Subtract fee from amount: CAmount

bitcoin · Oct 3, 2014 · 55e774d · 55e774d
1 parent f156d37
commit 55e774d
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/src/core.h b/src/core.h
@@ -193,7 +193,7 @@ class CTxOut
 
     uint256 GetHash() const;
 
-    int64_t GetDustThreshold(CFeeRate& minRelayTxFee) const
+    CAmount GetDustThreshold(CFeeRate& minRelayTxFee) const
     {
         // "Dust" is defined in terms of CTransaction::minRelayTxFee,
         // which has units satoshis-per-kilobyte.

diff --git a/src/qt/walletmodeltransaction.cpp b/src/qt/walletmodeltransaction.cpp
@@ -50,7 +50,7 @@ void WalletModelTransaction::reassignAmounts(int nChangePosRet)
 
         if (rcp.paymentRequest.IsInitialized())
         {
-            int64_t subtotal = 0;
+            CAmount subtotal = 0;
             const payments::PaymentDetails& details = rcp.paymentRequest.getDetails();
             for (int j = 0; j < details.outputs_size(); j++)
             {

diff --git a/src/wallet.cpp b/src/wallet.cpp
@@ -1440,7 +1440,7 @@ bool CWallet::CreateTransaction(const vector<CRecipient>& vecSend,
                     // So instead we raise the change and deduct from the recipient.
                     if (nSubtractFeeFromAmount > 0 && newTxOut.IsDust(::minRelayTxFee))
                     {
-                        int64_t nDust = newTxOut.GetDustThreshold(::minRelayTxFee) - newTxOut.nValue;
+                        CAmount nDust = newTxOut.GetDustThreshold(::minRelayTxFee) - newTxOut.nValue;
                         newTxOut.nValue += nDust; // raise change until no more dust
                         for (unsigned int i = 0; i < vecSend.size(); i++) // subtract from first recipient
                         {

diff --git a/src/wallet.h b/src/wallet.h
@@ -95,7 +95,7 @@ class CAddressBookData
 struct CRecipient
 {
     CScript scriptPubKey;
-    int64_t nAmount;
+    CAmount nAmount;
     bool fSubtractFeeFromAmount;
 };