diff options
| author | Antoine Riard <ariard@student.42.fr> | 2019-04-11 15:58:53 +0000 |
|---|---|---|
| committer | Antoine Riard <ariard@student.42.fr> | 2019-08-01 13:43:29 -0400 |
| commit | 611291c198eb2be9bf1aea1bf9b2187b18bdb3aa (patch) | |
| tree | e6038506c0e541ea5538375cbc8aec80fc21b43a /src/wallet/wallet.h | |
| parent | 8c8aa19b4b4fa56cd359092ef099bcfc7b26c334 (diff) | |
Introduce CWalletTx::SubmitMemoryPoolAndRelay
Higher wallet-tx method combining RelayWalletTransactions and
AcceptToMemoryPool, using new Chain::broadcastTransaction
Diffstat (limited to 'src/wallet/wallet.h')
| -rw-r--r-- | src/wallet/wallet.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h index 86c2cf851c..167096d472 100644 --- a/src/wallet/wallet.h +++ b/src/wallet/wallet.h @@ -579,11 +579,8 @@ public: int64_t GetTxTime() const; - // Pass this transaction to the node to relay to its peers - bool RelayWalletTransaction(interfaces::Chain::Lock& locked_chain); - - /** Pass this transaction to the mempool. Fails if absolute fee exceeds absurd fee. */ - bool AcceptToMemoryPool(interfaces::Chain::Lock& locked_chain, CValidationState& state); + // Pass this transaction to node for mempool insertion and relay to peers if flag set to true + bool SubmitMemoryPoolAndRelay(std::string& err_string, bool relay, interfaces::Chain::Lock& locked_chain); // TODO: Remove "NO_THREAD_SAFETY_ANALYSIS" and replace it with the correct // annotation "EXCLUSIVE_LOCKS_REQUIRED(pwallet->cs_wallet)". The annotation |