Merge pull request #5876

5983a4e Add a NODE_GETUTXO service bit and document NODE_NETWORK. Stop translating the NODE_* names as they are technical and cannot be translated. (Mike Hearn)
This commit is contained in:
Wladimir J. van der Laan 2015-03-26 09:15:36 +01:00
commit 8e4fd0cc31
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6
2 changed files with 12 additions and 2 deletions

View File

@ -67,7 +67,14 @@ public:
/** nServices flags */ /** nServices flags */
enum { enum {
// NODE_NETWORK means that the node is capable of serving the block chain. It is currently
// set by all Bitcoin Core nodes, and is unset by SPV clients or other peers that just want
// network services but don't provide them.
NODE_NETWORK = (1 << 0), NODE_NETWORK = (1 << 0),
// NODE_GETUTXO means the node is capable of responding to the getutxo protocol request.
// Bitcoin Core does not support this but a patch set called Bitcoin XT does.
// See BIP 64 for details on how this is implemented.
NODE_GETUTXO = (1 << 1),
// Bits 24-31 are reserved for temporary experiments. Just pick a bit that // Bits 24-31 are reserved for temporary experiments. Just pick a bit that
// isn't getting used, or one not being used much, and notify the // isn't getting used, or one not being used much, and notify the

View File

@ -878,10 +878,13 @@ QString formatServicesStr(quint64 mask)
switch (check) switch (check)
{ {
case NODE_NETWORK: case NODE_NETWORK:
strList.append(QObject::tr("NETWORK")); strList.append("NETWORK");
break;
case NODE_GETUTXO:
strList.append("GETUTXO");
break; break;
default: default:
strList.append(QString("%1[%2]").arg(QObject::tr("UNKNOWN")).arg(check)); strList.append(QString("%1[%2]").arg("UNKNOWN").arg(check));
} }
} }
} }