Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: blockchain updates for v20.1: chainparams, seeds #5914

Merged
merged 5 commits into from
Mar 4, 2024
Merged

chore: blockchain updates for v20.1: chainparams, seeds #5914

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
89f3a24
chore: update chainparams for v20.1 release
knst Feb 29, 2024
b8395aa
chore: update seeds for v20.1
knst Feb 29, 2024
151b56e
fix: uninitialized variable onions in makeseeds script
knst Feb 29, 2024
ca0c04d
docs: update release process for generating seeds: new PR as a reference
knst Feb 29, 2024
97a331c
chore: update chainparams for testnet
knst Feb 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions contrib/seeds/makeseeds.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@ def main():
else:
mns = json.load(sys.stdin)

onions = []
if len(sys.argv) > 2:
with open(sys.argv[2], 'r', encoding="utf8") as f:
onions = f.read().split('\n')
Expand Down
60 changes: 40 additions & 20 deletions contrib/seeds/nodes_main.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,86 +7,97 @@ cmhr5r3lqhy7ic2ebeil66ftcz5u62zq5qhbfdz53l6sqxljh7zxntyd.onion:9999
216.250.97.52:9999
216.238.75.46:9999
216.230.232.125:9999
216.189.154.7:9999
216.189.154.8:9999
216.107.217.62:9999
213.168.249.174:9999
212.52.0.210:9999
212.24.110.128:9999
212.24.107.223:9999
207.244.247.40:9999
206.168.213.205:9999
206.168.213.109:9999
206.168.212.226:9999
206.168.212.178:9999
206.168.212.144:9999
202.5.18.203:9999
195.181.211.64:9999
195.98.95.210:9999
194.158.71.228:9999
194.135.81.214:9999
194.5.157.214:9999
193.164.149.50:9999
193.31.30.62:9999
193.29.59.96:9999
193.29.57.21:9999
192.169.6.87:9999
192.64.83.140:9999
188.208.196.183:9999
188.127.237.243:9999
188.127.230.40:9999
188.68.223.94:9999
185.243.115.219:9999
185.228.83.156:9999
185.217.127.139:9999
185.216.13.118:9999
185.213.24.34:9999
185.185.40.249:9999
185.165.171.117:9999
185.164.163.218:9999
185.164.163.85:9999
185.155.99.34:9999
185.142.212.144:9999
185.135.80.200:9999
185.103.132.7:9999
185.87.149.61:9999
185.28.101.145:9999
178.208.87.226:9999
178.208.87.213:9999
178.159.2.12:9999
178.157.91.179:9999
178.157.91.176:9999
178.157.91.126:9999
178.128.254.204:9999
178.63.121.129:9999
178.62.235.117:9999
176.126.127.16:9999
176.126.127.15:9999
176.102.65.145:9999
174.34.233.207:9999
174.34.233.206:9999
174.34.233.204:9999
174.34.233.203:9999
173.249.21.122:9999
172.105.21.21:9999
172.104.90.249:9999
168.119.80.4:9999
167.88.169.16:9999
165.22.234.135:9999
155.133.23.221:9999
150.158.48.6:9999
145.239.20.176:9999
144.91.127.166:9999
142.202.205.95:9999
133.18.228.84:9999
130.162.233.186:9999
130.61.120.252:9999
128.199.181.159:9999
109.235.70.133:9999
123.193.64.166:9999
109.235.70.100:9999
109.235.69.170:9999
109.235.65.95:9999
106.55.9.22:9999
104.238.35.117:9999
104.238.35.116:9999
104.238.35.114:9999
104.225.159.232:9999
103.160.95.249:9999
103.160.95.225:9999
103.160.95.219:9999
95.211.196.46:9999
95.211.196.32:9999
95.211.196.8:9999
95.183.53.44:9999
95.183.52.98:9999
95.183.51.141:9999
93.21.76.185:9999
91.137.11.31:9999
89.179.73.96:9999
89.117.19.10:9999
89.73.152.14:9999
89.73.105.198:9999
89.40.4.87:9999
87.98.253.86:9999
85.215.107.202:9999
85.209.241.190:9999
Expand All @@ -99,18 +110,19 @@ cmhr5r3lqhy7ic2ebeil66ftcz5u62zq5qhbfdz53l6sqxljh7zxntyd.onion:9999
82.211.25.105:9999
82.211.21.179:9999
82.211.21.23:9999
82.202.230.83:9999
81.227.250.51:9999
80.249.144.187:9999
80.209.234.170:9999
79.143.29.95:9999
78.83.19.0:9999
77.232.132.89:9999
77.232.132.4:9999
77.223.99.4:9999
69.61.107.247:9999
69.61.107.215:9999
66.244.243.70:9999
66.244.243.69:9999
58.110.224.166:9999
54.145.163.94:9999
54.37.234.121:9999
52.33.9.172:9999
51.159.196.82:9999
Expand All @@ -119,28 +131,31 @@ cmhr5r3lqhy7ic2ebeil66ftcz5u62zq5qhbfdz53l6sqxljh7zxntyd.onion:9999
51.15.117.42:9999
51.15.96.206:9999
47.243.56.197:9999
47.109.109.166:9999
46.254.241.28:9999
46.254.241.21:9999
46.254.241.6:9999
46.254.241.4:9999
46.250.249.32:9999
46.72.31.9:9999
46.36.40.242:9999
46.30.189.251:9999
46.30.189.214:9999
46.30.189.213:9999
46.30.189.116:9999
46.10.241.191:9999
46.4.162.127:9999
45.93.139.117:9999
45.140.19.201:9999
45.91.94.217:9999
45.86.163.42:9999
45.85.117.45:9999
45.83.122.122:9999
45.79.40.205:9999
45.77.169.207:9999
45.76.83.91:9999
45.71.159.104:9999
45.71.158.108:9999
45.71.158.58:9999
45.63.107.90:9999
45.58.56.221:9999
45.58.52.33:9999
45.33.24.24:9999
45.11.182.64:9999
45.8.250.154:9999
Expand All @@ -149,21 +164,26 @@ cmhr5r3lqhy7ic2ebeil66ftcz5u62zq5qhbfdz53l6sqxljh7zxntyd.onion:9999
43.229.77.46:9999
37.77.104.166:9999
31.148.99.104:9999
31.10.97.36:9999
23.163.0.203:9999
18.139.244.9:9999
5.255.106.192:9999
5.252.21.24:9999
5.189.253.72:9999
5.189.239.52:9999
5.189.145.80:9999
5.181.202.18:9999
5.101.44.225:9999
5.181.202.44:9999
5.181.202.16:9999
5.161.110.79:9999
5.79.109.243:9999
5.78.74.118:9999
5.35.103.111:9999
5.35.103.74:9999
5.35.103.64:9999
5.35.103.58:9999
5.9.237.34:9999
5.2.73.58:9999
5.2.67.190:9999
3.82.241.57:9999
3.35.224.65:9999
2.233.120.35:9999
2.56.213.221:9999
2.56.213.220:9999
2 changes: 1 addition & 1 deletion doc/release-process.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Before every minor and major release:

