diff --git a/src/config.h b/src/config.h --- a/src/config.h +++ b/src/config.h @@ -22,9 +22,6 @@ virtual void SetCashAddrEncoding(bool) = 0; virtual bool UseCashAddrEncoding() const = 0; - virtual void SetExcessUTXOCharge(Amount amt) = 0; - virtual Amount GetExcessUTXOCharge() const = 0; - Config() = default; Config(const Config &) = delete; Config &operator=(const Config &) = delete; @@ -39,12 +36,8 @@ void SetCashAddrEncoding(bool) override; bool UseCashAddrEncoding() const override; - void SetExcessUTXOCharge(Amount) override; - Amount GetExcessUTXOCharge() const override; - private: bool useCashAddr; - Amount excessUTXOCharge; /** The largest block size this node will accept. */ uint64_t nMaxBlockSize; @@ -65,9 +58,6 @@ void SetCashAddrEncoding(bool) override {} bool UseCashAddrEncoding() const override { return false; } - void SetExcessUTXOCharge(Amount amt) override {} - Amount GetExcessUTXOCharge() const override { return Amount::zero(); } - private: std::unique_ptr chainParams; }; diff --git a/src/config.cpp b/src/config.cpp --- a/src/config.cpp +++ b/src/config.cpp @@ -55,10 +55,3 @@ chainParams = CreateChainParams(net); } -void GlobalConfig::SetExcessUTXOCharge(Amount fee) { - excessUTXOCharge = fee; -} - -Amount GlobalConfig::GetExcessUTXOCharge() const { - return excessUTXOCharge; -} diff --git a/src/init.cpp b/src/init.cpp --- a/src/init.cpp +++ b/src/init.cpp @@ -1147,15 +1147,6 @@ DEFAULT_WHITELISTFORCERELAY), ArgsManager::ALLOW_ANY, OptionsCategory::NODE_RELAY); - // Not sure this really belongs here, but it will do for now. - // FIXME: This doesn't work anyways. - argsman.AddArg("-excessutxocharge=", - strprintf("Fees (in %s/kB) to charge per utxo created for " - "relaying, and mining (default: %s)", - ticker, FormatMoney(DEFAULT_UTXO_FEE)), - ArgsManager::ALLOW_ANY | ArgsManager::DEBUG_ONLY, - OptionsCategory::NODE_RELAY); - argsman.AddArg("-blockmaxsize=", strprintf("Set maximum block size in bytes (default: %d)", DEFAULT_MAX_GENERATED_BLOCK_SIZE), @@ -1916,19 +1907,6 @@ "peertimeout cannot be configured with a negative value.")); } - // Obtain the amount to charge excess UTXO - if (args.IsArgSet("-excessutxocharge")) { - Amount n = Amount::zero(); - auto parsed = ParseMoney(args.GetArg("-excessutxocharge", ""), n); - if (!parsed || Amount::zero() > n) { - return InitError(AmountErrMsg( - "excessutxocharge", args.GetArg("-excessutxocharge", ""))); - } - config.SetExcessUTXOCharge(n); - } else { - config.SetExcessUTXOCharge(DEFAULT_UTXO_FEE); - } - if (args.IsArgSet("-minrelaytxfee")) { Amount n = Amount::zero(); auto parsed = ParseMoney(args.GetArg("-minrelaytxfee", ""), n); diff --git a/src/rpc/net.cpp b/src/rpc/net.cpp --- a/src/rpc/net.cpp +++ b/src/rpc/net.cpp @@ -757,8 +757,6 @@ }}, {RPCResult::Type::NUM, "relayfee", "minimum relay fee for transactions in " + ticker + "/kB"}, - {RPCResult::Type::NUM, "excessutxocharge", - "minimum charge for excess utxos in " + ticker}, {RPCResult::Type::ARR, "localaddresses", "list of local addresses", @@ -805,7 +803,6 @@ } obj.pushKV("networks", GetNetworksInfo()); obj.pushKV("relayfee", ::minRelayTxFee.GetFeePerK()); - obj.pushKV("excessutxocharge", config.GetExcessUTXOCharge()); UniValue localAddresses(UniValue::VARR); { LOCK(g_maplocalhost_mutex); diff --git a/src/validation.h b/src/validation.h --- a/src/validation.h +++ b/src/validation.h @@ -77,8 +77,6 @@ /** Default for -minrelaytxfee, minimum relay fee for transactions */ static const Amount DEFAULT_MIN_RELAY_TX_FEE_PER_KB(1000 * SATOSHI); -/** Default for -excessutxocharge for transactions transactions */ -static const Amount DEFAULT_UTXO_FEE = Amount::zero(); /** * Default for -mempoolexpiry, expiration time for mempool transactions in * hours.