Merge remote-tracking branch 'origin/develop' into rust-develop

1 files changed, 0 insertions, 30 deletions

diff --git a/patches/monero/0018-fix-coin-control-patch.patch b/patches/monero/0018-fix-coin-control-patch.patch
deleted file mode 100644
index 001a1c0..0000000
--- a/patches/monero/0018-fix-coin-control-patch.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 3d99b4efb5a79d7c52d596c349de25d1ca34c264 Mon Sep 17 00:00:00 2001
-From: Czarek Nakamoto <cyjan@mrcyjanek.net>
-Date: Fri, 27 Sep 2024 12:20:49 +0200
-Subject: [PATCH] fix coin control patch
-
----
- src/wallet/api/wallet.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/wallet/api/wallet.cpp b/src/wallet/api/wallet.cpp
-index 3ead385ec..ec7d60ec0 100644
---- a/src/wallet/api/wallet.cpp
-+++ b/src/wallet/api/wallet.cpp
-@@ -2174,11 +2174,11 @@ PendingTransaction *WalletImpl::createTransactionMultDest(const std::vector<stri
-             if (amount) {
-                 transaction->m_pending_tx = m_wallet->create_transactions_2(dsts, fake_outs_count,
-                                                                             adjusted_priority,
--                                                                            extra, subaddr_account, subaddr_indices);
-+                                                                            extra, subaddr_account, subaddr_indices, preferred_input_list);
-             } else {
-                 transaction->m_pending_tx = m_wallet->create_transactions_all(0, info.address, info.is_subaddress, 1, fake_outs_count,
-                                                                               adjusted_priority,
--                                                                              extra, subaddr_account, subaddr_indices);
-+                                                                              extra, subaddr_account, subaddr_indices, preferred_input_list);
-             }
-             pendingTxPostProcess(transaction);
- 
--- 
-2.39.5 (Apple Git-154)
-