Skip to content

Commit c23d55c

Browse files
committed
v1.0.0.1
* PoS enabled after block 4000. * PoS block reward 25 CROP (20 to Masternode / 5 to Stake wallet) * PoW reward change. (15 CROP after block 4000) * PoW ending at block 788000 (3 years)
1 parent 84c0b43 commit c23d55c

File tree

14 files changed

+1339
-54
lines changed

14 files changed

+1339
-54
lines changed

cropcoin-qt.pro

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
TEMPLATE = app
22
TARGET = cropcoin-qt
3-
VERSION = 1.0.0.0
3+
VERSION = 1.0.0.1
44
INCLUDEPATH += src src/json src/qt src/qt/plugins/mrichtexteditor
55
QT += network printsupport
66
DEFINES += ENABLE_WALLET

src/chainparams.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,8 @@ class CMainParams : public CChainParams {
145145
//strSporkKey = "046f78dcf911fbd61910136f7f0f8d90578f68d0b3ac973b5040fb7afb501b5939f39b108b0569dca71488f5bbf498d92e4d1194f6f941307ffd95f75e76869f0e";
146146
//strMasternodePaymentsPubKey = "046f78dcf911fbd61910136f7f0f8d90578f68d0b3ac973b5040fb7afb501b5939f39b108b0569dca71488f5bbf498d92e4d1194f6f941307ffd95f75e76869f0e";
147147
strDarksendPoolDummyAddress = "c25gtaAQYBUNjYrxzZqNdyADSmwPPpWoLC";
148-
nLastPOWBlock = 0x7fffffff;
149-
nPOSStartBlock = 0x7fffffff;
148+
nLastPOWBlock = 788000;
149+
nPOSStartBlock = 4000;
150150
nMasternodePaymentStartBlock = 50;
151151
}
152152

src/clientversion.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#define CLIENT_VERSION_MAJOR 1
1010
#define CLIENT_VERSION_MINOR 0
1111
#define CLIENT_VERSION_REVISION 0
12-
#define CLIENT_VERSION_BUILD 0
12+
#define CLIENT_VERSION_BUILD 1
1313

1414
// Set to true for release, false for prerelease or test build
1515
#define CLIENT_VERSION_IS_RELEASE true

