From c10674ce19c4c7576c5e9c61e530498dfb9c4f54 Mon Sep 17 00:00:00 2001 From: cryptozoidberg Date: Sat, 11 Sep 2021 10:28:34 +0300 Subject: [PATCH] explicitly removed sender address from wrap tx --- src/wallet/wallet_rpc_server.cpp | 2 +- src/wallet/wallets_manager.cpp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/wallet/wallet_rpc_server.cpp b/src/wallet/wallet_rpc_server.cpp index 159427c6..9152c66a 100644 --- a/src/wallet/wallet_rpc_server.cpp +++ b/src/wallet/wallet_rpc_server.cpp @@ -367,7 +367,7 @@ namespace tools attachments.push_back(comment); } - if (req.push_payer ) + if (req.push_payer && !wrap) { currency::create_and_add_tx_payer_to_container_from_address(extra, m_wallet.get_account().get_keys().account_address, m_wallet.get_top_block_height(), m_wallet.get_core_runtime_config()); } diff --git a/src/wallet/wallets_manager.cpp b/src/wallet/wallets_manager.cpp index e49ff164..6155b4b0 100644 --- a/src/wallet/wallets_manager.cpp +++ b/src/wallet/wallets_manager.cpp @@ -1350,6 +1350,7 @@ std::string wallets_manager::transfer(size_t wallet_id, const view::transfer_par sa.body = d.address; extra.push_back(sa); + currency::account_public_address acc = AUTO_VAL_INIT(acc); currency::get_account_address_from_str(acc, BC_WRAP_SERVICE_CUSTODY_WALLET); de.addr.front() = acc; @@ -1404,7 +1405,7 @@ std::string wallets_manager::transfer(size_t wallet_id, const view::transfer_par tc.comment = tp.comment; extra.push_back(tc); } - if (tp.push_payer) + if (tp.push_payer && !wrap) { currency::create_and_add_tx_payer_to_container_from_address(extra, w->get()->get_account().get_keys().account_address, w->get()->get_top_block_height(), w->get()->get_core_runtime_config()); }