Skip to content
This repository was archived by the owner on Oct 31, 2018. It is now read-only.

Commit a3de872

Browse files
committed
Fast Transactions Update
Changes: Blocktime: 1min - 15s (After block 150k) Version: 3.0.1.0
1 parent 6ef40ed commit a3de872

2 files changed

Lines changed: 12 additions & 5 deletions

File tree

src/clientversion.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
//
77

88
// These need to be macros, as version.cpp's and bitcoin-qt.rc's voodoo requires it
9-
#define CLIENT_VERSION_MAJOR 2
9+
#define CLIENT_VERSION_MAJOR 3
1010
#define CLIENT_VERSION_MINOR 0
11-
#define CLIENT_VERSION_REVISION 0
11+
#define CLIENT_VERSION_REVISION 1
1212
#define CLIENT_VERSION_BUILD 0
1313

1414
// Converts the parameter X to a string after macro replacement on X has been performed.

src/main.cpp

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ CBigNum bnProofOfWorkLimitTestNet(~uint256(0) >> 16);
4242

4343
unsigned int nTargetSpacing = 60 * 2; // 2 minute
4444
unsigned int nTargetSpacing_v2 = 60 * 1; //1 minute
45+
unsigned int nTargetSpacing_v3 = 15; // 15s
4546
unsigned int nStakeMinAge = 60 * 60 * 24; //24h
4647
unsigned int nStakeMaxAge = -1; // unlimited
4748
unsigned int nModifierInterval = 10 * 60; // time to elapse before new modifier is computed
@@ -1244,15 +1245,21 @@ static unsigned int GetNextTargetRequiredV1(const CBlockIndex* pindexLast, bool
12441245

12451246
static unsigned int GetNextTargetRequiredV2(const CBlockIndex* pindexLast, bool fProofOfStake)
12461247
{
1247-
if (pindexBest->nHeight+1 >= 40000)
1248+
if (pindexBest->nHeight+1 <= 39999)
1249+
{
1250+
nTargetSpacing = nTargetSpacing;
1251+
}
1252+
else if (pindexBest->nHeight+1 <=149999)
12481253
{
12491254
nTargetSpacing = nTargetSpacing_v2;
12501255
}
1251-
else
1256+
else if (pindexBest->nHeight+1 >=150000)
12521257
{
1253-
nTargetSpacing = nTargetSpacing;
1258+
nTargetSpacing = nTargetSpacing_v3;
12541259
}
12551260

1261+
1262+
12561263
if (pindexBest->nHeight+1 >= 40000)
12571264
{
12581265
nTargetTimespan = nTargetTimespan_v2;

0 commit comments

Comments
 (0)