update version and protocol

README.md

@@ -1,4 +1,4 @@
-DarkNet Repository (Version 2.1.1.0)
+DarkNet Repository (Version 2.1.2.0)
 More information at darknet-crypto.com
 Visit our ANN thread at bitcointalk.org/index.php?topic=1262920
 

configure.ac

@@ -2,7 +2,7 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
 AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 2)
 define(_CLIENT_VERSION_MINOR, 1)
-define(_CLIENT_VERSION_REVISION, 1)
+define(_CLIENT_VERSION_REVISION, 2)
 define(_CLIENT_VERSION_BUILD, 0)
 define(_CLIENT_VERSION_IS_RELEASE, true)
 define(_COPYRIGHT_YEAR, 2016)

contrib/debian/manpages/darknetd.1

@@ -1,4 +1,4 @@
-.TH DNETD "1" "January 2016" "darknetd 2.1.1.0"
+.TH DNETD "1" "January 2016" "darknetd 2.1.2.0"
 .SH NAME
 Darknet \- peer-to-peer network based digital currency
 .SH SYNOPSIS

contrib/gitian-descriptors/gitian-linux.yml

@@ -1,5 +1,5 @@
 ---
-name: "darknet-linux-2.1.1.0"
+name: "darknet-linux-2.1.2.0"
 enable_cache: true
 suites:
 - "trusty"

contrib/gitian-descriptors/gitian-osx.yml

@@ -1,5 +1,5 @@
 ---
-name: "darknet-osx-2.1.1.0"
+name: "darknet-osx-2.1.2.0"
 enable_cache: true
 suites:
 - "trusty"

contrib/gitian-descriptors/gitian-rpi2.yml

@@ -1,5 +1,5 @@
 ---
-name: "darknet-rpi2-2.1.1.0"
+name: "darknet-rpi2-2.1.2.0"
 enable_cache: true
 suites:
 - "trusty"

contrib/gitian-descriptors/gitian-win.yml

@@ -1,5 +1,5 @@
 ---
-name: "darknet-win-2.1.1.0"
+name: "darknet-win-2.1.2.0"
 enable_cache: true
 suites:
 - "trusty"

doc/Doxyfile

@@ -34,7 +34,7 @@ PROJECT_NAME           = Darknet
 # This could be handy for archiving the generated documentation or
 # if some version control system is used.
 
-PROJECT_NUMBER         = 2.1.1.0
+PROJECT_NUMBER         = 2.1.2.0
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer

doc/README.md

@@ -1,4 +1,4 @@
-DarkNet Core 2.1.1.0
+DarkNet Core 2.1.2.0
 =====================
 
 Setup

doc/README_windows.txt

@@ -1,4 +1,4 @@
-DarkNet Core 2.1.1.0
+DarkNet Core 2.1.2.0
 =====================
 
 Intro

src/clientversion.h

@@ -16,7 +16,7 @@
 //! These need to be macros, as clientversion.cpp's and darknet*-res.rc's voodoo requires it
 #define CLIENT_VERSION_MAJOR 2
 #define CLIENT_VERSION_MINOR 1
-#define CLIENT_VERSION_REVISION 1
+#define CLIENT_VERSION_REVISION 2
 #define CLIENT_VERSION_BUILD 0
 
 //! Set to true for release, false for prerelease or test build

src/main.cpp

@@ -1677,7 +1677,10 @@ int64_t GetMasternodePayment(int nHeight, int64_t blockValue)
             LogPrintf("GetMasternodePayment(): moneysupply=%s, nodecoins=%s \n", FormatMoney(nMoneySupply).c_str(), 
                 FormatMoney(mNodeCoins).c_str());
 
-        if (mNodeCoins <= (nMoneySupply * .05) && mNodeCoins > 0) {
+        if (mNodeCoins == 0) {
+            ret = 0;
+        }
+        else if (mNodeCoins <= (nMoneySupply * .05) && mNodeCoins > 0) {
             ret = blockValue * .85;
         }
         else if (mNodeCoins <= (nMoneySupply * .1) && mNodeCoins >= (nMoneySupply * .05)) {

src/version.h

@@ -11,7 +11,7 @@
  * network protocol versioning
  */
 
-static const int PROTOCOL_VERSION = 70650;
+static const int PROTOCOL_VERSION = 70700;
 
 //! initial proto version, to be increased after version/verack negotiation
 static const int INIT_PROTO_VERSION = 209;
@@ -20,11 +20,11 @@ static const int INIT_PROTO_VERSION = 209;
 static const int GETHEADERS_VERSION = 70077;
 
 //! disconnect from peers older than this proto version
-static const int MIN_PEER_PROTO_VERSION = 70600;
-static const int MIN_PEER_PROTO_VERSION_POS = 70600;
+static const int MIN_PEER_PROTO_VERSION = 70700;
+static const int MIN_PEER_PROTO_VERSION_POS = 70700;
 
 //! minimum peer version accepted by ObfuscationPool
-static const int MIN_POOL_PEER_PROTO_VERSION = 70600;
+static const int MIN_POOL_PEER_PROTO_VERSION = 70700;
 
 //! minimum peer version for masternode budgets
 static const int MIN_BUDGET_PEER_PROTO_VERSION = 70106;
@@ -35,8 +35,8 @@ static const int MIN_MNW_PEER_PROTO_VERSION = 70104;
 //! minimum peer version that can receive masternode payments
 // V1 - Last protocol version before update
 // V2 - Newest protocol version
-static const int MIN_MASTERNODE_PAYMENT_PROTO_VERSION_1 = 70500;
-static const int MIN_MASTERNODE_PAYMENT_PROTO_VERSION_2 = 70600;
+static const int MIN_MASTERNODE_PAYMENT_PROTO_VERSION_1 = 70700;
+static const int MIN_MASTERNODE_PAYMENT_PROTO_VERSION_2 = 70700;
 
 //! nTime field added to CAddress, starting with this version;
 //! if possible, avoid requesting addresses nodes older than this