Fix iOS builds

12 files changed, 63 insertions, 47 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 df2d589..6bf1027 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,7 +1,7 @@
-From 69edb14a59d5c1d77700c08c2828f767dc7de432 Mon Sep 17 00:00:00 2001
+From e0631b241c792b5558509ba219755ae6a46e3785 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/11] wallet: background sync with just the view key
+Subject: [PATCH 01/12] wallet: background sync with just the view key
 
 - When background syncing, the wallet wipes the spend key
 from memory and processes all new transactions. The wallet saves
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
new file mode 100644
index 0000000..9328da3
--- /dev/null
+++ b/patches/monero/0002-fix-missing-___clear_cache-when-targetting-iOS.patch
@@ -0,0 +1,34 @@
+From e3408d05b2e239616a0383158f4e861fbd6d78e1 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
+
+---
+ .gitmodules      | 3 ++-
+ external/randomx | 2 +-
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/.gitmodules b/.gitmodules
+index 721cce3b4..ffb73fe9a 100644
+--- a/.gitmodules
++++ b/.gitmodules
+@@ -9,7 +9,8 @@
+ 	url = https://github.com/trezor/trezor-common.git
+ [submodule "external/randomx"]
+ 	path = external/randomx
+-	url = https://github.com/tevador/RandomX
++	url = https://github.com/MrCyjaneK/RandomX
++	branch = cyjan-fix-ios
+ [submodule "external/supercop"]
+ 	path = external/supercop
+ 	url = https://github.com/monero-project/supercop
+diff --git a/external/randomx b/external/randomx
+index 102f8acf9..ce72c9bb9 160000
+--- a/external/randomx
++++ b/external/randomx
+@@ -1 +1 @@
+-Subproject commit 102f8acf90a7649ada410de5499a7ec62e49e1da
++Subproject commit ce72c9bb9cb799e0d9171094b9abb009e04c5bfc
+-- 
+2.39.5 (Apple Git-154)
+
diff --git a/patches/monero/0002-store-crash-fix.patch b/patches/monero/0003-store-crash-fix.patch
index fd0b303..1269989 100644
--- a/patches/monero/0002-store-crash-fix.patch
+++ b/patches/monero/0003-store-crash-fix.patch
@@ -1,7 +1,7 @@
-From ee0a1d2341b3648f975000bdad5f19b46a41cee0 Mon Sep 17 00:00:00 2001
+From d0861a0d2e162b44f01df0450ec4efcceb0b37b9 Mon Sep 17 00:00:00 2001
 From: Czarek Nakamoto <cyjan@mrcyjanek.net>
 Date: Sat, 11 May 2024 16:25:10 +0200
-Subject: [PATCH 02/11] store crash fix
+Subject: [PATCH 03/12] store crash fix
 
 Monero wallet crashes (sometimes) when it is syncing,
 while the proper solution (that can be seen in feather)
diff --git a/patches/monero/0003-Update-android-ndk.patch b/patches/monero/0004-Update-android-ndk.patch
index f6cc68d..ef7dd5c 100644
--- a/patches/monero/0003-Update-android-ndk.patch
+++ b/patches/monero/0004-Update-android-ndk.patch
@@ -1,7 +1,7 @@
-From 86f4d00f1c40a92c3ae2265f27be1568a8a54c81 Mon Sep 17 00:00:00 2001
+From c1f006c9944136ba786e9877d44c5cd3188af10d Mon Sep 17 00:00:00 2001
 From: Czarek Nakamoto <cyjan@mrcyjanek.net>
 Date: Thu, 23 May 2024 08:02:49 +0200
-Subject: [PATCH 03/11] Update android ndk
+Subject: [PATCH 04/12] Update android ndk
 
 rename arm -> armv7a
 ---
diff --git a/patches/monero/0004-uint64_t-missing-definition-fix.patch b/patches/monero/0005-uint64_t-missing-definition-fix.patch
index 4793742..881e2d5 100644
--- a/patches/monero/0004-uint64_t-missing-definition-fix.patch
+++ b/patches/monero/0005-uint64_t-missing-definition-fix.patch
@@ -1,7 +1,7 @@
-From 371fb3ba0e0fdd9d84daad1b6dddf78e6e54a6cc Mon Sep 17 00:00:00 2001
+From 0c73eb15aa1fa4144a2c4ec5ed0e1cce518d1e92 Mon Sep 17 00:00:00 2001
 From: Czarek Nakamoto <cyjan@mrcyjanek.net>
 Date: Mon, 2 Sep 2024 16:40:31 +0200
