Skip to content

Commit

Permalink
V3.1
Browse files Browse the repository at this point in the history
Adjusting Reward to give 10% to POS and bringing in new protocol.
  • Loading branch information
vish3vs committed Feb 12, 2019
1 parent d244be7 commit e4a13fd
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 12 deletions.
2 changes: 1 addition & 1 deletion configure.ac
@@ -1,7 +1,7 @@
dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
AC_PREREQ([2.60])
define(_CLIENT_VERSION_MAJOR, 3)
define(_CLIENT_VERSION_MINOR, 0)
define(_CLIENT_VERSION_MINOR, 1)
define(_CLIENT_VERSION_REVISION, 0)
define(_CLIENT_VERSION_BUILD, 0)
define(_CLIENT_VERSION_IS_RELEASE, true)
Expand Down
2 changes: 1 addition & 1 deletion share/genbuild.sh
Expand Up @@ -13,7 +13,7 @@ else
exit 1
fi

DESC="3.0.0"
DESC="3.1.0"
SUFFIX=""
LAST_COMMIT_DATE=""
if [ -e "$(which git 2>/dev/null)" -a "$(git rev-parse --is-inside-work-tree 2>/dev/null)" = "true" ]; then
Expand Down
4 changes: 2 additions & 2 deletions src/clientversion.h
@@ -1,5 +1,5 @@
// Copyright (c) 2009-2014 The Bitcoin developers
// Copyright (c) 2019 The SaveNode developers
// Copyright (c) 2017 The savenode developers
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.

Expand All @@ -16,7 +16,7 @@

//! These need to be macros, as clientversion.cpp's and savenode*-res.rc's voodoo requires it
#define CLIENT_VERSION_MAJOR 3
#define CLIENT_VERSION_MINOR 0
#define CLIENT_VERSION_MINOR 1
#define CLIENT_VERSION_REVISION 0
#define CLIENT_VERSION_BUILD 0

Expand Down
8 changes: 5 additions & 3 deletions src/main.cpp
Expand Up @@ -2,7 +2,7 @@
// Copyright (c) 2009-2014 The Bitcoin developers
// Copyright (c) 2014-2015 The Dash developers
// Copyright (c) 2015-2017 The PIVX developers
// Copyright (c) 2019 The SaveNode developers
// Copyright (c) 2017 The savenode developers
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.

Expand Down Expand Up @@ -2244,9 +2244,11 @@ int64_t GetMasternodePayment(int nHeight, int64_t blockValue, int nMasternodeCou
// 90% for Masternodes from block 100
if (nHeight <= 100) {
ret = blockValue / 100 * 0; // %0
} else if (nHeight > 100 ) {
} else if (nHeight > 100 && nHeight <= 268000) {
ret = blockValue / 100 * 90; // %90
}
}else{
ret = blockValue / 100 * 80; //80% MN ->10% goes to dev fee. 10% for POS.
}

return ret;
}
Expand Down
2 changes: 1 addition & 1 deletion src/spork.h
Expand Up @@ -54,7 +54,7 @@ using namespace boost;
#define SPORK_11_LOCK_INVALID_UTXO_DEFAULT 4070908800 //OFF - NOTE: this is block height not time!
#define SPORK_13_ENABLE_SUPERBLOCKS_DEFAULT 4070908800 //OFF
#define SPORK_14_NEW_PROTOCOL_ENFORCEMENT_DEFAULT 4070908800 //OFF
#define SPORK_15_NEW_PROTOCOL_ENFORCEMENT_2_DEFAULT 1549886400 //Monday, February 11, 2019 12:00:00 AM
#define SPORK_15_NEW_PROTOCOL_ENFORCEMENT_2_DEFAULT 1550188800 //Friday, February 15, 2019 12:00:00 AM
#define SPORK_16_ZEROCOIN_MAINTENANCE_MODE_DEFAULT 4070908800 //OFF
//Wednesday, January 30, 2019 12:00:00 PM

Expand Down
8 changes: 4 additions & 4 deletions src/version.h
@@ -1,7 +1,7 @@
// Copyright (c) 2012-2014 The Bitcoin developers
// Copyright (c) 2014-2015 The Dash developers
// Copyright (c) 2015-2017 The PIVX developers
// Copyright (c) 2019 The SaveNode developers
// Copyright (c) 2017 The savenode developers
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.

Expand All @@ -12,7 +12,7 @@
* network protocol versioning
*/

static const int PROTOCOL_VERSION = 70008;
static const int PROTOCOL_VERSION = 70009;

//! initial proto version, to be increased after version/verack negotiation
static const int INIT_PROTO_VERSION = 209;
Expand All @@ -21,8 +21,8 @@ static const int INIT_PROTO_VERSION = 209;
static const int GETHEADERS_VERSION = 70000;

//! disconnect from peers older than this proto version
static const int MIN_PEER_PROTO_VERSION_BEFORE_ENFORCEMENT = 70007;
static const int MIN_PEER_PROTO_VERSION_AFTER_ENFORCEMENT = 70008;
static const int MIN_PEER_PROTO_VERSION_BEFORE_ENFORCEMENT = 70008;
static const int MIN_PEER_PROTO_VERSION_AFTER_ENFORCEMENT = 70009;

//! nTime field added to CAddress, starting with this version;
//! if possible, avoid requesting addresses nodes older than this
Expand Down

0 comments on commit e4a13fd

Please sign in to comment.