src/init.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ std::string HelpMessage()
199199
strUsage += " -proxy=<ip:port> " + _("Connect through SOCKS5 proxy") + "\n";
200200
strUsage += " -tor=<ip:port> " + _("Use proxy to reach tor hidden services (default: same as -proxy)") + "\n";
201201
strUsage += " -dns " + _("Allow DNS lookups for -addnode, -seednode and -connect") + "\n";
202-
strUsage += " -port=<port> " + _("Listen for connections on <port> (default: 42742)") + "\n";
202+
strUsage += " -port=<port> " + _("Listen for connections on <port> (default: 17720)") + "\n";
203203
strUsage += " -maxconnections=<n> " + _("Maintain at most <n> connections to peers (default: 125)") + "\n";
204204
strUsage += " -addnode=<ip> " + _("Add a node to connect to and attempt to keep the connection open") + "\n";
205205
strUsage += " -connect=<ip> " + _("Connect only to the specified node(s)") + "\n";
@@ -249,7 +249,7 @@ std::string HelpMessage()
249249
"solved instantly. This is intended for regression testing tools and app development.") + "\n";
250250
strUsage += " -rpcuser=<user> " + _("Username for JSON-RPC connections") + "\n";
251251
strUsage += " -rpcpassword=<pw> " + _("Password for JSON-RPC connections") + "\n";
252-
strUsage += " -rpcport=<port> " + _("Listen for JSON-RPC connections on <port> (default: 42746)") + "\n";
252+
strUsage += " -rpcport=<port> " + _("Listen for JSON-RPC connections on <port> (default: 17721)") + "\n";
253253
strUsage += " -rpcallowip=<ip> " + _("Allow JSON-RPC connections from specified IP address") + "\n";
254254
if (!fHaveGUI){
255255
strUsage += " -rpcconnect=<ip> " + _("Send commands to node running on <ip> (default: 127.0.0.1)") + "\n";
@@ -1125,13 +1125,13 @@ bool AppInit2(boost::thread_group& threadGroup)
11251125
if (fServer)
11261126
StartRPCThreads();
11271127

1128-
/*#ifdef ENABLE_WALLET
1128+
#ifdef ENABLE_WALLET
11291129
// Mine proof-of-stake blocks in the background
11301130
if (!GetBoolArg("-staking", true))
11311131
LogPrintf("Staking disabled\n");
11321132
else if (pwalletMain)
11331133
threadGroup.create_thread(boost::bind(&ThreadStakeMiner, pwalletMain));
1134-
#endif*/
1134+
#endif
11351135

11361136
// ********************************************************* Step 12: finished
11371137

src/main.cpp

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1359,12 +1359,10 @@ int64_t GetProofOfWorkReward(int nHeight, int64_t nFees)
13591359

13601360
if (nHeight == 1) {
13611361
nSubsidy = 2000000 * COIN;
1362-
} else if (nHeight > 1 && nHeight <= 300000) {
1362+
} else if (nHeight > 1 && nHeight <= 4000) {
13631363
nSubsidy = 20 * COIN;
1364-
} else if (nHeight > 300000 && nHeight <= 600000) {
1365-
nSubsidy = 50 * COIN;
13661364
} else {
1367-
nSubsidy = 10 * COIN;
1365+
nSubsidy = 15 * COIN;
13681366
}
13691367

13701368
return nSubsidy + nFees;
@@ -4478,7 +4476,7 @@ bool SendMessages(CNode* pto, bool fSendTrickle)
44784476

44794477
int64_t GetMasternodePayment(int nHeight, int64_t blockValue)
44804478
{
4481-
int64_t ret = blockValue * 1/2; //50%
4479+
int64_t ret = blockValue * 4/5;
44824480

44834481
return ret;
44844482
}

src/main.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class CValidationState;
2323
static const int64_t DARKSEND_COLLATERAL = (0.01*COIN);
2424
static const int64_t DARKSEND_POOL_MAX = (999.99*COIN);
2525

26-
static const int64_t STATIC_POS_REWARD = 1 * COIN;
26+
static const int64_t STATIC_POS_REWARD = 25 * COIN;
2727
static const int64_t TARGET_SPACING = 120;
2828

2929

src/miner.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ CBlock* CreateNewBlock(CReserveKey& reservekey, bool fProofOfStake, int64_t* pFe
355355

356356
if(!fProofOfStake) {
357357

358-
int payments = 1;
358+
/*int payments = 1;
359359
CScript payeerewardaddress = CScript();
360360
int payeerewardpercent = 0;
361361
@@ -418,10 +418,10 @@ CBlock* CreateNewBlock(CReserveKey& reservekey, bool fProofOfStake, int64_t* pFe
418418
CCropCoincoinAddress address4(address3);
419419
420420
LogPrintf("Masternode payment to %s\n", address2.ToString().c_str());
421-
}
421+
}*/
422422

423423
int64_t blockValue = GetProofOfWorkReward(pindexPrev->nHeight + 1, nFees);
424-
int64_t masternodePayment = GetMasternodePayment(pindexPrev->nHeight+1, blockValue);
424+
/*int64_t masternodePayment = GetMasternodePayment(pindexPrev->nHeight+1, blockValue);
425425
426426
// Set output amount
427427
@@ -436,7 +436,7 @@ CBlock* CreateNewBlock(CReserveKey& reservekey, bool fProofOfStake, int64_t* pFe
436436
pblock->vtx[0].vout[2].nValue = rewardAmount;
437437
pblock->vtx[0].vout[1].nValue = masternodePayment - rewardAmount;
438438
blockValue -= masternodePayment;
439-
}
439+
}*/
440440

441441
pblock->vtx[0].vout[0].nValue = blockValue;
442442
//pblocktemplate->vTxFees[0] = -nFees;

src/qt/bitcoingui.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,13 +199,13 @@ BitcoinGUI::BitcoinGUI(QWidget *parent):
199199
//frameBlocksLayout->addStretch();
200200

201201

202-
/* if (GetBoolArg("-staking", true))
202+
if (GetBoolArg("-staking", true))
203203
{
204204
QTimer *timerStakingIcon = new QTimer(labelStakingIcon);
205205
connect(timerStakingIcon, SIGNAL(timeout()), this, SLOT(updateStakingIcon()));
206206
timerStakingIcon->start(20 * 1000);
207207
updateStakingIcon();
208-
}*/
208+
}
209209

210210
// Progress bar and label for blocks download
211211
progressBarLabel = new QLabel();

0 commit comments

Comments
 (0)