fix polyseed dependencies

12 files changed, 42 insertions, 25 deletions

diff --git a/patches/monero/0001-wallet-background-sync-with-just-the-view-key.patch b/patches/monero/0001-wallet-background-sync-with-just-the-view-key.patch
index 6bf1027..302e5ac 100644
--- a/patches/monero/0001-wallet-background-sync-with-just-the-view-key.patch
+++ b/patches/monero/0001-wallet-background-sync-with-just-the-view-key.patch
@@ -1,4 +1,4 @@
-From e0631b241c792b5558509ba219755ae6a46e3785 Mon Sep 17 00:00:00 2001
+From 66e6b4d40e9d7a927b0697bb66d387d18ad9ef0a Mon Sep 17 00:00:00 2001
 From: j-berman <justinberman@protonmail.com>
 Date: Thu, 13 Oct 2022 18:33:33 -0700
 Subject: [PATCH 01/12] wallet: background sync with just the view key
@@ -4313,5 +4313,5 @@ index 1e10e1f86..bff33a561 100644
 +        }
 +        return self.rpc.send_json_rpc_request(stop_background_sync)
 -- 
-2.39.5 (Apple Git-154)
+2.43.0
 
diff --git a/patches/monero/0002-fix-missing-___clear_cache-when-targetting-iOS.patch b/patches/monero/0002-fix-missing-___clear_cache-when-targetting-iOS.patch
index 9328da3..7d2fe5b 100644
--- a/patches/monero/0002-fix-missing-___clear_cache-when-targetting-iOS.patch
+++ b/patches/monero/0002-fix-missing-___clear_cache-when-targetting-iOS.patch
@@ -1,4 +1,4 @@
-From e3408d05b2e239616a0383158f4e861fbd6d78e1 Mon Sep 17 00:00:00 2001
+From aee5abfcc82ca7ff3e350fd964bbcb6406a91201 Mon Sep 17 00:00:00 2001
 From: Czarek Nakamoto <cyjan@mrcyjanek.net>
 Date: Tue, 2 Apr 2024 16:51:56 +0200
 Subject: [PATCH 02/12] fix missing ___clear_cache when targetting iOS
@@ -30,5 +30,5 @@ index 102f8acf9..ce72c9bb9 160000
 -Subproject commit 102f8acf90a7649ada410de5499a7ec62e49e1da
 +Subproject commit ce72c9bb9cb799e0d9171094b9abb009e04c5bfc
 -- 
-2.39.5 (Apple Git-154)
+2.43.0
 
diff --git a/patches/monero/0003-store-crash-fix.patch b/patches/monero/0003-store-crash-fix.patch
index 1269989..a0a07df 100644
--- a/patches/monero/0003-store-crash-fix.patch
+++ b/patches/monero/0003-store-crash-fix.patch
@@ -1,4 +1,4 @@
-From d0861a0d2e162b44f01df0450ec4efcceb0b37b9 Mon Sep 17 00:00:00 2001
+From 92b9dcfa4cc36728fc8d5738ab8bb71931a3e30d Mon Sep 17 00:00:00 2001
 From: Czarek Nakamoto <cyjan@mrcyjanek.net>
 Date: Sat, 11 May 2024 16:25:10 +0200
 Subject: [PATCH 03/12] store crash fix
@@ -206,5 +206,5 @@ index b1dc4f716..a050286bc 100644
      i_wallet2_callback* m_callback;
      hw::device::device_type m_key_device_type;
 -- 
-2.39.5 (Apple Git-154)
+2.43.0
 
diff --git a/patches/monero/0004-Update-android-ndk.patch b/patches/monero/0004-Update-android-ndk.patch
index ef7dd5c..a85c240 100644
--- a/patches/monero/0004-Update-android-ndk.patch
+++ b/patches/monero/0004-Update-android-ndk.patch
@@ -1,4 +1,4 @@
-From c1f006c9944136ba786e9877d44c5cd3188af10d Mon Sep 17 00:00:00 2001
+From 0893e2ca97d65bf64abd3efda3554f66948e073d Mon Sep 17 00:00:00 2001
 From: Czarek Nakamoto <cyjan@mrcyjanek.net>
 Date: Thu, 23 May 2024 08:02:49 +0200
 Subject: [PATCH 04/12] Update android ndk
@@ -149,5 +149,5 @@ index f118c754e..cc1d9b5c5 100644
    SET(CMAKE_C_COMPILER @CC@)
    SET(CMAKE_CXX_COMPILER @CXX@)
 -- 
-2.39.5 (Apple Git-154)
+2.43.0
 
diff --git a/patches/monero/0005-uint64_t-missing-definition-fix.patch b/patches/monero/0005-uint64_t-missing-definition-fix.patch
index 881e2d5..e2d7810 100644
--- a/patches/monero/0005-uint64_t-missing-definition-fix.patch
+++ b/patches/monero/0005-uint64_t-missing-definition-fix.patch
@@ -1,4 +1,4 @@
-From 0c73eb15aa1fa4144a2c4ec5ed0e1cce518d1e92 Mon Sep 17 00:00:00 2001
+From fc8b72e4da39cfe847a75213aab70365f3c2140d Mon Sep 17 00:00:00 2001
 From: Czarek Nakamoto <cyjan@mrcyjanek.net>
 Date: Mon, 2 Sep 2024 16:40:31 +0200
 Subject: [PATCH 05/12] uint64_t missing definition fix
