[monero] update to latest v0.18 (#122)

* monero update
* update checksum

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 = "9e80c4b59a0509aa02fbf01e8df2881b89f82225d1765bfa7856cbdbaf7af116";
-const String wallet2_api_c_cpp_sha256 = "d229507db508e574bd2badf4819a38dbead8c16a84311ad32c22c887a6003439-b089f9ee69924882c5d14dd1a6991deb05d9d1cd";
+const String wallet2_api_c_cpp_sha256 = "d229507db508e574bd2badf4819a38dbead8c16a84311ad32c22c887a6003439-0232839913b13cf0ab0bb7ad25fff0c05f37d2fe";
 const String wallet2_api_c_exp_sha256 = "d0f95f1f3bc49f1f59fe4eb0b61826128d7d3bb75405d5a01a252d02db03097d";

impls/monero.ts/checksum_monero.ts

@@ -1,5 +1,5 @@
 export const moneroChecksum = {
     wallet2_api_c_h_sha256: "9e80c4b59a0509aa02fbf01e8df2881b89f82225d1765bfa7856cbdbaf7af116",
-    wallet2_api_c_cpp_sha256: "d229507db508e574bd2badf4819a38dbead8c16a84311ad32c22c887a6003439-b089f9ee69924882c5d14dd1a6991deb05d9d1cd",
+    wallet2_api_c_cpp_sha256: "d229507db508e574bd2badf4819a38dbead8c16a84311ad32c22c887a6003439-0232839913b13cf0ab0bb7ad25fff0c05f37d2fe",
     wallet2_api_c_exp_sha256: "d0f95f1f3bc49f1f59fe4eb0b61826128d7d3bb75405d5a01a252d02db03097d",
 }

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 = "9e80c4b59a0509aa02fbf01e8df2881b89f82225d1765bfa7856cbdbaf7af116";
-const char * MONERO_wallet2_api_c_cpp_sha256 = "d229507db508e574bd2badf4819a38dbead8c16a84311ad32c22c887a6003439-b089f9ee69924882c5d14dd1a6991deb05d9d1cd";
+const char * MONERO_wallet2_api_c_cpp_sha256 = "d229507db508e574bd2badf4819a38dbead8c16a84311ad32c22c887a6003439-0232839913b13cf0ab0bb7ad25fff0c05f37d2fe";
 const char * MONERO_wallet2_api_c_exp_sha256 = "d0f95f1f3bc49f1f59fe4eb0b61826128d7d3bb75405d5a01a252d02db03097d";
 #endif

patches/monero/0002-fix-missing-___clear_cache-when-targetting-iOS.patch → patches/monero/0001-fix-missing-___clear_cache-when-targetting-iOS.patch

@@ -1,15 +1,15 @@
-From c7b6e26d36d2428e5747e2b8287ae3719fa443e3 Mon Sep 17 00:00:00 2001
+From 6e284a2ef552f1f47e8ca9edcf8651312c9e37dd Mon Sep 17 00:00:00 2001
 From: Czarek Nakamoto <[email protected]>
 Date: Tue, 2 Apr 2024 16:51:56 +0200
-Subject: [PATCH 02/14] fix missing ___clear_cache when targetting iOS
+Subject: [PATCH 01/14] fix missing ___clear_cache when targetting iOS
 
 ---
  .gitmodules      | 3 ++-
  external/randomx | 2 +-
  2 files changed, 3 insertions(+), 2 deletions(-)
 
 diff --git a/.gitmodules b/.gitmodules
-index 721cce3..ffb73fe 100644
+index 721cce3b4..ffb73fe9a 100644
 --- a/.gitmodules
 +++ b/.gitmodules
 @@ -9,7 +9,8 @@
@@ -23,12 +23,12 @@ index 721cce3..ffb73fe 100644
  	path = external/supercop
  	url = https://github.com/monero-project/supercop
 diff --git a/external/randomx b/external/randomx
-index 102f8ac..ce72c9b 160000
+index 102f8acf9..ce72c9bb9 160000
 --- a/external/randomx
 +++ b/external/randomx
 @@ -1 +1 @@
 -Subproject commit 102f8acf90a7649ada410de5499a7ec62e49e1da
 +Subproject commit ce72c9bb9cb799e0d9171094b9abb009e04c5bfc
 -- 
-2.39.5 (Apple Git-154)
+2.48.1
 

patches/monero/0003-store-crash-fix.patch → patches/monero/0002-store-crash-fix.patch

@@ -1,7 +1,7 @@
-From b49bc52f3d3d1751dd65d4694e4f74b84b23f583 Mon Sep 17 00:00:00 2001
+From b4f4b38af1ab974872862fc20735e41941b955e9 Mon Sep 17 00:00:00 2001
 From: Czarek Nakamoto <[email protected]>
 Date: Sat, 11 May 2024 16:25:10 +0200
-Subject: [PATCH 03/14] store crash fix
+Subject: [PATCH 02/14] store crash fix
 
 Monero wallet crashes (sometimes) when it is syncing,
 while the proper solution (that can be seen in feather)
@@ -43,7 +43,7 @@ the current state.
  4 files changed, 25 insertions(+), 15 deletions(-)
 
 diff --git a/src/wallet/api/wallet.cpp b/src/wallet/api/wallet.cpp
-index e9f76f4..0d85cf3 100644
+index 8fda0bab7..67b170e3d 100644
 --- a/src/wallet/api/wallet.cpp
 +++ b/src/wallet/api/wallet.cpp
 @@ -55,8 +55,8 @@ using namespace cryptonote;
@@ -135,7 +135,7 @@ index e9f76f4..0d85cf3 100644
 
 
 diff --git a/src/wallet/api/wallet.h b/src/wallet/api/wallet.h
-index 1f199a7..ac7ce2f 100644
+index 1f199a72c..ac7ce2f6a 100644
 --- a/src/wallet/api/wallet.h
 +++ b/src/wallet/api/wallet.h
 @@ -273,7 +273,6 @@ private:
@@ -147,7 +147,7 @@ index 1f199a7..ac7ce2f 100644
      std::atomic<int>  m_refreshIntervalMillis;
      std::atomic<bool> m_refreshShouldRescan;
 diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp
-index 8146014..7913d55 100644
+index dfb8b23cb..c9c2dbc82 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 8146014..7913d55 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 8146014..7913d55 100644
  bool wallet2::set_proxy(const std::string &address)
  {
    return m_http_client->set_proxy(address);
-@@ -4096,7 +4105,7 @@ void wallet2::refresh(bool trusted_daemon, uint64_t start_height, uint64_t & blo
+@@ -4107,7 +4116,7 @@ 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;
@@ -183,19 +183,19 @@ index 8146014..7913d55 100644
      uint64_t next_blocks_start_height;
      std::vector<cryptonote::block_complete_entry> next_blocks;
 diff --git a/src/wallet/wallet2.h b/src/wallet/wallet2.h
-index b1dc4f7..a050286 100644
+index 2f4ad52f1..daad1e940 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;
 
@@ -204,5 +204,5 @@ index b1dc4f7..a050286 100644
      i_wallet2_callback* m_callback;
      hw::device::device_type m_key_device_type;
 -- 
-2.39.5 (Apple Git-154)
+2.48.1
 

patches/monero/0004-uint64_t-missing-definition-fix.patch → patches/monero/0003-uint64_t-missing-definition-fix.patch

@@ -1,14 +1,14 @@
-From 99e6af859234d8b37866e46d95d77e20687767de Mon Sep 17 00:00:00 2001
+From a74f616e3c1671a883182b0db1c6fc11a1242c01 Mon Sep 17 00:00:00 2001
 From: Czarek Nakamoto <[email protected]>
 Date: Mon, 2 Sep 2024 16:40:31 +0200
-Subject: [PATCH 04/14] uint64_t missing definition fix
+Subject: [PATCH 03/14] uint64_t missing definition fix
 
 ---
  contrib/epee/include/net/http_base.h | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/contrib/epee/include/net/http_base.h b/contrib/epee/include/net/http_base.h
-index 4af4da7..ae4c0d0 100644
+index 4af4da790..ae4c0d05e 100644
 --- a/contrib/epee/include/net/http_base.h
 +++ b/contrib/epee/include/net/http_base.h
 @@ -28,7 +28,7 @@
@@ -21,5 +21,5 @@ index 4af4da7..ae4c0d0 100644
 
  #include <string>
 -- 
-2.39.5 (Apple Git-154)
+2.48.1
 

patches/monero/0005-use-proper-error-handling-in-get_seed.patch → patches/monero/0004-use-proper-error-handling-in-get_seed.patch

@@ -1,15 +1,15 @@
-From 6be87b2c75ea663e205f468c986809755839afa3 Mon Sep 17 00:00:00 2001
+From f9b222f1611d7cfbaf0ac52cd6194724c7554def Mon Sep 17 00:00:00 2001
 From: Czarek Nakamoto <[email protected]>
 Date: Mon, 24 Jun 2024 10:49:12 +0200
-Subject: [PATCH 05/14] use proper error handling in get_seed
+Subject: [PATCH 04/14] use proper error handling in get_seed
 
 ---
  src/wallet/api/wallet.cpp | 17 ++++++++++++-----
  src/wallet/wallet2.cpp    |  5 ++++-
  2 files changed, 16 insertions(+), 6 deletions(-)
 
 diff --git a/src/wallet/api/wallet.cpp b/src/wallet/api/wallet.cpp
-index 0d85cf3..dfbf4fd 100644
+index 67b170e3d..89df5c517 100644
 --- a/src/wallet/api/wallet.cpp
 +++ b/src/wallet/api/wallet.cpp
 @@ -826,12 +826,19 @@ bool WalletImpl::close(bool store)
@@ -38,10 +38,10 @@ index 0d85cf3..dfbf4fd 100644
 
  std::string WalletImpl::getSeedLanguage() const
 diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp
-index 7913d55..debc0c2 100644
+index c9c2dbc82..b827b826f 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 7913d55..debc0c2 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 7913d55..debc0c2 100644
 
    return true;
 -- 
-2.39.5 (Apple Git-154)
+2.48.1