From 291380457ba28c6208d2d1ac97757e8cfa8df85c Mon Sep 17 00:00:00 2001
From: Philip Robinson <simian@tari.com>
Date: Wed, 17 Nov 2021 14:49:58 +0200
Subject: [PATCH] feat: add error codes to LibWallet for CipherSeed errors
 (#3578)

Description
---
This PR adds explicit error codes to the LibWallet FFI interface to return the errors that can occur when invalid seed words are used during wallet recovery.

The new error codes are:

- Code 429: KeyManagerError::InvalidData
- Code 430: KeyManagerError::VersionMismatch
- Code 431: KeyManagerError::DecryptionFailed
- Code 432: KeyManagerError::CrcError


How Has This Been Tested?
---
cargo test
---
 base_layer/wallet_ffi/src/error.rs | 19 +++++++++++++++++--
 base_layer/wallet_ffi/src/lib.rs   |  3 ++-
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/base_layer/wallet_ffi/src/error.rs b/base_layer/wallet_ffi/src/error.rs
index 37349dd778..e842530d11 100644
--- a/base_layer/wallet_ffi/src/error.rs
+++ b/base_layer/wallet_ffi/src/error.rs
@@ -26,14 +26,13 @@ use tari_crypto::{
     signatures::SchnorrSignatureError,
     tari_utilities::{hex::HexError, ByteArrayError},
 };
-use tari_key_manager::error::MnemonicError;
+use tari_key_manager::error::{KeyManagerError, MnemonicError};
 use tari_wallet::{
     contacts_service::error::{ContactsServiceError, ContactsServiceStorageError},
     error::{WalletError, WalletStorageError},
     output_manager_service::error::{OutputManagerError, OutputManagerStorageError},
     transaction_service::error::{TransactionServiceError, TransactionStorageError},
 };
-
 use thiserror::Error;
 
 const LOG_TARGET: &str = "wallet_ffi::error";
@@ -286,6 +285,22 @@ impl From<WalletError> for LibWalletError {
                 code: 428,
                 message: format!("{:?}", w),
             },
+            WalletError::KeyManagerError(KeyManagerError::InvalidData) => Self {
+                code: 429,
+                message: format!("{:?}", w),
+            },
+            WalletError::KeyManagerError(KeyManagerError::VersionMismatch) => Self {
+                code: 430,
+                message: format!("{:?}", w),
+            },
+            WalletError::KeyManagerError(KeyManagerError::DecryptionFailed) => Self {
+                code: 431,
+                message: format!("{:?}", w),
+            },
+            WalletError::KeyManagerError(KeyManagerError::CrcError) => Self {
+                code: 432,
+                message: format!("{:?}", w),
+            },
             // This is the catch all error code. Any error that is not explicitly mapped above will be given this code
             _ => Self {
                 code: 999,
diff --git a/base_layer/wallet_ffi/src/lib.rs b/base_layer/wallet_ffi/src/lib.rs
index fbd9046d76..43006072de 100644
--- a/base_layer/wallet_ffi/src/lib.rs
+++ b/base_layer/wallet_ffi/src/lib.rs
@@ -1071,7 +1071,8 @@ pub unsafe extern "C" fn seed_words_push_word(
         return if let Err(e) = CipherSeed::from_mnemonic(&(*seed_words).0, None) {
             log::error!(
                 target: LOG_TARGET,
-                "Problem building valid private seed from seed phrase"
+                "Problem building valid private seed from seed phrase: {}",
+                e
             );
             error = LibWalletError::from(WalletError::KeyManagerError(e)).code;
             ptr::swap(error_out, &mut error as *mut c_int);