Skip to content

Commit 06d7eb9

Browse files
ClearNodeClearNode
committed
v1.1.0
updated reward structure
1 parent 4c50205 commit 06d7eb9

7 files changed

Lines changed: 118 additions & 117 deletions

File tree

‎README.md‎

Lines changed: 56 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -129,116 +129,116 @@ Explorer http://explorer.clearnodes.com
129129
</tr>
130130

131131
<tr height=21 style='mso-height-source:userset;height:15.75pt'>
132-
<td height=21 class=xl6417252 style='height:15.75pt'>80001-90000</td>
133-
<td class=xl6617252>31.25</td>
132+
<td height=21 class=xl6417252 style='height:15.75pt'>80001-100000</td>
133+
<td class=xl6617252>15</td>
134134
<td class=xl6617252>99.98</td>
135135
<td class=xl6617252>0.02</td>
136-
<td class=xl6717252 align=right>31.24375</td>
137-
<td class=xl6817252 align=right>0.00625</td>
136+
<td class=xl6717252 align=right>14.997</td>
137+
<td class=xl6817252 align=right>0.003</td>
138138
</tr>
139139
<tr height=21 style='mso-height-source:userset;height:15.75pt'>
140-
<td height=21 class=xl6417252 style='height:15.75pt'>90001-100000</td>
141-
<td class=xl6617252>50</td>
140+
<td height=21 class=xl6417252 style='height:15.75pt'>100001-120000</td>
141+
<td class=xl6617252>18</td>
142142
<td class=xl6617252>99.98</td>
143143
<td class=xl6617252>0.02</td>
144-
<td class=xl6717252 align=right>49.99</td>
145-
<td class=xl6817252 align=right>0.01</td>
144+
<td class=xl6717252 align=right>17.9964</td>
145+
<td class=xl6817252 align=right>0.0036</td>
146146
</tr>
147147
<tr height=21 style='mso-height-source:userset;height:15.75pt'>
148-
<td height=21 class=xl6417252 style='height:15.75pt'>100001-120000</td>
149-
<td class=xl6617252>100</td>
148+
<td height=21 class=xl6417252 style='height:15.75pt'>120001-145000</td>
149+
<td class=xl6617252>20</td>
150150
<td class=xl6617252>99.98</td>
151151
<td class=xl6617252>0.02</td>
152-
<td class=xl6717252 align=right>99.98</td>
153-
<td class=xl6817252 align=right>0.02</td>
152+
<td class=xl6717252 align=right>19.996</td>
153+
<td class=xl6817252 align=right>0.004</td>
154154
</tr>
155155
<tr height=21 style='mso-height-source:userset;height:15.75pt'>
156-
<td height=21 class=xl6417252 style='height:15.75pt'>120001-140000</td>
157-
<td class=xl6617252>150</td>
156+
<td height=21 class=xl6417252 style='height:15.75pt'>145001-170000</td>
157+
<td class=xl6617252>22</td>
158158
<td class=xl6617252>99.98</td>
159159
<td class=xl6617252>0.02</td>
160-
<td class=xl6717252 align=right>149.97</td>
161-
<td class=xl6817252 align=right>0.03</td>
160+
<td class=xl6717252 align=right>21.9956</td>
161+
<td class=xl6817252 align=right>0.0044</td>
162162
</tr>
163163
<tr height=21 style='mso-height-source:userset;height:15.75pt'>
164-
<td height=21 class=xl6417252 style='height:15.75pt'>140001-160000</td>
165-
<td class=xl6617252>200</td>
164+
<td height=21 class=xl6417252 style='height:15.75pt'>170001-200000</td>
165+
<td class=xl6617252>25</td>
166166
<td class=xl6617252>99.98</td>
167167
<td class=xl6617252>0.02</td>
168-
<td class=xl6717252 align=right>199.96</td>
169-
<td class=xl6817252 align=right>0.04</td>
168+
<td class=xl6717252 align=right>24.995</td>
169+
<td class=xl6817252 align=right>0.005</td>
170170
</tr>
171171
<tr height=21 style='mso-height-source:userset;height:15.75pt'>
172-
<td height=21 class=xl6417252 style='height:15.75pt'>160000-180000</td>
173-
<td class=xl6617252>250</td>
172+
<td height=21 class=xl6417252 style='height:15.75pt'>200000-230000</td>
173+
<td class=xl6617252>25</td>
174174
<td class=xl6617252>99.98</td>
175175
<td class=xl6617252>0.02</td>
176-
<td class=xl6717252 align=right>249.95</td>
177-
<td class=xl6817252 align=right>0.05</td>
176+
<td class=xl6717252 align=right>24.995</td>
177+
<td class=xl6817252 align=right>0.005</td>
178178
</tr>
179179
<tr height=21 style='mso-height-source:userset;height:15.75pt'>
180-
<td height=21 class=xl6417252 style='height:15.75pt'>180001-200000</td>
181-
<td class=xl6617252>312.5</td>
180+
<td height=21 class=xl6417252 style='height:15.75pt'>230001-265000</td>
181+
<td class=xl6617252>28</td>
182182
<td class=xl6617252>99.98</td>
183183
<td class=xl6617252>0.02</td>
184-
<td class=xl6717252 align=right>312.4375</td>
185-
<td class=xl6817252 align=right>0.0625</td>
184+
<td class=xl6717252 align=right>27.9944</td>
185+
<td class=xl6817252 align=right>0.0056</td>
186186
</tr>
187187
<tr height=21 style='mso-height-source:userset;height:15.75pt'>
188-
<td height=21 class=xl6417252 style='height:15.75pt'>200001-250000</td>
189-
<td class=xl6617252>375</td>
188+
<td height=21 class=xl6417252 style='height:15.75pt'>265001-300000</td>
189+
<td class=xl6617252>30</td>
190190
<td class=xl6617252>99.98</td>
191191
<td class=xl6617252>0.02</td>
192-
<td class=xl6717252 align=right>374.925</td>
193-
<td class=xl6817252 align=right>0.075</td>
192+
<td class=xl6717252 align=right>29.994</td>
193+
<td class=xl6817252 align=right>0.006</td>
194194
</tr>
195195
<tr height=21 style='mso-height-source:userset;height:15.75pt'>
196-
<td height=21 class=xl6417252 style='height:15.75pt'>250001-300000</td>
197-
<td class=xl6617252>500</td>
196+
<td height=21 class=xl6417252 style='height:15.75pt'>300001-350000</td>
197+
<td class=xl6617252>30</td>
198198
<td class=xl6617252>99.98</td>
199199
<td class=xl6617252>0.02</td>
200-
<td class=xl6717252 align=right>499.9</td>
201-
<td class=xl6817252 align=right>0.1</td>
200+
<td class=xl6717252 align=right>29.994</td>
201+
<td class=xl6817252 align=right>0.006</td>
202202
</tr>
203203
<tr height=21 style='mso-height-source:userset;height:15.75pt'>
204-
<td height=21 class=xl6417252 style='height:15.75pt'>300001-350000</td>
205-
<td class=xl6617252>625</td>
204+
<td height=21 class=xl6417252 style='height:15.75pt'>350001-400000</td>
205+
<td class=xl6617252>35</td>
206206
<td class=xl6617252>99.98</td>
207207
<td class=xl6617252>0.02</td>
208-
<td class=xl6717252 align=right>624.875</td>
209-
<td class=xl6817252 align=right>0.125</td>
208+
<td class=xl6717252 align=right>34.993</td>
209+
<td class=xl6817252 align=right>0.007</td>
210210
</tr>
211211
<tr height=21 style='mso-height-source:userset;height:15.75pt'>
212-
<td height=21 class=xl6417252 style='height:15.75pt'>350001-400000</td>
213-
<td class=xl6617252>750</td>
212+
<td height=21 class=xl6417252 style='height:15.75pt'>400001-450000</td>
213+
<td class=xl6617252>35</td>
214214
<td class=xl6617252>99.98</td>
215215
<td class=xl6617252>0.02</td>
216-
<td class=xl6717252 align=right>749.85</td>
217-
<td class=xl6817252 align=right>0.15</td>
216+
<td class=xl6717252 align=right>34.993</td>
217+
<td class=xl6817252 align=right>0.007</td>
218218
</tr>
219219
<tr height=21 style='mso-height-source:userset;height:15.75pt'>
220-
<td height=21 class=xl6417252 style='height:15.75pt'>400001-450000</td>
221-
<td class=xl6617252>875</td>
220+
<td height=21 class=xl6417252 style='height:15.75pt'>450001-500000</td>
221+
<td class=xl6617252>40</td>
222222
<td class=xl6617252>99.98</td>
223223
<td class=xl6617252>0.02</td>
224-
<td class=xl6717252 align=right>874.825</td>
225-
<td class=xl6817252 align=right>0.175</td>
224+
<td class=xl6717252 align=right>39.992</td>
225+
<td class=xl6817252 align=right>0.008</td>
226226
</tr>
227227
<tr height=21 style='mso-height-source:userset;height:15.75pt'>
228-
<td height=21 class=xl6417252 style='height:15.75pt'>450000-500000</td>
229-
<td class=xl6617252>1000</td>
228+
<td height=21 class=xl6417252 style='height:15.75pt'>500000-550000</td>
229+
<td class=xl6617252>45</td>
230230
<td class=xl6617252>99.98</td>
231231
<td class=xl6617252>0.02</td>
232-
<td class=xl6717252 align=right>999.8</td>
233-
<td class=xl6817252 align=right>0.2</td>
232+
<td class=xl6717252 align=right>44.991</td>
233+
<td class=xl6817252 align=right>0.009</td>
234234
</tr>
235235
<tr height=21 style='mso-height-source:userset;height:15.75pt'>
236-
<td height=21 class=xl6417252 style='height:15.75pt'>500001-</td>
237-
<td class=xl6617252>1125</td>
236+
<td height=21 class=xl6417252 style='height:15.75pt'>550001-</td>
237+
<td class=xl6617252>50</td>
238238
<td class=xl6617252>99.98</td>
239239
<td class=xl6617252>0.02</td>
240-
<td class=xl6717252 align=right>1124.775</td>
241-
<td class=xl6817252 align=right>0.225</td>
240+
<td class=xl6717252 align=right>49.99</td>
241+
<td class=xl6817252 align=right>0.01</td>
242242
</tr>
243243
</table>
244244

