From 9a8046deec55c72963760b682638f9b2391ffb48 Mon Sep 17 00:00:00 2001 From: Thoralf-M Date: Sun, 17 Jul 2022 21:26:17 +0200 Subject: [PATCH] Update to latest wallet rev --- Cargo.lock | 161 +++++++++++++++------------------ Cargo.toml | 8 +- src/command/account.rs | 2 +- src/command/account_manager.rs | 2 +- src/error.rs | 2 +- 5 files changed, 80 insertions(+), 95 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 47bfdac..089bf0f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -120,7 +120,6 @@ dependencies = [ "bitflags", "bytes", "futures-util", - "headers", "http", "http-body", "hyper", @@ -156,9 +155,9 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.65" +version = "0.3.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11a17d453482a265fd5f8479f2a3f405566e6ca627837aaddb85af8b1ab8ef61" +checksum = "cab84319d616cfb654d03394f38ab7e6f0919e181b1b57e1fd15e7fb4077d9a7" dependencies = [ "addr2line", "cc", @@ -181,10 +180,22 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c5738be7561b0eeb501ef1d5c5db3f24e01ceb55fededd9b00039aada34966ad" +[[package]] +name = "bee-api-types" +version = "1.0.0-alpha.1" +source = "git+https://github.com/iotaledger/bee?rev=ff52b003a2c3845e2987d23487a696af106c053c#ff52b003a2c3845e2987d23487a696af106c053c" +dependencies = [ + "axum", + "bee-block", + "bee-ledger-types", + "serde", + "thiserror", +] + [[package]] name = "bee-block" version = "0.1.0" -source = "git+https://github.com/iotaledger/bee?rev=3b66992a29ca6d4434a3af08562b197b14c21541#3b66992a29ca6d4434a3af08562b197b14c21541" +source = "git+https://github.com/iotaledger/bee?rev=ff52b003a2c3845e2987d23487a696af106c053c#ff52b003a2c3845e2987d23487a696af106c053c" dependencies = [ "bech32", "bee-pow", @@ -194,7 +205,7 @@ dependencies = [ "derive_more", "hashbrown 0.12.1", "hex", - "iota-crypto 0.12.1", + "iota-crypto 0.13.0", "iterator-sorted", "packable", "prefix-hex", @@ -206,43 +217,31 @@ dependencies = [ ] [[package]] -name = "bee-ledger" -version = "0.7.0" -source = "git+https://github.com/iotaledger/bee?rev=3b66992a29ca6d4434a3af08562b197b14c21541#3b66992a29ca6d4434a3af08562b197b14c21541" +name = "bee-ledger-types" +version = "1.0.0-alpha.1" +source = "git+https://github.com/iotaledger/bee?rev=ff52b003a2c3845e2987d23487a696af106c053c#ff52b003a2c3845e2987d23487a696af106c053c" dependencies = [ "bee-block", "packable", "thiserror", - "time-helper", ] [[package]] name = "bee-pow" -version = "0.2.0" -source = "git+https://github.com/iotaledger/bee?rev=3b66992a29ca6d4434a3af08562b197b14c21541#3b66992a29ca6d4434a3af08562b197b14c21541" +version = "1.0.0-alpha.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8e36e724dc98f8671c4f674b8419785def4ea81ad7af4fba061ff11724210c1" dependencies = [ "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=3b66992a29ca6d4434a3af08562b197b14c21541#3b66992a29ca6d4434a3af08562b197b14c21541" -dependencies = [ - "axum", - "bee-block", - "bee-ledger", - "serde", + "iota-crypto 0.13.0", "thiserror", ] [[package]] name = "bee-ternary" -version = "0.6.0" +version = "1.0.0-alpha.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0b9489a68e42231e9f4f1443c765d3f80433a52101510ab413e6a9cd2240d21" +checksum = "a9252b65ddd9a863b0efc06ddab6c26334ecbe00fb8fa47bbde10babda2981b2" dependencies = [ "autocfg", "num-traits", @@ -481,12 +480,12 @@ dependencies = [ [[package]] name = "cli-wallet" -version = "1.0.0-alpha.7" +version = "1.0.0-alpha.8" dependencies = [ "clap", "dialoguer", "fern-logger", - "iota-crypto 0.12.1", + "iota-crypto 0.13.0", "iota-wallet", "log", "prefix-hex", @@ -1012,31 +1011,6 @@ dependencies = [ "ahash", ] -[[package]] -name = "headers" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cff78e5788be1e0ab65b04d306b2ed5092c815ec97ec70f4ebd5aee158aa55d" -dependencies = [ - "base64", - "bitflags", - "bytes", - "headers-core", - "http", - "httpdate", - "mime", - "sha-1", -] - -[[package]] -name = "headers-core" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429" -dependencies = [ - "http", -] - [[package]] name = "heck" version = "0.4.0" @@ -1221,20 +1195,20 @@ dependencies = [ [[package]] name = "iota-client" version = "1.1.1" -source = "git+https://github.com/iotaledger/iota.rs?rev=c559768b450e218c3fbea56964300f92300513bb#c559768b450e218c3fbea56964300f92300513bb" +source = "git+https://github.com/iotaledger/iota.rs?rev=d090915dc94d6efa5d9c28ea8de1c13fc9e722ce#d090915dc94d6efa5d9c28ea8de1c13fc9e722ce" dependencies = [ "async-trait", "backtrace", + "bee-api-types", "bee-block", "bee-pow", - "bee-rest-api", "bee-ternary", "derive_builder", "futures", "gloo-timers", "hex", "instant", - "iota-crypto 0.12.1", + "iota-crypto 0.13.0", "iota_stronghold", "log", "num_cpus", @@ -1268,7 +1242,6 @@ dependencies = [ "aead", "aes", "aes-gcm", - "bee-ternary", "blake2 0.10.4", "chacha20poly1305", "curve25519-dalek", @@ -1285,10 +1258,32 @@ dependencies = [ "zeroize", ] +[[package]] +name = "iota-crypto" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "538b238fbd6fa732f526f6401656fa6a366598b9fe1ca35185e47f3978369707" +dependencies = [ + "aead", + "bee-ternary", + "blake2 0.10.4", + "chacha20poly1305", + "digest 0.10.3", + "ed25519-zebra", + "generic-array", + "getrandom 0.2.6", + "hmac", + "pbkdf2", + "serde", + "sha2 0.10.2", + "unicode-normalization", + "zeroize", +] + [[package]] name = "iota-wallet" version = "0.2.0" -source = "git+https://github.com/iotaledger/wallet.rs?rev=73b404144b9912fc96e6c677248cb362521e8797#73b404144b9912fc96e6c677248cb362521e8797" +source = "git+https://github.com/iotaledger/wallet.rs?rev=d4409fbff4927c998a70f49e60bd8895f4f81b37#d4409fbff4927c998a70f49e60bd8895f4f81b37" dependencies = [ "async-trait", "backtrace", @@ -1296,7 +1291,7 @@ dependencies = [ "getset", "hex", "iota-client", - "iota-crypto 0.12.1", + "iota-crypto 0.13.0", "log", "packable", "primitive-types", @@ -1310,9 +1305,9 @@ dependencies = [ [[package]] name = "iota_stronghold" -version = "0.7.1" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accb70f9b93c493b2d19fcc65a0c0e3cd3a79ed48caddf90c76c18b38887a445" +checksum = "241111d0e7fa6740c89e3355e0570f761445e561cb31a4d49ef784ee5ef99f0e" dependencies = [ "bincode", "hkdf", @@ -1527,9 +1522,9 @@ dependencies = [ [[package]] name = "object" -version = "0.28.4" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e42c982f2d955fac81dd7e1d0e1426a7d702acd9c98d19ab01083a6a0328c424" +checksum = "21158b2c33aa6d4561f1c0a6ea283ca92bc54802a93b263e910746d679a7eb53" dependencies = [ "memchr", ] @@ -1554,9 +1549,9 @@ checksum = "029d8d0b2f198229de29dca79676f2738ff952edf3fde542eb8bf94d8c21b435" [[package]] name = "packable" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "332ecf21e38a8f3afce70f005b638c67759686a5e3e12d1859c56d0687f164d3" +checksum = "ffe491a88c5c4c77f5e02c92901c011ec4368e4ea1b4aff5c1a4bdaf3a087354" dependencies = [ "autocfg", "packable-derive", @@ -1566,9 +1561,9 @@ dependencies = [ [[package]] name = "packable-derive" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cfe1637c03253dfa99917b97dcb646a540cad292b18fdc72e9a0d0dd29f165e" +checksum = "715f215a9cb02dd40282e4544148d0b3cb21010561e4588f0790ae9f1f61c041" dependencies = [ "proc-macro-crate", "proc-macro-error", @@ -1981,9 +1976,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.137" +version = "1.0.139" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61ea8d54c77f8315140a05f4c7237403bf38b72704d031543aa1d16abbf517d1" +checksum = "0171ebb889e45aa68b44aee0859b3eede84c6f5f5c228e6f140c0b2a0a46cad6" dependencies = [ "serde_derive", ] @@ -1999,9 +1994,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.137" +version = "1.0.139" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f26faba0c3959972377d3b2d306ee9f71faee9714294e41bb777f83f88578be" +checksum = "dc1d3230c1de7932af58ad8ffbe1d784bd55efd5a9d84ac24f69c72d83543dfb" dependencies = [ "proc-macro2", "quote", @@ -2010,9 +2005,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.81" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b7ce2b32a1aed03c558dc61a5cd328f15aff2dbc17daad8fb8af04d2100e15c" +checksum = "82c2c1fdcd807d1098552c5b9a36e425e42e9fbd7c6a37a8425f390f781f7fa7" dependencies = [ "itoa", "ryu", @@ -2031,17 +2026,6 @@ dependencies = [ "serde", ] -[[package]] -name = "sha-1" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "028f48d513f9678cda28f6e4064755b3fbb2af6acd672f2c209b62323f7aea0f" -dependencies = [ - "cfg-if", - "cpufeatures 0.2.2", - "digest 0.10.3", -] - [[package]] name = "sha2" version = "0.9.9" @@ -2287,10 +2271,11 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.19.2" +version = "1.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c51a52ed6686dd62c320f9b89299e9dfb46f730c7a48e635c19f21d116cb1439" +checksum = "57aec3cfa4c296db7255446efb4928a6be304b431a806216105542a67b6ca82e" dependencies = [ + "autocfg", "bytes", "libc", "memchr", @@ -2766,9 +2751,9 @@ dependencies = [ [[package]] name = "zeroize" -version = "1.5.5" +version = "1.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94693807d016b2f2d2e14420eb3bfcca689311ff775dcf113d74ea624b7cdf07" +checksum = "20b578acffd8516a6c3f2a1bdefc1ec37e547bb4e0fb8b6b01a4cafc886b4442" dependencies = [ "zeroize_derive", ] diff --git a/Cargo.toml b/Cargo.toml index fccc1c0..fa70da0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cli-wallet" -version = "1.0.0-alpha.7" +version = "1.0.0-alpha.8" authors = [ "IOTA Stiftung" ] edition = "2021" homepage = "https://iota.org" @@ -15,12 +15,12 @@ path = "src/main.rs" clap = { version = "3.2.8", 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.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 = "73b404144b9912fc96e6c677248cb362521e8797", default-features = false, features = [ "storage", "stronghold" ] } +iota-crypto = { version = "0.13.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 = "d4409fbff4927c998a70f49e60bd8895f4f81b37", 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.19.2", default-features = false } +tokio = { version = "1.20.0", default-features = false } [profile.release] panic = "abort" diff --git a/src/command/account.rs b/src/command/account.rs index 7e54c56..0b139be 100644 --- a/src/command/account.rs +++ b/src/command/account.rs @@ -7,7 +7,7 @@ use clap::{Parser, Subcommand}; use iota_wallet::{ account::{types::AccountAddress, AccountHandle, OutputsToClaim}, iota_client::{ - bee_block::output::{AliasId, FoundryId, NftId, OutputId, TokenId}, + block::output::{AliasId, FoundryId, NftId, OutputId, TokenId}, request_funds_from_faucet, }, AddressAndNftId, AddressNativeTokens, AddressWithAmount, AddressWithMicroAmount, NativeTokenOptions, NftOptions, diff --git a/src/command/account_manager.rs b/src/command/account_manager.rs index 1cae84d..8d14c74 100644 --- a/src/command/account_manager.rs +++ b/src/command/account_manager.rs @@ -61,7 +61,7 @@ pub async fn backup_command(manager: &AccountManager, path: String, password: &s pub async fn change_password_command(manager: &AccountManager, current: &str) -> Result<(), Error> { let new = get_password("Stronghold new password", true)?; - manager.change_stronghold_password(¤t, &new).await?; + manager.change_stronghold_password(current, &new).await?; Ok(()) } diff --git a/src/error.rs b/src/error.rs index 0ca6b07..50114a9 100644 --- a/src/error.rs +++ b/src/error.rs @@ -4,7 +4,7 @@ use fern_logger::Error as LoggerError; use iota_wallet::{ error::Error as WalletError, - iota_client::{bee_block::Error as BlockError, error::Error as ClientError}, + iota_client::{block::Error as BlockError, error::Error as ClientError}, }; #[derive(Debug, thiserror::Error)]