-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
14 changed files
with
42 additions
and
34 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From 8b7d9017d465f4e7797291d56082100704a3c59a Mon Sep 17 00:00:00 2001 | ||
From 1c32a5d6f62a550b9ee6635bca37f20a0471cc85 Mon Sep 17 00:00:00 2001 | ||
From: Czarek Nakamoto <[email protected]> | ||
Date: Tue, 26 Mar 2024 06:55:38 +0100 | ||
Subject: [PATCH 01/14] Fix wallet_api compilation target | ||
|
@@ -27,5 +27,5 @@ index 823f122c2..d81ddec93 100644 | |
pendingTxPostProcess(transaction); | ||
|
||
-- | ||
2.39.2 | ||
2.45.2 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From 114c13e1f26b32532a23e2db1c89403568bb8ee4 Mon Sep 17 00:00:00 2001 | ||
From 8729f36a109b33a080f5ee117a9d2a53fb55a47a Mon Sep 17 00:00:00 2001 | ||
From: tobtoht <[email protected]> | ||
Date: Tue, 12 Mar 2024 09:42:37 +0100 | ||
Subject: [PATCH 02/14] polyseed | ||
|
@@ -1295,5 +1295,5 @@ index df34f9abf..db5c1feb3 100644 | |
uint32_t m_multisig_threshold; | ||
std::vector<crypto::public_key> m_multisig_signers; | ||
-- | ||
2.39.2 | ||
2.45.2 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From 2d528c4fa050fe02f938bf460ff04192f0d3f288 Mon Sep 17 00:00:00 2001 | ||
From bc5c17f6c9fcd6122de2c60625388e7370f9e522 Mon Sep 17 00:00:00 2001 | ||
From: j-berman <[email protected]> | ||
Date: Thu, 13 Oct 2022 18:33:33 -0700 | ||
Subject: [PATCH 03/14] wallet: background sync with just the view key | ||
|
@@ -4347,5 +4347,5 @@ index 1e10e1f86..bff33a561 100644 | |
+ } | ||
+ return self.rpc.send_json_rpc_request(stop_background_sync) | ||
-- | ||
2.39.2 | ||
2.45.2 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From a6779dba0c87699f5818fbb679d6f77a945b3360 Mon Sep 17 00:00:00 2001 | ||
From dd3b82ecf391fbaa91d16634198e58fa9ed0091f Mon Sep 17 00:00:00 2001 | ||
From: tobtoht <[email protected]> | ||
Date: Tue, 26 Mar 2024 09:06:32 +0100 | ||
Subject: [PATCH 04/14] airgap | ||
|
@@ -166,5 +166,5 @@ index 009dce766..294a2d1f6 100644 | |
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); | ||
-- | ||
2.39.2 | ||
2.45.2 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From 0b17875257270149c5de45c2f43bab723a3905b7 Mon Sep 17 00:00:00 2001 | ||
From 820424507f43711e5e6b31a68dfda7e430cdae9d Mon Sep 17 00:00:00 2001 | ||
From: tobtoht <[email protected]> | ||
Date: Wed, 27 Mar 2024 16:31:36 +0100 | ||
Subject: [PATCH 05/14] coin control | ||
|
@@ -221,5 +221,5 @@ index 294a2d1f6..d1e68baac 100644 | |
bool frozen(const crypto::key_image &ki) const; | ||
bool frozen(const transfer_details &td) const; | ||
-- | ||
2.39.2 | ||
2.45.2 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From da7424810b9c7d42859ae6b6939672b6213a53a7 Mon Sep 17 00:00:00 2001 | ||
From cf12239f0c85f5865a796ac97c82f409604cfd3e Mon Sep 17 00:00:00 2001 | ||
From: Czarek Nakamoto <[email protected]> | ||
Date: Tue, 26 Mar 2024 09:44:54 +0100 | ||
Subject: [PATCH 06/14] fix build | ||
|
@@ -133,5 +133,5 @@ index 000000000..f05cb2b6a | |
+ #else | ||
+ #ifdef POLYSEED_SHARED | ||
-- | ||
2.39.2 | ||
2.45.2 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From 86421c3f08ba92f02bb4f484dff2e9710dfd3cd2 Mon Sep 17 00:00:00 2001 | ||
From b3916ec820e9b1aa3ad5af732c3fd32591b21a05 Mon Sep 17 00:00:00 2001 | ||
From: Your Name <[email protected]> | ||
Date: Thu, 28 Mar 2024 02:03:08 +0100 | ||
Subject: [PATCH 07/14] macos build fix | ||
|
@@ -110,5 +110,5 @@ index 000000000..bd97dd394 | |
+-- | ||
+2.39.2 | ||
-- | ||
2.39.2 | ||
2.45.2 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From 670e314c2737300ea618d7e3f51779af9e5009d2 Mon Sep 17 00:00:00 2001 | ||
From 80c2ee2b596b77d445c5e84f646a22949736fbd4 Mon Sep 17 00:00:00 2001 | ||
From: Czarek Nakamoto <[email protected]> | ||
Date: Tue, 2 Apr 2024 11:56:09 +0200 | ||
Subject: [PATCH 08/14] FIX: wallet listener crashing | ||
|
@@ -54,5 +54,5 @@ index ed309de34..ee0eeeb01 100644 | |
|
||
virtual void on_skip_transaction(uint64_t height, const crypto::hash &txid, const cryptonote::transaction& tx) | ||
-- | ||
2.39.2 | ||
2.45.2 | ||
|
24 changes: 16 additions & 8 deletions
24
patches/wownero/0009-fix-missing-___clear_cache-when-targetting-iOS.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,25 +1,33 @@ | ||
From ecdae80357168d532bc7625f337c6dff8b24939e Mon Sep 17 00:00:00 2001 | ||
From 05c6c9b1febdf4bb1073acd7b30d1ef981cd56b1 Mon Sep 17 00:00:00 2001 | ||
From: Czarek Nakamoto <[email protected]> | ||
Date: Tue, 2 Apr 2024 17:07:19 +0200 | ||
Subject: [PATCH 09/14] fix missing ___clear_cache when targetting iOS | ||
|
||
--- | ||
.gitmodules | 4 ++-- | ||
1 file changed, 2 insertions(+), 2 deletions(-) | ||
.gitmodules | 5 ++--- | ||
external/randomwow | 2 +- | ||
2 files changed, 3 insertions(+), 4 deletions(-) | ||
|
||
diff --git a/.gitmodules b/.gitmodules | ||
index bd30f0444..fa54f48b1 100644 | ||
index bd30f0444..6c3e36a72 100644 | ||
--- a/.gitmodules | ||
+++ b/.gitmodules | ||
@@ -20,6 +20,6 @@ | ||
@@ -20,6 +20,5 @@ | ||
branch = monero | ||
[submodule "external/randomwow"] | ||
path = external/randomwow | ||
- url = https://github.com/wownero-mirror/RandomWOW | ||
- branch = 1.2.1-wow | ||
+ url = https://github.com/mrcyjanek/RandomWOW | ||
- | ||
+ url = https://github.com/mrcyjanek/RandomWOW | ||
+ branch = cyjan-fix-ios | ||
|
||
diff --git a/external/randomwow b/external/randomwow | ||
index 27b099b6d..6f30d4b92 160000 | ||
--- a/external/randomwow | ||
+++ b/external/randomwow | ||
@@ -1 +1 @@ | ||
-Subproject commit 27b099b6dd6fef6e17f58c6dfe00009e9c5df587 | ||
+Subproject commit 6f30d4b924fecb231e5b683915cc75d18b3b5866 | ||
-- | ||
2.39.2 | ||
2.45.2 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From 6c94fb26ef4d87ceb53cdcf9fb372bc3420e9db9 Mon Sep 17 00:00:00 2001 | ||
From 6b220ce6f3bb9f57375d6bf06b70f82f043856c8 Mon Sep 17 00:00:00 2001 | ||
From: Czarek Nakamoto <[email protected]> | ||
Date: Thu, 25 Apr 2024 10:06:04 +0200 | ||
Subject: [PATCH 10/14] build wownero-seed | ||
|
@@ -609,5 +609,5 @@ index 000000000..a8f8fe059 | |
+-- | ||
+2.39.2 | ||
-- | ||
2.39.2 | ||
2.45.2 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From 8918f1a30ace05044a0e72a7bd661880e2ada35e Mon Sep 17 00:00:00 2001 | ||
From aff9394b39ccfa9842d47007a644f08b6b370e55 Mon Sep 17 00:00:00 2001 | ||
From: Czarek Nakamoto <[email protected]> | ||
Date: Thu, 23 May 2024 08:02:49 +0200 | ||
Subject: [PATCH 11/14] android ndk version bump | ||
|
@@ -116,5 +116,5 @@ index f118c754e..249213b20 100644 | |
SET(CMAKE_C_COMPILER @CC@) | ||
SET(CMAKE_CXX_COMPILER @CXX@) | ||
-- | ||
2.39.2 | ||
2.45.2 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From ed6bcc39821f50fc42914c60133f3773b934d9a1 Mon Sep 17 00:00:00 2001 | ||
From c40118e32ff966d0796b0b8f36f26a6f08dcfa90 Mon Sep 17 00:00:00 2001 | ||
From: Czarek Nakamoto <[email protected]> | ||
Date: Wed, 12 Jun 2024 15:48:01 +0200 | ||
Subject: [PATCH 12/14] rename arm -> armv7a | ||
|
@@ -90,5 +90,5 @@ index 249213b20..cc1d9b5c5 100644 | |
SET(CMAKE_ANDROID_ARCH_ABI "arm64-v8a") | ||
SET(CMAKE_SYSTEM_PROCESSOR "aarch64") | ||
-- | ||
2.39.2 | ||
2.45.2 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From 08c9a02339ceda7d033dbffd9e0093f1cacea6ec Mon Sep 17 00:00:00 2001 | ||
From f813a27e5842afde721494b9a1038d8f9d00016b Mon Sep 17 00:00:00 2001 | ||
From: Czarek Nakamoto <[email protected]> | ||
Date: Mon, 24 Jun 2024 10:49:12 +0200 | ||
Subject: [PATCH 13/14] use proper error handling in get_seed | ||
|
@@ -64,5 +64,5 @@ index 2b3eaad2e..4073974d9 100644 | |
crypto::ElectrumWords::bytes_to_words(key, electrum_words, "English"); | ||
} | ||
-- | ||
2.39.2 | ||
2.45.2 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From 584cf058ca441a46aa054d2d401b20f31ff7732e Mon Sep 17 00:00:00 2001 | ||
From 462a261e97814d71b976fe04af26cda2637deb4f Mon Sep 17 00:00:00 2001 | ||
From: Czarek Nakamoto <[email protected]> | ||
Date: Sat, 11 May 2024 16:25:10 +0200 | ||
Subject: [PATCH 14/14] store crash fix | ||
|
@@ -209,5 +209,5 @@ index d1e68baac..556306f20 100644 | |
i_wallet2_callback* m_callback; | ||
hw::device::device_type m_key_device_type; | ||
-- | ||
2.39.2 | ||
2.45.2 | ||
|