Skip to content

Commit 0cc65c6

Browse files
vish3vsvish3vs
committed
2.1.1
2.1.1 Reducing rewards.
1 parent 40f729a commit 0cc65c6

11 files changed

Lines changed: 17 additions & 32 deletions

File tree

‎.DS_Store‎

0 Bytes
Binary file not shown.

‎configure.ac‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
22
AC_PREREQ([2.60])
33
define(_CLIENT_VERSION_MAJOR, 2)
44
define(_CLIENT_VERSION_MINOR, 1)
5-
define(_CLIENT_VERSION_REVISION, 0)
5+
define(_CLIENT_VERSION_REVISION, 1)
66
define(_CLIENT_VERSION_BUILD, 0)
77
define(_CLIENT_VERSION_IS_RELEASE, true)
88
define(_COPYRIGHT_YEAR, 2017)

‎share/genbuild.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ else
1313
exit 1
1414
fi
1515

16-
DESC="2.1"
16+
DESC="2.1.1"
1717
SUFFIX=""
1818
LAST_COMMIT_DATE=""
1919
if [ -e "$(which git 2>/dev/null)" -a "$(git rev-parse --is-inside-work-tree 2>/dev/null)" = "true" ]; then

‎src/.DS_Store‎

6 KB
Binary file not shown.

‎src/clientversion.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
//! These need to be macros, as clientversion.cpp's and savenode*-res.rc's voodoo requires it
1818
#define CLIENT_VERSION_MAJOR 2
1919
#define CLIENT_VERSION_MINOR 1
20-
#define CLIENT_VERSION_REVISION 0
20+
#define CLIENT_VERSION_REVISION 1
2121
#define CLIENT_VERSION_BUILD 0
2222

2323
//! Set to true for release, false for prerelease or test build

‎src/main.cpp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2138,16 +2138,16 @@ int64_t GetBlockValue(int nHeight)
21382138
nSubsidy = 100 * COIN;
21392139
} else if (nHeight <= 100000 && nHeight > 60000) {
21402140
nSubsidy = 400 * COIN;
2141-
} else if (nHeight <= 150000 && nHeight > 100000) {
2142-
nSubsidy = 1200 * COIN;
2143-
} else if (nHeight <= 300000 && nHeight > 150000) {
2144-
nSubsidy = 2000 * COIN;
2145-
} else if (nHeight <= 1000000 && nHeight > 300000) {
2146-
nSubsidy = 750 * COIN;
2147-
} else if (nHeight <= 3000000 && nHeight > 1000000) {
2148-
nSubsidy = 500 * COIN;
2141+
} else if (nHeight <= 150000 && nHeight > 100000) { // Forking at block 100k
2142+
nSubsidy = 400 * COIN;
2143+
} else if (nHeight <= 200000 && nHeight > 150000) {
2144+
nSubsidy = 300 * COIN;
2145+
} else if (nHeight <= 300000 && nHeight > 200000) {
2146+
nSubsidy = 200 * COIN;
2147+
} else if (nHeight <= 1000000 && nHeight > 300000) {
2148+
nSubsidy = 100 * COIN;
21492149
} else {
2150-
nSubsidy = 10 * COIN;
2150+
nSubsidy = 50 * COIN;
21512151
}
21522152

21532153
// Check if we reached the coin max supply.

‎src/main.h‎

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -78,26 +78,11 @@ inline int64_t GetMstrNodCollateral(int nHeight){
7878
}
7979
else if(nHeight >= 100000 && nHeight < 150000)
8080
{
81-
return 16000;
81+
return 16000; // Forking at 100k
8282
}
83-
84-
else if(nHeight >= 150000 && nHeight < 300000)
85-
{
86-
return 32000;
87-
}
88-
else if(nHeight >= 300000 && nHeight < 1000000)
89-
{
90-
return 64000;
91-
}
92-
93-
else if(nHeight >= 1000000 && nHeight < 3000000)
94-
{
95-
return 100000;
96-
}
97-
9883
else
9984
{
100-
return 200000;
85+
return 32000;
10186
}
10287

10388
}

‎src/qt/.DS_Store‎

6 KB
Binary file not shown.

‎src/qt/res/.DS_Store‎

0 Bytes
Binary file not shown.

‎src/qt/res/images/about.png‎

41.6 KB
Loading

0 commit comments

Comments
 (0)