summaryrefslogtreecommitdiff
path: root/patches/monero/0006-fix-make-debug-test-target.patch
diff options
context:
space:
mode:
authorCzarek Nakamoto <cyjan@mrcyjanek.net>2024-04-12 11:13:43 +0200
committerCzarek Nakamoto <cyjan@mrcyjanek.net>2024-04-12 11:13:43 +0200
commit125e64f11f2201deaf2c291a586211a4410da57a (patch)
tree1f78db1ad19e14e284c128fe5a310edf2d1e1de1 /patches/monero/0006-fix-make-debug-test-target.patch
parentb003970d7f445489a588f4d0358af98d995969d2 (diff)
update patchesv0.18.3.3-RC23
update readme
Diffstat (limited to 'patches/monero/0006-fix-make-debug-test-target.patch')
-rw-r--r--patches/monero/0006-fix-make-debug-test-target.patch46
1 files changed, 0 insertions, 46 deletions
diff --git a/patches/monero/0006-fix-make-debug-test-target.patch b/patches/monero/0006-fix-make-debug-test-target.patch
deleted file mode 100644
index c376d98..0000000
--- a/patches/monero/0006-fix-make-debug-test-target.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From c1af99f391626d567fec83210a945f6f60bea700 Mon Sep 17 00:00:00 2001
-From: Czarek Nakamoto <cyjan@mrcyjanek.net>
-Date: Tue, 2 Apr 2024 01:13:12 +0200
-Subject: [PATCH] fix `make debug-test` target
-
----
- src/simplewallet/simplewallet.cpp | 4 ++--
- src/wallet/wallet_rpc_server.cpp | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp
-index 341b0e448..c2e16da4c 100644
---- a/src/simplewallet/simplewallet.cpp
-+++ b/src/simplewallet/simplewallet.cpp
-@@ -6976,13 +6976,13 @@ bool simple_wallet::transfer_main(int transfer_type, const std::vector<std::stri
- return false;
- }
- unlock_block = bc_height + locked_blocks;
-- ptx_vector = m_wallet->create_transactions_2(dsts, fake_outs_count, unlock_block /* unlock_time */, priority, extra, m_current_subaddress_account, subaddr_indices, subtract_fee_from_outputs);
-+ ptx_vector = m_wallet->create_transactions_2(dsts, fake_outs_count, unlock_block /* unlock_time */, priority, extra, m_current_subaddress_account, subaddr_indices, {}, subtract_fee_from_outputs);
- break;
- default:
- LOG_ERROR("Unknown transfer method, using default");
- /* FALLTHRU */
- case Transfer:
-- ptx_vector = m_wallet->create_transactions_2(dsts, fake_outs_count, 0 /* unlock_time */, priority, extra, m_current_subaddress_account, subaddr_indices, subtract_fee_from_outputs);
-+ ptx_vector = m_wallet->create_transactions_2(dsts, fake_outs_count, 0 /* unlock_time */, priority, extra, m_current_subaddress_account, subaddr_indices, {}, subtract_fee_from_outputs);
- break;
- }
-
-diff --git a/src/wallet/wallet_rpc_server.cpp b/src/wallet/wallet_rpc_server.cpp
-index 822fc828b..caa23e636 100644
---- a/src/wallet/wallet_rpc_server.cpp
-+++ b/src/wallet/wallet_rpc_server.cpp
-@@ -1157,7 +1157,7 @@ namespace tools
- {
- uint64_t mixin = m_wallet->adjust_mixin(req.ring_size ? req.ring_size - 1 : 0);
- uint32_t priority = m_wallet->adjust_priority(req.priority);
-- std::vector<wallet2::pending_tx> ptx_vector = m_wallet->create_transactions_2(dsts, mixin, req.unlock_time, priority, extra, req.account_index, req.subaddr_indices, req.subtract_fee_from_outputs);
-+ std::vector<wallet2::pending_tx> ptx_vector = m_wallet->create_transactions_2(dsts, mixin, req.unlock_time, priority, extra, req.account_index, req.subaddr_indices, {}, req.subtract_fee_from_outputs);
-
- if (ptx_vector.empty())
- {
---
-2.44.0
-