mirror of
https://github.com/ElementsProject/elements.git
synced 2026-08-14 12:43:40 +02:00
Merge 0b768746ef into merged_master (Bitcoin PR bitcoin/bitcoin#28170)
This commit is contained in:
commit
b5859dc083
11 changed files with 162 additions and 63 deletions
|
|
@ -9,8 +9,6 @@
|
|||
|
||||
#include <atomic>
|
||||
|
||||
static std::atomic<bool> g_initial_block_download_completed(false);
|
||||
|
||||
namespace NetMsgType {
|
||||
const char* VERSION = "version";
|
||||
const char* VERACK = "verack";
|
||||
|
|
@ -125,18 +123,6 @@ bool CMessageHeader::IsCommandValid() const
|
|||
return true;
|
||||
}
|
||||
|
||||
|
||||
ServiceFlags GetDesirableServiceFlags(ServiceFlags services) {
|
||||
if ((services & NODE_NETWORK_LIMITED) && g_initial_block_download_completed) {
|
||||
return ServiceFlags(NODE_NETWORK_LIMITED | NODE_WITNESS);
|
||||
}
|
||||
return ServiceFlags(NODE_NETWORK | NODE_WITNESS);
|
||||
}
|
||||
|
||||
void SetServiceFlagsIBDCache(bool state) {
|
||||
g_initial_block_download_completed = state;
|
||||
}
|
||||
|
||||
CInv::CInv()
|
||||
{
|
||||
type = 0;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue