diff --git a/doc/REST-interface.md b/doc/REST-interface.md index a0db4a6fb8..05ca775199 100644 --- a/doc/REST-interface.md +++ b/doc/REST-interface.md @@ -61,7 +61,7 @@ Given a height: returns hash of block in best-block-chain at height provided. Returns various state info regarding block chain processing. Only supports JSON as output format. -* chain : (string) current network name as defined in BIP70 (main, test, regtest) +* chain : (string) current network name (main, test, regtest) * blocks : (numeric) the current number of blocks processed in the server * headers : (numeric) the current number of headers we have validated * bestblockhash : (string) the hash of the currently best block diff --git a/src/chainparams.h b/src/chainparams.h index 775cd4df61..200723ebed 100644 --- a/src/chainparams.h +++ b/src/chainparams.h @@ -87,7 +87,7 @@ public: bool AllowMultiplePorts() const { return fAllowMultiplePorts; } /** How long to wait until we allow retrying of a LLMQ connection */ int LLMQConnectionRetryTimeout() const { return nLLMQConnectionRetryTimeout; } - /** Return the BIP70 network string (main, test or regtest) */ + /** Return the network string */ std::string NetworkIDString() const { return strNetworkID; } /** Return the list of hostnames to look up for DNS seeds */ const std::vector& DNSSeeds() const { return vSeeds; } @@ -163,7 +163,7 @@ std::unique_ptr CreateChainParams(const std::string& chain); const CChainParams &Params(); /** - * Sets the params returned by Params() to those for the given BIP70 chain name. + * Sets the params returned by Params() to those for the given chain name. * @throws std::runtime_error when the chain is not supported. */ void SelectParams(const std::string& chain); diff --git a/src/chainparamsbase.h b/src/chainparamsbase.h index 47133e7e27..46940e411e 100644 --- a/src/chainparamsbase.h +++ b/src/chainparamsbase.h @@ -15,11 +15,13 @@ class CBaseChainParams { public: - /** BIP70 chain name strings (main, test or regtest) */ + ///@{ + /** Chain name strings */ static const std::string MAIN; static const std::string TESTNET; static const std::string DEVNET; static const std::string REGTEST; + ///@} const std::string& DataDir() const { return strDataDir; } int RPCPort() const { return nRPCPort; } diff --git a/src/qt/networkstyle.h b/src/qt/networkstyle.h index 15e34b2afa..d452c4b680 100644 --- a/src/qt/networkstyle.h +++ b/src/qt/networkstyle.h @@ -14,7 +14,7 @@ class NetworkStyle { public: - /** Get style associated with provided BIP70 network id, or 0 if not known */ + /** Get style associated with provided network id, or 0 if not known */ static const NetworkStyle *instantiate(const QString &networkId); const QString &getAppName() const { return appName; } diff --git a/src/qt/walletmodel.h b/src/qt/walletmodel.h index 64bc1b3075..5bad69a469 100644 --- a/src/qt/walletmodel.h +++ b/src/qt/walletmodel.h @@ -61,8 +61,8 @@ public: CAmount amount; // If from a payment request, this is used for storing the memo QString message; - // If building with BIP70 is disabled, keep the payment request around as - // serialized string to ensure load/store is lossless + // Keep the payment request around as a serialized string to ensure + // load/store is lossless. std::string sPaymentRequest; // Empty if no authentication or invalid signature/cert/etc. QString authenticatedMerchant; diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp index b1f6ccf43c..ebbb899455 100644 --- a/src/rpc/blockchain.cpp +++ b/src/rpc/blockchain.cpp @@ -1476,7 +1476,7 @@ UniValue getblockchaininfo(const JSONRPCRequest& request) {}, RPCResult{ "{\n" - " \"chain\" : \"xxxx\", (string) current network name as defined in BIP70 (main, test, regtest) and\n" + " \"chain\" : \"xxxx\", (string) current network name (main, test, regtest) and\n" " devnet or devnet- for \"-devnet\" and \"-devnet=\" respectively\n" " \"blocks\" : xxxxxx, (numeric) the height of the most-work fully-validated chain. The genesis block has height 0\n" " \"headers\" : xxxxxx, (numeric) the current number of headers we have validated\n" diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp index 5eb9aa2a8d..23e21d1607 100644 --- a/src/rpc/mining.cpp +++ b/src/rpc/mining.cpp @@ -420,7 +420,7 @@ static UniValue getmininginfo(const JSONRPCRequest& request) " \"difficulty\" : xxx.xxxxx (numeric) The current difficulty\n" " \"networkhashps\" : nnn, (numeric) The network hashes per second\n" " \"pooledtx\" : n (numeric) The size of the mempool\n" - " \"chain\" : \"xxxx\", (string) current network name as defined in BIP70 (main, test, regtest)\n" + " \"chain\" : \"xxxx\", (string) current network name (main, test, regtest)\n" " \"warnings\" : \"...\" (string) any network and blockchain warnings\n" "}\n" }, diff --git a/src/util/system.h b/src/util/system.h index da458a87db..6892727d31 100644 --- a/src/util/system.h +++ b/src/util/system.h @@ -295,7 +295,7 @@ public: void ForceRemoveArg(const std::string& strArg); /** - * Looks for -regtest, -testnet and returns the appropriate BIP70 chain name. + * Returns the appropriate chain name from the program arguments. * @return CBaseChainParams::MAIN by default; raises runtime error if an invalid combination is given. */ std::string GetChainName() const;