aboutsummaryrefslogtreecommitdiff
path: root/src/wallet/wallet_rpc_server.cpp
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2015-07-24 07:44:28 +0200
committerRiccardo Spagni <ric@spagni.net>2015-07-24 07:44:39 +0200
commitee94ecb72124b2271b25fe825d65c9a265ae55ac (patch)
treefeb7f9a63c63c6de14fc7c950559a9d473ce9674 /src/wallet/wallet_rpc_server.cpp
parentMerge pull request #351 (diff)
parentwallet: new transaction construction algorithm (diff)
downloadmonero-ee94ecb72124b2271b25fe825d65c9a265ae55ac.tar.xz
Merge pull request #348
988fe1f wallet: new transaction construction algorithm (moneromooo-monero)
Diffstat (limited to 'src/wallet/wallet_rpc_server.cpp')
-rw-r--r--src/wallet/wallet_rpc_server.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/wallet/wallet_rpc_server.cpp b/src/wallet/wallet_rpc_server.cpp
index 7c82e69f8..1d38695ae 100644
--- a/src/wallet/wallet_rpc_server.cpp
+++ b/src/wallet/wallet_rpc_server.cpp
@@ -254,7 +254,11 @@ namespace tools
try
{
- std::vector<wallet2::pending_tx> ptx_vector = m_wallet.create_transactions(dsts, req.mixin, req.unlock_time, req.fee, extra);
+ std::vector<wallet2::pending_tx> ptx_vector;
+ if (req.new_algorithm)
+ ptx_vector = m_wallet.create_transactions_2(dsts, req.mixin, req.unlock_time, req.fee, extra);
+ else
+ ptx_vector = m_wallet.create_transactions(dsts, req.mixin, req.unlock_time, req.fee, extra);
m_wallet.commit_tx(ptx_vector);