diff --git a/src/interfaces/chain.h b/src/interfaces/chain.h --- a/src/interfaces/chain.h +++ b/src/interfaces/chain.h @@ -208,8 +208,8 @@ //! the fee or for another reason. virtual bool broadcastTransaction(const Config &config, const CTransactionRef &tx, - std::string &err_string, - const Amount &max_tx_fee, bool relay) = 0; + const Amount &max_tx_fee, bool relay, + std::string &err_string) = 0; //! Calculate mempool ancestor and descendant counts for the given //! transaction. diff --git a/src/interfaces/chain.cpp b/src/interfaces/chain.cpp --- a/src/interfaces/chain.cpp +++ b/src/interfaces/chain.cpp @@ -326,9 +326,8 @@ } bool broadcastTransaction(const Config &config, const CTransactionRef &tx, - std::string &err_string, - const Amount &max_tx_fee, - bool relay) override { + const Amount &max_tx_fee, bool relay, + std::string &err_string) override { const TransactionError err = BroadcastTransaction( m_node, config, tx, err_string, max_tx_fee, relay, /*wait_callback*/ false); diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -1937,7 +1937,7 @@ // out-of-order is incorrect - it should be unmarked when // TransactionRemovedFromMempool fires. bool ret = pwallet->chain().broadcastTransaction( - GetConfig(), tx, err_string, pwallet->m_default_max_tx_fee, relay); + GetConfig(), tx, pwallet->m_default_max_tx_fee, relay, err_string); fInMempool |= ret; return ret; }