From 039ea32adb5434b8f9e070f9a38a0699844fa8cd Mon Sep 17 00:00:00 2001 From: sneurlax Date: Mon, 21 Oct 2024 23:59:34 -0500 Subject: update MONERO_Wallet_checkTxKey IAW feedback resolves https://github.com/MrCyjaneK/monero_c/pull/67#issuecomment-2425926830 --- .../src/main/cpp/wallet2_api_c.cpp | 30 ++++++++-------------- 1 file changed, 10 insertions(+), 20 deletions(-) diff --git a/monero_libwallet2_api_c/src/main/cpp/wallet2_api_c.cpp b/monero_libwallet2_api_c/src/main/cpp/wallet2_api_c.cpp index f959fb2..f84a1b4 100644 --- a/monero_libwallet2_api_c/src/main/cpp/wallet2_api_c.cpp +++ b/monero_libwallet2_api_c/src/main/cpp/wallet2_api_c.cpp @@ -1511,27 +1511,17 @@ const char* MONERO_Wallet_getTxKey(void* wallet_ptr, const char* txid) { return buffer; } -bool MONERO_Wallet_checkTxKey(void* wallet_ptr, const char* txid, const char* tx_key, const char* address, uint64_t* received, bool* in_pool, uint64_t* confirmations) { - if (wallet_ptr == nullptr || txid == nullptr || tx_key == nullptr || address == nullptr || received == nullptr || in_pool == nullptr || confirmations == nullptr) { - return false; - } - +bool MONERO_Wallet_checkTxKey(void* wallet_ptr, const char* txid, const char* tx_key, const char* address, uint64_t received, bool in_pool, uint64_t confirmations) { Monero::Wallet* wallet = reinterpret_cast(wallet_ptr); - - try { - bool result = wallet->checkTxKey( - std::string(txid), - std::string(tx_key), - std::string(address), - *received, - *in_pool, - *confirmations - ); - return result; - } - catch (const std::exception& e) { - return false; - } + bool result = wallet->checkTxKey( + std::string(txid), + std::string(tx_key), + std::string(address), + received, + in_pool, + confirmations + ); + return result; } const char* MONERO_Wallet_signMessage(void* wallet_ptr, const char* message, const char* address) { -- cgit v1.2.3