-
Notifications
You must be signed in to change notification settings - Fork 1.2k
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.
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
backport: merge bitcoin#21732, #21762, #21754, #21953, #21850, #22633, #22738, #23154, #23721, #24002, #24197, merge bitcoin-core/gui#399 (auxiliary backports: part 14) #6137
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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
Co-authored-by: UdjinM6 <UdjinM6@users.noreply.github.com>
Co-authored-by: UdjinM6 <UdjinM6@users.noreply.github.com>
…lockTreeDB::LoadBlockIndexGuts()
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
utACK 1c5ea38
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
utACK 1c5ea38
@@ -17,7 +17,6 @@ | |||
import time | |||
import glob | |||
from collections import namedtuple | |||
from binascii import unhexlify |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
missing changes in contrib/signet/miner
- should be partial bitcoin#22633
|
||
- [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) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit: https://github.com/dashpay/dash-issues/issues/36 can be added here
, 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
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
scriptSig
padding multiplier (24
) differs from upstream (35
) as thevsize
value it corresponds to must match what is ordinarily generated (85
vs96
upstream) in order to fulfill an assertion (source).In bitcoin#21953, the hash associated with height
200
is generated like this (this is the same method used in dash#5236):CRegTestParams::m_assumeutxo_data
map 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(..)
mineBlocks
here to be 100 blocks less than the desired height../src/test/test_dash -t validation_chainstatemanager_tests
got
value printed to your terminal window/stdout
(theexpected
value should be our garbage value from earlier, ignore that). That's your good hash.CRegTestParams::m_assumeutxo_data
map entry with the correct entry, reverse every change except the map entry (for obvious reasons) and themineBlocks
change.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.mineBlocks
change.Breaking Changes
None expected.
Checklist: