backport: merge bitcoin#19143, #20377, #20946, #20936, #21226, #21264, #19259, #21380, #21489, #19288, #19055, #20882, #21185, #21115, partial bitcoin#11389 (fuzzing harness backports: part 6)#5548
Merged
PastaPastaPasta merged 17 commits intodashpay:developfrom Aug 30, 2023
Conversation
|
11389: should include 18e0718 imo (simply set |
Collaborator
Author
knst
requested changes
Aug 27, 2023
PastaPastaPasta
approved these changes
Aug 30, 2023
Member
PastaPastaPasta
left a comment
There was a problem hiding this comment.
utACK for merging via merge commit
…le, LoadExternalBlockFile and other FILE* consumers includes: - ad6c348
Required to resolve link failures: ``` /usr/bin/ld: /usr/bin/ld: DWARF error: invalid or unhandled FORM value: 0x25 libbitcoin_wallet.a(libbitcoin_wallet_a-rpcwallet.o): in function `getwalletinfo(JSONRPCRequest const&)': rpcwallet.cpp:(.text+0x4db2d): undefined reference to `CHDChain::CountAccounts()' /usr/bin/ld: rpcwallet.cpp:(.text+0x4dc15): undefined reference to `CHDChain::CountAccounts()' /usr/bin/ld: rpcwallet.cpp:(.text+0x4dd42): undefined reference to `CHDChain::GetAccount(unsigned int, CHDAccount&)' /usr/bin/ld: /usr/bin/ld: DWARF error: invalid or unhandled FORM value: 0x25 libbitcoin_wallet.a(libbitcoin_wallet_a-scriptpubkeyman.o): in function `LegacyScriptPubKeyMan::CheckDecryptionKey(std::vector<unsigned char, secure_allocator<unsigned char> > const&, bool)': scriptpubkeyman.cpp:(.text+0x1041): undefined reference to `CHDChain::IsNull() const' /usr/bin/ld: scriptpubkeyman.cpp:(.text+0x1058): undefined reference to `CHDChain::IsNull() const' /usr/bin/ld: scriptpubkeyman.cpp:(.text+0x11a9): undefined reference to `CHDChain::GetSeedHash()' /usr/bin/ld: libbitcoin_wallet.a(libbitcoin_wallet_a-scriptpubkeyman.o): in function `LegacyScriptPubKeyMan::DecryptHDChain(std::vector<unsigned char, secure_allocator<unsigned char> > const&, CHDChain&) const': [...] rpcdump.cpp:(.text+0x216d8): undefined reference to `CHDChain::GetMnemonic(std::__cxx11::basic_string<char, std::char_traits<char>, secure_allocator<char> >&, std::__cxx11::basic_string<char, std::char_traits<char>, secure_allocator<char> >&) const' /usr/bin/ld: rpcdump.cpp:(.text+0x217a3): undefined reference to `CHDChain::GetSeed() const' /usr/bin/ld: rpcdump.cpp:(.text+0x21a44): undefined reference to `CHDChain::CountAccounts()' /usr/bin/ld: rpcdump.cpp:(.text+0x21a6e): undefined reference to `CHDChain::GetAccount(unsigned int, CHDAccount&)' /usr/bin/ld: rpcdump.cpp:(.text+0x21b80): undefined reference to `CHDChain::CountAccounts()' clang: error: linker command failed with exit code 1 (use -v to see invocation) ```
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
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.
Motivation
Updating
libsecp256k1(which is required to integrate fixes, improvements and new APIs and capabilities, such as secp256k1#1129 needed for BIP324) involves not only updating the subtree but also usage of library APIs (such as the removal ofECCVerifyHandlefrom fuzzing code, commit).In the past, this has created problems where updates to API usage include updates to portions of code implementing features Dash has deprioritized/omitted (see dash#4332, where API updates in Taproot-specific code had to be omitted, rendering the backport partial).
To avoid this from happening, this PR aims to backport the necessary changes needed to be able to backport the updates to
libsecp256k1and does it alongside some general backports related to fuzzing.Additional Notes
hdwallet.cpphas been moved fromlibbitcoin_commontolibbitcoin_walletto avoid linker failures that were apparent once some fuzzing backports were done.Linker errors:
The original backport of bitcoin#18353 done in dash#4829 (segment) omitted
ShellEscape, presumably to ensure that it compiles on Windows.Bitcoin resolved this with bitcoin#21115, which has been backported in this pull request, hence the backport doesn't only do the changes necessary for Windows compilation but also includes previously omitted changes.