Disable default filters for services Zcash doesn't (yet) have

It turns out we've been whitelisting NODE_WITNESS since launch without
realising; this removes it from the default whitelist. The other two
were newly introduced in this branch by the merge from upstream, but
similarly have not yet been deployed to Zcash.
This commit is contained in:
Jack Grigg 2021-06-24 00:22:18 +01:00
parent 0346150d92
commit d5639345b3
2 changed files with 11 additions and 11 deletions

View File

@ -164,14 +164,14 @@ public:
if (filter_whitelist.empty()) {
filter_whitelist.insert(NODE_NETWORK); // x1
filter_whitelist.insert(NODE_NETWORK | NODE_BLOOM); // x5
filter_whitelist.insert(NODE_NETWORK | NODE_WITNESS); // x9
filter_whitelist.insert(NODE_NETWORK | NODE_WITNESS | NODE_COMPACT_FILTERS); // x49
filter_whitelist.insert(NODE_NETWORK | NODE_WITNESS | NODE_BLOOM); // xd
filter_whitelist.insert(NODE_NETWORK_LIMITED); // x400
filter_whitelist.insert(NODE_NETWORK_LIMITED | NODE_BLOOM); // x404
filter_whitelist.insert(NODE_NETWORK_LIMITED | NODE_WITNESS); // x408
filter_whitelist.insert(NODE_NETWORK_LIMITED | NODE_WITNESS | NODE_COMPACT_FILTERS); // x448
filter_whitelist.insert(NODE_NETWORK_LIMITED | NODE_WITNESS | NODE_BLOOM); // x40c
// filter_whitelist.insert(NODE_NETWORK | NODE_WITNESS); // x9
// filter_whitelist.insert(NODE_NETWORK | NODE_WITNESS | NODE_COMPACT_FILTERS); // x49
// filter_whitelist.insert(NODE_NETWORK | NODE_WITNESS | NODE_BLOOM); // xd
// filter_whitelist.insert(NODE_NETWORK_LIMITED); // x400
// filter_whitelist.insert(NODE_NETWORK_LIMITED | NODE_BLOOM); // x404
// filter_whitelist.insert(NODE_NETWORK_LIMITED | NODE_WITNESS); // x408
// filter_whitelist.insert(NODE_NETWORK_LIMITED | NODE_WITNESS | NODE_COMPACT_FILTERS); // x448
// filter_whitelist.insert(NODE_NETWORK_LIMITED | NODE_WITNESS | NODE_BLOOM); // x40c
}
if (host != NULL && ns == NULL) showHelp = true;
if (showHelp) fprintf(stderr, help, argv[0]);

View File

@ -61,9 +61,9 @@ enum
{
NODE_NETWORK = (1 << 0),
NODE_BLOOM = (1 << 2),
NODE_WITNESS = (1 << 3),
NODE_COMPACT_FILTERS = (1 << 6),
NODE_NETWORK_LIMITED = (1 << 10),
// NODE_WITNESS = (1 << 3),
// NODE_COMPACT_FILTERS = (1 << 6),
// NODE_NETWORK_LIMITED = (1 << 10),
};
class CAddress : public CService