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

.gitmodules

@@ -10,7 +10,7 @@
 [submodule "zano"]
 	path = zano
 	url = https://github.com/hyle-team/zano
-	shallow = true
+	shallow = false
 [submodule "wownero_libwallet2_api_c/wownero-seed"]
 	path = wownero_libwallet2_api_c/wownero-seed
 	url = https://github.com/MrCyjaneK/wownero-seed

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 = "f99009d1ca1d1c783cc9aa0fb63f680d48753b88124fb5de2079c57b7e34c827";
-const String wallet2_api_c_cpp_sha256 = "70b39a0bef660cb9ba0397117eb1590e18461ace89ab18141690658a2a537d5d-dd46a31f3cab67b316e9239b15acf7d5cea60aa9";
+const String wallet2_api_c_cpp_sha256 = "70b39a0bef660cb9ba0397117eb1590e18461ace89ab18141690658a2a537d5d-3e302be710f4e6b4f58642989c8e47711362fa56";
 const String wallet2_api_c_exp_sha256 = "5f53ea8bbe66a5e5aa6cbc4ca00695900e08589cfd32062e88965a24252d05ba";

impls/monero.ts/checksum_wownero.ts

@@ -1,5 +1,5 @@
 export const wowneroChecksum = {
     wallet2_api_c_h_sha256: "f99009d1ca1d1c783cc9aa0fb63f680d48753b88124fb5de2079c57b7e34c827",
-    wallet2_api_c_cpp_sha256: "70b39a0bef660cb9ba0397117eb1590e18461ace89ab18141690658a2a537d5d-dd46a31f3cab67b316e9239b15acf7d5cea60aa9",
+    wallet2_api_c_cpp_sha256: "70b39a0bef660cb9ba0397117eb1590e18461ace89ab18141690658a2a537d5d-3e302be710f4e6b4f58642989c8e47711362fa56",
     wallet2_api_c_exp_sha256: "5f53ea8bbe66a5e5aa6cbc4ca00695900e08589cfd32062e88965a24252d05ba",
 }

patches/wownero/0002-fix-missing-___clear_cache-when-targetting-iOS.patch

@@ -1,4 +1,4 @@
-From 21e95275c2e40454d9cce05c1139d8139af16587 Mon Sep 17 00:00:00 2001
+From 4828befb3843764eaaa5e5ea489cde6d101d71ce Mon Sep 17 00:00:00 2001
 From: Czarek Nakamoto <[email protected]>
 Date: Wed, 23 Oct 2024 15:18:21 +0200
 Subject: [PATCH 02/15] fix missing ___clear_cache when targetting iOS
@@ -8,12 +8,12 @@ Subject: [PATCH 02/15] fix missing ___clear_cache when targetting iOS
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/external/randomwow b/external/randomwow
-index 27b099b6d..c00685dad 160000
+index 27b099b6d..6f30d4b92 160000
 --- a/external/randomwow
 +++ b/external/randomwow
 @@ -1 +1 @@
 -Subproject commit 27b099b6dd6fef6e17f58c6dfe00009e9c5df587
-+Subproject commit c00685dad575137caf4a9100ba08e77be376fa98
++Subproject commit 6f30d4b924fecb231e5b683915cc75d18b3b5866
 -- 
-2.39.5 (Apple Git-154)
+2.48.0
 

patches/wownero/0003-fix-is_trivially_copyable.patch

@@ -1,4 +1,4 @@
-From b41551e7dd8d3f4968f330f60d14773eaabca818 Mon Sep 17 00:00:00 2001
+From d4d406961073b5f9d3cc46a6cedaf73a378e1ea6 Mon Sep 17 00:00:00 2001
 From: cyan <[email protected]>
 Date: Tue, 22 Oct 2024 10:23:18 +0000
 Subject: [PATCH 03/15] fix is_trivially_copyable
@@ -28,5 +28,5 @@ index 01dc387d6..5e3af4d11 100644
      return {reinterpret_cast<const std::uint8_t*>(std::addressof(src)), sizeof(T)};
    }
 -- 
-2.39.5 (Apple Git-154)
+2.48.0
 

patches/wownero/0004-store-crash-fix.patch

@@ -1,4 +1,4 @@
-From 9dc9c8048d3918fe3615e91ab8be342471167c26 Mon Sep 17 00:00:00 2001
+From 799d1825696483da743ff2f92a773fcfbef08557 Mon Sep 17 00:00:00 2001
 From: Czarek Nakamoto <[email protected]>
 Date: Sat, 11 May 2024 16:25:10 +0200
 Subject: [PATCH 04/15] store crash fix
@@ -147,7 +147,7 @@ index 1f199a72c..ac7ce2f6a 100644
      std::atomic<int>  m_refreshIntervalMillis;
      std::atomic<bool> m_refreshShouldRescan;
 diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp
-index 8ce515c57..651161d14 100644
+index 535005ab1..4e66cdeae 100644
 --- a/src/wallet/wallet2.cpp
 +++ b/src/wallet/wallet2.cpp
 @@ -1192,6 +1192,7 @@ wallet2::wallet2(network_type nettype, uint64_t kdf_rounds, bool unattended, std
@@ -158,7 +158,7 @@ index 8ce515c57..651161d14 100644
    m_trusted_daemon(false),
    m_nettype(nettype),
    m_multisig_rounds_passed(0),
-@@ -1404,6 +1405,14 @@ bool wallet2::set_daemon(std::string daemon_address, boost::optional<epee::net_u
+@@ -1412,6 +1413,14 @@ bool wallet2::set_daemon(std::string daemon_address, boost::optional<epee::net_u
    return ret;
  }
  //----------------------------------------------------------------------------------------------------
@@ -173,7 +173,7 @@ index 8ce515c57..651161d14 100644
  bool wallet2::set_proxy(const std::string &address)
  {
    return m_http_client->set_proxy(address);
-@@ -4098,8 +4107,9 @@ void wallet2::refresh(bool trusted_daemon, uint64_t start_height, uint64_t & blo
+@@ -4107,8 +4116,9 @@ void wallet2::refresh(bool trusted_daemon, uint64_t start_height, uint64_t & blo
    // infer when we get an incoming output
 
    bool first = true, last = false;
@@ -185,19 +185,19 @@ index 8ce515c57..651161d14 100644
      std::vector<cryptonote::block_complete_entry> next_blocks;
      std::vector<parsed_block> next_parsed_blocks;
 diff --git a/src/wallet/wallet2.h b/src/wallet/wallet2.h
-index 295976b53..c07a47c11 100644
+index 632298726..022d0696f 100644
 --- a/src/wallet/wallet2.h
 +++ b/src/wallet/wallet2.h
-@@ -1071,6 +1071,8 @@ private:
-       boost::optional<epee::net_utils::http::login> daemon_login = boost::none, bool trusted_daemon = true,
-       epee::net_utils::ssl_options_t ssl_options = epee::net_utils::ssl_support_t::e_ssl_support_autodetect);
+@@ -1078,6 +1078,8 @@ private:
+       epee::net_utils::ssl_options_t ssl_options = epee::net_utils::ssl_support_t::e_ssl_support_autodetect,
+       const std::string &proxy = "");
      bool set_proxy(const std::string &address);
 +    bool get_refresh_enabled();
 +    void set_refresh_enabled(bool val);
 
      void stop() { m_run.store(false, std::memory_order_relaxed); m_message_store.stop(); }
 
-@@ -1981,6 +1983,7 @@ private:
+@@ -1989,6 +1991,7 @@ private:
 
      boost::recursive_mutex m_daemon_rpc_mutex;
 
@@ -206,5 +206,5 @@ index 295976b53..c07a47c11 100644
      i_wallet2_callback* m_callback;
      hw::device::device_type m_key_device_type;
 -- 
-2.39.5 (Apple Git-154)
+2.48.0
 

patches/wownero/0005-uint64_t-missing-definition-fix.patch

@@ -1,4 +1,4 @@
-From 223e2e4b5b2c6366d0dd4130a726c4cfcdb13ffb Mon Sep 17 00:00:00 2001
+From 5a9148c10ea29a42d8aa08d69e2f4559c8611655 Mon Sep 17 00:00:00 2001
 From: Czarek Nakamoto <[email protected]>
 Date: Mon, 2 Sep 2024 16:40:31 +0200
 Subject: [PATCH 05/15] uint64_t missing definition fix
@@ -21,5 +21,5 @@ index 4af4da790..ae4c0d05e 100644
 
  #include <string>
 -- 
-2.39.5 (Apple Git-154)
+2.48.0
 

patches/wownero/0006-use-proper-error-handling-in-get_seed.patch

@@ -1,4 +1,4 @@
-From 776d22d6dc47739074f004979894f3c62d43a0c9 Mon Sep 17 00:00:00 2001
+From ee6aa49179833c930c1ec10ae2e877aeb87eb8c8 Mon Sep 17 00:00:00 2001
 From: Czarek Nakamoto <[email protected]>
 Date: Mon, 24 Jun 2024 10:49:12 +0200
 Subject: [PATCH 06/15] use proper error handling in get_seed
@@ -38,10 +38,10 @@ index 899ef044a..e16d8f83f 100644
 
  std::string WalletImpl::getSeedLanguage() const
 diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp
-index 651161d14..1e527cf97 100644
+index 4e66cdeae..48267d647 100644
 --- a/src/wallet/wallet2.cpp
 +++ b/src/wallet/wallet2.cpp
-@@ -1440,11 +1440,13 @@ bool wallet2::get_seed(epee::wipeable_string& electrum_words, const epee::wipeab
+@@ -1449,11 +1449,13 @@ bool wallet2::get_seed(epee::wipeable_string& electrum_words, const epee::wipeab
    bool keys_deterministic = is_deterministic();
    if (!keys_deterministic)
    {
@@ -55,7 +55,7 @@ index 651161d14..1e527cf97 100644
      std::cout << "seed_language not set" << std::endl;
      return false;
    }
-@@ -1454,8 +1456,9 @@ bool wallet2::get_seed(epee::wipeable_string& electrum_words, const epee::wipeab
+@@ -1463,8 +1465,9 @@ bool wallet2::get_seed(epee::wipeable_string& electrum_words, const epee::wipeab
      key = cryptonote::encrypt_key(key, passphrase);
    if (!crypto::ElectrumWords::bytes_to_words(key, electrum_words, seed_language))
    {
@@ -67,5 +67,5 @@ index 651161d14..1e527cf97 100644
 
    return true;
 -- 
-2.39.5 (Apple Git-154)
+2.48.0
 

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 <[email protected]>
 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<uint32_t, uint64_t> wallet2::balance_per_subaddress(uint32_t index_major, bool strict) const
  {
    std::map<uint32_t, uint64_t> amount_per_subaddr;
-@@ -7840,9 +7869,7 @@ bool wallet2::sign_tx(unsigned_tx_set &exported_txs, std::vector<wallet2::pendin
+@@ -7849,9 +7878,7 @@ bool wallet2::sign_tx(unsigned_tx_set &exported_txs, std::vector<wallet2::pendin
      crypto::key_derivation derivation;
      std::vector<crypto::key_derivation> additional_derivations;
 
@@ -837,7 +837,7 @@ index 1e527cf97..671fa5298 100644
      std::vector<crypto::public_key> additional_tx_pub_keys;
      for (const crypto::secret_key &skey: txs[n].additional_tx_keys)
      {
-@@ -11232,7 +11259,7 @@ std::vector<wallet2::pending_tx> wallet2::create_transactions_2(std::vector<cryp
+@@ -11241,7 +11268,7 @@ std::vector<wallet2::pending_tx> wallet2::create_transactions_2(std::vector<cryp
        MDEBUG("Ignoring output " << i << " of amount " << print_money(td.amount()) << " which is below fractional threshold " << print_money(fractional_threshold));
        continue;
      }
@@ -846,7 +846,7 @@ index 1e527cf97..671fa5298 100644
      {
        if (td.amount() > m_ignore_outputs_above || td.amount() < m_ignore_outputs_below)
        {
-@@ -11282,9 +11309,15 @@ std::vector<wallet2::pending_tx> wallet2::create_transactions_2(std::vector<cryp
+@@ -11291,9 +11318,15 @@ std::vector<wallet2::pending_tx> wallet2::create_transactions_2(std::vector<cryp
 
    LOG_PRINT_L2("Starting with " << num_nondust_outputs << " non-dust outputs and " << num_dust_outputs << " dust outputs");
 
@@ -864,7 +864,7 @@ index 1e527cf97..671fa5298 100644
    // if empty, put dummy entry so that the front can be referenced later in the loop
    if (unused_dust_indices_per_subaddr.empty())
      unused_dust_indices_per_subaddr.push_back({});
-@@ -13911,33 +13944,40 @@ crypto::public_key wallet2::get_tx_pub_key_from_received_outs(const tools::walle
+@@ -13920,33 +13953,40 @@ crypto::public_key wallet2::get_tx_pub_key_from_received_outs(const tools::walle
 
  bool wallet2::export_key_images(const std::string &filename, bool all) const
  {
@@ -928,7 +928,7 @@ index 1e527cf97..671fa5298 100644
  //----------------------------------------------------------------------------------------------------
  std::pair<uint64_t, std::vector<std::pair<crypto::key_image, crypto::signature>>> wallet2::export_key_images(bool all) const
  {
-@@ -13992,53 +14032,60 @@ std::pair<uint64_t, std::vector<std::pair<crypto::key_image, crypto::signature>>
+@@ -14001,53 +14041,60 @@ std::pair<uint64_t, std::vector<std::pair<crypto::key_image, crypto::signature>>
    return std::make_pair(offset, ski);
  }
 
@@ -1008,18 +1008,18 @@ 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);
 +    uint64_t view_only_balance(uint32_t index_major, const std::vector<crypto::key_image>& selected_inputs = {});
      // locked & unlocked balance per subaddress of given or current subaddress account
      std::map<uint32_t, uint64_t> balance_per_subaddress(uint32_t subaddr_index_major, bool strict) const;
      std::map<uint32_t, std::pair<uint64_t, std::pair<uint64_t, uint64_t>>> unlocked_balance_per_subaddress(uint32_t subaddr_index_major, bool strict);
-@@ -1624,9 +1625,11 @@ private:
+@@ -1631,9 +1632,11 @@ private:
      std::tuple<size_t, crypto::hash, std::vector<crypto::hash>> export_blockchain() const;
      void import_blockchain(const std::tuple<size_t, crypto::hash, std::vector<crypto::hash>> &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
 

patches/wownero/0008-add-dummy-device-for-ledger.patch

@@ -1,4 +1,4 @@
-From 07a3019d94feb48f746dbc780db1e4d2e0d6080c Mon Sep 17 00:00:00 2001
+From 221fb7ed81aff1830b4bc2d7f9b73c94eb36924a Mon Sep 17 00:00:00 2001
 From: Czarek Nakamoto <[email protected]>
 Date: Wed, 26 Jun 2024 15:04:38 +0200
 Subject: [PATCH 08/15] add dummy device for ledger
@@ -21,10 +21,10 @@ Subject: [PATCH 08/15] add dummy device for ledger
  create mode 100644 src/device/device_io_dummy.hpp
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 8b81c7ab7..abe44eca5 100644
+index 88335ee9d..86000f811 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -709,8 +709,12 @@ include_directories(${LMDB_INCLUDE})
+@@ -693,8 +693,12 @@ include_directories(${LMDB_INCLUDE})
  include_directories(${LIBUNWIND_INCLUDE})
  link_directories(${LIBUNWIND_LIBRARY_DIRS})
 
@@ -600,5 +600,5 @@ index e81b8f83a..277be6ac9 100644
 
  std::vector<std::string> WalletManagerImpl::findWallets(const std::string &path)
 -- 
-2.39.5 (Apple Git-154)
+2.48.0