Commit ebfdb8b
committed
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: 1a828c9acd5fe87617f3ab11ca1b5b13656adc61e591b58d68b685bba7404696afa664c53cc752dfbaca7fe08439d9428f33116f475c18c0959293460062b28425 files changed
Lines changed: 474 additions & 493 deletions
File tree
- contrib
- flatpak
- seeds
- doc
- man
- release-notes/dash
- src
- evo
- llmq
- test/functional
- test_framework
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
5 | | - | |
| 5 | + | |
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
21 | 21 | | |
22 | 22 | | |
23 | 23 | | |
| 24 | + | |
| 25 | + | |
24 | 26 | | |
25 | 27 | | |
26 | 28 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
23 | 23 | | |
24 | 24 | | |
25 | 25 | | |
26 | | - | |
27 | | - | |
| 26 | + | |
28 | 27 | | |
29 | | - | |
30 | 28 | | |
31 | | - | |
32 | | - | |
33 | | - | |
34 | | - | |
35 | | - | |
36 | | - | |
37 | | - | |
38 | | - | |
| 29 | + | |
39 | 30 | | |
40 | 31 | | |
41 | 32 | | |
42 | | - | |
43 | 33 | | |
44 | | - | |
45 | | - | |
46 | | - | |
47 | | - | |
48 | 34 | | |
49 | 35 | | |
50 | | - | |
51 | 36 | | |
52 | 37 | | |
| 38 | + | |
53 | 39 | | |
54 | | - | |
55 | 40 | | |
56 | | - | |
57 | 41 | | |
58 | 42 | | |
59 | | - | |
60 | | - | |
61 | | - | |
62 | | - | |
63 | | - | |
64 | 43 | | |
65 | 44 | | |
66 | 45 | | |
67 | | - | |
68 | | - | |
69 | | - | |
70 | | - | |
| 46 | + | |
71 | 47 | | |
72 | | - | |
73 | | - | |
74 | 48 | | |
75 | | - | |
76 | 49 | | |
77 | 50 | | |
78 | | - | |
79 | 51 | | |
80 | | - | |
81 | 52 | | |
82 | | - | |
83 | | - | |
84 | 53 | | |
85 | | - | |
86 | | - | |
87 | 54 | | |
88 | 55 | | |
89 | 56 | | |
90 | | - | |
| 57 | + | |
91 | 58 | | |
92 | 59 | | |
93 | 60 | | |
94 | | - | |
95 | 61 | | |
96 | | - | |
97 | | - | |
98 | | - | |
99 | | - | |
100 | 62 | | |
101 | 63 | | |
102 | | - | |
103 | 64 | | |
104 | 65 | | |
105 | 66 | | |
106 | | - | |
107 | | - | |
108 | 67 | | |
109 | 68 | | |
110 | 69 | | |
111 | 70 | | |
112 | 71 | | |
113 | 72 | | |
114 | 73 | | |
115 | | - | |
| 74 | + | |
| 75 | + | |
116 | 76 | | |
117 | 77 | | |
118 | 78 | | |
119 | | - | |
120 | | - | |
121 | | - | |
122 | | - | |
123 | | - | |
| 79 | + | |
124 | 80 | | |
| 81 | + | |
125 | 82 | | |
126 | | - | |
127 | | - | |
| 83 | + | |
| 84 | + | |
128 | 85 | | |
129 | 86 | | |
130 | | - | |
131 | | - | |
132 | | - | |
133 | | - | |
134 | | - | |
135 | | - | |
136 | | - | |
137 | | - | |
138 | | - | |
139 | | - | |
140 | | - | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
141 | 90 | | |
142 | | - | |
143 | | - | |
144 | | - | |
145 | | - | |
146 | | - | |
147 | 91 | | |
148 | | - | |
149 | | - | |
150 | | - | |
151 | | - | |
152 | 92 | | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
153 | 98 | | |
154 | 99 | | |
155 | 100 | | |
156 | | - | |
157 | 101 | | |
158 | 102 | | |
159 | | - | |
160 | | - | |
| 103 | + | |
161 | 104 | | |
162 | 105 | | |
163 | | - | |
| 106 | + | |
164 | 107 | | |
165 | 108 | | |
166 | 109 | | |
167 | | - | |
168 | | - | |
169 | | - | |
170 | | - | |
171 | 110 | | |
172 | | - | |
173 | 111 | | |
174 | | - | |
175 | | - | |
176 | | - | |
177 | 112 | | |
178 | 113 | | |
179 | 114 | | |
180 | | - | |
181 | 115 | | |
182 | | - | |
183 | 116 | | |
| 117 | + | |
184 | 118 | | |
185 | 119 | | |
186 | | - | |
187 | | - | |
188 | 120 | | |
189 | | - | |
190 | 121 | | |
| 122 | + | |
191 | 123 | | |
192 | | - | |
193 | 124 | | |
194 | | - | |
195 | | - | |
196 | 125 | | |
197 | | - | |
198 | | - | |
199 | 126 | | |
200 | 127 | | |
201 | | - | |
202 | | - | |
203 | | - | |
204 | | - | |
205 | 128 | | |
206 | 129 | | |
207 | 130 | | |
208 | | - | |
209 | | - | |
210 | | - | |
211 | | - | |
| 131 | + | |
212 | 132 | | |
213 | 133 | | |
| 134 | + | |
214 | 135 | | |
215 | 136 | | |
216 | | - | |
217 | 137 | | |
218 | 138 | | |
219 | 139 | | |
220 | 140 | | |
221 | | - | |
222 | | - | |
223 | | - | |
224 | | - | |
225 | | - | |
226 | | - | |
227 | | - | |
228 | | - | |
229 | | - | |
230 | | - | |
231 | 141 | | |
232 | | - | |
233 | 142 | | |
234 | 143 | | |
235 | | - | |
236 | 144 | | |
237 | 145 | | |
238 | | - | |
239 | | - | |
240 | 146 | | |
241 | 147 | | |
242 | 148 | | |
243 | 149 | | |
244 | | - | |
245 | 150 | | |
246 | 151 | | |
247 | 152 | | |
248 | | - | |
249 | | - | |
250 | 153 | | |
251 | 154 | | |
252 | 155 | | |
253 | | - | |
254 | | - | |
| 156 | + | |
| 157 | + | |
| 158 | + | |
| 159 | + | |
255 | 160 | | |
256 | | - | |
257 | | - | |
258 | 161 | | |
259 | 162 | | |
260 | | - | |
261 | 163 | | |
| 164 | + | |
262 | 165 | | |
263 | | - | |
264 | | - | |
265 | | - | |
266 | | - | |
267 | | - | |
268 | | - | |
269 | | - | |
270 | | - | |
271 | | - | |
272 | | - | |
273 | | - | |
274 | 166 | | |
275 | | - | |
276 | 167 | | |
277 | | - | |
| 168 | + | |
278 | 169 | | |
279 | 170 | | |
280 | | - | |
281 | 171 | | |
282 | | - | |
283 | | - | |
284 | | - | |
285 | | - | |
286 | | - | |
287 | 172 | | |
288 | | - | |
289 | | - | |
| 173 | + | |
290 | 174 | | |
291 | 175 | | |
292 | | - | |
293 | 176 | | |
294 | 177 | | |
295 | 178 | | |
296 | 179 | | |
297 | 180 | | |
298 | | - | |
| 181 | + | |
299 | 182 | | |
300 | | - | |
301 | | - | |
302 | | - | |
| 183 | + | |
| 184 | + | |
| 185 | + | |
303 | 186 | | |
304 | | - | |
305 | | - | |
306 | | - | |
307 | | - | |
308 | 187 | | |
309 | | - | |
310 | | - | |
311 | | - | |
312 | | - | |
313 | | - | |
314 | | - | |
315 | | - | |
316 | | - | |
317 | | - | |
318 | | - | |
319 | | - | |
320 | | - | |
321 | | - | |
322 | | - | |
323 | | - | |
324 | | - | |
325 | | - | |
326 | | - | |
327 | | - | |
328 | | - | |
329 | | - | |
330 | | - | |
| 188 | + | |
331 | 189 | | |
332 | | - | |
333 | | - | |
334 | | - | |
335 | | - | |
336 | | - | |
337 | | - | |
338 | 190 | | |
339 | | - | |
340 | | - | |
341 | 191 | | |
342 | 192 | | |
343 | 193 | | |
344 | | - | |
345 | | - | |
346 | | - | |
347 | | - | |
| 194 | + | |
| 195 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
| 3 | + | |
3 | 4 | | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
4 | 9 | | |
5 | 10 | | |
6 | 11 | | |
| |||
0 commit comments