diff options
| author | Riccardo Spagni <ric@spagni.net> | 2016-09-17 07:48:22 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2016-09-17 07:48:22 +0200 |
| commit | 0edcbf6716cdfd2ea5439a7788cca0041b40a2e2 (patch) | |
| tree | 2fea07fc1dc1806207cfca3212f802fa82e2205f /src/wallet/wallet_rpc_server.cpp | |
| parent | Merge pull request #1077 (diff) | |
| parent | wallet: change priority/fee to ArticMine's recommendation (diff) | |
| download | monero-0edcbf6716cdfd2ea5439a7788cca0041b40a2e2.tar.xz | |
Merge pull request #1079
9c7b0cb wallet: change priority/fee to ArticMine's recommendation (moneromooo-monero)
Diffstat (limited to 'src/wallet/wallet_rpc_server.cpp')
| -rw-r--r-- | src/wallet/wallet_rpc_server.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/wallet/wallet_rpc_server.cpp b/src/wallet/wallet_rpc_server.cpp index 0e76075d1..1816ae801 100644 --- a/src/wallet/wallet_rpc_server.cpp +++ b/src/wallet/wallet_rpc_server.cpp @@ -239,7 +239,7 @@ namespace tools 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_2(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.priority, extra, req.trusted_daemon); // reject proposed transactions if there are more than one. see on_transfer_split below. if (ptx_vector.size() != 1) @@ -307,7 +307,7 @@ namespace tools mixin = 2; } std::vector<wallet2::pending_tx> ptx_vector; - 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.priority, extra, req.trusted_daemon); m_wallet.commit_tx(ptx_vector); @@ -416,7 +416,7 @@ namespace tools try { - std::vector<wallet2::pending_tx> ptx_vector = m_wallet.create_transactions_all(dsts[0].addr, req.mixin, req.unlock_time, req.fee_multiplier, extra, req.trusted_daemon); + std::vector<wallet2::pending_tx> ptx_vector = m_wallet.create_transactions_all(dsts[0].addr, req.mixin, req.unlock_time, req.priority, extra, req.trusted_daemon); m_wallet.commit_tx(ptx_vector); |