X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=src%2Fversion.h;h=d61c5429c36f78b16f5a4d6721756109d8ccc61f;hb=c34c8413800562d59454691813836276f84b4e74;hp=c0ec97ddf2fb3615ccb80d1572c8ec5b822360e6;hpb=db4036a829f5e0adc55b6f320b51177e3b518c3e;p=novacoin.git

diff --git a/src/version.h b/src/version.h
index c0ec97d..d61c542 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1,6 +1,7 @@
 // Copyright (c) 2012 The Bitcoin developers
+// Copyright (c) 2012-2013 The PPCoin 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
 
@@ -10,10 +11,11 @@
 // 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;
+// 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
@@ -25,13 +27,21 @@ 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       3
+#define PPCOIN_VERSION_REVISION    4
+#define PPCOIN_VERSION_BUILD       0
+
 //
 // network protocol versioning
 //
 
-static const int PROTOCOL_VERSION = 60001;
+static const int PROTOCOL_VERSION = 60004;
 
 // 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;
@@ -39,8 +49,8 @@ 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 = 60003;
 
 // BIP 0031, pong message, is enabled for all versions AFTER this one
 static const int BIP0031_VERSION = 60000;