summaryrefslogtreecommitdiff
path: root/patches/zano/0007-relax-mutex-in-invoke-call.patch
diff options
context:
space:
mode:
authorcyan <cyjan@mrcyjanek.net>2026-03-09 18:05:16 +0100
committerGitHub <noreply@github.com>2026-03-09 18:05:16 +0100
commit2c11591e02b907e63d8fd4fcb0a6559625934a95 (patch)
treedab95d36703f314a8ee9d6277a160df16833c4e5 /patches/zano/0007-relax-mutex-in-invoke-call.patch
parent411e8a1cdb3f4c2812d83f28c335d2a4eb18bd29 (diff)
reproducibility (#177)
* reproducibility * wip: ci fixes, drop generate_translations_header.c * minor fixes * fix patch * fix: toolchain * bump hash * fix: minor build issue fixes * fix: x86_64-w64-mingw32 * wip * wip * all updated :o * fix: reduce git size * update checksum remove CI * chore, more optimal dockerfile * update monero to v0.18.4.6 * update checksum * update * minor patch update * fix: no command specified * fix: correct path * alpine * stupid. * AAWASTREYDRFUGTIHYJHGUTYFRDTFYVGUBHINJHGTYFRDSRTXDTCFHBJ
Diffstat (limited to 'patches/zano/0007-relax-mutex-in-invoke-call.patch')
-rw-r--r--patches/zano/0007-relax-mutex-in-invoke-call.patch43
1 files changed, 25 insertions, 18 deletions
diff --git a/patches/zano/0007-relax-mutex-in-invoke-call.patch b/patches/zano/0007-relax-mutex-in-invoke-call.patch
index cb38d5f..e6ed17f 100644
--- a/patches/zano/0007-relax-mutex-in-invoke-call.patch
+++ b/patches/zano/0007-relax-mutex-in-invoke-call.patch
@@ -1,28 +1,25 @@
-From af034097788cb58518b794c1312f8a8df297dda7 Mon Sep 17 00:00:00 2001
+From c8be0ef787060efcba6067729ae08b422bdde235 Mon Sep 17 00:00:00 2001
From: Czarek Nakamoto <cyjan@mrcyjanek.net>
Date: Tue, 18 Feb 2025 14:27:36 +0100
Subject: [PATCH 7/7] relax mutex in invoke call
---
- src/common/error_codes.h | 1 +
+ src/gui/qt-daemon/layout | 2 +-
src/wallet/wallets_manager.cpp | 37 ++++++++++++++++++++++++++++++----
- 2 files changed, 34 insertions(+), 4 deletions(-)
+ 2 files changed, 34 insertions(+), 5 deletions(-)
-diff --git a/src/common/error_codes.h b/src/common/error_codes.h
-index 1e3dc2ef..4723afe4 100644
---- a/src/common/error_codes.h
-+++ b/src/common/error_codes.h
-@@ -45,3 +45,4 @@
- #define API_RETURN_CODE_HTLC_ORIGIN_HASH_MISSMATCHED "HTLC_ORIGIN_HASH_MISSMATCHED"
- #define API_RETURN_CODE_WRAP "WRAP"
- #define API_RETURN_CODE_MISSING_ZC_INPUTS "MISSING_ZC_INPUTS"
-+#define API_RETURN_CODE_BAD_JSON "BAD_JSON"
-\ No newline at end of file
+diff --git a/src/gui/qt-daemon/layout b/src/gui/qt-daemon/layout
+index 7f7128e8..8ec45f89 160000
+--- a/src/gui/qt-daemon/layout
++++ b/src/gui/qt-daemon/layout
+@@ -1 +1 @@
+-Subproject commit 7f7128e8c3d5c04d801a327a7228abcc9aba85cd
++Subproject commit 8ec45f89802358be95c7fbb0eec5abe4382bd28e
diff --git a/src/wallet/wallets_manager.cpp b/src/wallet/wallets_manager.cpp
-index 5c8ef5c0..4b968a18 100644
+index 0152e3d4..490ae0e8 100644
--- a/src/wallet/wallets_manager.cpp
+++ b/src/wallet/wallets_manager.cpp
-@@ -1678,10 +1678,27 @@ std::string wallets_manager::get_wallet_status(uint64_t wallet_id)
+@@ -1698,10 +1698,27 @@ std::string wallets_manager::get_wallet_status(uint64_t wallet_id)
return epee::serialization::store_t_to_json(wsi);
}
@@ -50,7 +47,7 @@ index 5c8ef5c0..4b968a18 100644
CRITICAL_REGION_LOCAL1(wo.long_refresh_in_progress_lock);
if (wo.long_refresh_in_progress)
{
-@@ -1691,16 +1708,28 @@ std::string wallets_manager::invoke(uint64_t wallet_id, std::string params)
+@@ -1711,16 +1728,28 @@ std::string wallets_manager::invoke(uint64_t wallet_id, std::string params)
return epee::serialization::store_t_to_json(error_response);
}
@@ -82,7 +79,17 @@ index 5c8ef5c0..4b968a18 100644
+
return response_info.m_body;
}
-
+
+diff --git a/src/common/error_codes.h b/src/common/error_codes.h
+index b538fa87..7471b2d1 100644
+--- a/src/common/error_codes.h
++++ b/src/common/error_codes.h
+@@ -48,3 +48,4 @@
+ #define API_RETURN_CODE_MISSING_ZC_INPUTS "MISSING_ZC_INPUTS"
+ #define API_RETURN_CODE_ARG_OUT_OF_LIMITS "ARG_OUT_OF_LIMITS"
+ #define API_RETURN_CODE_TX_HAS_TOO_MANY_OUTPUTS "TX_HAS_TOO_MANY_OUTPUTS"
++#define API_RETURN_CODE_BAD_JSON "BAD_JSON"
+
--
-2.48.1
+2.51.0