diff --git a/src/node/transaction.h b/src/node/transaction.h index 098429597..2f88e716a 100644 --- a/src/node/transaction.h +++ b/src/node/transaction.h @@ -1,41 +1,51 @@ // Copyright (c) 2017-2019 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. #ifndef BITCOIN_NODE_TRANSACTION_H #define BITCOIN_NODE_TRANSACTION_H #include +#include #include #include class Config; struct NodeContext; struct TxId; +/** + * Maximum fee rate for sendrawtransaction and testmempoolaccept RPC calls. + * Also used by the GUI when broadcasting a completed PSBT. + * By default, a transaction with a fee rate higher than this will be rejected + * by these RPCs and the GUI. This can be overridden with the maxfeerate + * argument. + */ +static const CFeeRate DEFAULT_MAX_RAW_TX_FEE_RATE{COIN / 10}; + /** * Submit a transaction to the mempool and (optionally) relay it to all P2P * peers. * * Mempool submission can be synchronous (will await mempool entry notification * over the CValidationInterface) or asynchronous (will submit and not wait for * notification), depending on the value of wait_callback. wait_callback MUST * NOT be set while cs_main, cs_mempool or cs_wallet are held to avoid * deadlock. * * @param[in] node reference to node context * @param[in] tx the transaction to broadcast * @param[out] &err_string reference to std::string to fill with error string * if available * @param[in] max_tx_fee reject txs with fees higher than this (if 0, accept * any fee) * @param[in] relay flag if both mempool insertion and p2p relay are requested * @param[in] wait_callback, wait until callbacks have been processed to avoid * stale result due to a sequentially RPC. * @return error */ NODISCARD TransactionError BroadcastTransaction( NodeContext &node, const Config &config, CTransactionRef tx, std::string &err_string, Amount max_tx_fee, bool relay, bool wait_callback); #endif // BITCOIN_NODE_TRANSACTION_H diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp index 410c2c1f8..1e921ac9a 100644 --- a/src/rpc/rawtransaction.cpp +++ b/src/rpc/rawtransaction.cpp @@ -1,2027 +1,2020 @@ // Copyright (c) 2010 Satoshi Nakamoto // Copyright (c) 2009-2016 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include