diff --git a/src/config.h b/src/config.h --- a/src/config.h +++ b/src/config.h @@ -26,9 +26,6 @@ virtual void SetCashAddrEncoding(bool) = 0; virtual bool UseCashAddrEncoding() const = 0; - virtual void SetExcessUTXOCharge(Amount amt) = 0; - virtual Amount GetExcessUTXOCharge() const = 0; - virtual void SetMinFeePerKB(CFeeRate amt) = 0; virtual CFeeRate GetMinFeePerKB() const = 0; }; @@ -44,15 +41,11 @@ void SetCashAddrEncoding(bool) override; bool UseCashAddrEncoding() const override; - void SetExcessUTXOCharge(Amount) override; - Amount GetExcessUTXOCharge() const override; - void SetMinFeePerKB(CFeeRate amt) override; CFeeRate GetMinFeePerKB() const override; private: bool useCashAddr; - Amount excessUTXOCharge; CFeeRate feePerKB; }; @@ -67,15 +60,11 @@ return false; } uint8_t GetBlockPriorityPercentage() const override { return 0; } - void SetChainParams(std::string net); const CChainParams &GetChainParams() const override { return *chainParams; } - void SetCashAddrEncoding(bool) override {} bool UseCashAddrEncoding() const override { return false; } - void SetExcessUTXOCharge(Amount amt) override {} - Amount GetExcessUTXOCharge() const override { return Amount(0); } void SetMinFeePerKB(CFeeRate amt) override{}; CFeeRate GetMinFeePerKB() const override { return CFeeRate(Amount(0)); } diff --git a/src/config.cpp b/src/config.cpp --- a/src/config.cpp +++ b/src/config.cpp @@ -64,14 +64,6 @@ chainParams = CreateChainParams(net); } -void GlobalConfig::SetExcessUTXOCharge(Amount fee) { - excessUTXOCharge = fee; -} - -Amount GlobalConfig::GetExcessUTXOCharge() const { - return excessUTXOCharge; -} - void GlobalConfig::SetMinFeePerKB(CFeeRate fee) { feePerKB = fee; } diff --git a/src/init.cpp b/src/init.cpp --- a/src/init.cpp +++ b/src/init.cpp @@ -759,11 +759,6 @@ "block download (default: %u)", DEFAULT_MAX_TIP_AGE)); } - strUsage += HelpMessageOpt( - "-excessutxocharge=", - strprintf(_("Fees (in %s/kB) to charge per utxo created for" - "relaying, and mining (default: %s)"), - CURRENCY_UNIT, FormatMoney(DEFAULT_UTXO_FEE))); strUsage += HelpMessageOpt( "-minrelaytxfee=", strprintf( @@ -1542,18 +1537,6 @@ nConnectTimeout = gArgs.GetArg("-timeout", DEFAULT_CONNECT_TIMEOUT); if (nConnectTimeout <= 0) nConnectTimeout = DEFAULT_CONNECT_TIMEOUT; - // Obtain the amount to charge excess UTXO - if (gArgs.IsArgSet("-excessutxocharge")) { - Amount n(0); - auto parsed = ParseMoney(gArgs.GetArg("-excessutxocharge", ""), n); - if (!parsed || Amount(0) > n) - return InitError(AmountErrMsg( - "excessutxocharge", gArgs.GetArg("-excessutxocharge", ""))); - config.SetExcessUTXOCharge(n); - } else { - config.SetExcessUTXOCharge(DEFAULT_UTXO_FEE); - } - // Fee-per-kilobyte amount considered the same as "free". If you are mining, // be careful setting this: if you set it to zero then a transaction spammer // can cheaply fill blocks using 1-satoshi-fee transactions. It should be diff --git a/src/rpc/net.cpp b/src/rpc/net.cpp --- a/src/rpc/net.cpp +++ b/src/rpc/net.cpp @@ -522,11 +522,7 @@ " ],\n" " \"relayfee\": x.xxxxxxxx, (numeric) minimum " "relay fee for non-free transactions in " + - CURRENCY_UNIT + - "/kB\n" - " \"excessutxocharge\": x.xxxxxxxx, (numeric) minimum " - "charge for excess utxos in " + - CURRENCY_UNIT + "\n" + CURRENCY_UNIT + "/kB\n" " \"localaddresses\": [ " "(array) list of local addresses\n" " {\n" @@ -565,8 +561,6 @@ obj.push_back(Pair("networks", GetNetworksInfo())); obj.push_back(Pair("relayfee", ValueFromAmount(config.GetMinFeePerKB().GetFeePerK()))); - obj.push_back(Pair("excessutxocharge", - ValueFromAmount(config.GetExcessUTXOCharge()))); UniValue localAddresses(UniValue::VARR); { LOCK(cs_mapLocalHost); diff --git a/src/validation.h b/src/validation.h --- a/src/validation.h +++ b/src/validation.h @@ -57,8 +57,6 @@ static const bool DEFAULT_WHITELISTFORCERELAY = true; /** Default for -minrelaytxfee, minimum relay fee for transactions */ static const Amount DEFAULT_MIN_RELAY_TX_FEE(1000); -/** Default for -excessutxocharge for transactions transactions */ -static const Amount DEFAULT_UTXO_FEE(0); //! -maxtxfee default static const Amount DEFAULT_TRANSACTION_MAXFEE(COIN / 10); //! Discourage users to set fees higher than this amount (in satoshis) per kB