Skip to content

wallet: allow mintxfee=0 #1333

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/confidential_validation.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,9 @@ bool HasValidFee(const CTransaction& tx) {
CAmount fee = 0;
if (tx.vout[i].IsFee()) {
fee = tx.vout[i].nValue.GetAmount();
if (fee == 0 || !MoneyRange(fee))
if (fee == 0 || !MoneyRange(fee)) {
return false;
}
totalFee[tx.vout[i].nAsset.GetAsset()] += fee;
if (!MoneyRange(totalFee)) {
return false;
Expand Down
14 changes: 8 additions & 6 deletions src/wallet/spend.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1322,11 +1322,14 @@ static bool CreateTransactionInternal(

// Add fee output.
if (g_con_elementsmode) {
CTxOut fee(::policyAsset, 0, CScript());
assert(fee.IsFee());
txNew.vout.push_back(fee);
if (blind_details) {
blind_details->o_pubkeys.push_back(CPubKey());
// only create fee output if non-zero fee
if (coin_selection_params.m_effective_feerate > CFeeRate()) {
CTxOut fee(::policyAsset, 0, CScript());
assert(fee.IsFee());
txNew.vout.push_back(fee);
if (blind_details) {
blind_details->o_pubkeys.push_back(CPubKey());
}
}
}
assert(nChangePosInOut != -1);
Expand Down Expand Up @@ -1448,7 +1451,6 @@ static bool CreateTransactionInternal(
txNew = tx_blinded; // sigh, `fillBlindDetails` may have modified txNew
// Update the change position to the new tx
change_position = txNew.vout.begin() + nChangePosInOut;

int ret = BlindTransaction(blind_details->i_amount_blinds, blind_details->i_asset_blinds, blind_details->i_assets, blind_details->i_amounts, blind_details->o_amount_blinds, blind_details->o_asset_blinds, blind_details->o_pubkeys, issuance_asset_keys, issuance_token_keys, tx_blinded);
assert(ret != -1);
if (ret != blind_details->num_to_blind) {
Expand Down
2 changes: 1 addition & 1 deletion src/wallet/wallet.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3024,7 +3024,7 @@ std::shared_ptr<CWallet> CWallet::Create(WalletContext& context, const std::stri

if (args.IsArgSet("-mintxfee")) {
std::optional<CAmount> min_tx_fee = ParseMoney(args.GetArg("-mintxfee", ""));
if (!min_tx_fee || min_tx_fee.value() == 0) {
if (!min_tx_fee) {
error = AmountErrMsg("mintxfee", args.GetArg("-mintxfee", ""));
return nullptr;
} else if (min_tx_fee.value() > HIGH_TX_FEE_PER_KB) {
Expand Down
1 change: 1 addition & 0 deletions test/functional/test_runner.py
Original file line number Diff line number Diff line change
Expand Up @@ -356,6 +356,7 @@
'feature_coinstatsindex.py --legacy-wallet',
'feature_coinstatsindex.py --descriptors',
'wallet_orphanedreward.py',
'wallet_send_zero_fee.py',
'wallet_timelock.py',
'p2p_node_network_limited.py',
'p2p_permissions.py',
Expand Down
62 changes: 62 additions & 0 deletions test/functional/wallet_send_zero_fee.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
#!/usr/bin/env python3
# Copyright (c) 2017-2020 The Bitcoin Core developers
# Distributed under the MIT software license, see the accompanying
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
from decimal import Decimal

from test_framework.blocktools import COINBASE_MATURITY
from test_framework.test_framework import BitcoinTestFramework
from test_framework.util import (
assert_equal,
)

class WalletTest(BitcoinTestFramework):
def set_test_params(self):
self.setup_clean_chain = True
self.num_nodes = 3
self.extra_args = [[
"-blindedaddresses=1",
"-initialfreecoins=2100000000000000",
"-con_blocksubsidy=0",
"-con_connect_genesis_outputs=1",
"-txindex=1",
"-minrelaytxfee=0",
"-blockmintxfee=0",
"-mintxfee=0",
]] * self.num_nodes
self.extra_args[0].append("-anyonecanspendaremine=1")

def skip_test_if_missing_module(self):
self.skip_if_no_wallet()

def run_test(self):
self.generate(self.nodes[0], COINBASE_MATURITY + 1)
self.sync_all()

new_addr = self.nodes[1].getnewaddress()
self.nodes[0].sendtoaddress(new_addr, 10)
self.nodes[0].sendtoaddress(self.nodes[2].getnewaddress(), 20)
self.generate(self.nodes[0], 1)
assert_equal(self.nodes[0].getblockchaininfo()["blocks"], 102)
assert_equal(self.nodes[0].getbalance(), {'bitcoin': Decimal('20999969.99900900')})
assert_equal(self.nodes[1].getbalance(), {'bitcoin': Decimal('10.00000000')})
assert_equal(self.nodes[2].getbalance(), {'bitcoin': Decimal('20.00000000')})

addr = self.nodes[1].getnewaddress()
txid = self.nodes[0].sendtoaddress(addr, 1, None, None, None, None, None, None, None, None, None, 0, False)
tx = self.nodes[0].gettransaction(txid)
assert_equal(tx["fee"]["bitcoin"], 0)
hex = self.nodes[0].getrawtransaction(txid)
self.generate(self.nodes[0], 1)
assert_equal(self.nodes[0].getblockchaininfo()["blocks"], 103)

decoded = self.nodes[0].decoderawtransaction(hex)
# there should be no fee output
assert_equal(decoded["fee"], {})
assert_equal(len(decoded["vout"]),2)
assert_equal(self.nodes[0].getbalance(), {'bitcoin': Decimal('20999968.99900900')})
assert_equal(self.nodes[1].getbalance(), {'bitcoin': Decimal('11.00000000')})
assert_equal(self.nodes[2].getbalance(), {'bitcoin': Decimal('20.00000000')})

if __name__ == '__main__':
WalletTest().main()