backport: merge bitcoin#21391, #19550, #15946, #21230, #21252, #21297, #20605, #21575, #22309, #19762 (assumeutxo backports: part 4) by kwvg · Pull Request #5492 · dashpay/dash

kwvg · 2023-07-16T15:51:42Z

Additional information

Dependency for backport: merge bitcoin#19521, #22047, #21796, #21767, #24133, #24921, #27988, partial #24117, #24138, #27405 (assumeutxo: part 5) #5501

github-actions · 2023-07-23T20:23:55Z

This pull request has conflicts, please rebase.

github-actions · 2023-07-24T16:41:57Z

This pull request has conflicts, please rebase.

UdjinM6 · 2023-07-24T17:54:59Z

build failed

evo/creditpool.cpp: In function ‘std::optional<CBlock> GetBlockForCreditPool(const CBlockIndex*, const Consensus::Params&)’:
evo/creditpool.cpp:112:10: error: ‘ReadBlockFromDisk’ was not declared in this scope
  112 |     if (!ReadBlockFromDisk(block, block_index, consensusParams)) {
      |          ^~~~~~~~~~~~~~~~~

knst

also need to add missing header node/blockstorage.h to evo/creditpool.cpp

doc/release-notes-19550.md

knst · 2023-07-24T17:16:05Z

test/functional/feature_blockfilterindex_prune.py

can you add a new variable such as

governance_failure = 'Warning: You are starting with gover....

and use it instead literals?

Same as EXPECTED_STDERR_NO_GOV_PRUNE in test/functional/feature_pruning.py

Will do in a future PR

src/validation.h

src/validation.cpp

knst

check comment about g_chainman in CreateUTXOSnapshot

Btw for next time better for massive changes such as g_chainman refactoring to create dedicated PR rather than add some extra backports to make "batch of 10" IMO

merge https://github.com/bitcoin/bitcoin/pull/21391[: Prune g_chainman usage in RPC modules](d1be425)
rpc: Prune g_chainman usage within Dash-specific RPC modules

these 2 are big enough for dedicated PR. I am after meticulous reading still not 100% sure that all changes here are valid, but I haven't found any other issues ATM except mentioned comment.

src/rpc/blockchain.cpp

kwvg · 2023-07-27T19:09:57Z

This PR was already split in half due to review complexity concerns, I'd be glad to split it even further if told earlier about it. Referring to them as "extra" backports aren't representative of the reason they're included. If you look at #5501 (which is what this PR originally was before it was split in half), you can see they're the prerequisites for implementing coinstats support which is used by PRs further down the line and bugfixes that result in CI errors due to race conditions.

Work on g_chainman deglobalization is purely incidental and has arisen due to it being a dependency for backporting assumeutxo capabilities.

knst

utACK

UdjinM6

re-utACK

PastaPastaPasta

re-utACK

``` src/governance/governance.cpp:558:18: note: Shadow variable src/governance/governance.cpp:558:18: warning: Local variable '_' shadows outer function [shadowFunction] ```

…text`

…g prune

…rune

…together

Relates to dashpay/dash#5492

* docs(rpc): update protx diff Relates to dashpay/dash#5377 * docs(rpc): add getindexinfo rpc Relates to dashpay/dash#5492 * docs(rpc): add gettxchainlocks Relates to dashpay/dash#5578 * docs(rpc): update getblock

kwvg force-pushed the assumeutxo4 branch 2 times, most recently from 1dcd32d to b7ff846 Compare July 18, 2023 23:45

kwvg force-pushed the assumeutxo4 branch 7 times, most recently from 7c2eb36 to 6826dea Compare July 23, 2023 17:44

kwvg mentioned this pull request Jul 23, 2023

backport: merge bitcoin#19521, #22047, #21796, #21767, #24133, #24921, #27988, partial #24117, #24138, #27405 (assumeutxo: part 5) #5501

Merged

github-actions bot added the needs rebase label Jul 23, 2023

kwvg force-pushed the assumeutxo4 branch from 6826dea to 470924a Compare July 23, 2023 20:46

github-actions bot removed the needs rebase label Jul 23, 2023

kwvg marked this pull request as ready for review July 23, 2023 22:31

kwvg requested review from PastaPastaPasta, UdjinM6 and knst July 23, 2023 22:31

PastaPastaPasta mentioned this pull request Jul 24, 2023

backport: bitcoin#18160, #18454, #18487, #18524, #18532, #18546, #18551, #18561, #18563, #18587 #5479

Merged

5 tasks

github-actions bot added the needs rebase label Jul 24, 2023

kwvg force-pushed the assumeutxo4 branch from 470924a to c88d924 Compare July 24, 2023 16:48

github-actions bot removed the needs rebase label Jul 24, 2023

knst requested changes Jul 24, 2023

View reviewed changes

kwvg force-pushed the assumeutxo4 branch 2 times, most recently from 2b189ef to 8316f97 Compare July 24, 2023 18:47

kwvg requested a review from knst July 24, 2023 19:17

knst mentioned this pull request Jul 27, 2023

docs: Clarify when to rebase a non-conflicting PR and how #5514

Merged

5 tasks

knst requested changes Jul 27, 2023

View reviewed changes

src/rpc/blockchain.cpp Outdated Show resolved Hide resolved

kwvg dismissed stale reviews from PastaPastaPasta and UdjinM6 via bdd1b74 July 27, 2023 19:12

kwvg force-pushed the assumeutxo4 branch from 2bca58f to bdd1b74 Compare July 27, 2023 19:12

knst approved these changes Jul 27, 2023

View reviewed changes

kwvg requested review from PastaPastaPasta and UdjinM6 July 27, 2023 19:15

UdjinM6 approved these changes Jul 27, 2023

View reviewed changes

PastaPastaPasta approved these changes Jul 28, 2023

View reviewed changes

kwvg added 13 commits July 28, 2023 00:18

fix: resolve cppcheck shadow variable warning

bbb6815

``` src/governance/governance.cpp:558:18: note: Shadow variable src/governance/governance.cpp:558:18: warning: Local variable '_' shadows outer function [shadowFunction] ```

merge bitcoin#21391: Prune g_chainman usage in RPC modules

60e93ca

rpc: Prune g_chainman usage within Dash-specific RPC modules

77963ba

merge bitcoin#19550: Add getindexinfo RPC

9307a22

trivial: consistently use context as the argument name for `CoreCon…

b8fc743

…text`

merge bitcoin#15946: Allow maintaining the blockfilterindex when usin…

6c09b33

…g prune

merge bitcoin#21230: Fix NODE_NETWORK_LIMITED_MIN_BLOCKS disconnection

e30626d

merge bitcoin#21252: Intermittent issue in feature_blockfilterindex_p…

8cf0748

…rune

merge bitcoin#21297: feature_blockfilterindex_prune.py improvements

3450cc7

merge bitcoin#20605: Signal-safe instant shutdown

94b706e

merge bitcoin#21575: Create blockstorage module

b1643e7

merge bitcoin#22309: Add missing atomic include

4e82a96

merge bitcoin#19762: Allow named and positional arguments to be used …

d40f28e

…together

PastaPastaPasta force-pushed the assumeutxo4 branch from bdd1b74 to d40f28e Compare July 28, 2023 05:19

PastaPastaPasta merged commit d9a0b32 into dashpay:develop Jul 28, 2023

thephez added the RPC Some notable changes to RPC params/behaviour/descriptions label Aug 1, 2023

thephez added a commit to thephez/docs-core that referenced this pull request Oct 3, 2023

docs(rpc): add getindexinfo rpc

5f5bcd6

Relates to dashpay/dash#5492

Conversation

kwvg commented Jul 16, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Additional information

Uh oh!

github-actions bot commented Jul 23, 2023

Uh oh!

github-actions bot commented Jul 24, 2023

Uh oh!

UdjinM6 commented Jul 24, 2023

Uh oh!

knst left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

knst Jul 24, 2023

Choose a reason for hiding this comment

Uh oh!

kwvg Jul 24, 2023

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

knst left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

kwvg commented Jul 27, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

knst left a comment

Choose a reason for hiding this comment

Uh oh!

UdjinM6 left a comment

Choose a reason for hiding this comment

Uh oh!

PastaPastaPasta left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

kwvg commented Jul 16, 2023 •

edited

Loading

kwvg commented Jul 27, 2023 •

edited

Loading