rottenwheel/monero
1
0
Fork 0
mirror of https://codeberg.org/anoncontributorxmr/monero.git synced 2024-11-23 11:23:26 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

wallet: always use new algorithm for RPC transfers

Browse Source 
This ensures we get rct transactions when appropriate
This commit is contained in:
moneromooo-monero 2016-07-30 09:37:22 +01:00
parent b337aea6cc
commit 1303cda646
No known key found for this signature in database
GPG Key ID: 686F07454D6CEFC3
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/wallet/wallet_rpc_server.cpp
View File

@ -239,7 +239,7 @@ namespace tools
LOG_PRINT_L1("Requested mixin " << req.mixin << " too low for hard fork 2, using 2"); LOG_PRINT_L1("Requested mixin " << req.mixin << " too low for hard fork 2, using 2");
mixin = 2; mixin = 2;
} }
std::vector<wallet2::pending_tx> ptx_vector = m_wallet.create_transactions(dsts, mixin, req.unlock_time, req.fee_multiplier, extra, req.trusted_daemon); std::vector<wallet2::pending_tx> ptx_vector = m_wallet.create_transactions_2(dsts, mixin, req.unlock_time, req.fee_multiplier, extra, req.trusted_daemon);
// reject proposed transactions if there are more than one. see on_transfer_split below. // reject proposed transactions if there are more than one. see on_transfer_split below.
if (ptx_vector.size() != 1) if (ptx_vector.size() != 1)
@ -314,10 +314,7 @@ namespace tools
mixin = 2; mixin = 2;
} }
std::vector<wallet2::pending_tx> ptx_vector; std::vector<wallet2::pending_tx> ptx_vector;
if (req.new_algorithm) ptx_vector = m_wallet.create_transactions_2(dsts, mixin, req.unlock_time, req.fee_multiplier, extra, req.trusted_daemon);
ptx_vector = m_wallet.create_transactions_2(dsts, mixin, req.unlock_time, req.fee_multiplier, extra, req.trusted_daemon);
else
ptx_vector = m_wallet.create_transactions(dsts, mixin, req.unlock_time, req.fee_multiplier, extra, req.trusted_daemon);
m_wallet.commit_tx(ptx_vector); m_wallet.commit_tx(ptx_vector);

2
src/wallet/wallet_rpc_server_commands_defs.h
View File

@ -151,7 +151,6 @@ namespace wallet_rpc
uint64_t mixin; uint64_t mixin;
uint64_t unlock_time; uint64_t unlock_time;
std::string payment_id; std::string payment_id;
bool new_algorithm;
bool get_tx_keys; bool get_tx_keys;
bool trusted_daemon; bool trusted_daemon;
@ -161,7 +160,6 @@ namespace wallet_rpc
KV_SERIALIZE(mixin) KV_SERIALIZE(mixin)
KV_SERIALIZE(unlock_time) KV_SERIALIZE(unlock_time)
KV_SERIALIZE(payment_id) KV_SERIALIZE(payment_id)
KV_SERIALIZE(new_algorithm)
KV_SERIALIZE(get_tx_keys) KV_SERIALIZE(get_tx_keys)
KV_SERIALIZE(trusted_daemon) KV_SERIALIZE(trusted_daemon)
END_KV_SERIALIZE_MAP() END_KV_SERIALIZE_MAP()