Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- commit 5e207b0d9bda615dfc573e6a8988abcc7159e5ce
- Author: Vadique Myself <vadiquemyself@gmail.com>
- Date: Sun Sep 22 14:40:26 2019 +0300
- no forced transaction fees
- diff --git a/src/validation.cpp b/src/validation.cpp
- index 5b27b9ec5..13ac60059 100644
- --- a/src/validation.cpp
- +++ b/src/validation.cpp
- @@ -783,7 +783,6 @@ bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState& state, const C
- dFreeCount *= pow(1.0 - 1.0/600.0, (double)(nNow - nLastTime));
- nLastTime = nNow;
- // -limitfreerelay unit is thousand-bytes-per-minute
- - // At default rate it would take over a month to fill 1GB
- if (dFreeCount + nSize >= GetArg("-limitfreerelay", DEFAULT_LIMITFREERELAY) * 10 * 1000)
- return state.DoS(0, false, REJECT_INSUFFICIENTFEE, "rate limited free transaction");
- LogPrint("mempool", "Rate limit dFreeCount: %g => %g\n", dFreeCount, dFreeCount+nSize);
- diff --git a/src/validation.h b/src/validation.h
- index de986e972..fd8750e41 100644
- --- a/src/validation.h
- +++ b/src/validation.h
- @@ -124,7 +124,7 @@ static const int64_t BLOCK_DOWNLOAD_TIMEOUT_BASE = 1000000;
- /** Additional block download timeout per parallel downloading peer (i.e. 5 min) */
- static const int64_t BLOCK_DOWNLOAD_TIMEOUT_PER_PEER = 500000;
- -static const unsigned int DEFAULT_LIMITFREERELAY = 0;
- +static const unsigned int DEFAULT_LIMITFREERELAY = 128;
- static const bool DEFAULT_RELAYPRIORITY = true;
- static const int64_t DEFAULT_MAX_TIP_AGE = 24 * 60 * 60;
- /** Maximum age of our tip in seconds for us to be considered current for fee estimation */
- diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
- index 504852d68..8cb097208 100644
- --- a/src/wallet/wallet.cpp
- +++ b/src/wallet/wallet.cpp
- @@ -47,7 +47,7 @@ const char * DEFAULT_WALLET_DAT = "wallet.dat";
- const uint32_t BIP32_HARDENED_KEY_LIMIT = 0x80000000;
- /**
- - * Fees smaller than this (in satoshi) are considered zero fee (for transaction creation)
- + * Fees smaller than this are considered zero fee (for transaction creation)
- * Override with -mintxfee
- */
- CFeeRate CWallet::minTxFee = CFeeRate(DEFAULT_TRANSACTION_MINFEE);
- @@ -3877,8 +3877,8 @@ bool CWallet::ParameterInteraction()
- fSendFreeTransactions = GetBoolArg("-sendfreetransactions", DEFAULT_SEND_FREE_TRANSACTIONS);
- fWalletRbf = GetBoolArg("-walletrbf", DEFAULT_WALLET_RBF);
- - if (fSendFreeTransactions && GetArg("-limitfreerelay", DEFAULT_LIMITFREERELAY) <= 0)
- - return InitError("Creation of free transactions with their relay disabled is not supported.");
- + ///if (fSendFreeTransactions && GetArg("-limitfreerelay", DEFAULT_LIMITFREERELAY) <= 0)
- + ///return InitError("Creation of free transactions with their relay disabled is not supported.");
- return true;
- }
- diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
- index 5f77a31ea..1f8a85ebd 100644
- --- a/src/wallet/wallet.h
- +++ b/src/wallet/wallet.h
- @@ -47,11 +47,11 @@ static const unsigned int DEFAULT_KEYPOOL_SIZE = 100;
- //! -paytxfee default
- static const CAmount DEFAULT_TRANSACTION_FEE = 0;
- //! -fallbackfee default
- -static const CAmount DEFAULT_FALLBACK_FEE = COIN;
- +static const CAmount DEFAULT_FALLBACK_FEE = 0;
- //! -mintxfee default
- -static const CAmount DEFAULT_TRANSACTION_MINFEE = COIN;
- +static const CAmount DEFAULT_TRANSACTION_MINFEE = 0;
- //! minimum recommended increment for BIP 125 replacement txs
- -static const CAmount WALLET_INCREMENTAL_RELAY_FEE = COIN * 5;
- +static const CAmount WALLET_INCREMENTAL_RELAY_FEE = COIN * 2;
- //! target minimum change amount
- static const CAmount MIN_CHANGE = CENT;
- //! final minimum change amount after paying for fees
- @@ -59,7 +59,7 @@ static const CAmount MIN_FINAL_CHANGE = MIN_CHANGE/2;
- //! Default for -spendzeroconfchange
- static const bool DEFAULT_SPEND_ZEROCONF_CHANGE = true;
- //! Default for -sendfreetransactions
- -static const bool DEFAULT_SEND_FREE_TRANSACTIONS = false;
- +static const bool DEFAULT_SEND_FREE_TRANSACTIONS = true;
- //! Default for -walletrejectlongchains
- static const bool DEFAULT_WALLET_REJECT_LONG_CHAINS = false;
- //! -txconfirmtarget default
- @@ -67,7 +67,7 @@ static const unsigned int DEFAULT_TX_CONFIRM_TARGET = 6;
- //! -walletrbf default
- static const bool DEFAULT_WALLET_RBF = false;
- //! Largest (in bytes) free transaction we're willing to create
- -static const unsigned int MAX_FREE_TRANSACTION_CREATE_SIZE = 0;
- +static const unsigned int MAX_FREE_TRANSACTION_CREATE_SIZE = 223556;
- static const bool DEFAULT_WALLETBROADCAST = true;
- static const bool DEFAULT_DISABLE_WALLET = false;
- //! if set, all keys will be derived by using BIP32
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement