diff --git a/README.md b/README.md index 4b94d90723745..f32eb57cf7c0a 100644 --- a/README.md +++ b/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 diff --git a/configure.ac b/configure.ac index 188b24eb542f6..9cd81fb868df2 100644 --- a/configure.ac +++ b/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) diff --git a/contrib/debian/manpages/darknetd.1 b/contrib/debian/manpages/darknetd.1 index cd46658d16c0a..6aa5a109e1f0a 100644 --- a/contrib/debian/manpages/darknetd.1 +++ b/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 diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml index b516bf51c818d..47b51e15bb4f5 100644 --- a/contrib/gitian-descriptors/gitian-linux.yml +++ b/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" diff --git a/contrib/gitian-descriptors/gitian-osx.yml b/contrib/gitian-descriptors/gitian-osx.yml index 2b4e5bae6929c..e0ade03c85db8 100644 --- a/contrib/gitian-descriptors/gitian-osx.yml +++ b/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" diff --git a/contrib/gitian-descriptors/gitian-rpi2.yml b/contrib/gitian-descriptors/gitian-rpi2.yml index 91b4910bc38db..c042b28b97c50 100644 --- a/contrib/gitian-descriptors/gitian-rpi2.yml +++ b/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" diff --git a/contrib/gitian-descriptors/gitian-win.yml b/contrib/gitian-descriptors/gitian-win.yml index 94c625a6ed82e..4fdfb30fc7a4b 100644 --- a/contrib/gitian-descriptors/gitian-win.yml +++ b/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" diff --git a/doc/Doxyfile b/doc/Doxyfile index 683c45d5063e9..9f194c94d6e1e 100644 --- a/doc/Doxyfile +++ b/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 diff --git a/doc/README.md b/doc/README.md index 93d032db0c810..f19695c8e09f7 100644 --- a/doc/README.md +++ b/doc/README.md @@ -1,4 +1,4 @@ -DarkNet Core 2.1.1.0 +DarkNet Core 2.1.2.0 ===================== Setup diff --git a/doc/README_windows.txt b/doc/README_windows.txt index e3a2e683310d7..cdeabf7de32e9 100644 --- a/doc/README_windows.txt +++ b/doc/README_windows.txt @@ -1,4 +1,4 @@ -DarkNet Core 2.1.1.0 +DarkNet Core 2.1.2.0 ===================== Intro diff --git a/src/clientversion.h b/src/clientversion.h index beeeaafa2668a..40aa03c86ed78 100644 --- a/src/clientversion.h +++ b/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 diff --git a/src/main.cpp b/src/main.cpp index 86631881d1e92..3c142754cbeb3 100644 --- a/src/main.cpp +++ b/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)) { diff --git a/src/version.h b/src/version.h index 3131060995feb..f241238d7b032 100644 --- a/src/version.h +++ b/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