‎configure.ac‎

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

‎share/genbuild.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ git_check_in_repo() {
2222
! { git status --porcelain -uall --ignored "$@" 2>/dev/null || echo '??'; } | grep -q '?'
2323
}
2424

25-
DESC="1.0.0"
25+
DESC="1.1.0"
2626
SUFFIX=""
2727
LAST_COMMIT_DATE=""
2828
if [ "${BITCOIN_GENBUILD_NO_GIT}" != "1" -a -e "$(which git 2>/dev/null)" -a "$(git rev-parse --is-inside-work-tree 2>/dev/null)" = "true" ] && git_check_in_repo share/genbuild.sh; then

‎src/main.cpp‎

Lines changed: 23 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1905,36 +1905,28 @@ int64_t GetBlockValue(int nHeight)
19051905
nSubsidy = 6.25 * COIN;
19061906
} else if (nHeight <= 70000 && nHeight > 60000) {
19071907
nSubsidy = 8.75 * COIN;
1908-
} else if (nHeight <= 80000 && nHeight > 70000) {
1908+
}else if (nHeight <= 100000 && nHeight > 70000) {
19091909
nSubsidy = 15 * COIN;
1910-
} else if (nHeight <= 90000 && nHeight > 80000) {
1911-
nSubsidy = 31.25 * COIN;
1912-
} else if (nHeight <= 100000 && nHeight > 90000) {
1913-
nSubsidy = 50 * COIN;
1914-
} else if (nHeight <= 120000 && nHeight > 100000) {
1915-
nSubsidy = 100 * COIN;
1916-
} else if (nHeight <= 140000 && nHeight > 120000) {
1917-
nSubsidy = 150 * COIN;
1918-
} else if (nHeight <= 160000 && nHeight > 140000) {
1919-
nSubsidy = 200 * COIN;
1920-
} else if (nHeight <= 180000 && nHeight > 160000) {
1921-
nSubsidy = 250 * COIN;
1922-
} else if (nHeight <= 200000 && nHeight > 180000) {
1923-
nSubsidy = 312.5 * COIN;
1924-
} else if (nHeight <= 250000 && nHeight > 200000) {
1925-
nSubsidy = 375 * COIN;
1926-
} else if (nHeight <= 300000 && nHeight > 250000) {
1927-
nSubsidy = 500 * COIN;
1928-
} else if (nHeight <= 350000 && nHeight > 300000) {
1929-
nSubsidy = 625 * COIN;
1930-
} else if (nHeight <= 400000 && nHeight > 350000) {
1931-
nSubsidy = 750 * COIN;
1932-
} else if (nHeight <= 450000 && nHeight > 400000) {
1933-
nSubsidy = 875 * COIN;
1910+
}else if (nHeight <= 120000 && nHeight > 100000) {
1911+
nSubsidy = 18 * COIN;
1912+
} else if (nHeight <= 145000 && nHeight > 120000) {
1913+
nSubsidy = 20 * COIN;
1914+
} else if (nHeight <= 170000 && nHeight > 145000) {
1915+
nSubsidy = 22 * COIN;
1916+
} else if (nHeight <= 230000 && nHeight > 170000) {
1917+
nSubsidy = 25 * COIN;
1918+
} else if (nHeight <= 265000 && nHeight > 230000) {
1919+
nSubsidy = 28 * COIN;
1920+
} else if (nHeight <= 350000 && nHeight > 265000) {
1921+
nSubsidy = 30 * COIN;
1922+
} else if (nHeight <= 450000 && nHeight > 350000) {
1923+
nSubsidy = 35 * COIN;
19341924
} else if (nHeight <= 500000 && nHeight > 450000) {
1935-
nSubsidy = 1000 * COIN;
1925+
nSubsidy = 40 * COIN;
1926+
} else if (nHeight <= 550000 && nHeight > 500000) {
1927+
nSubsidy = 45 * COIN;
19361928
} else {
1937-
nSubsidy = 1125 * COIN;
1929+
nSubsidy = 50 * COIN;
19381930
}
19391931
return nSubsidy;
19401932
}
@@ -6640,12 +6632,12 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
66406632
int ActiveProtocol()
66416633
{
66426634
// SPORK_14 is used for 70913 (v3.1.0+)
6643-
if (IsSporkActive(SPORK_14_NEW_PROTOCOL_ENFORCEMENT))
6644-
return MIN_PEER_PROTO_VERSION_AFTER_ENFORCEMENT;
6635+
//if (IsSporkActive(SPORK_14_NEW_PROTOCOL_ENFORCEMENT))
6636+
// return MIN_PEER_PROTO_VERSION_AFTER_ENFORCEMENT;
66456637

66466638
// SPORK_15 was used for 70912 (v3.0.5+), commented out now.
6647-
//if (IsSporkActive(SPORK_15_NEW_PROTOCOL_ENFORCEMENT_2))
6648-
// return MIN_PEER_PROTO_VERSION_AFTER_ENFORCEMENT;
6639+
if (IsSporkActive(SPORK_15_NEW_PROTOCOL_ENFORCEMENT_2))
6640+
return MIN_PEER_PROTO_VERSION_AFTER_ENFORCEMENT;
66496641

66506642
return MIN_PEER_PROTO_VERSION_BEFORE_ENFORCEMENT;
66516643
}

