From 038868c787ef7bd3dced13611f94e2e73fe9caf4 Mon Sep 17 00:00:00 2001 From: Thibault Martinez Date: Thu, 16 Jun 2022 14:14:28 +0200 Subject: [PATCH] Bump wallet revision --- Cargo.lock | 349 +++++++++++++++++++++++++++++------------------------ Cargo.toml | 12 +- 2 files changed, 197 insertions(+), 164 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9a9fd60..e8c6953 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -87,13 +87,13 @@ checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" [[package]] name = "async-trait" -version = "0.1.53" +version = "0.1.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed6aa3524a2dfcf9fe180c51eae2b58738348d819517ceadf95789c51fff7600" +checksum = "96cf8829f67d2eab0b2dfa42c5d0ef737e0724e4a82b01b3e292456202b19716" dependencies = [ "proc-macro2 1.0.39", "quote 1.0.18", - "syn 1.0.95", + "syn 1.0.96", ] [[package]] @@ -136,27 +136,27 @@ checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" [[package]] name = "bech32" -version = "0.8.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9ff0bbfd639f15c74af777d81383cf53efb7c93613f6cab67c6c11e05bbf8b" +checksum = "c5738be7561b0eeb501ef1d5c5db3f24e01ceb55fededd9b00039aada34966ad" [[package]] name = "bee-block" version = "0.1.0" -source = "git+https://github.com/iotaledger/bee?rev=c67092169135df3ea67d874b00201d8ec3390599#c67092169135df3ea67d874b00201d8ec3390599" +source = "git+https://github.com/iotaledger/bee?rev=bdc6a94b0248861474817059e15543d5c29b0d72#bdc6a94b0248861474817059e15543d5c29b0d72" dependencies = [ "bech32", "bee-pow", - "bee-ternary 0.6.0", + "bee-ternary", "bitflags", "bytemuck", "derive_more", "hashbrown 0.12.1", "hex", - "iota-crypto 0.10.0", + "iota-crypto 0.12.1", "iterator-sorted", "packable", - "prefix-hex 0.2.0", + "prefix-hex", "primitive-types", "serde 1.0.137", "serde-big-array", @@ -167,7 +167,7 @@ dependencies = [ [[package]] name = "bee-ledger" version = "0.7.0" -source = "git+https://github.com/iotaledger/bee?rev=c67092169135df3ea67d874b00201d8ec3390599#c67092169135df3ea67d874b00201d8ec3390599" +source = "git+https://github.com/iotaledger/bee?rev=bdc6a94b0248861474817059e15543d5c29b0d72#bdc6a94b0248861474817059e15543d5c29b0d72" dependencies = [ "bee-block", "packable", @@ -178,17 +178,17 @@ dependencies = [ [[package]] name = "bee-pow" version = "0.2.0" -source = "git+https://github.com/iotaledger/bee?rev=c67092169135df3ea67d874b00201d8ec3390599#c67092169135df3ea67d874b00201d8ec3390599" +source = "git+https://github.com/iotaledger/bee?rev=bdc6a94b0248861474817059e15543d5c29b0d72#bdc6a94b0248861474817059e15543d5c29b0d72" dependencies = [ - "bee-ternary 0.6.0", - "iota-crypto 0.10.0", + "bee-ternary", + "iota-crypto 0.12.1", "thiserror", ] [[package]] name = "bee-rest-api" version = "0.2.2" -source = "git+https://github.com/iotaledger/bee?rev=c67092169135df3ea67d874b00201d8ec3390599#c67092169135df3ea67d874b00201d8ec3390599" +source = "git+https://github.com/iotaledger/bee?rev=bdc6a94b0248861474817059e15543d5c29b0d72#bdc6a94b0248861474817059e15543d5c29b0d72" dependencies = [ "bee-block", "bee-ledger", @@ -201,16 +201,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "bee-ternary" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e8479555c8e9bf3cad36daf16e6a2f77771774e977276a08df4d8ac5f1dda66" -dependencies = [ - "autocfg", - "num-traits 0.2.15", -] - [[package]] name = "bee-ternary" version = "0.6.0" @@ -258,9 +248,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitvec" -version = "0.20.4" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7774144344a4faa177370406a7ff5f1da24303817368584c6206c8303eb07848" +checksum = "1489fcb93a5bb47da0462ca93ad252ad6af2145cce58d10d46a83931ba9f016b" dependencies = [ "funty", "radium", @@ -275,10 +265,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0a4e37d16930f5459780f5621038b6382b9bb37c19016f39fb6b5808d831f174" dependencies = [ "crypto-mac 0.8.0", - "digest", + "digest 0.9.0", "opaque-debug", ] +[[package]] +name = "blake2" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9cf849ee05b2ee5fba5e36f97ff8ec2533916700fc0758d40d92136a42f3388" +dependencies = [ + "digest 0.10.3", +] + [[package]] name = "block-buffer" version = "0.9.0" @@ -288,6 +287,15 @@ dependencies = [ "generic-array", ] +[[package]] +name = "block-buffer" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bf7fe51849ea569fd452f37822f606a5cabb684dc918707a0193fd4664ff324" +dependencies = [ + "generic-array", +] + [[package]] name = "bs58" version = "0.4.0" @@ -425,51 +433,51 @@ dependencies = [ [[package]] name = "clap" -version = "3.1.18" +version = "3.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2dbdf4bdacb33466e854ce889eee8dfd5729abf7ccd7664d0a2d60cd384440b" +checksum = "d53da17d37dba964b9b3ecb5c5a1f193a2762c700e6829201e645b9381c99dc7" dependencies = [ "bitflags", "clap_derive", "clap_lex", "indexmap", - "lazy_static", + "once_cell", "textwrap", ] [[package]] name = "clap_derive" -version = "3.1.18" +version = "3.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25320346e922cffe59c0bbc5410c8d8784509efb321488971081313cb1e1a33c" +checksum = "c11d40217d16aee8508cc8e5fde8b4ff24639758608e5374e731b53f85749fb9" dependencies = [ "heck", "proc-macro-error", "proc-macro2 1.0.39", "quote 1.0.18", - "syn 1.0.95", + "syn 1.0.96", ] [[package]] name = "clap_lex" -version = "0.2.0" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a37c35f1112dad5e6e0b1adaff798507497a18fceeb30cceb3bae7d1427b9213" +checksum = "5538cd660450ebeb4234cfecf8f2284b844ffc4c50531e66d584ad5b91293613" dependencies = [ "os_str_bytes", ] [[package]] name = "cli-wallet" -version = "1.0.0-alpha.2" +version = "1.0.0-alpha.3" dependencies = [ "clap", "dialoguer", "fern-logger", - "iota-crypto 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", + "iota-crypto 0.12.1", "iota-wallet", "log", - "prefix-hex 0.4.0", + "prefix-hex", "thiserror", "tokio", ] @@ -571,6 +579,16 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" +[[package]] +name = "crypto-common" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57952ca27b5e3606ff4dd79b0020231aaf9d6aa76dc05fd30137538c50bd3ce8" +dependencies = [ + "generic-array", + "typenum", +] + [[package]] name = "crypto-mac" version = "0.8.0" @@ -598,7 +616,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b9fdf9972b2bd6af2d913799d9ebc165ea4d2e65878e329d9c6b372c4491b61" dependencies = [ "byteorder", - "digest", + "digest 0.9.0", "rand_core 0.5.1", "subtle", "zeroize", @@ -625,7 +643,7 @@ dependencies = [ "proc-macro2 1.0.39", "quote 1.0.18", "strsim", - "syn 1.0.95", + "syn 1.0.96", ] [[package]] @@ -636,7 +654,7 @@ checksum = "ddfc69c5bfcbd2fc09a0f38451d2daf0e372e367986a83906d1b0dbc88134fb5" dependencies = [ "darling_core", "quote 1.0.18", - "syn 1.0.95", + "syn 1.0.96", ] [[package]] @@ -674,7 +692,7 @@ dependencies = [ "darling", "proc-macro2 1.0.39", "quote 1.0.18", - "syn 1.0.95", + "syn 1.0.96", ] [[package]] @@ -684,7 +702,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f0314b72bed045f3a68671b3c86328386762c93f82d98c65c3cb5e5f573dd68" dependencies = [ "derive_builder_core", - "syn 1.0.95", + "syn 1.0.96", ] [[package]] @@ -695,7 +713,7 @@ checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" dependencies = [ "proc-macro2 1.0.39", "quote 1.0.18", - "syn 1.0.95", + "syn 1.0.96", ] [[package]] @@ -717,6 +735,17 @@ dependencies = [ "generic-array", ] +[[package]] +name = "digest" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2fb860ca6fafa5552fb6d0e816a69c8e49f0908bf524e30a90d97c85892d506" +dependencies = [ + "block-buffer 0.10.2", + "crypto-common", + "subtle", +] + [[package]] name = "dirs-next" version = "2.0.0" @@ -747,10 +776,24 @@ dependencies = [ "curve25519-dalek", "hex", "rand_core 0.5.1", - "sha2", + "sha2 0.9.9", "thiserror", ] +[[package]] +name = "ed25519-zebra" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "403ef3e961ab98f0ba902771d29f842058578bb1ce7e3c59dad5a6a93e784c69" +dependencies = [ + "curve25519-dalek", + "hex", + "rand_core 0.6.3", + "sha2 0.9.9", + "thiserror", + "zeroize", +] + [[package]] name = "encode_unicode" version = "0.3.6" @@ -819,9 +862,9 @@ dependencies = [ [[package]] name = "funty" -version = "1.1.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7" +checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[package]] name = "futures" @@ -880,7 +923,7 @@ checksum = "33c1e13800337f4d4d7a316bf45a567dbcb6ffe087f16424852d97e97a91f512" dependencies = [ "proc-macro2 1.0.39", "quote 1.0.18", - "syn 1.0.95", + "syn 1.0.96", ] [[package]] @@ -956,7 +999,7 @@ dependencies = [ "proc-macro-error", "proc-macro2 1.0.39", "quote 1.0.18", - "syn 1.0.95", + "syn 1.0.96", ] [[package]] @@ -1045,7 +1088,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2a2a2320eb7ec0ebe8da8f744d7812d9fc4cb4d09344ac01898dbcb6a20ae69b" dependencies = [ "crypto-mac 0.11.1", - "digest", + "digest 0.9.0", +] + +[[package]] +name = "hmac" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" +dependencies = [ + "digest 0.10.3", ] [[package]] @@ -1138,9 +1190,9 @@ dependencies = [ [[package]] name = "impl-codec" -version = "0.5.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "161ebdfec3c8e3b52bf61c4f3550a1eea4f9579d10dc1b936f3171ebdcd6c443" +checksum = "ba6a270039626615617f3f36d15fc827041df3b78c439da2cadfa47455a77f2f" dependencies = [ "parity-scale-codec", ] @@ -1162,7 +1214,7 @@ checksum = "11d7a9f6330b71fea57921c9b61c47ee6e84f72d394754eff6163ae67e7395eb" dependencies = [ "proc-macro2 1.0.39", "quote 1.0.18", - "syn 1.0.95", + "syn 1.0.96", ] [[package]] @@ -1187,20 +1239,21 @@ dependencies = [ [[package]] name = "iota-client" version = "1.1.1" -source = "git+https://github.com/iotaledger/iota.rs?rev=69bf6d1a8f1c9bfd6800a7be399187068416fb91#69bf6d1a8f1c9bfd6800a7be399187068416fb91" +source = "git+https://github.com/iotaledger/iota.rs?rev=f68aa2a2c903239bccd015e382d21ed1000cc452#f68aa2a2c903239bccd015e382d21ed1000cc452" dependencies = [ "async-trait", + "backtrace", "bee-block", "bee-pow", "bee-rest-api", - "bee-ternary 0.5.2", + "bee-ternary", "derive_builder", "fern-logger", "futures", "gloo-timers", "hex", "instant", - "iota-crypto 0.11.0 (git+https://github.com/iotaledger/crypto.rs?rev=c61d29253930105d0d589e54829b639427061e81)", + "iota-crypto 0.12.1", "iota-crypto 0.5.1", "iota_stronghold", "log", @@ -1211,7 +1264,6 @@ dependencies = [ "riker", "serde 1.0.137", "serde_json", - "slog-stdlog", "thiserror", "tokio", "url", @@ -1225,69 +1277,38 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cccb8160eb8a88434fb3a0a3fc852e625aceab6c0272f0f03cc3f47c125bceab" dependencies = [ "aead", - "blake2", + "blake2 0.9.2", "chacha20poly1305", - "digest", - "ed25519-zebra", + "digest 0.9.0", + "ed25519-zebra 2.2.0", "generic-array", "getrandom 0.2.6", - "hmac", - "pbkdf2", + "hmac 0.11.0", + "pbkdf2 0.8.0", "serde 1.0.137", - "sha2", + "sha2 0.9.9", "unicode-normalization", "x25519-dalek", ] [[package]] name = "iota-crypto" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1689fd8524d3516d499a94267f593ba9c984e31762a278ef66ce60d6621d16ff" -dependencies = [ - "bee-ternary 0.6.0", - "blake2", - "digest", - "ed25519-zebra", - "lazy_static", -] - -[[package]] -name = "iota-crypto" -version = "0.11.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95d41f0f3739c8fd4513ab24e8643786d3673bb55c4a07be3ec95b4cac751f7e" +checksum = "f03717e934972fad6f1c9b4cd25f662e1753b58a7f76e3dceadeb646e034b252" dependencies = [ "aead", - "blake2", + "bee-ternary", + "blake2 0.10.4", "chacha20poly1305", - "digest", - "ed25519-zebra", + "digest 0.10.3", + "ed25519-zebra 3.0.0", "generic-array", "getrandom 0.2.6", - "hmac", - "pbkdf2", + "hmac 0.12.1", + "pbkdf2 0.11.0", "serde 1.0.137", - "sha2", - "unicode-normalization", -] - -[[package]] -name = "iota-crypto" -version = "0.11.0" -source = "git+https://github.com/iotaledger/crypto.rs?rev=c61d29253930105d0d589e54829b639427061e81#c61d29253930105d0d589e54829b639427061e81" -dependencies = [ - "aead", - "blake2", - "chacha20poly1305", - "digest", - "ed25519-zebra", - "generic-array", - "getrandom 0.2.6", - "hmac", - "pbkdf2", - "serde 1.0.137", - "sha2", + "sha2 0.10.2", "unicode-normalization", "zeroize", ] @@ -1295,7 +1316,7 @@ dependencies = [ [[package]] name = "iota-wallet" version = "0.2.0" -source = "git+https://github.com/iotaledger/wallet.rs?rev=b61a4ad263315a2809b52181a101b7fccad5d804#b61a4ad263315a2809b52181a101b7fccad5d804" +source = "git+https://github.com/iotaledger/wallet.rs?rev=0bcc9c467f67385c7ce04e6ccb51d1b1eb5d02a2#0bcc9c467f67385c7ce04e6ccb51d1b1eb5d02a2" dependencies = [ "async-trait", "backtrace", @@ -1303,7 +1324,7 @@ dependencies = [ "getset", "hex", "iota-client", - "iota-crypto 0.11.0 (git+https://github.com/iotaledger/crypto.rs?rev=c61d29253930105d0d589e54829b639427061e81)", + "iota-crypto 0.12.1", "log", "packable", "primitive-types", @@ -1375,9 +1396,6 @@ name = "lazy_static" version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" -dependencies = [ - "spin", -] [[package]] name = "lazycell" @@ -1559,7 +1577,7 @@ dependencies = [ "proc-macro-error", "proc-macro2 1.0.39", "quote 1.0.18", - "syn 1.0.95", + "syn 1.0.96", "synstructure", ] @@ -1642,9 +1660,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.10.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f3e037eac156d1775da914196f0f37741a274155e34a0b7e427c35d2a2ecb9" +checksum = "7709cef83f0c1f58f666e746a08b21e0085f7440fa6a29cc194d68aac97a4225" [[package]] name = "opaque-debug" @@ -1660,9 +1678,9 @@ checksum = "029d8d0b2f198229de29dca79676f2738ff952edf3fde542eb8bf94d8c21b435" [[package]] name = "packable" -version = "0.3.3" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ba68b40fa9b816f4bba41799ace47d683ee7c1c8a93b0bf7c449c1acd35ecbe" +checksum = "332ecf21e38a8f3afce70f005b638c67759686a5e3e12d1859c56d0687f164d3" dependencies = [ "autocfg", "packable-derive", @@ -1672,22 +1690,22 @@ dependencies = [ [[package]] name = "packable-derive" -version = "0.3.3" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49ac147a716456f01535d90ead1fa84341886a5ee764c86690937e59335c928d" +checksum = "7cfe1637c03253dfa99917b97dcb646a540cad292b18fdc72e9a0d0dd29f165e" dependencies = [ "proc-macro-crate", "proc-macro-error", "proc-macro2 1.0.39", "quote 1.0.18", - "syn 1.0.95", + "syn 1.0.96", ] [[package]] name = "parity-scale-codec" -version = "2.3.1" +version = "3.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "373b1a4c1338d9cd3d1fa53b3a11bdab5ab6bd80a20f7f7becd76953ae2be909" +checksum = "9182e4a71cae089267ab03e67c99368db7cd877baf50f931e5d6d4b71e195ac0" dependencies = [ "arrayvec 0.7.2", "bitvec", @@ -1699,14 +1717,14 @@ dependencies = [ [[package]] name = "parity-scale-codec-derive" -version = "2.3.1" +version = "3.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1557010476e0595c9b568d16dcfb81b93cdeb157612726f5170d31aa707bed27" +checksum = "9299338969a3d2f491d65f140b00ddec470858402f888af98e8642fb5e8965cd" dependencies = [ "proc-macro-crate", "proc-macro2 1.0.39", "quote 1.0.18", - "syn 1.0.95", + "syn 1.0.96", ] [[package]] @@ -1724,6 +1742,15 @@ dependencies = [ "crypto-mac 0.11.1", ] +[[package]] +name = "pbkdf2" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" +dependencies = [ + "digest 0.10.3", +] + [[package]] name = "peeking_take_while" version = "0.1.2" @@ -1771,17 +1798,6 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" -[[package]] -name = "prefix-hex" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f120947380f07a50dd8d9985d3591f6632d688b8060321c3783aac91fa902c7" -dependencies = [ - "hex", - "primitive-types", - "uint", -] - [[package]] name = "prefix-hex" version = "0.4.0" @@ -1789,13 +1805,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a85165b6848fe5328066d5cb934dd5c88ff09674db6fcd018df68d9a542b2317" dependencies = [ "hex", + "primitive-types", + "uint", ] [[package]] name = "primitive-types" -version = "0.10.1" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05e4722c697a58a99d5d06a08c30821d7c082a4632198de1eaa5a6c22ef42373" +checksum = "e28720988bff275df1f51b171e1b2a18c30d194c4d2b61defdacecd625a5d94a" dependencies = [ "fixed-hash", "impl-codec", @@ -1822,7 +1840,7 @@ dependencies = [ "proc-macro-error-attr", "proc-macro2 1.0.39", "quote 1.0.18", - "syn 1.0.95", + "syn 1.0.96", "version_check", ] @@ -1881,9 +1899,9 @@ dependencies = [ [[package]] name = "radium" -version = "0.6.2" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "643f8f41a8ebc4c5dc4515c82bb8abd397b527fc20fd681b7c011c2aee5d44fb" +checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" [[package]] name = "rand" @@ -1995,9 +2013,9 @@ checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" [[package]] name = "reqwest" -version = "0.11.10" +version = "0.11.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46a1f7aa4f35e5e8b4160449f51afc758f0ce6454315a9fa7d0d113e958c41eb" +checksum = "b75aa69a3f06bbcc66ede33af2af253c6f7a86b1ca0033f60c580a27074fbf92" dependencies = [ "base64", "bytes", @@ -2023,6 +2041,7 @@ dependencies = [ "serde_urlencoded", "tokio", "tokio-rustls", + "tower-service", "url", "wasm-bindgen", "wasm-bindgen-futures", @@ -2125,9 +2144,9 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "0.3.0" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ee86d63972a7c661d1536fefe8c3c8407321c3df668891286de28abcd087360" +checksum = "e7522c9de787ff061458fe9a829dc790a3f5b22dc571694fc5883f448b94d9a9" dependencies = [ "base64", ] @@ -2202,7 +2221,7 @@ checksum = "1f26faba0c3959972377d3b2d306ee9f71faee9714294e41bb777f83f88578be" dependencies = [ "proc-macro2 1.0.39", "quote 1.0.18", - "syn 1.0.95", + "syn 1.0.96", ] [[package]] @@ -2243,13 +2262,24 @@ version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" dependencies = [ - "block-buffer", + "block-buffer 0.9.0", "cfg-if 1.0.0", "cpufeatures 0.2.2", - "digest", + "digest 0.9.0", "opaque-debug", ] +[[package]] +name = "sha2" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55deaec60f81eefe3cce0dc50bda92d6d8e88f2a27df7c5033b42afeb1ed2676" +dependencies = [ + "cfg-if 1.0.0", + "cpufeatures 0.2.2", + "digest 0.10.3", +] + [[package]] name = "shlex" version = "1.1.0" @@ -2320,7 +2350,7 @@ checksum = "1eec7338a29758185dc796de8847e078b9bc2f5880c02f7a7b34b13f04d31a23" dependencies = [ "proc-macro2 1.0.39", "quote 1.0.18", - "syn 1.0.95", + "syn 1.0.96", ] [[package]] @@ -2387,9 +2417,9 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.95" +version = "1.0.96" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbaf6116ab8924f39d52792136fb74fd60a80194cf1b1c6ffa6453eef1c3f942" +checksum = "0748dd251e24453cb8717f0354206b91557e4ec8703673a4b30208f2abaf1ebf" dependencies = [ "proc-macro2 1.0.39", "quote 1.0.18", @@ -2404,7 +2434,7 @@ checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" dependencies = [ "proc-macro2 1.0.39", "quote 1.0.18", - "syn 1.0.95", + "syn 1.0.96", "unicode-xid 0.2.3", ] @@ -2447,7 +2477,7 @@ checksum = "0396bc89e626244658bef819e22d0cc459e795a5ebe878e6ec336d1674a8d79a" dependencies = [ "proc-macro2 1.0.39", "quote 1.0.18", - "syn 1.0.95", + "syn 1.0.96", ] [[package]] @@ -2506,9 +2536,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.18.2" +version = "1.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4903bf0427cf68dddd5aa6a93220756f8be0c34fcfa9f5e6191e103e15a31395" +checksum = "c51a52ed6686dd62c320f9b89299e9dfb46f730c7a48e635c19f21d116cb1439" dependencies = [ "bytes", "libc", @@ -2530,7 +2560,7 @@ checksum = "b557f72f448c511a979e2564e55d74e6c4432fc96ff4f6241bc6bded342643b7" dependencies = [ "proc-macro2 1.0.39", "quote 1.0.18", - "syn 1.0.95", + "syn 1.0.96", ] [[package]] @@ -2593,7 +2623,7 @@ checksum = "cc6b8ad3567499f98a1db7a752b07a7c8c7c7c34c332ec00effb2b0027974b7c" dependencies = [ "proc-macro2 1.0.39", "quote 1.0.18", - "syn 1.0.95", + "syn 1.0.96", ] [[package]] @@ -2784,7 +2814,7 @@ dependencies = [ "log", "proc-macro2 1.0.39", "quote 1.0.18", - "syn 1.0.95", + "syn 1.0.96", "wasm-bindgen-shared", ] @@ -2818,7 +2848,7 @@ checksum = "99ec0dc7a4756fffc231aab1b9f2f578d23cd391390ab27f952ae0c9b3ece20b" dependencies = [ "proc-macro2 1.0.39", "quote 1.0.18", - "syn 1.0.95", + "syn 1.0.96", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -2943,9 +2973,12 @@ dependencies = [ [[package]] name = "wyz" -version = "0.2.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214" +checksum = "30b31594f29d27036c383b53b59ed3476874d518f0efb151b27a4c275141390e" +dependencies = [ + "tap", +] [[package]] name = "x25519-dalek" @@ -2984,6 +3017,6 @@ checksum = "3f8f187641dad4f680d25c4bfc4225b418165984179f26ca76ec4fb6441d3a17" dependencies = [ "proc-macro2 1.0.39", "quote 1.0.18", - "syn 1.0.95", + "syn 1.0.96", "synstructure", ] diff --git a/Cargo.toml b/Cargo.toml index 9b0115c..bd65fa8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cli-wallet" -version = "1.0.0-alpha.2" +version = "1.0.0-alpha.3" authors = [ "IOTA Stiftung" ] edition = "2021" homepage = "https://iota.org" @@ -12,15 +12,15 @@ name = "wallet" path = "src/main.rs" [dependencies] -clap = { version = "3.1.18", default-features = false, features = [ "derive", "std" ] } +clap = { version = "3.2.5", default-features = false, features = [ "derive", "std" ] } dialoguer = { version = "0.10.1", default-features = false, features = [ "password" ] } fern-logger = { version = "0.5.0", default-features = false } -iota-crypto = { version = "0.11.0", default-features = false, features = [ "std", "random", "sha", "pbkdf", "hmac", "bip39", "bip39-en", "chacha", "blake2b", "slip10" ] } -iota-wallet = { git = "https://github.com/iotaledger/wallet.rs", rev = "b61a4ad263315a2809b52181a101b7fccad5d804", default-features = false, features = [ "storage", "stronghold" ] } +iota-crypto = { version = "0.12.1", default-features = false, features = [ "std", "random", "sha", "pbkdf", "hmac", "bip39", "bip39-en", "chacha", "blake2b", "slip10" ] } +iota-wallet = { git = "https://github.com/iotaledger/wallet.rs", rev = "0bcc9c467f67385c7ce04e6ccb51d1b1eb5d02a2", default-features = false, features = [ "storage", "stronghold" ] } log = { version = "0.4.17", default-features = false } prefix-hex = { version = "0.4.0", default-features = false, features = [ "std" ] } -thiserror = { version = "1.0.31" , default-features = false } -tokio = { version = "1.18.2", default-features = false } +thiserror = { version = "1.0.31", default-features = false } +tokio = { version = "1.19.2", default-features = false } [profile.release] panic = "abort"