Skip to content

Commit

Permalink
fix darwin builds
Browse files Browse the repository at this point in the history
  • Loading branch information
@MrCyjaneK
MrCyjaneK committed Jul 16, 2024
1 parent b3da711 commit 2de2e59
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 10 deletions.
2 changes: 0 additions & 2 deletions monero_libwallet2_api_c/monero_libwallet2_api_c.exp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions monero_libwallet2_api_c/src/main/cpp/wallet2_api_c.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion monero_libwallet2_api_c/src/main/cpp/wallet2_api_c.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
17 changes: 14 additions & 3 deletions wownero_libwallet2_api_c/src/main/cpp/wallet2_api_c.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions wownero_libwallet2_api_c/src/main/cpp/wallet2_api_c.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 0 additions & 2 deletions wownero_libwallet2_api_c/wownero_libwallet2_api_c.exp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 2de2e59

Please sign in to comment.