Ryan Ofsky c8e3978114 Merge bitcoin/bitcoin#27307: wallet: track mempool conflicts with wallet transactions ... 5952292133 wallet, rpc: show mempool conflicts in `gettransaction` result (ishaanam) 54e07ee22f wallet: track mempool conflicts (ishaanam) d64922b590 wallet refactor: use CWalletTx member functions to determine tx state (ishaanam) ffe5ff1fb6 scripted-diff: wallet: s/TxStateConflicted/TxStateBlockConflicted (ishaanam) 180973a941 test: Add tests for wallet mempool conflicts (ishaanam) Pull request description: The `mempool_conflicts` variable is added to `CWalletTx`, it is a set of txids of txs in the mempool conflicting with the wallet tx or a wallet tx's parent. This PR only changes how mempool-conflicted txs are dealt with in memory. `IsSpent` now returns false for an output being spent by a mempool conflicted transaction where it previously returned true. A txid is added to `mempool_conflicts` during `transactionAddedToMempool`. A txid is removed from `mempool_conflicts` during `transactionRemovedFromMempool`. This PR also adds a `mempoolconflicts` field to the `gettransaction` wallet RPC result. Builds on #27145 Second attempt at #18600 ACKs for top commit: achow101: ACK 5952292133 ryanofsky: Code review ACK 5952292133. Just small suggested changes since last review furszy: ACK 59522921 Tree-SHA512: 615779606723dbb6c2e302681d8e58ae2052ffee52d721ee0389746ddbbcf4b4c4afacf01ddf42b6405bc6f883520524186a955bf6b628fe9b3ae54cffc56a29		2024-03-27 12:45:08 -04:00
..
bench	bench: basic block filter index initial sync	2024-03-12 09:30:42 -03:00
common	Merge bitcoin/bitcoin#29007: test: create deterministic addrman in the functional tests	2024-03-11 10:29:31 -04:00
compat	netbase: refactor CreateSock() to accept sa_family_t	2024-03-01 13:13:07 -05:00
config
consensus	Include version.h in fewer places	2023-11-16 11:36:22 +10:00
crc32c	Update crc32c subtree to latest upstream master	2024-02-27 18:28:19 +00:00
crypto	Merge bitcoin/bitcoin#29263: serialization: c++20 endian/byteswap/clz modernization	2024-03-01 11:19:58 -05:00
index	Merge bitcoin/bitcoin#29672: validation: Make translations of fatal errors consistent	2024-03-22 14:50:58 -04:00
init	doc: add unconditional info loglevel following merge of PR 28318	2024-01-11 11:01:28 -06:00
interfaces	Merge bitcoin/bitcoin#28890: rpc: Remove deprecated -rpcserialversion	2024-01-05 10:42:10 +00:00
ipc	multiprocess: Add type conversion code for UniValue types	2023-11-28 12:35:50 -05:00
kernel	node: Make translations of fatal errors consistent	2024-03-21 16:40:22 +01:00
leveldb
logging
minisketch
node	node: Make translations of fatal errors consistent	2024-03-21 16:40:22 +01:00
policy	Merge bitcoin/bitcoin#29242: Mempool util: Add RBF diagram checks for single chunks against clusters of size 2	2024-03-26 08:48:37 +00:00
primitives	[validation] Cache merkle root and witness commitment checks	2024-02-27 14:19:15 +00:00
qt	Merge bitcoin/bitcoin#27375: net: support unix domain sockets for -proxy and -onion	2024-03-13 06:53:07 -04:00
rpc	scripted-diff: Rename max_sane_feerate to client_maxfeerate	2024-03-25 11:48:18 -04:00
script	ci: Bump TIDY_LLVM_V	2024-03-15 13:34:05 +00:00
secp256k1	Update secp256k1 subtree to latest master	2024-01-04 14:40:28 +00:00
support	scripted-diff: Fix bitcoin_config_h includes	2024-02-13 20:10:44 +00:00
test	Merge bitcoin/bitcoin#29722: 28950 followups	2024-03-26 08:56:44 +00:00
univalue
util	Merge bitcoin/bitcoin#29242: Mempool util: Add RBF diagram checks for single chunks against clusters of size 2	2024-03-26 08:48:37 +00:00
wallet	Merge bitcoin/bitcoin#27307: wallet: track mempool conflicts with wallet transactions	2024-03-27 12:45:08 -04:00
zmq	zmq: read raw block with ReadRawBlockFromDisk	2024-03-12 12:46:46 -04:00
.bear-tidy-config	tidy: modernize-use-emplace	2023-10-12 11:27:19 +02:00
.clang-format	refactor: Print verbose serialize compiler error messages	2023-12-15 15:20:54 +01:00
.clang-tidy	ci: Bump TIDY_LLVM_V	2024-03-15 13:34:05 +00:00
addrdb.cpp	addrman: drop /*deterministic=*/ comment	2024-03-23 15:33:47 +01:00
addrdb.h	Use serialization parameters for CAddress serialization	2023-09-05 10:13:25 +02:00
addresstype.cpp	Add PubKeyDestination for P2PK scripts	2023-09-12 12:14:31 -04:00
addresstype.h	bugfix: Mark CNoDestination and PubKeyDestination constructor explicit	2023-10-25 22:46:55 +02:00
addrman.cpp	Merge bitcoin/bitcoin#29404: refactor: bitcoin-config.h includes cleanup	2024-02-20 13:07:48 +00:00
addrman.h	doc, test: Test and explain service flag handling	2024-01-15 16:19:53 -05:00
addrman_impl.h	net: Optionally include terrible addresses in GetAddr results	2023-10-04 18:08:49 +02:00
arith_uint256.cpp	refactor: Remove unused and fragile string interface from arith_uint256	2023-11-21 17:37:25 +01:00
arith_uint256.h	refactor: Remove unused and fragile string interface from arith_uint256	2023-11-21 17:37:25 +01:00
attributes.h
banman.cpp	Merge bitcoin/bitcoin#24097: Replace RecursiveMutex m_cs_banned with Mutex, and rename it	2023-11-02 14:09:27 -04:00
banman.h	Merge bitcoin/bitcoin#24097: Replace RecursiveMutex m_cs_banned with Mutex, and rename it	2023-11-02 14:09:27 -04:00
base58.cpp
base58.h
bech32.cpp
bech32.h
bip324.cpp	net: merge V2Transport constructors, move key gen	2023-09-10 16:11:52 -04:00
bip324.h	net: merge V2Transport constructors, move key gen	2023-09-10 16:11:52 -04:00
bitcoin-chainstate.cpp	node: Make translations of fatal errors consistent	2024-03-21 16:40:22 +01:00
bitcoin-cli-res.rc
bitcoin-cli.cpp	Fix -netinfo backward compat with getpeerinfo pre-v26	2024-01-09 15:27:08 -06:00
bitcoin-tx-res.rc
bitcoin-tx.cpp	doc: Update bitcoin-tx replaceable documentation	2023-12-11 13:08:46 -05:00
bitcoin-util-res.rc
bitcoin-util.cpp	Include version.h in fewer places	2023-11-16 11:36:22 +10:00
bitcoin-wallet-res.rc
bitcoin-wallet.cpp
bitcoind-res.rc
bitcoind.cpp	Get rid of shutdown.cpp/shutdown.h, use SignalInterrupt directly	2023-12-04 15:39:15 -04:00
blockencodings.cpp	serialize: Drop useless version param from GetSerializeSize()	2023-11-16 11:14:13 +10:00
blockencodings.h	Use ParamsWrapper for witness serialization	2023-11-14 08:45:30 +10:00
blockfilter.cpp	refactor: SpanReader without nVersion	2023-11-28 12:42:07 +01:00
blockfilter.h	Remove unused includes from blockfilter.h	2023-08-17 18:28:15 +02:00
chain.cpp
chain.h	assumeutxo: Remove BLOCK_ASSUMED_VALID flag	2024-03-18 11:28:40 -05:00
chainparams.cpp
chainparams.h
chainparamsbase.cpp
chainparamsbase.h
chainparamsseeds.h	seeds: Update testnet seeds	2024-03-04 19:53:30 -05:00
checkqueue.h	refactor: Make CCheckQueue non-copyable and non-movable explicitly	2023-10-03 10:52:17 +01:00
clientversion.cpp	scripted-diff: Fix bitcoin_config_h includes	2024-02-13 20:10:44 +00:00
clientversion.h
coins.cpp	Use Txid in COutpoint	2023-11-21 13:15:44 +00:00
coins.h	Merge bitcoin/bitcoin#28922: Use Txid in COutpoint	2023-11-24 14:41:58 +00:00
compressor.cpp
compressor.h
core_io.h	Remove deprecated -rpcserialversion	2023-12-11 18:22:13 +01:00
core_memusage.h
core_read.cpp	Include version.h in fewer places	2023-11-16 11:36:22 +10:00
core_write.cpp	Remove deprecated -rpcserialversion	2023-12-11 18:22:13 +01:00
cuckoocache.h
dbwrapper.cpp	dbwrapper: Use DataStream for batch operations	2023-09-12 12:07:39 +02:00
dbwrapper.h	dbwrapper: Use DataStream for batch operations	2023-09-12 12:07:39 +02:00
deploymentinfo.cpp
deploymentinfo.h
deploymentstatus.cpp
deploymentstatus.h
dummywallet.cpp
external_signer.cpp	Remove unused version.h include	2023-11-30 11:28:19 +01:00
external_signer.h
flatfile.cpp	scripted-diff: Replace error() with LogError()	2024-03-11 13:49:37 +01:00
flatfile.h
hash.cpp	crypto, hash: replace custom rotl32 with std::rotl	2024-01-05 17:12:38 +01:00
hash.h	Include version.h in fewer places	2023-11-16 11:36:22 +10:00
headerssync.cpp	refactor: Fix timedata includes	2024-02-01 13:52:05 +01:00
headerssync.h
httprpc.cpp	refactor: drop protocol.h include header in rpc/util.h	2023-09-19 15:54:17 -06:00
httprpc.h
httpserver.cpp	Merge bitcoin/bitcoin#28318: logging: Simplify API for level based logging	2024-01-10 14:11:32 -05:00
httpserver.h	refactor: Remove call to ShutdownRequested from HTTPRequest	2023-12-04 15:39:15 -04:00
i2p.cpp	Merge bitcoin/bitcoin#27375: net: support unix domain sockets for -proxy and -onion	2024-03-13 06:53:07 -04:00
i2p.h	i2p: construct Session with Proxy instead of CService	2024-03-01 14:47:29 -05:00
indirectmap.h
init.cpp	init: clarify -test error	2024-03-23 15:33:50 +01:00
init.h	Get rid of shutdown.cpp/shutdown.h, use SignalInterrupt directly	2023-12-04 15:39:15 -04:00
key.cpp	refactor: Allow std::span construction from CKey	2024-01-16 15:29:18 +01:00
key.h	refactor: Allow std::span construction from CKey	2024-01-16 15:29:18 +01:00
key_io.cpp	refactor: Allow std::span construction from CKey	2024-01-16 15:29:18 +01:00
key_io.h
logging.cpp	logging: add -loglevelalways=1 option	2023-12-15 11:03:25 +10:00
logging.h	log: Remove error() reference	2024-03-12 16:26:15 +01:00
Makefile.am	Add FeeFrac utils	2024-03-18 10:32:00 -04:00
Makefile.bench.include	bench: basic block filter index initial sync	2024-03-12 09:30:42 -03:00
Makefile.crc32c.include
Makefile.leveldb.include
Makefile.minisketch.include
Makefile.qt.include	Merge bitcoin/bitcoin#22764: build: Include qt sources for parsing with extract_strings.py	2023-10-19 13:25:49 +01:00
Makefile.qt_locale.include	qt: 27.0 translations update	2024-03-04 10:02:26 +00:00
Makefile.qttest.include
Makefile.test.include	Add fuzz test for FeeFrac	2024-03-18 10:32:00 -04:00
Makefile.test_fuzz.include	fuzz: move MockedDescriptorConverter to fuzz/util	2023-11-20 15:57:50 -03:00
Makefile.test_util.include
Makefile.univalue.include
mapport.cpp
mapport.h
memusage.h	add std::list to memusage	2023-09-13 11:37:45 +01:00
merkleblock.cpp	refactor: Use Txid in CMerkleBlock	2023-11-28 17:49:41 +01:00
merkleblock.h	refactor: Use Txid in CMerkleBlock	2023-11-28 17:49:41 +01:00
net.cpp	Merge bitcoin/bitcoin#27375: net: support unix domain sockets for -proxy and -onion	2024-03-13 06:53:07 -04:00
net.h	Accept "in" and "out" flags to -whitelist to allow whitelisting manual connections	2024-02-28 10:05:56 -03:00
net_permissions.cpp	Accept "in" and "out" flags to -whitelist to allow whitelisting manual connections	2024-02-28 10:05:56 -03:00
net_permissions.h	Accept "in" and "out" flags to -whitelist to allow whitelisting manual connections	2024-02-28 10:05:56 -03:00
net_processing.cpp	Merge bitcoin/bitcoin#29619: refactor: consolidate MempoolAcceptResult processing	2024-03-13 07:26:34 -04:00
net_processing.h	net: move state dependent peer services flags	2024-01-15 10:28:20 -03:00
net_types.cpp
net_types.h
netaddress.cpp	netbase: refactor CreateSock() to accept sa_family_t	2024-03-01 13:13:07 -05:00
netaddress.h	netbase: refactor CreateSock() to accept sa_family_t	2024-03-01 13:13:07 -05:00
netbase.cpp	netbase: remove unnecessary log message	2024-03-13 14:09:50 -04:00
netbase.h	net: split ConnectToSocket() from ConnectDirectly() for unix sockets	2024-03-01 14:47:28 -05:00
netgroup.cpp	Merge bitcoin/bitcoin#27581: net: Continuous ASMap health check	2023-12-06 11:22:42 -05:00
netgroup.h	net: Add continuous ASMap health check logging	2023-12-02 22:03:08 +01:00
netmessagemaker.h	refactor: NetMsg::Make() without nVersion	2023-11-20 14:02:27 +01:00
noui.cpp	node: Use log levels in noui_ThreadSafeMessageBox	2024-03-21 16:41:16 +01:00
noui.h
outputtype.cpp
outputtype.h
pow.cpp
pow.h
prevector.h	refactor: Mark prevector iterator with std::contiguous_iterator_tag	2024-01-18 19:29:34 +01:00
protocol.cpp	net: remove now unused global 'g_initial_block_download_completed'	2024-01-23 10:25:16 -03:00
protocol.h	net: remove now unused global 'g_initial_block_download_completed'	2024-01-23 10:25:16 -03:00
psbt.cpp	Remove unused version.h include	2023-11-30 11:28:19 +01:00
psbt.h	refactor: SpanReader without nVersion	2023-11-28 12:42:07 +01:00
pubkey.cpp	pubkey: introduce a GetEvenCorrespondingCPubKey helper	2023-10-08 02:43:19 +02:00
pubkey.h	Add missing XOnlyPubKey::data() to get mutable data	2024-01-16 10:58:57 +01:00
random.cpp	scripted-diff: Fix bitcoin_config_h includes	2024-02-13 20:10:44 +00:00
random.h	crypto: replace CountBits with std::bit_width	2024-02-26 16:13:12 +00:00
randomenv.cpp	[refactor] Remove compat.h from kernel headers	2023-09-12 22:51:48 +02:00
randomenv.h
rest.cpp	rest: read raw block in rest_block and deserialize for json	2024-03-12 12:48:04 -04:00
rest.h
reverse_iterator.h
scheduler.cpp	scripted-diff: Rename SingleThreadedSchedulerClient to SerialTaskRunner	2024-02-15 14:43:14 +01:00
scheduler.h	kernel: Remove dependency on CScheduler	2024-02-16 17:12:52 +01:00
serialize.h	Merge bitcoin/bitcoin#29263: serialization: c++20 endian/byteswap/clz modernization	2024-03-01 11:19:58 -05:00
signet.cpp	refactor: SpanReader without nVersion	2023-11-28 12:42:07 +01:00
signet.h
span.h	Allow int8_t optimized vector serialization	2023-12-22 09:58:19 +01:00
streams.cpp
streams.h	Remove unused CDataStream	2023-11-30 11:27:54 +01:00
sync.cpp	scripted-diff: Fix bitcoin_config_h includes	2024-02-13 20:10:44 +00:00
sync.h	Merge bitcoin/bitcoin#27116: doc: clarify that LOCK() internally checks whether the mutex is held	2023-10-26 15:02:13 -04:00
threadsafety.h
timedata.cpp	Remove GetAdjustedTime	2024-01-05 17:16:38 +00:00
timedata.h	refactor: Fix timedata includes	2024-02-01 13:52:05 +01:00
tinyformat.h
torcontrol.cpp	Merge bitcoin/bitcoin#28318: logging: Simplify API for level based logging	2024-01-10 14:11:32 -05:00
torcontrol.h	doc, refactor: Changing -torcontrol help to specify that a default port is used	2023-08-17 23:58:47 -05:00
txdb.cpp	Merge bitcoin/bitcoin#28195: blockstorage: Drop legacy -txindex check	2023-09-05 11:37:35 +01:00
txdb.h
txmempool.cpp	Implement ImprovesFeerateDiagram	2024-03-18 10:32:00 -04:00
txmempool.h	Implement ImprovesFeerateDiagram	2024-03-18 10:32:00 -04:00
txorphanage.cpp	fuzz: Improve fuzzing stability for txorphan harness	2023-12-08 13:14:46 +00:00
txorphanage.h	fuzz: Improve fuzzing stability for txorphan harness	2023-12-08 13:14:46 +00:00
txrequest.cpp	refactor: modernize-use-default-member-init for bit-fields (C++20)	2023-12-07 11:06:01 +01:00
txrequest.h
uint256.cpp
uint256.h
undo.h	Include version.h in fewer places	2023-11-16 11:36:22 +10:00
validation.cpp	use const ref for client_maxfeerate	2024-03-25 11:52:12 -04:00
validation.h	use const ref for client_maxfeerate	2024-03-25 11:52:12 -04:00
validationinterface.cpp	kernel: Remove dependency on CScheduler	2024-02-16 17:12:52 +01:00
validationinterface.h	kernel: Remove dependency on CScheduler	2024-02-16 17:12:52 +01:00
versionbits.cpp
versionbits.h
walletinitinterface.h
warnings.cpp	scripted-diff: Fix bitcoin_config_h includes	2024-02-13 20:10:44 +00:00
warnings.h