Skip to content
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.

Sign up for GitHub

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

Jump to bottom

backport: bitcoin#17946, #18663, #18946, #18975, #19004, #19115, #19152, #19173, partial #18735 #5802

Merged
merged 9 commits into from
Jan 9, 2024
Merged

backport: bitcoin#17946, #18663, #18946, #18975, #19004, #19115, #19152, #19173, partial #18735 #5802

merged 9 commits into from
Jan 9, 2024

Commits on Jan 9, 2024

  1. Merge bitcoin#18663: doc: mention build docs in README.md 

    bda62e8 Adding build instructions to Bitcoin Core, fixes bitcoin#18658 (Saahil Shangle)

Pull request description:

  Making the instructions for building Bitcoin Core more clear in the main `README.md` will reduce confusion between the `build_msvc` and `doc` folders.

ACKs for top commit:
  laanwj:
    ACK bda62e8

Tree-SHA512: ee4c394661eba48d4229e3d1e9ddb67ccb79589429bfa9986cb0242cd615d1f3cc5332063562c1e89c0cdd9ae2e609f61e8bfb209926d8363d35d3da6d94ae9c
    @PastaPastaPasta
    MarcoFalke authored and PastaPastaPasta committed Jan 9, 2024
    Configuration menu
    Copy the full SHA
    30c1a2e View commit details
    Browse the repository at this point in the history

  2. Merge bitcoin#18946: rpcwallet: Replace boost::optional<T>::emplace w… 

    …ith simple assignment of T{}

fa1f840 rpcwallet: Replace pwallet-> with wallet. (MarcoFalke)
fa182a8 rpcwallet: Replace boost::optional<T>::emplace with simple assignment of T{} (MarcoFalke)

Pull request description:

  Closes bitcoin#18943

ACKs for top commit:
  laanwj:
    ACK fa1f840
  ryanofsky:
    Code review ACK fa1f840 and thanks for using a standalone commit for the fix
  promag:
    Code review ACK fa1f840.
  hebasto:
    ACK fa1f840, tested on Linux Mint 19.3.

Tree-SHA512: 0838485d1f93f737ce5bf12740669dcafeebb78dbc3fa15dbcc511edce64bf024f60f0497a04149a1e799d893d57b0c9ffe442020c1b9cfc3c69db731f50e712
    @laanwj @PastaPastaPasta
    laanwj authored and PastaPastaPasta committed Jan 9, 2024
    Configuration menu
    Copy the full SHA
    d2a2054 View commit details
    Browse the repository at this point in the history

  3. Merge bitcoin#18975: test: Remove const to work around compiler error… 

    … on xenial

050e2ee test: Remove const to work around compiler error on xenial (Wladimir J. van der Laan)

Pull request description:

  Fix the following error in travis:

      test/validationinterface_tests.cpp:26:36: error: default initialization of an object of const type 'const BlockValidationState' without a user-provided default constructor

      const BlockValidationState state_dummy;

ACKs for top commit:
  MarcoFalke:
    Tested ACK 050e2ee on xenial with clang version 3.8.0-2ubuntu4 (tags/RELEASE_380/final)
  fanquake:
    ACK 050e2ee - I see why we didn't hit this on master. We are installing the `clang-8` packages for the tsan job. However on the 0.20 branch we are still just installing `clang`, which is 3.8.

Tree-SHA512: 8a1d57289dbe9895ab79f81ca87b4fd723426b8d72f3a34bec9553226fba69f6dc19551c1f1d52db6c4b2652164a02ddc60f3187c3e2ad7bcacb0aaca7fa690a
    @fanquake @PastaPastaPasta
    fanquake authored and PastaPastaPasta committed Jan 9, 2024
    Configuration menu
    Copy the full SHA
    41dcede View commit details
    Browse the repository at this point in the history

  4. Merge bitcoin#17946: Fix GBT: Restore "!segwit" and "csv" to "rules" key 

    412d5fe QA: feature_segwit: Check that template "rules" includes "!segwit" as appropriate (Luke Dashjr)
2abe8cc Bugfix: Include "csv","!segwit" in "rules" (Luke Dashjr)

Pull request description:

  bitcoin#16060 removed CSV & segwit from versionbits, breaking the "rules" key returned by GBT.

  Without this, miners don't know they're mining segwit blocks, and should fall back to pre-segwit block creation.

ACKs for top commit:
  sipa:
    ACK 412d5fe
  jnewbery:
    Tested ACK 412d5fe.

