// Copyright (c) 2012 The Bitcoin developers
-// Copyright (c) 2012-2013 The PPCoin developers
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#ifndef BITCOIN_VERSION_H
#define BITCOIN_VERSION_H
+#include "clientversion.h"
#include <string>
//
// client versioning
//
-// These need to be macro's, as version.cpp's voodoo requires it
-#define CLIENT_VERSION_MAJOR 0
-#define CLIENT_VERSION_MINOR 6
-#define CLIENT_VERSION_REVISION 3
-#define CLIENT_VERSION_BUILD 0
-
static const int CLIENT_VERSION =
1000000 * CLIENT_VERSION_MAJOR
- + 10000 * CLIENT_VERSION_MINOR
+ + 10000 * CLIENT_VERSION_MINOR
+ 100 * CLIENT_VERSION_REVISION
+ 1 * CLIENT_VERSION_BUILD;
extern const std::string CLIENT_BUILD;
extern const std::string CLIENT_DATE;
-// ppcoin version - intended for display purpose ONLY
-#define PPCOIN_VERSION_MAJOR 0
-#define PPCOIN_VERSION_MINOR 3
-#define PPCOIN_VERSION_REVISION 3
-#define PPCOIN_VERSION_BUILD 0
+//
+// database format versioning
+//
+static const int DATABASE_VERSION = 70507;
//
// network protocol versioning
//
-static const int PROTOCOL_VERSION = 60004;
+static const int PROTOCOL_VERSION = 60016;
// earlier versions not supported as of Feb 2012, and are disconnected
-// NOTE: as of bitcoin v0.6 message serialization (vSend, vRecv) still
-// uses MIN_PROTO_VERSION(209), where message format uses PROTOCOL_VERSION
static const int MIN_PROTO_VERSION = 209;
// nTime field added to CAddress, starting with this version;
static const int CADDR_TIME_VERSION = 31402;
// only request blocks from nodes outside this range of versions
-static const int NOBLKS_VERSION_START = 32000;
-static const int NOBLKS_VERSION_END = 32400;
+static const int NOBLKS_VERSION_START = 60002;
+static const int NOBLKS_VERSION_END = 60006;
// BIP 0031, pong message, is enabled for all versions AFTER this one
static const int BIP0031_VERSION = 60000;
+// "mempool" command, enhanced "getdata" behavior starts with this version:
+static const int MEMPOOL_GD_VERSION = 60002;
+
+#define DISPLAY_VERSION_MAJOR 0
+#define DISPLAY_VERSION_MINOR 4
+#define DISPLAY_VERSION_REVISION 4
+#define DISPLAY_VERSION_BUILD 6
+
#endif