diff --git a/Cargo.lock b/Cargo.lock index 599292ac84..99cfcb9578 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -456,7 +456,7 @@ checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.77", ] [[package]] @@ -471,17 +471,6 @@ version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi 0.1.19", - "libc", - "winapi", -] - [[package]] name = "autocfg" version = "1.2.0" @@ -840,18 +829,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "clap" -version = "3.2.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" -dependencies = [ - "bitflags 1.3.2", - "clap_lex 0.2.4", - "indexmap 1.9.3", - "textwrap", -] - [[package]] name = "clap" version = "4.5.18" @@ -870,7 +847,7 @@ checksum = "4d72166dd41634086d5803a47eb71ae740e61d84709c36f3c34110173db3961b" dependencies = [ "anstream", "anstyle", - "clap_lex 0.7.0", + "clap_lex", "strsim 0.11.1", ] @@ -883,16 +860,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.60", -] - -[[package]] -name = "clap_lex" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" -dependencies = [ - "os_str_bytes", + "syn 2.0.77", ] [[package]] @@ -1141,19 +1109,19 @@ dependencies = [ [[package]] name = "criterion" -version = "0.4.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7c76e09c1aae2bc52b3d2f29e13c6572553b30c4aa1b8a49fd70de6412654cb" +checksum = "f2b12d017a929603d80db1831cd3a24082f8137ce19c69e6447f54f5fc8d692f" dependencies = [ "anes", - "atty", "cast", "ciborium", - "clap 3.2.25", + "clap", "criterion-plot", + "is-terminal", "itertools 0.10.5", - "lazy_static", "num-traits", + "once_cell", "oorandom", "plotters", "rayon", @@ -1287,7 +1255,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.77", ] [[package]] @@ -1335,7 +1303,7 @@ dependencies = [ "proc-macro2", "quote", "strsim 0.11.1", - "syn 2.0.60", + "syn 2.0.77", ] [[package]] @@ -1357,7 +1325,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core 0.20.10", "quote", - "syn 2.0.60", + "syn 2.0.77", ] [[package]] @@ -1389,7 +1357,7 @@ checksum = "d65d7ce8132b7c0e54497a4d9a55a1c2a0912a0d786cf894472ba818fba45762" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.77", ] [[package]] @@ -1400,7 +1368,7 @@ checksum = "62d671cc41a825ebabc75757b62d3d168c577f9149b2d49ece1dad1f72119d25" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.77", ] [[package]] @@ -1485,7 +1453,7 @@ dependencies = [ "proc-macro2", "quote", "regex", - "syn 2.0.60", + "syn 2.0.77", "termcolor", "toml 0.8.12", "walkdir", @@ -1692,7 +1660,7 @@ dependencies = [ "prettier-please", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.77", ] [[package]] @@ -1888,7 +1856,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.77", ] [[package]] @@ -2145,15 +2113,6 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - [[package]] name = "hermit-abi" version = "0.3.9" @@ -2491,7 +2450,7 @@ dependencies = [ "subxt-metadata", "subxt-signer", "subxt-test-macro", - "syn 2.0.60", + "syn 2.0.77", "test-runtime", "tokio", "tracing", @@ -2773,11 +2732,11 @@ dependencies = [ [[package]] name = "keccak-hash" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b286e6b663fb926e1eeb68528e69cb70ed46c6d65871a21b2215ae8154c6d3c" +checksum = "3e1b8590eb6148af2ea2d75f38e7d29f5ca970d5a4df456b3ef19b8b415d0264" dependencies = [ - "primitive-types", + "primitive-types 0.13.1", "tiny-keccak", ] @@ -3050,7 +3009,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.77", ] [[package]] @@ -3149,12 +3108,6 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" -[[package]] -name = "os_str_bytes" -version = "6.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1" - [[package]] name = "overload" version = "0.1.1" @@ -3255,9 +3208,9 @@ dependencies = [ [[package]] name = "paste" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "pbkdf2" @@ -3299,7 +3252,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.77", ] [[package]] @@ -3418,7 +3371,7 @@ dependencies = [ "polkavm-common", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.77", ] [[package]] @@ -3428,7 +3381,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ba81f7b5faac81e528eb6158a6f3c9e0bb1008e0ffa19653bc8dea925ecb429" dependencies = [ "polkavm-derive-impl", - "syn 2.0.60", + "syn 2.0.77", ] [[package]] @@ -3476,7 +3429,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "22020dfcf177fcc7bf5deaf7440af371400c67c0de14c399938d8ed4fb4645d3" dependencies = [ "proc-macro2", - "syn 2.0.60", + "syn 2.0.77", ] [[package]] @@ -3499,7 +3452,17 @@ dependencies = [ "impl-codec", "impl-serde", "scale-info", - "uint", + "uint 0.9.5", +] + +[[package]] +name = "primitive-types" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d15600a7d856470b7d278b3fe0e311fe28c2526348549f8ef2ff7db3299c87f5" +dependencies = [ + "fixed-hash", + "uint 0.10.0", ] [[package]] @@ -3540,7 +3503,7 @@ dependencies = [ "proc-macro-error-attr2", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.77", ] [[package]] @@ -3698,7 +3661,7 @@ checksum = "5fddb4f8d99b0a2ebafc65a87a69a7b9875e4b1ae1f00db265d300ef7f28bccc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.77", ] [[package]] @@ -4086,7 +4049,7 @@ checksum = "e98f3262c250d90e700bb802eb704e1f841e03331c2eb815e46516c4edbf5b27" dependencies = [ "derive_more", "parity-scale-codec", - "primitive-types", + "primitive-types 0.12.2", "scale-bits", "scale-decode-derive", "scale-type-resolver", @@ -4113,7 +4076,7 @@ checksum = "4ba0b9c48dc0eb20c60b083c29447c0c4617cb7c4a4c9fef72aa5c5bc539e15e" dependencies = [ "derive_more", "parity-scale-codec", - "primitive-types", + "primitive-types 0.12.2", "scale-bits", "scale-encode-derive", "scale-type-resolver", @@ -4178,7 +4141,7 @@ dependencies = [ "proc-macro2", "quote", "scale-info", - "syn 2.0.60", + "syn 2.0.77", "thiserror", ] @@ -4299,7 +4262,16 @@ version = "0.28.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d24b59d129cdadea20aea4fb2352fa053712e5d713eee47d700cd4b2bc002f10" dependencies = [ - "secp256k1-sys", + "secp256k1-sys 0.9.2", +] + +[[package]] +name = "secp256k1" +version = "0.29.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9465315bc9d4566e1724f0fffcbcc446268cb522e60f9a27bcded6b19c108113" +dependencies = [ + "secp256k1-sys 0.10.1", ] [[package]] @@ -4311,6 +4283,15 @@ dependencies = [ "cc", ] +[[package]] +name = "secp256k1-sys" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4387882333d3aa8cb20530a17c69a3752e97837832f34f6dccc760e715001d9" +dependencies = [ + "cc", +] + [[package]] name = "secrecy" version = "0.8.0" @@ -4320,6 +4301,15 @@ dependencies = [ "zeroize", ] +[[package]] +name = "secrecy" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba079fa568d52545cd70b334b2ce6f88f62b8fc2bda9290f48a0578388a49331" +dependencies = [ + "zeroize", +] + [[package]] name = "security-framework" version = "2.10.0" @@ -4388,7 +4378,7 @@ checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.77", ] [[package]] @@ -4696,7 +4686,7 @@ dependencies = [ "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.77", ] [[package]] @@ -4754,12 +4744,12 @@ dependencies = [ "parity-scale-codec", "parking_lot", "paste", - "primitive-types", + "primitive-types 0.12.2", "rand", "scale-info", "schnorrkel", - "secp256k1", - "secrecy", + "secp256k1 0.28.2", + "secrecy 0.8.0", "serde", "sp-crypto-hashing", "sp-debug-derive", @@ -4797,7 +4787,7 @@ checksum = "b85d0f1f1e44bd8617eb2a48203ee854981229e3e79e6f468c7175d5fd37489b" dependencies = [ "quote", "sp-crypto-hashing", - "syn 2.0.60", + "syn 2.0.77", ] [[package]] @@ -4808,7 +4798,7 @@ checksum = "48d09fa0a5f7299fb81ee25ae3853d26200f7a348148aed6de76be905c007dbe" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.77", ] [[package]] @@ -4836,7 +4826,7 @@ dependencies = [ "parity-scale-codec", "polkavm-derive", "rustversion", - "secp256k1", + "secp256k1 0.28.2", "sp-core", "sp-crypto-hashing", "sp-externalities", @@ -4906,9 +4896,9 @@ dependencies = [ [[package]] name = "sp-runtime" -version = "39.0.0" +version = "39.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5641385c2cd8e2252aacf35e0aff2f236331dfaea8dc11c5a4ec6bb36544450" +checksum = "806f19b91dc283145e0580353e6ae68e4e634c0915d3dd950f57547b90b55a8c" dependencies = [ "docify", "either", @@ -4941,7 +4931,7 @@ dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", "polkavm-derive", - "primitive-types", + "primitive-types 0.12.2", "sp-externalities", "sp-runtime-interface-proc-macro", "sp-std", @@ -4962,7 +4952,7 @@ dependencies = [ "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.77", ] [[package]] @@ -5068,7 +5058,7 @@ dependencies = [ "parity-scale-codec", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.77", ] [[package]] @@ -5192,7 +5182,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.60", + "syn 2.0.77", ] [[package]] @@ -5238,7 +5228,7 @@ dependencies = [ "instant", "jsonrpsee", "parity-scale-codec", - "primitive-types", + "primitive-types 0.12.2", "scale-bits", "scale-decode", "scale-encode", @@ -5269,7 +5259,7 @@ dependencies = [ name = "subxt-cli" version = "0.37.0" dependencies = [ - "clap 4.5.18", + "clap", "color-eyre", "frame-metadata 16.0.0", "heck", @@ -5289,7 +5279,7 @@ dependencies = [ "subxt", "subxt-codegen", "subxt-metadata", - "syn 2.0.60", + "syn 2.0.77", "thiserror", "tokio", ] @@ -5309,7 +5299,7 @@ dependencies = [ "scale-info", "scale-typegen", "subxt-metadata", - "syn 2.0.60", + "syn 2.0.77", "thiserror", "tokio", ] @@ -5329,7 +5319,7 @@ dependencies = [ "impl-serde", "keccak-hash", "parity-scale-codec", - "primitive-types", + "primitive-types 0.12.2", "scale-bits", "scale-decode", "scale-encode", @@ -5387,7 +5377,7 @@ dependencies = [ "sp-maybe-compressed-blob", "sp-state-machine", "subxt-codegen", - "syn 2.0.60", + "syn 2.0.77", ] [[package]] @@ -5424,8 +5414,8 @@ dependencies = [ "regex", "schnorrkel", "scrypt", - "secp256k1", - "secrecy", + "secp256k1 0.29.1", + "secrecy 0.10.2", "serde", "serde_json", "sha2 0.10.8", @@ -5441,7 +5431,7 @@ name = "subxt-test-macro" version = "0.37.0" dependencies = [ "quote", - "syn 2.0.60", + "syn 2.0.77", ] [[package]] @@ -5457,9 +5447,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.60" +version = "2.0.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3" +checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" dependencies = [ "proc-macro2", "quote", @@ -5515,12 +5505,6 @@ dependencies = [ "which", ] -[[package]] -name = "textwrap" -version = "0.16.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9" - [[package]] name = "thiserror" version = "1.0.64" @@ -5538,7 +5522,7 @@ checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.77", ] [[package]] @@ -5609,7 +5593,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.77", ] [[package]] @@ -5762,7 +5746,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.77", ] [[package]] @@ -5942,6 +5926,18 @@ dependencies = [ "static_assertions", ] +[[package]] +name = "uint" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "909988d098b2f738727b161a106cfc7cab00c539c2687a8836f8e565976fb53e" +dependencies = [ + "byteorder", + "crunchy", + "hex", + "static_assertions", +] + [[package]] name = "unarray" version = "0.1.4" @@ -6143,7 +6139,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.77", "wasm-bindgen-shared", ] @@ -6177,7 +6173,7 @@ checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.77", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -6472,15 +6468,14 @@ dependencies = [ [[package]] name = "which" -version = "5.0.0" +version = "6.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bf3ea8596f3a0dd5980b46430f2058dfe2c36a27ccfbb1845d6fbfcd9ba6e14" +checksum = "b4ee928febd44d98f2f459a4a79bd4d928591333a494a10a868418ac1b39cf1f" dependencies = [ "either", "home", - "once_cell", "rustix 0.38.34", - "windows-sys 0.48.0", + "winsafe", ] [[package]] @@ -6746,6 +6741,12 @@ dependencies = [ "memchr", ] +[[package]] +name = "winsafe" +version = "0.0.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d135d17ab770252ad95e9a872d365cf3090e3be864a34ab46f48555993efc904" + [[package]] name = "wyz" version = "0.5.1" @@ -6796,7 +6797,7 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.77", ] [[package]] @@ -6816,7 +6817,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.77", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 4f880a8db9..196606148a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -70,7 +70,7 @@ bitvec = { version = "1", default-features = false } blake2 = { version = "0.10.6", default-features = false } clap = { version = "4.5.18", features = ["derive", "cargo"] } cfg-if = "1.0.0" -criterion = "0.4" +criterion = "0.5.1" codec = { package = "parity-scale-codec", version = "3.6.9", default-features = false } color-eyre = "0.6.3" console_error_panic_hook = "0.1.7" @@ -102,7 +102,7 @@ scale-typegen = "0.8.0" scale-typegen-description = "0.8.0" serde = { version = "1.0.210", default-features = false, features = ["derive"] } serde_json = { version = "1.0.128", default-features = false } -syn = { version = "2.0.15", features = ["full", "extra-traits"] } +syn = { version = "2.0.77", features = ["full", "extra-traits"] } thiserror = "1.0.64" tokio = { version = "1.40", default-features = false } tracing = { version = "0.1.40", default-features = false } @@ -112,7 +112,7 @@ trybuild = "1.0.99" url = "2.5.2" wabt = "0.10.0" wasm-bindgen-test = "0.3.24" -which = "5.0.0" +which = "6.0.3" strip-ansi-escapes = "0.2.0" proptest = "1.5.0" hex-literal = "0.4.1" @@ -140,7 +140,7 @@ tokio-util = "0.7.12" # Substrate crates: sp-core = { version = "34.0.0", default-features = false } sp-crypto-hashing = { version = "0.1.0", default-features = false } -sp-runtime = "39.0.0" +sp-runtime = "39.0.1" sp-keyring = "39.0.0" sp-maybe-compressed-blob = "11.0.0" sp-state-machine = "0.43.0" @@ -163,16 +163,15 @@ bip32 = { version = "0.5.2", default-features = false } hmac = { version = "0.12.1", default-features = false } pbkdf2 = { version = "0.12.2", default-features = false } schnorrkel = { version = "0.11.4", default-features = false } -secp256k1 = { version = "0.28.2", default-features = false } -keccak-hash = { version = "0.10.0", default-features = false } -secrecy = "0.8.0" +secp256k1 = { version = "0.29.1", default-features = false } +keccak-hash = { version = "0.11.0", default-features = false } +secrecy = "0.10.2" sha2 = { version = "0.10.8", default-features = false } zeroize = { version = "1", default-features = false } base64 = { version = "0.22.1", default-features = false } scrypt = { version = "0.11.0", default-features = false } crypto_secretbox = { version = "0.1.1", default-features = false } - [profile.dev.package.smoldot-light] opt-level = 2 [profile.test.package.smoldot-light] diff --git a/signer/src/crypto/secret_uri.rs b/signer/src/crypto/secret_uri.rs index dd287d2874..0d93db202e 100644 --- a/signer/src/crypto/secret_uri.rs +++ b/signer/src/crypto/secret_uri.rs @@ -5,7 +5,7 @@ use core::fmt::Display; use super::DeriveJunction; -use alloc::vec::Vec; +use alloc::{string::ToString, vec::Vec}; use regex::Regex; use secrecy::SecretString; @@ -108,10 +108,8 @@ impl core::str::FromStr for SecretUri { let password = cap.name("password"); Ok(Self { - phrase: SecretString::from_str(phrase).expect("Returns infallible error; qed"), - password: password.map(|v| { - SecretString::from_str(v.as_str()).expect("Returns infallible error; qed") - }), + phrase: SecretString::from(phrase.to_string()), + password: password.map(|v| SecretString::from(v.as_str().to_string())), junctions, }) } diff --git a/signer/src/ecdsa.rs b/signer/src/ecdsa.rs index e7c6c657d3..89e128f680 100644 --- a/signer/src/ecdsa.rs +++ b/signer/src/ecdsa.rs @@ -69,8 +69,8 @@ impl Keypair { let seed = SecretKeyBytes::from_hex(hex_str)?; Self::from_secret_key(seed)? } else { - let phrase = bip39::Mnemonic::from_str(phrase.expose_secret().as_str())?; - let pass_str = password.as_ref().map(|p| p.expose_secret().as_str()); + let phrase = bip39::Mnemonic::from_str(phrase.expose_secret())?; + let pass_str = password.as_ref().map(|p| p.expose_secret()); Self::from_phrase(&phrase, pass_str)? }; diff --git a/signer/src/sr25519.rs b/signer/src/sr25519.rs index 6442e3990e..d70e0b1b8f 100644 --- a/signer/src/sr25519.rs +++ b/signer/src/sr25519.rs @@ -75,8 +75,8 @@ impl Keypair { let seed = SecretKeyBytes::from_hex(hex_str)?; Self::from_secret_key(seed)? } else { - let phrase = bip39::Mnemonic::from_str(phrase.expose_secret().as_str())?; - let pass_str = password.as_ref().map(|p| p.expose_secret().as_str()); + let phrase = bip39::Mnemonic::from_str(phrase.expose_secret())?; + let pass_str = password.as_ref().map(|p| p.expose_secret()); Self::from_phrase(&phrase, pass_str)? };