From b4c3fbacab594bd1e67e71602a1ac07f0c19a77f Mon Sep 17 00:00:00 2001 From: cyan Date: Wed, 15 Jan 2025 14:04:42 +0100 Subject: Wownero 0.11.3.0 (#105) * update wownero to 0.11.3.0 * Updated wownero, cleaned up patches * unshallow zano * Fix ios builds * Update checksum --- patches/wownero/0007-UR-functions.patch | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'patches/wownero/0007-UR-functions.patch') diff --git a/patches/wownero/0007-UR-functions.patch b/patches/wownero/0007-UR-functions.patch index ad0592c..0bdc695 100644 --- a/patches/wownero/0007-UR-functions.patch +++ b/patches/wownero/0007-UR-functions.patch @@ -1,4 +1,4 @@ -From 1302c64b0218da6d32b9dd9cbf1c2c56f51e6aff Mon Sep 17 00:00:00 2001 +From 031df7de0d75d93f78be732d5cac702b0ab193f0 Mon Sep 17 00:00:00 2001 From: tobtoht Date: Tue, 12 Mar 2024 10:09:50 +0100 Subject: [PATCH 07/15] UR functions @@ -53,7 +53,7 @@ index 991071fbe..b24855d9b 100644 + url = https://github.com/MrCyjaneK/bc-ur + branch = misc diff --git a/CMakeLists.txt b/CMakeLists.txt -index e387ffb1b..8b81c7ab7 100644 +index b4b8c8089..88335ee9d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -96,7 +96,8 @@ enable_language(C ASM) @@ -98,10 +98,10 @@ index f118c754e..f26655d68 100644 SET(LLVM_ENABLE_PIC OFF) SET(LLVM_ENABLE_PIE OFF) diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt -index 3184ae5a1..88a7bb0b5 100644 +index 29aed0cc6..dfdffe67c 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt -@@ -72,4 +72,5 @@ endif() +@@ -69,4 +69,5 @@ endif() add_subdirectory(db_drivers) add_subdirectory(easylogging++) add_subdirectory(qrcodegen) @@ -780,7 +780,7 @@ index e349df176..764adbfbf 100644 /*! * \brief scanTransactions - scan a list of transaction ids, this operation may reveal the txids to the remote node and affect your privacy diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp -index 1e527cf97..671fa5298 100644 +index 48267d647..e14d4d2fc 100644 --- a/src/wallet/wallet2.cpp +++ b/src/wallet/wallet2.cpp @@ -948,6 +948,16 @@ uint32_t get_subaddress_clamped_sum(uint32_t idx, uint32_t extra) @@ -800,7 +800,7 @@ index 1e527cf97..671fa5298 100644 static void setup_shim(hw::wallet_shim * shim, tools::wallet2 * wallet) { shim->get_tx_pub_key_from_received_outs = std::bind(&tools::wallet2::get_tx_pub_key_from_received_outs, wallet, std::placeholders::_1); -@@ -6989,6 +6999,25 @@ uint64_t wallet2::unlocked_balance(uint32_t index_major, bool strict, uint64_t * +@@ -6998,6 +7008,25 @@ uint64_t wallet2::unlocked_balance(uint32_t index_major, bool strict, uint64_t * return amount; } //---------------------------------------------------------------------------------------------------- @@ -826,7 +826,7 @@ index 1e527cf97..671fa5298 100644 std::map wallet2::balance_per_subaddress(uint32_t index_major, bool strict) const { std::map amount_per_subaddr; -@@ -7840,9 +7869,7 @@ bool wallet2::sign_tx(unsigned_tx_set &exported_txs, std::vector additional_derivations; @@ -837,7 +837,7 @@ index 1e527cf97..671fa5298 100644 std::vector additional_tx_pub_keys; for (const crypto::secret_key &skey: txs[n].additional_tx_keys) { -@@ -11232,7 +11259,7 @@ std::vector wallet2::create_transactions_2(std::vector wallet2::create_transactions_2(std::vector m_ignore_outputs_above || td.amount() < m_ignore_outputs_below) { -@@ -11282,9 +11309,15 @@ std::vector wallet2::create_transactions_2(std::vector wallet2::create_transactions_2(std::vector>> wallet2::export_key_images(bool all) const { -@@ -13992,53 +14032,60 @@ std::pair> +@@ -14001,53 +14041,60 @@ std::pair> return std::make_pair(offset, ski); } @@ -1008,10 +1008,10 @@ index 1e527cf97..671fa5298 100644 ski.push_back(std::make_pair(key_image, signature)); } diff --git a/src/wallet/wallet2.h b/src/wallet/wallet2.h -index c07a47c11..80ff0698d 100644 +index 022d0696f..746e2aeff 100644 --- a/src/wallet/wallet2.h +++ b/src/wallet/wallet2.h -@@ -1150,6 +1150,7 @@ private: +@@ -1157,6 +1157,7 @@ private: // locked & unlocked balance of given or current subaddress account uint64_t balance(uint32_t subaddr_index_major, bool strict) const; uint64_t unlocked_balance(uint32_t subaddr_index_major, bool strict, uint64_t *blocks_to_unlock = NULL, uint64_t *time_to_unlock = NULL); @@ -1019,7 +1019,7 @@ index c07a47c11..80ff0698d 100644 // locked & unlocked balance per subaddress of given or current subaddress account std::map balance_per_subaddress(uint32_t subaddr_index_major, bool strict) const; std::map>> unlocked_balance_per_subaddress(uint32_t subaddr_index_major, bool strict); -@@ -1624,9 +1625,11 @@ private: +@@ -1631,9 +1632,11 @@ private: std::tuple> export_blockchain() const; void import_blockchain(const std::tuple> &bc); bool export_key_images(const std::string &filename, bool all = false) const; @@ -1032,5 +1032,5 @@ index c07a47c11..80ff0698d 100644 bool import_key_images(signed_tx_set & signed_tx, size_t offset=0, bool only_selected_transfers=false); crypto::public_key get_tx_pub_key_from_received_outs(const tools::wallet2::transfer_details &td) const; -- -2.39.5 (Apple Git-154) +2.48.0 -- cgit v1.2.3