highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-01-19 06:43:45 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
d3f04c0e81a649fd7db1ff38bbc96b3eb18312d8
bitcoin/src
History
Wladimir J. van der Laan d3f04c0e81 Merge #13030: [bugfix] [wallet] Fix zapwallettxes/multiwallet interaction. 
1f83839 [wallet] [tests] Test disallowed multiwallet params (John Newbery)
3476e3c [wallet] Fix zapwallettxes/multiwallet interaction. (John Newbery)

Pull request description:

  `-zapwallettxes` should be disallowed when starting bitcoin in multiwallet mode.

  There's code in `WalletInit::ParameterInteraction()` to disallow `-zapwallettxes` when running in multiwallet mode. This code functioned as expected when passing the parameter `-zapwallettxes=1`, but not when passing the parameter `-zapwallettxes` (ie without the value specified). Fix that and add a test.

  The new test in the
  _[wallet] [tests] Test disallowed multiwallet params_ commit reproduces the bug and should fail against master.

  Fixes #12505

Tree-SHA512: 6cd921717e9c7d2773ca84c946c310c2adec8430e37cbecdb33a620f510db3058a72bd328411812ba415111bc52a3367b332c9d15a37a92ccfd7ae785d2f32ab
2018-04-23 20:23:18 +02:00
..
bench
Merge #13025: Dead code removal
2018-04-19 07:58:36 -04:00
compat
Default to defining endian-conversion DECLs in compat w/o config
2018-04-16 11:47:32 -04:00
config
…
consensus
Use P2SH consensus rules for all blocks
2018-04-13 09:52:50 -04:00
crypto
Consensus: Fix bug when compiler do not support __builtin_clz*
2018-03-01 17:20:27 +08:00
interfaces
Merge #13017: Add wallets management functions
2018-04-23 07:59:02 +02:00
leveldb
Bump leveldb subtree
2018-02-16 08:59:28 -05:00
obj
…
obj-test
…
policy
Extract consts for WITNESS_V0 hash sizes
2018-04-10 20:13:32 -07:00
primitives
Support serialization as another type without casting
2018-03-20 17:08:06 -07:00
qt
wallet: Add AddWallet, RemoveWallet, GetWallet and GetWallets
2018-04-18 22:07:33 +01:00
rpc
Merge #12448: Interrupt block generation on shutdown request
2018-04-23 18:04:52 +02:00
script
Drop dead code CScript::Find
2018-04-12 18:57:23 -07:00
secp256k1
Bump secp256k1 subtree
2017-09-29 16:02:39 +02:00
support
Remove duplicate includes
2018-04-09 09:18:49 +02:00
test
Merge #13052: trivial: Fix relevent typo
2018-04-23 10:46:19 -04:00
univalue
univalue: Bump subtree
2018-02-10 09:55:54 -05:00
wallet
Merge #13030: [bugfix] [wallet] Fix zapwallettxes/multiwallet interaction.
2018-04-23 20:23:18 +02:00
zmq
Increment MIT Licence copyright header year on files modified in 2017
2018-01-03 02:26:56 +09:00
.clang-format
Fix inconsistent namespace formatting guidelines
2018-04-13 15:37:20 -04:00
addrdb.cpp
Add logging and error handling for file syncing
2018-04-23 14:25:28 +02:00
addrdb.h
Increment MIT Licence copyright header year on files modified in 2017
2018-01-03 02:26:56 +09:00
addrman.cpp
net: Correct addrman logging
2018-03-06 21:52:53 +01:00
addrman.h
Merge #12731: Support serialization as another type without casting
2018-04-10 20:54:33 +02:00
amount.h
…
arith_uint256.cpp
[arith_uint256] Do not destroy *this content if passed-in operator may reference it
2018-03-01 11:49:35 +09:00
arith_uint256.h
[arith_uint256] Avoid unnecessary this-copy using prefix operator
2018-02-28 19:59:19 +09:00
base58.cpp
use base58 map instead of strchr()
2018-03-21 11:57:57 +08:00
base58.h
Split key_io (address/key encodings) off from base58
2018-02-19 18:55:21 -08:00
bech32.cpp
scripted-diff: Replace #include "" with #include <> (ryanofsky)
2017-11-16 08:23:01 +13:00
bech32.h
Fix missing or inconsistent include guards
2018-03-22 16:23:04 +01:00
bitcoin-cli-res.rc
…
bitcoin-cli.cpp
Move ChainNameFromCommandLine into ArgsManager and rename to GetChainName
2018-04-06 04:46:02 +10:00
bitcoin-tx-res.rc
…
bitcoin-tx.cpp
Merge #12950: bitcoin-tx: Flatten for loop over one element
2018-04-13 17:15:15 +02:00
bitcoind-res.rc
…
bitcoind.cpp
net: Minor accumulated cleanups
2018-04-16 13:24:14 -07:00
blockencodings.cpp
Increment MIT Licence copyright header year on files modified in 2017
2018-01-03 02:26:56 +09:00
blockencodings.h
Fix missing or inconsistent include guards
2018-03-22 16:23:04 +01:00
bloom.cpp
Increment MIT Licence copyright header year on files modified in 2017
2018-01-03 02:26:56 +09:00
bloom.h
Increment MIT Licence copyright header year on files modified in 2017
2018-01-03 02:26:56 +09:00
chain.cpp
Increment MIT Licence copyright header year on files modified in 2017
2018-01-03 02:26:56 +09:00
chain.h
Add static_assert to prevent VARINT(<signed value>)
2018-03-15 18:57:55 -05:00
chainparams.cpp
Use P2SH consensus rules for all blocks
2018-04-13 09:52:50 -04:00
chainparams.h
[doc] Add comments for chainparams.h, validation.cpp
2018-04-17 17:15:20 -04:00
chainparamsbase.cpp
ArgsManager: support config file sections
2018-04-11 23:15:28 +10:00
chainparamsbase.h
Move ChainNameFromCommandLine into ArgsManager and rename to GetChainName
2018-04-06 04:46:02 +10:00
chainparamsseeds.h
Fix a-vs-an typos
2018-02-11 10:48:15 +01:00
checkpoints.cpp
Add LookupBlockIndex function
2018-03-06 19:52:19 +00:00
checkpoints.h
Add LookupBlockIndex function
2018-03-06 19:52:19 +00:00
checkqueue.h
[Refactor] Remove unused fQuit var from checkqueue.h
2018-01-07 20:44:21 +00:00
clientversion.cpp
Merge #11966: clientversion: Use full commit hash for commit-based version descriptions
2018-02-13 10:58:41 +01:00
clientversion.h
Increment MIT Licence copyright header year on files modified in 2017
2018-01-03 02:26:56 +09:00
coins.cpp
Increment MIT Licence copyright header year on files modified in 2017
2018-01-03 02:26:56 +09:00
coins.h
Support deserializing into temporaries
2018-03-13 17:04:31 -07:00
compat.h
net: Minor accumulated cleanups
2018-04-16 13:24:14 -07:00
compressor.cpp
Move compressor utility functions out of class
2018-03-21 14:17:18 -07:00
compressor.h
Support serializing Span<unsigned char> and use that instead of FLATDATA
2018-04-05 08:20:37 -07:00
core_io.h
Increment MIT Licence copyright header year on files modified in 2017
2018-01-03 02:26:56 +09:00
core_memusage.h
Increment MIT Licence copyright header year on files modified in 2017
2018-01-03 02:26:56 +09:00
core_read.cpp
Merge #10498: Use static_cast instead of C-style casts for non-fundamental types
2018-02-07 16:15:28 -05:00
core_write.cpp
Expose a transaction's weight via RPC
2018-04-13 15:18:26 -04:00
cuckoocache.h
Use explicit casting in cuckoocache's compute_hashes(...) to clarify integer conversion
2018-03-27 00:37:20 +02:00
dbwrapper.cpp
[logging] Comment all continuing logs.
2018-04-07 12:29:48 -04:00
dbwrapper.h
Add DynamicMemoryUsage() to LevelDB
2018-03-06 00:25:39 -05:00
fs.cpp
scripted-diff: Replace #include "" with #include <> (ryanofsky)
2017-11-16 08:23:01 +13:00
fs.h
…
hash.cpp
Increment MIT Licence copyright header year on files modified in 2017
2018-01-03 02:26:56 +09:00
hash.h
Support deserializing into temporaries
2018-03-13 17:04:31 -07:00
httprpc.cpp
Merge #12859: Bugfix: Include <memory> for std::unique_ptr
2018-04-05 09:31:53 +02:00
httprpc.h
Increment MIT Licence copyright header year on files modified in 2017
2018-01-03 02:26:56 +09:00
httpserver.cpp
Merge #12859: Bugfix: Include <memory> for std::unique_ptr
2018-04-05 09:31:53 +02:00
httpserver.h
Increment MIT Licence copyright header year on files modified in 2017
2018-01-03 02:26:56 +09:00
indirectmap.h
…
init.cpp
Consistently log CValidationState on failure
2018-04-18 18:43:12 -04:00
init.h
wallet: Refactor g_wallet_init_interface to const reference
2018-04-13 14:07:21 +01:00
key_io.cpp
Simplify Base32 and Base64 conversions
2018-03-07 07:04:07 -08:00
key_io.h
Fix missing or inconsistent include guards
2018-03-22 16:23:04 +01:00
key.cpp
Merge #9598: Improve readability by removing redundant casts to same type (on all platforms)
2018-03-07 17:47:46 +01:00
key.h
Make CKey::Load references const
2018-01-23 13:16:56 -05:00
keystore.cpp
Merge #12460: Assert CPubKey::ValidLength to the pubkey's header-relevant size
2018-04-04 17:50:32 -04:00
keystore.h
Merge #12762: Make CKeyStore an interface
2018-03-27 20:42:49 +02:00
limitedmap.h
Increment MIT Licence copyright header year on files modified in 2017
2018-01-03 02:26:56 +09:00
logging.cpp
MOVEONLY: Move logging code from util.{h,cpp} to new files.
2018-04-18 10:05:05 -07:00
logging.h
MOVEONLY: Move logging code from util.{h,cpp} to new files.
2018-04-18 10:05:05 -07:00
Makefile.am
MOVEONLY: Move logging code from util.{h,cpp} to new files.
2018-04-18 10:05:05 -07:00
Makefile.bench.include
benchmark: Removed bench/perf.cpp
2018-04-18 19:53:10 -07:00
Makefile.leveldb.include
…
Makefile.qt.include
Remove direct bitcoin calls from qt/splashscreen.cpp
2018-04-04 16:52:40 -04:00
Makefile.qttest.include
Remove direct bitcoin calls from qt/splashscreen.cpp
2018-04-04 16:52:40 -04:00
Makefile.test.include
Merge #12926: Run unit tests in parallel
2018-04-10 14:27:18 +02:00
memusage.h
Bugfix: Include <memory> for std::unique_ptr
2018-04-02 18:31:52 +00:00
merkleblock.cpp
Increment MIT Licence copyright header year on files modified in 2017
2018-01-03 02:26:56 +09:00
merkleblock.h
Increment MIT Licence copyright header year on files modified in 2017
2018-01-03 02:26:56 +09:00
miner.cpp
Remove duplicate includes
2018-04-09 09:18:49 +02:00
miner.h
Remove unused variable in SortForBlock
2018-03-14 23:10:39 -07:00
net_processing.cpp
Consistently log CValidationState on failure
2018-04-18 18:43:12 -04:00
net_processing.h
Remove direct bitcoin calls from qt/peertablemodel.cpp
2018-04-04 16:52:40 -04:00
net.cpp
net: Minor accumulated cleanups
2018-04-16 13:24:14 -07:00
net.h
Merge #12569: net: Increase signal-to-noise ratio in debug.log by adjusting log level when logging failed non-manual connect():s
2018-04-13 19:25:18 +02:00
netaddress.cpp
net: Minor accumulated cleanups
2018-04-16 13:24:14 -07:00
netaddress.h
net: Minor accumulated cleanups
2018-04-16 13:24:14 -07:00
netbase.cpp
net: Minor accumulated cleanups
2018-04-16 13:24:14 -07:00
netbase.h
Increase signal-to-noise ratio in debug.log by adjusting log level when logging failed non-manual connect():s
2018-03-11 10:49:04 +01:00
netmessagemaker.h
Increment MIT Licence copyright header year on files modified in 2017
2018-01-03 02:26:56 +09:00
noui.cpp
Increment MIT Licence copyright header year on files modified in 2017
2018-01-03 02:26:56 +09:00
noui.h
…
pow.cpp
Increment MIT Licence copyright header year on files modified in 2017
2018-01-03 02:26:56 +09:00
pow.h
Increment MIT Licence copyright header year on files modified in 2017
2018-01-03 02:26:56 +09:00
prevector.h
Use memset() to optimize prevector::resize()
2018-02-27 13:27:51 -08:00
protocol.cpp
Add setter for g_initial_block_download_completed
2018-02-17 21:28:50 +11:00
protocol.h
Merge #12731: Support serialization as another type without casting
2018-04-10 20:54:33 +02:00
pubkey.cpp
Increment MIT Licence copyright header year on files modified in 2017
2018-01-03 02:26:56 +09:00
pubkey.h
Assert CPubKey::ValidLength to the pubkey's header-relevent size
2018-02-16 12:30:26 -08:00
random.cpp
Remove duplicate includes
2018-04-09 09:18:49 +02:00
random.h
Merge #12742: Make FastRandomContext support standard C++11 RNG interface
2018-03-22 12:21:46 -04:00
rest.cpp
Merge #12717: [REST] Handle UTXO retrieval when ignoring the mempool
2018-03-27 21:32:02 +02:00
reverse_iterator.h
Declare single-argument (non-converting) constructors "explicit"
2017-08-16 16:33:25 +02:00
reverselock.h
…
scheduler.cpp
Increment MIT Licence copyright header year on files modified in 2017
2018-01-03 02:26:56 +09:00
scheduler.h
Increment MIT Licence copyright header year on files modified in 2017
2018-01-03 02:26:56 +09:00
serialize.h
Merge #12916: Introduce BigEndian wrapper and use it for netaddress ports
2018-04-11 14:23:58 +02:00
span.h
Add Slice: a (pointer, size) array view that acts like a container
2018-04-05 08:20:37 -07:00
streams.h
Support deserializing into temporaries
2018-03-13 17:04:31 -07:00
sync.cpp
[logging] Comment all continuing logs.
2018-04-07 12:29:48 -04:00
sync.h
Increment MIT Licence copyright header year on files modified in 2017
2018-01-03 02:26:56 +09:00
threadinterrupt.cpp
Increment MIT Licence copyright header year on files modified in 2017
2018-01-03 02:26:56 +09:00
threadinterrupt.h
…
threadsafety.h
…
timedata.cpp
Increment MIT Licence copyright header year on files modified in 2017
2018-01-03 02:26:56 +09:00
timedata.h
Increment MIT Licence copyright header year on files modified in 2017
2018-01-03 02:26:56 +09:00
tinyformat.h
Fix typos
2018-03-21 08:34:44 +02:00
torcontrol.cpp
boost: drop boost threads from torcontrol
2018-02-08 14:35:29 -05:00
torcontrol.h
boost: drop boost threads from torcontrol
2018-02-08 14:35:29 -05:00
txdb.cpp
[logging] Comment all continuing logs.
2018-04-07 12:29:48 -04:00
txdb.h
Merge #12731: Support serialization as another type without casting
2018-04-10 20:54:33 +02:00
txmempool.cpp
Merge #11742: rpc: Add testmempoolaccept
2018-04-02 16:02:33 +02:00
txmempool.h
Merge #11742: rpc: Add testmempoolaccept
2018-04-02 16:02:33 +02:00
ui_interface.cpp
Increment MIT Licence copyright header year on files modified in 2017
2018-01-03 02:26:56 +09:00
ui_interface.h
Increment MIT Licence copyright header year on files modified in 2017
2018-01-03 02:26:56 +09:00
uint256.cpp
Increment MIT Licence copyright header year on files modified in 2017
2018-01-03 02:26:56 +09:00
uint256.h
Increment MIT Licence copyright header year on files modified in 2017
2018-01-03 02:26:56 +09:00
undo.h
Merge #12716: Fix typos and cleanup in various files
2018-03-21 11:17:43 -04:00
util.cpp
Add logging and error handling for file syncing
2018-04-23 14:25:28 +02:00
util.h
Add logging and error handling for file syncing
2018-04-23 14:25:28 +02:00
utilmoneystr.cpp
Increment MIT Licence copyright header year on files modified in 2017
2018-01-03 02:26:56 +09:00
utilmoneystr.h
Increment MIT Licence copyright header year on files modified in 2017
2018-01-03 02:26:56 +09:00
utilstrencodings.cpp
Simplify Base32 and Base64 conversions
2018-03-07 07:04:07 -08:00
utilstrencodings.h
Generalize ConvertBits
2018-03-06 20:28:08 -08:00
utiltime.cpp
Avoid std::locale/imbue in DateTimeStrFormat
2018-04-13 01:36:53 -07:00
utiltime.h
Avoid std::locale/imbue in DateTimeStrFormat
2018-04-13 01:36:53 -07:00
validation.cpp
Merge #13012: [doc] Add comments for chainparams.h, validation.cpp
2018-04-23 17:15:33 +02:00
validation.h
Separate NULLDUMMY enforcement from SEGWIT enforcement
2018-04-13 10:35:27 -04:00
validationinterface.cpp
Hold cs_main while calling UpdatedBlockTip() and ui.NotifyBlockTip
2018-04-16 18:03:21 -04:00
validationinterface.h
Polish interfaces around PeerLogicValidation
2018-03-14 10:11:01 +01:00
version.h
Increment MIT Licence copyright header year on files modified in 2017
2018-01-03 02:26:56 +09:00
versionbits.cpp
scripted-diff: Convert 11 enums into scoped enums (C++11)
2018-03-09 15:03:40 +01:00
versionbits.h
Merge #12757: Clarify include guard naming convention
2018-04-01 18:30:21 -04:00
walletinitinterface.h
wallet: Make WalletInitInterface members const
2018-04-13 14:02:59 +01:00
warnings.cpp
Increment MIT Licence copyright header year on files modified in 2017
2018-01-03 02:26:56 +09:00
warnings.h
Increment MIT Licence copyright header year on files modified in 2017
2018-01-03 02:26:56 +09:00