iotaledger · DaughterOfMars · Sep 12, 2023 · Sep 13, 2023 · Sep 14, 2023 · Sep 18, 2023
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/bindings/core/src/error.rs b/bindings/core/src/error.rs
@@ -26,6 +26,8 @@ pub enum Error {
     /// SerdeJson errors.
     #[error("{0}")]
     SerdeJson(#[from] serde_json::error::Error),
+    #[error("secret manager was not provided")]
+    MissingSecretManager,
     /// Unpack errors.
     #[error("{0}")]
     Unpack(#[from] packable::error::UnpackError<iota_sdk::types::block::Error, UnexpectedEOF>),

diff --git a/bindings/core/src/lib.rs b/bindings/core/src/lib.rs
@@ -16,7 +16,7 @@ use derivative::Derivative;
 use fern_logger::{logger_init, LoggerConfig, LoggerOutputConfigBuilder};
 pub use iota_sdk;
 use iota_sdk::{
-    client::secret::{SecretManager, SecretManagerDto},
+    client::secret::{SecretManage, SecretManagerDto},
     types::block::address::Bech32Address,
     utils::serde::bip44::option_bip44,
     wallet::{ClientOptions, Wallet},
@@ -86,7 +86,10 @@ impl WalletOptions {
         self
     }
 
-    pub async fn build(self) -> iota_sdk::wallet::Result<Wallet> {
+    pub async fn build<S: SecretManage>(self, secret_manager: &S) -> iota_sdk::wallet::Result<Wallet>
+    where
+        iota_sdk::client::Error: From<S::Error>,
+    {
         log::debug!("wallet options: {self:?}");
         let mut builder = Wallet::builder()
             .with_address(self.address)
@@ -99,11 +102,7 @@ impl WalletOptions {
             builder = builder.with_storage_path(storage_path);
         }
 
-        if let Some(secret_manager) = self.secret_manager {
-            builder = builder.with_secret_manager(SecretManager::try_from(secret_manager)?);
-        }
-
-        builder.finish().await
+        builder.finish(secret_manager).await
     }
 }
 

diff --git a/bindings/core/src/method/wallet.rs b/bindings/core/src/method/wallet.rs
@@ -434,53 +434,53 @@ pub enum WalletMethod {
         /// Bech32 HRP
         bech32_hrp: Option<Hrp>,
     },
-    /// Get the ledger nano status
-    /// Expected response: [`LedgerNanoStatus`](crate::Response::LedgerNanoStatus)
-    #[cfg(feature = "ledger_nano")]
-    #[cfg_attr(docsrs, doc(cfg(feature = "ledger_nano")))]
-    GetLedgerNanoStatus,
-    /// Set the stronghold password.
-    /// Expected response: [`Ok`](crate::Response::Ok)
-    #[cfg(feature = "stronghold")]
-    #[cfg_attr(docsrs, doc(cfg(feature = "stronghold")))]
-    SetStrongholdPassword {
-        #[derivative(Debug(format_with = "OmittedDebug::omitted_fmt"))]
-        password: String,
-    },
-    /// Set the stronghold password clear interval.
-    /// Expected response: [`Ok`](crate::Response::Ok)
-    #[cfg(feature = "stronghold")]
-    #[cfg_attr(docsrs, doc(cfg(feature = "stronghold")))]
-    #[serde(rename_all = "camelCase")]
-    SetStrongholdPasswordClearInterval { interval_in_milliseconds: Option<u64> },
-    /// Store a mnemonic into the Stronghold vault.
-    /// Expected response: [`Ok`](crate::Response::Ok)
-    #[cfg(feature = "stronghold")]
-    #[cfg_attr(docsrs, doc(cfg(feature = "stronghold")))]
-    StoreMnemonic {
-        #[derivative(Debug(format_with = "OmittedDebug::omitted_fmt"))]
-        mnemonic: String,
-    },
-    /// Change the Stronghold password to another one and also re-encrypt the values in the loaded snapshot with it.
-    /// Expected response: [`Ok`](crate::Response::Ok)
-    #[cfg(feature = "stronghold")]
-    #[cfg_attr(docsrs, doc(cfg(feature = "stronghold")))]
-    #[serde(rename_all = "camelCase")]
-    ChangeStrongholdPassword {
-        #[derivative(Debug(format_with = "OmittedDebug::omitted_fmt"))]
-        current_password: String,
-        #[derivative(Debug(format_with = "OmittedDebug::omitted_fmt"))]
-        new_password: String,
-    },
-    /// Clears the Stronghold password from memory.
-    /// Expected response: [`Ok`](crate::Response::Ok)
-    #[cfg(feature = "stronghold")]
-    #[cfg_attr(docsrs, doc(cfg(feature = "stronghold")))]
-    ClearStrongholdPassword,
-    /// Checks if the Stronghold password is available.
-    /// Expected response:
-    /// [`Bool`](crate::Response::Bool)
-    #[cfg(feature = "stronghold")]
-    #[cfg_attr(docsrs, doc(cfg(feature = "stronghold")))]
-    IsStrongholdPasswordAvailable,
+    // /// Get the ledger nano status
+    // /// Expected response: [`LedgerNanoStatus`](crate::Response::LedgerNanoStatus)
+    // #[cfg(feature = "ledger_nano")]
+    // #[cfg_attr(docsrs, doc(cfg(feature = "ledger_nano")))]
+    // GetLedgerNanoStatus,
+    // /// Set the stronghold password.
+    // /// Expected response: [`Ok`](crate::Response::Ok)
+    // #[cfg(feature = "stronghold")]
+    // #[cfg_attr(docsrs, doc(cfg(feature = "stronghold")))]
+    // SetStrongholdPassword {
+    //     #[derivative(Debug(format_with = "OmittedDebug::omitted_fmt"))]
+    //     password: String,
+    // },
+    // /// Set the stronghold password clear interval.
+    // /// Expected response: [`Ok`](crate::Response::Ok)
+    // #[cfg(feature = "stronghold")]
+    // #[cfg_attr(docsrs, doc(cfg(feature = "stronghold")))]
+    // #[serde(rename_all = "camelCase")]
+    // SetStrongholdPasswordClearInterval { interval_in_milliseconds: Option<u64> },
+    // /// Store a mnemonic into the Stronghold vault.
+    // /// Expected response: [`Ok`](crate::Response::Ok)
+    // #[cfg(feature = "stronghold")]
+    // #[cfg_attr(docsrs, doc(cfg(feature = "stronghold")))]
+    // StoreMnemonic {
+    //     #[derivative(Debug(format_with = "OmittedDebug::omitted_fmt"))]
+    //     mnemonic: String,
+    // },
+    // /// Change the Stronghold password to another one and also re-encrypt the values in the loaded snapshot with
+    // it. /// Expected response: [`Ok`](crate::Response::Ok)
+    // #[cfg(feature = "stronghold")]
+    // #[cfg_attr(docsrs, doc(cfg(feature = "stronghold")))]
+    // #[serde(rename_all = "camelCase")]
+    // ChangeStrongholdPassword {
+    //     #[derivative(Debug(format_with = "OmittedDebug::omitted_fmt"))]
+    //     current_password: String,
+    //     #[derivative(Debug(format_with = "OmittedDebug::omitted_fmt"))]
+    //     new_password: String,
+    // },
+    // /// Clears the Stronghold password from memory.
+    // /// Expected response: [`Ok`](crate::Response::Ok)
+    // #[cfg(feature = "stronghold")]
+    // #[cfg_attr(docsrs, doc(cfg(feature = "stronghold")))]
+    // ClearStrongholdPassword,
+    // /// Checks if the Stronghold password is available.
+    // /// Expected response:
+    // /// [`Bool`](crate::Response::Bool)
+    // #[cfg(feature = "stronghold")]
+    // #[cfg_attr(docsrs, doc(cfg(feature = "stronghold")))]
+    // IsStrongholdPasswordAvailable,
 }
diff --git a/bindings/core/src/method_handler/call_method.rs b/bindings/core/src/method_handler/call_method.rs
@@ -38,14 +38,6 @@ impl CallMethod for Client {
     }
 }
 
-impl CallMethod for Wallet {
-    type Method = WalletMethod;
-
-    fn call_method<'a>(&'a self, method: Self::Method) -> Pin<Box<dyn Future<Output = Response> + 'a>> {
-        Box::pin(call_wallet_method(self, method))
-    }
-}
-
 /// Call a client method.
 pub async fn call_client_method(client: &Client, method: ClientMethod) -> Response {
     log::debug!("Client method: {method:?}");
@@ -58,9 +50,17 @@ pub async fn call_client_method(client: &Client, method: ClientMethod) -> Respon
 }
 
 /// Call a wallet method.
