Skip to content

Commit 42ed7f5

Browse files
committed
Merge #20606: Remove unused bits from service flags enum
fa40168 Remove unused bits from service flags enum (MarcoFalke) Pull request description: Remove service bits that haven't been observed on the active network for years and won't ever be observed on the network with this meaning. Keeping this dead assignment in our source code forever doesn't add any value. I somehow forgot to do this in commit fa0d0ff. ACKs for top commit: laanwj: Code review ACK fa40168 practicalswift: cr ACK fa40168 fanquake: ACK fa40168 Tree-SHA512: 376e5ac05940493cf2209fea60515c843e978c4b476f2524f6bf7a37a646d237c3ddcf6c0fa23641f9ba550f625609703d9b51b4be631a7f2a90e1092b557232
2 parents 795afe6 + fa40168 commit 42ed7f5

File tree

3 files changed

+0
-6
lines changed

3 files changed

+0
-6
lines changed

src/protocol.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,6 @@ static std::string serviceFlagToStr(size_t bit)
203203
switch ((ServiceFlags)service_flag) {
204204
case NODE_NONE: abort(); // impossible
205205
case NODE_NETWORK: return "NETWORK";
206-
case NODE_GETUTXO: return "GETUTXO";
207206
case NODE_BLOOM: return "BLOOM";
208207
case NODE_WITNESS: return "WITNESS";
209208
case NODE_COMPACT_FILTERS: return "COMPACT_FILTERS";

src/protocol.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -273,10 +273,6 @@ enum ServiceFlags : uint64_t {
273273
// NODE_NETWORK means that the node is capable of serving the complete block chain. It is currently
274274
// set by all Bitcoin Core non pruned nodes, and is unset by SPV clients or other light clients.
275275
NODE_NETWORK = (1 << 0),
276-
// NODE_GETUTXO means the node is capable of responding to the getutxo protocol request.
277-
// Bitcoin Core does not support this but a patch set called Bitcoin XT does.
278-
// See BIP 64 for details on how this is implemented.
279-
NODE_GETUTXO = (1 << 1),
280276
// NODE_BLOOM means the node is capable and willing to handle bloom-filtered connections.
281277
// Bitcoin Core nodes used to support this by default, without advertising this bit,
282278
// but no longer do as of protocol version 70011 (= NO_BLOOM_VERSION)

test/functional/test_framework/messages.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151
MAX_INV_SIZE = 50000 # Maximum number of entries in an 'inv' protocol message
5252

5353
NODE_NETWORK = (1 << 0)
54-
NODE_GETUTXO = (1 << 1)
5554
NODE_BLOOM = (1 << 2)
5655
NODE_WITNESS = (1 << 3)
5756
NODE_COMPACT_FILTERS = (1 << 6)

0 commit comments

Comments
 (0)