mirror/bitcoin
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge bitcoin/bitcoin#26302: refactor: Use type-safe time point for CWallet::m_next_resend

Browse Source 
fa51cc9651 refactor: Use type-safe time point for CWallet::m_next_resend (MacroFake)

Pull request description:

  `GetTime` is not type-safe, thus deprecated, see https://github.com/bitcoin/bitcoin/blob/75cbbfa279685f70d9f6fa71432df00862ffa865/src/util/time.h#L62-L70

ACKs for top commit:
  shaavan:
    Code Review ACK fa51cc9651
  aureleoules:
    ACK fa51cc9651

Tree-SHA512: 030de10070518580763ea75079442e2f934c54d3083be3ebe35e7f1bc6db2096745bb46d95aa1e6efe29ced30a048acfe5cd999178e6787b7647dfbec5ecb444
This commit is contained in:
fanquake committed 2022-10-24 10:11:13 +08:00
2 parents 6d40484684 fa51cc9651
commit 50cc8ef5a7
2 files changed
+5 -4
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/wallet/wallet.cpp
+2 -2
View File
@@ -1916,12 +1916,12 @@ bool CWallet::ShouldResend() const
// Do this infrequently and randomly to avoid giving away // Do this infrequently and randomly to avoid giving away
// that these are our transactions. // that these are our transactions.
if (GetTime() < m_next_resend) return false; if (NodeClock::now() < m_next_resend) return false;
return true; return true;
} }
int64_t CWallet::GetDefaultNextResend() { return GetTime() + (12 * 60 * 60) + GetRand(24 * 60 * 60); } NodeClock::time_point CWallet::GetDefaultNextResend() { return FastRandomContext{}.rand_uniform_delay(NodeClock::now() + 12h, 24h); }
// Resubmit transactions from the wallet to the mempool, optionally asking the // Resubmit transactions from the wallet to the mempool, optionally asking the
// mempool to relay them. On startup, we will do this for all unconfirmed // mempool to relay them. On startup, we will do this for all unconfirmed
src/wallet/wallet.h
+3 -2
View File
@@ -20,6 +20,7 @@
#include <util/strencodings.h> #include <util/strencodings.h>
#include <util/string.h> #include <util/string.h>
#include <util/system.h> #include <util/system.h>
#include <util/time.h>
#include <util/ui_change_type.h> #include <util/ui_change_type.h>
#include <validationinterface.h> #include <validationinterface.h>
#include <wallet/crypter.h> #include <wallet/crypter.h>
@@ -250,7 +251,7 @@ private:
int nWalletVersion GUARDED_BY(cs_wallet){FEATURE_BASE}; int nWalletVersion GUARDED_BY(cs_wallet){FEATURE_BASE};
/** The next scheduled rebroadcast of wallet transactions. */ /** The next scheduled rebroadcast of wallet transactions. */
int64_t m_next_resend{GetDefaultNextResend()}; NodeClock::time_point m_next_resend{GetDefaultNextResend()};
/** Whether this wallet will submit newly created transactions to the node's mempool and /** Whether this wallet will submit newly created transactions to the node's mempool and
* prompt rebroadcasts (see ResendWalletTransactions()). */ * prompt rebroadcasts (see ResendWalletTransactions()). */
bool fBroadcastTransactions = false; bool fBroadcastTransactions = false;
@@ -348,7 +349,7 @@ private:
*/ */
static bool AttachChain(const std::shared_ptr<CWallet>& wallet, interfaces::Chain& chain, const bool rescan_required, bilingual_str& error, std::vector<bilingual_str>& warnings); static bool AttachChain(const std::shared_ptr<CWallet>& wallet, interfaces::Chain& chain, const bool rescan_required, bilingual_str& error, std::vector<bilingual_str>& warnings);
static int64_t GetDefaultNextResend(); static NodeClock::time_point GetDefaultNextResend();
public: public:
/** /**