Commit 9efaaa1a authored by Ashot's avatar Ashot

Fixed budget payment bug. Increased release and protocol versions

parent 9e77ac44
Pipeline #902 failed with stage
in 54 minutes and 13 seconds
variables:
RELEASE_VERSION: "0.12.7.3"
RELEASE_VERSION: "0.12.7.4"
GIT_STRATEGY: "clone"
MAKEJOBS: "-j4"
CCACHE_SIZE: "100M"
......
......@@ -3,7 +3,7 @@ AC_PREREQ([2.60])
define(_CLIENT_VERSION_MAJOR, 0)
define(_CLIENT_VERSION_MINOR, 12)
define(_CLIENT_VERSION_REVISION, 7)
define(_CLIENT_VERSION_BUILD, 3)
define(_CLIENT_VERSION_BUILD, 4)
define(_COPYRIGHT_YEAR, 2018)
AC_INIT([Crown Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[info@crown.tech],[crown])
AC_CONFIG_SRCDIR([src/main.cpp])
......
......@@ -17,7 +17,7 @@
#define CLIENT_VERSION_MAJOR 0
#define CLIENT_VERSION_MINOR 12
#define CLIENT_VERSION_REVISION 7
#define CLIENT_VERSION_BUILD 3
#define CLIENT_VERSION_BUILD 4
/**
* Copyright year (2009-this)
......
......@@ -382,8 +382,16 @@ CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn, CWallet* pwallet,
if (txCoinbase.vout.size() > 2)
nValueNodeRewards += txCoinbase.vout[SN_PMT_SLOT].nValue;
//Reduce PoS reward by the node rewards
txCoinStake.vout[0].nValue = GetBlockValue(nHeight, nFees) - nValueNodeRewards;
if (!(IsSporkActive(SPORK_13_ENABLE_SUPERBLOCKS) && budget.IsBudgetPaymentBlock(pindexPrev->nHeight + 1)))
{
//Reduce PoS reward by the node rewards
txCoinStake.vout[0].nValue = GetBlockValue(nHeight, nFees) - nValueNodeRewards;
}
else
{
// Miner gets full block value in case of superblock
txCoinStake.vout[0].nValue = GetBlockValue(nHeight, nFees);
}
pblock->vtx[1] = txCoinStake;
// Make sure coinbase has null values
......
......@@ -9,8 +9,8 @@
/**
* network protocol versioning
*/
static const int PROTOCOL_VERSION = 71056;
static const int PROTOCOL_POS_START = 71056;
static const int PROTOCOL_VERSION = 71057;
static const int PROTOCOL_POS_START = 71057;
//! initial proto version, to be increased after version/verack negotiation
static const int INIT_PROTO_VERSION = 209;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment