From 12bc3aaaa9aafb7db0b08ad1343f830070aa18d3 Mon Sep 17 00:00:00 2001 From: Czarek Nakamoto Date: Thu, 4 Jan 2024 22:17:42 +0100 Subject: drop cache, it is causing more trouble than it's worth implement anonero's fork functions in bridge. Calling it RC39 to not break versioning. --- libbridge/src/main/cpp/helpers.cpp | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'libbridge/src/main/cpp/helpers.cpp') diff --git a/libbridge/src/main/cpp/helpers.cpp b/libbridge/src/main/cpp/helpers.cpp index 064ce36..fac131a 100644 --- a/libbridge/src/main/cpp/helpers.cpp +++ b/libbridge/src/main/cpp/helpers.cpp @@ -143,3 +143,17 @@ const char* vectorToString(const std::set& intSet, const std::string s memcpy(buffer, str.c_str(), size + 1); return buffer; } + +std::set splitString(const std::string& str, const std::string& delim) { + std::set tokens; + size_t pos = 0; + std::string token; + std::string content = str; // Copy of str so we can safely erase content + while ((pos = content.find(delim)) != std::string::npos) { + token = content.substr(0, pos); + tokens.insert(token); + content.erase(0, pos + delim.length()); + } + tokens.insert(content); // Inserting the last token + return tokens; +} \ No newline at end of file -- cgit v1.2.3 From 54611055816001884a91c1760722de8c0af8b294 Mon Sep 17 00:00:00 2001 From: Czarek Nakamoto Date: Fri, 5 Jan 2024 17:32:49 +0100 Subject: fix splitString, add logging --- libbridge/src/main/cpp/helpers.cpp | 1 + libbridge/src/main/cpp/wallet2_api_c.cpp | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'libbridge/src/main/cpp/helpers.cpp') diff --git a/libbridge/src/main/cpp/helpers.cpp b/libbridge/src/main/cpp/helpers.cpp index fac131a..04befc6 100644 --- a/libbridge/src/main/cpp/helpers.cpp +++ b/libbridge/src/main/cpp/helpers.cpp @@ -146,6 +146,7 @@ const char* vectorToString(const std::set& intSet, const std::string s std::set splitString(const std::string& str, const std::string& delim) { std::set tokens; + if (str.empty()) return tokens; size_t pos = 0; std::string token; std::string content = str; // Copy of str so we can safely erase content diff --git a/libbridge/src/main/cpp/wallet2_api_c.cpp b/libbridge/src/main/cpp/wallet2_api_c.cpp index 3e56263..31f3bd4 100644 --- a/libbridge/src/main/cpp/wallet2_api_c.cpp +++ b/libbridge/src/main/cpp/wallet2_api_c.cpp @@ -1178,10 +1178,15 @@ void* MONERO_Wallet_createTransaction(void* wallet_ptr, const char* dst_addr, co } std::set subaddr_indices = {}; std::set preferred_inputs = splitString(std::string(preferredInputs), std::string(separator)); + wallet->info("MONERO_C", "TEST"); + wallet->info("MONERO_C", preferredInputs); + wallet->info("MONERO_C", std::to_string(preferred_inputs.size())); + auto oneInput = *(preferred_inputs.begin()); + wallet->info("MONERO_C", oneInput); return wallet->createTransaction(std::string(dst_addr), std::string(payment_id), optAmount, mixin_count, Monero::PendingTransaction::Priority_Low, - subaddr_account, subaddr_indices); + subaddr_account, subaddr_indices, preferred_inputs); } void* MONERO_Wallet_loadUnsignedTx(void* wallet_ptr, const char* fileName) { Monero::Wallet *wallet = reinterpret_cast(wallet_ptr); -- cgit v1.2.3