Skip to content

Commit 5e95f8d

Browse files
PastaPastaPastaPastaPastaPasta
committed
Merge #5914: chore: blockchain updates for v20.1: chainparams, seeds
97a331c chore: update chainparams for testnet (Konstantin Akimov) ca0c04d docs: update release process for generating seeds: new PR as a reference (Konstantin Akimov) 151b56e fix: uninitialized variable onions in makeseeds script (Konstantin Akimov) b8395aa chore: update seeds for v20.1 (Konstantin Akimov) 89f3a24 chore: update chainparams for v20.1 release (Konstantin Akimov) Pull request description: ## Issue being fixed or feature implemented Part of release process to update seeds and chainparams: https://github.com/dashpay/dash/blob/develop/doc/release-process.md ## Breaking Changes N/A ## Checklist: - [x] I have performed a self-review of my own code - [ ] I have commented my code, particularly in hard-to-understand areas - [ ] I have added or updated relevant unit/integration/functional/e2e tests - [x] I have made corresponding changes to the documentation - [x] I have assigned this pull request to a milestone Top commit has no ACKs. Tree-SHA512: 9ba600bbc5aefe2b0ed031a7f1c39d2b105f90b6ecb843c3ab27f0668caaa381dc54cb794f74d6069a72d4d9a3f73dcca782422a98b606b192e65b51fd39b35d
2 parents 533d82c + 97a331c commit 5e95f8d

File tree

5 files changed

+110
-115
lines changed

5 files changed

+110
-115
lines changed

‎contrib/seeds/makeseeds.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,7 @@ def main():
150150
else:
151151
mns = json.load(sys.stdin)
152152

153+
onions = []
153154
if len(sys.argv) > 2:
154155
with open(sys.argv[2], 'r', encoding="utf8") as f:
155156
onions = f.read().split('\n')

‎contrib/seeds/nodes_main.txt‎

