From 4538d6bfd1bddcfb741f04dbcd61a4eb41162e8f Mon Sep 17 00:00:00 2001 From: Gregory Sanders Date: Tue, 30 Jul 2019 16:32:32 -0400 Subject: [PATCH] rpc_fundrawtransaction gets stuck due to feefilter and wallet/mempool disagreement --- src/policy/policy.h | 4 ++-- src/validation.h | 2 +- src/wallet/wallet.h | 4 ++-- test/functional/rpc_fundrawtransaction.py | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/policy/policy.h b/src/policy/policy.h index ebe040f0ea7cf..0db5a5416ef81 100644 --- a/src/policy/policy.h +++ b/src/policy/policy.h @@ -19,7 +19,7 @@ class CTxOut; /** Default for -blockmaxweight, which controls the range of block weights the mining code will create **/ static const unsigned int DEFAULT_BLOCK_MAX_WEIGHT = MAX_BLOCK_WEIGHT - 4000; /** Default for -blockmintxfee, which sets the minimum feerate for a transaction in blocks created by mining code **/ -static const unsigned int DEFAULT_BLOCK_MIN_TX_FEE = 1000; +static const unsigned int DEFAULT_BLOCK_MIN_TX_FEE = 100; /** The maximum weight for transactions we're willing to relay/mine */ static const unsigned int MAX_STANDARD_TX_WEIGHT = 400000; /** The minimum non-witness size for transactions we're willing to relay/mine (1 segwit input + 1 P2WPKH output = 82 bytes) */ @@ -31,7 +31,7 @@ static const unsigned int MAX_STANDARD_TX_SIGOPS_COST = MAX_BLOCK_SIGOPS_COST/5; /** Default for -maxmempool, maximum megabytes of mempool memory usage */ static const unsigned int DEFAULT_MAX_MEMPOOL_SIZE = 300; /** Default for -incrementalrelayfee, which sets the minimum feerate increase for mempool limiting or BIP 125 replacement **/ -static const unsigned int DEFAULT_INCREMENTAL_RELAY_FEE = 1000; +static const unsigned int DEFAULT_INCREMENTAL_RELAY_FEE = 100; /** Default for -bytespersigop */ static const unsigned int DEFAULT_BYTES_PER_SIGOP = 20; /** Default for -permitbaremultisig */ diff --git a/src/validation.h b/src/validation.h index d747fdbf27c6c..a16922da99e9c 100644 --- a/src/validation.h +++ b/src/validation.h @@ -55,7 +55,7 @@ static const bool DEFAULT_WHITELISTRELAY = true; /** Default for -whitelistforcerelay. */ static const bool DEFAULT_WHITELISTFORCERELAY = false; /** Default for -minrelaytxfee, minimum relay fee for transactions */ -static const unsigned int DEFAULT_MIN_RELAY_TX_FEE = 1000; +static const unsigned int DEFAULT_MIN_RELAY_TX_FEE = 100; /** Default for -limitancestorcount, max number of in-mempool ancestors */ static const unsigned int DEFAULT_ANCESTOR_LIMIT = 25; /** Default for -limitancestorsize, maximum kilobytes of tx + all in-mempool ancestors */ diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h index 6a7097bf44c98..d38a43870ddd0 100644 --- a/src/wallet/wallet.h +++ b/src/wallet/wallet.h @@ -68,9 +68,9 @@ static const CAmount DEFAULT_FALLBACK_FEE = 20000; //! -discardfee default static const CAmount DEFAULT_DISCARD_FEE = 10000; //! -mintxfee default -static const CAmount DEFAULT_TRANSACTION_MINFEE = 1000; +static const CAmount DEFAULT_TRANSACTION_MINFEE = 100; //! minimum recommended increment for BIP 125 replacement txs -static const CAmount WALLET_INCREMENTAL_RELAY_FEE = 5000; +static const CAmount WALLET_INCREMENTAL_RELAY_FEE = 1000; //! Default for -spendzeroconfchange static const bool DEFAULT_SPEND_ZEROCONF_CHANGE = true; //! Default for -walletrejectlongchains diff --git a/test/functional/rpc_fundrawtransaction.py b/test/functional/rpc_fundrawtransaction.py index cdf636e200c8d..b0e8e05eafa60 100755 --- a/test/functional/rpc_fundrawtransaction.py +++ b/test/functional/rpc_fundrawtransaction.py @@ -53,7 +53,7 @@ def run_test(self): # than a minimum sized signature. # = 2 bytes * minRelayTxFeePerByte - feeTolerance = 2 * min_relay_tx_fee/1000 + feeTolerance = 2 * min_relay_tx_fee/100 self.nodes[2].generate(1) self.sync_all()