From d7a38301ece1a166af7b230e34be6e950e0aeb3c Mon Sep 17 00:00:00 2001 From: cyan Date: Mon, 26 Aug 2024 06:57:16 +0200 Subject: Monero v0.18.3.4 (#38) * updated monero dependency * update patches for v0.18.3.4 * update generate checksum to include version of submodule as well --- monero_libwallet2_api_c/src/main/cpp/monero_checksum.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'monero_libwallet2_api_c/src') diff --git a/monero_libwallet2_api_c/src/main/cpp/monero_checksum.h b/monero_libwallet2_api_c/src/main/cpp/monero_checksum.h index 56b583f..f07cafe 100644 --- a/monero_libwallet2_api_c/src/main/cpp/monero_checksum.h +++ b/monero_libwallet2_api_c/src/main/cpp/monero_checksum.h @@ -1,6 +1,6 @@ #ifndef MONEROC_CHECKSUMS #define MONEROC_CHECKSUMS const char * MONERO_wallet2_api_c_h_sha256 = "e8db0ef0324a153f5e3ecca4c0db23c54f4576e84988f04bd4f11c1142f9d7ad"; -const char * MONERO_wallet2_api_c_cpp_sha256 = "d1842cded0040c16b8886878681c8938005f69ec1378fa9be68a430311cc3666"; +const char * MONERO_wallet2_api_c_cpp_sha256 = "d1842cded0040c16b8886878681c8938005f69ec1378fa9be68a430311cc3666-b089f9ee69924882c5d14dd1a6991deb05d9d1cd"; const char * MONERO_wallet2_api_c_exp_sha256 = "c8913ac41068f67b57c9b0a3c7dd8973e3c1273b66c2ff0aadb0003931da748c"; #endif -- cgit v1.2.3 From b1f49d4b99aed681c8a96bf48a1fc56108babb3b Mon Sep 17 00:00:00 2001 From: Czarek Nakamoto Date: Wed, 28 Aug 2024 09:12:32 +0200 Subject: fix multdest mixing --- monero_libwallet2_api_c/src/main/cpp/wallet2_api_c.cpp | 3 +-- wownero_libwallet2_api_c/src/main/cpp/wallet2_api_c.cpp | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'monero_libwallet2_api_c/src') 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 13f99d5..407d700 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 @@ -1311,8 +1311,7 @@ void* MONERO_Wallet_createTransactionMultDest(void* wallet_ptr, const char* dst_ uint32_t subaddr_account, const char* preferredInputs, const char* preferredInputs_separator) { Monero::Wallet *wallet = reinterpret_cast(wallet_ptr); - std::set dst_addr_ = splitString(std::string(dst_addr_list), std::string(dst_addr_list_separator)); - std::vector dst_addr(dst_addr_.begin(), dst_addr_.end()); + std::vector dst_addr = splitStringVector(std::string(dst_addr_list), std::string(dst_addr_list_separator)); Monero::optional> optAmount; if (!amount_sweep_all) { 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 9e953b5..2347496 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 @@ -1252,8 +1252,7 @@ void* WOWNERO_Wallet_createTransactionMultDest(void* wallet_ptr, const char* dst uint32_t subaddr_account, const char* preferredInputs, const char* preferredInputs_separator) { Monero::Wallet *wallet = reinterpret_cast(wallet_ptr); - std::set dst_addr_ = splitString(std::string(dst_addr_list), std::string(dst_addr_list_separator)); - std::vector dst_addr(dst_addr_.begin(), dst_addr_.end()); + std::set dst_addr = splitStringVector(std::string(dst_addr_list), std::string(dst_addr_list_separator)); Monero::optional> optAmount; if (!amount_sweep_all) { -- cgit v1.2.3 From 00a935025e1f405ae84f0618669011b12e6a6514 Mon Sep 17 00:00:00 2001 From: Czarek Nakamoto Date: Wed, 28 Aug 2024 11:07:35 +0200 Subject: update checksum --- generate_checksum.sh | 2 +- impls/monero.dart/lib/src/checksum_monero.dart | 2 +- impls/monero.dart/lib/src/checksum_wownero.dart | 2 +- monero_libwallet2_api_c/src/main/cpp/monero_checksum.h | 2 +- wownero_libwallet2_api_c/src/main/cpp/wownero_checksum.h | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) (limited to 'monero_libwallet2_api_c/src') diff --git a/generate_checksum.sh b/generate_checksum.sh index 7fcca70..5847ff5 100755 --- a/generate_checksum.sh +++ b/generate_checksum.sh @@ -1,6 +1,6 @@ #!/bin/bash cd "$(realpath $(dirname $0))" - +function sha256sum() { shasum -a 256 "$@" ; } && export -f sha256sum for coin in monero wownero; do submodule_hash=$(git ls-tree HEAD ${coin} | xargs | awk '{ print $3 }') diff --git a/impls/monero.dart/lib/src/checksum_monero.dart b/impls/monero.dart/lib/src/checksum_monero.dart index 364e618..4ab72a3 100644 --- a/impls/monero.dart/lib/src/checksum_monero.dart +++ b/impls/monero.dart/lib/src/checksum_monero.dart @@ -1,4 +1,4 @@ // ignore_for_file: constant_identifier_names const String wallet2_api_c_h_sha256 = "e8db0ef0324a153f5e3ecca4c0db23c54f4576e84988f04bd4f11c1142f9d7ad"; -const String wallet2_api_c_cpp_sha256 = "d1842cded0040c16b8886878681c8938005f69ec1378fa9be68a430311cc3666-b089f9ee69924882c5d14dd1a6991deb05d9d1cd"; +const String wallet2_api_c_cpp_sha256 = "dca52ac9ee009fda9fb5726543a454885e61d8eb74fb33112288029ed625bec5-b089f9ee69924882c5d14dd1a6991deb05d9d1cd"; const String wallet2_api_c_exp_sha256 = "c8913ac41068f67b57c9b0a3c7dd8973e3c1273b66c2ff0aadb0003931da748c"; diff --git a/impls/monero.dart/lib/src/checksum_wownero.dart b/impls/monero.dart/lib/src/checksum_wownero.dart index 5b71c28..8d08889 100644 --- a/impls/monero.dart/lib/src/checksum_wownero.dart +++ b/impls/monero.dart/lib/src/checksum_wownero.dart @@ -1,4 +1,4 @@ // ignore_for_file: constant_identifier_names const String wallet2_api_c_h_sha256 = "8a8d386dd5d996c89a0586c55b295ef95ca584bf1ffa26255152b291910a0a77"; -const String wallet2_api_c_cpp_sha256 = "ed400bd9c4709383ffd42a9fbe68be37a2a47a42f92eacaf3a2dbd248c422739-e25963cbc11ca0a0fe5eb34b9bd7c72e4f51b795"; +const String wallet2_api_c_cpp_sha256 = "28e4d44c565cd7d97d3f18cdd322be48f89dc9fded82fb533af56a8eaa4e0bda-e25963cbc11ca0a0fe5eb34b9bd7c72e4f51b795"; const String wallet2_api_c_exp_sha256 = "3673e40e1a7115552276d1d541f6e4d5a0fef47c40fff7b988f49923af84c8a4"; diff --git a/monero_libwallet2_api_c/src/main/cpp/monero_checksum.h b/monero_libwallet2_api_c/src/main/cpp/monero_checksum.h index f07cafe..20cbeae 100644 --- a/monero_libwallet2_api_c/src/main/cpp/monero_checksum.h +++ b/monero_libwallet2_api_c/src/main/cpp/monero_checksum.h @@ -1,6 +1,6 @@ #ifndef MONEROC_CHECKSUMS #define MONEROC_CHECKSUMS const char * MONERO_wallet2_api_c_h_sha256 = "e8db0ef0324a153f5e3ecca4c0db23c54f4576e84988f04bd4f11c1142f9d7ad"; -const char * MONERO_wallet2_api_c_cpp_sha256 = "d1842cded0040c16b8886878681c8938005f69ec1378fa9be68a430311cc3666-b089f9ee69924882c5d14dd1a6991deb05d9d1cd"; +const char * MONERO_wallet2_api_c_cpp_sha256 = "dca52ac9ee009fda9fb5726543a454885e61d8eb74fb33112288029ed625bec5-b089f9ee69924882c5d14dd1a6991deb05d9d1cd"; const char * MONERO_wallet2_api_c_exp_sha256 = "c8913ac41068f67b57c9b0a3c7dd8973e3c1273b66c2ff0aadb0003931da748c"; #endif diff --git a/wownero_libwallet2_api_c/src/main/cpp/wownero_checksum.h b/wownero_libwallet2_api_c/src/main/cpp/wownero_checksum.h index 9a6f552..b7ff10c 100644 --- a/wownero_libwallet2_api_c/src/main/cpp/wownero_checksum.h +++ b/wownero_libwallet2_api_c/src/main/cpp/wownero_checksum.h @@ -1,6 +1,6 @@ #ifndef MONEROC_CHECKSUMS #define MONEROC_CHECKSUMS const char * WOWNERO_wallet2_api_c_h_sha256 = "8a8d386dd5d996c89a0586c55b295ef95ca584bf1ffa26255152b291910a0a77"; -const char * WOWNERO_wallet2_api_c_cpp_sha256 = "ed400bd9c4709383ffd42a9fbe68be37a2a47a42f92eacaf3a2dbd248c422739-e25963cbc11ca0a0fe5eb34b9bd7c72e4f51b795"; +const char * WOWNERO_wallet2_api_c_cpp_sha256 = "28e4d44c565cd7d97d3f18cdd322be48f89dc9fded82fb533af56a8eaa4e0bda-e25963cbc11ca0a0fe5eb34b9bd7c72e4f51b795"; const char * WOWNERO_wallet2_api_c_exp_sha256 = "3673e40e1a7115552276d1d541f6e4d5a0fef47c40fff7b988f49923af84c8a4"; #endif -- cgit v1.2.3