@@ -21,5 +21,5 @@ index 4af4da790..ae4c0d05e 100644
  
  #include <string>
 -- 
-2.39.5 (Apple Git-154)
+2.43.0
 
diff --git a/patches/monero/0006-use-proper-error-handling-in-get_seed.patch b/patches/monero/0006-use-proper-error-handling-in-get_seed.patch
index f2e8d26..5039c22 100644
--- a/patches/monero/0006-use-proper-error-handling-in-get_seed.patch
+++ b/patches/monero/0006-use-proper-error-handling-in-get_seed.patch
@@ -1,4 +1,4 @@
-From 75e5aaa8d7b741631dba2addb34ffac3be983804 Mon Sep 17 00:00:00 2001
+From 8ccefc307c8025881128a3ca908975270219d92e Mon Sep 17 00:00:00 2001
 From: Czarek Nakamoto <cyjan@mrcyjanek.net>
 Date: Mon, 24 Jun 2024 10:49:12 +0200
 Subject: [PATCH 06/12] use proper error handling in get_seed
@@ -67,5 +67,5 @@ index aa61fb298..5ffeda2ec 100644
  
    return true;
 -- 
-2.39.5 (Apple Git-154)
+2.43.0
 
diff --git a/patches/monero/0007-UR-functions.patch b/patches/monero/0007-UR-functions.patch
index 5672c64..b321420 100644
--- a/patches/monero/0007-UR-functions.patch
+++ b/patches/monero/0007-UR-functions.patch
@@ -1,4 +1,4 @@
-From 99aeed52b018ae0ab056237abadf4ebd997306c4 Mon Sep 17 00:00:00 2001
+From 06921411d75e372df8176dd307e146812fe397ba Mon Sep 17 00:00:00 2001
 From: tobtoht <tob@featherwallet.org>
 Date: Tue, 12 Mar 2024 10:09:50 +0100
 Subject: [PATCH 07/12] UR functions
@@ -1031,5 +1031,5 @@ index a050286bc..1d7e430b9 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.43.0
 
diff --git a/patches/monero/0008-add-dummy-device-for-ledger.patch b/patches/monero/0008-add-dummy-device-for-ledger.patch
index 5598b68..c654f66 100644
--- a/patches/monero/0008-add-dummy-device-for-ledger.patch
+++ b/patches/monero/0008-add-dummy-device-for-ledger.patch
@@ -1,4 +1,4 @@
-From 3cd9d0fddbd55dfef23c92bfb75b9b01a42d24c6 Mon Sep 17 00:00:00 2001
+From 36bd3b42888710ac125a2450675102b77a772782 Mon Sep 17 00:00:00 2001
 From: Czarek Nakamoto <cyjan@mrcyjanek.net>
 Date: Wed, 26 Jun 2024 15:04:38 +0200
 Subject: [PATCH 08/12] add dummy device for ledger
