diff options
author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-06-16 17:30:53 +0200 |
---|---|---|
committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-06-16 17:41:27 +0200 |
commit | 807691ca96a1a4b0655f6ea80b721b940dd29a39 (patch) | |
tree | 66a7583a17c11ea84a6e1a2f08356907d4e5cfb1 /src/chainparams.h | |
parent | f73082db87b9e07ddcd4656f4fc309c4d2854285 (diff) | |
parent | f5ae6c98260fdd3c0ca203ce67c6467d9cdaea95 (diff) | |
download | bitcoin-807691ca96a1a4b0655f6ea80b721b940dd29a39.tar.xz |
Merge pull request #4326
f5ae6c9 add NetworkIDString() to chainparams (Philip Kaufmann)
Diffstat (limited to 'src/chainparams.h')
-rw-r--r-- | src/chainparams.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/chainparams.h b/src/chainparams.h index 8370cc5690..6e09a2cba3 100644 --- a/src/chainparams.h +++ b/src/chainparams.h @@ -79,6 +79,8 @@ public: * until nGenProcLimit blocks are generated */ bool MineBlocksOnDemand() const { return fMineBlocksOnDemand; } Network NetworkID() const { return networkID; } + /* Return the BIP70 network string (main, test or regtest) */ + std::string NetworkIDString() const { return strNetworkID; } const vector<CDNSSeedData>& DNSSeeds() const { return vSeeds; } const std::vector<unsigned char>& Base58Prefix(Base58Type type) const { return base58Prefixes[type]; } const vector<CAddress>& FixedSeeds() const { return vFixedSeeds; } @@ -102,6 +104,7 @@ protected: vector<CDNSSeedData> vSeeds; std::vector<unsigned char> base58Prefixes[MAX_BASE58_TYPES]; Network networkID; + std::string strNetworkID; CBlock genesis; vector<CAddress> vFixedSeeds; bool fRequireRPCPassword; |