rc1.0.0.1

This commit is contained in:
2017-12-28 04:48:48 +00:00
parent f684400067
commit 47764b053b
2 changed files with 3 additions and 3 deletions
+1 -1
View File
@@ -1000,7 +1000,7 @@ uint256 WantedByOrphan(const CBlock* pblockOrphan)
// miner's coin base reward // miner's coin base reward
int64_t GetProofOfWorkReward(int64_t nFees) int64_t GetProofOfWorkReward(int64_t nFees)
{ {
int64_t nSubsidy = 1500 * COIN; int64_t nSubsidy = 90 * COIN;
if (fDebug && GetBoolArg("-printcreation")) if (fDebug && GetBoolArg("-printcreation"))
printf("GetProofOfWorkReward() : create=%s nSubsidy=%"PRId64"\n", FormatMoney(nSubsidy).c_str(), nSubsidy); printf("GetProofOfWorkReward() : create=%s nSubsidy=%"PRId64"\n", FormatMoney(nSubsidy).c_str(), nSubsidy);
+2 -2
View File
@@ -28,7 +28,7 @@ class CNode;
class CTxMemPool; class CTxMemPool;
static const int LAST_POW_BLOCK = 35000000; static const int LAST_POW_BLOCK = 52560000;
/** The maximum allowed size for a serialized block, in bytes (network rule) */ /** The maximum allowed size for a serialized block, in bytes (network rule) */
static const unsigned int MAX_BLOCK_SIZE = 1000000; static const unsigned int MAX_BLOCK_SIZE = 1000000;
@@ -47,7 +47,7 @@ static const int64_t MIN_TX_FEE = 10000;
/** Fees smaller than this (in satoshi) are considered zero fee (for relaying) */ /** Fees smaller than this (in satoshi) are considered zero fee (for relaying) */
static const int64_t MIN_RELAY_TX_FEE = MIN_TX_FEE; static const int64_t MIN_RELAY_TX_FEE = MIN_TX_FEE;
/** No amount larger than this (in satoshi) is valid */ /** No amount larger than this (in satoshi) is valid */
static const int64_t MAX_MONEY = 126039676160 * COIN; static const int64_t MAX_MONEY = 25000000000 * COIN;
inline bool MoneyRange(int64_t nValue) { return (nValue >= 0 && nValue <= MAX_MONEY); } inline bool MoneyRange(int64_t nValue) { return (nValue >= 0 && nValue <= MAX_MONEY); }
/** Threshold for nLockTime: below this value it is interpreted as block number, otherwise as UNIX timestamp. */ /** Threshold for nLockTime: below this value it is interpreted as block number, otherwise as UNIX timestamp. */
static const unsigned int LOCKTIME_THRESHOLD = 500000000; // Tue Nov 5 00:53:20 1985 UTC static const unsigned int LOCKTIME_THRESHOLD = 500000000; // Tue Nov 5 00:53:20 1985 UTC