-Subject: [PATCH 04/11] uint64_t missing definition fix
+Subject: [PATCH 05/12] uint64_t missing definition fix
 
 ---
  contrib/epee/include/net/http_base.h | 2 +-
diff --git a/patches/monero/0005-use-proper-error-handling-in-get_seed.patch b/patches/monero/0006-use-proper-error-handling-in-get_seed.patch
index 8c42d27..f2e8d26 100644
--- a/patches/monero/0005-use-proper-error-handling-in-get_seed.patch
+++ b/patches/monero/0006-use-proper-error-handling-in-get_seed.patch
@@ -1,7 +1,7 @@
-From e5efe5789f2338cd6bcc49f25b6ab5aab0f0d657 Mon Sep 17 00:00:00 2001
+From 75e5aaa8d7b741631dba2addb34ffac3be983804 Mon Sep 17 00:00:00 2001
 From: Czarek Nakamoto <cyjan@mrcyjanek.net>
 Date: Mon, 24 Jun 2024 10:49:12 +0200
-Subject: [PATCH 05/11] use proper error handling in get_seed
+Subject: [PATCH 06/12] use proper error handling in get_seed
 
 ---
  src/wallet/api/wallet.cpp | 17 ++++++++++++-----
diff --git a/patches/monero/0006-UR-functions.patch b/patches/monero/0007-UR-functions.patch
index d7d6d0f..5672c64 100644
--- a/patches/monero/0006-UR-functions.patch
+++ b/patches/monero/0007-UR-functions.patch
@@ -1,7 +1,7 @@
-From a250a9695b3a374d46a2e93894fb0c0619a994b3 Mon Sep 17 00:00:00 2001
+From 99aeed52b018ae0ab056237abadf4ebd997306c4 Mon Sep 17 00:00:00 2001
 From: tobtoht <tob@featherwallet.org>
 Date: Tue, 12 Mar 2024 10:09:50 +0100
-Subject: [PATCH 06/11] UR functions
+Subject: [PATCH 07/12] UR functions
 
 This commit adds UR functions for UR tasks,
 I believe that the right place to get
@@ -40,10 +40,10 @@ Things broken in the commit
  create mode 160000 external/bc-ur
 
 diff --git a/.gitmodules b/.gitmodules
-index 721cce3b4..d1896924a 100644
+index ffb73fe9a..72af74d55 100644
 --- a/.gitmodules
 +++ b/.gitmodules
-@@ -14,3 +14,7 @@
+@@ -15,3 +15,7 @@
  	path = external/supercop
  	url = https://github.com/monero-project/supercop
  	branch = monero
diff --git a/patches/monero/0007-add-dummy-device-for-ledger.patch b/patches/monero/0008-add-dummy-device-for-ledger.patch
index 54335cd..5598b68 100644
--- a/patches/monero/0007-add-dummy-device-for-ledger.patch
+++ b/patches/monero/0008-add-dummy-device-for-ledger.patch
@@ -1,7 +1,7 @@
-From 191cf0f700839d327eab24eaae4635818bb21bae Mon Sep 17 00:00:00 2001
+From 3cd9d0fddbd55dfef23c92bfb75b9b01a42d24c6 Mon Sep 17 00:00:00 2001
 From: Czarek Nakamoto <cyjan@mrcyjanek.net>
 Date: Wed, 26 Jun 2024 15:04:38 +0200
-Subject: [PATCH 07/11] add dummy device for ledger
+Subject: [PATCH 08/12] add dummy device for ledger
 
 ---
  CMakeLists.txt                 |   6 +-
diff --git a/patches/monero/0008-polyseed.patch b/patches/monero/0009-polyseed.patch
index 4399653..4044aea 100644
--- a/patches/monero/0008-polyseed.patch
+++ b/patches/monero/0009-polyseed.patch
@@ -1,7 +1,7 @@
-From 47c473f8680e0df31d3d8c3282b5f9fa51448d76 Mon Sep 17 00:00:00 2001
+From e28bd4b5afd73a07d086422a9bc264047e245a7b Mon Sep 17 00:00:00 2001
 From: tobtoht <tob@featherwallet.org>
 Date: Tue, 12 Mar 2024 09:42:37 +0100
