nihilist/monero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wallet: use minimum mixin when RPC asks for too low mixin

Browse Source 
After the fork, normal transfer functions called via RPC
use the minimum mixin 2 if 0 or 1 is requested. While the
incoming transaction may be valid (eg, it has an unmixable
and at most a mixable input), it is a simple way to make
sure RPC users can't get a seemingly random accept/reject
behavior if they don't update their requested mixin.
This commit is contained in:
moneromooo-monero 2016-03-11 21:32:16 +00:00
parent 31d2e0f84d
commit 8bc1bd6b65
No known key found for this signature in database
GPG Key ID: 686F07454D6CEFC3
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/wallet/wallet_rpc_server.cpp
View File

@ -227,7 +227,12 @@ namespace tools
try try
{ {
std::vector<wallet2::pending_tx> ptx_vector = m_wallet.create_transactions(dsts, req.mixin, req.unlock_time, req.fee, extra); uint64_t mixin = req.mixin;
if (mixin < 2 && m_wallet.use_fork_rules(2)) {
LOG_PRINT_L1("Requested mixin " << req.mixin << " too low for hard fork 2, using 2");
mixin = 2;
}
std::vector<wallet2::pending_tx> ptx_vector = m_wallet.create_transactions(dsts, mixin, req.unlock_time, req.fee, extra);
// 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)
@ -287,11 +292,16 @@ namespace tools
try try
{ {
uint64_t mixin = req.mixin;
if (mixin < 2 && m_wallet.use_fork_rules(2)) {
LOG_PRINT_L1("Requested mixin " << req.mixin << " too low for hard fork 2, using 2");
mixin = 2;
}
std::vector<wallet2::pending_tx> ptx_vector; std::vector<wallet2::pending_tx> ptx_vector;
if (req.new_algorithm) if (req.new_algorithm)
ptx_vector = m_wallet.create_transactions_2(dsts, req.mixin, req.unlock_time, req.fee, extra); ptx_vector = m_wallet.create_transactions_2(dsts, mixin, req.unlock_time, req.fee, extra);
else else
ptx_vector = m_wallet.create_transactions(dsts, req.mixin, req.unlock_time, req.fee, extra); ptx_vector = m_wallet.create_transactions(dsts, mixin, req.unlock_time, req.fee, extra);
m_wallet.commit_tx(ptx_vector); m_wallet.commit_tx(ptx_vector);