Tree-SHA512: 825d72e257dc0dd4941f2fe498d8d4f4f2a21b9505cd21a8f9eb7fb5d6d7dd9219347928cf90bb57a777920ce24295859763e64fa8a22ebb58fc2380f80f5615
    @PastaPastaPasta
    MarcoFalke authored and PastaPastaPasta committed Jan 9, 2024
    Configuration menu
    Copy the full SHA
    061f2b5 View commit details
    Browse the repository at this point in the history

  5. Merge bitcoin#19004: refactor: Replace const char* to std::string 

    c57f03c refactor: Replace const char* to std::string (Calvin Kim)

Pull request description:

  Rationale: Addresses bitcoin#19000
  Some functions should be returning std::string instead of const char*.
  This commit changes that.

  Main benefits/reasoning:

  1.  The functions never return nullptr, so returning a string makes code at call sites easier to review (reviewers don't have to read the source code to verify that a nullptr is never returned)
  2. All call sites convert to string anyway

ACKs for top commit:
  MarcoFalke:
    re-ACK c57f03c (no changes since previous review) 🚃
  Empact:
    Fair enough, Code Review ACK bitcoin@c57f03c
  practicalswift:
    ACK c57f03c -- patch looks correct
  hebasto:
    re-ACK c57f03c

Tree-SHA512: 9ce99bb38fe399b54844315048204cafce0f27fd8f24cae357fa7ac6f5d8094d57bbf5f5c1f5878a65f2d35e4a3f95d527eb17f49250b690c591c0df86ca84fd
    @PastaPastaPasta
    MarcoFalke authored and PastaPastaPasta committed Jan 9, 2024
    Configuration menu
    Copy the full SHA
    f2790a8 View commit details
    Browse the repository at this point in the history

  6. partial Merge bitcoin#18735: ci: Add and document BASE_BUILD_DIR 

    fae49f6 ci: Add and document BASE_BUILD_DIR (MarcoFalke)

Pull request description:

  Also fixes bitcoin#18768

ACKs for top commit:
  hebasto:
    re-ACK fae49f6, which is essentially the same as the previously [reviewed changes](bitcoin#18735 (review)).

Tree-SHA512: 216565a05ccd513dd9f114b2333d3c283fd71914d32f9b05f145cb7c70633b083ff8ef60798d6f22f4be6a4d652b03806551fd74b5b596c92968501a4d9726d2
    @PastaPastaPasta
    MarcoFalke authored and PastaPastaPasta committed Jan 9, 2024
    Configuration menu
    Copy the full SHA
    5a8df5e View commit details
    Browse the repository at this point in the history

  7. Merge bitcoin#19115: doc: Add release notes for 17219

    @knst @PastaPastaPasta
    knst authored and PastaPastaPasta committed Jan 9, 2024
    Configuration menu
    Copy the full SHA
    1f81fdc View commit details
    Browse the repository at this point in the history

  8. Merge bitcoin#19152: build: improve build OS configure output 

    0fef60c build: improved output of configure for build OS (sachinkm77)

Pull request description:

  The purpose of this fix is to improve output of the configure script by providing the build OS. This is done by leveraging the build_os set by the script config.sub / config.guess. bitcoin#18966

ACKs for top commit:
  fanquake:
    ACK 0fef60c - thanks for following up.

Tree-SHA512: b9f49df901a9d37eb16c67c063bb3611602a84391aa54d097a52b740f474c2785c24bf405522d15d724fde25070d354bf20b885add2ee4405a71cbe9ebab5ff3
    @fanquake @PastaPastaPasta
    fanquake authored and PastaPastaPasta committed Jan 9, 2024
    Configuration menu
    Copy the full SHA
    26abf94 View commit details
    Browse the repository at this point in the history

  9. Merge bitcoin#19173: build: turn on --enable-c++17 by --enable-fuzz 

    0012471 build: turn on --enable-c++17 by --enable-fuzz (Vasil Dimov)

Pull request description:

  Fuzzing code uses C++17 specific code (e.g. std::optional), so it is not
  possible to compile with --enable-fuzz and without --enable-c++17.

  Thus, turn on --enable-c++17 whenever --enable-fuzz is used.

ACKs for top commit:
  hebasto:
    ACK 0012471, tested on Linux Mint 19.3 (x86_64); verified that it fails to compile with `--enable-fuzz` and without `--enable-c++17` on master.

Tree-SHA512: 290531ea8d79de3b9251ea4ad21e793478b18150cc0124eea1e50c3a4ed92bab89c3e70ed0aa526906f8723ea952cdba4268f1560ae4be9bd25b9e4f9b97436c
    @PastaPastaPasta
    MarcoFalke authored and PastaPastaPasta committed Jan 9, 2024
    Configuration menu
    Copy the full SHA
    d5e709b View commit details
    Browse the repository at this point in the history