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#8456, #15704, #18850, #19241, #19317, #19493, #19739, #19903, #20003 #5813

Merged
merged 9 commits into from
Jan 11, 2024

Commits on Jan 11, 2024

  1. Merge bitcoin#19317: Add a left-justified width field to log2_work co…

    …mponent for a uniform debug.log output
    
    c858302 Change format of log2_work for uniform output (zero-padded) (jmorgan)
    
    Pull request description:
    
      Motivation:
      It's jarring to watch the output of `tail -f ~/btcdata/debug.log` scroll by and very frequently see columns not lining up correctly because `log2_work` somtimes has less precision than 8 digits.
    
      Current display:
      ```
      2020-06-18T02:54:42Z UpdateTip: new best=0000000000000000107f877e4920643f9fb06090fa7551cd1cdd83b857f520aa height=382038 version=0x00000003 log2_work=83.558653 tx=90953616 date='2015-11-04T17:11:44Z' progress=0.166675 cache=117.6MiB(966410txo)
      2020-06-18T02:54:51Z UpdateTip: new best=0000000000000000019a4de585d30d1a8cc13c7a1972d11b4945635c9556acb5 height=382039 version=0x00000003 log2_work=83.55868 tx=90955936 date='2015-11-04T17:19:39Z' progress=0.166679 cache=117.9MiB(968799txo)
      ```
    
      Display with this commit:
      ```
      2020-06-18T02:54:42Z UpdateTip: new best=0000000000000000107f877e4920643f9fb06090fa7551cd1cdd83b857f520aa height=382038 version=0x00000003 log2_work=83.558653 tx=90953616 date='2015-11-04T17:11:44Z' progress=0.166675 cache=117.6MiB(966410txo)
      2020-06-18T02:54:51Z UpdateTip: new best=0000000000000000019a4de585d30d1a8cc13c7a1972d11b4945635c9556acb5 height=382039 version=0x00000003 log2_work=83.55868  tx=90955936 date='2015-11-04T17:19:39Z' progress=0.166679 cache=117.9MiB(968799txo)
      ```
    
    ACKs for top commit:
      practicalswift:
        ACK c858302 -- patch looks great :)
      achow101:
        ACK c858302
      laanwj:
        Tested ACK c858302
    
    Tree-SHA512: 16cbe419c4993ad51019c676e8ca409ef1025b803cc598437c780dd7ca003d7e4ad421f451e9a374e0070ee9b3ee601b7aba849e1f346798f9321d1bce5c4401
    laanwj authored and PastaPastaPasta committed Jan 11, 2024
    Configuration menu
    Copy the full SHA
    bba596d View commit details
    Browse the repository at this point in the history
  2. Merge bitcoin#18850: wallet: Fix ZapSelectTx to sync wallet spends

    9c59f9c Fix ZapSelectTx to sync wallet spends (Anthony Fieroni)
    
    Pull request description:
    
      Signed-off-by: Anthony Fieroni <[email protected]>
    
    ACKs for top commit:
      achow101:
        ACK 9c59f9c
      ryanofsky:
        Code review ACK 9c59f9c. Only change since last review tweaking the for loop as suggested
      jonatack:
        ACK 9c59f9c tested rebased on current master b33136b and the new unit test does indeed fail without the change.
      meshcollider:
        utACK 9c59f9c
    
    Tree-SHA512: 71672a5ab0c659550c3a40577614ea896412b79566b5672636ab18765e4c71b9d0a990d94dc6b6e623b03a05737022b04026b5699438809c7c54782d0fd0a5d2
    meshcollider authored and PastaPastaPasta committed Jan 11, 2024
    Configuration menu
    Copy the full SHA
    b64081b View commit details
    Browse the repository at this point in the history
  3. partial Merge bitcoin#8456: [RPC] Simplified bumpfee command.

    It includes only this commit for sake of backporting HasWalletSpent
    
    [RPC] bumpfee
    
    This command allows a user to increase the fee on a wallet transaction T, creating a "bumper" transaction B.
    T must signal that it is BIP-125 replaceable.
    T's change output is decremented to pay the additional fee.  (B will not add inputs to T.)
    T cannot have any descendant transactions.
    Once B bumps T, neither T nor B's outputs can be spent until either T or (more likely) B is mined.
    
    Includes code by @jonasschnelli and @ryanofsky
    mrbandrews authored and PastaPastaPasta committed Jan 11, 2024
    Configuration menu
    Copy the full SHA
    21e1a4a View commit details
    Browse the repository at this point in the history
  4. Merge bitcoin#19493: wallet: Fix clang build in Mac

    1e58bcc wallet: Fix clang build in Mac (Anthony Fieroni)
    
    Pull request description:
    
      Signed-off-by: Anthony Fieroni <[email protected]>
    
    Top commit has no ACKs.
    
    Tree-SHA512: 19312929af14dab97c37cf4547fbd6589a6de960f1a499c2118bb684240639af4b127cf8dc4d201b41d253cfbb645614a0606d4ecce29f300b10c210d38a961b
    MarcoFalke authored and PastaPastaPasta committed Jan 11, 2024
    Configuration menu
    Copy the full SHA
    c95bbed View commit details
    Browse the repository at this point in the history
  5. Merge bitcoin#15704: Move Win32 defines to configure.ac to ensure the…

    …y are globally defined
    
    1ccb9f3 Move Win32 defines to configure.ac to ensure they are globally defined (Luke Dashjr)
    
    Pull request description:
    
      bitcoin#9245 no longer needs this, since the main `_WIN32_WINNT` got bumped by something else.
    
      So rather than just lose it, might as well get it merged in independently.
    
      I'm not aware of any practical effects, but it seems safer to use the same API versions everywhere.
    
    ACKs for top commit:
      fanquake:
        ACK 1ccb9f3 - checked that the binaries produced are the same.
    
    Tree-SHA512: 273e9186579197be01b443b6968e26b9a8031d356fabc5b73aa967fcdb837df195b7ce0fc4e4529c85d9b86da6f2d7ff1bf56a3ff0cbbcd8cee8a9c2bf70a244
    fanquake authored and PastaPastaPasta committed Jan 11, 2024
    Configuration menu
    Copy the full SHA
    feb6363 View commit details
    Browse the repository at this point in the history
  6. Merge bitcoin#19739: refactor: remove c-string interfaces for DecodeB…

    …ase58{Check}
    
    d3e8adf util: remove c-string interfaces for DecodeBase58{Check} (Sebastian Falbesoner)
    
    Pull request description:
    
      This micro-PR gets rid of base58 function interfaces that are redundant in terms of c-string / std::string variants; the c-string interface for `DecodeBase58Check` is completely unused outside the base58 module, while the c-string interface for `DecodeBase58` is only used in unit tests, where an implicit conversion to std::string is not problematic.
    
    ACKs for top commit:
      practicalswift:
        ACK d3e8adf -- patch looks correct
      laanwj:
        Code review ACK d3e8adf
    
    Tree-SHA512: 006a4a1e23b11385f60820c188b8e6b1634a182ca36e29a6580f72150214c65a3fdb273ec439165f26ba88a42d2bf5bab1cf3666a9eaee222fb4e1c00aeba433
    laanwj authored and PastaPastaPasta committed Jan 11, 2024
    Configuration menu
    Copy the full SHA
    fb274b1 View commit details
    Browse the repository at this point in the history
  7. Merge bitcoin#19903: Update build-openbsd.md with GUI support

    d110200 Add OpenBSD instructions for building the Qt GUI (grubles)
    
    Pull request description:
    
      Using OpenBSD as a desktop OS is prevalent enough IMO to warrant updating the documentation for building the GUI.
    
    ACKs for top commit:
      fanquake:
        ACK d110200 - looks fine. Have not tested.
    
    Tree-SHA512: a8078334fdd35438bcf87c3f5eae851c2a1ce961eb48ae50770bf2c556489da86b6ee198fe9fb732dcaddb2e0f2f4f55a3126971aae8f7d4e2e320dbb024e204
    fanquake authored and PastaPastaPasta committed Jan 11, 2024
    Configuration menu
    Copy the full SHA
    2870a68 View commit details
    Browse the repository at this point in the history
  8. Merge bitcoin#19241: help: Generate checkpoint height from chainparams

    916d359 help: Generate checkpoint height from chainparams (Luke Dashjr)
    
    Pull request description:
    
      Not sure if this is worth putting in Core, but might as well until checkpoints are removed entirely.
    
    ACKs for top commit:
      laanwj:
        re-ACK 916d359
    
    Tree-SHA512: d8eb26b570ee730fdd75ca916507134db5f2f68987a911e33544b7f1c9ccfd1c76b9c9db63056971956b6daf16910f17ecfc197481c2f7b0773afdfbf7d381cf
    laanwj authored and PastaPastaPasta committed Jan 11, 2024
    Configuration menu
    Copy the full SHA
    a5cb057 View commit details
    Browse the repository at this point in the history
  9. Merge bitcoin#20003: net: Exit with error message if -proxy is specif…

    …ied without arguments (instead of continuing without proxy server)
    
    9b4fa0a net: Print error message if -proxy is specified without arguments (instead of continuing without proxy server) (practicalswift)
    
    Pull request description:
    
      Exit with error message if `-proxy` is specified without arguments (instead of continuing without proxy server).
    
      Continuing without a proxy server when the end-user has specified `-proxy` may result in accidental loss of privacy. (The end-user might think he/she is using a proxy when he/she is not.)
    
      Before this patch:
    
      ```
      $ src/bitcoind -proxy
      …
      2020-09-23T00:24:33Z InitParameterInteraction: parameter interaction: -proxy set -> setting -listen=0
      2020-09-23T00:24:33Z InitParameterInteraction: parameter interaction: -proxy set -> setting -upnp=0
      2020-09-23T00:24:33Z InitParameterInteraction: parameter interaction: -proxy set -> setting -discover=0
      2020-09-23T00:24:33Z InitParameterInteraction: parameter interaction: -listen=0 -> setting -listenonion=0
      …
      2020-09-23T00:24:33Z init message: Starting network threads...
      ```
    
      `bitcoind` is now running *without* a proxy server (`GetProxy(…, …) == false`, `HaveNameProxy() == false`, etc.).
    
      Note that the "-proxy set" log messages above which the end-user might interpret as "good, my traffic is now routed via the proxy".
    
      After this patch:
    
      ```
      $ src/bitcoind -proxy
      Error: No proxy server specified. Use -proxy=<ip> or -proxy=<ip:port>.
      $ echo $?
      1
      ```
    
    ACKs for top commit:
      laanwj:
        re-ACK 9b4fa0a
      kristapsk:
        ACK 9b4fa0a, I have tested the code.
      hebasto:
        re-ACK 9b4fa0a
    
    Tree-SHA512: 4ba7a011991699a54b5bb87ec68367c681231bf5dcd36f8c89ff9ddc2e8d29df453817b7e362597e652ad6b341a22b7274be0fd78d435e5f0fd8058e5221c4ce
    laanwj authored and PastaPastaPasta committed Jan 11, 2024
    Configuration menu
    Copy the full SHA
    4293cbd View commit details
    Browse the repository at this point in the history