diff --git a/README.md b/README.md index 36f46ffa2a3bf..933258039bd80 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -DarkNet Repository (Version 1.0.1.0) +DarkNet Repository (Version 1.0.2.1) More information at darknet-crypto.com Visit our ANN thread at bitcointalk.org/index.php?topic=1262920 @@ -16,7 +16,7 @@ Blocks 2-259200 Approx. 180 DAYS PoW Rewards Breakdown: Blocks 2-43200 20% MNODE (50 DNET) / 80% MINER (200 DNET) -Blocks 43201-259201 Min of 20% MNODE (50 DNET) Max of 30% MNODE (75 DNET)/ 70% MINER (175 DNET) / Max 10% (25 DNET) PROPOSALS +Blocks 43201-259201 20% MNODE (50 DNET)/ 70% MINER (175 DNET) / Max 10% (25 DNET) PROPOSALS Rewards for blocks after the switch to PoS will be split in proportions to be determined at a later date. PoS Staking Rewards: diff --git a/configure.ac b/configure.ac index f19e014fbccc0..03ad05fc3b620 100644 --- a/configure.ac +++ b/configure.ac @@ -2,8 +2,8 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N) AC_PREREQ([2.60]) define(_CLIENT_VERSION_MAJOR, 1) define(_CLIENT_VERSION_MINOR, 0) -define(_CLIENT_VERSION_REVISION, 1) -define(_CLIENT_VERSION_BUILD, 0) +define(_CLIENT_VERSION_REVISION, 2) +define(_CLIENT_VERSION_BUILD, 1) define(_CLIENT_VERSION_IS_RELEASE, true) define(_COPYRIGHT_YEAR, 2015) AC_INIT([Dash Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[www.darknet-crypto.com],[darknet]) diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml index abb0c8a43d022..0c01f1e9c4401 100755 --- a/contrib/gitian-descriptors/gitian-linux.yml +++ b/contrib/gitian-descriptors/gitian-linux.yml @@ -1,5 +1,5 @@ --- -name: "darknet-linux-1.0.2.0" +name: "darknet-linux-1.0.2.1" enable_cache: true suites: - "precise" diff --git a/contrib/gitian-descriptors/gitian-osx.yml b/contrib/gitian-descriptors/gitian-osx.yml index f233bd9239f27..a585a4392d5a0 100644 --- a/contrib/gitian-descriptors/gitian-osx.yml +++ b/contrib/gitian-descriptors/gitian-osx.yml @@ -1,5 +1,5 @@ --- -name: "darknet-osx-1.0.2.0" +name: "darknet-osx-1.0.2.1" enable_cache: true suites: - "precise" diff --git a/contrib/gitian-descriptors/gitian-rpi2.yml b/contrib/gitian-descriptors/gitian-rpi2.yml index b5ea5d6818779..3429f1df3c858 100644 --- a/contrib/gitian-descriptors/gitian-rpi2.yml +++ b/contrib/gitian-descriptors/gitian-rpi2.yml @@ -1,5 +1,5 @@ --- -name: "darknet-raspberry-1.0.2.0" +name: "darknet-raspberry-1.0.2.1" enable_cache: true suites: - "precise" diff --git a/contrib/gitian-descriptors/gitian-win.yml b/contrib/gitian-descriptors/gitian-win.yml index 1fe9603174ff7..0f5eba713c2a5 100755 --- a/contrib/gitian-descriptors/gitian-win.yml +++ b/contrib/gitian-descriptors/gitian-win.yml @@ -1,5 +1,5 @@ --- -name: "darknet-win-1.0.2.0" +name: "darknet-win-1.0.2.1" enable_cache: true suites: - "precise" diff --git a/src/clientversion.h b/src/clientversion.h index 8d0454c0ae837..86732cd4b88ee 100644 --- a/src/clientversion.h +++ b/src/clientversion.h @@ -16,8 +16,8 @@ //! These need to be macros, as clientversion.cpp's and darknet*-res.rc's voodoo requires it #define CLIENT_VERSION_MAJOR 1 #define CLIENT_VERSION_MINOR 0 -#define CLIENT_VERSION_REVISION 1 -#define CLIENT_VERSION_BUILD 0 +#define CLIENT_VERSION_REVISION 2 +#define CLIENT_VERSION_BUILD 1 //! Set to true for release, false for prerelease or test build #define CLIENT_VERSION_IS_RELEASE true diff --git a/src/version.h b/src/version.h index 73e6b5650e435..6aaa4a3288989 100644 --- a/src/version.h +++ b/src/version.h @@ -10,7 +10,7 @@ * network protocol versioning */ -static const int PROTOCOL_VERSION = 70103; +static const int PROTOCOL_VERSION = 70106; //! initial proto version, to be increased after version/verack negotiation static const int INIT_PROTO_VERSION = 209; @@ -22,19 +22,19 @@ static const int GETHEADERS_VERSION = 70077; static const int MIN_PEER_PROTO_VERSION = 70066; //! minimum peer version accepted by ObfuscatePool -static const int MIN_POOL_PEER_PROTO_VERSION = 70103; +static const int MIN_POOL_PEER_PROTO_VERSION = 70106; //! minimum peer version for masternode budgets static const int MIN_BUDGET_PEER_PROTO_VERSION = 70103; //! minimum peer version for masternode winner broadcasts -static const int MIN_MNW_PEER_PROTO_VERSION = 70103; +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 = 70066; -static const int MIN_MASTERNODE_PAYMENT_PROTO_VERSION_2 = 70103; +static const int MIN_MASTERNODE_PAYMENT_PROTO_VERSION_2 = 70106; //! nTime field added to CAddress, starting with this version; //! if possible, avoid requesting addresses nodes older than this