GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-15 12:51:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixup! Don't use pointers for CReserveKeys

Browse source
This commit is contained in:
Gregory Sanders 2017-08-09 14:29:19 -04:00
parent bc4a33163a
commit 4e4fe7f602
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/qt/walletmodel.cpp
View file

@ -281,9 +281,9 @@ WalletModel::SendCoinsReturn WalletModel::prepareTransaction(WalletModelTransact
std::string strFailReason;
CWalletTx *newTx = transaction.getTransaction();
CReserveKey *keyChange = transaction.getPossibleKeyChange();
std::vector<CReserveKey*> vkeyChange;
vkeyChange.push_back(keyChange);
//CReserveKey *keyChange = transaction.getPossibleKeyChange();
std::vector<CReserveKey> vkeyChange;
vkeyChange.emplace_back(CReserveKey(wallet));
std::vector<CAmount> outAmounts;
bool fCreated = wallet->CreateTransaction(vecSend, *newTx, vkeyChange, nFeeRequired, nChangePosRet, strFailReason, coinControl, true, &outAmounts);
transaction.setTransactionFee(nFeeRequired);
@ -338,9 +338,9 @@ WalletModel::SendCoinsReturn WalletModel::sendCoins(WalletModelTransaction &tran
newTx->vOrderForm.push_back(make_pair("Message", rcp.message.toStdString()));
}
CReserveKey *keyChange = transaction.getPossibleKeyChange();
std::vector<CReserveKey*> vkeyChange;
vkeyChange.push_back(keyChange);
//CReserveKey *keyChange = transaction.getPossibleKeyChange();
std::vector<CReserveKey> vkeyChange;
vkeyChange.emplace_back(CReserveKey(wallet));
CValidationState state;
if(!wallet->CommitTransaction(*newTx, vkeyChange, g_connman.get(), state))
return SendCoinsReturn(TransactionCommitFailed, QString::fromStdString(state.GetRejectReason()));