From 60c1141682d6a09442e9668dbdd51e6335e97515 Mon Sep 17 00:00:00 2001 From: 8-BIT-PARTY Date: Mon, 29 Jun 2015 09:16:33 -0400 Subject: [PATCH] Experimental. Set masternode cost to 888 BIT. Set PoS block value to 0.65 (Atari rules), masternode gets 0.44 since block 288888. --- src/activemasternode.cpp | 4 ++-- src/darksend.cpp | 2 +- src/main.cpp | 9 +++++---- src/main.h | 2 +- src/spork.h | 2 +- 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/activemasternode.cpp b/src/activemasternode.cpp index 84a66ba..fe3d359 100644 --- a/src/activemasternode.cpp +++ b/src/activemasternode.cpp @@ -8,7 +8,7 @@ #include "clientversion.h" // -// Bootup the masternode, look for a 500 8BIT input and register on the network +// Bootup the masternode, look for a 888 8BIT input and register on the network // void CActiveMasternode::ManageStatus() { @@ -371,7 +371,7 @@ vector CActiveMasternode::SelectCoinsMasternode() // Filter BOOST_FOREACH(const COutput& out, vCoins) { - if(out.tx->vout[out.i].nValue == 112*COIN) { //exactly + if(out.tx->vout[out.i].nValue == 888*COIN) { //exactly filteredCoins.push_back(out); } } diff --git a/src/darksend.cpp b/src/darksend.cpp index 11a3bb1..686f6f2 100644 --- a/src/darksend.cpp +++ b/src/darksend.cpp @@ -1985,7 +1985,7 @@ bool CDarkSendSigner::IsVinAssociatedWithPubkey(CTxIn& vin, CPubKey& pubkey){ //if(GetTransaction(vin.prevout.hash, txVin, hash, true)){ if(GetTransaction(vin.prevout.hash, txVin, hash)){ BOOST_FOREACH(CTxOut out, txVin.vout){ - if(out.nValue == 112*COIN){ + if(out.nValue == 888*COIN){ if(out.scriptPubKey == payee2) return true; } } diff --git a/src/main.cpp b/src/main.cpp index 2b871eb..4608303 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1155,7 +1155,10 @@ int64_t GetProofOfStakeReward(int64_t nCoinAge, int64_t nFees, unsigned int nHei { int64_t nSubsidy; - if (nHeight > 11499){ + if (nHeight > 288887) { + nSubsidy = static_cast(0.65 * COIN); + } + else if (nHeight > 11499){ nSubsidy = static_cast(1.2 * COIN); }else if (nHeight > 1888){ nSubsidy = nCoinAge * COIN_YEAR_REWARD * 33 / (365 * 33 + 8); @@ -4293,7 +4296,5 @@ bool SendMessages(CNode* pto, bool fSendTrickle) int64_t GetMasternodePayment(int nHeight, int64_t blockValue) { - int64_t ret = static_cast(blockValue * 0.733333333333333333); //67% - - return ret; + return static_cast(blockValue * (0.733333333333333333 ? nHeight < 288888 : 0.677)); } diff --git a/src/main.h b/src/main.h index 2497a5c..49e961c 100644 --- a/src/main.h +++ b/src/main.h @@ -20,7 +20,7 @@ class CValidationState; #define START_MASTERNODE_PAYMENTS_TESTNET 1429738064 #define START_MASTERNODE_PAYMENTS 1429738064 -static const int64_t DARKSEND_COLLATERAL = (112*COIN); +static const int64_t DARKSEND_COLLATERAL = (888*COIN); static const int64_t DARKSEND_FEE = (0.00925*COIN); static const int64_t DARKSEND_POOL_MAX = (1111.99*COIN); diff --git a/src/spork.h b/src/spork.h index 31a878e..7467043 100644 --- a/src/spork.h +++ b/src/spork.h @@ -26,7 +26,7 @@ using namespace boost; #define SPORK_1_MASTERNODE_PAYMENTS_ENFORCEMENT_DEFAULT 2428537599 //2015-4-8 23:59:59 GMT -#define SPORK_2_MAX_VALUE_DEFAULT 112 //500 8BIT +#define SPORK_2_MAX_VALUE_DEFAULT 888 //888 8BIT #define SPORK_3_REPLAY_BLOCKS_DEFAULT 0 #define SPORK_4_RECONVERGE_DEFAULT 1420070400 //2047-1-1