mirror of https://github.com/bitcoin/bitcoin.git synced 2025-12-09 12:12:41 +01:00

Files

MarcoFalke 3657aee2d2 Merge #18982 : wallet: Minimal fix to restore conflicted transaction notifications

7eaf86d3bf trivial: Suggested cleanups to surrounding code (Russell Yanofsky)
b604c5c8b5 wallet: Minimal fix to restore conflicted transaction notifications (Russell Yanofsky)

Pull request description:

  This fix is a based on the fix by Antoine Riard (ariard) in https://github.com/bitcoin/bitcoin/pull/18600.

  Unlike that PR, which implements some new behavior, this just restores previous wallet notification and status behavior for transactions removed from the mempool because they conflict with transactions in a block. The behavior was accidentally changed in two `CWallet::BlockConnected` updates: a31be09bfd and 7e89994133 from https://github.com/bitcoin/bitcoin/pull/16624, causing issue https://github.com/bitcoin/bitcoin/issues/18325.

  The change here could be improved and replaced with a more comprehensive cleanup, so it includes a detailed comment explaining future considerations.

  Fixes #18325

  Co-authored-by: Antoine Riard (ariard)

ACKs for top commit:
  jonatack:
    Re-ACK 7eaf86d3bf
  ariard:
    ACK 7eaf86d, reviewed, built and ran tests.
  MarcoFalke:
    ACK 7eaf86d3bf 🍡

Tree-SHA512: 9a1efe975969bb522a9dd73c41064a9348887cb67883cd92c6571fd2df4321b9f4568363891abdaae14a3b9b168ef8142e95c373fc04677e46289b251fb84689

2020-06-02 18:11:52 -04:00

chain.cpp

wallet: Minimal fix to restore conflicted transaction notifications

2020-05-15 09:23:55 -04:00

chain.h

wallet: Minimal fix to restore conflicted transaction notifications

2020-05-15 09:23:55 -04:00

handler.cpp

scripted-diff: Bump copyright headers

2020-04-16 13:33:09 -04:00

handler.h

scripted-diff: Bump copyright headers

2020-04-16 13:33:09 -04:00

node.cpp

Merge #18452 : qt: Fix shutdown when waitfor* cmds are called from RPC console

2020-05-29 15:49:46 +02:00

node.h

BlockTip struct created and connected to notifyHeaderTip and notifyBlockTip signals.

2020-05-23 20:02:10 -03:00

README.md

Suggested interfaces::Chain cleanups from #15288

2019-03-04 15:57:58 -05:00

wallet.cpp

Added best block hash to the NotifyHeaderTip and NotifyBlockTip signals.

2020-05-23 20:02:04 -03:00

wallet.h

Added best block hash to the NotifyHeaderTip and NotifyBlockTip signals.

2020-05-23 20:02:04 -03:00

README.md

Internal c++ interfaces

The following interfaces are defined here:

Chain — used by wallet to access blockchain and mempool state. Added in #14437, #14711, #15288, and #10973.
ChainClient — used by node to start & stop Chain clients. Added in #14437.
Node — used by GUI to start & stop bitcoin node. Added in #10244.
Wallet — used by GUI to access wallets. Added in #10244.
Handler — returned by handleEvent methods on interfaces above and used to manage lifetimes of event handlers.
Init — used by multiprocess code to access interfaces above on startup. Added in #10102.

The interfaces above define boundaries between major components of bitcoin code (node, wallet, and gui), making it possible for them to run in different processes, and be tested, developed, and understood independently. These interfaces are not currently designed to be stable or to be used externally.