-pub async fn call_wallet_method(wallet: &Wallet, method: WalletMethod) -> Response {
+pub async fn call_wallet_method<S: 'static + SecretManage + Clone>(
+    wallet: &Wallet,
+    secret_manager: &S,
+    method: WalletMethod,
+) -> Response
+where
+    iota_sdk::client::Error: From<S::Error>,
+{
     log::debug!("Wallet method: {method:?}");
-    let result = convert_async_panics(|| async { call_wallet_method_internal(wallet, method).await }).await;
+    let result =
+        convert_async_panics(|| async { call_wallet_method_internal(wallet, secret_manager, method).await }).await;
 
     let response = result.unwrap_or_else(Response::Error);
 
@@ -80,7 +80,7 @@ pub fn call_utils_method(method: UtilsMethod) -> Response {
 }
 
 /// Call a secret manager method.
-pub async fn call_secret_manager_method<S: SecretManage + DowncastSecretManager>(
+pub async fn call_secret_manager_method<S: SecretManage + DowncastSecretManager + ?Sized>(
     secret_manager: &S,
     method: SecretManagerMethod,
 ) -> Response

diff --git a/bindings/core/src/method_handler/secret_manager.rs b/bindings/core/src/method_handler/secret_manager.rs
@@ -1,10 +1,6 @@
 // Copyright 2023 IOTA Stiftung
 // SPDX-License-Identifier: Apache-2.0
 
-#[cfg(feature = "ledger_nano")]
-use iota_sdk::client::secret::ledger_nano::LedgerSecretManager;
-#[cfg(feature = "stronghold")]
-use iota_sdk::client::secret::{stronghold::StrongholdSecretManager, SecretManager};
 use iota_sdk::{
     client::{
         api::{GetAddressesOptions, PreparedTransactionData},
@@ -19,7 +15,7 @@ use iota_sdk::{
 use crate::{method::SecretManagerMethod, response::Response, Result};
 
 /// Call a secret manager method.
-pub(crate) async fn call_secret_manager_method_internal<S: SecretManage + DowncastSecretManager>(
+pub(crate) async fn call_secret_manager_method_internal<S: SecretManage + DowncastSecretManager + ?Sized>(
     secret_manager: &S,
     method: SecretManagerMethod,
 ) -> Result<Response>
@@ -52,8 +48,8 @@ where
                     coin_type,
                     account_index,
                     range,
-                    bech32_hrp: _,
                     options,
+                    ..
                 },
         } => {
             let addresses = secret_manager
@@ -67,11 +63,7 @@ where
         }
         #[cfg(feature = "ledger_nano")]
         SecretManagerMethod::GetLedgerNanoStatus => {
-            if let Some(secret_manager) = secret_manager.downcast::<LedgerSecretManager>() {
-                Response::LedgerNanoStatus(secret_manager.get_ledger_nano_status().await)
-            } else {
-                return Err(iota_sdk::client::Error::SecretManagerMismatch.into());
-            }
+            Response::LedgerNanoStatus(secret_manager.as_ledger_nano()?.get_ledger_nano_status().await)
         }
         SecretManagerMethod::SignTransaction {
             prepared_transaction_data,
@@ -121,15 +113,8 @@ where
         #[cfg(feature = "stronghold")]
         SecretManagerMethod::StoreMnemonic { mnemonic } => {
             let mnemonic = crypto::keys::bip39::Mnemonic::from(mnemonic);
-            if let Some(secret_manager) = secret_manager.downcast::<StrongholdSecretManager>() {
-                secret_manager.store_mnemonic(mnemonic).await?;
-                Response::Ok
-            } else if let Some(SecretManager::Stronghold(secret_manager)) = secret_manager.downcast::<SecretManager>() {
-                secret_manager.store_mnemonic(mnemonic).await?;
-                Response::Ok
-            } else {
-                return Err(iota_sdk::client::Error::SecretManagerMismatch.into());
-            }
+            secret_manager.as_stronghold()?.store_mnemonic(mnemonic).await?;
+            Response::Ok
         }
     };
     Ok(response)