From b4c3fbacab594bd1e67e71602a1ac07f0c19a77f Mon Sep 17 00:00:00 2001 From: cyan Date: Wed, 15 Jan 2025 14:04:42 +0100 Subject: [PATCH] Wownero 0.11.3.0 (#105) * update wownero to 0.11.3.0 * Updated wownero, cleaned up patches * unshallow zano * Fix ios builds * Update checksum --- .gitmodules | 2 +- .../monero.dart/lib/src/checksum_wownero.dart | 2 +- impls/monero.ts/checksum_wownero.ts | 2 +- ...ckground-sync-with-just-the-view-key.patch | 191 +++++++++--------- ...g-___clear_cache-when-targetting-iOS.patch | 8 +- .../0003-fix-is_trivially_copyable.patch | 4 +- patches/wownero/0004-store-crash-fix.patch | 20 +- ...0005-uint64_t-missing-definition-fix.patch | 4 +- ...se-proper-error-handling-in-get_seed.patch | 10 +- patches/wownero/0007-UR-functions.patch | 30 +-- .../0008-add-dummy-device-for-ledger.patch | 8 +- patches/wownero/0009-polyseed.patch | 42 ++-- patches/wownero/0010-coin-control.patch | 46 ++--- ...-and-tx-key-getter-for-PendingTransc.patch | 4 +- ...coverDeterministicWalletFromSpendKey.patch | 4 +- .../0013-add-monero-submodule-support.patch | 8 +- .../wownero/0014-fix-iOS-depends-build.patch | 6 +- ...ude-locale-only-when-targeting-WIN32.patch | 30 +-- wownero | 2 +- .../src/main/cpp/wownero_checksum.h | 2 +- 20 files changed, 208 insertions(+), 217 deletions(-) diff --git a/.gitmodules b/.gitmodules index 04af1e1..5a3c641 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,7 +10,7 @@ [submodule "zano"] path = zano url = https://github.com/hyle-team/zano - shallow = true + shallow = false [submodule "wownero_libwallet2_api_c/wownero-seed"] path = wownero_libwallet2_api_c/wownero-seed url = https://github.com/MrCyjaneK/wownero-seed diff --git a/impls/monero.dart/lib/src/checksum_wownero.dart b/impls/monero.dart/lib/src/checksum_wownero.dart index bada1f4..258b2b8 100644 --- a/impls/monero.dart/lib/src/checksum_wownero.dart +++ b/impls/monero.dart/lib/src/checksum_wownero.dart @@ -1,4 +1,4 @@ // ignore_for_file: constant_identifier_names const String wallet2_api_c_h_sha256 = "f99009d1ca1d1c783cc9aa0fb63f680d48753b88124fb5de2079c57b7e34c827"; -const String wallet2_api_c_cpp_sha256 = "70b39a0bef660cb9ba0397117eb1590e18461ace89ab18141690658a2a537d5d-dd46a31f3cab67b316e9239b15acf7d5cea60aa9"; +const String wallet2_api_c_cpp_sha256 = "70b39a0bef660cb9ba0397117eb1590e18461ace89ab18141690658a2a537d5d-3e302be710f4e6b4f58642989c8e47711362fa56"; const String wallet2_api_c_exp_sha256 = "5f53ea8bbe66a5e5aa6cbc4ca00695900e08589cfd32062e88965a24252d05ba"; diff --git a/impls/monero.ts/checksum_wownero.ts b/impls/monero.ts/checksum_wownero.ts index 7e0c8cd..a7dc752 100644 --- a/impls/monero.ts/checksum_wownero.ts +++ b/impls/monero.ts/checksum_wownero.ts @@ -1,5 +1,5 @@ export const wowneroChecksum = { wallet2_api_c_h_sha256: "f99009d1ca1d1c783cc9aa0fb63f680d48753b88124fb5de2079c57b7e34c827", - wallet2_api_c_cpp_sha256: "70b39a0bef660cb9ba0397117eb1590e18461ace89ab18141690658a2a537d5d-dd46a31f3cab67b316e9239b15acf7d5cea60aa9", + wallet2_api_c_cpp_sha256: "70b39a0bef660cb9ba0397117eb1590e18461ace89ab18141690658a2a537d5d-3e302be710f4e6b4f58642989c8e47711362fa56", wallet2_api_c_exp_sha256: "5f53ea8bbe66a5e5aa6cbc4ca00695900e08589cfd32062e88965a24252d05ba", } diff --git a/patches/wownero/0001-wallet-background-sync-with-just-the-view-key.patch b/patches/wownero/0001-wallet-background-sync-with-just-the-view-key.patch index df672bd..e45deb1 100644 --- a/patches/wownero/0001-wallet-background-sync-with-just-the-view-key.patch +++ b/patches/wownero/0001-wallet-background-sync-with-just-the-view-key.patch @@ -1,4 +1,4 @@ -From 82bdb3dcf75f9e6bd8c5e31a125b8acc154a0623 Mon Sep 17 00:00:00 2001 +From 6ebd4546355d3d6ed82e3d30a45ecb06310b958e Mon Sep 17 00:00:00 2001 From: j-berman Date: Thu, 13 Oct 2022 18:33:33 -0700 Subject: [PATCH 01/15] wallet: background sync with just the view key @@ -35,7 +35,7 @@ cache. src/wallet/api/wallet.cpp | 213 +++- src/wallet/api/wallet.h | 12 + src/wallet/api/wallet2_api.h | 42 + - src/wallet/wallet2.cpp | 1030 ++++++++++++++++-- + src/wallet/wallet2.cpp | 1028 ++++++++++++++++-- src/wallet/wallet2.h | 156 ++- src/wallet/wallet_errors.h | 39 + src/wallet/wallet_rpc_server.cpp | 162 +++ @@ -47,7 +47,7 @@ cache. tests/functional_tests/wallet.py | 43 +- tests/unit_tests/wipeable_string.cpp | 12 + utils/python-rpc/framework/wallet.py | 42 + - 20 files changed, 2337 insertions(+), 130 deletions(-) + 20 files changed, 2336 insertions(+), 129 deletions(-) diff --git a/src/cryptonote_basic/account.cpp b/src/cryptonote_basic/account.cpp index 2ac455fda..4e87d4477 100644 @@ -97,7 +97,7 @@ index 8c0d3ce20..8b5091a46 100644 const unsigned char HASH_KEY_MEMORY = 'k'; const unsigned char HASH_KEY_MULTISIG[] = {'M', 'u', 'l', 't' , 'i', 's', 'i', 'g', 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp -index 462c06f0e..8c5122097 100644 +index e0a08eec0..83b56c3f4 100644 --- a/src/simplewallet/simplewallet.cpp +++ b/src/simplewallet/simplewallet.cpp @@ -155,6 +155,17 @@ typedef cryptonote::simple_wallet sw; @@ -546,7 +546,7 @@ index 462c06f0e..8c5122097 100644 if (m_wallet->key_on_device()) { fail_msg_writer() << tr("command not supported by HW wallet"); -@@ -9178,6 +9346,8 @@ bool simple_wallet::unspent_outputs(const std::vector &args_) +@@ -9192,6 +9360,8 @@ bool simple_wallet::unspent_outputs(const std::vector &args_) //---------------------------------------------------------------------------------------------------- bool simple_wallet::rescan_blockchain(const std::vector &args_) { @@ -555,7 +555,7 @@ index 462c06f0e..8c5122097 100644 uint64_t start_height = 0; ResetType reset_type = ResetSoft; -@@ -9475,6 +9645,7 @@ bool simple_wallet::account(const std::vector &args/* = std::vector +@@ -9489,6 +9659,7 @@ bool simple_wallet::account(const std::vector &args/* = std::vector if (command == "new") { // create a new account and switch to it @@ -563,7 +563,7 @@ index 462c06f0e..8c5122097 100644 std::string label = boost::join(local_args, " "); if (label.empty()) label = tr("(Untitled account)"); -@@ -9505,6 +9676,7 @@ bool simple_wallet::account(const std::vector &args/* = std::vector +@@ -9519,6 +9690,7 @@ bool simple_wallet::account(const std::vector &args/* = std::vector else if (command == "label" && local_args.size() >= 1) { // set label of the specified account @@ -571,7 +571,7 @@ index 462c06f0e..8c5122097 100644 uint32_t index_major; if (!epee::string_tools::get_xtype_from_string(index_major, local_args[0])) { -@@ -9526,6 +9698,7 @@ bool simple_wallet::account(const std::vector &args/* = std::vector +@@ -9540,6 +9712,7 @@ bool simple_wallet::account(const std::vector &args/* = std::vector } else if (command == "tag" && local_args.size() >= 2) { @@ -579,7 +579,7 @@ index 462c06f0e..8c5122097 100644 const std::string tag = local_args[0]; std::set account_indices; for (size_t i = 1; i < local_args.size(); ++i) -@@ -9550,6 +9723,7 @@ bool simple_wallet::account(const std::vector &args/* = std::vector +@@ -9564,6 +9737,7 @@ bool simple_wallet::account(const std::vector &args/* = std::vector } else if (command == "untag" && local_args.size() >= 1) { @@ -587,7 +587,7 @@ index 462c06f0e..8c5122097 100644 std::set account_indices; for (size_t i = 0; i < local_args.size(); ++i) { -@@ -9573,6 +9747,7 @@ bool simple_wallet::account(const std::vector &args/* = std::vector +@@ -9587,6 +9761,7 @@ bool simple_wallet::account(const std::vector &args/* = std::vector } else if (command == "tag_description" && local_args.size() >= 1) { @@ -595,7 +595,7 @@ index 462c06f0e..8c5122097 100644 const std::string tag = local_args[0]; std::string description; if (local_args.size() > 1) -@@ -9690,6 +9865,7 @@ bool simple_wallet::print_address(const std::vector &args/* = std:: +@@ -9704,6 +9879,7 @@ bool simple_wallet::print_address(const std::vector &args/* = std:: } else if (local_args[0] == "new") { @@ -603,7 +603,7 @@ index 462c06f0e..8c5122097 100644 local_args.erase(local_args.begin()); std::string label; if (local_args.size() > 0) -@@ -9702,6 +9878,7 @@ bool simple_wallet::print_address(const std::vector &args/* = std:: +@@ -9716,6 +9892,7 @@ bool simple_wallet::print_address(const std::vector &args/* = std:: } else if (local_args[0] == "mnew") { @@ -611,7 +611,7 @@ index 462c06f0e..8c5122097 100644 local_args.erase(local_args.begin()); if (local_args.size() != 1) { -@@ -9727,6 +9904,7 @@ bool simple_wallet::print_address(const std::vector &args/* = std:: +@@ -9741,6 +9918,7 @@ bool simple_wallet::print_address(const std::vector &args/* = std:: } else if (local_args[0] == "one-off") { @@ -619,7 +619,7 @@ index 462c06f0e..8c5122097 100644 local_args.erase(local_args.begin()); std::string label; if (local_args.size() != 2) -@@ -9745,6 +9923,7 @@ bool simple_wallet::print_address(const std::vector &args/* = std:: +@@ -9759,6 +9937,7 @@ bool simple_wallet::print_address(const std::vector &args/* = std:: } else if (local_args.size() >= 2 && local_args[0] == "label") { @@ -627,7 +627,7 @@ index 462c06f0e..8c5122097 100644 if (!epee::string_tools::get_xtype_from_string(index, local_args[1])) { fail_msg_writer() << tr("failed to parse index: ") << local_args[1]; -@@ -9891,6 +10070,8 @@ bool simple_wallet::print_integrated_address(const std::vector &arg +@@ -9905,6 +10084,8 @@ bool simple_wallet::print_integrated_address(const std::vector &arg //---------------------------------------------------------------------------------------------------- bool simple_wallet::address_book(const std::vector &args/* = std::vector()*/) { @@ -636,7 +636,7 @@ index 462c06f0e..8c5122097 100644 if (args.size() == 0) { } -@@ -9951,6 +10132,8 @@ bool simple_wallet::address_book(const std::vector &args/* = std::v +@@ -9965,6 +10146,8 @@ bool simple_wallet::address_book(const std::vector &args/* = std::v //---------------------------------------------------------------------------------------------------- bool simple_wallet::set_tx_note(const std::vector &args) { @@ -645,7 +645,7 @@ index 462c06f0e..8c5122097 100644 if (args.size() == 0) { PRINT_USAGE(USAGE_SET_TX_NOTE); -@@ -9979,6 +10162,8 @@ bool simple_wallet::set_tx_note(const std::vector &args) +@@ -9993,6 +10176,8 @@ bool simple_wallet::set_tx_note(const std::vector &args) //---------------------------------------------------------------------------------------------------- bool simple_wallet::get_tx_note(const std::vector &args) { @@ -654,7 +654,7 @@ index 462c06f0e..8c5122097 100644 if (args.size() != 1) { PRINT_USAGE(USAGE_GET_TX_NOTE); -@@ -10004,6 +10189,8 @@ bool simple_wallet::get_tx_note(const std::vector &args) +@@ -10018,6 +10203,8 @@ bool simple_wallet::get_tx_note(const std::vector &args) //---------------------------------------------------------------------------------------------------- bool simple_wallet::set_description(const std::vector &args) { @@ -663,7 +663,7 @@ index 462c06f0e..8c5122097 100644 // 0 arguments allowed, for setting the description to empty string std::string description = ""; -@@ -10020,6 +10207,8 @@ bool simple_wallet::set_description(const std::vector &args) +@@ -10034,6 +10221,8 @@ bool simple_wallet::set_description(const std::vector &args) //---------------------------------------------------------------------------------------------------- bool simple_wallet::get_description(const std::vector &args) { @@ -672,7 +672,7 @@ index 462c06f0e..8c5122097 100644 if (args.size() != 0) { PRINT_USAGE(USAGE_GET_DESCRIPTION); -@@ -10078,6 +10267,8 @@ bool simple_wallet::wallet_info(const std::vector &args) +@@ -10092,6 +10281,8 @@ bool simple_wallet::wallet_info(const std::vector &args) type = tr("Watch only"); else if (m_wallet->multisig(&ready, &threshold, &total)) type = (boost::format(tr("%u/%u multisig%s")) % threshold % total % (ready ? "" : " (not yet finalized)")).str(); @@ -681,7 +681,7 @@ index 462c06f0e..8c5122097 100644 else type = tr("Normal"); message_writer() << tr("Type: ") << type; -@@ -10089,6 +10280,7 @@ bool simple_wallet::wallet_info(const std::vector &args) +@@ -10103,6 +10294,7 @@ bool simple_wallet::wallet_info(const std::vector &args) //---------------------------------------------------------------------------------------------------- bool simple_wallet::sign(const std::vector &args) { @@ -689,7 +689,7 @@ index 462c06f0e..8c5122097 100644 if (m_wallet->key_on_device()) { fail_msg_writer() << tr("command not supported by HW wallet"); -@@ -10196,6 +10388,7 @@ bool simple_wallet::export_key_images(const std::vector &args_) +@@ -10210,6 +10402,7 @@ bool simple_wallet::export_key_images(const std::vector &args_) fail_msg_writer() << tr("command not supported by HW wallet"); return true; } @@ -697,7 +697,7 @@ index 462c06f0e..8c5122097 100644 auto args = args_; if (m_wallet->watch_only()) -@@ -10249,6 +10442,7 @@ bool simple_wallet::import_key_images(const std::vector &args) +@@ -10263,6 +10456,7 @@ bool simple_wallet::import_key_images(const std::vector &args) fail_msg_writer() << tr("command not supported by HW wallet"); return true; } @@ -705,7 +705,7 @@ index 462c06f0e..8c5122097 100644 if (!m_wallet->is_trusted_daemon()) { fail_msg_writer() << tr("this command requires a trusted daemon. Enable with --trusted-daemon"); -@@ -10357,6 +10551,7 @@ bool simple_wallet::export_outputs(const std::vector &args_) +@@ -10371,6 +10565,7 @@ bool simple_wallet::export_outputs(const std::vector &args_) fail_msg_writer() << tr("command not supported by HW wallet"); return true; } @@ -713,7 +713,7 @@ index 462c06f0e..8c5122097 100644 auto args = args_; bool all = false; -@@ -10406,6 +10601,7 @@ bool simple_wallet::import_outputs(const std::vector &args) +@@ -10420,6 +10615,7 @@ bool simple_wallet::import_outputs(const std::vector &args) fail_msg_writer() << tr("command not supported by HW wallet"); return true; } @@ -1296,7 +1296,7 @@ index 71991df0d..e349df176 100644 virtual AddressBook * addressBook() = 0; virtual Subaddress * subaddress() = 0; diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp -index 30b3502dc..8ce515c57 100644 +index 478101af2..535005ab1 100644 --- a/src/wallet/wallet2.cpp +++ b/src/wallet/wallet2.cpp @@ -157,6 +157,8 @@ static const std::string MULTISIG_SIGNATURE_MAGIC = "SigMultisigPkV1"; @@ -1346,7 +1346,7 @@ index 30b3502dc..8ce515c57 100644 m_show_wallet_name_when_locked(false), m_inactivity_lock_timeout(DEFAULT_INACTIVITY_LOCK_TIMEOUT), m_setup_background_mining(BackgroundMiningNo), -@@ -1860,6 +1867,9 @@ bool has_nonrequested_tx_at_height_or_above_requested(uint64_t height, const std +@@ -1869,6 +1876,9 @@ bool has_nonrequested_tx_at_height_or_above_requested(uint64_t height, const std //---------------------------------------------------------------------------------------------------- void wallet2::scan_tx(const std::unordered_set &txids) { @@ -1356,7 +1356,7 @@ index 30b3502dc..8ce515c57 100644 // Get the transactions from daemon in batches sorted lowest height to highest tx_entry_data txs_to_scan = get_tx_entries(txids); if (txs_to_scan.tx_entries.empty()) -@@ -2169,11 +2179,11 @@ void wallet2::scan_output(const cryptonote::transaction &tx, bool miner_tx, cons +@@ -2178,11 +2188,11 @@ void wallet2::scan_output(const cryptonote::transaction &tx, bool miner_tx, cons THROW_WALLET_EXCEPTION_IF(i >= tx.vout.size(), error::wallet_internal_error, "Invalid vout index"); // if keys are encrypted, ask for password @@ -1370,7 +1370,7 @@ index 30b3502dc..8ce515c57 100644 { boost::optional pwd = m_callback->on_get_password(pool ? "output found in pool" : "output received"); THROW_WALLET_EXCEPTION_IF(!pwd, error::password_needed, tr("Password is needed to compute key image for incoming wownero")); -@@ -2185,7 +2195,7 @@ void wallet2::scan_output(const cryptonote::transaction &tx, bool miner_tx, cons +@@ -2194,7 +2204,7 @@ void wallet2::scan_output(const cryptonote::transaction &tx, bool miner_tx, cons crypto::public_key output_public_key; THROW_WALLET_EXCEPTION_IF(!get_output_public_key(tx.vout[i], output_public_key), error::wallet_internal_error, "Failed to get output public key"); @@ -1379,7 +1379,7 @@ index 30b3502dc..8ce515c57 100644 { tx_scan_info.in_ephemeral.pub = output_public_key; tx_scan_info.in_ephemeral.sec = crypto::null_skey; -@@ -2442,6 +2452,22 @@ void wallet2::process_new_transaction(const crypto::hash &txid, const cryptonote +@@ -2451,6 +2461,22 @@ void wallet2::process_new_transaction(const crypto::hash &txid, const cryptonote THROW_WALLET_EXCEPTION_IF(tx.vout.size() != o_indices.size(), error::wallet_internal_error, "transactions outputs size=" + std::to_string(tx.vout.size()) + " not match with daemon response size=" + std::to_string(o_indices.size())); @@ -1402,7 +1402,7 @@ index 30b3502dc..8ce515c57 100644 } for(size_t o: outs) -@@ -2467,7 +2493,7 @@ void wallet2::process_new_transaction(const crypto::hash &txid, const cryptonote +@@ -2476,7 +2502,7 @@ void wallet2::process_new_transaction(const crypto::hash &txid, const cryptonote td.m_tx = (const cryptonote::transaction_prefix&)tx; td.m_txid = txid; td.m_key_image = tx_scan_info[o].ki; @@ -1411,7 +1411,7 @@ index 30b3502dc..8ce515c57 100644 if (!td.m_key_image_known) { // we might have cold signed, and have a mapping to key images -@@ -2657,10 +2683,25 @@ void wallet2::process_new_transaction(const crypto::hash &txid, const cryptonote +@@ -2666,10 +2692,25 @@ void wallet2::process_new_transaction(const crypto::hash &txid, const cryptonote set_spent(it->second, height); if (!ignore_callbacks && 0 != m_callback) m_callback->on_money_spent(height, txid, tx, amount, tx, td.m_subaddr_index); @@ -1438,7 +1438,7 @@ index 30b3502dc..8ce515c57 100644 { PERF_TIMER(track_uses); const uint64_t amount = in_to_key.amount; -@@ -2674,7 +2715,27 @@ void wallet2::process_new_transaction(const crypto::hash &txid, const cryptonote +@@ -2683,7 +2724,27 @@ void wallet2::process_new_transaction(const crypto::hash &txid, const cryptonote { size_t idx = i->second; THROW_WALLET_EXCEPTION_IF(idx >= m_transfers.size(), error::wallet_internal_error, "Output tracker cache index out of range"); @@ -1467,7 +1467,7 @@ index 30b3502dc..8ce515c57 100644 } } } -@@ -2684,7 +2745,24 @@ void wallet2::process_new_transaction(const crypto::hash &txid, const cryptonote +@@ -2693,7 +2754,24 @@ void wallet2::process_new_transaction(const crypto::hash &txid, const cryptonote continue; for (uint64_t offset: offsets) if (offset == td.m_global_output_index) @@ -1493,7 +1493,7 @@ index 30b3502dc..8ce515c57 100644 } } } -@@ -3057,8 +3135,8 @@ void wallet2::pull_blocks(bool first, bool try_incremental, uint64_t start_heigh +@@ -3066,8 +3144,8 @@ void wallet2::pull_blocks(bool first, bool try_incremental, uint64_t start_heigh req.start_height = start_height; req.no_miner_tx = m_refresh_type == RefreshNoCoinbase; @@ -1504,7 +1504,7 @@ index 30b3502dc..8ce515c57 100644 req.pool_info_since = m_pool_info_query_time; { -@@ -3085,7 +3163,7 @@ void wallet2::pull_blocks(bool first, bool try_incremental, uint64_t start_heigh +@@ -3094,7 +3172,7 @@ void wallet2::pull_blocks(bool first, bool try_incremental, uint64_t start_heigh << ", height " << blocks_start_height + blocks.size() << ", node height " << res.current_height << ", pool info " << static_cast(res.pool_info_extent)); @@ -1513,7 +1513,7 @@ index 30b3502dc..8ce515c57 100644 { if (res.pool_info_extent != COMMAND_RPC_GET_BLOCKS_FAST::NONE) { -@@ -3597,6 +3675,9 @@ void wallet2::process_unconfirmed_transfer(bool incremental, const crypto::hash +@@ -3606,6 +3684,9 @@ void wallet2::process_unconfirmed_transfer(bool incremental, const crypto::hash // incremental update anymore, because with that we might miss some txs altogether. void wallet2::update_pool_state(std::vector> &process_txs, bool refreshed, bool try_incremental) { @@ -1523,7 +1523,7 @@ index 30b3502dc..8ce515c57 100644 bool updated = false; if (m_pool_info_query_time != 0 && try_incremental) { -@@ -4168,6 +4249,8 @@ void wallet2::refresh(bool trusted_daemon, uint64_t start_height, uint64_t & blo +@@ -4177,6 +4258,8 @@ void wallet2::refresh(bool trusted_daemon, uint64_t start_height, uint64_t & blo } m_first_refresh_done = true; @@ -1532,7 +1532,7 @@ index 30b3502dc..8ce515c57 100644 LOG_PRINT_L1("Refresh done, blocks received: " << blocks_fetched << ", balance (all accounts): " << print_money(balance_all(false)) << ", unlocked: " << print_money(unlocked_balance_all(false))); } -@@ -4253,6 +4336,14 @@ wallet2::detached_blockchain_data wallet2::detach_blockchain(uint64_t height, st +@@ -4262,6 +4345,14 @@ wallet2::detached_blockchain_data wallet2::detach_blockchain(uint64_t height, st td.m_uses.pop_back(); } @@ -1547,7 +1547,7 @@ index 30b3502dc..8ce515c57 100644 if (output_tracker_cache) output_tracker_cache->clear(); -@@ -4327,8 +4418,12 @@ void wallet2::handle_reorg(uint64_t height, std::map m_blockchain.offset(), error::wallet_internal_error, "Daemon claims reorg below last checkpoint"); @@ -1560,7 +1560,7 @@ index 30b3502dc..8ce515c57 100644 if (m_callback) m_callback->on_reorg(height, dbd.detached_blockchain.size(), dbd.detached_tx_hashes.size()); } -@@ -4338,6 +4433,7 @@ bool wallet2::deinit() +@@ -4347,6 +4442,7 @@ bool wallet2::deinit() if(m_is_initialized) { m_is_initialized = false; unlock_keys_file(); @@ -1568,7 +1568,7 @@ index 30b3502dc..8ce515c57 100644 m_account.deinit(); } return true; -@@ -4364,6 +4460,7 @@ bool wallet2::clear() +@@ -4373,6 +4469,7 @@ bool wallet2::clear() m_device_last_key_image_sync = 0; m_pool_info_query_time = 0; m_skip_to_height = 0; @@ -1576,7 +1576,7 @@ index 30b3502dc..8ce515c57 100644 return true; } //---------------------------------------------------------------------------------------------------- -@@ -4382,13 +4479,30 @@ void wallet2::clear_soft(bool keep_key_images) +@@ -4391,13 +4488,30 @@ void wallet2::clear_soft(bool keep_key_images) m_scanned_pool_txs[1].clear(); m_pool_info_query_time = 0; m_skip_to_height = 0; @@ -1608,7 +1608,7 @@ index 30b3502dc..8ce515c57 100644 /*! * \brief Stores wallet information to wallet file. * \param keys_file_name Name of wallet file -@@ -4400,16 +4514,35 @@ bool wallet2::store_keys(const std::string& keys_file_name, const epee::wipeable +@@ -4409,16 +4523,35 @@ bool wallet2::store_keys(const std::string& keys_file_name, const epee::wipeable { boost::optional keys_file_data = get_keys_file_data(password, watch_only); CHECK_AND_ASSERT_MES(keys_file_data != boost::none, false, "failed to generate wallet keys data"); @@ -1648,7 +1648,7 @@ index 30b3502dc..8ce515c57 100644 if (e) { boost::filesystem::remove(tmp_file_name); -@@ -4421,26 +4554,27 @@ bool wallet2::store_keys(const std::string& keys_file_name, const epee::wipeable +@@ -4430,26 +4563,27 @@ bool wallet2::store_keys(const std::string& keys_file_name, const epee::wipeable } //---------------------------------------------------------------------------------------------------- boost::optional wallet2::get_keys_file_data(const epee::wipeable_string& password, bool watch_only) @@ -1684,7 +1684,7 @@ index 30b3502dc..8ce515c57 100644 account.forget_spend_key(); account.encrypt_keys(key); -@@ -4575,6 +4709,9 @@ boost::optional wallet2::get_keys_file_data(const epee: +@@ -4584,6 +4718,9 @@ boost::optional wallet2::get_keys_file_data(const epee: value2.SetInt(m_track_uses ? 1 : 0); json.AddMember("track_uses", value2, json.GetAllocator()); @@ -1694,7 +1694,7 @@ index 30b3502dc..8ce515c57 100644 value2.SetInt(m_show_wallet_name_when_locked ? 1 : 0); json.AddMember("show_wallet_name_when_locked", value2, json.GetAllocator()); -@@ -4632,6 +4769,12 @@ boost::optional wallet2::get_keys_file_data(const epee: +@@ -4641,6 +4778,12 @@ boost::optional wallet2::get_keys_file_data(const epee: value2.SetInt(m_enable_multisig ? 1 : 0); json.AddMember("enable_multisig", value2, json.GetAllocator()); @@ -1707,7 +1707,7 @@ index 30b3502dc..8ce515c57 100644 // Serialize the JSON object rapidjson::StringBuffer buffer; rapidjson::Writer writer(buffer); -@@ -4658,13 +4801,81 @@ void wallet2::setup_keys(const epee::wipeable_string &password) +@@ -4667,13 +4810,81 @@ void wallet2::setup_keys(const epee::wipeable_string &password) m_account.decrypt_viewkey(key); } @@ -1790,7 +1790,7 @@ index 30b3502dc..8ce515c57 100644 if (m_ask_password == AskPasswordToDecrypt && !m_unattended && !m_watch_only) decrypt_keys(original_password); setup_keys(new_password); -@@ -4723,8 +4934,24 @@ bool wallet2::load_keys_buf(const std::string& keys_buf, const epee::wipeable_st +@@ -4732,8 +4943,24 @@ bool wallet2::load_keys_buf(const std::string& keys_buf, const epee::wipeable_st std::string account_data; account_data.resize(keys_file_data.account_data.size()); crypto::chacha20(keys_file_data.account_data.data(), keys_file_data.account_data.size(), key, keys_file_data.iv, &account_data[0]); @@ -1816,7 +1816,7 @@ index 30b3502dc..8ce515c57 100644 // The contents should be JSON if the wallet follows the new format. if (json.Parse(account_data.c_str()).HasParseError()) { -@@ -4762,6 +4989,7 @@ bool wallet2::load_keys_buf(const std::string& keys_buf, const epee::wipeable_st +@@ -4771,6 +4998,7 @@ bool wallet2::load_keys_buf(const std::string& keys_buf, const epee::wipeable_st m_ignore_outputs_above = MONEY_SUPPLY; m_ignore_outputs_below = 0; m_track_uses = false; @@ -1824,7 +1824,7 @@ index 30b3502dc..8ce515c57 100644 m_show_wallet_name_when_locked = false; m_inactivity_lock_timeout = DEFAULT_INACTIVITY_LOCK_TIMEOUT; m_setup_background_mining = BackgroundMiningNo; -@@ -4779,6 +5007,7 @@ bool wallet2::load_keys_buf(const std::string& keys_buf, const epee::wipeable_st +@@ -4788,6 +5016,7 @@ bool wallet2::load_keys_buf(const std::string& keys_buf, const epee::wipeable_st m_credits_target = 0; m_enable_multisig = false; m_allow_mismatched_daemon_version = true; @@ -1832,7 +1832,7 @@ index 30b3502dc..8ce515c57 100644 } else if(json.IsObject()) { -@@ -5015,6 +5244,39 @@ bool wallet2::load_keys_buf(const std::string& keys_buf, const epee::wipeable_st +@@ -5024,6 +5253,39 @@ bool wallet2::load_keys_buf(const std::string& keys_buf, const epee::wipeable_st m_credits_target = field_credits_target; GET_FIELD_FROM_JSON_RETURN_ON_ERROR(json, enable_multisig, int, Int, false, false); m_enable_multisig = field_enable_multisig; @@ -1872,7 +1872,7 @@ index 30b3502dc..8ce515c57 100644 } else { -@@ -5078,12 +5340,17 @@ bool wallet2::load_keys_buf(const std::string& keys_buf, const epee::wipeable_st +@@ -5087,12 +5349,17 @@ bool wallet2::load_keys_buf(const std::string& keys_buf, const epee::wipeable_st const cryptonote::account_keys& keys = m_account.get_keys(); hw::device &hwdev = m_account.get_device(); r = r && hwdev.verify_keys(keys.m_view_secret_key, keys.m_account_address.m_view_public_key); @@ -1892,7 +1892,7 @@ index 30b3502dc..8ce515c57 100644 return true; } -@@ -5098,11 +5365,12 @@ bool wallet2::load_keys_buf(const std::string& keys_buf, const epee::wipeable_st +@@ -5107,11 +5374,12 @@ bool wallet2::load_keys_buf(const std::string& keys_buf, const epee::wipeable_st * can be used prior to rewriting wallet keys file, to ensure user has entered the correct password * */ @@ -1907,7 +1907,7 @@ index 30b3502dc..8ce515c57 100644 lock_keys_file(); return r; } -@@ -5120,7 +5388,7 @@ bool wallet2::verify_password(const epee::wipeable_string& password) +@@ -5129,7 +5397,7 @@ bool wallet2::verify_password(const epee::wipeable_string& password) * can be used prior to rewriting wallet keys file, to ensure user has entered the correct password * */ @@ -1916,7 +1916,7 @@ index 30b3502dc..8ce515c57 100644 { rapidjson::Document json; wallet2::keys_file_data keys_file_data; -@@ -5137,9 +5405,22 @@ bool wallet2::verify_password(const std::string& keys_file_name, const epee::wip +@@ -5146,9 +5414,22 @@ bool wallet2::verify_password(const std::string& keys_file_name, const epee::wip std::string account_data; account_data.resize(keys_file_data.account_data.size()); crypto::chacha20(keys_file_data.account_data.data(), keys_file_data.account_data.size(), key, keys_file_data.iv, &account_data[0]); @@ -1940,7 +1940,7 @@ index 30b3502dc..8ce515c57 100644 // The contents should be JSON if the wallet follows the new format. if (json.Parse(account_data.c_str()).HasParseError()) { -@@ -5164,6 +5445,7 @@ bool wallet2::verify_password(const std::string& keys_file_name, const epee::wip +@@ -5173,6 +5454,7 @@ bool wallet2::verify_password(const std::string& keys_file_name, const epee::wip r = r && hwdev.verify_keys(keys.m_view_secret_key, keys.m_account_address.m_view_public_key); if(!no_spend_key) r = r && hwdev.verify_keys(keys.m_spend_secret_key, keys.m_account_address.m_spend_public_key); @@ -1948,7 +1948,7 @@ index 30b3502dc..8ce515c57 100644 return r; } -@@ -5175,9 +5457,7 @@ void wallet2::encrypt_keys(const crypto::chacha_key &key) +@@ -5184,9 +5466,7 @@ void wallet2::encrypt_keys(const crypto::chacha_key &key) void wallet2::decrypt_keys(const crypto::chacha_key &key) { @@ -1959,7 +1959,7 @@ index 30b3502dc..8ce515c57 100644 m_account.encrypt_viewkey(key); m_account.decrypt_keys(key); -@@ -5853,11 +6133,30 @@ void wallet2::rewrite(const std::string& wallet_name, const epee::wipeable_strin +@@ -5862,11 +6142,30 @@ void wallet2::rewrite(const std::string& wallet_name, const epee::wipeable_strin { if (wallet_name.empty()) return; @@ -1990,7 +1990,7 @@ index 30b3502dc..8ce515c57 100644 } /*! * \brief Writes to a file named based on the normal wallet (doesn't generate key, assumes it's already there) -@@ -5891,6 +6190,16 @@ bool wallet2::wallet_valid_path_format(const std::string& file_path) +@@ -5900,6 +6199,16 @@ bool wallet2::wallet_valid_path_format(const std::string& file_path) return !file_path.empty(); } //---------------------------------------------------------------------------------------------------- @@ -2007,7 +2007,7 @@ index 30b3502dc..8ce515c57 100644 bool wallet2::parse_long_payment_id(const std::string& payment_id_str, crypto::hash& payment_id) { cryptonote::blobdata payment_id_data; -@@ -6126,10 +6435,81 @@ void wallet2::load(const std::string& wallet_, const epee::wipeable_string& pass +@@ -6135,10 +6444,81 @@ void wallet2::load(const std::string& wallet_, const epee::wipeable_string& pass THROW_WALLET_EXCEPTION_IF(true, error::file_read_error, "failed to load keys from buffer"); } @@ -2090,16 +2090,7 @@ index 30b3502dc..8ce515c57 100644 bool cache_missing = use_fs ? (!boost::filesystem::exists(m_wallet_file, e) || e) : cache_buf.empty(); if (cache_missing) { -@@ -6143,7 +6523,7 @@ void wallet2::load(const std::string& wallet_, const epee::wipeable_string& pass - bool r = true; - if (use_fs) - { -- load_from_file(m_wallet_file, cache_file_buf, std::numeric_limits::max()); -+ r = load_from_file(m_wallet_file, cache_file_buf, std::numeric_limits::max()); - THROW_WALLET_EXCEPTION_IF(!r, error::file_read_error, m_wallet_file); - } - -@@ -6156,7 +6536,7 @@ void wallet2::load(const std::string& wallet_, const epee::wipeable_string& pass +@@ -6165,7 +6545,7 @@ void wallet2::load(const std::string& wallet_, const epee::wipeable_string& pass THROW_WALLET_EXCEPTION_IF(!r, error::wallet_internal_error, "internal error: failed to deserialize \"" + m_wallet_file + '\"'); std::string cache_data; cache_data.resize(cache_file_data.cache_data.size()); @@ -2108,7 +2099,7 @@ index 30b3502dc..8ce515c57 100644 try { bool loaded = false; -@@ -6246,60 +6626,76 @@ void wallet2::load(const std::string& wallet_, const epee::wipeable_string& pass +@@ -6255,60 +6635,76 @@ void wallet2::load(const std::string& wallet_, const epee::wipeable_string& pass m_account_public_address.m_view_public_key != m_account.get_keys().m_account_address.m_view_public_key, error::wallet_files_doesnt_correspond, m_keys_file, m_wallet_file); } @@ -2227,7 +2218,7 @@ index 30b3502dc..8ce515c57 100644 } } //---------------------------------------------------------------------------------------------------- -@@ -6381,6 +6777,8 @@ void wallet2::store_to(const std::string &path, const epee::wipeable_string &pas +@@ -6390,6 +6786,8 @@ void wallet2::store_to(const std::string &path, const epee::wipeable_string &pas same_file = canonical_old_path == canonical_new_path; } @@ -2236,7 +2227,7 @@ index 30b3502dc..8ce515c57 100644 if (!same_file) { -@@ -6397,6 +6795,21 @@ void wallet2::store_to(const std::string &path, const epee::wipeable_string &pas +@@ -6406,6 +6804,21 @@ void wallet2::store_to(const std::string &path, const epee::wipeable_string &pas } } } @@ -2258,7 +2249,7 @@ index 30b3502dc..8ce515c57 100644 // get wallet cache data boost::optional cache_file_data = get_cache_file_data(); -@@ -6490,6 +6903,22 @@ void wallet2::store_to(const std::string &path, const epee::wipeable_string &pas +@@ -6499,6 +6912,22 @@ void wallet2::store_to(const std::string &path, const epee::wipeable_string &pas // store should only exist if the MMS is really active m_message_store.write_to_file(get_multisig_wallet_state(), m_mms_file); } @@ -2281,7 +2272,7 @@ index 30b3502dc..8ce515c57 100644 } //---------------------------------------------------------------------------------------------------- boost::optional wallet2::get_cache_file_data() -@@ -6507,7 +6936,7 @@ boost::optional wallet2::get_cache_file_data() +@@ -6516,7 +6945,7 @@ boost::optional wallet2::get_cache_file_data() std::string cipher; cipher.resize(cache_file_data.get().cache_data.size()); cache_file_data.get().iv = crypto::rand(); @@ -2290,7 +2281,7 @@ index 30b3502dc..8ce515c57 100644 cache_file_data.get().cache_data = cipher; return cache_file_data; } -@@ -8577,6 +9006,34 @@ bool wallet2::is_keys_file_locked() const +@@ -8586,6 +9015,34 @@ bool wallet2::is_keys_file_locked() const return m_keys_file_locker->locked(); } @@ -2325,7 +2316,7 @@ index 30b3502dc..8ce515c57 100644 bool wallet2::tx_add_fake_output(std::vector> &outs, uint64_t global_index, const crypto::public_key& output_public_key, const rct::key& mask, uint64_t real_index, bool unlocked, std::unordered_set &valid_public_keys_cache) const { if (!unlocked) // don't add locked outs -@@ -13900,6 +14357,413 @@ bool wallet2::import_key_images(signed_tx_set & signed_tx, size_t offset, bool o +@@ -13909,6 +14366,413 @@ bool wallet2::import_key_images(signed_tx_set & signed_tx, size_t offset, bool o return import_key_images(signed_tx.key_images, offset, only_selected_transfers ? boost::make_optional(selected_transfers) : boost::none); } @@ -2740,7 +2731,7 @@ index 30b3502dc..8ce515c57 100644 { payment_container payments; diff --git a/src/wallet/wallet2.h b/src/wallet/wallet2.h -index 75137237b..295976b53 100644 +index b620ea265..632298726 100644 --- a/src/wallet/wallet2.h +++ b/src/wallet/wallet2.h @@ -256,6 +256,20 @@ private: @@ -2833,7 +2824,7 @@ index 75137237b..295976b53 100644 typedef std::tuple get_outs_entry; struct parsed_block -@@ -974,7 +1041,8 @@ private: +@@ -980,7 +1047,8 @@ private: /*! * \brief verifies given password is correct for default wallet keys file */ @@ -2843,7 +2834,7 @@ index 75137237b..295976b53 100644 cryptonote::account_base& get_account(){return m_account;} const cryptonote::account_base& get_account()const{return m_account;} -@@ -1069,6 +1137,7 @@ private: +@@ -1076,6 +1144,7 @@ private: cryptonote::network_type nettype() const { return m_nettype; } bool watch_only() const { return m_watch_only; } bool multisig(bool *ready = NULL, uint32_t *threshold = NULL, uint32_t *total = NULL) const; @@ -2851,7 +2842,7 @@ index 75137237b..295976b53 100644 bool has_multisig_partial_key_images() const; bool has_unknown_key_images() const; bool get_multisig_seed(epee::wipeable_string& seed, const epee::wipeable_string &passphrase = std::string()) const; -@@ -1276,11 +1345,17 @@ private: +@@ -1283,11 +1352,17 @@ private: return; } a & m_has_ever_refreshed_from_node; @@ -2870,7 +2861,7 @@ index 75137237b..295976b53 100644 FIELD(m_blockchain) FIELD(m_transfers) FIELD(m_account_public_address) -@@ -1312,6 +1387,12 @@ private: +@@ -1319,6 +1394,12 @@ private: return true; } FIELD(m_has_ever_refreshed_from_node) @@ -2883,7 +2874,7 @@ index 75137237b..295976b53 100644 END_SERIALIZE() /*! -@@ -1327,6 +1408,8 @@ private: +@@ -1334,6 +1415,8 @@ private: * \return Whether path is valid format */ static bool wallet_valid_path_format(const std::string& file_path); @@ -2892,7 +2883,7 @@ index 75137237b..295976b53 100644 static bool parse_long_payment_id(const std::string& payment_id_str, crypto::hash& payment_id); static bool parse_short_payment_id(const std::string& payment_id_str, crypto::hash8& payment_id); static bool parse_payment_id(const std::string& payment_id_str, crypto::hash& payment_id); -@@ -1375,6 +1458,9 @@ private: +@@ -1382,6 +1465,9 @@ private: void ignore_outputs_below(uint64_t value) { m_ignore_outputs_below = value; } bool track_uses() const { return m_track_uses; } void track_uses(bool value) { m_track_uses = value; } @@ -2902,7 +2893,7 @@ index 75137237b..295976b53 100644 bool show_wallet_name_when_locked() const { return m_show_wallet_name_when_locked; } void show_wallet_name_when_locked(bool value) { m_show_wallet_name_when_locked = value; } BackgroundMiningSetupType setup_background_mining() const { return m_setup_background_mining; } -@@ -1689,6 +1775,9 @@ private: +@@ -1696,6 +1782,9 @@ private: uint64_t get_bytes_sent() const; uint64_t get_bytes_received() const; @@ -2912,7 +2903,7 @@ index 75137237b..295976b53 100644 // MMS ------------------------------------------------------------------------------------------------- mms::message_store& get_message_store() { return m_message_store; }; const mms::message_store& get_message_store() const { return m_message_store; }; -@@ -1724,6 +1813,9 @@ private: +@@ -1731,6 +1820,9 @@ private: * \return Whether it was successful. */ bool store_keys(const std::string& keys_file_name, const epee::wipeable_string& password, bool watch_only = false); @@ -2922,7 +2913,7 @@ index 75137237b..295976b53 100644 /*! * \brief Load wallet keys information from wallet file. * \param keys_file_name Name of wallet file -@@ -1737,6 +1829,7 @@ private: +@@ -1744,6 +1836,7 @@ private: */ bool load_keys_buf(const std::string& keys_buf, const epee::wipeable_string& password); bool load_keys_buf(const std::string& keys_buf, const epee::wipeable_string& password, boost::optional& keys_to_encrypt); @@ -2930,7 +2921,7 @@ index 75137237b..295976b53 100644 void process_new_transaction(const crypto::hash &txid, const cryptonote::transaction& tx, const std::vector &o_indices, uint64_t height, uint8_t block_version, uint64_t ts, bool miner_tx, bool pool, bool double_spend_seen, const tx_cache_data &tx_cache_data, std::map, size_t> *output_tracker_cache = NULL, bool ignore_callbacks = false); bool should_skip_block(const cryptonote::block &b, uint64_t height) const; void process_new_blockchain_entry(const cryptonote::block& b, const cryptonote::block_complete_entry& bche, const parsed_block &parsed_block, const crypto::hash& bl_id, uint64_t height, const std::vector &tx_cache_data, size_t tx_cache_data_offset, std::map, size_t> *output_tracker_cache = NULL); -@@ -1745,6 +1838,15 @@ private: +@@ -1752,6 +1845,15 @@ private: void get_short_chain_history(std::list& ids, uint64_t granularity = 1) const; bool clear(); void clear_soft(bool keep_key_images=false); @@ -2946,7 +2937,7 @@ index 75137237b..295976b53 100644 void pull_blocks(bool first, bool try_incremental, uint64_t start_height, uint64_t& blocks_start_height, const std::list &short_chain_history, std::vector &blocks, std::vector &o_indices, uint64_t ¤t_height); void pull_hashes(uint64_t start_height, uint64_t& blocks_start_height, const std::list &short_chain_history, std::vector &hashes); void fast_refresh(uint64_t stop_height, uint64_t &blocks_start_height, std::list &short_chain_history, bool force = false); -@@ -1796,10 +1898,23 @@ private: +@@ -1803,10 +1905,23 @@ private: bool get_ring(const crypto::chacha_key &key, const crypto::key_image &key_image, std::vector &outs); crypto::chacha_key get_ringdb_key(); void setup_keys(const epee::wipeable_string &password); @@ -2970,7 +2961,7 @@ index 75137237b..295976b53 100644 void register_devices(); hw::device& lookup_device(const std::string & device_descriptor); -@@ -1914,6 +2029,8 @@ private: +@@ -1922,6 +2037,8 @@ private: uint64_t m_ignore_outputs_above; uint64_t m_ignore_outputs_below; bool m_track_uses; @@ -2979,7 +2970,7 @@ index 75137237b..295976b53 100644 bool m_show_wallet_name_when_locked; uint32_t m_inactivity_lock_timeout; BackgroundMiningSetupType m_setup_background_mining; -@@ -1959,6 +2076,7 @@ private: +@@ -1967,6 +2084,7 @@ private: uint64_t m_last_block_reward; std::unique_ptr m_keys_file_locker; @@ -2987,7 +2978,7 @@ index 75137237b..295976b53 100644 mms::message_store m_message_store; bool m_original_keys_available; -@@ -1966,6 +2084,7 @@ private: +@@ -1974,6 +2092,7 @@ private: crypto::secret_key m_original_view_secret_key; crypto::chacha_key m_cache_key; @@ -2995,7 +2986,7 @@ index 75137237b..295976b53 100644 std::shared_ptr m_encrypt_keys_after_refresh; bool m_unattended; -@@ -1981,9 +2100,13 @@ private: +@@ -1989,9 +2108,13 @@ private: static boost::mutex default_daemon_address_lock; static std::string default_daemon_address; @@ -3010,7 +3001,7 @@ index 75137237b..295976b53 100644 BOOST_CLASS_VERSION(tools::wallet2::transfer_details, 12) BOOST_CLASS_VERSION(tools::wallet2::multisig_info, 1) BOOST_CLASS_VERSION(tools::wallet2::multisig_info::LR, 0) -@@ -1999,6 +2122,8 @@ BOOST_CLASS_VERSION(tools::wallet2::signed_tx_set, 1) +@@ -2007,6 +2130,8 @@ BOOST_CLASS_VERSION(tools::wallet2::signed_tx_set, 1) BOOST_CLASS_VERSION(tools::wallet2::tx_construction_data, 4) BOOST_CLASS_VERSION(tools::wallet2::pending_tx, 3) BOOST_CLASS_VERSION(tools::wallet2::multisig_sig, 1) @@ -3019,7 +3010,7 @@ index 75137237b..295976b53 100644 namespace boost { -@@ -2497,6 +2622,29 @@ namespace boost +@@ -2505,6 +2630,29 @@ namespace boost return; a & x.multisig_sigs; } @@ -3121,7 +3112,7 @@ index c077313d4..c54cd3499 100644 #if !defined(_MSC_VER) diff --git a/src/wallet/wallet_rpc_server.cpp b/src/wallet/wallet_rpc_server.cpp -index 6fc996299..3cc6b278f 100644 +index 1c7c45034..21e69ea0e 100644 --- a/src/wallet/wallet_rpc_server.cpp +++ b/src/wallet/wallet_rpc_server.cpp @@ -73,6 +73,54 @@ using namespace epee; @@ -3591,10 +3582,10 @@ index 3308d1751..c2329aafe 100644 //json rpc v2 bool on_query_key(const wallet_rpc::COMMAND_RPC_QUERY_KEY::request& req, wallet_rpc::COMMAND_RPC_QUERY_KEY::response& res, epee::json_rpc::error& er, const connection_context *ctx = NULL); diff --git a/src/wallet/wallet_rpc_server_commands_defs.h b/src/wallet/wallet_rpc_server_commands_defs.h -index b6098d95c..a44b56ed6 100644 +index 2ce39f667..72a35eb73 100644 --- a/src/wallet/wallet_rpc_server_commands_defs.h +++ b/src/wallet/wallet_rpc_server_commands_defs.h -@@ -2696,5 +2696,69 @@ namespace wallet_rpc +@@ -2698,5 +2698,69 @@ namespace wallet_rpc typedef epee::misc_utils::struct_init response; }; @@ -4314,5 +4305,5 @@ index 1e10e1f86..bff33a561 100644 + } + return self.rpc.send_json_rpc_request(stop_background_sync) -- -2.39.5 (Apple Git-154) +2.48.0 diff --git a/patches/wownero/0002-fix-missing-___clear_cache-when-targetting-iOS.patch b/patches/wownero/0002-fix-missing-___clear_cache-when-targetting-iOS.patch index d922a40..ca9ccfd 100644 --- a/patches/wownero/0002-fix-missing-___clear_cache-when-targetting-iOS.patch +++ b/patches/wownero/0002-fix-missing-___clear_cache-when-targetting-iOS.patch @@ -1,4 +1,4 @@ -From 21e95275c2e40454d9cce05c1139d8139af16587 Mon Sep 17 00:00:00 2001 +From 4828befb3843764eaaa5e5ea489cde6d101d71ce Mon Sep 17 00:00:00 2001 From: Czarek Nakamoto Date: Wed, 23 Oct 2024 15:18:21 +0200 Subject: [PATCH 02/15] fix missing ___clear_cache when targetting iOS @@ -8,12 +8,12 @@ Subject: [PATCH 02/15] fix missing ___clear_cache when targetting iOS 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/randomwow b/external/randomwow -index 27b099b6d..c00685dad 160000 +index 27b099b6d..6f30d4b92 160000 --- a/external/randomwow +++ b/external/randomwow @@ -1 +1 @@ -Subproject commit 27b099b6dd6fef6e17f58c6dfe00009e9c5df587 -+Subproject commit c00685dad575137caf4a9100ba08e77be376fa98 ++Subproject commit 6f30d4b924fecb231e5b683915cc75d18b3b5866 -- -2.39.5 (Apple Git-154) +2.48.0 diff --git a/patches/wownero/0003-fix-is_trivially_copyable.patch b/patches/wownero/0003-fix-is_trivially_copyable.patch index f600003..5b81f2d 100644 --- a/patches/wownero/0003-fix-is_trivially_copyable.patch +++ b/patches/wownero/0003-fix-is_trivially_copyable.patch @@ -1,4 +1,4 @@ -From b41551e7dd8d3f4968f330f60d14773eaabca818 Mon Sep 17 00:00:00 2001 +From d4d406961073b5f9d3cc46a6cedaf73a378e1ea6 Mon Sep 17 00:00:00 2001 From: cyan Date: Tue, 22 Oct 2024 10:23:18 +0000 Subject: [PATCH 03/15] fix is_trivially_copyable @@ -28,5 +28,5 @@ index 01dc387d6..5e3af4d11 100644 return {reinterpret_cast(std::addressof(src)), sizeof(T)}; } -- -2.39.5 (Apple Git-154) +2.48.0 diff --git a/patches/wownero/0004-store-crash-fix.patch b/patches/wownero/0004-store-crash-fix.patch index 0f15183..52104dc 100644 --- a/patches/wownero/0004-store-crash-fix.patch +++ b/patches/wownero/0004-store-crash-fix.patch @@ -1,4 +1,4 @@ -From 9dc9c8048d3918fe3615e91ab8be342471167c26 Mon Sep 17 00:00:00 2001 +From 799d1825696483da743ff2f92a773fcfbef08557 Mon Sep 17 00:00:00 2001 From: Czarek Nakamoto Date: Sat, 11 May 2024 16:25:10 +0200 Subject: [PATCH 04/15] store crash fix @@ -147,7 +147,7 @@ index 1f199a72c..ac7ce2f6a 100644 std::atomic m_refreshIntervalMillis; std::atomic m_refreshShouldRescan; diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp -index 8ce515c57..651161d14 100644 +index 535005ab1..4e66cdeae 100644 --- a/src/wallet/wallet2.cpp +++ b/src/wallet/wallet2.cpp @@ -1192,6 +1192,7 @@ wallet2::wallet2(network_type nettype, uint64_t kdf_rounds, bool unattended, std @@ -158,7 +158,7 @@ index 8ce515c57..651161d14 100644 m_trusted_daemon(false), m_nettype(nettype), m_multisig_rounds_passed(0), -@@ -1404,6 +1405,14 @@ bool wallet2::set_daemon(std::string daemon_address, boost::optionalset_proxy(address); -@@ -4098,8 +4107,9 @@ void wallet2::refresh(bool trusted_daemon, uint64_t start_height, uint64_t & blo +@@ -4107,8 +4116,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; @@ -185,19 +185,19 @@ index 8ce515c57..651161d14 100644 std::vector next_blocks; std::vector next_parsed_blocks; diff --git a/src/wallet/wallet2.h b/src/wallet/wallet2.h -index 295976b53..c07a47c11 100644 +index 632298726..022d0696f 100644 --- a/src/wallet/wallet2.h +++ b/src/wallet/wallet2.h -@@ -1071,6 +1071,8 @@ private: - boost::optional 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); +@@ -1078,6 +1078,8 @@ private: + epee::net_utils::ssl_options_t ssl_options = epee::net_utils::ssl_support_t::e_ssl_support_autodetect, + const std::string &proxy = ""); bool set_proxy(const std::string &address); + bool get_refresh_enabled(); + void set_refresh_enabled(bool val); void stop() { m_run.store(false, std::memory_order_relaxed); m_message_store.stop(); } -@@ -1981,6 +1983,7 @@ private: +@@ -1989,6 +1991,7 @@ private: boost::recursive_mutex m_daemon_rpc_mutex; @@ -206,5 +206,5 @@ index 295976b53..c07a47c11 100644 i_wallet2_callback* m_callback; hw::device::device_type m_key_device_type; -- -2.39.5 (Apple Git-154) +2.48.0 diff --git a/patches/wownero/0005-uint64_t-missing-definition-fix.patch b/patches/wownero/0005-uint64_t-missing-definition-fix.patch index 05bef1f..5035df2 100644 --- a/patches/wownero/0005-uint64_t-missing-definition-fix.patch +++ b/patches/wownero/0005-uint64_t-missing-definition-fix.patch @@ -1,4 +1,4 @@ -From 223e2e4b5b2c6366d0dd4130a726c4cfcdb13ffb Mon Sep 17 00:00:00 2001 +From 5a9148c10ea29a42d8aa08d69e2f4559c8611655 Mon Sep 17 00:00:00 2001 From: Czarek Nakamoto Date: Mon, 2 Sep 2024 16:40:31 +0200 Subject: [PATCH 05/15] uint64_t missing definition fix @@ -21,5 +21,5 @@ index 4af4da790..ae4c0d05e 100644 #include -- -2.39.5 (Apple Git-154) +2.48.0 diff --git a/patches/wownero/0006-use-proper-error-handling-in-get_seed.patch b/patches/wownero/0006-use-proper-error-handling-in-get_seed.patch index 8f10b80..b9680fc 100644 --- a/patches/wownero/0006-use-proper-error-handling-in-get_seed.patch +++ b/patches/wownero/0006-use-proper-error-handling-in-get_seed.patch @@ -1,4 +1,4 @@ -From 776d22d6dc47739074f004979894f3c62d43a0c9 Mon Sep 17 00:00:00 2001 +From ee6aa49179833c930c1ec10ae2e877aeb87eb8c8 Mon Sep 17 00:00:00 2001 From: Czarek Nakamoto Date: Mon, 24 Jun 2024 10:49:12 +0200 Subject: [PATCH 06/15] use proper error handling in get_seed @@ -38,10 +38,10 @@ index 899ef044a..e16d8f83f 100644 std::string WalletImpl::getSeedLanguage() const diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp -index 651161d14..1e527cf97 100644 +index 4e66cdeae..48267d647 100644 --- a/src/wallet/wallet2.cpp +++ b/src/wallet/wallet2.cpp -@@ -1440,11 +1440,13 @@ bool wallet2::get_seed(epee::wipeable_string& electrum_words, const epee::wipeab +@@ -1449,11 +1449,13 @@ bool wallet2::get_seed(epee::wipeable_string& electrum_words, const epee::wipeab bool keys_deterministic = is_deterministic(); if (!keys_deterministic) { @@ -55,7 +55,7 @@ index 651161d14..1e527cf97 100644 std::cout << "seed_language not set" << std::endl; return false; } -@@ -1454,8 +1456,9 @@ bool wallet2::get_seed(epee::wipeable_string& electrum_words, const epee::wipeab +@@ -1463,8 +1465,9 @@ bool wallet2::get_seed(epee::wipeable_string& electrum_words, const epee::wipeab key = cryptonote::encrypt_key(key, passphrase); if (!crypto::ElectrumWords::bytes_to_words(key, electrum_words, seed_language)) { @@ -67,5 +67,5 @@ index 651161d14..1e527cf97 100644 return true; -- -2.39.5 (Apple Git-154) +2.48.0 diff --git a/patches/wownero/0007-UR-functions.patch b/patches/wownero/0007-UR-functions.patch index ad0592c..0bdc695 100644 --- a/patches/wownero/0007-UR-functions.patch +++ b/patches/wownero/0007-UR-functions.patch @@ -1,4 +1,4 @@ -From 1302c64b0218da6d32b9dd9cbf1c2c56f51e6aff Mon Sep 17 00:00:00 2001 +From 031df7de0d75d93f78be732d5cac702b0ab193f0 Mon Sep 17 00:00:00 2001 From: tobtoht Date: Tue, 12 Mar 2024 10:09:50 +0100 Subject: [PATCH 07/15] UR functions @@ -53,7 +53,7 @@ index 991071fbe..b24855d9b 100644 + url = https://github.com/MrCyjaneK/bc-ur + branch = misc diff --git a/CMakeLists.txt b/CMakeLists.txt -index e387ffb1b..8b81c7ab7 100644 +index b4b8c8089..88335ee9d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -96,7 +96,8 @@ enable_language(C ASM) @@ -98,10 +98,10 @@ index f118c754e..f26655d68 100644 SET(LLVM_ENABLE_PIC OFF) SET(LLVM_ENABLE_PIE OFF) diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt -index 3184ae5a1..88a7bb0b5 100644 +index 29aed0cc6..dfdffe67c 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt -@@ -72,4 +72,5 @@ endif() +@@ -69,4 +69,5 @@ endif() add_subdirectory(db_drivers) add_subdirectory(easylogging++) add_subdirectory(qrcodegen) @@ -780,7 +780,7 @@ index e349df176..764adbfbf 100644 /*! * \brief scanTransactions - scan a list of transaction ids, this operation may reveal the txids to the remote node and affect your privacy diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp -index 1e527cf97..671fa5298 100644 +index 48267d647..e14d4d2fc 100644 --- a/src/wallet/wallet2.cpp +++ b/src/wallet/wallet2.cpp @@ -948,6 +948,16 @@ uint32_t get_subaddress_clamped_sum(uint32_t idx, uint32_t extra) @@ -800,7 +800,7 @@ index 1e527cf97..671fa5298 100644 static void setup_shim(hw::wallet_shim * shim, tools::wallet2 * wallet) { shim->get_tx_pub_key_from_received_outs = std::bind(&tools::wallet2::get_tx_pub_key_from_received_outs, wallet, std::placeholders::_1); -@@ -6989,6 +6999,25 @@ uint64_t wallet2::unlocked_balance(uint32_t index_major, bool strict, uint64_t * +@@ -6998,6 +7008,25 @@ uint64_t wallet2::unlocked_balance(uint32_t index_major, bool strict, uint64_t * return amount; } //---------------------------------------------------------------------------------------------------- @@ -826,7 +826,7 @@ index 1e527cf97..671fa5298 100644 std::map wallet2::balance_per_subaddress(uint32_t index_major, bool strict) const { std::map amount_per_subaddr; -@@ -7840,9 +7869,7 @@ bool wallet2::sign_tx(unsigned_tx_set &exported_txs, std::vector additional_derivations; @@ -837,7 +837,7 @@ index 1e527cf97..671fa5298 100644 std::vector additional_tx_pub_keys; for (const crypto::secret_key &skey: txs[n].additional_tx_keys) { -@@ -11232,7 +11259,7 @@ std::vector wallet2::create_transactions_2(std::vector wallet2::create_transactions_2(std::vector m_ignore_outputs_above || td.amount() < m_ignore_outputs_below) { -@@ -11282,9 +11309,15 @@ std::vector wallet2::create_transactions_2(std::vector wallet2::create_transactions_2(std::vector>> wallet2::export_key_images(bool all) const { -@@ -13992,53 +14032,60 @@ std::pair> +@@ -14001,53 +14041,60 @@ std::pair> return std::make_pair(offset, ski); } @@ -1008,10 +1008,10 @@ index 1e527cf97..671fa5298 100644 ski.push_back(std::make_pair(key_image, signature)); } diff --git a/src/wallet/wallet2.h b/src/wallet/wallet2.h -index c07a47c11..80ff0698d 100644 +index 022d0696f..746e2aeff 100644 --- a/src/wallet/wallet2.h +++ b/src/wallet/wallet2.h -@@ -1150,6 +1150,7 @@ private: +@@ -1157,6 +1157,7 @@ private: // locked & unlocked balance of given or current subaddress account uint64_t balance(uint32_t subaddr_index_major, bool strict) const; uint64_t unlocked_balance(uint32_t subaddr_index_major, bool strict, uint64_t *blocks_to_unlock = NULL, uint64_t *time_to_unlock = NULL); @@ -1019,7 +1019,7 @@ index c07a47c11..80ff0698d 100644 // locked & unlocked balance per subaddress of given or current subaddress account std::map balance_per_subaddress(uint32_t subaddr_index_major, bool strict) const; std::map>> unlocked_balance_per_subaddress(uint32_t subaddr_index_major, bool strict); -@@ -1624,9 +1625,11 @@ private: +@@ -1631,9 +1632,11 @@ private: std::tuple> export_blockchain() const; void import_blockchain(const std::tuple> &bc); bool export_key_images(const std::string &filename, bool all = false) const; @@ -1032,5 +1032,5 @@ index c07a47c11..80ff0698d 100644 bool import_key_images(signed_tx_set & signed_tx, size_t offset=0, bool only_selected_transfers=false); crypto::public_key get_tx_pub_key_from_received_outs(const tools::wallet2::transfer_details &td) const; -- -2.39.5 (Apple Git-154) +2.48.0 diff --git a/patches/wownero/0008-add-dummy-device-for-ledger.patch b/patches/wownero/0008-add-dummy-device-for-ledger.patch index 6d40bb2..679bce2 100644 --- a/patches/wownero/0008-add-dummy-device-for-ledger.patch +++ b/patches/wownero/0008-add-dummy-device-for-ledger.patch @@ -1,4 +1,4 @@ -From 07a3019d94feb48f746dbc780db1e4d2e0d6080c Mon Sep 17 00:00:00 2001 +From 221fb7ed81aff1830b4bc2d7f9b73c94eb36924a Mon Sep 17 00:00:00 2001 From: Czarek Nakamoto Date: Wed, 26 Jun 2024 15:04:38 +0200 Subject: [PATCH 08/15] add dummy device for ledger @@ -21,10 +21,10 @@ Subject: [PATCH 08/15] add dummy device for ledger create mode 100644 src/device/device_io_dummy.hpp diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8b81c7ab7..abe44eca5 100644 +index 88335ee9d..86000f811 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -709,8 +709,12 @@ include_directories(${LMDB_INCLUDE}) +@@ -693,8 +693,12 @@ include_directories(${LMDB_INCLUDE}) include_directories(${LIBUNWIND_INCLUDE}) link_directories(${LIBUNWIND_LIBRARY_DIRS}) @@ -600,5 +600,5 @@ index e81b8f83a..277be6ac9 100644 std::vector WalletManagerImpl::findWallets(const std::string &path) -- -2.39.5 (Apple Git-154) +2.48.0 diff --git a/patches/wownero/0009-polyseed.patch b/patches/wownero/0009-polyseed.patch index aa5af28..6f5d5d3 100644 --- a/patches/wownero/0009-polyseed.patch +++ b/patches/wownero/0009-polyseed.patch @@ -1,4 +1,4 @@ -From c1f5cc2d9b71b7b923b17c33c23b23da918e4751 Mon Sep 17 00:00:00 2001 +From d146c6c1e23e1bf3762449e72a3aab847b3c0412 Mon Sep 17 00:00:00 2001 From: tobtoht Date: Tue, 12 Mar 2024 09:42:37 +0100 Subject: [PATCH 09/15] polyseed @@ -64,7 +64,7 @@ index b24855d9b..589676649 100644 + url = https://github.com/tevador/polyseed.git \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt -index abe44eca5..85a62ef7b 100644 +index 86000f811..96056e324 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -372,6 +372,8 @@ if(NOT MANUAL_SUBMODULES) @@ -307,10 +307,10 @@ index b016f2f48..f2f365b1b 100644 + } diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt -index 88a7bb0b5..95be500b1 100644 +index dfdffe67c..fa98f61b5 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt -@@ -73,4 +73,6 @@ add_subdirectory(db_drivers) +@@ -70,4 +70,6 @@ add_subdirectory(db_drivers) add_subdirectory(easylogging++) add_subdirectory(qrcodegen) add_subdirectory(bc-ur) @@ -1194,7 +1194,7 @@ index a223e1df9..28fcd36c9 100644 bool walletExists(const std::string &path) override; bool verifyWalletPassword(const std::string &keys_file_name, const std::string &password, bool no_spend_key, uint64_t kdf_rounds = 1) const override; diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp -index 671fa5298..3e49c21f8 100644 +index e14d4d2fc..fd4094360 100644 --- a/src/wallet/wallet2.cpp +++ b/src/wallet/wallet2.cpp @@ -92,6 +92,7 @@ using namespace epee; @@ -1215,7 +1215,7 @@ index 671fa5298..3e49c21f8 100644 { set_rpc_client_secret_key(rct::rct2sk(rct::skGen())); } -@@ -1474,6 +1476,20 @@ bool wallet2::get_seed(epee::wipeable_string& electrum_words, const epee::wipeab +@@ -1483,6 +1485,20 @@ bool wallet2::get_seed(epee::wipeable_string& electrum_words, const epee::wipeab return true; } //---------------------------------------------------------------------------------------------------- @@ -1236,7 +1236,7 @@ index 671fa5298..3e49c21f8 100644 bool wallet2::get_multisig_seed(epee::wipeable_string& seed, const epee::wipeable_string &passphrase) const { bool ready; -@@ -4792,6 +4808,9 @@ boost::optional wallet2::get_keys_file_data(const crypt +@@ -4801,6 +4817,9 @@ boost::optional wallet2::get_keys_file_data(const crypt value2.SetInt(m_enable_multisig ? 1 : 0); json.AddMember("enable_multisig", value2, json.GetAllocator()); @@ -1246,7 +1246,7 @@ index 671fa5298..3e49c21f8 100644 if (m_background_sync_type == BackgroundSyncCustomPassword && !background_keys_file && m_custom_background_key) { value.SetString(reinterpret_cast(m_custom_background_key.get().data()), m_custom_background_key.get().size()); -@@ -5031,6 +5050,7 @@ bool wallet2::load_keys_buf(const std::string& keys_buf, const epee::wipeable_st +@@ -5040,6 +5059,7 @@ bool wallet2::load_keys_buf(const std::string& keys_buf, const epee::wipeable_st m_enable_multisig = false; m_allow_mismatched_daemon_version = true; m_custom_background_key = boost::none; @@ -1254,7 +1254,7 @@ index 671fa5298..3e49c21f8 100644 } else if(json.IsObject()) { -@@ -5271,6 +5291,9 @@ bool wallet2::load_keys_buf(const std::string& keys_buf, const epee::wipeable_st +@@ -5280,6 +5300,9 @@ bool wallet2::load_keys_buf(const std::string& keys_buf, const epee::wipeable_st GET_FIELD_FROM_JSON_RETURN_ON_ERROR(json, background_sync_type, BackgroundSyncType, Int, false, BackgroundSyncOff); m_background_sync_type = field_background_sync_type; @@ -1264,7 +1264,7 @@ index 671fa5298..3e49c21f8 100644 // Load encryption key used to encrypt background cache crypto::chacha_key custom_background_key; m_custom_background_key = boost::none; -@@ -5590,6 +5613,48 @@ void wallet2::init_type(hw::device::device_type device_type) +@@ -5599,6 +5622,48 @@ void wallet2::init_type(hw::device::device_type device_type) m_key_device_type = device_type; } @@ -1313,7 +1313,7 @@ index 671fa5298..3e49c21f8 100644 /*! * \brief Generates a wallet or restores one. Assumes the multisig setup * has already completed for the provided multisig info. -@@ -5717,7 +5782,7 @@ crypto::secret_key wallet2::generate(const std::string& wallet_, const epee::wip +@@ -5726,7 +5791,7 @@ crypto::secret_key wallet2::generate(const std::string& wallet_, const epee::wip return retval; } @@ -1322,7 +1322,7 @@ index 671fa5298..3e49c21f8 100644 { // -1 month for fluctuations in block time and machine date/time setup. // avg seconds per block -@@ -5741,7 +5806,7 @@ crypto::secret_key wallet2::generate(const std::string& wallet_, const epee::wip +@@ -5750,7 +5815,7 @@ crypto::secret_key wallet2::generate(const std::string& wallet_, const epee::wip // the daemon is currently syncing. // If we use the approximate height we subtract one month as // a safety margin. @@ -1331,7 +1331,7 @@ index 671fa5298..3e49c21f8 100644 uint64_t target_height = get_daemon_blockchain_target_height(err); if (err.empty()) { if (target_height < height) -@@ -13634,9 +13699,10 @@ uint64_t wallet2::get_daemon_blockchain_target_height(string &err) +@@ -13643,9 +13708,10 @@ uint64_t wallet2::get_daemon_blockchain_target_height(string &err) return target_height; } @@ -1343,7 +1343,7 @@ index 671fa5298..3e49c21f8 100644 LOG_PRINT_L2("Calculated blockchain height: " << approx_blockchain_height); return approx_blockchain_height; } -@@ -15771,15 +15837,6 @@ bool wallet2::parse_uri(const std::string &uri, std::string &address, std::strin +@@ -15780,15 +15846,6 @@ bool wallet2::parse_uri(const std::string &uri, std::string &address, std::strin //---------------------------------------------------------------------------------------------------- uint64_t wallet2::get_blockchain_height_by_date(uint16_t year, uint8_t month, uint8_t day) { @@ -1359,7 +1359,7 @@ index 671fa5298..3e49c21f8 100644 std::tm date = { 0, 0, 0, 0, 0, 0, 0, 0 }; date.tm_year = year - 1900; date.tm_mon = month - 1; -@@ -15788,7 +15845,23 @@ uint64_t wallet2::get_blockchain_height_by_date(uint16_t year, uint8_t month, ui +@@ -15797,7 +15854,23 @@ uint64_t wallet2::get_blockchain_height_by_date(uint16_t year, uint8_t month, ui { throw std::runtime_error("month or day out of range"); } @@ -1384,7 +1384,7 @@ index 671fa5298..3e49c21f8 100644 uint64_t height_min = 0; uint64_t height_max = get_daemon_blockchain_height(err) - 1; diff --git a/src/wallet/wallet2.h b/src/wallet/wallet2.h -index 80ff0698d..c26349ce3 100644 +index 746e2aeff..c165acb9d 100644 --- a/src/wallet/wallet2.h +++ b/src/wallet/wallet2.h @@ -72,6 +72,7 @@ @@ -1416,7 +1416,7 @@ index 80ff0698d..c26349ce3 100644 /*! * \brief Generates a wallet or restores one. * \param wallet_ Name of wallet file -@@ -1088,6 +1103,15 @@ private: +@@ -1095,6 +1110,15 @@ private: bool is_deterministic() const; bool get_seed(epee::wipeable_string& electrum_words, const epee::wipeable_string &passphrase = epee::wipeable_string()) const; @@ -1432,7 +1432,7 @@ index 80ff0698d..c26349ce3 100644 /*! * \brief Checks if light wallet. A light wallet sends view key to a server where the blockchain is scanned. */ -@@ -1555,8 +1579,8 @@ private: +@@ -1562,8 +1586,8 @@ private: /*! * \brief Calculates the approximate blockchain height from current date/time. */ @@ -1443,7 +1443,7 @@ index 80ff0698d..c26349ce3 100644 std::vector select_available_outputs_from_histogram(uint64_t count, bool atleast, bool unlocked, bool allow_rct); std::vector select_available_outputs(const std::function &f); std::vector select_available_unmixable_outputs(); -@@ -1650,6 +1674,7 @@ private: +@@ -1657,6 +1681,7 @@ private: bool parse_uri(const std::string &uri, std::string &address, std::string &payment_id, uint64_t &amount, std::string &tx_description, std::string &recipient_name, std::vector &unknown_parameters, std::string &error); uint64_t get_blockchain_height_by_date(uint16_t year, uint8_t month, uint8_t day); // 1<=month<=12, 1<=day<=31 @@ -1451,7 +1451,7 @@ index 80ff0698d..c26349ce3 100644 bool is_synced(); -@@ -1995,6 +2020,7 @@ private: +@@ -2003,6 +2028,7 @@ private: std::string seed_language; /*!< Language of the mnemonics (seed). */ bool is_old_file_format; /*!< Whether the wallet file is of an old file format */ bool m_watch_only; /*!< no spend key */ @@ -1460,5 +1460,5 @@ index 80ff0698d..c26349ce3 100644 uint32_t m_multisig_threshold; std::vector m_multisig_signers; -- -2.39.5 (Apple Git-154) +2.48.0 diff --git a/patches/wownero/0010-coin-control.patch b/patches/wownero/0010-coin-control.patch index 2362fed..94f8485 100644 --- a/patches/wownero/0010-coin-control.patch +++ b/patches/wownero/0010-coin-control.patch @@ -1,4 +1,4 @@ -From 14bcfd4bb49e7697c034d3d38c988f90a1842145 Mon Sep 17 00:00:00 2001 +From edc33fa98da3bc9e8e746a59f5e62b9001afb230 Mon Sep 17 00:00:00 2001 From: tobtoht Date: Tue, 12 Mar 2024 11:07:57 +0100 Subject: [PATCH 10/15] coin control @@ -22,7 +22,7 @@ Subject: [PATCH 10/15] coin control create mode 100644 src/wallet/api/coins_info.h diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp -index 8c5122097..cfdb8935f 100644 +index 83b56c3f4..12c38b8e1 100644 --- a/src/simplewallet/simplewallet.cpp +++ b/src/simplewallet/simplewallet.cpp @@ -6981,7 +6981,7 @@ bool simple_wallet::transfer_main(const std::vector &args_, bool ca @@ -777,10 +777,10 @@ index be1c3704e..013b5bcba 100644 virtual SubaddressAccount * subaddressAccount() = 0; virtual void setListener(WalletListener *) = 0; diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp -index 3e49c21f8..4d756567f 100644 +index fd4094360..be3096675 100644 --- a/src/wallet/wallet2.cpp +++ b/src/wallet/wallet2.cpp -@@ -2094,12 +2094,21 @@ bool wallet2::frozen(const multisig_tx_set& txs) const +@@ -2103,12 +2103,21 @@ bool wallet2::frozen(const multisig_tx_set& txs) const return false; } @@ -802,7 +802,7 @@ index 3e49c21f8..4d756567f 100644 void wallet2::thaw(const crypto::key_image &ki) { thaw(get_transfer_details(ki)); -@@ -2110,6 +2119,18 @@ bool wallet2::frozen(const crypto::key_image &ki) const +@@ -2119,6 +2128,18 @@ bool wallet2::frozen(const crypto::key_image &ki) const return frozen(get_transfer_details(ki)); } //---------------------------------------------------------------------------------------------------- @@ -821,7 +821,7 @@ index 3e49c21f8..4d756567f 100644 size_t wallet2::get_transfer_details(const crypto::key_image &ki) const { for (size_t idx = 0; idx < m_transfers.size(); ++idx) -@@ -2523,6 +2544,7 @@ void wallet2::process_new_transaction(const crypto::hash &txid, const cryptonote +@@ -2532,6 +2553,7 @@ void wallet2::process_new_transaction(const crypto::hash &txid, const cryptonote uint64_t amount = tx.vout[o].amount ? tx.vout[o].amount : tx_scan_info[o].amount; if (!pool) { @@ -829,7 +829,7 @@ index 3e49c21f8..4d756567f 100644 m_transfers.push_back(transfer_details{}); transfer_details& td = m_transfers.back(); td.m_block_height = height; -@@ -2626,6 +2648,7 @@ void wallet2::process_new_transaction(const crypto::hash &txid, const cryptonote +@@ -2635,6 +2657,7 @@ void wallet2::process_new_transaction(const crypto::hash &txid, const cryptonote uint64_t extra_amount = amount - burnt; if (!pool) { @@ -837,7 +837,7 @@ index 3e49c21f8..4d756567f 100644 transfer_details &td = m_transfers[kit->second]; td.m_block_height = height; td.m_internal_output_index = o; -@@ -10497,7 +10520,7 @@ void wallet2::transfer_selected_rct(std::vector picks; float current_output_relatdness = 1.0f; -@@ -10508,6 +10531,9 @@ std::vector wallet2::pick_preferred_rct_inputs(uint64_t needed_money, ui +@@ -10517,6 +10540,9 @@ std::vector wallet2::pick_preferred_rct_inputs(uint64_t needed_money, ui for (size_t i = 0; i < m_transfers.size(); ++i) { const transfer_details& td = m_transfers[i]; @@ -856,7 +856,7 @@ index 3e49c21f8..4d756567f 100644 if (!is_spent(td, false) && !td.m_frozen && td.is_rct() && td.amount() >= needed_money && is_transfer_unlocked(td) && td.m_subaddr_index.major == subaddr_account && subaddr_indices.count(td.m_subaddr_index.minor) == 1) { if (td.amount() > m_ignore_outputs_above || td.amount() < m_ignore_outputs_below) -@@ -10528,6 +10554,9 @@ std::vector wallet2::pick_preferred_rct_inputs(uint64_t needed_money, ui +@@ -10537,6 +10563,9 @@ std::vector wallet2::pick_preferred_rct_inputs(uint64_t needed_money, ui for (size_t i = 0; i < m_transfers.size(); ++i) { const transfer_details& td = m_transfers[i]; @@ -866,7 +866,7 @@ index 3e49c21f8..4d756567f 100644 if (!is_spent(td, false) && !td.m_frozen && !td.m_key_image_partial && td.is_rct() && is_transfer_unlocked(td) && td.m_subaddr_index.major == subaddr_account && subaddr_indices.count(td.m_subaddr_index.minor) == 1) { if (td.amount() > m_ignore_outputs_above || td.amount() < m_ignore_outputs_below) -@@ -10539,6 +10568,9 @@ std::vector wallet2::pick_preferred_rct_inputs(uint64_t needed_money, ui +@@ -10548,6 +10577,9 @@ std::vector wallet2::pick_preferred_rct_inputs(uint64_t needed_money, ui for (size_t j = i + 1; j < m_transfers.size(); ++j) { const transfer_details& td2 = m_transfers[j]; @@ -876,7 +876,7 @@ index 3e49c21f8..4d756567f 100644 if (td2.amount() > m_ignore_outputs_above || td2.amount() < m_ignore_outputs_below) { MDEBUG("Ignoring output " << j << " of amount " << print_money(td2.amount()) << " which is outside prescribed range [" << print_money(m_ignore_outputs_below) << ", " << print_money(m_ignore_outputs_above) << "]"); -@@ -11111,7 +11143,7 @@ bool wallet2::light_wallet_key_image_is_ours(const crypto::key_image& key_image, +@@ -11120,7 +11152,7 @@ bool wallet2::light_wallet_key_image_is_ours(const crypto::key_image& key_image, // This system allows for sending (almost) the entire balance, since it does // not generate spurious change in all txes, thus decreasing the instantaneous // usable balance. @@ -885,7 +885,7 @@ index 3e49c21f8..4d756567f 100644 { //ensure device is let in NONE mode in any case hw::device &hwdev = m_account.get_device(); -@@ -11319,6 +11351,9 @@ std::vector wallet2::create_transactions_2(std::vector wallet2::create_transactions_2(std::vector wallet2::create_transactions_2(std::vector wallet2::create_transactions_2(std::vector &ptx_vector, c +@@ -11898,7 +11933,7 @@ bool wallet2::sanity_check(const std::vector &ptx_vector, c return true; } @@ -913,7 +913,7 @@ index 3e49c21f8..4d756567f 100644 { std::vector unused_transfers_indices; std::vector unused_dust_indices; -@@ -11918,6 +11953,9 @@ std::vector wallet2::create_transactions_all(uint64_t below +@@ -11927,6 +11962,9 @@ std::vector wallet2::create_transactions_all(uint64_t below for (size_t i = 0; i < m_transfers.size(); ++i) { const transfer_details& td = m_transfers[i]; @@ -924,10 +924,10 @@ index 3e49c21f8..4d756567f 100644 { MDEBUG("Ignoring output " << i << " of amount " << print_money(td.amount()) << " which is below threshold " << print_money(fractional_threshold)); diff --git a/src/wallet/wallet2.h b/src/wallet/wallet2.h -index c26349ce3..a48ba33b6 100644 +index c165acb9d..6b103d9c2 100644 --- a/src/wallet/wallet2.h +++ b/src/wallet/wallet2.h -@@ -1209,8 +1209,8 @@ private: +@@ -1216,8 +1216,8 @@ private: bool parse_unsigned_tx_from_str(const std::string &unsigned_tx_st, unsigned_tx_set &exported_txs) const; bool load_tx(const std::string &signed_filename, std::vector &ptx, std::function accept_func = NULL); bool parse_tx_from_str(const std::string &signed_tx_st, std::vector &ptx, std::function accept_func); @@ -938,7 +938,7 @@ index c26349ce3..a48ba33b6 100644 std::vector create_transactions_single(const crypto::key_image &ki, const cryptonote::account_public_address &address, bool is_subaddress, const size_t outputs, const size_t fake_outs_count, uint32_t priority, const std::vector& extra); std::vector create_transactions_from(const cryptonote::account_public_address &address, bool is_subaddress, const size_t outputs, std::vector unused_transfers_indices, std::vector unused_dust_indices, const size_t fake_outs_count, uint32_t priority, const std::vector& extra); bool sanity_check(const std::vector &ptx_vector, const std::vector& dsts, const unique_index_container& subtract_fee_from_outputs = {}) const; -@@ -1562,6 +1562,7 @@ private: +@@ -1569,6 +1569,7 @@ private: uint64_t get_num_rct_outputs(); size_t get_num_transfer_details() const { return m_transfers.size(); } const transfer_details &get_transfer_details(size_t idx) const; @@ -946,7 +946,7 @@ index c26349ce3..a48ba33b6 100644 uint8_t get_current_hard_fork(); void get_hard_fork_info(uint8_t version, uint64_t &earliest_height); -@@ -1793,7 +1794,9 @@ private: +@@ -1800,7 +1801,9 @@ private: void freeze(size_t idx); void thaw(size_t idx); bool frozen(size_t idx) const; @@ -956,7 +956,7 @@ index c26349ce3..a48ba33b6 100644 void thaw(const crypto::key_image &ki); bool frozen(const crypto::key_image &ki) const; bool frozen(const transfer_details &td) const; -@@ -1834,6 +1837,8 @@ private: +@@ -1841,6 +1844,8 @@ private: static std::string get_default_daemon_address() { CRITICAL_REGION_LOCAL(default_daemon_address_lock); return default_daemon_address; } @@ -965,7 +965,7 @@ index c26349ce3..a48ba33b6 100644 private: /*! * \brief Stores wallet information to wallet file. -@@ -1905,7 +1910,7 @@ private: +@@ -1912,7 +1917,7 @@ private: std::vector get_unspent_amounts_vector(bool strict); uint64_t get_dynamic_base_fee_estimate(); float get_output_relatedness(const transfer_details &td0, const transfer_details &td1) const; @@ -975,5 +975,5 @@ index c26349ce3..a48ba33b6 100644 void set_unspent(size_t idx); bool is_spent(const transfer_details &td, bool strict = true) const; -- -2.39.5 (Apple Git-154) +2.48.0 diff --git a/patches/wownero/0011-Add-hex-encoding-and-tx-key-getter-for-PendingTransc.patch b/patches/wownero/0011-Add-hex-encoding-and-tx-key-getter-for-PendingTransc.patch index f130f51..de19446 100644 --- a/patches/wownero/0011-Add-hex-encoding-and-tx-key-getter-for-PendingTransc.patch +++ b/patches/wownero/0011-Add-hex-encoding-and-tx-key-getter-for-PendingTransc.patch @@ -1,4 +1,4 @@ -From 7c4f0b36d627bf4d1ce198240c1e974eff27bbec Mon Sep 17 00:00:00 2001 +From 96911b156ad9cfef2ebf2809a393492e87ab7607 Mon Sep 17 00:00:00 2001 From: M Date: Fri, 21 Apr 2023 15:43:47 -0400 Subject: [PATCH 11/15] Add hex encoding and tx key getter for @@ -64,5 +64,5 @@ index 013b5bcba..f421fdc05 100644 /** -- -2.39.5 (Apple Git-154) +2.48.0 diff --git a/patches/wownero/0012-Add-recoverDeterministicWalletFromSpendKey.patch b/patches/wownero/0012-Add-recoverDeterministicWalletFromSpendKey.patch index a15e54c..bbb5547 100644 --- a/patches/wownero/0012-Add-recoverDeterministicWalletFromSpendKey.patch +++ b/patches/wownero/0012-Add-recoverDeterministicWalletFromSpendKey.patch @@ -1,4 +1,4 @@ -From 298c7e0745306605d7ed1cee320b92eacf8aaeb6 Mon Sep 17 00:00:00 2001 +From ad28016bf3cfd11242dc14472389f7a006c73dcf Mon Sep 17 00:00:00 2001 From: Konstantin Ullrich Date: Wed, 11 Oct 2023 16:47:59 +0200 Subject: [PATCH 12/15] Add recoverDeterministicWalletFromSpendKey @@ -149,5 +149,5 @@ index 28fcd36c9..be3ff8184 100644 const std::string &password, NetworkType nettype, -- -2.39.5 (Apple Git-154) +2.48.0 diff --git a/patches/wownero/0013-add-monero-submodule-support.patch b/patches/wownero/0013-add-monero-submodule-support.patch index f220055..6b1e987 100644 --- a/patches/wownero/0013-add-monero-submodule-support.patch +++ b/patches/wownero/0013-add-monero-submodule-support.patch @@ -1,4 +1,4 @@ -From 1bd61531746e983799fcae9d3a7228620bbc84f5 Mon Sep 17 00:00:00 2001 +From f8b3055a79c929dc167d20d4874ab20b0a51d49d Mon Sep 17 00:00:00 2001 From: cyan Date: Thu, 7 Nov 2024 16:46:24 +0000 Subject: [PATCH 13/15] add monero submodule support @@ -10,7 +10,7 @@ Subject: [PATCH 13/15] add monero submodule support 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 85a62ef7b..763d240fc 100644 +index 96056e324..1383e630a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -223,9 +223,9 @@ function(forbid_undefined_symbols) @@ -48,7 +48,7 @@ index 7ecf5f610..89fb9d167 100644 set(saved_CMAKE_C_FLAGS ${CMAKE_C_FLAGS}) set(CMAKE_C_FLAGS "${flag}") diff --git a/src/wallet/wallet_rpc_server.cpp b/src/wallet/wallet_rpc_server.cpp -index 3cc6b278f..071434486 100644 +index 21e69ea0e..d9bc5dda3 100644 --- a/src/wallet/wallet_rpc_server.cpp +++ b/src/wallet/wallet_rpc_server.cpp @@ -1162,7 +1162,7 @@ namespace tools @@ -61,5 +61,5 @@ index 3cc6b278f..071434486 100644 if (ptx_vector.empty()) { -- -2.39.5 (Apple Git-154) +2.48.0 diff --git a/patches/wownero/0014-fix-iOS-depends-build.patch b/patches/wownero/0014-fix-iOS-depends-build.patch index 5e97b89..5cb1c79 100644 --- a/patches/wownero/0014-fix-iOS-depends-build.patch +++ b/patches/wownero/0014-fix-iOS-depends-build.patch @@ -1,4 +1,4 @@ -From f9bf382c57e4a36044e7a0697dc36073487eadd3 Mon Sep 17 00:00:00 2001 +From a707d5fc2aa9d387857381e7ebc4a68c1d245a00 Mon Sep 17 00:00:00 2001 From: Czarek Nakamoto Date: Thu, 21 Nov 2024 06:05:03 -0500 Subject: [PATCH 14/15] fix iOS depends build @@ -11,7 +11,7 @@ Subject: [PATCH 14/15] fix iOS depends build 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 763d240fc..e3a0faacd 100644 +index 1383e630a..b8782570d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -39,10 +39,6 @@ include(CheckLibraryExists) @@ -100,5 +100,5 @@ index 83bea8b5b..dfb4b5c5a 100644 #if TARGET_OS_MAC && (!defined(MAC_OS_X_VERSION_MIN_REQUIRED) || MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_7) return boost::logic::tribool(IOPSGetTimeRemainingEstimate() != kIOPSTimeRemainingUnlimited); -- -2.39.5 (Apple Git-154) +2.48.0 diff --git a/patches/wownero/0015-include-locale-only-when-targeting-WIN32.patch b/patches/wownero/0015-include-locale-only-when-targeting-WIN32.patch index 512e012..27ec9bc 100644 --- a/patches/wownero/0015-include-locale-only-when-targeting-WIN32.patch +++ b/patches/wownero/0015-include-locale-only-when-targeting-WIN32.patch @@ -1,4 +1,4 @@ -From a6538084be4fdfbf84e7cbae2bce040aeaf4a4f9 Mon Sep 17 00:00:00 2001 +From eeb059ab8bff7e8614531565259ca66f6e6a8c7d Mon Sep 17 00:00:00 2001 From: Czarek Nakamoto Date: Mon, 18 Nov 2024 10:57:37 -0500 Subject: [PATCH 15/15] include locale only when targeting WIN32 @@ -9,21 +9,21 @@ Subject: [PATCH 15/15] include locale only when targeting WIN32 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index e3a0faacd..b9207ef2a 100644 +index b8782570d..d1ed1de7b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -1096,7 +1096,10 @@ if(STATIC) - set(Boost_USE_STATIC_LIBS ON) - set(Boost_USE_STATIC_RUNTIME ON) - endif() --find_package(Boost 1.58 QUIET REQUIRED COMPONENTS system filesystem thread date_time chrono regex serialization program_options locale) -+if(WIN32) -+ set(BOOST_LOCALE locale) -+endif() -+find_package(Boost 1.58 QUIET REQUIRED COMPONENTS system filesystem thread date_time chrono regex serialization program_options ${BOOST_LOCALE}) - add_definitions(-DBOOST_ASIO_ENABLE_SEQUENTIAL_STRAND_ALLOCATION) - add_definitions(-DBOOST_NO_AUTO_PTR) - add_definitions(-DBOOST_UUID_DISABLE_ALIGNMENT) # This restores UUID's std::has_unique_object_representations property +@@ -1090,7 +1090,10 @@ if(NOT Boost_FOUND) + elseif(Boost_FOUND) + message(STATUS "Found Boost Version: ${Boost_VERSION_STRING}") + +- set(BOOST_COMPONENTS filesystem thread date_time chrono serialization program_options locale) ++ if(WIN32) ++ set(BOOST_LOCALE locale) ++ endif() ++ set(BOOST_COMPONENTS filesystem thread date_time chrono serialization program_options ${BOOST_LOCALE}) + + # Boost System is header-only since 1.69 + if (Boost_VERSION_STRING VERSION_LESS 1.69.0) diff --git a/src/wallet/api/wallet.cpp b/src/wallet/api/wallet.cpp index e650e6044..6d7553a1d 100644 --- a/src/wallet/api/wallet.cpp @@ -39,5 +39,5 @@ index e650e6044..6d7553a1d 100644 #include "bc-ur/src/bc-ur.hpp" #if defined(HIDAPI_DUMMY) && !defined(HAVE_HIDAPI) -- -2.39.5 (Apple Git-154) +2.48.0 diff --git a/wownero b/wownero index dd46a31..3e302be 160000 --- a/wownero +++ b/wownero @@ -1 +1 @@ -Subproject commit dd46a31f3cab67b316e9239b15acf7d5cea60aa9 +Subproject commit 3e302be710f4e6b4f58642989c8e47711362fa56 diff --git a/wownero_libwallet2_api_c/src/main/cpp/wownero_checksum.h b/wownero_libwallet2_api_c/src/main/cpp/wownero_checksum.h index e366e07..99f45d7 100644 --- a/wownero_libwallet2_api_c/src/main/cpp/wownero_checksum.h +++ b/wownero_libwallet2_api_c/src/main/cpp/wownero_checksum.h @@ -1,6 +1,6 @@ #ifndef MONEROC_CHECKSUMS #define MONEROC_CHECKSUMS const char * WOWNERO_wallet2_api_c_h_sha256 = "f99009d1ca1d1c783cc9aa0fb63f680d48753b88124fb5de2079c57b7e34c827"; -const char * WOWNERO_wallet2_api_c_cpp_sha256 = "70b39a0bef660cb9ba0397117eb1590e18461ace89ab18141690658a2a537d5d-dd46a31f3cab67b316e9239b15acf7d5cea60aa9"; +const char * WOWNERO_wallet2_api_c_cpp_sha256 = "70b39a0bef660cb9ba0397117eb1590e18461ace89ab18141690658a2a537d5d-3e302be710f4e6b4f58642989c8e47711362fa56"; const char * WOWNERO_wallet2_api_c_exp_sha256 = "5f53ea8bbe66a5e5aa6cbc4ca00695900e08589cfd32062e88965a24252d05ba"; #endif