Skip to content

Commit ebfdb8b

Browse files
Merge #7379: chore: merge master 23.1.5 back into develop
01640b9 chore: prepare v23.1.5 release (PastaClaw) c3e3b9d fix: correct v23.1.4 checkpoint hash (PastaClaw) 10b6309 docs: use standard bug fixes wording (PastaClaw) 0495b47 docs: refine v23.1.4 release intro (PastaClaw) 3826688 docs: fix v23.1.4 release notes title (PastaClaw) 2068176 Merge #7317: fix: drop `virtual` specifier for `CZMQNotificationInterface` dtor (pasta) 9a463a2 test: early bail-out for huge QSIGSHARESINV and QGETSIGSHARES (Konstantin Akimov) 3426458 fix: early bail-out for huge QSIGSHARESINV and QGETSIGSHARES (Konstantin Akimov) b9c6b95 chore: version bump, man pages, flatpak, release notes for release v23.1.4 (Konstantin Akimov) 6f7a0ef chore: version bump, man pages, flatpak, release notes for release v23.1.4 (Konstantin Akimov) 78bb4c4 Merge #7359: fix: make huge asset lock tx non-standard (pasta) 5962016 chore: update min-chainwork, checkpoints and seeds for v23.1.4 (Konstantin Akimov) 99305fb test: add test for duplicated platform-node-id in mempool (Konstantin Akimov) 78b8274 fix: don't let 2 protx with the same platform-id to be presented in mempool (Konstantin Akimov) 54187cd perf: avoid re-validation of ehf signals during block-connect (Konstantin Akimov) 47fa631 Merge #7352: perf: optimize division to uint32 to make re-target-pow calculation much faster (pasta) d93f755 Merge #7332: fix: remove cs_main from MaybePunishNodeForTx, missing changes from bitcoin#19607 (pasta) Pull request description: # chore: merge master 23.1.5 back into develop ## Issue being fixed or feature implemented Backmerge current `master` into `develop` so the active development branch includes the `v23.1.4` and `v23.1.5` release-line changes. ## What was done? Merged `upstream/master` (`v23.1.5`, `5dde61050d20c23c3e179c34e663a025f56843f3`) into `upstream/develop`. Carried forward release metadata and generated artifacts for `v23.1.4` and `v23.1.5`, including version metadata, man pages, release notes, checkpoints, chainTxData, minimum chain work, assume-valid data, and seed updates. Resolved conflicts in Dash-specific code while preserving develop-only refactors: - Kept develop's `CChainstateHelper` ownership layout and `SuperblockManager` integration. - Carried forward the EHF block-connect optimization without reintroducing the removed `CMNHFManager` quorum-manager member. - Carried forward the LLMQ signing-share inventory bounds into develop's `NetSigning` split. - Carried forward the Platform node ID mempool conflict handling and its functional test coverage. ## How Has This Been Tested? - Ran `git diff --check upstream/develop...HEAD`. - Scanned changed files for conflict markers. - Verified the corrected `CMNHFManager` constructor call after conflict resolution. - Ran the required pre-PR `code-review` gate against the backmerge branch; final recommendation was `ship` with no significant issues found. No local build was run; this is a release backmerge and CI should run the full Dash Core PR build/test matrix. ## Breaking Changes None expected. This is a backmerge from the release branch into `develop`. ## Checklist - [x] I have performed a self-review of my own code - [ ] I have commented my code, particularly in hard-to-understand areas - [x] I have added or updated relevant unit/integration/functional/e2e tests - [x] I have made corresponding changes to the documentation - [ ] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_ Top commit has no ACKs. Tree-SHA512: 1a828c9acd5fe87617f3ab11ca1b5b13656adc61e591b58d68b685bba7404696afa664c53cc752dfbaca7fe08439d9428f33116f475c18c0959293460062b284
2 parents 7e32409 + 22a3321 commit ebfdb8b

25 files changed

Lines changed: 474 additions & 493 deletions

configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ AC_PREREQ([2.69])
22
dnl Don't forget to push a corresponding tag when updating any of _CLIENT_VERSION_* numbers
33
define(_CLIENT_VERSION_MAJOR, 23)
44
define(_CLIENT_VERSION_MINOR, 1)
5-
define(_CLIENT_VERSION_BUILD, 3)
5+
define(_CLIENT_VERSION_BUILD, 5)
66
define(_CLIENT_VERSION_IS_RELEASE, false)
77
define(_COPYRIGHT_YEAR, 2026)
88
define(_COPYRIGHT_HOLDERS,[The %s developers])