‎src/main.h‎

Lines changed: 20 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -79,34 +79,30 @@ inline int64_t GetMasterNodeCollateral(int nHeight){
7979
return 1125;
8080
} else if (nHeight <= 80000 && nHeight > 70000) {
8181
return 1750;
82-
} else if (nHeight <= 90000 && nHeight > 80000) {
83-
return 3750;
84-
} else if (nHeight <= 100000 && nHeight > 90000) {
85-
return 6250;
82+
} else if (nHeight <= 100000 && nHeight > 80000) {
83+
return 2500;
8684
} else if (nHeight <= 120000 && nHeight > 100000) {
87-
return 12500;
88-
} else if (nHeight <= 140000 && nHeight > 120000) {
89-
return 18750;
90-
} else if (nHeight <= 160000 && nHeight > 140000) {
91-
return 25000;
92-
} else if (nHeight <= 180000 && nHeight > 160000) {
93-
return 31250;
94-
} else if (nHeight <= 200000 && nHeight > 180000) {
95-
return 37500;
96-
} else if (nHeight <= 250000 && nHeight > 200000) {
97-
return 50000;
98-
} else if (nHeight <= 300000 && nHeight > 250000) {
99-
return 62500;
85+
return 3500;
86+
} else if (nHeight <= 145000 && nHeight > 120000) {
87+
return 5000;
88+
} else if (nHeight <= 170000 && nHeight > 145000) {
89+
return 6500;
90+
} else if (nHeight <= 200000 && nHeight > 170000) {
91+
return 8000;
92+
} else if (nHeight <= 230000 && nHeight > 200000) {
93+
return 10000;
94+
} else if (nHeight <= 265000 && nHeight > 230000) {
95+
return 12000;
96+
} else if (nHeight <= 300000 && nHeight > 265000) {
97+
return 15000;
10098
} else if (nHeight <= 350000 && nHeight > 300000) {
101-
return 75000;
99+
return 20000;
102100
} else if (nHeight <= 400000 && nHeight > 350000) {
103-
return 87500;
104-
} else if (nHeight <= 450000 && nHeight > 400000) {
105-
return 100000;
106-
} else if (nHeight <= 500000 && nHeight > 450000) {
107-
return 112500;
101+
return 35000;
102+
} else if (nHeight <= 550000 && nHeight > 400000) {
103+
return 50000;
108104
}
109-
return 125000;
105+
return 50000;
110106
}
111107

