X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=src%2Fversion.h;h=fd6aa43dc3e0759e74ac4e5281921fb4fc4a5710;hb=ded6e92d905b86306202b62b39b2d79eb12ef90f;hp=15d071f725095197a0dc14388e27c11d6b75b229;hpb=2984c53596e50ea983a5c3b31d67ed737011aeb5;p=novacoin.git

diff --git a/src/version.h b/src/version.h
index 15d071f..fd6aa43 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;
 
@@ -26,21 +21,18 @@ extern const std::string CLIENT_NAME;
 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       2
-#define PPCOIN_VERSION_REVISION    4
-#define PPCOIN_VERSION_BUILD       0
+//
+// database format versioning
+//
+static const int DATABASE_VERSION = 70507;
 
 //
 // network protocol versioning
 //
 
-static const int PROTOCOL_VERSION = 60002;
+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;
@@ -48,10 +40,18 @@ 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;
 
+// "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