// Copyright (c) 2012 The Bitcoin developers
// Distributed under the MIT/X11 software license, see the accompanying
-// file license.txt or http://www.opensource.org/licenses/mit-license.php.
+// 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
//
-static const int CLIENT_VERSION_MAJOR = 0;
-static const int CLIENT_VERSION_MINOR = 6;
-static const int CLIENT_VERSION_REVISION = 3;
-static const int 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_DATE;
//
+// database format versioning
+//
+static const int DATABASE_VERSION = 70507;
+
+//
// network protocol versioning
//
-static const int PROTOCOL_VERSION = 60001;
+static const int PROTOCOL_VERSION = 60018;
// earlier versions not supported as of Feb 2012, and are disconnected
static const int MIN_PROTO_VERSION = 209;
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;
+#define DISPLAY_VERSION_MAJOR 0
+#define DISPLAY_VERSION_MINOR 5
+#define DISPLAY_VERSION_REVISION 9
#endif