highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-01-20 15:19:07 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
654420d6dfb455ca4030055881db4e3aa9ec6e8b
bitcoin/src
History
Russell Yanofsky 654420d6df wallet: Minimal fix to restore conflicted transaction notifications 
This fix is a based on the fix by Antoine Riard <ariard@student.42.fr> 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@student.42.fr>

Github-Pull: #18982
Rebased-From: b604c5c8b5
2020-06-09 21:12:38 +08:00
..
bench
Fix wallet unload race condition
2020-03-27 15:17:35 +00:00
compat
scripted-diff: Bump copyright of files changed in 2019
2019-12-30 10:42:20 +13:00
config
…
consensus
Update merkle.cpp
2020-03-18 10:34:53 -07:00
crc32c
Import crc32c using subtree merge as as 'src/crc32c'
2020-01-28 17:00:01 +01:00
crypto
Avoid non-trivial global constants in SHA-NI code
2020-04-23 14:24:10 +08:00
index
Merge #17477: Remove the mempool's NotifyEntryAdded and NotifyEntryRemoved signals
2020-03-19 17:26:51 +01:00
interfaces
wallet: Minimal fix to restore conflicted transaction notifications
2020-06-09 21:12:38 +08:00
leveldb
Update to leveldb upstream using subtree merge
2020-01-28 16:59:07 +01:00
logging
doc: Correct spelling errors in comments
2020-03-02 23:07:21 -08:00
node
doc: Correct spelling errors in comments
2020-03-02 23:07:21 -08:00
policy
scripted-diff: Bump copyright of files changed in 2020
2020-01-15 02:18:00 +07:00
primitives
Check for overflow when calculating sum of outputs
2020-03-23 16:36:24 +02:00
qt
Merge #19170: [0.20] Add missing QPainterPath include
2020-06-04 18:21:28 -04:00
rpc
Merge #19019: [0.20] Fix GBT: Restore "!segwit" and "csv" to "rules" key
2020-06-02 17:55:19 -04:00
script
Merge #18388: Make VerifyWitnessProgram use a Span stack
2020-03-27 14:49:50 +08:00
secp256k1
Update the secp256k1 subtree to the latest upstream version
2019-03-31 11:41:05 -07:00
support
Merge #15600: lockedpool: When possible, use madvise to avoid including sensitive information in core dumps
2020-03-26 16:56:03 +01:00
test
fuzz: Remove enumeration of expected deserialization exceptions in ProcessMessage(...) fuzzer
2020-05-15 12:03:50 +08:00
univalue
Update univalue subtree
2020-02-09 07:44:29 -08:00
util
util: Don't reference errno when pthread fails.
2020-06-09 21:06:15 +08:00
wallet
wallet: Minimal fix to restore conflicted transaction notifications
2020-06-09 21:12:38 +08:00
zmq
Merge #17477: Remove the mempool's NotifyEntryAdded and NotifyEntryRemoved signals
2020-03-19 17:26:51 +01:00
.clang-format
util: Add AllowShortCaseLabelsOnASingleLine option
2019-10-14 13:24:54 +03:00
addrdb.cpp
scripted-diff: Bump copyright of files changed in 2019
2019-12-30 10:42:20 +13:00
addrdb.h
Convert addrdb/addrman to new serialization
2020-01-02 11:05:36 -08:00
addrman.cpp
logging: asmap logging and #include fixups
2020-03-04 14:24:19 +01:00
addrman.h
logging: asmap logging and #include fixups
2020-03-04 14:24:19 +01:00
amount.h
…
arith_uint256.cpp
scripted-diff: Bump copyright of files changed in 2019
2019-12-30 10:42:20 +13:00
arith_uint256.h
scripted-diff: Bump copyright of files changed in 2019
2019-12-30 10:42:20 +13:00
attributes.h
…
banman.cpp
scripted-diff: Bump copyright of files changed in 2019
2019-12-30 10:42:20 +13:00
banman.h
refactor: move DUMP_BANS_INTERVAL to banman.h
2020-03-10 09:52:53 -04:00
base58.cpp
scripted-diff: Bump copyright of files changed in 2019
2019-12-30 10:42:20 +13:00
base58.h
scripted-diff: Bump copyright of files changed in 2019
2019-12-30 10:42:20 +13:00
bech32.cpp
Add some general std::vector utility functions
2019-10-16 08:56:57 -07:00
bech32.h
Assert that the HRP is lowercase in Bech32::Encode
2019-09-05 13:25:11 +12:00
bitcoin-cli-res.rc
…
bitcoin-cli.cpp
build: fix ASLR for bitcoin-cli on Windows
2020-04-23 14:30:39 +08:00
bitcoin-tx-res.rc
…
bitcoin-tx.cpp
Replace std::to_string with locale-independent alternative
2020-03-14 12:23:01 -07:00
bitcoin-wallet-res.rc
[tools] Add wallet inspection and modification tool
2019-01-30 16:26:52 -05:00
bitcoin-wallet.cpp
bitcoin-wallet: Use PACKAGE_NAME in usage help
2020-01-14 18:19:00 +00:00
bitcoind-res.rc
…
bitcoind.cpp
scripted-diff: Replace MilliSleep with UninterruptibleSleep
2020-02-21 10:06:21 -08:00
blockencodings.cpp
scripted-diff: Bump copyright of files changed in 2019
2019-12-30 10:42:20 +13:00
blockencodings.h
Convert blockencodings.h to new serialization framework
2020-02-25 14:10:44 -08:00
blockfilter.cpp
scripted-diff: Bump copyright of files changed in 2019
2019-12-30 10:42:20 +13:00
blockfilter.h
scripted-diff: Bump copyright of files changed in 2019
2019-12-30 10:42:20 +13:00
bloom.cpp
scripted-diff: Bump copyright of files changed in 2019
2019-12-30 10:42:20 +13:00
bloom.h
scripted-diff: Bump copyright of files changed in 2019
2019-12-30 10:42:20 +13:00
chain.cpp
scripted-diff: Bump copyright of files changed in 2019
2019-12-30 10:42:20 +13:00
chain.h
Get rid of VARINT default argument
2020-02-10 12:00:10 -08:00
chainparams.cpp
chainparams: Bump assumed valid hash
2020-04-02 05:34:47 +08:00
chainparams.h
[test] add chainparams property to indicate chain allows time mocking
2020-02-13 08:59:51 -08:00
chainparamsbase.cpp
scripted-diff: Bump copyright of files changed in 2019
2019-12-30 10:42:20 +13:00
chainparamsbase.h
scripted-diff: Bump copyright of files changed in 2019
2019-12-30 10:42:20 +13:00
chainparamsseeds.h
net: Hardcoded seeds update for 0.20
2020-04-03 16:29:26 +02:00
checkqueue.h
refactor: Remove redundant conditional
2020-01-21 14:07:42 +00:00
clientversion.cpp
…
clientversion.h
…
coins.cpp
scripted-diff: Bump copyright of files changed in 2019
2019-12-30 10:42:20 +13:00
coins.h
serialization: prevent int overflow for big Coin::nHeight
2020-03-28 08:38:07 +09:00
compat.h
…
compressor.cpp
scripted-diff: Bump copyright of files changed in 2019
2019-12-30 10:42:20 +13:00
compressor.h
Merge #17917: tests: Add amount compression/decompression fuzzing to existing fuzzing harness
2020-03-05 15:25:36 -05:00
core_io.h
scripted-diff: Bump copyright of files changed in 2019
2019-12-30 10:42:20 +13:00
core_memusage.h
…
core_read.cpp
Limit decimal range of numbers ParseScript accepts
2020-03-27 15:51:05 +09:00
core_write.cpp
scripted-diff: Bump copyright of files changed in 2019
2019-12-30 10:42:20 +13:00
cuckoocache.h
tests: Add fuzzing harness for classes/functions in cuckoocache.h
2020-04-08 14:45:27 +00:00
dbwrapper.cpp
scripted-diff: Bump copyright of files changed in 2019
2019-12-30 10:42:20 +13:00
dbwrapper.h
scripted-diff: Bump copyright of files changed in 2019
2019-12-30 10:42:20 +13:00
dummywallet.cpp
scripted-diff: Bump copyright of files changed in 2020
2020-01-15 02:18:00 +07:00
flatfile.cpp
Style cleanup.
2019-02-22 17:38:45 -08:00
flatfile.h
Get rid of VARINT default argument
2020-02-10 12:00:10 -08:00
fs.cpp
Fix WSL file locking by using flock instead of fcntl
2020-06-09 21:09:22 +08:00
fs.h
scripted-diff: Bump copyright of files changed in 2019
2019-12-30 10:42:20 +13:00
hash.cpp
…
hash.h
Squashed 'src/secp256k1/' changes from 0b70241850..b19c000063
2019-03-31 11:41:05 -07:00
httprpc.cpp
scripted-diff: Replace MilliSleep with UninterruptibleSleep
2020-02-21 10:06:21 -08:00
httprpc.h
scripted-diff: Bump copyright of files changed in 2019
2019-12-30 10:42:20 +13:00
httpserver.cpp
tests: Add fuzzing harness for HTTPRequest, libevent's evhttp and related functions
2020-04-06 13:58:51 +00:00
httpserver.h
tests: Add fuzzing harness for HTTPRequest, libevent's evhttp and related functions
2020-04-06 13:58:51 +00:00
indirectmap.h
Add missing includes
2020-01-31 12:36:13 +00:00
init.cpp
Do not expose and consider -logthreadnames when it does not work
2020-04-23 14:31:32 +08:00
init.h
scripted-diff: Bump copyright of files changed in 2019
2019-12-30 10:42:20 +13:00
key_io.cpp
scripted-diff: Bump copyright of files changed in 2019
2019-12-30 10:42:20 +13:00
key_io.h
…
key.cpp
scripted-diff: Bump copyright of files changed in 2019
2019-12-30 10:42:20 +13:00
key.h
scripted-diff: Bump copyright of files changed in 2019
2019-12-30 10:42:20 +13:00
limitedmap.h
…
logging.cpp
scripted-diff: Bump copyright of files changed in 2020
2020-01-15 02:18:00 +07:00
logging.h
scripted-diff: Bump copyright of files changed in 2020
2020-01-15 02:18:00 +07:00
Makefile.am
build: create test_fuzz library from src/test/fuzz/fuzz.cpp
2020-04-05 01:01:13 +02:00
Makefile.bench.include
Merge #18429: build: remove double LIBBITCOIN_SERVER from bench-Makefile
2020-03-26 17:20:28 +08:00
Makefile.crc32c.include
build: CRC32C build system integration
2020-01-28 17:01:48 +01:00
Makefile.leveldb.include
build: CRC32C build system integration
2020-01-28 17:01:48 +01:00
Makefile.qt_locale.include
qt: Pre-rc2 translations update
2020-05-15 14:13:03 +02:00
Makefile.qt.include
Merge #17513: refactor, qt: Nuke some circular dependencies
2019-11-21 19:38:39 +01:00
Makefile.qttest.include
build: Create test utility library from src/test/util/
2019-11-21 21:13:08 +01:00
Makefile.test_fuzz.include
build: create test_fuzz library from src/test/fuzz/fuzz.cpp
2020-04-05 01:01:13 +02:00
Makefile.test_util.include
fuzz: Add process_messages harness
2020-04-05 10:46:24 +08:00
Makefile.test.include
test: disable script fuzz tests
2020-05-15 15:50:32 +08:00
memusage.h
Add missing includes
2020-01-31 12:36:13 +00:00
merkleblock.cpp
scripted-diff: Bump copyright of files changed in 2019
2019-12-30 10:42:20 +13:00
merkleblock.h
…
miner.cpp
Refactor FormatStateMessage into ValidationState
2020-02-27 17:59:07 -08:00
miner.h
rpc: Remove mempool global from miner
2019-12-23 06:12:10 +07:00
net_permissions.cpp
net: Avoid using C-style NUL-terminated strings as arguments in the netbase interface
2020-01-08 12:35:59 +00:00
net_permissions.h
net: Remove forcerelay of rejected txs
2020-02-11 07:44:12 -08:00
net_processing.cpp
[net processing] Only send a getheaders for one block in an INV
2020-05-15 08:10:05 +08:00
net_processing.h
net: Add missing cs_vNodes lock
2020-03-29 11:45:46 -04:00
net_types.h
refactor: Remove addrdb.h dependency from node.h
2019-10-29 11:30:12 +02:00
net.cpp
net: Add missing cs_vNodes lock
2020-03-29 11:45:46 -04:00
net.h
Merge #18454: net: Make addr relay mockable, add test
2020-04-10 10:12:46 -04:00
netaddress.cpp
net: extract conditional to bool CNetAddr::IsHeNet
2020-03-04 14:31:31 +01:00
netaddress.h
net: extract conditional to bool CNetAddr::IsHeNet
2020-03-04 14:31:31 +01:00
netbase.cpp
Merge #17754: net: Don't allow resolving of std::string with embedded NUL characters. Add tests.
2020-01-22 20:20:45 +01:00
netbase.h
net: Avoid using C-style NUL-terminated strings as arguments in the netbase interface
2020-01-08 12:35:59 +00:00
netmessagemaker.h
…
noui.cpp
scripted-diff: Bump copyright of files changed in 2019
2019-12-30 10:42:20 +13:00
noui.h
scripted-diff: Bump copyright of files changed in 2019
2019-12-30 10:42:20 +13:00
optional.h
scripted-diff: Bump copyright of files changed in 2019
2019-12-30 10:42:20 +13:00
outputtype.cpp
Revert "Store p2sh scripts in AddAndGetDestinationForScript"
2020-02-12 11:48:30 -05:00
outputtype.h
List output types in an array in order to be iterated over
2020-01-23 16:35:06 -05:00
pow.cpp
…
pow.h
…
prevector.h
Make VectorFormatter support stateful formatters
2020-02-15 19:49:24 -08:00
protocol.cpp
net: Fail instead of truncate command name in CMessageHeader
2020-02-06 13:24:40 +01:00
protocol.h
net: Fail instead of truncate command name in CMessageHeader
2020-02-06 13:24:40 +01:00
psbt.cpp
Merge #17156: psbt: check that various indexes and amounts are within bounds
2020-01-29 19:39:50 +08:00
psbt.h
Fix doxygen errors
2020-01-16 18:25:11 -08:00
pubkey.cpp
scripted-diff: Bump copyright of files changed in 2019
2019-12-30 10:42:20 +13:00
pubkey.h
scripted-diff: Bump copyright of files changed in 2019
2019-12-30 10:42:20 +13:00
random.cpp
build: fix sysctl() detection on macOS
2020-03-19 11:36:38 +08:00
random.h
tests: Add fuzzing harness for functions/classes in random.h
2020-03-29 13:17:04 +00:00
randomenv.cpp
Drop unused mach time headers
2020-02-28 14:56:49 -08:00
randomenv.h
[MOVEONLY] Move perfmon data gathering to new randomenv module
2019-11-12 14:50:44 -08:00
rest.cpp
scripted-diff: Bump copyright of files changed in 2019
2019-12-30 10:42:20 +13:00
reverse_iterator.h
…
scheduler.cpp
scheduler: Make schedule* methods type safe
2020-03-10 09:47:32 -04:00
scheduler.h
scheduler: Make schedule* methods type safe
2020-03-10 09:47:32 -04:00
serialize.h
Merge #18112: Serialization improvements step 5 (blockencodings)
2020-03-05 19:56:26 +01:00
shutdown.cpp
…
shutdown.h
…
span.h
Make VerifyWitnessProgram use a Span stack
2020-03-23 14:44:58 -07:00
streams.h
scripted-diff: Bump copyright of files changed in 2019
2019-12-30 10:42:20 +13:00
sync.cpp
util: Remove unused itostr
2020-03-27 08:59:06 -04:00
sync.h
Fix missing header in sync.h
2020-03-15 22:43:39 +00:00
threadinterrupt.cpp
…
threadinterrupt.h
scripted-diff: Bump copyright of files changed in 2019
2019-12-30 10:42:20 +13:00
threadsafety.h
scripted-diff: Bump copyright of files changed in 2019
2019-12-30 10:42:20 +13:00
timedata.cpp
scripted-diff: Bump copyright of files changed in 2020
2020-01-15 02:18:00 +07:00
timedata.h
…
tinyformat.h
util: Update tinyformat to upstream
2019-12-06 10:02:08 +01:00
torcontrol.cpp
net: Avoid using C-style NUL-terminated strings as arguments in the netbase interface
2020-01-08 12:35:59 +00:00
torcontrol.h
scripted-diff: Bump copyright of files changed in 2019
2019-12-30 10:42:20 +13:00
txdb.cpp
Get rid of VARINT default argument
2020-02-10 12:00:10 -08:00
txdb.h
scripted-diff: Bump copyright of files changed in 2020
2020-01-15 02:18:00 +07:00
txmempool.cpp
wallet: Minimal fix to restore conflicted transaction notifications
2020-06-09 21:12:38 +08:00
txmempool.h
Merge #17477: Remove the mempool's NotifyEntryAdded and NotifyEntryRemoved signals
2020-03-19 17:26:51 +01:00
ui_interface.cpp
scripted-diff: Bump copyright of files changed in 2020
2020-01-15 02:18:00 +07:00
ui_interface.h
scripted-diff: Bump copyright of files changed in 2020
2020-01-15 02:18:00 +07:00
uint256.cpp
refactor: define a UINT256_ONE global constant
2020-01-23 16:35:08 -05:00
uint256.h
refactor: define a UINT256_ONE global constant
2020-01-23 16:35:08 -05:00
undo.h
serialization: prevent int overflow for big Coin::nHeight
2020-03-28 08:38:07 +09:00
validation.cpp
Merge #17477: Remove the mempool's NotifyEntryAdded and NotifyEntryRemoved signals
2020-03-19 17:26:51 +01:00
validation.h
scripted-diff: Bump copyright of files changed in 2020
2020-01-15 02:18:00 +07:00
validationinterface.cpp
wallet: Minimal fix to restore conflicted transaction notifications
2020-06-09 21:12:38 +08:00
validationinterface.h
wallet: Minimal fix to restore conflicted transaction notifications
2020-06-09 21:12:38 +08:00
version.h
…
versionbits.cpp
scripted-diff: Bump copyright of files changed in 2019
2019-12-30 10:42:20 +13:00
versionbits.h
scripted-diff: Bump copyright of files changed in 2019
2019-12-30 10:42:20 +13:00
versionbitsinfo.cpp
scripted-diff: Bump copyright of files changed in 2019
2019-12-30 10:42:20 +13:00
versionbitsinfo.h
…
walletinitinterface.h
scripted-diff: Bump copyright of files changed in 2019
2019-12-30 10:42:20 +13:00
warnings.cpp
scripted-diff: Bump copyright of files changed in 2019
2019-12-30 10:42:20 +13:00
warnings.h
scripted-diff: Bump copyright of files changed in 2019
2019-12-30 10:42:20 +13:00