AskDavis/Casinotest
1
0
Fork 0
mirror of https://github.com/AskDavis/Casinotest.git synced 2026-01-03 20:29:46 -08:00
Code Issues Packages Projects Releases Wiki Activity

resolved client version merge conflict

Browse Source
This commit is contained in:
qwerty55
2014-07-17 03:18:25 -04:00
parent 7300f8150a 2ff46aa40b
commit cc9e4439d6
6 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/clientversion.h
View File

@@ -7,8 +7,8 @@
// These need to be macros, as version.cpp's and bitcoin-qt.rc's voodoo requires it
#define CLIENT_VERSION_MAJOR 1
#define CLIENT_VERSION_MINOR 2
#define CLIENT_VERSION_REVISION 1
#define CLIENT_VERSION_MINOR 3
#define CLIENT_VERSION_REVISION 0
#define CLIENT_VERSION_BUILD 0
// Set to true for release, false for prerelease or test build

14
src/main.cpp
View File

@@ -1108,8 +1108,18 @@ int64 static GetBlockValue(int nHeight, int64 nFees)
nSubsidy = 45 * COIN;
}
// Subsidy is cut in half every 3153600 blocks, which will occur approximately every 3 years
nSubsidy >>= (nHeight / 3153600);
// Permantently reduce the number of mined coins to 10 after block 620000
if(nHeight > 620000){
if(nHeight < 3756000){
nSubsidy = 10 * COIN;
}
else
{
nSubsidy = 0 * COIN;
}
}
return nSubsidy + nFees;
}

2
src/main.h
View File

@@ -54,7 +54,7 @@ static const int64 DUST_SOFT_LIMIT = 100000; // 0.001 CSC
/** Dust Hard Limit, ignored as wallet inputs (mininput default) */
static const int64 DUST_HARD_LIMIT = 1000; // 0.00001 CSC mininput
/** No amount larger than this (in satoshi) is valid */
static const int64 MAX_MONEY = 336000000 * COIN;
static const int64 MAX_MONEY = 63000000 * COIN;
inline bool MoneyRange(int64 nValue) { return (nValue >= 0 && nValue <= MAX_MONEY); }
/** Coinbase transaction outputs can only be spent after this number of new blocks (network rule) */
static const int COINBASE_MATURITY = 8;

4
src/version.h
View File

@@ -25,13 +25,13 @@ extern const std::string CLIENT_DATE;
// network protocol versioning
//
static const int PROTOCOL_VERSION = 70003;
static const int PROTOCOL_VERSION = 70004;
// intial proto version, to be increased after version/verack negotiation
static const int INIT_PROTO_VERSION = 209;
// disconnect from peers older than this proto version
static const int MIN_PEER_PROTO_VERSION = 70003; // TODO: Change to 70003 before block 445000 to force new client downloading and therefore doing the actual hard fork
static const int MIN_PEER_PROTO_VERSION = 70004; // TODO: Change to 70003 before block 445000 to force new client downloading and therefore doing the actual hard fork
// nTime field added to CAddress, starting with this version;
// if possible, avoid requesting addresses nodes older than this