-Subject: [PATCH 08/11] polyseed
+Subject: [PATCH 09/12] polyseed
 
 Co-authored-by: Czarek Nakamoto <cyjan@mrcyjanek.net>
 ---
@@ -15,8 +15,6 @@ 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 ++-
@@ -34,11 +32,9 @@ 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 ++-
- 29 files changed, 857 insertions(+), 24 deletions(-)
+ 27 files changed, 855 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 160000 external/utf8proc
  create mode 100644 src/polyseed/CMakeLists.txt
  create mode 100644 src/polyseed/pbkdf2.c
  create mode 100644 src/polyseed/pbkdf2.h
@@ -46,13 +42,13 @@ Co-authored-by: Czarek Nakamoto <cyjan@mrcyjanek.net>
  create mode 100644 src/polyseed/polyseed.hpp
 
 diff --git a/.gitmodules b/.gitmodules
-index d1896924a..36fa3058a 100644
+index 72af74d55..b838e84e0 100644
 --- a/.gitmodules
 +++ b/.gitmodules
-@@ -10,6 +10,12 @@
- [submodule "external/randomx"]
+@@ -11,6 +11,12 @@
  	path = external/randomx
- 	url = https://github.com/tevador/RandomX
+ 	url = https://github.com/MrCyjaneK/RandomX
+ 	branch = cyjan-fix-ios
 +[submodule "external/utf8proc"]
 +	path = external/utf8proc
 +	url = https://github.com/JuliaStrings/utf8proc.git
@@ -245,20 +241,6 @@ 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..3de4596fb
---- /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
diff --git a/patches/monero/0009-coin-control.patch b/patches/monero/0010-coin-control.patch
index e44b450..ad680ef 100644
--- a/patches/monero/0009-coin-control.patch
+++ b/patches/monero/0010-coin-control.patch
@@ -1,7 +1,7 @@
-From 972d5165e1b09929e432146fbe4585046341b38f Mon Sep 17 00:00:00 2001
+From 6a3d0ad6fadae9b84c42565064e8acf558b26d2b Mon Sep 17 00:00:00 2001
 From: tobtoht <tob@featherwallet.org>
 Date: Tue, 12 Mar 2024 11:07:57 +0100
-Subject: [PATCH 09/11] coin control
+Subject: [PATCH 10/12] coin control
 
 ---
  src/simplewallet/simplewallet.cpp |   2 +-
diff --git a/patches/monero/0010-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 1b1304e..cc00c9c 100644
--- a/patches/monero/0010-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,7 +1,7 @@
-From 6f3fc7aca64cca815992d33d6ca606e2a8f7d230 Mon Sep 17 00:00:00 2001
+From 971477966488aa9eb30bbbfaca4a621dc8997fd5 Mon Sep 17 00:00:00 2001
 From: M <m@cakewallet.com>
 Date: Fri, 21 Apr 2023 15:43:47 -0400
-Subject: [PATCH 10/11] Add hex encoding and tx key getter for
+Subject: [PATCH 11/12] Add hex encoding and tx key getter for
  PendingTransction in wallet api.
 
 ---
diff --git a/patches/monero/0011-Add-recoverDeterministicWalletFromSpendKey.patch b/patches/monero/0012-Add-recoverDeterministicWalletFromSpendKey.patch
index 801ab2b..8ef01f1 100644
--- a/patches/monero/0011-Add-recoverDeterministicWalletFromSpendKey.patch
+++ b/patches/monero/0012-Add-recoverDeterministicWalletFromSpendKey.patch
@@ -1,7 +1,7 @@
-From feaa18195d914163254add690d230137c4962e5b Mon Sep 17 00:00:00 2001
+From e848beaeb450fac2d7a24bb97c9ce6ddd16e7608 Mon Sep 17 00:00:00 2001
 From: Konstantin Ullrich <konstantinullrich12@gmail.com>
 Date: Wed, 11 Oct 2023 16:47:59 +0200
-Subject: [PATCH 11/11] Add recoverDeterministicWalletFromSpendKey
+Subject: [PATCH 12/12] Add recoverDeterministicWalletFromSpendKey
 
 This function is used by Cake Wallet to enable polyseed (dart implementation)
 support.