From 849d470a5829bdcf447eb46ed262f42e4fbb0822 Mon Sep 17 00:00:00 2001 From: Jesse Abramowitz Date: Wed, 4 Dec 2024 14:41:11 -0500 Subject: [PATCH] fix --- Cargo.lock | 790 +++---------------- crates/threshold-signature-server/Cargo.toml | 4 +- 2 files changed, 107 insertions(+), 687 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0c45c5b91..9ca5a3720 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1621,7 +1621,7 @@ dependencies = [ "sp-io 38.0.0", "sp-keyring 39.0.0", "sp-runtime 39.0.2", - "sp-tracing 17.0.1", + "sp-tracing", "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", @@ -1981,7 +1981,7 @@ dependencies = [ "anstream", "anstyle", "clap_lex", - "strsim 0.11.1", + "strsim", "terminal_size", ] @@ -2924,38 +2924,14 @@ dependencies = [ "syn 2.0.90", ] -[[package]] -name = "darling" -version = "0.14.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850" -dependencies = [ - "darling_core 0.14.4", - "darling_macro 0.14.4", -] - [[package]] name = "darling" version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" dependencies = [ - "darling_core 0.20.10", - "darling_macro 0.20.10", -] - -[[package]] -name = "darling_core" -version = "0.14.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim 0.10.0", - "syn 1.0.109", + "darling_core", + "darling_macro", ] [[package]] @@ -2968,28 +2944,17 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "strsim 0.11.1", + "strsim", "syn 2.0.90", ] -[[package]] -name = "darling_macro" -version = "0.14.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" -dependencies = [ - "darling_core 0.14.4", - "quote", - "syn 1.0.109", -] - [[package]] name = "darling_macro" version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ - "darling_core 0.20.10", + "darling_core", "quote", "syn 2.0.90", ] @@ -3518,7 +3483,7 @@ dependencies = [ "sp-runtime 39.0.2", "sp-statement-store 18.0.0", "sp-timestamp 34.0.0", - "sp-tracing 17.0.1", + "sp-tracing", "sp-transaction-storage-proof 34.0.0", "substrate-build-script-utils", "substrate-frame-rpc-system", @@ -3550,7 +3515,7 @@ dependencies = [ "sha3", "sp-core 34.0.0", "sp-keyring 39.0.0", - "subxt 0.38.0", + "subxt", "subxt-core", "synedrion", "tdx-quote", @@ -3647,7 +3612,7 @@ dependencies = [ "snow", "sp-core 34.0.0", "sp-keyring 39.0.0", - "subxt 0.38.0", + "subxt", "synedrion", "thiserror 2.0.4", "tokio", @@ -3738,7 +3703,7 @@ dependencies = [ "sp-session 36.0.0", "sp-staking 36.0.0", "sp-std", - "sp-storage 21.0.0", + "sp-storage", "sp-transaction-pool 34.0.0", "sp-version 37.0.0", "static_assertions", @@ -3761,7 +3726,7 @@ dependencies = [ "sp-std", "strum 0.26.3", "strum_macros 0.26.4", - "subxt 0.38.0", + "subxt", ] [[package]] @@ -3780,7 +3745,7 @@ dependencies = [ "serde_json", "sp-core 34.0.0", "sp-runtime 39.0.2", - "subxt 0.38.0", + "subxt", "tokio", "x25519-dalek 2.0.1", ] @@ -3803,7 +3768,7 @@ dependencies = [ "rand_core 0.6.4", "sp-core 34.0.0", "sp-keyring 39.0.0", - "subxt 0.38.0", + "subxt", "synedrion", "tdx-quote", "tokio", @@ -3858,10 +3823,10 @@ dependencies = [ "sha2 0.10.8", "sha3", "snow", - "sp-core 31.0.0", + "sp-core 34.0.0", "sp-keyring 39.0.0", "strum 0.26.3", - "subxt 0.35.3", + "subxt", "synedrion", "tdx-quote", "thiserror 2.0.4", @@ -4059,16 +4024,6 @@ version = "2.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" -[[package]] -name = "event-listener" -version = "4.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e" -dependencies = [ - "concurrent-queue", - "pin-project-lite 0.2.15", -] - [[package]] name = "event-listener" version = "5.3.1" @@ -4374,7 +4329,7 @@ dependencies = [ "sp-io 38.0.0", "sp-runtime 39.0.2", "sp-runtime-interface 28.0.0", - "sp-storage 21.0.0", + "sp-storage", "static_assertions", ] @@ -4422,9 +4377,9 @@ dependencies = [ "sp-keystore 0.40.0", "sp-runtime 39.0.2", "sp-state-machine 0.43.0", - "sp-storage 21.0.0", + "sp-storage", "sp-trie 37.0.0", - "sp-wasm-interface 21.0.1", + "sp-wasm-interface", "thiserror 1.0.69", "thousands", ] @@ -4452,9 +4407,9 @@ checksum = "02d3379df61ff3dd871e2dde7d1bcdc0263e613c21c7579b149fd4f0ad9b1dc2" dependencies = [ "frame-metadata 17.0.0", "parity-scale-codec", - "scale-decode 0.14.0", + "scale-decode", "scale-info", - "scale-type-resolver 0.2.0", + "scale-type-resolver", "sp-crypto-hashing", ] @@ -4503,18 +4458,7 @@ dependencies = [ "sp-core 34.0.0", "sp-io 38.0.0", "sp-runtime 39.0.2", - "sp-tracing 17.0.1", -] - -[[package]] -name = "frame-metadata" -version = "15.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "878babb0b136e731cc77ec2fd883ff02745ff21e6fb662729953d44923df009c" -dependencies = [ - "cfg-if", - "parity-scale-codec", - "scale-info", + "sp-tracing", ] [[package]] @@ -4616,7 +4560,7 @@ dependencies = [ "sp-staking 30.0.0", "sp-state-machine 0.39.0", "sp-std", - "sp-tracing 17.0.1", + "sp-tracing", "sp-weights", "static_assertions", "tt-call", @@ -4658,7 +4602,7 @@ dependencies = [ "sp-staking 36.0.0", "sp-state-machine 0.43.0", "sp-std", - "sp-tracing 17.0.1", + "sp-tracing", "sp-weights", "static_assertions", "tt-call", @@ -6233,7 +6177,6 @@ version = "0.22.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cfdb12a2381ea5b2e68c3469ec604a007b367778cdb14d09612c8069ebd616ad" dependencies = [ - "jsonrpsee-client-transport 0.22.5", "jsonrpsee-core 0.22.5", "jsonrpsee-http-client", "jsonrpsee-proc-macros 0.22.5", @@ -8330,12 +8273,6 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b93853da6d84c2e3c7d730d6473e8817692dd89be387eb01b94d7f108ecb5b8c" -[[package]] -name = "no-std-net" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43794a0ace135be66a25d3ae77d41b91615fb68ae937f904090203e81f755b65" - [[package]] name = "nodrop" version = "0.1.14" @@ -9018,7 +8955,7 @@ dependencies = [ "sp-core 34.0.0", "sp-io 38.0.0", "sp-runtime 39.0.2", - "sp-tracing 17.0.1", + "sp-tracing", ] [[package]] @@ -9307,7 +9244,7 @@ dependencies = [ "staging-xcm", "staging-xcm-builder", "wasm-instrument", - "wasmi 0.32.3", + "wasmi", ] [[package]] @@ -9339,7 +9276,7 @@ dependencies = [ "sp-io 38.0.0", "sp-keystore 0.40.0", "sp-runtime 39.0.2", - "sp-tracing 17.0.1", + "sp-tracing", "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", @@ -9858,7 +9795,7 @@ dependencies = [ "sp-io 38.0.0", "sp-runtime 39.0.2", "sp-staking 36.0.0", - "sp-tracing 17.0.1", + "sp-tracing", ] [[package]] @@ -10264,7 +10201,7 @@ dependencies = [ "sp-io 38.0.0", "sp-keystore 0.40.0", "sp-runtime 39.0.2", - "sp-tracing 17.0.1", + "sp-tracing", "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", @@ -10651,7 +10588,7 @@ dependencies = [ "sp-inherents 34.0.0", "sp-io 38.0.0", "sp-runtime 39.0.2", - "sp-storage 21.0.0", + "sp-storage", "sp-timestamp 34.0.0", ] @@ -10999,7 +10936,7 @@ dependencies = [ "sp-core 34.0.0", "sp-io 38.0.0", "sp-runtime 39.0.2", - "sp-tracing 17.0.1", + "sp-tracing", "staging-parachain-info", "staging-xcm", "staging-xcm-executor", @@ -11507,7 +11444,7 @@ dependencies = [ "frame-benchmarking", "parity-scale-codec", "polkadot-primitives 16.0.0", - "sp-tracing 17.0.1", + "sp-tracing", ] [[package]] @@ -11773,20 +11710,20 @@ dependencies = [ "sp-state-machine 0.43.0", "sp-statement-store 18.0.0", "sp-std", - "sp-storage 21.0.0", + "sp-storage", "sp-timestamp 34.0.0", - "sp-tracing 17.0.1", + "sp-tracing", "sp-transaction-pool 34.0.0", "sp-transaction-storage-proof 34.0.0", "sp-trie 37.0.0", "sp-version 37.0.0", - "sp-wasm-interface 21.0.1", + "sp-wasm-interface", "sp-weights", "staging-parachain-info", "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", - "substrate-bip39 0.6.0", + "substrate-bip39", "testnet-parachains-constants", "xcm-runtime-apis", ] @@ -11819,7 +11756,7 @@ dependencies = [ "sp-offchain 34.0.0", "sp-runtime 39.0.2", "sp-session 36.0.0", - "sp-storage 21.0.0", + "sp-storage", "sp-transaction-pool 34.0.0", "sp-version 37.0.0", ] @@ -11893,15 +11830,6 @@ dependencies = [ "polkavm-assembler 0.10.0", ] -[[package]] -name = "polkavm-derive" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79fa916f7962348bd1bb1a65a83401675e6fc86c51a0fdbcf92a3108e58e6125" -dependencies = [ - "polkavm-derive-impl-macro 0.8.0", -] - [[package]] name = "polkavm-derive" version = "0.9.1" @@ -11920,18 +11848,6 @@ dependencies = [ "polkavm-derive-impl-macro 0.10.0", ] -[[package]] -name = "polkavm-derive-impl" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c10b2654a8a10a83c260bfb93e97b262cf0017494ab94a65d389e0eda6de6c9c" -dependencies = [ - "polkavm-common 0.8.0", - "proc-macro2", - "quote", - "syn 2.0.90", -] - [[package]] name = "polkavm-derive-impl" version = "0.9.0" @@ -11956,16 +11872,6 @@ dependencies = [ "syn 2.0.90", ] -[[package]] -name = "polkavm-derive-impl-macro" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15e85319a0d5129dc9f021c62607e0804f5fb777a05cdda44d750ac0732def66" -dependencies = [ - "polkavm-derive-impl 0.8.0", - "syn 2.0.90", -] - [[package]] name = "polkavm-derive-impl-macro" version = "0.9.0" @@ -13457,17 +13363,6 @@ dependencies = [ "wait-timeout", ] -[[package]] -name = "ruzstd" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58c4eb8a81997cf040a091d1f7e1938aeab6749d3a0dfa73af43cdc32393483d" -dependencies = [ - "byteorder", - "derive_more 0.99.18", - "twox-hash", -] - [[package]] name = "ruzstd" version = "0.6.0" @@ -13550,7 +13445,7 @@ checksum = "97e78771bbc491d4d601afbbf01f5718d6d724d0d971c8581cf5b4c62a9502f7" dependencies = [ "log", "sp-core 32.0.0", - "sp-wasm-interface 21.0.1", + "sp-wasm-interface", "thiserror 1.0.69", ] @@ -13562,7 +13457,7 @@ checksum = "b975ee3a95eaacb611e7b415737a7fa2db4d8ad7b880cc1b97371b04e95c7903" dependencies = [ "log", "sp-core 34.0.0", - "sp-wasm-interface 21.0.1", + "sp-wasm-interface", "thiserror 1.0.69", ] @@ -13704,7 +13599,7 @@ dependencies = [ "sp-io 38.0.0", "sp-runtime 39.0.2", "sp-state-machine 0.43.0", - "sp-tracing 17.0.1", + "sp-tracing", ] [[package]] @@ -13838,7 +13733,7 @@ dependencies = [ "sp-runtime 35.0.0", "sp-state-machine 0.39.0", "sp-statement-store 14.0.0", - "sp-storage 21.0.0", + "sp-storage", "sp-trie 33.0.0", "substrate-prometheus-endpoint", ] @@ -13866,7 +13761,7 @@ dependencies = [ "sp-runtime 39.0.2", "sp-state-machine 0.43.0", "sp-statement-store 18.0.0", - "sp-storage 21.0.0", + "sp-storage", "sp-trie 37.0.0", "substrate-prometheus-endpoint", ] @@ -14160,7 +14055,7 @@ dependencies = [ "sp-runtime-interface 27.0.0", "sp-trie 33.0.0", "sp-version 33.0.0", - "sp-wasm-interface 21.0.1", + "sp-wasm-interface", "tracing", ] @@ -14184,7 +14079,7 @@ dependencies = [ "sp-runtime-interface 28.0.0", "sp-trie 37.0.0", "sp-version 37.0.0", - "sp-wasm-interface 21.0.1", + "sp-wasm-interface", "tracing", ] @@ -14197,7 +14092,7 @@ dependencies = [ "polkavm 0.9.3", "sc-allocator 27.0.0", "sp-maybe-compressed-blob", - "sp-wasm-interface 21.0.1", + "sp-wasm-interface", "thiserror 1.0.69", "wasm-instrument", ] @@ -14211,7 +14106,7 @@ dependencies = [ "polkavm 0.9.3", "sc-allocator 29.0.0", "sp-maybe-compressed-blob", - "sp-wasm-interface 21.0.1", + "sp-wasm-interface", "thiserror 1.0.69", "wasm-instrument", ] @@ -14225,7 +14120,7 @@ dependencies = [ "log", "polkavm 0.9.3", "sc-executor-common 0.33.0", - "sp-wasm-interface 21.0.1", + "sp-wasm-interface", ] [[package]] @@ -14237,7 +14132,7 @@ dependencies = [ "log", "polkavm 0.9.3", "sc-executor-common 0.35.0", - "sp-wasm-interface 21.0.1", + "sp-wasm-interface", ] [[package]] @@ -14255,7 +14150,7 @@ dependencies = [ "sc-allocator 27.0.0", "sc-executor-common 0.33.0", "sp-runtime-interface 27.0.0", - "sp-wasm-interface 21.0.1", + "sp-wasm-interface", "wasmtime 8.0.1", ] @@ -14274,7 +14169,7 @@ dependencies = [ "sc-allocator 29.0.0", "sc-executor-common 0.35.0", "sp-runtime-interface 28.0.0", - "sp-wasm-interface 21.0.1", + "sp-wasm-interface", "wasmtime 8.0.1", ] @@ -15089,7 +14984,7 @@ dependencies = [ "sp-runtime 35.0.0", "sp-session 31.0.0", "sp-state-machine 0.39.0", - "sp-storage 21.0.0", + "sp-storage", "sp-transaction-pool 30.0.0", "sp-transaction-storage-proof 30.0.0", "sp-trie 33.0.0", @@ -15154,7 +15049,7 @@ dependencies = [ "sp-runtime 39.0.2", "sp-session 36.0.0", "sp-state-machine 0.43.0", - "sp-storage 21.0.0", + "sp-storage", "sp-transaction-pool 34.0.0", "sp-transaction-storage-proof 34.0.0", "sp-trie 37.0.0", @@ -15335,7 +15230,7 @@ dependencies = [ "sp-core 32.0.0", "sp-rpc 30.0.0", "sp-runtime 35.0.0", - "sp-tracing 17.0.1", + "sp-tracing", "thiserror 1.0.69", "tracing", "tracing-log 0.1.4", @@ -15365,7 +15260,7 @@ dependencies = [ "sp-core 34.0.0", "sp-rpc 32.0.0", "sp-runtime 39.0.2", - "sp-tracing 17.0.1", + "sp-tracing", "thiserror 1.0.69", "tracing", "tracing-log 0.2.0", @@ -15406,7 +15301,7 @@ dependencies = [ "sp-core 32.0.0", "sp-crypto-hashing", "sp-runtime 35.0.0", - "sp-tracing 17.0.1", + "sp-tracing", "sp-transaction-pool 30.0.0", "substrate-prometheus-endpoint", "thiserror 1.0.69", @@ -15434,7 +15329,7 @@ dependencies = [ "sp-core 34.0.0", "sp-crypto-hashing", "sp-runtime 39.0.2", - "sp-tracing 17.0.1", + "sp-tracing", "sp-transaction-pool 34.0.0", "substrate-prometheus-endpoint", "thiserror 1.0.69", @@ -15490,18 +15385,6 @@ dependencies = [ "sp-arithmetic", ] -[[package]] -name = "scale-bits" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "662d10dcd57b1c2a3c41c9cf68f71fb09747ada1ea932ad961aca7e2ca28315f" -dependencies = [ - "parity-scale-codec", - "scale-info", - "scale-type-resolver 0.1.1", - "serde", -] - [[package]] name = "scale-bits" version = "0.6.0" @@ -15510,25 +15393,10 @@ checksum = "e57b1e7f6b65ed1f04e79a85a57d755ad56d76fdf1e9bddcc9ae14f71fcdcf54" dependencies = [ "parity-scale-codec", "scale-info", - "scale-type-resolver 0.2.0", + "scale-type-resolver", "serde", ] -[[package]] -name = "scale-decode" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afc79ba56a1c742f5aeeed1f1801f3edf51f7e818f0a54582cac6f131364ea7b" -dependencies = [ - "derive_more 0.99.18", - "parity-scale-codec", - "primitive-types 0.12.2", - "scale-bits 0.5.0", - "scale-decode-derive 0.11.1", - "scale-type-resolver 0.1.1", - "smallvec", -] - [[package]] name = "scale-decode" version = "0.14.0" @@ -15538,51 +15406,24 @@ dependencies = [ "derive_more 1.0.0", "parity-scale-codec", "primitive-types 0.13.1", - "scale-bits 0.6.0", - "scale-decode-derive 0.14.0", - "scale-type-resolver 0.2.0", + "scale-bits", + "scale-decode-derive", + "scale-type-resolver", "smallvec", ] -[[package]] -name = "scale-decode-derive" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5398fdb3c7bea3cb419bac4983aadacae93fe1a7b5f693f4ebd98c3821aad7a5" -dependencies = [ - "darling 0.14.4", - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "scale-decode-derive" version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5ed9401effa946b493f9f84dc03714cca98119b230497df6f3df6b84a2b03648" dependencies = [ - "darling 0.20.10", + "darling", "proc-macro2", "quote", "syn 2.0.90", ] -[[package]] -name = "scale-encode" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "628800925a33794fb5387781b883b5e14d130fece9af5a63613867b8de07c5c7" -dependencies = [ - "derive_more 0.99.18", - "parity-scale-codec", - "primitive-types 0.12.2", - "scale-bits 0.5.0", - "scale-encode-derive 0.6.0", - "scale-type-resolver 0.1.1", - "smallvec", -] - [[package]] name = "scale-encode" version = "0.8.0" @@ -15592,32 +15433,19 @@ dependencies = [ "derive_more 1.0.0", "parity-scale-codec", "primitive-types 0.13.1", - "scale-bits 0.6.0", - "scale-encode-derive 0.8.0", - "scale-type-resolver 0.2.0", + "scale-bits", + "scale-encode-derive", + "scale-type-resolver", "smallvec", ] -[[package]] -name = "scale-encode-derive" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a304e1af7cdfbe7a24e08b012721456cc8cecdedadc14b3d10513eada63233c" -dependencies = [ - "darling 0.14.4", - "proc-macro-crate 1.1.3", - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "scale-encode-derive" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "102fbc6236de6c53906c0b262f12c7aa69c2bdc604862c12728f5f4d370bc137" dependencies = [ - "darling 0.20.10", + "darling", "proc-macro-crate 3.2.0", "proc-macro2", "quote", @@ -15650,16 +15478,6 @@ dependencies = [ "syn 2.0.90", ] -[[package]] -name = "scale-type-resolver" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10b800069bfd43374e0f96f653e0d46882a2cb16d6d961ac43bea80f26c76843" -dependencies = [ - "scale-info", - "smallvec", -] - [[package]] name = "scale-type-resolver" version = "0.2.0" @@ -15670,19 +15488,6 @@ dependencies = [ "smallvec", ] -[[package]] -name = "scale-typegen" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d470fa75e71b12b3244a4113adc4bc49891f3daba2054703cacd06256066397e" -dependencies = [ - "proc-macro2", - "quote", - "scale-info", - "syn 2.0.90", - "thiserror 1.0.69", -] - [[package]] name = "scale-typegen" version = "0.9.0" @@ -15696,27 +15501,6 @@ dependencies = [ "thiserror 1.0.69", ] -[[package]] -name = "scale-value" -version = "0.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c07ccfee963104335c971aaf8b7b0e749be8569116322df23f1f75c4ca9e4a28" -dependencies = [ - "base58", - "blake2 0.10.6", - "derive_more 0.99.18", - "either", - "frame-metadata 15.1.0", - "parity-scale-codec", - "scale-bits 0.5.0", - "scale-decode 0.11.1", - "scale-encode 0.6.0", - "scale-info", - "scale-type-resolver 0.1.1", - "serde", - "yap", -] - [[package]] name = "scale-value" version = "0.17.0" @@ -15728,11 +15512,11 @@ dependencies = [ "derive_more 1.0.0", "either", "parity-scale-codec", - "scale-bits 0.6.0", - "scale-decode 0.14.0", - "scale-encode 0.8.0", + "scale-bits", + "scale-decode", + "scale-encode", "scale-info", - "scale-type-resolver 0.2.0", + "scale-type-resolver", "serde", "yap", ] @@ -16380,61 +16164,6 @@ dependencies = [ "futures-lite", ] -[[package]] -name = "smoldot" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6d1eaa97d77be4d026a1e7ffad1bb3b78448763b357ea6f8188d3e6f736a9b9" -dependencies = [ - "arrayvec 0.7.6", - "async-lock", - "atomic-take", - "base64 0.21.7", - "bip39", - "blake2-rfc", - "bs58 0.5.1", - "chacha20 0.9.1", - "crossbeam-queue", - "derive_more 0.99.18", - "ed25519-zebra 4.0.3", - "either", - "event-listener 4.0.3", - "fnv", - "futures-lite", - "futures-util", - "hashbrown 0.14.5", - "hex", - "hmac 0.12.1", - "itertools 0.12.1", - "libm", - "libsecp256k1", - "merlin", - "no-std-net", - "nom", - "num-bigint", - "num-rational", - "num-traits", - "pbkdf2", - "pin-project", - "poly1305 0.8.0", - "rand", - "rand_chacha", - "ruzstd 0.5.0", - "schnorrkel", - "serde", - "serde_json", - "sha2 0.10.8", - "sha3", - "siphasher 1.0.1", - "slab", - "smallvec", - "soketto 0.7.1", - "twox-hash", - "wasmi 0.31.2", - "x25519-dalek 2.0.1", - "zeroize", -] - [[package]] name = "smoldot" version = "0.18.0" @@ -16473,7 +16202,7 @@ dependencies = [ "poly1305 0.8.0", "rand", "rand_chacha", - "ruzstd 0.6.0", + "ruzstd", "schnorrkel", "serde", "serde_json", @@ -16484,47 +16213,11 @@ dependencies = [ "smallvec", "soketto 0.8.1", "twox-hash", - "wasmi 0.32.3", + "wasmi", "x25519-dalek 2.0.1", "zeroize", ] -[[package]] -name = "smoldot-light" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5496f2d116b7019a526b1039ec2247dd172b8670633b1a64a614c9ea12c9d8c7" -dependencies = [ - "async-channel 2.3.1", - "async-lock", - "base64 0.21.7", - "blake2-rfc", - "derive_more 0.99.18", - "either", - "event-listener 4.0.3", - "fnv", - "futures-channel", - "futures-lite", - "futures-util", - "hashbrown 0.14.5", - "hex", - "itertools 0.12.1", - "log", - "lru 0.12.5", - "no-std-net", - "parking_lot 0.12.3", - "pin-project", - "rand", - "rand_chacha", - "serde", - "serde_json", - "siphasher 1.0.1", - "slab", - "smol", - "smoldot 0.16.0", - "zeroize", -] - [[package]] name = "smoldot-light" version = "0.16.2" @@ -16557,7 +16250,7 @@ dependencies = [ "siphasher 1.0.1", "slab", "smol", - "smoldot 0.18.0", + "smoldot", "zeroize", ] @@ -17352,53 +17045,6 @@ dependencies = [ "sp-timestamp 34.0.0", ] -[[package]] -name = "sp-core" -version = "31.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d7a0fd8f16dcc3761198fc83be12872f823b37b749bc72a3a6a1f702509366" -dependencies = [ - "array-bytes 6.2.3", - "bitflags 1.3.2", - "blake2 0.10.6", - "bounded-collections", - "bs58 0.5.1", - "dyn-clonable", - "ed25519-zebra 3.1.0", - "futures", - "hash-db", - "hash256-std-hasher", - "impl-serde 0.4.0", - "itertools 0.10.5", - "k256", - "libsecp256k1", - "log", - "merlin", - "parity-bip39", - "parity-scale-codec", - "parking_lot 0.12.3", - "paste", - "primitive-types 0.12.2", - "rand", - "scale-info", - "schnorrkel", - "secp256k1", - "secrecy 0.8.0", - "serde", - "sp-crypto-hashing", - "sp-debug-derive", - "sp-externalities 0.27.0", - "sp-runtime-interface 26.0.0", - "sp-std", - "sp-storage 20.0.0", - "ss58-registry", - "substrate-bip39 0.5.0", - "thiserror 1.0.69", - "tracing", - "w3f-bls", - "zeroize", -] - [[package]] name = "sp-core" version = "32.0.0" @@ -17437,9 +17083,9 @@ dependencies = [ "sp-externalities 0.28.0", "sp-runtime-interface 27.0.0", "sp-std", - "sp-storage 21.0.0", + "sp-storage", "ss58-registry", - "substrate-bip39 0.6.0", + "substrate-bip39", "thiserror 1.0.69", "tracing", "w3f-bls", @@ -17484,9 +17130,9 @@ dependencies = [ "sp-externalities 0.29.0", "sp-runtime-interface 28.0.0", "sp-std", - "sp-storage 21.0.0", + "sp-storage", "ss58-registry", - "substrate-bip39 0.6.0", + "substrate-bip39", "thiserror 1.0.69", "tracing", "w3f-bls", @@ -17569,18 +17215,6 @@ dependencies = [ "syn 2.0.90", ] -[[package]] -name = "sp-externalities" -version = "0.27.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1d6a4572eadd4a63cff92509a210bf425501a0c5e76574b30a366ac77653787" -dependencies = [ - "environmental", - "parity-scale-codec", - "sp-std", - "sp-storage 20.0.0", -] - [[package]] name = "sp-externalities" version = "0.28.0" @@ -17589,7 +17223,7 @@ checksum = "33abaec4be69b1613796bbf430decbbcaaf978756379e2016e683a4d6379cd02" dependencies = [ "environmental", "parity-scale-codec", - "sp-storage 21.0.0", + "sp-storage", ] [[package]] @@ -17600,7 +17234,7 @@ checksum = "a904407d61cb94228c71b55a9d3708e9d6558991f9e83bd42bd91df37a159d30" dependencies = [ "environmental", "parity-scale-codec", - "sp-storage 21.0.0", + "sp-storage", ] [[package]] @@ -17676,7 +17310,7 @@ dependencies = [ "sp-runtime-interface 27.0.0", "sp-state-machine 0.39.0", "sp-std", - "sp-tracing 17.0.1", + "sp-tracing", "sp-trie 33.0.0", "tracing", "tracing-core", @@ -17703,7 +17337,7 @@ dependencies = [ "sp-keystore 0.40.0", "sp-runtime-interface 28.0.0", "sp-state-machine 0.43.0", - "sp-tracing 17.0.1", + "sp-tracing", "sp-trie 37.0.0", "tracing", "tracing-core", @@ -17939,26 +17573,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "sp-runtime-interface" -version = "26.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e48a675ea4858333d4d755899ed5ed780174aa34fec15953428d516af5452295" -dependencies = [ - "bytes", - "impl-trait-for-tuples", - "parity-scale-codec", - "polkavm-derive 0.8.0", - "primitive-types 0.12.2", - "sp-externalities 0.27.0", - "sp-runtime-interface-proc-macro", - "sp-std", - "sp-storage 20.0.0", - "sp-tracing 16.0.0", - "sp-wasm-interface 20.0.0", - "static_assertions", -] - [[package]] name = "sp-runtime-interface" version = "27.0.0" @@ -17973,9 +17587,9 @@ dependencies = [ "sp-externalities 0.28.0", "sp-runtime-interface-proc-macro", "sp-std", - "sp-storage 21.0.0", - "sp-tracing 17.0.1", - "sp-wasm-interface 21.0.1", + "sp-storage", + "sp-tracing", + "sp-wasm-interface", "static_assertions", ] @@ -17993,9 +17607,9 @@ dependencies = [ "sp-externalities 0.29.0", "sp-runtime-interface-proc-macro", "sp-std", - "sp-storage 21.0.0", - "sp-tracing 17.0.1", - "sp-wasm-interface 21.0.1", + "sp-storage", + "sp-tracing", + "sp-wasm-interface", "static_assertions", ] @@ -18183,20 +17797,6 @@ version = "14.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "12f8ee986414b0a9ad741776762f4083cd3a5128449b982a3919c4df36874834" -[[package]] -name = "sp-storage" -version = "20.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8dba5791cb3978e95daf99dad919ecb3ec35565604e88cd38d805d9d4981e8bd" -dependencies = [ - "impl-serde 0.4.0", - "parity-scale-codec", - "ref-cast", - "serde", - "sp-debug-derive", - "sp-std", -] - [[package]] name = "sp-storage" version = "21.0.0" @@ -18236,19 +17836,6 @@ dependencies = [ "thiserror 1.0.69", ] -[[package]] -name = "sp-tracing" -version = "16.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0351810b9d074df71c4514c5228ed05c250607cba131c1c9d1526760ab69c05c" -dependencies = [ - "parity-scale-codec", - "sp-std", - "tracing", - "tracing-core", - "tracing-subscriber 0.2.25", -] - [[package]] name = "sp-tracing" version = "17.0.1" @@ -18407,20 +17994,6 @@ dependencies = [ "syn 2.0.90", ] -[[package]] -name = "sp-wasm-interface" -version = "20.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ef97172c42eb4c6c26506f325f48463e9bc29b2034a587f1b9e48c751229bee" -dependencies = [ - "anyhow", - "impl-trait-for-tuples", - "log", - "parity-scale-codec", - "sp-std", - "wasmtime 8.0.1", -] - [[package]] name = "sp-wasm-interface" version = "21.0.1" @@ -18684,12 +18257,6 @@ dependencies = [ "serde", ] -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - [[package]] name = "strsim" version = "0.11.1" @@ -18740,19 +18307,6 @@ dependencies = [ "syn 2.0.90", ] -[[package]] -name = "substrate-bip39" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2b564c293e6194e8b222e52436bcb99f60de72043c7f845cf6c4406db4df121" -dependencies = [ - "hmac 0.12.1", - "pbkdf2", - "schnorrkel", - "sha2 0.10.8", - "zeroize", -] - [[package]] name = "substrate-bip39" version = "0.6.0" @@ -18873,42 +18427,6 @@ version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" -[[package]] -name = "subxt" -version = "0.35.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd68bef23f4de5e513ab4c29af69053e232b098f9c87ab552d7ea153b4a1fbc5" -dependencies = [ - "async-trait", - "base58", - "blake2 0.10.6", - "derivative", - "either", - "frame-metadata 16.0.0", - "futures", - "hex", - "impl-serde 0.4.0", - "instant", - "jsonrpsee 0.22.5", - "parity-scale-codec", - "primitive-types 0.12.2", - "scale-bits 0.5.0", - "scale-decode 0.11.1", - "scale-encode 0.6.0", - "scale-info", - "scale-value 0.14.1", - "serde", - "serde_json", - "sp-crypto-hashing", - "subxt-lightclient 0.35.3", - "subxt-macro 0.35.3", - "subxt-metadata 0.35.3", - "thiserror 1.0.69", - "tokio-util", - "tracing", - "url", -] - [[package]] name = "subxt" version = "0.38.0" @@ -18928,17 +18446,17 @@ dependencies = [ "parity-scale-codec", "polkadot-sdk", "primitive-types 0.13.1", - "scale-bits 0.6.0", - "scale-decode 0.14.0", - "scale-encode 0.8.0", + "scale-bits", + "scale-decode", + "scale-encode", "scale-info", - "scale-value 0.17.0", + "scale-value", "serde", "serde_json", "subxt-core", - "subxt-lightclient 0.38.0", - "subxt-macro 0.38.0", - "subxt-metadata 0.38.0", + "subxt-lightclient", + "subxt-macro", + "subxt-metadata", "thiserror 1.0.69", "tokio", "tokio-util", @@ -18948,27 +18466,6 @@ dependencies = [ "web-time", ] -[[package]] -name = "subxt-codegen" -version = "0.35.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d9e2b256b71d31a2629e44eb9cbfd944eb7d577c9e0c8e9802cc3c3943af2d9" -dependencies = [ - "frame-metadata 16.0.0", - "heck 0.4.1", - "hex", - "jsonrpsee 0.22.5", - "parity-scale-codec", - "proc-macro2", - "quote", - "scale-info", - "scale-typegen 0.2.1", - "subxt-metadata 0.35.3", - "syn 2.0.90", - "thiserror 1.0.69", - "tokio", -] - [[package]] name = "subxt-codegen" version = "0.38.0" @@ -18981,8 +18478,8 @@ dependencies = [ "proc-macro2", "quote", "scale-info", - "scale-typegen 0.9.0", - "subxt-metadata 0.38.0", + "scale-typegen", + "subxt-metadata", "syn 2.0.90", "thiserror 1.0.69", ] @@ -19005,31 +18502,14 @@ dependencies = [ "parity-scale-codec", "polkadot-sdk", "primitive-types 0.13.1", - "scale-bits 0.6.0", - "scale-decode 0.14.0", - "scale-encode 0.8.0", + "scale-bits", + "scale-decode", + "scale-encode", "scale-info", - "scale-value 0.17.0", + "scale-value", "serde", "serde_json", - "subxt-metadata 0.38.0", - "tracing", -] - -[[package]] -name = "subxt-lightclient" -version = "0.35.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d51f1ac12e3be7aafea4d037730a57da4f22f2e9c73955666081ffa2697c6f1" -dependencies = [ - "futures", - "futures-util", - "serde", - "serde_json", - "smoldot-light 0.14.0", - "thiserror 1.0.69", - "tokio", - "tokio-stream", + "subxt-metadata", "tracing", ] @@ -19048,8 +18528,8 @@ dependencies = [ "send_wrapper 0.6.0", "serde", "serde_json", - "smoldot 0.18.0", - "smoldot-light 0.16.2", + "smoldot", + "smoldot-light", "thiserror 1.0.69", "tokio", "tokio-stream", @@ -19060,51 +18540,22 @@ dependencies = [ "web-time", ] -[[package]] -name = "subxt-macro" -version = "0.35.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98dc84d7e6a0abd7ed407cce0bf60d7d58004f699460cffb979640717d1ab506" -dependencies = [ - "darling 0.20.10", - "parity-scale-codec", - "proc-macro-error", - "quote", - "scale-typegen 0.2.1", - "subxt-codegen 0.35.3", - "syn 2.0.90", -] - [[package]] name = "subxt-macro" version = "0.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "228db9a5c95a6d8dc6152b4d6cdcbabc4f60821dd3f482a4f8791e022b7caadb" dependencies = [ - "darling 0.20.10", + "darling", "parity-scale-codec", "proc-macro-error2", "quote", - "scale-typegen 0.9.0", - "subxt-codegen 0.38.0", + "scale-typegen", + "subxt-codegen", "subxt-utils-fetchmetadata", "syn 2.0.90", ] -[[package]] -name = "subxt-metadata" -version = "0.35.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc10c54028d079a9f1be65188707cd29e5ffd8d0031a2b1346a0941d57b7ab7e" -dependencies = [ - "derive_more 0.99.18", - "frame-metadata 16.0.0", - "hashbrown 0.14.5", - "parity-scale-codec", - "scale-info", - "sp-crypto-hashing", -] - [[package]] name = "subxt-metadata" version = "0.38.0" @@ -20651,19 +20102,6 @@ dependencies = [ "web-sys", ] -[[package]] -name = "wasmi" -version = "0.31.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a8281d1d660cdf54c76a3efa9ddd0c270cada1383a995db3ccb43d166456c7" -dependencies = [ - "smallvec", - "spin 0.9.8", - "wasmi_arena", - "wasmi_core 0.13.0", - "wasmparser-nostd", -] - [[package]] name = "wasmi" version = "0.32.3" @@ -20677,16 +20115,10 @@ dependencies = [ "smallvec", "spin 0.9.8", "wasmi_collections", - "wasmi_core 0.32.3", + "wasmi_core", "wasmparser-nostd", ] -[[package]] -name = "wasmi_arena" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "104a7f73be44570cac297b3035d76b169d6599637631cf37a1703326a0727073" - [[package]] name = "wasmi_collections" version = "0.32.3" @@ -20698,18 +20130,6 @@ dependencies = [ "string-interner", ] -[[package]] -name = "wasmi_core" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf1a7db34bff95b85c261002720c00c3a6168256dcb93041d3fa2054d19856a" -dependencies = [ - "downcast-rs", - "libm", - "num-traits", - "paste", -] - [[package]] name = "wasmi_core" version = "0.32.3" diff --git a/crates/threshold-signature-server/Cargo.toml b/crates/threshold-signature-server/Cargo.toml index d77656b79..c01faf724 100644 --- a/crates/threshold-signature-server/Cargo.toml +++ b/crates/threshold-signature-server/Cargo.toml @@ -35,9 +35,9 @@ reqwest={ version="0.12.9", features=["json", "stream"] } axum ={ version="0.7.9", features=["ws"] } # Substrate -subxt ="0.35.3" +subxt ="0.38.0" parity-scale-codec="3.6.8" -sp-core ={ version="31.0.0", default-features=false } +sp-core ={ version="34.0.0", default-features=false } # Entropy entropy-shared ={ version="0.3.0", path="../shared" }