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

UNDO: Assets: comment CTransaction::nTxFee in wallet

Browse source
This commit is contained in:
Jorge Timón 2015-11-26 14:50:09 +01:00
parent 6d72a1e403
commit b4f6f6f411
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/rpcwallet.cpp
View file

@ -1601,11 +1601,11 @@ Value gettransaction(const Array& params, bool fHelp)
CAmount nCredit = wtx.GetCredit(filter);
CAmount nDebit = wtx.GetDebit(filter);
CAmount nNet = nCredit - nDebit;
CAmount nFee = (wtx.IsFromMe(filter) ? wtx.nTxFee : 0);
// CAmount nFee = (wtx.IsFromMe(filter) ? wtx.nTxFee : 0);
entry.push_back(Pair("amount", ValueFromAmount(nNet - nFee)));
if (wtx.IsFromMe(filter))
entry.push_back(Pair("fee", ValueFromAmount(nFee)));
// entry.push_back(Pair("amount", ValueFromAmount(nNet - nFee)));
// if (wtx.IsFromMe(filter))
// entry.push_back(Pair("fee", ValueFromAmount(nFee)));
WalletTxToJSON(wtx, entry);

6
src/wallet.cpp
View file

@ -864,8 +864,8 @@ void CWalletTx::GetAmounts(list<COutputEntry>& listReceived,
// Compute fee:
CAmount nDebit = GetDebit(filter);
if (nDebit > 0) // debit>0 means we signed/sent this transaction
nFee = nTxFee;
// if (nDebit > 0) // debit>0 means we signed/sent this transaction
// nFee = nTxFee;
// Sent/received.
for (unsigned int i = 0; i < vout.size(); ++i)
@ -1633,7 +1633,7 @@ bool CWallet::CreateTransaction(const vector<CSend>& vecSend, const vector<CTxIn
BOOST_FOREACH(const PAIRTYPE(const CWalletTx*,unsigned int)& coin, setCoins)
txNew.vin.push_back(CTxIn(coin.first->GetHash(),coin.second));
txNew.nTxFee = nValueIn - nValueOut;
// txNew.nTxFee = nValueIn - nValueOut;
LogPrintf("Created transaction (before blinding): %s", CTransaction(txNew).ToString());
// Create blinded outputs