Lines changed: 40 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -7,86 +7,97 @@ cmhr5r3lqhy7ic2ebeil66ftcz5u62zq5qhbfdz53l6sqxljh7zxntyd.onion:9999
77
216.250.97.52:9999
88
216.238.75.46:9999
99
216.230.232.125:9999
10-
216.189.154.7:9999
10+
216.189.154.8:9999
11+
216.107.217.62:9999
1112
213.168.249.174:9999
1213
212.52.0.210:9999
1314
212.24.110.128:9999
1415
212.24.107.223:9999
1516
207.244.247.40:9999
16-
206.168.213.205:9999
1717
206.168.213.109:9999
1818
206.168.212.226:9999
1919
206.168.212.178:9999
20+
206.168.212.144:9999
21+
202.5.18.203:9999
2022
195.181.211.64:9999
2123
195.98.95.210:9999
2224
194.158.71.228:9999
2325
194.135.81.214:9999
26+
194.5.157.214:9999
2427
193.164.149.50:9999
25-
193.31.30.62:9999
2628
193.29.59.96:9999
2729
193.29.57.21:9999
2830
192.169.6.87:9999
31+
192.64.83.140:9999
2932
188.208.196.183:9999
3033
188.127.237.243:9999
3134
188.127.230.40:9999
3235
188.68.223.94:9999
3336
185.243.115.219:9999
3437
185.228.83.156:9999
38+
185.217.127.139:9999
3539
185.216.13.118:9999
3640
185.213.24.34:9999
41+
185.185.40.249:9999
3742
185.165.171.117:9999
3843
185.164.163.218:9999
3944
185.164.163.85:9999
4045
185.155.99.34:9999
4146
185.142.212.144:9999
4247
185.135.80.200:9999
4348
185.103.132.7:9999
49+
185.87.149.61:9999
4450
185.28.101.145:9999
4551
178.208.87.226:9999
4652
178.208.87.213:9999
4753
178.159.2.12:9999
4854
178.157.91.179:9999
4955
178.157.91.176:9999
50-
178.157.91.126:9999
5156
178.128.254.204:9999
5257
178.63.121.129:9999
5358
178.62.235.117:9999
59+
176.126.127.16:9999
5460
176.126.127.15:9999
5561
176.102.65.145:9999
5662
174.34.233.207:9999
5763
174.34.233.206:9999
5864
174.34.233.204:9999
65+
174.34.233.203:9999
5966
173.249.21.122:9999
6067
172.105.21.21:9999
61-
172.104.90.249:9999
6268
168.119.80.4:9999
69+
167.88.169.16:9999
6370
165.22.234.135:9999
6471
155.133.23.221:9999
6572
150.158.48.6:9999
6673
145.239.20.176:9999
67-
144.91.127.166:9999
6874
142.202.205.95:9999
6975
133.18.228.84:9999
76+
130.162.233.186:9999
7077
130.61.120.252:9999
7178
128.199.181.159:9999
72-
109.235.70.133:9999
79+
123.193.64.166:9999
7380
109.235.70.100:9999
7481
109.235.69.170:9999
7582
109.235.65.95:9999
7683
106.55.9.22:9999
77-
104.238.35.117:9999
84+
104.238.35.116:9999
7885
104.238.35.114:9999
79-
104.225.159.232:9999
8086
103.160.95.249:9999
8187
103.160.95.225:9999
8288
103.160.95.219:9999
89+
95.211.196.46:9999
90+
95.211.196.32:9999
91+
95.211.196.8:9999
8392
95.183.53.44:9999
8493
95.183.52.98:9999
8594
95.183.51.141:9999
8695
93.21.76.185:9999
96+
91.137.11.31:9999
8797
89.179.73.96:9999
8898
89.117.19.10:9999
89-
89.73.152.14:9999
99+
89.73.105.198:9999
100+
89.40.4.87:9999
90101
87.98.253.86:9999
91102
85.215.107.202:9999
92103
85.209.241.190:9999
@@ -99,18 +110,19 @@ cmhr5r3lqhy7ic2ebeil66ftcz5u62zq5qhbfdz53l6sqxljh7zxntyd.onion:9999
99110
82.211.25.105:9999
100111
82.211.21.179:9999
101112
82.211.21.23:9999
113+
82.202.230.83:9999
102114
81.227.250.51:9999
103-
80.249.144.187:9999
104115
80.209.234.170:9999
116+
79.143.29.95:9999
105117
78.83.19.0:9999
106118
77.232.132.89:9999
107119
77.232.132.4:9999
108120
77.223.99.4:9999
121+
69.61.107.247:9999
109122
69.61.107.215:9999
110123
66.244.243.70:9999
111124
66.244.243.69:9999
112125
58.110.224.166:9999
113-
54.145.163.94:9999
114126
54.37.234.121:9999
115127
52.33.9.172:9999
116128
51.159.196.82:9999
@@ -119,28 +131,31 @@ cmhr5r3lqhy7ic2ebeil66ftcz5u62zq5qhbfdz53l6sqxljh7zxntyd.onion:9999
119131
51.15.117.42:9999
120132
51.15.96.206:9999
121133
47.243.56.197:9999
134+
47.109.109.166:9999
122135
46.254.241.28:9999
123136
46.254.241.21:9999
124137
46.254.241.6:9999
125138
46.254.241.4:9999
139+
46.250.249.32:9999
140+
46.72.31.9:9999
126141
46.36.40.242:9999
127142
46.30.189.251:9999
143+
46.30.189.214:9999
128144
46.30.189.213:9999
129-
46.30.189.116:9999
130145
46.10.241.191:9999
131146
46.4.162.127:9999
132-
45.93.139.117:9999
147+
45.140.19.201:9999
133148
45.91.94.217:9999
134149
45.86.163.42:9999
135-
45.85.117.45:9999
150+
45.83.122.122:9999
151+
45.79.40.205:9999
136152
45.77.169.207:9999
137153
45.76.83.91:9999
138154
45.71.159.104:9999
139155
45.71.158.108:9999
140156
45.71.158.58:9999
141157
45.63.107.90:9999
142158
45.58.56.221:9999
143-
45.58.52.33:9999
144159
45.33.24.24:9999
145160
45.11.182.64:9999
146161
45.8.250.154:9999
@@ -149,21 +164,26 @@ cmhr5r3lqhy7ic2ebeil66ftcz5u62zq5qhbfdz53l6sqxljh7zxntyd.onion:9999
149164
43.229.77.46:9999
150165
37.77.104.166:9999
151166
31.148.99.104:9999
167+
31.10.97.36:9999
152168
23.163.0.203:9999
153169
18.139.244.9:9999
170+
5.255.106.192:9999
154171
5.252.21.24:9999
155-
5.189.253.72:9999
156172
5.189.239.52:9999
157173
5.189.145.80:9999
158-
5.181.202.18:9999
159-
5.101.44.225:9999
174+
5.181.202.44:9999
175+
5.181.202.16:9999
176+
5.161.110.79:9999
177+
5.79.109.243:9999
160178
5.78.74.118:9999
161179
5.35.103.111:9999
162180
5.35.103.74:9999
163181
5.35.103.64:9999
164182
5.35.103.58:9999
165183
5.9.237.34:9999
166-
5.2.73.58:9999
167184
5.2.67.190:9999
185+
3.82.241.57:9999
168186
3.35.224.65:9999
187+
2.233.120.35:9999
169188
2.56.213.221:9999
189+
2.56.213.220:9999

