tiamak/monero_c
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix darwin builds

Browse Source
This commit is contained in:
Czarek Nakamoto
2024-07-16 13:16:21 +02:00
parent b3da711965
commit 2de2e59c3c
6 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
wownero_libwallet2_api_c/src/main/cpp/wallet2_api_c.cpp
View File

@@ -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.

4
wownero_libwallet2_api_c/src/main/cpp/wallet2_api_c.h
View File

@@ -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;

2
wownero_libwallet2_api_c/wownero_libwallet2_api_c.exp
View File

@@ -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