From b4f6f6f411b6efebf12f99698bc3f1f40a78b7dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jorge=20Tim=C3=B3n?= <jtimon@jtimon.cc>
Date: Thu, 26 Nov 2015 14:50:09 +0100
Subject: [PATCH] UNDO: Assets: comment CTransaction::nTxFee in wallet

---
 src/rpcwallet.cpp | 8 ++++----
 src/wallet.cpp    | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/rpcwallet.cpp b/src/rpcwallet.cpp
index 6d97292072..6fdf8a544a 100644
--- a/src/rpcwallet.cpp
+++ b/src/rpcwallet.cpp
@@ -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);
 
diff --git a/src/wallet.cpp b/src/wallet.cpp
index e6aaccdbba..6136ea0522 100644
--- a/src/wallet.cpp
+++ b/src/wallet.cpp
@@ -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