‎doc/release-process.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Before every minor and major release:
2424

2525
Before every major release:
2626

27-
* [ ] Update hardcoded [seeds](/contrib/seeds/README.md), see [this pull request](https://github.com/dashpay/dash/pull/5692) for an example.
27+
* [ ] Update hardcoded [seeds](/contrib/seeds/README.md), see [this pull request](https://github.com/dashpay/dash/pull/5914) for an example.
2828
* [ ] Update [`src/chainparams.cpp`](/src/chainparams.cpp) `m_assumed_blockchain_size` and `m_assumed_chain_state_size` with the current size plus some overhead (see [this](#how-to-calculate-assumed-blockchain-and-chain-state-size) for information on how to calculate them).
2929
* [ ] Update [`src/chainparams.cpp`](/src/chainparams.cpp) `chainTxData` with statistics about the transaction count and rate. Use the output of the `getchaintxstats` RPC, see
3030
[this pull request](https://github.com/dashpay/dash/pull/5692) for an example. Reviewers can verify the results by running `getchaintxstats <window_block_count> <window_last_block_hash>` with the `window_block_count` and `window_last_block_hash` from your output.

‎src/chainparams.cpp‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -225,10 +225,10 @@ class CMainParams : public CChainParams {
225225
consensus.vDeployments[Consensus::DEPLOYMENT_MN_RR].useEHF = true;
226226

227227
// The best chain should have at least this much work.
228-
consensus.nMinimumChainWork = uint256S("0x000000000000000000000000000000000000000000008d970bc6cda0b02b30fc"); // 1969000
228+
consensus.nMinimumChainWork = uint256S("0x000000000000000000000000000000000000000000009134566d753c5e08ab88"); // 2029000
229229

230230
// By default assume that the signatures in ancestors of this block are valid.
231-
consensus.defaultAssumeValid = uint256S("0x000000000000000c8b7a3bdcd8b9f516462122314529c8342244c685a4c899bf"); // 1969000
231+
consensus.defaultAssumeValid = uint256S("0x0000000000000020d5e38b6aef5bc8e430029444d7977b46f710c7d281ef1281"); // 2029000
232232

233233
/**
234234
* The message start string is designed to be unlikely to occur in normal data.
@@ -334,19 +334,20 @@ class CMainParams : public CChainParams {
334334
{1850400, uint256S("0x00000000000000261bdbe99c01fcba992e577efa6cc41aae564b8ca9f112b2a3")},
335335
{1889000, uint256S("0x00000000000000075300e852d5bf5380f905b2768241f8b442498442084807a7")},
336336
{1969000, uint256S("0x000000000000000c8b7a3bdcd8b9f516462122314529c8342244c685a4c899bf")},
337+
{2029000, uint256S("0x0000000000000020d5e38b6aef5bc8e430029444d7977b46f710c7d281ef1281")},
337338
}
338339
};
339340

340341
m_assumeutxo_data = MapAssumeutxo{
341342
// TODO to be specified in a future patch.
342343
};
343344

344-
// getchaintxstats 17280 000000000000000c8b7a3bdcd8b9f516462122314529c8342244c685a4c899bf
345+
// getchaintxstats 17280 0000000000000020d5e38b6aef5bc8e430029444d7977b46f710c7d281ef1281
345346
chainTxData = ChainTxData{
346-
1699617498, // * UNIX timestamp of last known number of transactions (Block 1969000)
347-
49780131, // * total number of transactions between genesis and that timestamp
347+
1709075370, // * UNIX timestamp of last known number of transactions (Block 1969000)
348+
51654587, // * total number of transactions between genesis and that timestamp
348349
// (the tx=... number in the ChainStateFlushed debug.log lines)
349-
0.1256464722959867, // * estimated number of transactions per second after that timestamp
350+
0.1827081972006155, // * estimated number of transactions per second after that timestamp
350351
};
351352
}
352353
};
@@ -423,10 +424,10 @@ class CTestNetParams : public CChainParams {
423424
consensus.vDeployments[Consensus::DEPLOYMENT_MN_RR].useEHF = true;
424425

425426
// The best chain should have at least this much work.
426-
consensus.nMinimumChainWork = uint256S("0x00000000000000000000000000000000000000000000000002d68d24632e300f"); // 905100
427+
consensus.nMinimumChainWork = uint256S("0x00000000000000000000000000000000000000000000000002ecd6cf5ad0f774"); // 960000
427428

428429
// By default assume that the signatures in ancestors of this block are valid.
429-
consensus.defaultAssumeValid = uint256S("0x0000020c5e0f86f385cbf8e90210de9a9fd63633f01433bf47a6b3227a2851fd"); // 905100
430+
consensus.defaultAssumeValid = uint256S("0x0000000386cf5061ea16404c66deb83eb67892fa4f79b9e58e5eaab097ec2bd6"); // 960000
430431

431432
pchMessageStart[0] = 0xce;
432433
pchMessageStart[1] = 0xe2;
@@ -507,19 +508,20 @@ class CTestNetParams : public CChainParams {
507508
{840000, uint256S("0x000000cd7c3084499912ae893125c13e8c3c656abb6e511dcec6619c3d65a510")},
508509
{851000, uint256S("0x0000014d3b875540ff75517b7fbb1714e25d50ce92f65d7086cfce357928bb02")},
509510
{905100, uint256S("0x0000020c5e0f86f385cbf8e90210de9a9fd63633f01433bf47a6b3227a2851fd")},
511+
{960000, uint256S("0x0000000386cf5061ea16404c66deb83eb67892fa4f79b9e58e5eaab097ec2bd6")},
510512
}
511513
};
512514

513515
m_assumeutxo_data = MapAssumeutxo{
514516
// TODO to be specified in a future patch.
515517
};
516518

517-
// getchaintxstats 17280 0000020c5e0f86f385cbf8e90210de9a9fd63633f01433bf47a6b3227a2851fd
519+
// getchaintxstats 17280 0000000386cf5061ea16404c66deb83eb67892fa4f79b9e58e5eaab097ec2bd6
518520
chainTxData = ChainTxData{
519-
1698870742, // * UNIX timestamp of last known number of transactions (Block 905100)
520-
5952838, // * total number of transactions between genesis and that timestamp
521+
1706545657, // * UNIX timestamp of last known number of transactions (Block 905100)
522+
6159236, // * total number of transactions between genesis and that timestamp
521523
// (the tx=... number in the ChainStateFlushed debug.log lines)
522-
0.009046572717013628, // * estimated number of transactions per second after that timestamp
524+
0.02150786927638326, // * estimated number of transactions per second after that timestamp
523525
};
524526
}
525527
};

0 commit comments

Comments
 (0)