backport: merge bitcoin#21732, #21762, #21754, #21953, #21850, #22633, #22738, #23154, #23721, #24002, #24197, merge bitcoin-core/gui#399 (auxiliary backports: part 14)#6137
Merged
PastaPastaPasta merged 14 commits intodashpay:developfrom Jul 23, 2024
Conversation
kwvg
changed the title
UdjinM6
requested changes
Jul 22, 2024
UdjinM6
left a comment
UdjinM6
left a comment
There was a problem hiding this comment.
pls see https://github.com/UdjinM6/dash/commits/pr_6137/ (CI: https://gitlab.com/UdjinM6/dash/-/pipelines/1382702435)
pls note that 22501 and 397b432 are also parts of #6133, 22619 is a part of #6071
kwvg
changed the title
Co-authored-by: UdjinM6 <[email protected]>
Co-authored-by: UdjinM6 <[email protected]>
…lockTreeDB::LoadBlockIndexGuts()
UdjinM6
approved these changes
Jul 23, 2024
knst
reviewed
Jul 24, 2024
| import time | ||
| import glob | ||
| from collections import namedtuple | ||
| from binascii import unhexlify |
Collaborator
There was a problem hiding this comment.
missing changes in contrib/signet/miner - should be partial bitcoin#22633
knst
reviewed
Jul 24, 2024
|
|
||
| - [assumeutxo proposal](https://github.com/jamesob/assumeutxo-docs/tree/2019-04-proposal/proposal) | ||
| - [Github issue](https://github.com/bitcoin/bitcoin/issues/15605) (Bitcoin) | ||
| - [draft PR](https://github.com/bitcoin/bitcoin/pull/15606) (Bitcoin) |
Collaborator
There was a problem hiding this comment.
nit: https://github.com/dashpay/dash-issues/issues/36 can be added here
PastaPastaPasta
added a commit
that referenced
this pull request
Aug 7, 2024
, bitcoin#23522, bitcoin#24026, bitcoin#24104, bitcoin#24167, bitcoin#20744, partial bitcoin#23469, bitcoin#24169 (replace boost::filesystem with std::filesystem) 0f23920 partial bitcoin#24169: Add --enable-c++20 option (Kittywhiskers Van Gogh) a3b7926 merge bitcoin#20744: Use std::filesystem. Remove Boost Filesystem & System (Kittywhiskers Van Gogh) be7ac49 merge bitcoin#24167: consistently use fsbridge:: for ifstream / ofstream (Kittywhiskers Van Gogh) 7ffea43 merge bitcoin#24104: Make compatible with boost 1.78 (Kittywhiskers Van Gogh) 7c270e6 merge bitcoin#24026: Block unsafe std::string fs::path conversion copy_file calls (Kittywhiskers Van Gogh) b0d2484 merge bitcoin#23522: Improve fs::PathToString documentation (Kittywhiskers Van Gogh) 20d359b partial bitcoin#23469: Remove Boost build note from build-unix.md (Kittywhiskers Van Gogh) 193f6fd merge bitcoin#23446: Mention that BerkeleyDB is for legacy wallet in build-unix (Kittywhiskers Van Gogh) ecfac10 merge bitcoin#22937: Forbid calling unsafe fs::path(std::string) constructor and fs::path::string() method (Kittywhiskers Van Gogh) 23fe7e2 chore: dashify symbols in some unit tests (Kittywhiskers Van Gogh) 28b96a0 merge bitcoin#22840: fix unoptimized libraries in depends (Kittywhiskers Van Gogh) Pull request description: ## Additional Information * Depends on #6085 * Depends on #6137 * Dependency for #6150 ## Breaking Changes None observed. ## Checklist: - [x] I have performed a self-review of my own code - [x] I have commented my code, particularly in hard-to-understand areas **(note: N/A)** - [x] I have added or updated relevant unit/integration/functional/e2e tests - [x] I have made corresponding changes to the documentation **(note: N/A)** - [x] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_ ACKs for top commit: knst: utACK 0f23920 PastaPastaPasta: utACK 0f23920 Tree-SHA512: 4b8f0ae55185ece27d8084a5339196b7ed993c8138f4c59a0db3e16729d4edf4a59a68a8c7309c32df57734c07182821c4878b55c253da5df763204ad7158426
5 tasks
PastaPastaPasta
added a commit
that referenced
this pull request
May 26, 2025
…pcwallet) 730ef82 merge bitcoin#23667: Split up rpcwallet (Kittywhiskers Van Gogh) bf18e7a Remove unused imports from rpc/wallet and reorder RPCs (Kittywhiskers Van Gogh) d17884f MOVEONLY: Move rpcwallet to rpc/wallet (Kittywhiskers Van Gogh) 1290783 MOVEONLY: Move spending RPCs to spend.cpp (Kittywhiskers Van Gogh) 36107c7 MOVEONLY: Move balance and utxo RPCs to coins.cpp (Kittywhiskers Van Gogh) 0aac1b3 MOVEONLY: Move address related functions from rpcwallet to addresses.cpp (Kittywhiskers Van Gogh) 6dcf2a2 MOVEONLY: Move transaction related wallet RPCs to transactions.cpp (Kittywhiskers Van Gogh) c080211 merge bitcoin#23647: Move wallet backup and encryption RPCs out of rpcwallet (Kittywhiskers Van Gogh) Pull request description: ## Additional Information * Depends on #6686 * [bitcoin#23667](bitcoin#23667) was merged upstream in v0.23. As of this writing, the backport backlog for v0.23 is at ~90% completion. While this refactor is disruptive, delaying it makes any backport after v0.23 at best annoying and at worst, causing history inconsistency, which may cause conflicts. * While the commits for [bitcoin#23647](bitcoin#23647) have been squashed down, due to the diff size, [bitcoin#23667](bitcoin#23667) is available commit-by-commit. Both can be validated as primarily move-only with `git log -p -n1 --color-moved=dimmed_zebra`. * In [bitcoin#23647](bitcoin#23647), `LoadWalletHelper` was moved to `wallet/rpc/util.cpp` but [bitcoin#23721](bitcoin#23721) (included in [dash#6137](#6137)) replaced it with `HandleWalletError`. Due to this OOO backport, changes in [bitcoin#23647](bitcoin#23647) adopts portions of [bitcoin#23721](bitcoin#23721) for correctness and consistency. * [bitcoin#23667](bitcoin#23667) does not move `walletdisplayaddress` as it is not implemented yet on account of relying on external signer support (which is the same reason why [bitcoin#23172](bitcoin#23172) hasn't been backported per the spreadsheet and `FundTxDoc` wasn't moved in this PR as it isn't backported yet). This needs to be kept in mind when backporting [bitcoin#23172](bitcoin#23172) and [bitcoin#21467](bitcoin#21467) (and its predecessors). ## Breaking Changes None expected. All changes are move-only. ## Checklist - [x] I have performed a self-review of my own code - [x] I have commented my code, particularly in hard-to-understand areas **(note: N/A)** - [x] I have added or updated relevant unit/integration/functional/e2e tests **(note: N/A)** - [x] I have made corresponding changes to the documentation **(note: N/A)** - [x] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_ ACKs for top commit: UdjinM6: utACK 730ef82 PastaPastaPasta: utACK 730ef82 Tree-SHA512: 445d3e42ea73b745d71b4cbfedd891359701aec25542a9d58f514e22dc059e665659fdd428ea71204996163a90c33b0621f4bc415691f1b42e7a2f558f035642
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Additional Information
Dependency for backport: merge bitcoin#22840, #22937, #23446, #23522, #24026, #24104, #24167, #20744, partial bitcoin#23469, #24169 (replace boost::filesystem with std::filesystem) #6138
In bitcoin#21754, the
scriptSigpadding multiplier (24) differs from upstream (35) as thevsizevalue it corresponds to must match what is ordinarily generated (85vs96upstream) in order to fulfill an assertion (source).In bitcoin#21953, the hash associated with height
200is generated like this (this is the same method used in dash#5236):CRegTestParams::m_assumeutxo_datamap with a garbage hash value (likeuint256::ONE). This is to avoid an unrecognized metadata failure (source) caused by looking through the map to see if the height's there.LogPrintf(..)in the serialized hash check error log message located here to astd::cout << strprintf(..)mineBlockshere to be 100 blocks less than the desired height../src/test/test_dash -t validation_chainstatemanager_testsgotvalue printed to your terminal window/stdout(theexpectedvalue should be our garbage value from earlier, ignore that). That's your good hash.CRegTestParams::m_assumeutxo_datamap entry with the correct entry, reverse every change except the map entry (for obvious reasons) and themineBlockschange.validation_tests, it simply tests the hardcoded chainparams value with its own hardcoded value. That's also why we don't use this test since it'll just regurgitate the garbage values we give it.mineBlockschange.Breaking Changes
None expected.
Checklist: