Skip to content

Commit

Permalink
cleanup patches
Browse files Browse the repository at this point in the history
  • Loading branch information
@MrCyjaneK
MrCyjaneK committed Oct 21, 2024
1 parent d04dcf6 commit f0f2177
Show file tree
Hide file tree
Showing 21 changed files with 770 additions and 1,312 deletions.
405 changes: 203 additions & 202 deletions ...kground-sync-with-just-the-view-key.patch → ...kground-sync-with-just-the-view-key.patch
View file

Large diffs are not rendered by default.

44 changes: 22 additions & 22 deletions patches/monero/0011-store-crash-fix.patch → patches/monero/0002-store-crash-fix.patch
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 238c847c153c74953b094d83bfe181a596771d37 Mon Sep 17 00:00:00 2001
From a671dfe3e4d4723942f87a57a70a1a42f778cb4c Mon Sep 17 00:00:00 2001
From: Czarek Nakamoto <[email protected]>
Date: Sat, 11 May 2024 16:25:10 +0200
Subject: [PATCH 11/16] store crash fix
Subject: [PATCH 02/11] store crash fix

Monero wallet crashes (sometimes) when it is syncing,
while the proper solution (that can be seen in feather)
Expand Down Expand Up @@ -43,10 +43,10 @@ the current state.
4 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/src/wallet/api/wallet.cpp b/src/wallet/api/wallet.cpp
index ec4ae51ff..306c9b8ae 100644
index e9f76f4cf..0d85cf359 100644
--- a/src/wallet/api/wallet.cpp
+++ b/src/wallet/api/wallet.cpp
@@ -56,8 +56,8 @@ using namespace cryptonote;
@@ -55,8 +55,8 @@ using namespace cryptonote;
#define MONERO_DEFAULT_LOG_CATEGORY "WalletAPI"