112108
/** Default for -blockmaxsize and -blockminsize, which control the range of sizes the mining code will create **/

‎src/masternode-payments.cpp‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,20 @@ void CMasternodePayments::FillBlockPayee(CMutableTransaction& txNew, int64_t nFe
327327

328328
//subtract mn payment from the stake reward
329329
if (!txNew.vout[1].IsZerocoinMint())
330-
txNew.vout[i - 1].nValue -= masternodePayment;
330+
if (i == 2) {
331+
// Majority of cases; do it quick and move on
332+
txNew.vout[i - 1].nValue -= masternodePayment;
333+
} else if (i > 2) {
334+
// special case, stake is split between (i-1) outputs
335+
unsigned int outputs = i-1;
336+
CAmount mnPaymentSplit = masternodePayment / outputs;
337+
CAmount mnPaymentRemainder = masternodePayment - (mnPaymentSplit * outputs);
338+
for (unsigned int j=1; j<=outputs; j++) {
339+
txNew.vout[j].nValue -= mnPaymentSplit;
340+
}
341+
// in case it's not an even division, take the last bit of dust from the last one
342+
txNew.vout[outputs].nValue -= mnPaymentRemainder;
343+
}
331344
} else {
332345
txNew.vout.resize(2);
333346
txNew.vout[1].scriptPubKey = payee;

‎src/version.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
* network protocol versioning
1313
*/
1414

15-
static const int PROTOCOL_VERSION = 70914;
15+
static const int PROTOCOL_VERSION = 70916;
1616

1717
//! initial proto version, to be increased after version/verack negotiation
1818
static const int INIT_PROTO_VERSION = 209;
@@ -21,8 +21,8 @@ static const int INIT_PROTO_VERSION = 209;
2121
static const int GETHEADERS_VERSION = 70077;
2222

2323
//! disconnect from peers older than this proto version
24-
static const int MIN_PEER_PROTO_VERSION_BEFORE_ENFORCEMENT = 70912;
25-
static const int MIN_PEER_PROTO_VERSION_AFTER_ENFORCEMENT = 70914;
24+
static const int MIN_PEER_PROTO_VERSION_BEFORE_ENFORCEMENT = 70914;
25+
static const int MIN_PEER_PROTO_VERSION_AFTER_ENFORCEMENT = 70916;
2626

2727
//! masternodes older than this proto version use old strMessage format for mnannounce
2828
static const int MIN_PEER_MNANNOUNCE = 70913;

0 commit comments

Comments
 (0)