Before every major release:

* [ ] Update hardcoded [seeds](/contrib/seeds/README.md), see [this pull request](https://github.com/dashpay/dash/pull/5692) for an example.
* [ ] Update hardcoded [seeds](/contrib/seeds/README.md), see [this pull request](https://github.com/dashpay/dash/pull/5914) for an example.
* [ ] 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).
* [ ] Update [`src/chainparams.cpp`](/src/chainparams.cpp) `chainTxData` with statistics about the transaction count and rate. Use the output of the `getchaintxstats` RPC, see
[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.
Expand Down
26 changes: 14 additions & 12 deletions src/chainparams.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,10 +225,10 @@ class CMainParams : public CChainParams {
consensus.vDeployments[Consensus::DEPLOYMENT_MN_RR].useEHF = true;

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

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

/**
* The message start string is designed to be unlikely to occur in normal data.
Expand Down Expand Up @@ -334,19 +334,20 @@ class CMainParams : public CChainParams {
{1850400, uint256S("0x00000000000000261bdbe99c01fcba992e577efa6cc41aae564b8ca9f112b2a3")},
{1889000, uint256S("0x00000000000000075300e852d5bf5380f905b2768241f8b442498442084807a7")},
{1969000, uint256S("0x000000000000000c8b7a3bdcd8b9f516462122314529c8342244c685a4c899bf")},
{2029000, uint256S("0x0000000000000020d5e38b6aef5bc8e430029444d7977b46f710c7d281ef1281")},
}
};

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

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

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

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

pchMessageStart[0] = 0xce;
pchMessageStart[1] = 0xe2;
Expand Down Expand Up @@ -507,19 +508,20 @@ class CTestNetParams : public CChainParams {
{840000, uint256S("0x000000cd7c3084499912ae893125c13e8c3c656abb6e511dcec6619c3d65a510")},
{851000, uint256S("0x0000014d3b875540ff75517b7fbb1714e25d50ce92f65d7086cfce357928bb02")},
{905100, uint256S("0x0000020c5e0f86f385cbf8e90210de9a9fd63633f01433bf47a6b3227a2851fd")},
{960000, uint256S("0x0000000386cf5061ea16404c66deb83eb67892fa4f79b9e58e5eaab097ec2bd6")},
}
};

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

// getchaintxstats 17280 0000020c5e0f86f385cbf8e90210de9a9fd63633f01433bf47a6b3227a2851fd
// getchaintxstats 17280 0000000386cf5061ea16404c66deb83eb67892fa4f79b9e58e5eaab097ec2bd6
chainTxData = ChainTxData{
1698870742, // * UNIX timestamp of last known number of transactions (Block 905100)
5952838, // * total number of transactions between genesis and that timestamp
1706545657, // * UNIX timestamp of last known number of transactions (Block 905100)
6159236, // * total number of transactions between genesis and that timestamp
// (the tx=... number in the ChainStateFlushed debug.log lines)
0.009046572717013628, // * estimated number of transactions per second after that timestamp
0.02150786927638326, // * estimated number of transactions per second after that timestamp
};
}
};
Expand Down
Loading
Loading