0.18: wallet: Fix -maxtxfee check by moving it to CWallet::CreateTransaction

promag · promag · commit a11dbaa547ec · 2019-08-25T02:51:07.000+01:00
Github-Pull: bitcoin#16322 Rebased-From: 5c1b971
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -2690,11 +2690,6 @@ bool CWallet::FundTransaction(CMutableTransaction& tx, CAmount& nFeeRet, int& nC
         }
     }
 
-    if (nFeeRet > maxTxFee) {
-        strFailReason = _("Fee exceeds maximum configured by -maxtxfee");
-        return false;
-    }
-
     return true;
 }
 
@@ -3131,6 +3126,11 @@ bool CWallet::CreateTransaction(interfaces::Chain::Lock& locked_chain, const std
         }
     }
 
+    if (nFeeRet > maxTxFee) {
+        strFailReason = _("Fee exceeds maximum configured by -maxtxfee");
+        return false;
+    }
+
     if (gArgs.GetBoolArg("-walletrejectlongchains", DEFAULT_WALLET_REJECT_LONG_CHAINS)) {
         // Lastly, ensure this tx will pass the mempool's chain limits
         LockPoints lp;
diff --git a/test/functional/rpc_psbt.py b/test/functional/rpc_psbt.py
@@ -134,7 +134,7 @@ def run_test(self):
         assert_greater_than(0.06, res["fee"])
 
         # feeRate of 10 BTC / KB produces a total fee well above -maxtxfee
-        # previously this was silenty capped at -maxtxfee
+        # previously this was silently capped at -maxtxfee
         assert_raises_rpc_error(-4, "Fee exceeds maximum configured by -maxtxfee", self.nodes[1].walletcreatefundedpsbt, [{"txid":txid,"vout":p2wpkh_pos},{"txid":txid,"vout":p2sh_p2wpkh_pos},{"txid":txid,"vout":p2pkh_pos}], {self.nodes[1].getnewaddress():29.99}, 0, {"feeRate": 10})
 
         # partially sign multisig things with node 1
diff --git a/test/functional/wallet_bumpfee.py b/test/functional/wallet_bumpfee.py
@@ -73,6 +73,7 @@ def run_test(self):
         test_unconfirmed_not_spendable(rbf_node, rbf_node_address)
         test_bumpfee_metadata(rbf_node, dest_address)
         test_locked_wallet_fails(rbf_node, dest_address)
+        test_maxtxfee_fails(self, rbf_node, dest_address)
         self.log.info("Success")
 
 
@@ -204,6 +205,15 @@ def test_settxfee(rbf_node, dest_address):
     rbf_node.settxfee(Decimal("0.00000000"))  # unset paytxfee
 
 
+def test_maxtxfee_fails(test, rbf_node, dest_address):
+    test.restart_node(1, ['-maxtxfee=0.00003'] + test.extra_args[1])
+    rbf_node.walletpassphrase(WALLET_PASSPHRASE, WALLET_PASSPHRASE_TIMEOUT)
+    rbfid = spend_one_input(rbf_node, dest_address)
+    assert_raises_rpc_error(-4, "Specified or calculated fee 0.0000332 is too high (cannot be higher than maxTxFee 0.00003)", rbf_node.bumpfee, rbfid)
+    test.restart_node(1, test.extra_args[1])
+    rbf_node.walletpassphrase(WALLET_PASSPHRASE, WALLET_PASSPHRASE_TIMEOUT)
+
+
 def test_rebumping(rbf_node, dest_address):
     # check that re-bumping the original tx fails, but bumping the bumper succeeds
     rbfid = spend_one_input(rbf_node, dest_address)

Original file line number	Diff line number	Diff line change
`@@ -2690,11 +2690,6 @@ bool CWallet::FundTransaction(CMutableTransaction& tx, CAmount& nFeeRet, int& nC`
`2690`	`2690`	`}`
`2691`	`2691`	`}`
`2692`	`2692`
`2693`		`- if (nFeeRet > maxTxFee) {`
`2694`		`- strFailReason = _("Fee exceeds maximum configured by -maxtxfee");`
`2695`		`- return false;`
`2696`		`- }`
`2697`		`-`
`2698`	`2693`	`return true;`
`2699`	`2694`	`}`
`2700`	`2695`
`@@ -3131,6 +3126,11 @@ bool CWallet::CreateTransaction(interfaces::Chain::Lock& locked_chain, const std`
`3131`	`3126`	`}`
`3132`	`3127`	`}`
`3133`	`3128`
	`3129`	`+ if (nFeeRet > maxTxFee) {`
	`3130`	`+ strFailReason = _("Fee exceeds maximum configured by -maxtxfee");`
	`3131`	`+ return false;`
	`3132`	`+ }`
	`3133`	`+`
`3134`	`3134`	`if (gArgs.GetBoolArg("-walletrejectlongchains", DEFAULT_WALLET_REJECT_LONG_CHAINS)) {`
`3135`	`3135`	`// Lastly, ensure this tx will pass the mempool's chain limits`
`3136`	`3136`	`LockPoints lp;`