From d550d2b99c5ebb9efe23923236e0fae18ae1c9db Mon Sep 17 00:00:00 2001
From: l1h3r <devin.turner@iota.org>
Date: Mon, 15 Mar 2021 10:18:56 -0700
Subject: [PATCH] Fix account-related dependencies

---
 identity-account/Cargo.toml               | 8 ++++----
 identity-account/src/stronghold/result.rs | 2 +-
 identity-account/src/stronghold/vault.rs  | 4 ++--
 identity-account/src/utils/crypto.rs      | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/identity-account/Cargo.toml b/identity-account/Cargo.toml
index df641ea319..4ef69a0a43 100644
--- a/identity-account/Cargo.toml
+++ b/identity-account/Cargo.toml
@@ -15,19 +15,19 @@ futures = { version = "0.3" }
 hashbrown = { version = "0.9" }
 identity-core = { version = "=0.2.0", path = "../identity-core" }
 once_cell = { version = "1.5", default-features = false, features = ["std"] }
-riker = { version = "0.4", git ="https://github.com/elenaf9/riker", branch = "master" }
+riker = { version = "0.4" }
 slog = { version = "2.7" }
 tokio = { version = "1.2", default-features = false, features = ["rt", "rt-multi-thread", "sync"] }
 zeroize = { version = "1.2"}
 
 [dependencies.iota-crypto]
 git = "https://github.com/iotaledger/crypto.rs"
-rev = "dbb082870676b25b1867513792e51bd74ef1824d"
-features = ["blake2b", "ed25519", "hmac", "pbkdf", "sha"]
+rev = "b849861b86c3f7357b7477de4253b7352b363627"
+features = ["blake2b", "ed25519", "hmac", "pbkdf", "sha", "slip10"]
 
 [dependencies.iota-stronghold]
 git = "https://github.com/iotaledger/stronghold.rs"
-rev = "374742b1d0d42592d7ae39bb7842fb301b685ddd"
+rev = "b8904ff0df9c963980ae148815ad56c40588d84a"
 
 [dev-dependencies]
 rand = { version = "0.8" }
diff --git a/identity-account/src/stronghold/result.rs b/identity-account/src/stronghold/result.rs
index 7a5f29c389..4e1ad305d0 100644
--- a/identity-account/src/stronghold/result.rs
+++ b/identity-account/src/stronghold/result.rs
@@ -1,7 +1,7 @@
 // Copyright 2020-2021 IOTA Stiftung
 // SPDX-License-Identifier: Apache-2.0
 
-use iota_stronghold::hd::ChainCode;
+use crypto::keys::slip10::ChainCode;
 use iota_stronghold::ProcResult;
 use iota_stronghold::ResultMessage;
 
diff --git a/identity-account/src/stronghold/vault.rs b/identity-account/src/stronghold/vault.rs
index 58af0995d4..64904a5fd6 100644
--- a/identity-account/src/stronghold/vault.rs
+++ b/identity-account/src/stronghold/vault.rs
@@ -1,8 +1,8 @@
 // Copyright 2020-2021 IOTA Stiftung
 // SPDX-License-Identifier: Apache-2.0
 
-use iota_stronghold::hd::Chain;
-use iota_stronghold::hd::ChainCode;
+use crypto::keys::slip10::Chain;
+use crypto::keys::slip10::ChainCode;
 use iota_stronghold::Location;
 use iota_stronghold::Procedure;
 use iota_stronghold::RecordHint;
diff --git a/identity-account/src/utils/crypto.rs b/identity-account/src/utils/crypto.rs
index c5c9ea3041..778af84a35 100644
--- a/identity-account/src/utils/crypto.rs
+++ b/identity-account/src/utils/crypto.rs
@@ -1,7 +1,7 @@
 // Copyright 2020-2021 IOTA Stiftung
 // SPDX-License-Identifier: Apache-2.0
 
-use crypto::kdfs::pbkdf::PBKDF2_HMAC_SHA512;
+use crypto::keys::pbkdf::PBKDF2_HMAC_SHA512;
 
 const PBKDF_ITER: usize = 100;
 const PBKDF_SALT: &[u8] = b"identity.rs";