Andrew Chow 7d33ae755d

Merge bitcoin/bitcoin#27145: wallet: when a block is disconnected, update transactions that are no longer conflicted ...

89df7987c2f1eea42454c2b0efc31a924fbfd3a8 Add wallets_conflicts (Antoine Riard)
dced203162d45e542f187f8d0d07dab85c52cf28 wallet, tests: mark unconflicted txs as inactive (ishaanam)
096487c4dcfadebe5ca959927f5426cae1c304d5 wallet: introduce generic recursive tx state updating function (ishaanam)

Pull request description:

  This implements a fix for #7315. Previously when a block was disconnected any transactions that were conflicting with transactions mined in that block were not updated to be marked as inactive. The fix implemented here is described on the [Bitcoin DevWiki](https://github.com/bitcoin-core/bitcoin-devwiki/wiki/Wallet-Transaction-Conflict-Tracking#idea-refresh-conflicted). A test which tested the previous behavior has also been updated.

  Second attempt at #17543

ACKs for top commit:
  achow101:
    ACK 89df7987c2f1eea42454c2b0efc31a924fbfd3a8
  rajarshimaitra:
    tACK 89df7987c2f1eea42454c2b0efc31a924fbfd3a8.
  glozow:
    ACK 89df7987c2f1eea42454c2b0efc31a924fbfd3a8
  furszy:
    Tested ACK 89df7987

Tree-SHA512: 3133b151477e8818302fac29e96de30cd64c09a8fe3a7612074a34ba1a332e69148162e6cb3f1074d9d9c9bab5ef9996967d325d8c4c99ba42b5fe3b66a60546

2023-05-27 13:07:09 -04:00

..

rpc

scripted-diff: Use UniValue::find_value method

2023-05-09 18:47:14 +02:00

test

test: add coverage for wallet read write db deadlock

2023-05-15 12:29:38 -03:00

bdb.cpp

wallet: bugfix, GetNewCursor() misses to provide batch ptr to BerkeleyCursor

2023-05-15 12:23:15 -03:00

bdb.h

wallet: bugfix, GetNewCursor() misses to provide batch ptr to BerkeleyCursor

2023-05-15 12:23:15 -03:00

coincontrol.cpp

refactor: Make ListSelected return vector

2023-04-26 10:41:10 +02:00

coincontrol.h

refactor: Make ListSelected return vector

2023-04-26 10:41:10 +02:00

coinselection.cpp

Merge bitcoin/bitcoin#27419: move-only: Extract common/args from util/system

2023-04-21 11:19:08 +01:00

coinselection.h

Merge bitcoin/bitcoin#26720: wallet: coin selection, don't return results that exceed the max allowed weight

2023-04-20 16:33:39 -04:00

context.cpp

scripted-diff: Bump copyright headers

2022-12-24 23:49:50 +00:00

context.h

…

crypter.cpp

…

crypter.h

scripted-diff: Bump copyright headers

2022-12-24 23:49:50 +00:00

db.cpp

move-only: Extract common/args and common/config.cpp from util/system

2023-04-19 10:48:30 +02:00

db.h

wallet: Move DummyDatabase to salvage

2023-05-03 10:45:10 -04:00

dump.cpp

move-only: Extract common/args and common/config.cpp from util/system

2023-04-19 10:48:30 +02:00

dump.h

refactor: Move fs.* to util/fs.*

2023-03-23 12:55:18 +01:00

external_signer_scriptpubkeyman.cpp

refactor: Replace string chain name constants with ChainTypes

2023-05-09 15:49:14 +02:00

external_signer_scriptpubkeyman.h

wallet: set keypool_size instead of access global args manager

2023-02-15 15:49:44 -03:00

feebumper.cpp

bumpfee: enable send coins back to yourself

2023-04-15 10:44:50 -03:00

feebumper.h

wallet: add outputs arguments to bumpfee and psbtbumpfee

2023-01-17 13:28:53 +02:00

fees.cpp

scripted-diff: Bump copyright headers

2022-12-24 23:49:50 +00:00

fees.h

…

init.cpp

move-only: Extract common/args and common/config.cpp from util/system

2023-04-19 10:48:30 +02:00

interfaces.cpp

Merge bitcoin/bitcoin#27224: refactor: Remove CAddressBookData::destdata

2023-05-01 08:16:54 -04:00

load.cpp

move-only: Extract common/args and common/config.cpp from util/system

2023-04-19 10:48:30 +02:00

load.h

scripted-diff: Bump copyright headers

2022-12-24 23:49:50 +00:00

receive.cpp

scripted-diff: Bump copyright headers

2022-12-24 23:49:50 +00:00

receive.h

wallet: Add wallet/types.h for simple public enum and struct types

2023-04-11 15:52:25 -04:00

salvage.cpp

wallet: Move DummyDatabase to salvage

2023-05-03 10:45:10 -04:00

salvage.h

refactor: Move fs.* to util/fs.*

2023-03-23 12:55:18 +01:00

scriptpubkeyman.cpp

wallet: skip block scan if block was created before wallet birthday

2023-05-25 10:45:38 -03:00

scriptpubkeyman.h

wallet: skip block scan if block was created before wallet birthday

2023-05-25 10:45:38 -03:00

spend.cpp

refactor: Make ListSelected return vector

2023-04-26 10:41:10 +02:00

spend.h

gui: bugfix, getAvailableBalance skips selected coins

2023-04-03 17:23:42 -03:00

sqlite.cpp

wallet: Add DatabaseBatch::ErasePrefix method

2023-04-12 05:30:43 -04:00

sqlite.h

wallet: Add DatabaseBatch::ErasePrefix method

2023-04-12 05:30:43 -04:00

transaction.cpp

…

transaction.h

wallet: Add wallet/types.h for simple public enum and struct types

2023-04-11 15:52:25 -04:00

types.h

wallet: add AddressPurpose enum to replace string values

2023-04-11 15:52:25 -04:00

wallet.cpp

Merge bitcoin/bitcoin#27145: wallet: when a block is disconnected, update transactions that are no longer conflicted

2023-05-27 13:07:09 -04:00

wallet.h

Merge bitcoin/bitcoin#27145: wallet: when a block is disconnected, update transactions that are no longer conflicted

2023-05-27 13:07:09 -04:00

walletdb.cpp

Merge bitcoin/bitcoin#27556: wallet: fix deadlock in bdb read write operation

2023-05-18 11:10:05 -04:00

walletdb.h

walletdb: Remove unused CreateMockWalletDatabase

2023-05-15 16:14:43 -04:00

wallettool.cpp

move-only: Extract common/args and common/config.cpp from util/system

2023-04-19 10:48:30 +02:00

wallettool.h

…

walletutil.cpp

move-only: Extract common/args and common/config.cpp from util/system

2023-04-19 10:48:30 +02:00

walletutil.h

refactor: Move fs.* to util/fs.*

2023-03-23 12:55:18 +01:00