Fix origfee return for bumpfee with feerate arg

instagibbs · instagibbs · commit 02afb0c550dc · 2019-12-01T20:54:16.000-05:00
diff --git a/src/wallet/feebumper.cpp b/src/wallet/feebumper.cpp
@@ -108,12 +108,11 @@ static feebumper::Result CheckFeeRate(const CWallet& wallet, const CWalletTx& wt
     return feebumper::Result::OK;
 }
 
-static CFeeRate EstimateFeeRate(const CWallet& wallet, const CWalletTx& wtx, CCoinControl& coin_control, CAmount& old_fee)
+static CFeeRate EstimateFeeRate(const CWallet& wallet, const CWalletTx& wtx, const CAmount old_fee, CCoinControl& coin_control)
 {
     // Get the fee rate of the original transaction. This is calculated from
     // the tx fee/vsize, so it may have been rounded down. Add 1 satoshi to the
     // result.
-    old_fee = wtx.GetDebit(ISMINE_SPENDABLE) - wtx.tx->GetValueOut();
     int64_t txSize = GetVirtualTransactionSize(*(wtx.tx));
     CFeeRate feerate(old_fee, txSize);
     feerate += CFeeRate(1);
@@ -309,6 +308,8 @@ Result CreateRateBumpTransaction(CWallet& wallet, const uint256& txid, const CCo
         }
     }
 
+    old_fee = wtx.GetDebit(ISMINE_SPENDABLE) - wtx.tx->GetValueOut();
+
     if (coin_control.m_feerate) {
         // The user provided a feeRate argument.
         // We calculate this here to avoid compiler warning on the cs_wallet lock
@@ -319,7 +320,7 @@ Result CreateRateBumpTransaction(CWallet& wallet, const uint256& txid, const CCo
         }
     } else {
         // The user did not provide a feeRate argument
-        new_coin_control.m_feerate = EstimateFeeRate(wallet, wtx, new_coin_control, old_fee);
+        new_coin_control.m_feerate = EstimateFeeRate(wallet, wtx, old_fee, new_coin_control);
     }
 
     // Fill in required inputs we are double-spending(all of them)
diff --git a/test/functional/wallet_bumpfee.py b/test/functional/wallet_bumpfee.py
@@ -101,7 +101,8 @@ def test_simple_bumpfee_succeeds(self, mode, rbf_node, peer_node, dest_address):
     else:
         bumped_tx = rbf_node.bumpfee(rbfid)
     assert_equal(bumped_tx["errors"], [])
-    assert bumped_tx["fee"] - abs(rbftx["fee"]) > 0
+    assert bumped_tx["fee"] > -rbftx["fee"]
+    assert_equal(bumped_tx["origfee"], -rbftx["fee"])
     # check that bumped_tx propagates, original tx was evicted and has a wallet conflict
     self.sync_mempools((rbf_node, peer_node))
     assert bumped_tx["txid"] in rbf_node.getrawmempool()

Original file line number	Diff line number	Diff line change
`@@ -108,12 +108,11 @@ static feebumper::Result CheckFeeRate(const CWallet& wallet, const CWalletTx& wt`
`108`	`108`	`return feebumper::Result::OK;`
`109`	`109`	`}`
`110`	`110`
`111`		`-static CFeeRate EstimateFeeRate(const CWallet& wallet, const CWalletTx& wtx, CCoinControl& coin_control, CAmount& old_fee)`
	`111`	`+static CFeeRate EstimateFeeRate(const CWallet& wallet, const CWalletTx& wtx, const CAmount old_fee, CCoinControl& coin_control)`
`112`	`112`	`{`
`113`	`113`	`// Get the fee rate of the original transaction. This is calculated from`
`114`	`114`	`// the tx fee/vsize, so it may have been rounded down. Add 1 satoshi to the`
`115`	`115`	`// result.`
`116`		`- old_fee = wtx.GetDebit(ISMINE_SPENDABLE) - wtx.tx->GetValueOut();`
`117`	`116`	`int64_t txSize = GetVirtualTransactionSize(*(wtx.tx));`
`118`	`117`	`CFeeRate feerate(old_fee, txSize);`
`119`	`118`	`feerate += CFeeRate(1);`
`@@ -309,6 +308,8 @@ Result CreateRateBumpTransaction(CWallet& wallet, const uint256& txid, const CCo`
`309`	`308`	`}`
`310`	`309`	`}`
`311`	`310`
	`311`	`+ old_fee = wtx.GetDebit(ISMINE_SPENDABLE) - wtx.tx->GetValueOut();`
	`312`	`+`
`312`	`313`	`if (coin_control.m_feerate) {`
`313`	`314`	`// The user provided a feeRate argument.`
`314`	`315`	`// We calculate this here to avoid compiler warning on the cs_wallet lock`
`@@ -319,7 +320,7 @@ Result CreateRateBumpTransaction(CWallet& wallet, const uint256& txid, const CCo`
`319`	`320`	`}`
`320`	`321`	`} else {`
`321`	`322`	`// The user did not provide a feeRate argument`
`322`		`- new_coin_control.m_feerate = EstimateFeeRate(wallet, wtx, new_coin_control, old_fee);`
	`323`	`+ new_coin_control.m_feerate = EstimateFeeRate(wallet, wtx, old_fee, new_coin_control);`
`323`	`324`	`}`
`324`	`325`
`325`	`326`	`// Fill in required inputs we are double-spending(all of them)`