contrib/flatpak/org.dash.dash-core.metainfo.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
</screenshot>
2222
</screenshots>
2323
<releases>
24+
<release date="2026-06-19" version="23.1.5"/>
25+
<release date="2026-06-13" version="23.1.4"/>
2426
<release date="2026-05-15" version="23.1.3"/>
2527
<release date="2026-03-12" version="23.1.2"/>
2628
<release date="2026-02-18" version="23.1.0"/>

contrib/seeds/nodes_main.txt

Lines changed: 39 additions & 191 deletions
Original file line numberDiff line numberDiff line change
@@ -23,325 +23,173 @@ ayhwwpjq4rg3bslbtt7yejqyhucyaqsbb7tn45blh4r7xj62wfonryqd.onion:9999
2323
3uvcjymiixi6n6m2p6fsgyjxkx2ceaesd7eopi3p7jn364i5z646koid.onion:9999
2424
3cova3snmiydrdaqrszj5krnujpwgkueh2kjodun4hvixk3y5l5zmgid.onion:9999
2525
2br37z5ilg3i3rawwkznmh6lhczboql5zdrfgmkaxns4tpfrxmu6s5yd.onion:9999
26-
216.250.97.52:9999
27-
216.238.82.108:9999
26+
217.154.231.20:9999
2827
216.238.75.46:9999
29-
216.238.73.67:9999
3028
216.230.232.125:9999
31-
216.189.157.22:9999
32-
216.106.186.179:9999
33-
216.106.186.131:9999
34-
213.171.15.125:9999
35-
213.159.77.221:9999
36-
212.71.239.75:9999
37-
212.52.0.210:9999
38-
212.24.109.253:9999
29+
212.132.105.190:9999
3930
212.24.104.225:9999
4031
209.141.36.206:9999
4132
208.87.102.91:9999
42-
208.87.102.89:9999
4333
207.244.247.40:9999
44-
207.180.233.6:9999
45-
205.206.255.206:9999
46-
205.206.254.21:9999
47-
202.182.105.95:9999
4834
202.71.14.79:9999
4935
202.5.16.33:9999
50-
198.244.213.69:9999
5136
195.98.95.210:9999
5237
195.26.254.228:9999
38+
194.238.25.199:9999
5339
194.135.84.100:9999
54-
194.135.80.33:9999
5540
194.5.157.214:9999
56-
193.160.119.129:9999
5741
192.175.127.198:9999
5842
192.169.6.87:9999
59-
191.101.2.231:9999
60-
188.244.117.12:9999
61-
188.166.182.47:9999
62-
188.40.205.3:9999
63-
185.252.234.238:9999
6443
185.243.115.219:9999
6544
185.228.83.156:9999
6645
185.228.83.132:9999
67-
185.213.24.34:9999
68-
185.198.234.25:9999
69-
185.198.234.17:9999
70-
185.198.234.12:9999
46+
185.216.179.5:9999
7147
185.193.19.214:9999
72-
185.185.40.171:9999
73-
185.185.40.167:9999
7448
185.185.40.104:9999
75-
185.185.40.14:9999
7649
185.166.217.154:9999
7750
185.165.171.117:9999
78-
185.164.163.220:9999
7951
185.164.163.218:9999
80-
185.164.163.217:9999
8152
185.164.163.85:9999
82-
185.164.163.59:9999
83-
185.141.216.4:9999
8453
185.112.249.53:9999
85-
185.112.249.52:9999
86-
185.112.249.51:9999
8754
185.112.249.49:9999
8855
185.28.101.145:9999
8956
184.107.182.198:9999
90-
178.253.42.64:9999
57+
178.253.253.5:9999
9158
178.215.237.135:9999
9259
178.215.237.134:9999
9360
178.208.87.226:9999
94-
178.208.87.225:9999
9561
178.208.87.213:9999
96-
178.208.87.72:9999
97-
178.208.87.33:9999
98-
178.157.91.184:9999
99-
178.157.91.178:9999
10062
178.157.91.177:9999
10163
178.63.121.129:9999
102-
178.62.171.16:9999
10364
177.93.141.86:9999
10465
177.93.141.60:9999
10566
176.102.65.145:9999
106-
173.212.245.118:9999
107-
173.212.232.90:9999
10867
172.238.7.25:9999
10968
172.236.244.81:9999
11069
172.104.145.166:9999
11170
172.86.91.158:9999
11271
172.86.73.160:9999
11372
168.119.87.196:9999
11473
168.119.80.4:9999
115-
167.71.229.90:9999
74+
167.104.216.28:9999
75+
167.88.169.16:9999
11676
165.22.234.135:9999
11777
165.22.221.97:9999
11878
163.172.66.41:9999
119-
162.250.191.31:9999
120-
162.212.35.104:9999
121-
162.212.35.100:9999
122-
161.35.17.210:9999
123-
159.89.122.128:9999
79+
161.97.165.115:9999
12480
159.75.121.163:9999
81+
154.16.63.112:9999
12582
152.67.95.184:9999
126-
151.244.85.229:9999
127-
151.244.85.197:9999
83+
151.244.85.219:9999
84+
151.244.85.195:9999
12885
151.244.85.178:9999
12986
151.244.85.123:9999
130-
151.244.85.64:9999
131-
151.244.85.48:9999
132-
149.28.241.190:9999
133-
147.93.132.12:9999
134-
147.93.131.52:9999
135-
147.45.183.128:9999
136-
147.45.103.99:9999
137-
146.59.153.204:9999
138-
146.59.45.235:9999
139-
144.126.143.197:9999
140-
144.126.141.62:9999
87+
149.104.110.119:9999
88+
147.45.41.210:9999
89+
144.31.188.42:9999
14190
144.24.238.178:9999
142-
142.179.162.14:9999
143-
142.93.149.185:9999
144-
139.162.215.169:9999
145-
139.162.211.76:9999
146-
139.28.97.2:9999
14791
136.244.99.17:9999
148-
136.243.142.39:9999
149-
136.243.142.35:9999
150-
135.181.8.82:9999
151-
134.255.182.186:9999
15292
133.18.97.226:9999
93+
132.243.197.240:9999
94+
132.243.197.179:9999
95+
132.243.197.99:9999
96+
132.243.197.23:9999
97+
130.255.155.163:9999
15398
130.162.233.186:9999
15499
123.193.64.166:9999
155100
115.190.248.57:9999
156-
115.120.238.240:9999
157101
114.132.172.215:9999
158102
109.235.67.246:9999
159-
109.199.96.61:9999
160-
109.173.240.233:9999
103+
108.160.131.192:9999
161104
107.189.3.74:9999
162105
107.179.202.74:9999
163-
107.174.204.106:9999
106+
107.174.204.232:9999
164107
107.170.254.160:9999
165108
106.55.9.22:9999
166109
104.234.167.115:9999
167-
100.42.182.181:9999
168-
95.183.51.141:9999
169-
95.171.21.131:9999
170-
94.172.109.161:9999
171110
93.115.172.39:9999
172-
93.115.172.38:9999
173111
93.115.172.37:9999
174-
92.255.76.59:9999
175-
92.53.120.89:9999
176-
91.239.5.12:9999
177112
91.199.149.177:9999
178113
91.198.108.40:9999
179114
91.198.108.39:9999
180-
91.198.108.38:9999
181115
91.198.108.37:9999
182-
91.198.108.36:9999
183116
91.198.108.35:9999
117+
91.184.249.209:9999
184118
89.179.73.96:9999
185119
89.125.209.195:9999
186-
89.125.209.178:9999
187-
89.125.209.120:9999
188120
89.125.209.110:9999
189-
89.125.209.106:9999
190121
89.125.209.69:9999
122+
89.117.57.27:9999
191123
89.117.3.242:9999
192-
89.47.167.131:9999
193124
89.46.42.218:9999
194-
89.46.42.216:9999
195-
89.40.15.222:9999
196125
89.35.131.149:9999
197-
89.35.131.61:9999
198-
89.35.131.39:9999
199126
87.228.24.64:9999
200127
85.209.241.245:9999
201-
85.209.241.235:9999
202-
85.209.241.234:9999
203-
85.209.241.198:9999
204-
85.209.241.185:9999
205128
85.209.241.93:9999
206129
85.209.241.87:9999
207130
85.209.241.86:9999
208-
85.209.241.73:9999
209-
85.209.241.10:9999
210-
85.193.90.107:9999
211-
85.92.111.111:9999
131+
85.155.188.138:9999
212132
84.247.180.201:9999
213133
84.242.179.204:9999
134+
84.98.12.196:9999
214135
84.9.50.17:9999
215136
83.239.99.40:9999
216-
83.222.9.253:9999
217137
83.149.100.186:9999
218138
83.149.100.185:9999
219139
83.149.100.184:9999
220140
83.149.100.183:9999
221-
82.211.21.240:9999
222-
82.211.21.226:9999
223-
82.211.21.179:9999
224-
82.211.21.131:9999
225-
82.211.21.110:9999
226-
82.211.21.99:9999
227-
82.211.21.32:9999
228-
82.211.21.30:9999
229-
82.211.21.23:9999
230-
82.211.21.4:9999
231141
82.202.230.83:9999
232-
82.180.149.107:9999
233142
82.180.146.192:9999
234143
81.227.250.51:9999
235-
81.200.152.144:9999
236144
80.249.147.8:9999
237145
80.240.132.231:9999
238-
80.209.239.129:9999
239-
80.209.233.182:9999
240146
80.208.230.144:9999
241147
78.83.19.0:9999
242148
77.223.99.4:9999
243149
77.221.148.204:9999
244-
74.208.174.63:9999
245150
74.50.90.113:9999
246151
72.62.58.108:9999
247152
72.60.38.160:9999
248-
70.34.198.26:9999
249-
69.167.168.63:9999
250153
69.61.107.215:9999
251154
66.245.196.52:9999
252155
66.244.243.70:9999
253-
66.42.84.27:9999
254-
66.29.147.83:9999
156+
66.163.113.113:9999
157+
66.163.113.91:9999
158+
66.163.113.7:9999
159+
62.171.133.125:9999
255160
62.60.244.174:9999
256-
57.128.212.163:9999
257-
54.69.95.118:9999
258161
52.36.102.91:9999
259162
52.33.9.172:9999
260-
52.10.213.198:9999
261163
51.158.188.88:9999
164+
51.158.169.237:9999
262165
51.158.167.31:9999
263-
51.79.109.200:9999
264-
51.79.109.182:9999
265-
50.116.28.103:9999
266-
47.110.197.29:9999
267-
47.110.184.51:9999
268-
47.110.165.177:9999
269-
47.110.157.147:9999
270-
47.110.154.77:9999
271-
47.110.146.65:9999
272-
47.99.229.213:9999
273-
47.98.66.95:9999
274166
46.250.254.10:9999
275-
46.148.231.121:9999
276167
46.36.40.242:9999
277-
46.10.241.191:9999
168+
46.30.189.187:9999
278169
46.4.162.127:9999
279170
45.153.186.100:9999
280-
45.153.70.126:9999
281171
45.149.154.194:9999
282-
45.140.19.201:9999
283-
45.135.180.130:9999
284-
45.135.180.114:9999
285-
45.135.180.79:9999
286-
45.132.74.89:9999
287172
45.128.156.30:9999
288-
45.91.94.217:9999
289-
45.76.84.108:9999
173+
45.79.18.106:9999
290174
45.61.186.121:9999
291175
45.58.56.79:9999
292-
45.58.52.247:9999
293176
44.240.99.214:9999
294177
43.229.77.46:9999
295178
43.167.244.109:9999
296179
43.167.239.145:9999
297180
43.134.180.113:9999
298-
38.242.197.189:9999
181+
43.133.171.101:9999
299182
38.102.125.108:9999
300-
35.180.128.14:9999
301-
35.174.217.98:9999
302-
34.209.37.222:9999
183+
38.54.12.111:9999
184+
37.97.227.21:9999
185+
34.246.176.25:9999
303186
31.148.99.148:9999
304-
31.58.170.181:9999
305-
31.58.170.180:9999
306-
31.58.170.139:9999
307-
31.58.170.130:9999
308187
31.10.97.36:9999
309-
15.188.53.12:9999
310-
8.222.147.169:9999
311-
8.222.146.149:9999
312-
8.219.246.164:9999
313-
8.219.220.160:9999
314-
8.219.206.45:9999
315-
8.219.205.129:9999
316-
8.219.204.148:9999
317-
8.219.170.241:9999
318-
8.219.160.147:9999
319-
8.219.54.127:9999
320-
5.230.228.97:9999
321-
5.230.119.203:9999
322-
5.230.119.202:9999
323-
5.230.119.201:9999
324-
5.230.119.199:9999
325-
5.230.119.189:9999
326-
5.230.119.188:9999
327-
5.230.119.186:9999
328-
5.230.119.182:9999
329-
5.230.119.180:9999
330-
5.189.164.253:9999
188+
23.163.0.174:9999
331189
5.161.110.79:9999
332-
5.53.124.120:9999
333-
5.39.11.80:9999
334-
5.39.10.23:9999
335-
5.35.103.123:9999
336-
5.35.103.26:9999
337-
5.35.103.25:9999
338190
5.35.103.19:9999
339-
5.9.237.37:9999
340-
5.9.237.32:9999
341191
5.2.73.58:9999
342192
5.2.67.190:9999
343193
2.233.120.35:9999
344-
2.57.241.178:9999
345-
2.57.241.155:9999
346-
2.56.213.221:9999
347-
2.56.213.218:9999
194+
2.59.219.54:9999
195+
1.117.75.220:9999

contrib/seeds/nodes_test.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
212.47.68.199:19999
22
185.187.169.193:19999
3+
206.245.167.63:19999
34
147.93.132.9:19999
5+
68.67.122.72:19999
6+
68.67.122.42:19999
7+
68.67.122.33:19999
8+
68.67.122.23:19999
49
62.60.244.174:19999
510
54.213.94.216:19999
611
54.191.146.137:19999

0 commit comments

Comments
 (0)