diff options
6 files changed, 21 insertions, 10 deletions
diff --git a/monero_libwallet2_api_c/monero_libwallet2_api_c.exp b/monero_libwallet2_api_c/monero_libwallet2_api_c.exp index 7867e01..6765302 100644 --- a/monero_libwallet2_api_c/monero_libwallet2_api_c.exp +++ b/monero_libwallet2_api_c/monero_libwallet2_api_c.exp @@ -13,7 +13,6 @@ _MONERO_PendingTransaction_multisigSignData _MONERO_PendingTransaction_signMultisigTx _MONERO_PendingTransaction_signersKeys _MONERO_PendingTransaction_hex -_MONERO_PendingTransaction_txHex _MONERO_UnsignedTransaction_status _MONERO_UnsignedTransaction_errorString _MONERO_UnsignedTransaction_amount @@ -274,7 +273,6 @@ _MONERO_WalletManager_createWalletFromPolyseed _MONERO_WalletManager_closeWallet _MONERO_WalletManager_walletExists _MONERO_WalletManager_verifyWalletPassword -_MONERO_WalletManager_queryWalletDevice _MONERO_WalletManager_findWallets _MONERO_WalletManager_errorString _MONERO_WalletManager_setDaemonAddress 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 c03e273..7fd79e9 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 @@ -1861,6 +1861,10 @@ void MONERO_WalletManagerFactory_setLogLevel(int level) { Monero::WalletManagerFactory::setLogLevel(level); } +void MONERO_WalletManagerFactory_setLogCategories(const char* categories) { + Monero::WalletManagerFactory::setLogCategories(std::string(categories)); +} + // DEBUG functions // As it turns out we need a bit more functions to make sure that the library is working. diff --git a/monero_libwallet2_api_c/src/main/cpp/wallet2_api_c.h b/monero_libwallet2_api_c/src/main/cpp/wallet2_api_c.h index 1bb3551..14c658f 100644 --- a/monero_libwallet2_api_c/src/main/cpp/wallet2_api_c.h +++ b/monero_libwallet2_api_c/src/main/cpp/wallet2_api_c.h @@ -101,7 +101,7 @@ extern ADDAPI const char* MONERO_PendingTransaction_signersKeys(void* pendingTx_ // virtual std::vector<std::string> hex() const = 0; extern ADDAPI const char* MONERO_PendingTransaction_hex(void* pendingTx_ptr, const char* separator); // virtual std::vector<std::string> txKey() const = 0; -extern ADDAPI const char* MONERO_PendingTransaction_txHex(void* pendingTx_ptr, const char* separator); +// extern ADDAPI const char* MONERO_PendingTransaction_txHex(void* pendingTx_ptr, const char* separator); // }; // struct UnsignedTransaction diff --git a/wownero_libwallet2_api_c/src/main/cpp/wallet2_api_c.cpp b/wownero_libwallet2_api_c/src/main/cpp/wallet2_api_c.cpp index 6afdfe4..f29ca4e 100644 --- a/wownero_libwallet2_api_c/src/main/cpp/wallet2_api_c.cpp +++ b/wownero_libwallet2_api_c/src/main/cpp/wallet2_api_c.cpp @@ -133,6 +133,12 @@ const char* WOWNERO_PendingTransaction_hex(void* pendingTx_ptr, const char* sepa return vectorToString(txid, std::string(separator)); } +// const char* WOWNERO_PendingTransaction_txHex(void* pendingTx_ptr, const char* separator) { +// Monero::PendingTransaction *pendingTx = reinterpret_cast<Monero::PendingTransaction*>(pendingTx_ptr); +// std::vector<std::string> txid = pendingTx->txHex(); +// return vectorToString(txid, std::string(separator)); +// } + const char* WOWNERO_PendingTransaction_txKey(void* pendingTx_ptr, const char* separator) { Monero::PendingTransaction *pendingTx = reinterpret_cast<Monero::PendingTransaction*>(pendingTx_ptr); std::vector<std::string> txid = pendingTx->txKey(); @@ -1613,9 +1619,10 @@ bool WOWNERO_WalletManager_verifyWalletPassword(void* wm_ptr, const char* keys_f return wm->verifyWalletPassword(std::string(keys_file_name), std::string(password), no_spend_key, kdf_rounds); } // virtual bool queryWalletDevice(Wallet::Device& device_type, const std::string &keys_file_name, const std::string &password, uint64_t kdf_rounds = 1) const = 0; -// bool WOWNERO_WalletManager_queryWalletDevice(int device_type, const char* keys_file_name, const char* password, uint64_t kdf_rounds) { -// return Monero::WalletManagerFactory::getWalletManager()->queryWalletDevice(device_type, std::string(keys_file_name), std::string(password), kdf_rounds); -//} +// bool WOWNERO_WalletManager_queryWalletDevice(void* wm_ptr, int device_type, const char* keys_file_name, const char* password, uint64_t kdf_rounds) { +// Monero::WalletManager *wm = reinterpret_cast<Monero::WalletManager*>(wm_ptr); +// return wm->queryWalletDevice(reinterpret_cast<Monero::Wallet::Device>(device_type), std::string(keys_file_name), std::string(password), kdf_rounds); +// } // virtual std::vector<std::string> findWallets(const std::string &path) = 0; const char* WOWNERO_WalletManager_findWallets(void* wm_ptr, const char* path, const char* separator) { Monero::WalletManager *wm = reinterpret_cast<Monero::WalletManager*>(wm_ptr); @@ -1705,6 +1712,10 @@ void WOWNERO_WalletManagerFactory_setLogLevel(int level) { Monero::WalletManagerFactory::setLogLevel(level); } +void WOWNERO_WalletManagerFactory_setLogCategories(const char* categories) { + Monero::WalletManagerFactory::setLogCategories(std::string(categories)); +} + // DEBUG functions // As it turns out we need a bit more functions to make sure that the library is working. diff --git a/wownero_libwallet2_api_c/src/main/cpp/wallet2_api_c.h b/wownero_libwallet2_api_c/src/main/cpp/wallet2_api_c.h index 4321f16..7219c10 100644 --- a/wownero_libwallet2_api_c/src/main/cpp/wallet2_api_c.h +++ b/wownero_libwallet2_api_c/src/main/cpp/wallet2_api_c.h @@ -100,7 +100,7 @@ extern ADDAPI const char* WOWNERO_PendingTransaction_signersKeys(void* pendingTx // virtual std::vector<std::string> hex() const = 0; extern ADDAPI const char* WOWNERO_PendingTransaction_hex(void* pendingTx_ptr, const char* separator); // virtual std::vector<std::string> txKey() const = 0; -extern ADDAPI const char* WOWNERO_PendingTransaction_txHex(void* pendingTx_ptr, const char* separator); +// extern ADDAPI const char* WOWNERO_PendingTransaction_txHex(void* pendingTx_ptr, const char* separator); // }; // struct UnsignedTransaction @@ -921,7 +921,7 @@ extern ADDAPI bool WOWNERO_WalletManager_walletExists(void* wm_ptr, const char* // virtual bool verifyWalletPassword(const std::string &keys_file_name, const std::string &password, bool no_spend_key, uint64_t kdf_rounds = 1) const = 0; extern ADDAPI bool WOWNERO_WalletManager_verifyWalletPassword(void* wm_ptr, const char* keys_file_name, const char* password, bool no_spend_key, uint64_t kdf_rounds); // virtual bool queryWalletDevice(Wallet::Device& device_type, const std::string &keys_file_name, const std::string &password, uint64_t kdf_rounds = 1) const = 0; -extern ADDAPI bool WOWNERO_WalletManager_queryWalletDevice(int device_type, const char* keys_file_name, const char* password, uint64_t kdf_rounds); +// extern ADDAPI bool WOWNERO_WalletManager_queryWalletDevice(void* wm_ptr, int device_type, const char* keys_file_name, const char* password, uint64_t kdf_rounds); // virtual std::vector<std::string> findWallets(const std::string &path) = 0; extern ADDAPI const char* WOWNERO_WalletManager_findWallets(void* wm_ptr, const char* path, const char* separator); // virtual std::string errorString() const = 0; diff --git a/wownero_libwallet2_api_c/wownero_libwallet2_api_c.exp b/wownero_libwallet2_api_c/wownero_libwallet2_api_c.exp index 4954174..09cb687 100644 --- a/wownero_libwallet2_api_c/wownero_libwallet2_api_c.exp +++ b/wownero_libwallet2_api_c/wownero_libwallet2_api_c.exp @@ -12,7 +12,6 @@ _WOWNERO_PendingTransaction_multisigSignData _WOWNERO_PendingTransaction_signMultisigTx _WOWNERO_PendingTransaction_signersKeys _WOWNERO_PendingTransaction_hex -_WOWNERO_PendingTransaction_txHex _WOWNERO_UnsignedTransaction_status _WOWNERO_UnsignedTransaction_errorString _WOWNERO_UnsignedTransaction_amount @@ -249,7 +248,6 @@ _WOWNERO_WalletManager_createWalletFromPolyseed _WOWNERO_WalletManager_closeWallet _WOWNERO_WalletManager_walletExists _WOWNERO_WalletManager_verifyWalletPassword -_WOWNERO_WalletManager_queryWalletDevice _WOWNERO_WalletManager_findWallets _WOWNERO_WalletManager_errorString _WOWNERO_WalletManager_setDaemonAddress |