diff --git a/src/init.cpp b/src/init.cpp --- a/src/init.cpp +++ b/src/init.cpp @@ -766,7 +766,7 @@ strprintf( _("Fees (in %s/kB) smaller than this are considered zero fee for " "relaying, mining and transaction creation (default: %s)"), - CURRENCY_UNIT, FormatMoney(DEFAULT_MIN_RELAY_TX_FEE))); + CURRENCY_UNIT, FormatMoney(DEFAULT_MIN_RELAY_TX_FEE_PER_KB))); strUsage += HelpMessageOpt( "-maxtxfee=", strprintf(_("Maximum total fees (in %s) to use in a single wallet " @@ -837,7 +837,7 @@ "-blockmintxfee=", strprintf(_("Set lowest fee rate (in %s/kB) for transactions to be " "included in block creation. (default: %s)"), - CURRENCY_UNIT, FormatMoney(DEFAULT_BLOCK_MIN_TX_FEE))); + CURRENCY_UNIT, FormatMoney(DEFAULT_BLOCK_MIN_TX_FEE_PER_KB))); if (showDebug) { strUsage += HelpMessageOpt("-blockversion=", @@ -1564,7 +1564,7 @@ // High fee check is done afterward in CWallet::ParameterInteraction() config.SetMinFeePerKB(CFeeRate(n)); } else { - config.SetMinFeePerKB(CFeeRate(DEFAULT_MIN_RELAY_TX_FEE)); + config.SetMinFeePerKB(CFeeRate(DEFAULT_MIN_RELAY_TX_FEE_PER_KB)); } // Sanity check argument for min fee for including tx in block diff --git a/src/miner.cpp b/src/miner.cpp --- a/src/miner.cpp +++ b/src/miner.cpp @@ -97,7 +97,7 @@ ParseMoney(gArgs.GetArg("-blockmintxfee", ""), n); blockMinFeeRate = CFeeRate(n); } else { - blockMinFeeRate = CFeeRate(DEFAULT_BLOCK_MIN_TX_FEE); + blockMinFeeRate = CFeeRate(DEFAULT_BLOCK_MIN_TX_FEE_PER_KB); } LOCK(cs_main); diff --git a/src/net_processing.cpp b/src/net_processing.cpp --- a/src/net_processing.cpp +++ b/src/net_processing.cpp @@ -3759,7 +3759,7 @@ int64_t timeNow = GetTimeMicros(); if (timeNow > pto->nextSendTimeFeeFilter) { static CFeeRate default_feerate = - CFeeRate(DEFAULT_MIN_RELAY_TX_FEE); + CFeeRate(DEFAULT_MIN_RELAY_TX_FEE_PER_KB); static FeeFilterRounder filterRounder(default_feerate); Amount filterToSend = filterRounder.round(currentFilter); // If we don't allow free transactions, then we always have a fee diff --git a/src/policy/policy.h b/src/policy/policy.h --- a/src/policy/policy.h +++ b/src/policy/policy.h @@ -28,7 +28,7 @@ * Default for -blockmintxfee, which sets the minimum feerate for a transaction * in blocks created by mining code. */ -static const Amount DEFAULT_BLOCK_MIN_TX_FEE(1000); +static const Amount DEFAULT_BLOCK_MIN_TX_FEE_PER_KB(100); /** * The maximum size for transactions we're willing to relay/mine. */ diff --git a/src/primitives/transaction.cpp b/src/primitives/transaction.cpp --- a/src/primitives/transaction.cpp +++ b/src/primitives/transaction.cpp @@ -114,7 +114,7 @@ // are created. We want to change in advance of spending them to // incentivize keeping your UTXO set reasonbly sized. int64_t modSize = - int64_t(nTxSize) + (int64_t(outputs) - int64_t(inputs)) * 179; + int64_t(nTxSize) + (int64_t(outputs) - int64_t(inputs)) * 1790; // Note: It is impossible to generate a negative number above in any real // world situation. This is because the inputs have a least 179 byte diff --git a/src/test/miner_tests.cpp b/src/test/miner_tests.cpp --- a/src/test/miner_tests.cpp +++ b/src/test/miner_tests.cpp @@ -27,7 +27,7 @@ BOOST_FIXTURE_TEST_SUITE(miner_tests, TestingSetup) -static CFeeRate blockMinFeeRate = CFeeRate(DEFAULT_BLOCK_MIN_TX_FEE); +static CFeeRate blockMinFeeRate = CFeeRate(DEFAULT_BLOCK_MIN_TX_FEE_PER_KB); static struct { uint8_t extranonce; diff --git a/src/validation.h b/src/validation.h --- a/src/validation.h +++ b/src/validation.h @@ -56,7 +56,7 @@ /** Default for DEFAULT_WHITELISTFORCERELAY. */ static const bool DEFAULT_WHITELISTFORCERELAY = true; /** Default for -minrelaytxfee, minimum relay fee for transactions */ -static const Amount DEFAULT_MIN_RELAY_TX_FEE(1000); +static const Amount DEFAULT_MIN_RELAY_TX_FEE_PER_KB(100); /** Default for -excessutxocharge for transactions transactions */ static const Amount DEFAULT_UTXO_FEE(0); //! -maxtxfee default diff --git a/test/functional/test_framework/mininode.py b/test/functional/test_framework/mininode.py --- a/test/functional/test_framework/mininode.py +++ b/test/functional/test_framework/mininode.py @@ -412,7 +412,7 @@ for vout in self.vout: # Include the sizes for the outputs. tx_size += len(ToHex(vout))//2 - tx_size += (len(self.vout) - len(self.vin))*179 + tx_size += (len(self.vout) - len(self.vin))*1790 return max(tx_size, 10 + 34 * len(self.vout)) def serialize(self):