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.

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: bitcoin#16551, #20288, #20329, #20451, #20491, #20512, #20587, #20588, #20611, #21112 #5963

Merged
merged 10 commits into from
Apr 3, 2024

Commits on Apr 3, 2024

  1. Merge bitcoin#20288: script, doc: contrib/seeds updates

    961f148 doc: update contrib/seeds/README dnspython installation info (Jon Atack)
    dd7b5f4 script: fix deprecation warning in makeseeds.py (Jon Atack)
    
    Pull request description:
    
      Seen while reviewing bitcoin#20237.
    
      1. Fix a deprecation warning in `contrib/seeds/makeseeds.py`
      ```
          makeseeds.py:139: DeprecationWarning: please use dns.resolver.resolve() instead
            asn = int([x.to_text() for x in dns.resolver.query('.'.join(
      ```
        - Per https://dnspython.readthedocs.io/en/latest/whatsnew.html, `dns.resolver.query()` was deprecated in `dnspython` version 2.0.0.
    
        - See https://dnspython.readthedocs.io/en/latest/resolver-class.html for more info on the resolver class.
    
      2. Update the `dnspython` dependency installation instructions in `contrib/seeds/README`
    
        - The markdown rendering can be seen here: https://github.com/jonatack/bitcoin/tree/contrib-seeds-fixups/contrib/seeds
    
    ACKs for top commit:
      laanwj:
        code review ACK 961f148
    
    Tree-SHA512: f9c4f318a1a0d35b8de147d24b72c534a1f58eece31e7cfa00b4149a63b6a618d8ca0312f52fd8056f3c645cf2ee68574ca02319fddffdad919a70cd33395d33
    laanwj authored and knst committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    9eec4cc View commit details
    Browse the repository at this point in the history
  2. Merge bitcoin#20329: docs/descriptors.md: Remove hardened marker in t…

    …he path after xpub
    
    dc80a7d docs/descriptors.md: Remove hardened marker in the path after xpub (Dmitry Petukhov)
    
    Pull request description:
    
      As described in "Key origin identification" section, a descriptor
      that has hardened derivation after xpub does not let you compute scripts
      without access to the corresponding private keys. Such a descriptor is
      practically useless.
    
      The text after the descriptor said "with child key *1'/2* of the
      specified xpub", and clearly an xpub cannot have "child key" with
      hardened derivation. Therefore it makes sense to fix this inconsistency
      to not confuse the reader of the doc
    
    Top commit has no ACKs.
    
    Tree-SHA512: 9f35951d90868585303681c27ea2ef9d36d4036181e337cfbd48730de0c346320b08dd089350b116d4c8542f3b506868cf318796bb713e5f80600ccbd96f9970
    MarcoFalke authored and knst committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    455bb2e View commit details
    Browse the repository at this point in the history
  3. Merge bitcoin#20491: refactor: Drop noop gcc version checks

    830ddf4 Drop noop gcc version checks (Hennadii Stepanov)
    
    Pull request description:
    
      Since bitcoin#20413 the minimum required GCC version is 7.
    
    ACKs for top commit:
      fanquake:
        ACK 830ddf4
    
    Tree-SHA512: 36264661d6ced1683a0c907efba7c700502acaf8e9fd50d9066bc9c7b877b25165b0684c2d7fe74bd58e500a77d7702bdbdd53691c274f29e4abccd241c10964
    fanquake authored and knst committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    d01973c View commit details
    Browse the repository at this point in the history
  4. Merge bitcoin#20512: doc: Add bash as an OpenBSD dependency

    1d578c0 doc: Add bash as an OpenBSD dependency (Emil Engler)
    
    Pull request description:
    
      If we require Python for the test framework, we should also require
      bash. It is required for the linters and other scripts and does not
      comes in a default OpenBSD installation.
    
    ACKs for top commit:
      practicalswift:
        ACK 1d578c0
      RiccardoMasutti:
        ACK 1d578c0
      theStack:
        ACK 1d578c0
    
    Tree-SHA512: ef14e801983093a99d4c28d134adbc589ca06e5437bf1ff34f8e593968c59793e9d99e8a48f577f847acdfc5185e193276526894b4c632c59d66d87939977910
    jonasschnelli authored and knst committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    def356e View commit details
    Browse the repository at this point in the history
  5. Merge bitcoin#20587: [doc] Tidy up Tor doc (more stringent)

    32045bb [doc] Tidy up Tor doc (more stringent) (wodry)
    
    Pull request description:
    
      This is a follow up to bitcoin#19638 that left two deprecated "hidden service/server" naming occurences.
    
      It also shall make the chapter titles regarding creation of onion services stringent and easy to read and distinguish.
    
      It removes the one and only reference to the testnet (here the testnet onion service port), as it is not explained that it references to the testnet and I do not know why it is mentioned there. It is only confusing. Also, as said, the testnet is not referenced at any other place in this document.
    
    ACKs for top commit:
      practicalswift:
        ACK 32045bb
      laanwj:
        Review ACK 32045bb
      RiccardoMasutti:
        ACK 32045bb
    
    Tree-SHA512: c623387b76d68845c0fa47f67a6f8ef70c9c560e3f8f8754e45a4f51e43198c2092be789588acd4ada607f42fbe62d51a4b1888d81b225df19b6557a081835c0
    laanwj authored and knst committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    d186b37 View commit details
    Browse the repository at this point in the history
  6. Merge bitcoin#20588: Remove unused and confusing CTransaction constru…

    …ctor
    
    fac39c1 wallet: document that tx in CreateTransaction is purely an out-param (MarcoFalke)
    faac315 Remove unused and confusing CTransaction constructor (MarcoFalke)
    
    Pull request description:
    
      The constructor is confusing and dangerous (as explained in the TODO), fix that by removing it.
    
    ACKs for top commit:
      laanwj:
        Code review ACK fac39c1
      promag:
        Code review ACK fac39c1.
      theStack:
        Code review ACK fac39c1
    
    Tree-SHA512: e0c8cffce8d8ee0166b8e1cbfe85ed0657611e26e2af0d69fde70eceaa5d75cbde3eb489af0428fe4fc431360b4c791fb1cc21b8dee7d4c7a4f17df00836229d
    fanquake authored and knst committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    41505e6 View commit details
    Browse the repository at this point in the history
  7. Merge bitcoin#20611: Move TX_MAX_STANDARD_VERSION to policy

    fade619 Move TX_MAX_STANDARD_VERSION to policy (MarcoFalke)
    
    Pull request description:
    
      `primitives` should only be used for the raw datastructures (parsing and format). It is not the right place to document relay policy.
    
    ACKs for top commit:
      laanwj:
        Code review ACK fade619
      lontivero:
        Concept ACK bitcoin@fade619
    
    Tree-SHA512: f809c4aecd14d7e9feaa7b50b9c0697232991eef36190cd960bcfb0ad6e20c71a4f6aab48c7747cf8a681eb14feda60c55b09a37f128673d519567224f29cd97
    laanwj authored and knst committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    b193c63 View commit details
    Browse the repository at this point in the history
  8. Merge bitcoin#16551: test: Test that low difficulty chain fork is rej…

    …ected
    
    Backport notice:
     - data have real blocks from testnet
     - due to big gap in blocks before checkpoints (half-year) for sack of this test is added one more checkpoint, otherwise blocks are not accepted due to non-mockable time for other chains except regtest
     - data for 2 blocks in split chain are generated locally for testnet
    --------------
    333317c test: Test that low difficulty chain fork is rejected (MarcoFalke)
    fa31dc1 test: Pass down correct chain name in tests (MarcoFalke)
    
    Pull request description:
    
      To prevent OOM, Bitcoin Core will reject chain forks at low difficulty by default. This is the only use-case of checkpoints, so add a test for it to make sure the feature works as expected. If it didn't work, checkpoints would have no use-case and we might as well remove them
    
    ACKs for top commit:
      Sjors:
        Thanks for adding the node 1 example. Code review ACK 333317c
    
    Tree-SHA512: 90dffa540d0904f3cffb61d2382b1a26f84fe9560b7013e4461546383add31a8757b350616a6d43217c59ef7b8b2a1b62bb3bab582c679cbb2c660a782ce7be1
    MarcoFalke authored and knst committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    eba325d View commit details
    Browse the repository at this point in the history
  9. Merge bitcoin#20451: lint: run mypy over contrib/devtools

    1ef2138 lint: run mypy over contrib/devtools (fanquake)
    
    Pull request description:
    
      wumpus mentioned on IRC that we don't currently run `mypy` over the `contrib/devtools` directory, and that it would likely be worthwhile given bitcoin#20434. This just adds that dir to the linter, as well as some missing annotations to fix existing errors. Note that now we require Python 3.6 we can make use of variable annotations.
    
      master (patched to check contrib devtools):
      ```bash
      test/lint/lint-python.sh
      contrib/devtools/symbol-check.py:154: error: Incompatible types in assignment (expression has type "List[str]", variable has type "str")
      contrib/devtools/circular-dependencies.py:35: error: Need type annotation for 'deps' (hint: "deps: Dict[<type>, <type>] = ...")
      contrib/devtools/circular-dependencies.py:67: error: Need type annotation for 'closure' (hint: "closure: Dict[<type>, <type>] = ...")
      Found 4 errors in 3 files (checked 187 source files)
      ```
    
      I haven't quite gone as far as to add annotations like
      ```python
      CHECKS: Dict[str, List[Tuple[str, Callable[[Any], bool]]]] = {...
      ```
      to `symbol-check.py`.
    
    ACKs for top commit:
      laanwj:
        ACK 1ef2138
    
    Tree-SHA512: a58c2ece588c640289dc1d35dad5b1b8732788272daa0965d6bf44ee8a7f7c8e8585f94d233ac41c84b9ffcfc97841a00fe2c9acba41f58fd164f01de4b6512b
    laanwj authored and knst committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    1995d2e View commit details
    Browse the repository at this point in the history
  10. Merge bitcoin#21112: ci: use Focal for macOS cross builds

    ac24af4 ci: use Ubuntu Focal for macOS cross build (fanquake)
    
    Pull request description:
    
      I had assumed Cirrus was spinning up Docker containers to run the CI,
      however we are actaully running on the Cirrus machines themselves. See
      `DANGER_RUN_CI_ON_HOST` and in the logs:
      ```bash
      Running on host system without docker wrapper
      ```
    
      So with this change we will actually be using Focal for the macOS cross build.
    
      Follow up to bitcoin#21036.
    
      This originally contained Windows changes, and an attempt to get Cirrus running without `DANGER_RUN_CI_ON_HOST`, however that seems non-trival, so Windows changes have been dropped from here for now.
    
    ACKs for top commit:
      MarcoFalke:
        cr ACK ac24af4
    
    Tree-SHA512: 587ba5acf741bcefecf1bc262fa1177f565ebfa9de56125eca19ed3c7db7b9aabfb96866e9c140681b88cb7015a3ded2bc6b4b1b235543d6f6e9dfc6984d569f
    MarcoFalke authored and knst committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    c865338 View commit details
    Browse the repository at this point in the history