[BUG][GUI] Refine bytes/fee/"after fee" calculation in coin-control

random-zebra · furszy · commit 74c4b9d57e91 · 2021-10-13T17:46:53.000-03:00
diff --git a/src/qt/coincontroldialog.cpp b/src/qt/coincontroldialog.cpp
@@ -550,9 +550,6 @@ TotalAmounts CoinControlDialog::getTotals() const
             t.nBytes += (GetCompactSize(nShieldIns) + GetCompactSize(nShieldOuts));
         }
 
-        // !TODO: ExtraPayload size for special txes. For now 1 byte for nullopt.
-        t.nBytes += 1;
-
         // nVersion, nType, nLockTime
         t.nBytes += 8;
 
diff --git a/src/sapling/sapling_operation.h b/src/sapling/sapling_operation.h
@@ -11,10 +11,6 @@
 #include "primitives/transaction.h"
 #include "wallet/wallet.h"
 
-// transaction.h comment: spending taddr output requires CTxIn >= 148 bytes and typical taddr txout is 34 bytes
-#define CTXIN_SPEND_DUST_SIZE   148
-#define CTXOUT_REGULAR_SIZE     34
-
 class CCoinControl;
 struct TxValues;
 
diff --git a/src/sapling/sapling_transaction.h b/src/sapling/sapling_transaction.h
@@ -17,7 +17,7 @@
 #include <boost/variant.hpp>
 
 // transaction.h comment: spending taddr output requires CTxIn >= 148 bytes and typical taddr txout is 34 bytes
-#define CTXIN_SPEND_DUST_SIZE   148
+#define CTXIN_SPEND_DUST_SIZE   149
 #define CTXOUT_REGULAR_SIZE     34
 
 // These constants are defined in the protocol § 7.1:

Original file line number	Diff line number	Diff line change
`@@ -550,9 +550,6 @@ TotalAmounts CoinControlDialog::getTotals() const`
`550`	`550`	`t.nBytes += (GetCompactSize(nShieldIns) + GetCompactSize(nShieldOuts));`
`551`	`551`	`}`
`552`	`552`
`553`		`- // !TODO: ExtraPayload size for special txes. For now 1 byte for nullopt.`
`554`		`- t.nBytes += 1;`
`555`		`-`
`556`	`553`	`// nVersion, nType, nLockTime`
`557`	`554`	`t.nBytes += 8;`
`558`	`555`