Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2025-12-14 18:55:19 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/mbg033/bitmonero

Browse source
This commit is contained in:
Ilya Kitaev 2016-06-23 16:23:09 +03:00
commit ab61ba0c9b
5 changed files with 19 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/wallet/api/wallet.cpp
View file

@ -36,7 +36,6 @@
#include "mnemonics/electrum-words.h"
#include <boost/format.hpp>
#include <boost/regex.hpp>
#include <sstream>
using namespace std;
@ -146,7 +145,6 @@ std::string Wallet::genPaymentId()
}
///////////////////////// WalletImpl implementation ////////////////////////
WalletImpl::WalletImpl(bool testnet)
:m_wallet(nullptr), m_status(Wallet::Status_Ok), m_trustedDaemon(false),
@ -397,11 +395,13 @@ bool WalletImpl::refresh()
// - payment_details;
// - unconfirmed_transfer_details;
// - confirmed_transfer_details)
PendingTransaction *WalletImpl::createTransaction(const string &dst_addr, const string &payment_id, uint64_t amount, uint32_t mixin_count)
{
clearStatus();
vector<cryptonote::tx_destination_entry> dsts;
cryptonote::tx_destination_entry de;
// indicates if dst_addr is integrated address (address + payment_id)
bool has_payment_id;
crypto::hash8 payment_id_short;
@ -420,6 +420,7 @@ PendingTransaction *WalletImpl::createTransaction(const string &dst_addr, const
break;
}
std::vector<uint8_t> extra;
// if dst_addr is not an integrated address, parse payment_id
if (!has_payment_id && !payment_id.empty()) {
@ -446,7 +447,6 @@ PendingTransaction *WalletImpl::createTransaction(const string &dst_addr, const
}
}
de.amount = amount;
if (de.amount <= 0) {
m_status = Status_Error;
@ -457,8 +457,6 @@ PendingTransaction *WalletImpl::createTransaction(const string &dst_addr, const
dsts.push_back(de);
//std::vector<tools::wallet2::pending_tx> ptx_vector;
try {
transaction->m_pending_tx = m_wallet->create_transactions_2(dsts, fake_outs_count, 0 /* unlock_time */,
0 /* unused fee arg*/, extra, m_trustedDaemon);