From a1e087b61726e0a82f4f1250f15ff82f7edf56f8 Mon Sep 17 00:00:00 2001 From: Czarek Nakamoto Date: Mon, 1 Jan 2024 14:01:31 +0100 Subject: [PATCH] - helpers.cpp: - functions for dealing with: - std::vector - std::vector - std::vector> - wallet2_api_c.h: - PendingTransaction - txid - subaddrAccount - subaddrIndices - multisigSignData - signMultisigTx - signersKeys --- libbridge/CMakeLists.txt | 1 + libbridge/src/main/cpp/helpers.cpp | 86 ++++++++++++++++++++++++ libbridge/src/main/cpp/helpers.hpp | 8 +++ libbridge/src/main/cpp/wallet2_api_c.cpp | 34 +++++++++- libbridge/src/main/cpp/wallet2_api_c.h | 9 +++ 5 files changed, 137 insertions(+), 1 deletion(-) create mode 100644 libbridge/src/main/cpp/helpers.cpp create mode 100644 libbridge/src/main/cpp/helpers.hpp diff --git a/libbridge/CMakeLists.txt b/libbridge/CMakeLists.txt index df2e7f7..e82b3d1 100644 --- a/libbridge/CMakeLists.txt +++ b/libbridge/CMakeLists.txt @@ -6,6 +6,7 @@ set (CMAKE_CXX_STANDARD 11) add_library( wallet2_api_c SHARED + src/main/cpp/helpers.cpp src/main/cpp/wallet2_api_c.cpp ) set(EXTERNAL_LIBS_DIR ${CMAKE_SOURCE_DIR}/..) diff --git a/libbridge/src/main/cpp/helpers.cpp b/libbridge/src/main/cpp/helpers.cpp new file mode 100644 index 0000000..c19c39d --- /dev/null +++ b/libbridge/src/main/cpp/helpers.cpp @@ -0,0 +1,86 @@ +#include +#include +#include +#include +#include +#include +#include +#include "helpers.hpp" +#include +#include + +const char* vectorToString(const std::vector& vec, const std::string separator) { + // Concatenate all strings in the vector + std::string result; + for (const auto& str : vec) { + result += str; + } + const char* cstr = result.c_str(); + return cstr; +} + +const char* vectorToString(const std::vector& vec, const std::string separator) { + // Calculate the size needed for the result string + size_t size = 0; + for (size_t i = 0; i < vec.size(); ++i) { + // Calculate the number of digits in each element + size += snprintf(nullptr, 0, "%u", vec[i]); + // Add comma and space for all elements except the last one + if (i < vec.size() - 1) { + size += 2; // comma and space + } + } + + // Allocate memory for the result string + char* result = static_cast(malloc(size + 1)); + if (result == nullptr) { + // Handle memory allocation failure + return nullptr; + } + + // Fill in the result string + char* current = result; + for (size_t i = 0; i < vec.size(); ++i) { + // Convert each element to string and copy to the result string + int written = snprintf(current, size + 1, "%u", vec[i]); + current += written; + // Add comma and space for all elements except the last one + if (i < vec.size() - 1) { + strcpy(current, ", "); + current += 2; + } + } + + return result; +} + +const char* vectorToString(const std::vector>& vec, const std::string separator) { + // Check if the vector is empty + if (vec.empty()) { + return ""; + } + + // Use a stringstream to concatenate sets with commas and individual elements with spaces + std::ostringstream oss; + oss << "{"; + for (auto it = vec.begin(); it != vec.end(); ++it) { + if (it != vec.begin()) { + oss << separator; + } + + oss << "{"; + for (auto setIt = it->begin(); setIt != it->end(); ++setIt) { + if (setIt != it->begin()) { + oss << separator; + } + oss << *setIt; + } + oss << "}"; + } + oss << "}"; + std::string str = oss.str(); + const std::string::size_type size = str.size(); + char *buffer = new char[size + 1]; //we need extra char for NUL + memcpy(buffer, str.c_str(), size + 1); + return buffer; +} diff --git a/libbridge/src/main/cpp/helpers.hpp b/libbridge/src/main/cpp/helpers.hpp new file mode 100644 index 0000000..0f79677 --- /dev/null +++ b/libbridge/src/main/cpp/helpers.hpp @@ -0,0 +1,8 @@ +#include +#include +#include +#include + +const char* vectorToString(const std::vector& vec, const std::string separator); +const char* vectorToString(const std::vector& vec, const std::string separator); +const char* vectorToString(const std::vector>& vec, const std::string separator); \ No newline at end of file diff --git a/libbridge/src/main/cpp/wallet2_api_c.cpp b/libbridge/src/main/cpp/wallet2_api_c.cpp index b756342..9e8d9fa 100644 --- a/libbridge/src/main/cpp/wallet2_api_c.cpp +++ b/libbridge/src/main/cpp/wallet2_api_c.cpp @@ -2,6 +2,7 @@ #include "wallet2_api_c.h" #include "wallet2_api.h" #include +#include "helpers.hpp" #ifdef __cplusplus extern "C" @@ -55,11 +56,42 @@ uint64_t MONERO_PendingTransaction_fee(void* pendingTx_ptr) { Monero::PendingTransaction *pendingTx = reinterpret_cast(pendingTx_ptr); return pendingTx->fee(); } +const char* MONERO_PendingTransaction_txid(void* pendingTx_ptr, const char* separator) { + Monero::PendingTransaction *pendingTx = reinterpret_cast(pendingTx_ptr); + std::vector txid = pendingTx->txid(); + return vectorToString(txid, std::string(separator)); +} uint64_t MONERO_PendingTransaction_txCount(void* pendingTx_ptr) { Monero::PendingTransaction *pendingTx = reinterpret_cast(pendingTx_ptr); return pendingTx->txCount(); } - +const char* MONERO_PendingTransaction_subaddrAccount(void* pendingTx_ptr, const char* separator) { + Monero::PendingTransaction *pendingTx = reinterpret_cast(pendingTx_ptr); + std::vector subaddrAccount = pendingTx->subaddrAccount(); + return vectorToString(subaddrAccount, std::string(separator)); +} +const char* MONERO_PendingTransaction_subaddrIndices(void* pendingTx_ptr, const char* separator) { + Monero::PendingTransaction *pendingTx = reinterpret_cast(pendingTx_ptr); + std::vector> subaddrIndices = pendingTx->subaddrIndices(); + return vectorToString(subaddrIndices, std::string(separator)); +} +const char* MONERO_PendingTransaction_multisigSignData(void* pendingTx_ptr) { + Monero::PendingTransaction *pendingTx = reinterpret_cast(pendingTx_ptr); + std::string str = pendingTx->multisigSignData(); + const std::string::size_type size = str.size(); + char *buffer = new char[size + 1]; //we need extra char for NUL + memcpy(buffer, str.c_str(), size + 1); + return buffer; +} +void MONERO_PendingTransaction_signMultisigTx(void* pendingTx_ptr) { + Monero::PendingTransaction *pendingTx = reinterpret_cast(pendingTx_ptr); + return pendingTx->signMultisigTx(); +} +const char* MONERO_PendingTransaction_signersKeys(void* pendingTx_ptr, const char* separator) { + Monero::PendingTransaction *pendingTx = reinterpret_cast(pendingTx_ptr); + std::vector txid = pendingTx->signersKeys(); + return vectorToString(txid, std::string(separator)); +} // TransactionInfo int MONERO_TransactionInfo_direction(void* txInfo_ptr) { Monero::TransactionInfo *txInfo = reinterpret_cast(txInfo_ptr); diff --git a/libbridge/src/main/cpp/wallet2_api_c.h b/libbridge/src/main/cpp/wallet2_api_c.h index e2c23bb..234ab79 100644 --- a/libbridge/src/main/cpp/wallet2_api_c.h +++ b/libbridge/src/main/cpp/wallet2_api_c.h @@ -9,6 +9,7 @@ #include #include #include +#include #ifdef __cplusplus extern "C" @@ -68,13 +69,19 @@ uint64_t MONERO_PendingTransaction_dust(void* pendingTx_ptr); // virtual uint64_t fee() const = 0; uint64_t MONERO_PendingTransaction_fee(void* pendingTx_ptr); // virtual std::vector txid() const = 0; +const char* MONERO_PendingTransaction_txid(void* pendingTx_ptr, const char* separator); // virtual uint64_t txCount() const = 0; uint64_t MONERO_PendingTransaction_txCount(void* pendingTx_ptr); // virtual std::vector subaddrAccount() const = 0; +const char* MONERO_PendingTransaction_subaddrAccount(void* pendingTx_ptr, const char* separator); // virtual std::vector> subaddrIndices() const = 0; +const char* MONERO_PendingTransaction_subaddrIndices(void* pendingTx_ptr, const char* separator); // virtual std::string multisigSignData() = 0; +const char* MONERO_PendingTransaction_multisigSignData(void* pendingTx_ptr); // virtual void signMultisigTx() = 0; +void MONERO_PendingTransaction_signMultisigTx(void* pendingTx_ptr); // virtual std::vector signersKeys() const = 0; +const char* MONERO_PendingTransaction_signersKeys(void* pendingTx_ptr, const char* separator); // }; // struct UnsignedTransaction @@ -86,7 +93,9 @@ uint64_t MONERO_PendingTransaction_txCount(void* pendingTx_ptr); // }; // virtual ~UnsignedTransaction() = 0; // virtual int status() const = 0; +// int MONERO_UnsignedTransaction_status(void* unsignedTx_ptr); // virtual std::string errorString() const = 0; +// const char* MONERO_UnsignedTransaction_errorString(void* unsignedTx_ptr); // virtual std::vector amount() const = 0; // virtual std::vector fee() const = 0; // virtual std::vector mixin() const = 0;