diff options
| author | Russell Yanofsky <russ@yanofsky.org> | 2021-11-12 15:20:53 -0500 |
|---|---|---|
| committer | Russell Yanofsky <russ@yanofsky.org> | 2021-11-12 15:20:53 -0500 |
| commit | 0e0f4fdd892223766db4a83194b6576847b757f7 (patch) | |
| tree | 0fd8793d1fd590aedc2b01c0841dbd2c9d6376f0 /src | |
| parent | c9dd5c8d6e59e27af98e99d2844d6ead8eec3162 (diff) | |
| download | bitcoin-0e0f4fdd892223766db4a83194b6576847b757f7.tar.xz | |
multiprocess: Add interfaces::Node::broadCastTransaction method
This fixes a null pointer crash in the bitcoin-gui PSBT dialog. The
bitcoin-gui interfaces::Node object has a null NodeContext pointer, and
can't broadcast transactions directly. It needs to broadcast
transactions through the bitcoin-node process instead.
Diffstat (limited to 'src')
| -rw-r--r-- | src/interfaces/node.h | 4 | ||||
| -rw-r--r-- | src/node/interfaces.cpp | 4 | ||||
| -rw-r--r-- | src/qt/psbtoperationsdialog.cpp | 4 |
3 files changed, 10 insertions, 2 deletions
diff --git a/src/interfaces/node.h b/src/interfaces/node.h index 34fdde3774..12f2fce22b 100644 --- a/src/interfaces/node.h +++ b/src/interfaces/node.h @@ -31,6 +31,7 @@ class RPCTimerInterface; class UniValue; class proxyType; enum class SynchronizationState; +enum class TransactionError; struct CNodeStateStats; struct NodeContext; struct bilingual_str; @@ -174,6 +175,9 @@ public: //! Get unspent outputs associated with a transaction. virtual bool getUnspentOutput(const COutPoint& output, Coin& coin) = 0; + //! Broadcast transaction. + virtual TransactionError broadcastTransaction(CTransactionRef tx, CAmount max_tx_fee, std::string& err_string) = 0; + //! Get wallet client. virtual WalletClient& walletClient() = 0; diff --git a/src/node/interfaces.cpp b/src/node/interfaces.cpp index 192caf7994..57142e1c73 100644 --- a/src/node/interfaces.cpp +++ b/src/node/interfaces.cpp @@ -261,6 +261,10 @@ public: LOCK(::cs_main); return chainman().ActiveChainstate().CoinsTip().GetCoin(output, coin); } + TransactionError broadcastTransaction(CTransactionRef tx, CAmount max_tx_fee, std::string& err_string) override + { + return BroadcastTransaction(*m_context, std::move(tx), err_string, max_tx_fee, /*relay=*/ true, /*wait_callback=*/ false); + } WalletClient& walletClient() override { return *Assert(m_context->wallet_client); diff --git a/src/qt/psbtoperationsdialog.cpp b/src/qt/psbtoperationsdialog.cpp index 34d56e5506..3e598bfab9 100644 --- a/src/qt/psbtoperationsdialog.cpp +++ b/src/qt/psbtoperationsdialog.cpp @@ -110,8 +110,8 @@ void PSBTOperationsDialog::broadcastTransaction() CTransactionRef tx = MakeTransactionRef(mtx); std::string err_string; - TransactionError error = BroadcastTransaction( - *m_client_model->node().context(), tx, err_string, DEFAULT_MAX_RAW_TX_FEE_RATE.GetFeePerK(), /* relay */ true, /* await_callback */ false); + TransactionError error = + m_client_model->node().broadcastTransaction(tx, DEFAULT_MAX_RAW_TX_FEE_RATE.GetFeePerK(), err_string); if (error == TransactionError::OK) { showStatus(tr("Transaction broadcast successfully! Transaction ID: %1") |