diff --git a/impls/monero.dart/lib/src/checksum_zano.dart b/impls/monero.dart/lib/src/checksum_zano.dart index b8b879a..e530e89 100644 --- a/impls/monero.dart/lib/src/checksum_zano.dart +++ b/impls/monero.dart/lib/src/checksum_zano.dart @@ -1,4 +1,4 @@ // ignore_for_file: constant_identifier_names const String wallet2_api_c_h_sha256 = "8acaa95513b85a984c08e05cc3f2ac7530bb8f32946eeeb45357bd846aef33dd"; -const String wallet2_api_c_cpp_sha256 = "4efacd3812d53dd268b6869cc0a9560e7320574d96e09136cf067f796edfeba6-2817090c8ac7639d6f697d00fc8bcba2b3681d90"; +const String wallet2_api_c_cpp_sha256 = "4efacd3812d53dd268b6869cc0a9560e7320574d96e09136cf067f796edfeba6-fe85ce27fb5a5ce37eac87397601de45343f5376"; const String wallet2_api_c_exp_sha256 = "66f3ff655bbfd11ad28c318ab707090b5a93276f436b06f7b1c0f329dba3c9c2"; diff --git a/impls/monero.ts/checksum_zano.ts b/impls/monero.ts/checksum_zano.ts index 2af89bd..351bf90 100644 --- a/impls/monero.ts/checksum_zano.ts +++ b/impls/monero.ts/checksum_zano.ts @@ -1,5 +1,5 @@ export const zanoChecksum = { wallet2_api_c_h_sha256: "8acaa95513b85a984c08e05cc3f2ac7530bb8f32946eeeb45357bd846aef33dd", - wallet2_api_c_cpp_sha256: "4efacd3812d53dd268b6869cc0a9560e7320574d96e09136cf067f796edfeba6-2817090c8ac7639d6f697d00fc8bcba2b3681d90", + wallet2_api_c_cpp_sha256: "4efacd3812d53dd268b6869cc0a9560e7320574d96e09136cf067f796edfeba6-fe85ce27fb5a5ce37eac87397601de45343f5376", wallet2_api_c_exp_sha256: "66f3ff655bbfd11ad28c318ab707090b5a93276f436b06f7b1c0f329dba3c9c2", } diff --git a/patches/zano/0001-add-missing-include.patch b/patches/zano/0001-add-missing-include.patch deleted file mode 100644 index cd95528..0000000 --- a/patches/zano/0001-add-missing-include.patch +++ /dev/null @@ -1,64 +0,0 @@ -From a49fa9a64aebf69f15832291e70888ff18ed6040 Mon Sep 17 00:00:00 2001 -From: Czarek Nakamoto -Date: Thu, 31 Oct 2024 13:07:20 +0000 -Subject: [PATCH 1/5] add missing #include - ---- - src/currency_core/genesis.cpp | 1 + - src/currency_core/genesis.h | 2 +- - src/wallet/plain_wallet_api.cpp | 1 + - src/wallet/plain_wallet_api.h | 1 + - 4 files changed, 4 insertions(+), 1 deletion(-) - -diff --git a/src/currency_core/genesis.cpp b/src/currency_core/genesis.cpp -index a58dcb4e..c34b0285 100644 ---- a/src/currency_core/genesis.cpp -+++ b/src/currency_core/genesis.cpp -@@ -4,6 +4,7 @@ - // file COPYING or http://www.opensource.org/licenses/mit-license.php. - - #include "genesis.h" -+#include - - namespace currency - { -diff --git a/src/currency_core/genesis.h b/src/currency_core/genesis.h -index 8ea77d89..d78cec97 100644 ---- a/src/currency_core/genesis.h -+++ b/src/currency_core/genesis.h -@@ -3,7 +3,7 @@ - // Copyright (c) 2014-2018 The Louisdor Project - // Distributed under the MIT/X11 software license, see the accompanying - // file COPYING or http://www.opensource.org/licenses/mit-license.php. -- -+#include - #pragma once - #include - namespace currency -diff --git a/src/wallet/plain_wallet_api.cpp b/src/wallet/plain_wallet_api.cpp -index bb322481..dccff76c 100644 ---- a/src/wallet/plain_wallet_api.cpp -+++ b/src/wallet/plain_wallet_api.cpp -@@ -6,6 +6,7 @@ - #ifdef ANDROID_BUILD - #include - #endif -+#include - #include "plain_wallet_api.h" - #include "plain_wallet_api_defs.h" - #include "currency_core/currency_config.h" -diff --git a/src/wallet/plain_wallet_api.h b/src/wallet/plain_wallet_api.h -index f12eba03..177b8173 100644 ---- a/src/wallet/plain_wallet_api.h -+++ b/src/wallet/plain_wallet_api.h -@@ -6,6 +6,7 @@ - #pragma once - - #include -+#include - #include "../common/error_codes.h" - - namespace plain_wallet --- -2.39.5 (Apple Git-154) - diff --git a/patches/zano/0002-fix-build-issues.patch b/patches/zano/0001-fix-build-issues.patch similarity index 90% rename from patches/zano/0002-fix-build-issues.patch rename to patches/zano/0001-fix-build-issues.patch index 9ff3f85..4ddcff0 100644 --- a/patches/zano/0002-fix-build-issues.patch +++ b/patches/zano/0001-fix-build-issues.patch @@ -1,7 +1,7 @@ -From 627750b0f1471c5d34755ca446d452429945d5d6 Mon Sep 17 00:00:00 2001 +From 38da066606cb959497d9b8221bb29ee885bc7c31 Mon Sep 17 00:00:00 2001 From: cyan Date: Sat, 2 Nov 2024 20:50:26 +0000 -Subject: [PATCH 2/5] fix build issues +Subject: [PATCH 1/7] fix build issues --- contrib/db/libmdbx/CMakeLists.txt | 2 +- @@ -35,5 +35,5 @@ index 5949e9f0..e7b677bd 100644 add_definitions(-DNDEBUG=1 -DMDBX_DEBUG=0 -DLIBMDBX_EXPORTS=1 -D_GNU_SOURCE=1) -- -2.39.5 (Apple Git-154) +2.48.1 diff --git a/patches/zano/0003-fix-mingw-build-issues.patch b/patches/zano/0002-fix-mingw-build-issues.patch similarity index 93% rename from patches/zano/0003-fix-mingw-build-issues.patch rename to patches/zano/0002-fix-mingw-build-issues.patch index 48b4d65..cbaa537 100644 --- a/patches/zano/0003-fix-mingw-build-issues.patch +++ b/patches/zano/0002-fix-mingw-build-issues.patch @@ -1,7 +1,7 @@ -From 1f7604d5b661f4490a1757e5ed1d6ed367ffb739 Mon Sep 17 00:00:00 2001 +From 9e55bde82de70a12d68249233d2d571bf388a409 Mon Sep 17 00:00:00 2001 From: cyan Date: Sun, 3 Nov 2024 08:59:22 +0000 -Subject: [PATCH 3/5] fix mingw build issues +Subject: [PATCH 2/7] fix mingw build issues --- contrib/epee/include/misc_os_dependent.h | 4 ++-- @@ -57,5 +57,5 @@ index 9176de17..8b488135 100644 #define I64T __int64 #define U64C(v) (v##ui64) -- -2.39.5 (Apple Git-154) +2.48.1 diff --git a/patches/zano/0005-fix-ios-builds.patch b/patches/zano/0003-fix-ios-builds.patch similarity index 90% rename from patches/zano/0005-fix-ios-builds.patch rename to patches/zano/0003-fix-ios-builds.patch index f68244f..880345e 100644 --- a/patches/zano/0005-fix-ios-builds.patch +++ b/patches/zano/0003-fix-ios-builds.patch @@ -1,7 +1,7 @@ -From 20975fed75b7255f6cb6df74a17f1923f7159c09 Mon Sep 17 00:00:00 2001 +From 2eccbb7b4dfef6aef3de75ed843353343b2cc0c8 Mon Sep 17 00:00:00 2001 From: Czarek Nakamoto Date: Tue, 5 Nov 2024 16:52:23 +0100 -Subject: [PATCH 5/5] fix ios builds +Subject: [PATCH 3/7] fix ios builds --- CMakeLists.txt | 6 +++--- @@ -39,5 +39,5 @@ index c480300f..7087d796 100644 -- -2.39.5 (Apple Git-154) +2.48.1 diff --git a/patches/zano/0004-update-tor-connect.patch b/patches/zano/0004-update-tor-connect.patch deleted file mode 100644 index 76cc59d..0000000 --- a/patches/zano/0004-update-tor-connect.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 7d05e6a8d62ad3302bd1bb1818db36bde5885bab Mon Sep 17 00:00:00 2001 -From: Czarek Nakamoto -Date: Tue, 5 Nov 2024 10:35:03 -0500 -Subject: [PATCH 4/5] update tor-connect - ---- - .gitmodules | 2 +- - contrib/tor-connect | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/.gitmodules b/.gitmodules -index 57896bbb..4df859f8 100644 ---- a/.gitmodules -+++ b/.gitmodules -@@ -7,7 +7,7 @@ - branch = main - [submodule "contrib/tor-connect"] - path = contrib/tor-connect -- url = https://github.com/hyle-team/tor-connect.git -+ url = https://github.com/MrCyjaneK/tor-connect.git - branch = main - [submodule "contrib/jwt-cpp"] - path = contrib/jwt-cpp -diff --git a/contrib/tor-connect b/contrib/tor-connect -index b589edb1..cc445b2f 160000 ---- a/contrib/tor-connect -+++ b/contrib/tor-connect -@@ -1 +1 @@ --Subproject commit b589edb1906dccb387cfeded6ed12286c5f0405f -+Subproject commit cd7f0c4b583488a7fe9b50de8e533a9853b6a5c7 --- -2.39.5 (Apple Git-154) - diff --git a/patches/zano/0006-use-boost-filesystem-instead-of-stdfs.patch b/patches/zano/0004-use-boost-filesystem-instead-of-stdfs.patch similarity index 96% rename from patches/zano/0006-use-boost-filesystem-instead-of-stdfs.patch rename to patches/zano/0004-use-boost-filesystem-instead-of-stdfs.patch index 64b7f4c..1ede500 100644 --- a/patches/zano/0006-use-boost-filesystem-instead-of-stdfs.patch +++ b/patches/zano/0004-use-boost-filesystem-instead-of-stdfs.patch @@ -1,7 +1,7 @@ -From 033d71f4a8623dee3508c493431402bbbe5a8b2d Mon Sep 17 00:00:00 2001 +From 1ba500f05c1b534c9fbec8d1dc534546febb5b43 Mon Sep 17 00:00:00 2001 From: Czarek Nakamoto Date: Wed, 4 Dec 2024 17:21:44 -0600 -Subject: [PATCH] use boost::filesystem instead of stdfs +Subject: [PATCH 4/7] use boost::filesystem instead of stdfs --- CMakeLists.txt | 23 ++++------------------- @@ -76,5 +76,5 @@ index bb21ae99..ced01092 100644 continue; } -- -2.39.5 (Apple Git-154) +2.48.1 diff --git a/patches/zano/0007-downgrade-cmake-version-so-LIB_DEPENDS-shows-up.patch b/patches/zano/0005-downgrade-cmake-version-so-LIB_DEPENDS-shows-up.patch similarity index 72% rename from patches/zano/0007-downgrade-cmake-version-so-LIB_DEPENDS-shows-up.patch rename to patches/zano/0005-downgrade-cmake-version-so-LIB_DEPENDS-shows-up.patch index 0ac7e50..0c5af27 100644 --- a/patches/zano/0007-downgrade-cmake-version-so-LIB_DEPENDS-shows-up.patch +++ b/patches/zano/0005-downgrade-cmake-version-so-LIB_DEPENDS-shows-up.patch @@ -1,7 +1,7 @@ -From e6201106cd09416f96c8d83270c94565583cd356 Mon Sep 17 00:00:00 2001 +From 00bfd0703db144cb51f667c183ff5d066dec2f9c Mon Sep 17 00:00:00 2001 From: Czarek Nakamoto Date: Thu, 5 Dec 2024 09:36:34 -0600 -Subject: [PATCH] downgrade cmake version so LIB_DEPENDS shows up +Subject: [PATCH 5/7] downgrade cmake version so LIB_DEPENDS shows up --- CMakeLists.txt | 2 +- @@ -18,5 +18,5 @@ index 6ded9711..47d24a81 100644 PROJECT(Zano) -- -2.39.5 (Apple Git-154) +2.48.1 diff --git a/patches/zano/0008-increase-max-password.patch b/patches/zano/0006-increase-max-password.patch similarity index 81% rename from patches/zano/0008-increase-max-password.patch rename to patches/zano/0006-increase-max-password.patch index 0ce87c7..83415b0 100644 --- a/patches/zano/0008-increase-max-password.patch +++ b/patches/zano/0006-increase-max-password.patch @@ -1,17 +1,17 @@ -From 6812b5de7e0a52e9341e54dbe2fc0b790dc6de5a Mon Sep 17 00:00:00 2001 +From cefa69627a46ec6fd54e3c44e82f1d777e3c98c0 Mon Sep 17 00:00:00 2001 From: Czarek Nakamoto Date: Thu, 12 Dec 2024 09:00:57 -0500 -Subject: [PATCH] increase max password +Subject: [PATCH 6/7] increase max password --- src/currency_core/currency_format_utils.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/currency_core/currency_format_utils.cpp b/src/currency_core/currency_format_utils.cpp -index 96d55b4..0c3d947 100644 +index 56316dd5..d92e5793 100644 --- a/src/currency_core/currency_format_utils.cpp +++ b/src/currency_core/currency_format_utils.cpp -@@ -3632,7 +3632,7 @@ namespace currency +@@ -3653,7 +3653,7 @@ namespace currency return true; } //------------------------------------------------------------------ @@ -21,5 +21,5 @@ index 96d55b4..0c3d947 100644 { // OLD: static const std::string allowed_password_symbols = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz~!?@#$%^&*_+|{}[]()<>:;\"'-=\\/.,"; -- -2.39.5 (Apple Git-154) +2.48.1 diff --git a/patches/zano/0010-relax-mutex-in-invoke-call.patch b/patches/zano/0007-relax-mutex-in-invoke-call.patch similarity index 90% rename from patches/zano/0010-relax-mutex-in-invoke-call.patch rename to patches/zano/0007-relax-mutex-in-invoke-call.patch index e3e29a7..cb38d5f 100644 --- a/patches/zano/0010-relax-mutex-in-invoke-call.patch +++ b/patches/zano/0007-relax-mutex-in-invoke-call.patch @@ -1,7 +1,7 @@ -From 2421d1fb4b4c50c1372361b1688f7d9fff9ef716 Mon Sep 17 00:00:00 2001 +From af034097788cb58518b794c1312f8a8df297dda7 Mon Sep 17 00:00:00 2001 From: Czarek Nakamoto Date: Tue, 18 Feb 2025 14:27:36 +0100 -Subject: [PATCH] relax mutex in invoke call +Subject: [PATCH 7/7] relax mutex in invoke call --- src/common/error_codes.h | 1 + @@ -9,7 +9,7 @@ Subject: [PATCH] relax mutex in invoke call 2 files changed, 34 insertions(+), 4 deletions(-) diff --git a/src/common/error_codes.h b/src/common/error_codes.h -index 1e3dc2efc..4723afe40 100644 +index 1e3dc2ef..4723afe4 100644 --- a/src/common/error_codes.h +++ b/src/common/error_codes.h @@ -45,3 +45,4 @@ @@ -19,10 +19,10 @@ index 1e3dc2efc..4723afe40 100644 +#define API_RETURN_CODE_BAD_JSON "BAD_JSON" \ No newline at end of file diff --git a/src/wallet/wallets_manager.cpp b/src/wallet/wallets_manager.cpp -index 7155771d2..3da57dc7a 100644 +index 5c8ef5c0..4b968a18 100644 --- a/src/wallet/wallets_manager.cpp +++ b/src/wallet/wallets_manager.cpp -@@ -1675,10 +1675,27 @@ std::string wallets_manager::get_wallet_status(uint64_t wallet_id) +@@ -1678,10 +1678,27 @@ std::string wallets_manager::get_wallet_status(uint64_t wallet_id) return epee::serialization::store_t_to_json(wsi); } @@ -50,7 +50,7 @@ index 7155771d2..3da57dc7a 100644 CRITICAL_REGION_LOCAL1(wo.long_refresh_in_progress_lock); if (wo.long_refresh_in_progress) { -@@ -1688,16 +1705,28 @@ std::string wallets_manager::invoke(uint64_t wallet_id, std::string params) +@@ -1691,16 +1708,28 @@ std::string wallets_manager::invoke(uint64_t wallet_id, std::string params) return epee::serialization::store_t_to_json(error_response); } diff --git a/patches/zano/0009-add-keys-to-open_wallet_response.patch b/patches/zano/0009-add-keys-to-open_wallet_response.patch deleted file mode 100644 index 1ca4952..0000000 --- a/patches/zano/0009-add-keys-to-open_wallet_response.patch +++ /dev/null @@ -1,83 +0,0 @@ -From 8f6c62f969ee38e7db5a0e639cd08216ba79d6d1 Mon Sep 17 00:00:00 2001 -From: Czarek Nakamoto -Date: Tue, 18 Feb 2025 04:29:30 +0100 -Subject: [PATCH] add keys to open_wallet_response - ---- - src/wallet/view_iface.h | 8 ++++++++ - src/wallet/wallets_manager.cpp | 19 +++++++++++++++++++ - 2 files changed, 27 insertions(+) - -diff --git a/src/wallet/view_iface.h b/src/wallet/view_iface.h -index dce4b5ee0..bda58d05f 100644 ---- a/src/wallet/view_iface.h -+++ b/src/wallet/view_iface.h -@@ -452,6 +452,10 @@ public: - transfers_array recent_history; - wallet_info wi; - std::string seed; -+ std::string private_spend_key; -+ std::string private_view_key; -+ std::string public_spend_key; -+ std::string public_view_key; - bool recovered; - uint64_t wallet_local_bc_size; - uint64_t wallet_file_size; -@@ -463,6 +467,10 @@ public: - KV_SERIALIZE(recent_history) - KV_SERIALIZE(wi) - KV_SERIALIZE(seed) -+ KV_SERIALIZE(private_spend_key) -+ KV_SERIALIZE(private_view_key) -+ KV_SERIALIZE(public_spend_key) -+ KV_SERIALIZE(public_view_key) - KV_SERIALIZE(recovered) - KV_SERIALIZE(wallet_local_bc_size) - KV_SERIALIZE(wallet_file_size) -diff --git a/src/wallet/wallets_manager.cpp b/src/wallet/wallets_manager.cpp -index 8859ec8d7..7155771d2 100644 ---- a/src/wallet/wallets_manager.cpp -+++ b/src/wallet/wallets_manager.cpp -@@ -1086,6 +1086,13 @@ std::string wallets_manager::open_wallet(const std::wstring& path, const std::st - - //workaround for missed fee - owr.seed = w->get_account().get_seed_phrase(""); -+ auto& keys = w->get_account().get_keys(); -+ -+ owr.private_view_key = epee::string_tools::pod_to_hex(keys.view_secret_key); -+ owr.public_view_key = epee::string_tools::pod_to_hex(keys.account_address.view_public_key); -+ owr.private_spend_key = epee::string_tools::pod_to_hex(keys.spend_secret_key); -+ owr.public_spend_key = epee::string_tools::pod_to_hex(keys.account_address.spend_public_key); -+ // open_wallet_response - break; - } - catch (const tools::error::file_not_found& /**/) -@@ -1197,6 +1204,12 @@ std::string wallets_manager::generate_wallet(const std::wstring& path, const std - w->generate(path, password, false); - w->set_minimum_height(m_last_daemon_height-1); - owr.seed = w->get_account().get_seed_phrase(""); -+ auto& keys = w->get_account().get_keys(); -+ -+ owr.private_view_key = epee::string_tools::pod_to_hex(keys.view_secret_key); -+ owr.public_view_key = epee::string_tools::pod_to_hex(keys.account_address.view_public_key); -+ owr.private_spend_key = epee::string_tools::pod_to_hex(keys.spend_secret_key); -+ owr.public_spend_key = epee::string_tools::pod_to_hex(keys.account_address.spend_public_key); - } - catch (const tools::error::file_exists&) - { -@@ -1306,6 +1319,12 @@ std::string wallets_manager::restore_wallet(const std::wstring& path, const std: - bool is_tracking = currency::account_base::is_seed_tracking(seed_phrase); - w->restore(path, password, seed_phrase, is_tracking, seed_password); - owr.seed = w->get_account().get_seed_phrase(""); -+ auto& keys = w->get_account().get_keys(); -+ -+ owr.private_view_key = epee::string_tools::pod_to_hex(keys.view_secret_key); -+ owr.public_view_key = epee::string_tools::pod_to_hex(keys.account_address.view_public_key); -+ owr.private_spend_key = epee::string_tools::pod_to_hex(keys.spend_secret_key); -+ owr.public_spend_key = epee::string_tools::pod_to_hex(keys.account_address.spend_public_key); - } - catch (const tools::error::file_exists&) - { --- -2.48.1 - diff --git a/tests/integration.test.ts b/tests/integration.test.ts index eb478f7..3aebe38 100644 --- a/tests/integration.test.ts +++ b/tests/integration.test.ts @@ -21,7 +21,7 @@ async function syncBlockchain(wallet: Wallet): Promise { clearTimeout(timeout); resolve(blockChainHeight); } else { - setTimeout(poll, 500); + timeout = setTimeout(poll, 500); } }; diff --git a/tests/regression.test.ts b/tests/regression.test.ts index 797720f..481c1a6 100755 --- a/tests/regression.test.ts +++ b/tests/regression.test.ts @@ -21,16 +21,5 @@ Deno.test(`Regression tests (${coin})`, async (t) => { } }); - await t.step("All releases sequentially (all tags in the release order, next)", async () => { - tags.unshift("next"); - - const walletInfo = await createWalletViaCli(coin, "cat", "koshka"); - - for (const version of tags.toReversed()) { - if (version !== "next" && version !== tags[0]) await prepareMoneroC(coin, version); - await $`deno run -A ./tests/compare.ts ${coin} ${version} ${JSON.stringify(walletInfo)}`; - } - }); - await Deno.remove("./tests/wallets", { recursive: true }).catch(() => {}); }); diff --git a/zano b/zano index 2817090..fe85ce2 160000 --- a/zano +++ b/zano @@ -1 +1 @@ -Subproject commit 2817090c8ac7639d6f697d00fc8bcba2b3681d90 +Subproject commit fe85ce27fb5a5ce37eac87397601de45343f5376 diff --git a/zano_libwallet2_api_c/src/main/cpp/zano_checksum.h b/zano_libwallet2_api_c/src/main/cpp/zano_checksum.h index 7f8d845..abbd733 100644 --- a/zano_libwallet2_api_c/src/main/cpp/zano_checksum.h +++ b/zano_libwallet2_api_c/src/main/cpp/zano_checksum.h @@ -1,6 +1,6 @@ #ifndef MONEROC_CHECKSUMS #define MONEROC_CHECKSUMS const char * ZANO_wallet2_api_c_h_sha256 = "8acaa95513b85a984c08e05cc3f2ac7530bb8f32946eeeb45357bd846aef33dd"; -const char * ZANO_wallet2_api_c_cpp_sha256 = "4efacd3812d53dd268b6869cc0a9560e7320574d96e09136cf067f796edfeba6-2817090c8ac7639d6f697d00fc8bcba2b3681d90"; +const char * ZANO_wallet2_api_c_cpp_sha256 = "4efacd3812d53dd268b6869cc0a9560e7320574d96e09136cf067f796edfeba6-fe85ce27fb5a5ce37eac87397601de45343f5376"; const char * ZANO_wallet2_api_c_exp_sha256 = "66f3ff655bbfd11ad28c318ab707090b5a93276f436b06f7b1c0f329dba3c9c2"; #endif