#define LOCK_REFRESH() \
Expand All @@ -57,24 +57,24 @@ index ec4ae51ff..306c9b8ae 100644
m_wallet->stop(); \
m_refreshCV.notify_one(); \
boost::mutex::scoped_lock lock(m_refreshMutex); \
@@ -467,7 +467,7 @@ WalletImpl::WalletImpl(NetworkType nettype, uint64_t kdf_rounds)
@@ -466,7 +466,7 @@ WalletImpl::WalletImpl(NetworkType nettype, uint64_t kdf_rounds)
m_wallet2Callback.reset(new Wallet2CallbackImpl(this));
m_wallet->callback(m_wallet2Callback.get());
m_refreshThreadDone = false;
- m_refreshEnabled = false;
+ m_wallet->set_refresh_enabled(false);
m_addressBook.reset(new AddressBookImpl(this));
m_subaddress.reset(new SubaddressImpl(this));
m_coins.reset(new CoinsImpl(this));
@@ -1064,6 +1064,7 @@ void WalletImpl::stop()
m_subaddressAccount.reset(new SubaddressAccountImpl(this));
@@ -962,6 +962,7 @@ void WalletImpl::stop()
bool WalletImpl::store(const std::string &path)
{
clearStatus();
+ LOCK_REFRESH();
try {
if (path.empty()) {
m_wallet->store();
@@ -2591,10 +2592,10 @@ void WalletImpl::refreshThreadFunc()
@@ -2448,10 +2449,10 @@ void WalletImpl::refreshThreadFunc()
}

LOG_PRINT_L3(__FUNCTION__ << ": refresh lock acquired...");
Expand All @@ -87,7 +87,7 @@ index ec4ae51ff..306c9b8ae 100644
LOG_PRINT_L3(__FUNCTION__ << ": refreshing...");
doRefresh();
}
@@ -2624,12 +2625,12 @@ void WalletImpl::doRefresh()
@@ -2481,12 +2482,12 @@ void WalletImpl::doRefresh()
}
m_wallet->find_and_save_rings(false);
} else {
Expand All @@ -102,7 +102,7 @@ index ec4ae51ff..306c9b8ae 100644

if (m_wallet2Callback->getListener()) {
m_wallet2Callback->getListener()->refreshed();
@@ -2639,9 +2640,9 @@ void WalletImpl::doRefresh()
@@ -2496,9 +2497,9 @@ void WalletImpl::doRefresh()

void WalletImpl::startRefresh()
{
Expand All @@ -114,7 +114,7 @@ index ec4ae51ff..306c9b8ae 100644
m_refreshCV.notify_one();
}
}
@@ -2651,7 +2652,7 @@ void WalletImpl::startRefresh()
@@ -2508,7 +2509,7 @@ void WalletImpl::startRefresh()
void WalletImpl::stopRefresh()
{
if (!m_refreshThreadDone) {
Expand All @@ -123,7 +123,7 @@ index ec4ae51ff..306c9b8ae 100644
m_refreshThreadDone = true;
m_refreshCV.notify_one();
m_refreshThread.join();
@@ -2662,9 +2663,7 @@ void WalletImpl::pauseRefresh()
@@ -2519,9 +2520,7 @@ void WalletImpl::pauseRefresh()
{
LOG_PRINT_L2(__FUNCTION__ << ": refresh paused...");
// TODO synchronize access
Expand All @@ -135,10 +135,10 @@ index ec4ae51ff..306c9b8ae 100644


diff --git a/src/wallet/api/wallet.h b/src/wallet/api/wallet.h
index d0f443abc..2ad2b62a4 100644
index 1f199a72c..ac7ce2f6a 100644
--- a/src/wallet/api/wallet.h
+++ b/src/wallet/api/wallet.h
@@ -295,7 +295,6 @@ private:
@@ -273,7 +273,6 @@ private:
std::unique_ptr<SubaddressAccountImpl> m_subaddressAccount;

// multi-threaded refresh stuff
Expand All @@ -147,18 +147,18 @@ index d0f443abc..2ad2b62a4 100644
std::atomic<int> m_refreshIntervalMillis;
std::atomic<bool> m_refreshShouldRescan;
diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp
index 61601f70c..4de226a4a 100644
index 8146014d6..aa61fb298 100644
--- a/src/wallet/wallet2.cpp
+++ b/src/wallet/wallet2.cpp
@@ -1203,6 +1203,7 @@ wallet2::wallet2(network_type nettype, uint64_t kdf_rounds, bool unattended, std
@@ -1192,6 +1192,7 @@ wallet2::wallet2(network_type nettype, uint64_t kdf_rounds, bool unattended, std
m_upper_transaction_weight_limit(0),
m_run(true),
m_callback(0),
+ m_refreshEnabled(false),
m_trusted_daemon(false),
m_nettype(nettype),
m_multisig_rounds_passed(0),
@@ -1416,6 +1417,14 @@ bool wallet2::set_daemon(std::string daemon_address, boost::optional<epee::net_u
@@ -1404,6 +1405,14 @@ bool wallet2::set_daemon(std::string daemon_address, boost::optional<epee::net_u
return ret;
}
//----------------------------------------------------------------------------------------------------
Expand All @@ -173,7 +173,7 @@ index 61601f70c..4de226a4a 100644
bool wallet2::set_proxy(const std::string &address)
{
return m_http_client->set_proxy(address);
@@ -4146,8 +4155,9 @@ void wallet2::refresh(bool trusted_daemon, uint64_t start_height, uint64_t & blo
@@ -4096,8 +4105,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;
Expand All @@ -185,10 +185,10 @@ index 61601f70c..4de226a4a 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 fdc1a6212..3ce710433 100644
index b1dc4f716..a050286bc 100644
--- a/src/wallet/wallet2.h
+++ b/src/wallet/wallet2.h
@@ -1086,6 +1086,8 @@ private:
@@ -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);
bool set_proxy(const std::string &address);
Expand All @@ -197,7 +197,7 @@ index fdc1a6212..3ce710433 100644

void stop() { m_run.store(false, std::memory_order_relaxed); m_message_store.stop(); }

@@ -2012,6 +2014,7 @@ private:
@@ -1981,6 +1983,7 @@ private:

boost::recursive_mutex m_daemon_rpc_mutex;

Expand All @@ -206,5 +206,5 @@ index fdc1a6212..3ce710433 100644
i_wallet2_callback* m_callback;
hw::device::device_type m_key_device_type;
--
2.39.2
2.39.5 (Apple Git-154)

71 changes: 52 additions & 19 deletions ...onero/0013-android-ndk-version-bump.patch → patches/monero/0003-Update-android-ndk.patch
View file
Original file line number Diff line number Diff line change
@@ -1,25 +1,28 @@
From 1b978a697e1bdb3144bc08f998d125ac593fa971 Mon Sep 17 00:00:00 2001
From e2526a2a08b96dd75f8c9effe475dd15156c743e Mon Sep 17 00:00:00 2001
From: Czarek Nakamoto <[email protected]>
Date: Thu, 23 May 2024 08:02:49 +0200
Subject: [PATCH 13/16] android ndk version bump
Subject: [PATCH 03/11] Update android ndk

rename arm -> armv7a
---
contrib/depends/hosts/android.mk | 16 +++++++++++++---
contrib/depends/packages/android_ndk.mk | 20 ++++++++++++++------
contrib/depends/hosts/android.mk | 18 ++++++++++++----
contrib/depends/packages/android_ndk.mk | 28 ++++++++++++++++++-------
contrib/depends/packages/boost.mk | 1 +
contrib/depends/toolchain.cmake.in | 11 ++++++-----
4 files changed, 34 insertions(+), 14 deletions(-)
contrib/depends/packages/openssl.mk | 2 +-
contrib/depends/toolchain.cmake.in | 13 ++++++------
5 files changed, 44 insertions(+), 18 deletions(-)

diff --git a/contrib/depends/hosts/android.mk b/contrib/depends/hosts/android.mk
index d6f8b99dd..e1c99aef3 100644
index d6f8b99dd..827103c36 100644
--- a/contrib/depends/hosts/android.mk
+++ b/contrib/depends/hosts/android.mk
@@ -1,12 +1,22 @@
ANDROID_API=21
-
+host_toolchain=nonexistent
ifeq ($(host_arch),arm)
-ifeq ($(host_arch),arm)
-host_toolchain=arm-linux-androideabi-
+host_toolchain=nonexistent
+ifeq ($(host_arch),armv7a)
+host_toolchain=armv7a-linux-androideabi${ANDROID_API}-
+endif
+ifeq ($(host_arch),x86_64)
Expand All @@ -41,10 +44,10 @@ index d6f8b99dd..e1c99aef3 100644
android_CFLAGS=-pipe
android_CXXFLAGS=$(android_CFLAGS)
diff --git a/contrib/depends/packages/android_ndk.mk b/contrib/depends/packages/android_ndk.mk
index 5deff76c7..1ad250653 100644
index 9b8a5332f..2c2914ec2 100644
--- a/contrib/depends/packages/android_ndk.mk
+++ b/contrib/depends/packages/android_ndk.mk
@@ -1,8 +1,10 @@
@@ -1,12 +1,16 @@
package=android_ndk
-$(package)_version=17b
+$(package)_version=26d
Expand All @@ -57,10 +60,20 @@ index 5deff76c7..1ad250653 100644
+$(package)_version_apiversion=21

define $(package)_set_vars
$(package)_config_opts_arm=--arch arm
@@ -17,8 +19,14 @@ define $(package)_extract_cmds
-$(package)_config_opts_arm=--arch arm
+$(package)_config_opts_armv7a=--arch arm
$(package)_config_opts_aarch64=--arch arm64
+$(package)_config_opts_x86_64=--arch x86_64
+$(package)_config_opts_i686=--arch x86
endef

define $(package)_extract_cmds
@@ -14,9 +18,19 @@ define $(package)_extract_cmds
unzip -q $($(1)_source_dir)/$($(package)_file_name)
endef

+# arm-linux-androideabi-ar - openssl workaround
+
define $(package)_stage_cmds
- android-ndk-r$($(package)_version)/build/tools/make_standalone_toolchain.py --api 21 \
- --install-dir $(build_prefix) --stl=libc++ $($(package)_config_opts) &&\
Expand All @@ -71,7 +84,9 @@ index 5deff76c7..1ad250653 100644
+ --install-dir $(build_prefix)/toolchain --stl=libc++ $($(package)_config_opts) &&\
+ mv $(build_prefix)/toolchain $($(package)_staging_dir)/$(host_prefix)/native && \
+ cp $($(package)_staging_dir)/$(host_prefix)/native/bin/llvm-ar $($(package)_staging_dir)/$(host_prefix)/native/bin/$(host)$($(package)_version_apiversion)-ar &&\
+ cp $($(package)_staging_dir)/$(host_prefix)/native/bin/llvm-ar $($(package)_staging_dir)/$(host_prefix)/native/bin/arm-linux-androideabi-ar &&\
+ cp $($(package)_staging_dir)/$(host_prefix)/native/bin/llvm-ranlib $($(package)_staging_dir)/$(host_prefix)/native/bin/$(host)$($(package)_version_apiversion)-ranlib &&\
+ cp $($(package)_staging_dir)/$(host_prefix)/native/bin/llvm-ranlib $($(package)_staging_dir)/$(host_prefix)/native/bin/arm-linux-androideabi-ranlib &&\
+ cp $($(package)_staging_dir)/$(host_prefix)/native/bin/llvm-ar $($(package)_staging_dir)/$(host_prefix)/native/bin/$(host)-ar &&\
+ cp $($(package)_staging_dir)/$(host_prefix)/native/bin/llvm-ranlib $($(package)_staging_dir)/$(host_prefix)/native/bin/$(host)-ranlib
endef
Expand All @@ -88,20 +103,38 @@ index fd06c5393..c17e863cc 100644
$(package)_cxxflags_freebsd=-fPIC
endef

diff --git a/contrib/depends/packages/openssl.mk b/contrib/depends/packages/openssl.mk
index a157762c7..2430f6495 100644
--- a/contrib/depends/packages/openssl.mk
+++ b/contrib/depends/packages/openssl.mk
@@ -34,7 +34,7 @@ $(package)_config_opts_x86_64_linux=linux-x86_64
$(package)_config_opts_i686_linux=linux-generic32
$(package)_config_opts_arm_linux=linux-generic32
$(package)_config_opts_aarch64_linux=linux-generic64
-$(package)_config_opts_arm_android=--static android-arm
+$(package)_config_opts_armv7a_android=--static android-arm
$(package)_config_opts_aarch64_android=--static android-arm64
$(package)_config_opts_aarch64_darwin=darwin64-arm64-cc
$(package)_config_opts_riscv64_linux=linux-generic64
diff --git a/contrib/depends/toolchain.cmake.in b/contrib/depends/toolchain.cmake.in
index f26655d68..96a95ceb8 100644
index f118c754e..cc1d9b5c5 100644
--- a/contrib/depends/toolchain.cmake.in
+++ b/contrib/depends/toolchain.cmake.in
@@ -104,16 +104,17 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "Android")
@@ -100,20 +100,21 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
SET(LLVM_ENABLE_PIE OFF)
elseif(CMAKE_SYSTEM_NAME STREQUAL "Android")
SET(ANDROID TRUE)
- if(ARCHITECTURE STREQUAL "arm")
+ if(ARCHITECTURE STREQUAL "armv7a")
SET(CMAKE_ANDROID_ARCH_ABI "armeabi-v7a")
SET(CMAKE_SYSTEM_PROCESSOR "armv7-a")
SET(CMAKE_ANDROID_ARM_MODE ON)
- SET(CMAKE_C_COMPILER_TARGET arm-linux-androideabi)
- SET(CMAKE_CXX_COMPILER_TARGET arm-linux-androideabi)
- SET(_CMAKE_TOOLCHAIN_PREFIX arm-linux-androideabi-)
+ SET(CMAKE_C_COMPILER_TARGET arm-linux-androideabi21)
+ SET(CMAKE_CXX_COMPILER_TARGET arm-linux-androideabi21)
+ SET(_CMAKE_TOOLCHAIN_PREFIX arm-linux-androideabi21-)
+ SET(CMAKE_C_COMPILER_TARGET armv7a-linux-androideabi21)
+ SET(CMAKE_CXX_COMPILER_TARGET armv7a-linux-androideabi21)
+ SET(_CMAKE_TOOLCHAIN_PREFIX armv7a-linux-androideabi21-)
elseif(ARCHITECTURE STREQUAL "aarch64")
SET(CMAKE_ANDROID_ARCH_ABI "arm64-v8a")
SET(CMAKE_SYSTEM_PROCESSOR "aarch64")
Expand All @@ -116,5 +149,5 @@ index f26655d68..96a95ceb8 100644
SET(CMAKE_C_COMPILER @CC@)
SET(CMAKE_CXX_COMPILER @CXX@)
--
2.39.2
2.39.5 (Apple Git-154)

Loading

0 comments on commit f0f2177

Please sign in to comment.