fix(deps): update rust crate iota_stronghold to v1 (#70)

* fix(deps): update rust crate iota_stronghold to v1 * fix compile error Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: FabianLars <fabianlars@fabianlars.de>
2 years ago · 66322a3426
parent 58144ecb41
commit 66322a3426
3 changed files with 110 additions and 106 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@ -25,7 +25,7 @@ checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8"
 dependencies = [
 "cfg-if 1.0.0",
 "cipher",
- "cpufeatures 0.2.5",
+ "cpufeatures",
 "opaque-debug",
 ]

@ -93,6 +93,18 @@ version = "1.0.66"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "216261ddc8289130e551ddcd5ce8a064710c0d064a4d2895c67151c92b5443f6"

+[[package]]
+name = "arrayref"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544"
+
+[[package]]
+name = "arrayvec"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6"
+
 [[package]]
 name = "ascii"
 version = "1.1.0"
@ -132,12 +144,6 @@ dependencies = [
 "num-traits",
 ]

-[[package]]
-name = "atom"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1dcfa7026c8fa43fa767bff0b7cd4d1963cdfd946e0386bee93003e9b2498562"
-
 [[package]]
 name = "authenticator"
 version = "0.3.1"
@ -207,22 +213,22 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"

 [[package]]
 name = "blake2"
-version = "0.9.2"
+version = "0.10.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a4e37d16930f5459780f5621038b6382b9bb37c19016f39fb6b5808d831f174"
+checksum = "b12e5fd123190ce1c2e559308a94c9bacad77907d4c6005d9e58fe1a0689e55e"
 dependencies = [
- "crypto-mac",
- "digest 0.9.0",
- "opaque-debug",
+ "digest 0.10.6",
 ]

 [[package]]
-name = "blake2"
-version = "0.10.5"
+name = "blake2b_simd"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b12e5fd123190ce1c2e559308a94c9bacad77907d4c6005d9e58fe1a0689e55e"
+checksum = "72936ee4afc7f8f736d1c38383b56480b5497b4617b4a77bdbf1d2ababc76127"
 dependencies = [
- "digest 0.10.6",
+ "arrayref",
+ "arrayvec",
+ "constant_time_eq",
 ]

 [[package]]
@ -401,21 +407,21 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"

 [[package]]
 name = "chacha20"
-version = "0.7.1"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fee7ad89dc1128635074c268ee661f90c3f7e83d9fd12910608c36b47d6c3412"
+checksum = "5c80e5460aa66fe3b91d40bcbdab953a597b60053e34d684ac6903f863b680a6"
 dependencies = [
 "cfg-if 1.0.0",
 "cipher",
- "cpufeatures 0.1.5",
+ "cpufeatures",
 "zeroize",
 ]

 [[package]]
 name = "chacha20poly1305"
-version = "0.8.0"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1580317203210c517b6d44794abfbe600698276db18127e37ad3e69bf5e848e5"
+checksum = "a18446b09be63d457bbec447509e85f662f32952b035ce892290396bc0b0cff5"
 dependencies = [
 "aead",
 "chacha20",
@ -517,6 +523,12 @@ version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e4c78c047431fee22c1a7bb92e00ad095a02a983affe4d8a72e2a2c62c1b94f3"

+[[package]]
+name = "constant_time_eq"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc"
+
 [[package]]
 name = "convert_case"
 version = "0.4.0"
@ -564,15 +576,6 @@ dependencies = [
 "libc",
 ]

-[[package]]
-name = "cpufeatures"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66c99696f6c9dd7f35d486b9d04d7e6e202aa3e8c40d553f2fdf5e7e0c6a71ef"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "cpufeatures"
 version = "0.2.5"
@ -655,16 +658,6 @@ dependencies = [
 "typenum",
 ]

-[[package]]
-name = "crypto-mac"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab"
-dependencies = [
- "generic-array",
- "subtle",
-]
-
 [[package]]
 name = "cssparser"
 version = "0.27.2"
@ -1306,7 +1299,7 @@ dependencies = [
 "libc",
 "log",
 "rustversion",
- "windows",
+ "windows 0.39.0",
 ]

 [[package]]
@ -1823,24 +1816,15 @@ dependencies = [

 [[package]]
 name = "iota-crypto"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee273ae67ff1bc7c59317c0ab280e0e76259e6bd83e140ac4c2ecebec994f740"
-dependencies = [
- "blake2 0.9.2",
- "digest 0.9.0",
-]
-
-[[package]]
-name = "iota-crypto"
-version = "0.12.1"
+version = "0.15.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f03717e934972fad6f1c9b4cd25f662e1753b58a7f76e3dceadeb646e034b252"
+checksum = "4e04d492224bff6e97142f033d0a4383bcbc05918be1ff7b3abd2c1cc85205a2"
 dependencies = [
 "aead",
 "aes",
 "aes-gcm",
- "blake2 0.10.5",
+ "autocfg",
+ "blake2",
 "chacha20poly1305",
 "curve25519-dalek",
 "digest 0.10.6",
@ -1856,27 +1840,18 @@ dependencies = [
 "zeroize",
 ]

-[[package]]
-name = "iota-crypto"
-version = "0.15.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e04d492224bff6e97142f033d0a4383bcbc05918be1ff7b3abd2c1cc85205a2"
-dependencies = [
- "autocfg",
-]
-
 [[package]]
 name = "iota_stronghold"
-version = "0.8.1"
+version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "241111d0e7fa6740c89e3355e0570f761445e561cb31a4d49ef784ee5ef99f0e"
+checksum = "6c5baaa2460627283f54b968db7a38c9c754dc6059157cae64550ed1b79c91aa"
 dependencies = [
 "bincode",
 "hkdf",
- "iota-crypto 0.12.1",
+ "iota-crypto",
+ "rust-argon2",
 "serde",
 "stronghold-derive",
- "stronghold-rlu",
 "stronghold-utils",
 "stronghold_engine",
 "thiserror",
@ -2368,6 +2343,18 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54"

+[[package]]
+name = "nix"
+version = "0.24.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069"
+dependencies = [
+ "bitflags",
+ "cfg-if 1.0.0",
+ "libc",
+ "memoffset",
+]
+
 [[package]]
 name = "nodrop"
 version = "0.1.14"
@ -2907,7 +2894,7 @@ version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "048aeb476be11a4b6ca432ca569e375810de9294ae78f4774e78ea98a9246ede"
 dependencies = [
- "cpufeatures 0.2.5",
+ "cpufeatures",
 "opaque-debug",
 "universal-hash",
 ]
@ -2919,7 +2906,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8419d2b623c7c0896ff2d5d96e2cb4ede590fed28fcc34934f4c33c036e620a1"
 dependencies = [
 "cfg-if 1.0.0",
- "cpufeatures 0.2.5",
+ "cpufeatures",
 "opaque-debug",
 "universal-hash",
 ]
@ -3236,6 +3223,18 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5d79b4b604167921892e84afbbaad9d5ad74e091bf6c511d9dbfb0593f09fabd"

+[[package]]
+name = "rust-argon2"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b50162d19404029c1ceca6f6980fe40d45c8b369f6f44446fa14bb39573b5bb9"
+dependencies = [
+ "base64 0.13.1",
+ "blake2b_simd",
+ "constant_time_eq",
+ "crossbeam-utils",
+]
+
 [[package]]
 name = "rustc_version"
 version = "0.3.3"
@ -3537,7 +3536,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3"
 dependencies = [
 "cfg-if 1.0.0",
- "cpufeatures 0.2.5",
+ "cpufeatures",
 "digest 0.10.6",
 ]

@ -3549,7 +3548,7 @@ checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800"
 dependencies = [
 "block-buffer 0.9.0",
 "cfg-if 1.0.0",
- "cpufeatures 0.2.5",
+ "cpufeatures",
 "digest 0.9.0",
 "opaque-debug",
 ]
@ -3561,7 +3560,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0"
 dependencies = [
 "cfg-if 1.0.0",
- "cpufeatures 0.2.5",
+ "cpufeatures",
 "digest 0.10.6",
 ]

@ -3823,48 +3822,39 @@ dependencies = [

 [[package]]
 name = "stronghold-derive"
-version = "0.3.1"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bac933fa00ab0d0f1d6327ab9198a95aaaca3458dae09f0b8e1cd69fee2a7eaf"
+checksum = "2835db23c4724c05a2f85b81c4681f4aa8ea158edc8a7f4ad791c916fb766c2e"
 dependencies = [
 "proc-macro2",
 "quote",
 "syn",
 ]

-[[package]]
-name = "stronghold-rlu"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b00fbacafc4ef96fb95fac07d86cc3ec5e21c8efa94785374ad7913a4a216ba"
-dependencies = [
- "atom",
- "lazy_static",
- "log",
- "thiserror",
- "zeroize",
-]
-
 [[package]]
 name = "stronghold-runtime"
-version = "0.5.2"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8845d2c5a4270ecdf542f489ff16b2a6fec245ad001c6afe098c2e6ea0211d6c"
+checksum = "d93abb10fbd11335d31c33a70b2523c0caab348215caa2ce6da04a268c30afcb"
 dependencies = [
 "dirs",
- "iota-crypto 0.8.0",
+ "iota-crypto",
+ "libc",
 "libsodium-sys",
+ "log",
+ "nix",
 "rand 0.8.5",
 "serde",
 "thiserror",
+ "windows 0.36.1",
 "zeroize",
 ]

 [[package]]
 name = "stronghold-utils"
-version = "0.4.1"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be1ce0d6205e8ea89771f2b32d64aeaecbc930320919e95ec4efcc0aa96cd951"
+checksum = "8300214898af5e153e7f66e49dbd1c6a21585f2d592d9f24f58b969792475ed6"
 dependencies = [
 "rand 0.8.5",
 "stronghold-derive",
@ -3872,14 +3862,14 @@ dependencies = [

 [[package]]
 name = "stronghold_engine"
-version = "0.5.3"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1aab9d53f21c2293ba7e8fc3b6e7a5365ce12caf55f5c4b2a7d26e9e84d14071"
+checksum = "96d68a609d0a4f05dbde8b704619faa7f861069bbc649e3abecb4d389f10236f"
 dependencies = [
 "anyhow",
 "dirs-next",
 "hex",
- "iota-crypto 0.12.1",
+ "iota-crypto",
 "once_cell",
 "paste",
 "serde",
@ -3992,7 +3982,7 @@ dependencies = [
 "serde",
 "unicode-segmentation",
 "uuid 1.2.2",
- "windows",
+ "windows 0.39.0",
 "windows-implement",
 "x11-dl",
 ]
@ -4050,7 +4040,7 @@ dependencies = [
 "uuid 1.2.2",
 "webkit2gtk",
 "webview2-com",
- "windows",
+ "windows 0.39.0",
 ]

 [[package]]
@ -4227,7 +4217,7 @@ name = "tauri-plugin-stronghold"
 version = "0.1.0"
 dependencies = [
 "hex",
- "iota-crypto 0.15.3",
+ "iota-crypto",
 "iota_stronghold",
 "log",
 "rand 0.8.5",
@ -4299,7 +4289,7 @@ dependencies = [
 "thiserror",
 "uuid 1.2.2",
 "webview2-com",
- "windows",
+ "windows 0.39.0",
 ]

 [[package]]
@ -4318,7 +4308,7 @@ dependencies = [
 "uuid 1.2.2",
 "webkit2gtk",
 "webview2-com",
- "windows",
+ "windows 0.39.0",
 "wry",
 ]

@ -4347,7 +4337,7 @@ dependencies = [
 "thiserror",
 "url",
 "walkdir",
- "windows",
+ "windows 0.39.0",
 ]

 [[package]]
@ -5040,7 +5030,7 @@ checksum = "b4a769c9f1a64a8734bde70caafac2b96cada12cd4aefa49196b3a386b8b4178"
 dependencies = [
 "webview2-com-macros",
 "webview2-com-sys",
- "windows",
+ "windows 0.39.0",
 "windows-implement",
 ]

@ -5065,7 +5055,7 @@ dependencies = [
 "serde",
 "serde_json",
 "thiserror",
- "windows",
+ "windows 0.39.0",
 "windows-bindgen",
 "windows-metadata",
 ]
@ -5124,6 +5114,19 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"

+[[package]]
+name = "windows"
+version = "0.36.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e53b97a83176b369b0eb2fd8158d4ae215357d02df9d40c1e1bf1879c5482c80"
+dependencies = [
+ "windows_aarch64_msvc 0.36.1",
+ "windows_i686_gnu 0.36.1",
+ "windows_i686_msvc 0.36.1",
+ "windows_x86_64_gnu 0.36.1",
+ "windows_x86_64_msvc 0.36.1",
+]
+
 [[package]]
 name = "windows"
 version = "0.39.0"
@ -5343,7 +5346,7 @@ dependencies = [
 "webkit2gtk",
 "webkit2gtk-sys",
 "webview2-com",
- "windows",
+ "windows 0.39.0",
 "windows-implement",
 ]

--- a/plugins/stronghold/Cargo.toml
+++ b/plugins/stronghold/Cargo.toml
@ -15,7 +15,7 @@ serde_json.workspace = true
 tauri.workspace = true
 log.workspace = true
 thiserror.workspace = true
-iota_stronghold = { version = "0.8" }
+iota_stronghold = "1"
 iota-crypto = "0.15"
 hex = "0.4"
 zeroize = { version = "1", features = ["zeroize_derive"] }
--- a/plugins/stronghold/src/stronghold.rs
+++ b/plugins/stronghold/src/stronghold.rs
@ -48,7 +48,8 @@ impl Stronghold {
    }

    pub fn save(&self) -> Result<()> {
-        self.inner.commit(&self.path, &self.keyprovider)?;
+        self.inner
+            .commit_with_keyprovider(&self.path, &self.keyprovider)?;
        Ok(())
    }