Update Merge Files

Author: rubber-duckie-au

src/chainparams.cpp

@@ -0,0 +1,84 @@
+// Copyright (c) 2010 Satoshi Nakamoto
+// Copyright (c) 2009-2012 The Bitcoin developers
+// Distributed under the MIT/X11 software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#include "compat.h"
+
+#include "util.h"
+#include "cdnsseeddata.h"
+#include "chainparamsseeds.h"
+#include "cmainparams.h"
+#include "ctestnetparams.h"
+#include "cregtestparams.h"
+#include "ctxin.h"
+#include "ctxout.h"
+#include "caddress.h"
+#include "ctransaction.h"
+
+#include "chainparams.h"
+
+static CMainParams mainParams;
+static CTestNetParams testNetParams;
+static CRegTestParams regTestParams;
+static CChainParams *pCurrentParams = &mainParams;
+
+const CChainParams &Params()
+{
+    return *pCurrentParams;
+}
+
+void SelectParams(CChainParams_Network network)
+{
+    switch (network)
+	{
+		case CChainParams_Network::MAIN:
+			pCurrentParams = &mainParams;
+			break;
+
+		case CChainParams_Network::TESTNET:
+			pCurrentParams = &testNetParams;
+			break;
+
+		case CChainParams_Network::REGTEST:
+			pCurrentParams = &regTestParams;
+			break;
+
+		default:
+			assert(false && "Unimplemented network");
+			return;
+    }
+}
+
+bool SelectParamsFromCommandLine()
+{
+    bool fRegTest = GetBoolArg("-regtest", false);
+    bool fTestNet = GetBoolArg("-testnet", false);
+
+    if (fTestNet && fRegTest)
+	{
+        return false;
+    }
+
+    if (fRegTest)
+	{
+        SelectParams(CChainParams_Network::REGTEST);
+    }
+	else if (fTestNet)
+	{
+        SelectParams(CChainParams_Network::TESTNET);
+    }
+	else
+	{
+        SelectParams(CChainParams_Network::MAIN);
+    }
+	
+    return true;
+}
+
+bool TestNet()
+{
+    // Note: it's deliberate that this returns "false" for regression test mode.
+    return Params().NetworkID() == CChainParams_Network::TESTNET;
+}
+

src/clientversion.h

@@ -0,0 +1,22 @@
+#ifndef CLIENTVERSION_H
+#define CLIENTVERSION_H
+
+//
+// client versioning
+//
+
+// These need to be macros, as version.cpp's and bitcoin-qt.rc's voodoo requires it
+#define CLIENT_VERSION_MAJOR       2
+#define CLIENT_VERSION_MINOR       0
+#define CLIENT_VERSION_REVISION    0
+#define CLIENT_VERSION_BUILD       1
+
+// Set to true for release, false for prerelease or test build
+#define CLIENT_VERSION_IS_RELEASE  true
+
+// Converts the parameter X to a string after macro replacement on X has been performed.
+// Don't merge these into one macro!
+#define STRINGIZE(X) DO_STRINGIZE(X)
+#define DO_STRINGIZE(X) #X
+
+#endif // CLIENTVERSION_H