@@ -575,5 +575,5 @@ index 764adbfbf..53ec4abfc 100644
  
  /**
 -- 
-2.39.5 (Apple Git-154)
+2.43.0
 
diff --git a/patches/monero/0009-polyseed.patch b/patches/monero/0009-polyseed.patch
index 4044aea..de546f7 100644
--- a/patches/monero/0009-polyseed.patch
+++ b/patches/monero/0009-polyseed.patch
@@ -1,4 +1,4 @@
-From e28bd4b5afd73a07d086422a9bc264047e245a7b Mon Sep 17 00:00:00 2001
+From 3514a626e1ee02dfa6cbcfb60efe506f60a682fb Mon Sep 17 00:00:00 2001
 From: tobtoht <tob@featherwallet.org>
 Date: Tue, 12 Mar 2024 09:42:37 +0100
 Subject: [PATCH 09/12] polyseed
@@ -15,6 +15,8 @@ Co-authored-by: Czarek Nakamoto <cyjan@mrcyjanek.net>
  contrib/epee/include/wipeable_string.h        |   7 +
  contrib/epee/src/wipeable_string.cpp          |  10 +
  external/CMakeLists.txt                       |   2 +
+ external/polyseed                             |   1 +
+ external/utf8proc                             |   1 +
  src/CMakeLists.txt                            |   1 +
  src/cryptonote_basic/CMakeLists.txt           |   1 +
  src/cryptonote_basic/account.cpp              |  23 ++-
@@ -32,9 +34,10 @@ Co-authored-by: Czarek Nakamoto <cyjan@mrcyjanek.net>
  src/wallet/api/wallet_manager.h               |  10 +
  src/wallet/wallet2.cpp                        | 100 ++++++++--
  src/wallet/wallet2.h                          |  30 ++-
- 27 files changed, 855 insertions(+), 24 deletions(-)
+ 28 files changed, 856 insertions(+), 24 deletions(-)
  create mode 100644 contrib/depends/packages/polyseed.mk
  create mode 100644 contrib/depends/patches/polyseed/force-static-mingw.patch
+ create mode 160000 external/polyseed
  create mode 100644 src/polyseed/CMakeLists.txt
  create mode 100644 src/polyseed/pbkdf2.c
  create mode 100644 src/polyseed/pbkdf2.h
@@ -241,6 +244,20 @@ index f9ed6a69a..8fcf792d7 100644
 +add_subdirectory(utf8proc EXCLUDE_FROM_ALL)
  add_subdirectory(bc-ur)
  add_subdirectory(randomx EXCLUDE_FROM_ALL)
+diff --git a/external/polyseed b/external/polyseed
+new file mode 160000
+index 000000000..dfb05d8ed
+--- /dev/null
++++ b/external/polyseed
+@@ -0,0 +1 @@
++Subproject commit dfb05d8edb682b0e8f743b1b70c9131712ff4157
+diff --git a/external/utf8proc b/external/utf8proc
+new file mode 160000
+index 000000000..dfb05d8ed
+--- /dev/null
++++ b/external/utf8proc
+@@ -0,0 +1 @@
++Subproject commit 3de4596fbe28956855df2ecb3c11c0bbc3535838
 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
 index 3335d3c21..06b708cf0 100644
 --- a/src/CMakeLists.txt
@@ -1376,5 +1393,5 @@ index 1d7e430b9..91cf2a376 100644
      uint32_t m_multisig_threshold;
      std::vector<crypto::public_key> m_multisig_signers;
 -- 
-2.39.5 (Apple Git-154)
+2.43.0
 
diff --git a/patches/monero/0010-coin-control.patch b/patches/monero/0010-coin-control.patch
index ad680ef..c6ec734 100644
--- a/patches/monero/0010-coin-control.patch
+++ b/patches/monero/0010-coin-control.patch
@@ -1,4 +1,4 @@
-From 6a3d0ad6fadae9b84c42565064e8acf558b26d2b Mon Sep 17 00:00:00 2001
+From 71fee81e40348ebf18995033fbf42e64d7522c6d Mon Sep 17 00:00:00 2001
 From: tobtoht <tob@featherwallet.org>
 Date: Tue, 12 Mar 2024 11:07:57 +0100
 Subject: [PATCH 10/12] coin control
@@ -975,5 +975,5 @@ index 91cf2a376..bc16d528c 100644
      void set_unspent(size_t idx);
      bool is_spent(const transfer_details &td, bool strict = true) const;
 -- 
-2.39.5 (Apple Git-154)
+2.43.0
 
diff --git a/patches/monero/0011-Add-hex-encoding-and-tx-key-getter-for-PendingTransc.patch b/patches/monero/0011-Add-hex-encoding-and-tx-key-getter-for-PendingTransc.patch
index cc00c9c..d026065 100644
--- a/patches/monero/0011-Add-hex-encoding-and-tx-key-getter-for-PendingTransc.patch
+++ b/patches/monero/0011-Add-hex-encoding-and-tx-key-getter-for-PendingTransc.patch
@@ -1,4 +1,4 @@
-From 971477966488aa9eb30bbbfaca4a621dc8997fd5 Mon Sep 17 00:00:00 2001
+From c7bf71b5069ba8ea71022fab516b40bf85da2a79 Mon Sep 17 00:00:00 2001
 From: M <m@cakewallet.com>
 Date: Fri, 21 Apr 2023 15:43:47 -0400
 Subject: [PATCH 11/12] Add hex encoding and tx key getter for
@@ -64,5 +64,5 @@ index 013b5bcba..f421fdc05 100644
  
  /**
 -- 
-2.39.5 (Apple Git-154)
+2.43.0
 
diff --git a/patches/monero/0012-Add-recoverDeterministicWalletFromSpendKey.patch b/patches/monero/0012-Add-recoverDeterministicWalletFromSpendKey.patch
index 8ef01f1..a4bda2c 100644
--- a/patches/monero/0012-Add-recoverDeterministicWalletFromSpendKey.patch
+++ b/patches/monero/0012-Add-recoverDeterministicWalletFromSpendKey.patch
@@ -1,4 +1,4 @@
-From e848beaeb450fac2d7a24bb97c9ce6ddd16e7608 Mon Sep 17 00:00:00 2001
+From a9977b076cf6aa260059bd272abbf1af580d2f72 Mon Sep 17 00:00:00 2001
 From: Konstantin Ullrich <konstantinullrich12@gmail.com>
 Date: Wed, 11 Oct 2023 16:47:59 +0200
 Subject: [PATCH 12/12] Add recoverDeterministicWalletFromSpendKey
@@ -149,5 +149,5 @@ index 28fcd36c9..be3ff8184 100644
                                              const std::string &password,
                                              NetworkType nettype,
 -- 
-2.39.5 (Apple Git-154)
+2.43.0