From c83ab742bfd47aaf4c286f06ce702988b4940137 Mon Sep 17 00:00:00 2001 From: woodser Date: Mon, 12 Apr 2021 10:05:00 -0400 Subject: [PATCH] update to monero-project v0.17.2.0 --- external/monero-project | 2 +- src/utils/monero_utils.cpp | 4 +--- src/wallet/monero_wallet_full.cpp | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/external/monero-project b/external/monero-project index 28f60ef..d3fd7d3 160000 --- a/external/monero-project +++ b/external/monero-project @@ -1 +1 @@ -Subproject commit 28f60ef569f795a0b21e06aa14e0de69c7416c7f +Subproject commit d3fd7d37f5a06758984abc09415d1555d544df19 diff --git a/src/utils/monero_utils.cpp b/src/utils/monero_utils.cpp index 4261831..7c50cba 100644 --- a/src/utils/monero_utils.cpp +++ b/src/utils/monero_utils.cpp @@ -82,9 +82,7 @@ void monero_utils::validate_address(const std::string& address, monero_network_t void monero_utils::json_to_binary(const std::string &json, std::string &bin) { epee::serialization::portable_storage ps; ps.load_from_json(json); - epee::byte_slice bin_slice; - ps.store_to_binary(bin_slice); - bin.assign(reinterpret_cast(bin_slice.data()), bin_slice.size()); + ps.store_to_binary(bin); } void monero_utils::binary_to_json(const std::string &bin, std::string &json) { diff --git a/src/wallet/monero_wallet_full.cpp b/src/wallet/monero_wallet_full.cpp index e35aa08..fde345f 100644 --- a/src/wallet/monero_wallet_full.cpp +++ b/src/wallet/monero_wallet_full.cpp @@ -370,7 +370,7 @@ namespace monero { output->m_subaddress_index = td.m_subaddr_index.minor; output->m_is_spent = td.m_spent; output->m_is_frozen = td.m_frozen; - output->m_stealth_public_key = epee::string_tools::pod_to_hex(td.get_public_key()); + //output->m_stealth_public_key = epee::string_tools::pod_to_hex(td.get_public_key()); if (td.m_key_image_known) { output->m_key_image = std::make_shared(); output->m_key_image.get()->m_hex = epee::string_tools::pod_to_hex(td.m_key_image);