Merge branch '2.0' into 500-error-patch

boxfish-studio · Feb 7, 2024 · cc54773 · cc54773
2 parents 965cb77 + 7bffac2
commit cc54773
Show file tree

Hide file tree

Showing 33 changed files with 909 additions and 772 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/bindings/core/src/method_handler/secret_manager.rs b/bindings/core/src/method_handler/secret_manager.rs
@@ -67,11 +67,14 @@ 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)
+            let secret_manager = if let Some(secret_manager) = secret_manager.downcast::<LedgerSecretManager>() {
+                secret_manager
+            } else if let Some(SecretManager::LedgerNano(secret_manager)) = secret_manager.downcast::<SecretManager>() {
+                secret_manager
             } else {
                 return Err(iota_sdk::client::Error::SecretManagerMismatch.into());
-            }
+            };
+            Response::LedgerNanoStatus(secret_manager.get_ledger_nano_status().await)
         }
         SecretManagerMethod::SignTransaction {
             prepared_transaction_data,