diff options
| author | Matt Corallo <git@bluematt.me> | 2017-08-05 13:48:37 -0400 |
|---|---|---|
| committer | Matt Corallo <git@bluematt.me> | 2017-08-06 21:40:56 -0400 |
| commit | 01699fb283485918478017331872c75817b81bdb (patch) | |
| tree | 60801a38d7872abaca38bd6a73288292ae0f9c77 /src/wallet/wallet.h | |
| parent | a9dd11144152bf40fa797cc0b0c8857c03d3ad6a (diff) | |
| download | bitcoin-01699fb283485918478017331872c75817b81bdb.tar.xz | |
Fix resendwallettransactions assert failure if -walletbroadcast=0
Diffstat (limited to 'src/wallet/wallet.h')
| -rw-r--r-- | src/wallet/wallet.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h index 7ef2e6f1d8..3a02d1305d 100644 --- a/src/wallet/wallet.h +++ b/src/wallet/wallet.h @@ -470,6 +470,7 @@ public: int64_t GetTxTime() const; int GetRequestCount() const; + // RelayWalletTransaction may only be called if fBroadcastTransactions! bool RelayWalletTransaction(CConnman* connman); std::set<uint256> GetConflicts() const; @@ -937,6 +938,7 @@ public: CBlockIndex* ScanForWalletTransactions(CBlockIndex* pindexStart, bool fUpdate = false); void ReacceptWalletTransactions(); void ResendWalletTransactions(int64_t nBestBlockTime, CConnman* connman) override; + // ResendWalletTransactionsBefore may only be called if fBroadcastTransactions! std::vector<uint256> ResendWalletTransactionsBefore(int64_t nTime, CConnman* connman); CAmount GetBalance() const; CAmount GetUnconfirmedBalance() const; |