X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=src%2Fversion.h;h=3fa5be8ed80831a570487432f58b4b179e9dd815;hb=1ebe5b92ef18395cdae9b88fc38b0ed6166c3243;hp=9718e75afb73836118dbc2349a879be3accb2332;hpb=23e7583a8c9a0dcee9cbbf3be8bfc453298773f0;p=novacoin.git

diff --git a/src/version.h b/src/version.h
index 9718e75..3fa5be8 100644
--- a/src/version.h
+++ b/src/version.h
@@ -4,21 +4,16 @@
 #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;
 
@@ -27,10 +22,15 @@ extern const std::string CLIENT_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 = 60017;
 
 // earlier versions not supported as of Feb 2012, and are disconnected
 static const int MIN_PROTO_VERSION = 209;
@@ -40,10 +40,11 @@ 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    5
 
 #endif