0
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-02-13 11:25:02 -05:00
bitcoin-bitcoin-core/src
MarcoFalke 6a97e8a060
Merge #17260: Split some CWallet functions into new LegacyScriptPubKeyMan
f201ba59ff Refactor: Split up CWallet and LegacyScriptPubKeyMan and classes (Andrew Chow)
6702048f91 MOVEONLY: Move key handling code out of wallet to keyman file (Andrew Chow)
ab053ec6d1 Move wallet enums to walletutil.h (Andrew Chow)

Pull request description:

  Moves key management functions into a new class LegacyScriptPubKeyMan. First two commits are move-only commits which move stuff out of wallet.{h/cpp} and into newly created scriptpubkeyman.{h/cpp}. Third commit changes several things in CWallet to use LegacyScriptPubKeyMan.

  First step in the wallet boxes refactor. Note that LegacyScriptPubKeyMan and ScriptPubKeyMan cannot be used standalone yet and are still very much tied into CWallet with both accessing functions within each other. This PR is to help reduce review burden.

ACKs for top commit:
  Sjors:
    Code review ACK f201ba5.
  promag:
    Code review ACK f201ba59ff.
  ryanofsky:
    Code review ACK f201ba59ff
  MarcoFalke:
    ACK f201ba59ff

Tree-SHA512: bdc0d8595a06233fe003afcf968a38e0e8cc584a6a89c5bcd05309ac29dca852391802d46763ef81a108d146d0f40c79ea5438e87234ed12b4b8360c9aec94c0
2019-10-29 08:19:23 -04:00
..
bench Merge #17279: refactor: Remove redundant c_str() calls in formatting 2019-10-28 15:10:06 -04:00
compat compat: remove bswap_* check on macOS 2019-10-24 16:01:44 -04:00
config
consensus consensus: Explain why fCheckDuplicateInputs can not be skipped and remove it 2019-10-24 14:58:34 -04:00
crypto Remove unused includes 2019-10-15 22:56:43 +00:00
index Remove unused includes 2019-10-15 22:56:43 +00:00
interfaces Merge #17260: Split some CWallet functions into new LegacyScriptPubKeyMan 2019-10-29 08:19:23 -04:00
leveldb Pull leveldb subtree 2019-01-26 12:45:48 -05:00
node Remove unused includes 2019-10-15 22:56:43 +00:00
policy refactor: Remove redundant c_str() calls in formatting 2019-10-28 13:31:33 +01:00
primitives Remove unused includes 2019-10-15 22:56:43 +00:00
qt Merge #17260: Split some CWallet functions into new LegacyScriptPubKeyMan 2019-10-29 08:19:23 -04:00
rpc refactor: Remove redundant c_str() calls in formatting 2019-10-28 13:31:33 +01:00
script Merge #17260: Split some CWallet functions into new LegacyScriptPubKeyMan 2019-10-29 08:19:23 -04:00
secp256k1 Update the secp256k1 subtree to the latest upstream version 2019-03-31 11:41:05 -07:00
support Improve documentation of memory_cleanse() 2019-07-01 12:59:44 +02:00
test Merge #17260: Split some CWallet functions into new LegacyScriptPubKeyMan 2019-10-29 08:19:23 -04:00
univalue Update univalue subtree 2018-09-07 08:21:14 -04:00
util Merge #17260: Split some CWallet functions into new LegacyScriptPubKeyMan 2019-10-29 08:19:23 -04:00
wallet Merge #17260: Split some CWallet functions into new LegacyScriptPubKeyMan 2019-10-29 08:19:23 -04:00
zmq Remove unused includes 2019-10-15 22:56:43 +00:00
.clang-format util: Add AllowShortCaseLabelsOnASingleLine option 2019-10-14 13:24:54 +03:00
addrdb.cpp addrdb: Remove temporary files created in SerializeFileDB. Fixes non-determinism in unit tests. 2019-06-14 08:30:43 +02:00
addrdb.h banman: Add, use CBanEntry ctor that takes ban reason 2019-01-16 13:54:18 -05:00
addrman.cpp Make reasoning about dependencies easier by not including unused dependencies 2019-06-02 17:15:23 +02:00
addrman.h [addrman] Ensure collisions eventually get resolved 2019-02-27 16:53:44 -05:00
amount.h Update copyright headers to 2018 2018-12-29 10:15:01 +01:00
arith_uint256.cpp Remove unused includes 2019-10-15 22:56:43 +00:00
arith_uint256.h Remove unused includes 2019-10-15 22:56:43 +00:00
attributes.h Add NODISCARD to all {Decode,Parse}[...](...) functions returning bool. Sort includes. 2018-11-05 17:03:11 +01:00
banman.cpp scripted-diff: Make translation bilingual 2019-07-24 16:33:20 +03:00
banman.h Allow connections from misbehavior banned peers. 2019-01-22 21:10:48 +00:00
base58.cpp scripted-diff: Move util files to separate directory. 2018-11-04 22:46:07 -08:00
base58.h Add NODISCARD to all {Decode,Parse}[...](...) functions returning bool. Sort includes. 2018-11-05 17:03:11 +01: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 refactor: Remove redundant c_str() calls in formatting 2019-10-28 13:31:33 +01:00
bitcoin-tx-res.rc
bitcoin-tx.cpp refactor: Remove redundant c_str() calls in formatting 2019-10-28 13:31:33 +01:00
bitcoin-wallet-res.rc [tools] Add wallet inspection and modification tool 2019-01-30 16:26:52 -05:00
bitcoin-wallet.cpp refactor: Remove redundant c_str() calls in formatting 2019-10-28 13:31:33 +01:00
bitcoind-res.rc
bitcoind.cpp refactor: Remove redundant c_str() calls in formatting 2019-10-28 13:31:33 +01:00
blockencodings.cpp CorruptionPossible -> BLOCK_MUTATED 2019-05-02 15:14:12 -04:00
blockencodings.h Remove unused includes 2019-10-15 22:56:43 +00:00
blockfilter.cpp init: Add CLI option to enable block filter index. 2019-04-06 12:10:55 -07:00
blockfilter.h init: Add CLI option to enable block filter index. 2019-04-06 12:10:55 -07:00
bloom.cpp refactor: Improve CRollingBloomFilter::reset by using std::fill 2019-05-22 15:55:50 +01:00
bloom.h Removes unsed CBloomFilter constructor. 2018-08-13 01:24:55 +02:00
chain.cpp refactor: combine Chain::findFirstBlockWithTime/findFirstBlockWithTimeAndHeight 2019-03-27 18:29:48 -04:00
chain.h chain: Set all CBlockIndex members to null, remove SetNull helper 2019-10-16 13:06:50 -04:00
chainparams.cpp chainparams: Bump assumed chain params 2019-10-01 07:33:24 -04:00
chainparams.h Remove wallet settings from chainparams 2019-07-16 16:22:14 -04:00
chainparamsbase.cpp Testchains: Generic selection with -chain=<str> in addition of -testnet and -regtest 2019-09-06 22:05:33 +02:00
chainparamsbase.h Remove wallet settings from chainparams 2019-07-16 16:22:14 -04:00
chainparamsseeds.h contrib: Remove invalid nodes from seeds list 2019-10-02 08:51:12 +02:00
checkqueue.h Update copyright headers to 2018 2018-07-27 07:15:02 -04:00
clientversion.cpp Update copyright headers to 2018 2018-07-27 07:15:02 -04:00
clientversion.h Update copyright headers to 2018 2018-07-27 07:15:02 -04:00
coins.cpp move-onlyish: move CCoinsViewErrorCatcher out of init.cpp 2019-07-21 21:00:31 -04:00
coins.h make SaltedOutpointHasher noexcept 2019-09-25 20:56:38 +02:00
compat.h windows: Set _WIN32_WINNT to 0x0601 (Windows 7) 2019-01-23 16:28:27 +08:00
compressor.cpp Remove unused includes 2019-10-15 22:56:43 +00:00
compressor.h Update copyright headers to 2018 2018-07-27 07:15:02 -04:00
core_io.h Move PSBT decoding functions from core_io to psbt.cpp 2019-03-26 17:38:00 -07:00
core_memusage.h Update copyright headers to 2018 2018-07-27 07:15:02 -04:00
core_read.cpp Include core_io.h from core_read.cpp 2019-06-06 08:00:33 +02:00
core_write.cpp Don't show addresses or P2PK in decoderawtransaction 2019-08-30 11:29:21 +09:00
cuckoocache.h doc: Doxygen-friendly CuckooCache comments 2019-10-10 15:47:39 -04:00
dbwrapper.cpp Replace deprecated Boost Filesystem function 2019-04-30 10:05:54 +03:00
dbwrapper.h Remove unused includes 2019-10-15 22:56:43 +00:00
dummywallet.cpp Remove unused includes 2019-10-15 22:56:43 +00:00
flatfile.cpp Style cleanup. 2019-02-22 17:38:45 -08:00
flatfile.h Style cleanup. 2019-02-22 17:38:45 -08:00
fs.cpp Avoid redefine warning 2019-04-10 12:16:52 +01:00
fs.h Replace deprecated Boost Filesystem function 2019-04-30 10:05:54 +03:00
hash.cpp Extract CSipHasher to it's own file in crypto/ directory. 2018-11-05 09:25:15 -08:00
hash.h Squashed 'src/secp256k1/' changes from 0b70241850..b19c000063 2019-03-31 11:41:05 -07:00
httprpc.cpp Remove unused includes 2019-10-15 22:56:43 +00:00
httprpc.h Remove unused includes 2019-10-15 22:56:43 +00:00
httpserver.cpp http: add missing header bootlegged by boost < 1.72 2019-10-25 13:11:09 +00:00
httpserver.h Remove unused includes 2019-10-15 22:56:43 +00:00
indirectmap.h
init.cpp refactor: Remove redundant c_str() calls in formatting 2019-10-28 13:31:33 +01:00
init.h Pass chain and client variables where needed 2018-11-06 11:44:40 -04:00
key.cpp Make reasoning about dependencies easier by not including unused dependencies 2019-06-02 17:15:23 +02:00
key.h refactor: Remove unused CExt{Pub,}Key (de)serialization methods 2019-10-22 00:07:31 +02:00
key_io.cpp Remove unused includes 2019-10-15 22:56:43 +00:00
key_io.h Update copyright headers to 2018 2018-07-27 07:15:02 -04:00
limitedmap.h Update copyright headers to 2018 2018-07-27 07:15:02 -04:00
logging.cpp util: Filter control characters out of log messages 2019-10-15 10:53:17 +02:00
logging.h test: Log to debug.log in all tests 2019-06-20 12:12:24 -04:00
Makefile.am Merge #17260: Split some CWallet functions into new LegacyScriptPubKeyMan 2019-10-29 08:19:23 -04:00
Makefile.bench.include refactor: test/bench: dedup Build{Crediting,Spending}Transaction() 2019-10-23 01:59:32 +02:00
Makefile.leveldb.include build: Remove WINVER pre define in Makefile.leveldb.inlcude 2019-01-26 09:28:48 +08:00
Makefile.qt.include Remove BIP70 Support 2019-10-24 16:01:43 -04:00
Makefile.qt_locale.include qt: Periodic translations update 2019-09-30 09:41:11 +02:00
Makefile.qttest.include Remove BIP70 Support 2019-10-24 16:01:43 -04:00
Makefile.test.include tests: Add fuzzing harness for various CScript related functions 2019-10-25 08:28:13 +00:00
memusage.h Update copyright headers to 2018 2018-07-27 07:15:02 -04:00
merkleblock.cpp Make reasoning about dependencies easier by not including unused dependencies 2019-06-02 17:15:23 +02:00
merkleblock.h Update copyright headers to 2018 2018-07-27 07:15:02 -04:00
miner.cpp Remove unused includes 2019-10-15 22:56:43 +00:00
miner.h [rpc] mining: Omit uninitialized currentblockweight, currentblocktx 2019-02-12 11:34:57 -05:00
net.cpp Merge #17279: refactor: Remove redundant c_str() calls in formatting 2019-10-28 15:10:06 -04:00
net.h Add override/final modifiers to V1TransportDeserializer 2019-10-23 09:27:35 +02:00
net_permissions.cpp util: Move ResolveErrMsg to util/error 2019-08-15 10:05:32 -04:00
net_permissions.h Make whitebind/whitelist permissions more flexible 2019-08-11 11:33:27 +09:00
net_processing.cpp Merge #16202: p2p: Refactor network message deserialization 2019-10-28 09:15:59 -04:00
net_processing.h p2p: Remove BIP61 reject messages 2019-10-02 10:39:14 -04:00
netaddress.cpp Fix spelling errors identified by codespell 1.15.0 2019-06-11 17:18:16 +02:00
netaddress.h Remove unused includes 2019-10-15 22:56:43 +00:00
netbase.cpp util: refactor upper/lowercase functions 2019-08-08 11:35:14 +09:00
netbase.h util: refactor upper/lowercase functions 2019-08-08 11:35:14 +09:00
netmessagemaker.h Update copyright headers to 2018 2018-07-27 07:15:02 -04:00
noui.cpp refactor: Remove redundant c_str() calls in formatting 2019-10-28 13:31:33 +01:00
noui.h Suppress output in test_bitcoin for expected errors 2019-07-03 14:03:21 +02:00
optional.h Remove 'boost::optional'-related gcc warnings 2019-01-30 22:44:28 +02:00
outputtype.cpp Add some general std::vector utility functions 2019-10-16 08:56:57 -07:00
outputtype.h Move various SigningProviders to signingprovider.{cpp,h} 2019-07-09 16:20:18 -04:00
pow.cpp Update copyright headers to 2018 2018-07-27 07:15:02 -04:00
pow.h Update copyright headers to 2018 2018-07-27 07:15:02 -04:00
prevector.h Remove unused includes 2019-10-15 22:56:43 +00:00
protocol.cpp p2p: Remove BIP61 reject messages 2019-10-02 10:39:14 -04:00
protocol.h Remove unused includes 2019-10-15 22:56:43 +00:00
psbt.cpp Remove unused includes 2019-10-15 22:56:43 +00:00
psbt.h Fix bug where duplicate PSBT keys are accepted 2019-10-08 01:45:36 +03:00
pubkey.cpp Update copyright headers to 2018 2018-07-27 07:15:02 -04:00
pubkey.h refactor: Remove unused CExt{Pub,}Key (de)serialization methods 2019-10-22 00:07:31 +02:00
random.cpp random: remove call to RAND_screen() (Windows only) 2019-10-18 14:24:21 -04:00
random.h net: Use mockable time for tx download 2019-06-17 14:12:32 -04:00
rest.cpp Remove unused includes 2019-10-15 22:56:43 +00:00
reverse_iterator.h scripted-diff: Remove trailing whitespaces 2018-07-24 20:46:23 +01:00
reverselock.h
scheduler.cpp Switch all RNG code to the built-in PRNG. 2019-01-16 16:34:56 -08:00
scheduler.h trivial: correct parameter name in comments 2019-02-10 17:17:32 -05:00
serialize.h Remove unused includes 2019-10-15 22:56:43 +00:00
shutdown.cpp Break circular dependency: init -> * -> init by extracting shutdown.h 2018-06-25 00:08:49 -04:00
shutdown.h Break circular dependency: init -> * -> init by extracting shutdown.h 2018-06-25 00:08:49 -04:00
span.h Add more methods to Span class 2018-07-27 11:52:18 -07:00
streams.h Remove unused includes 2019-10-15 22:56:43 +00:00
sync.cpp refactor: Remove redundant c_str() calls in formatting 2019-10-28 13:31:33 +01:00
sync.h refactor: consolidate PASTE macros 2019-09-25 10:56:00 -04:00
threadinterrupt.cpp Merge #11640: Make LOCK, LOCK2, TRY_LOCK work with CWaitableCriticalSection 2018-08-31 16:00:38 +02:00
threadinterrupt.h Remove unused includes 2019-10-15 22:56:43 +00:00
threadsafety.h Move LockAnnotation from threadsafety.h (imported code) to sync.h (our code) 2019-05-17 13:29:04 +02:00
timedata.cpp scripted-diff: Make translation bilingual 2019-07-24 16:33:20 +03:00
timedata.h Update copyright headers to 2018 2018-07-27 07:15:02 -04:00
tinyformat.h tinyformat: Add doc to Bitcoin Core specific strprintf 2019-06-13 09:30:40 -04:00
torcontrol.cpp fix: tor: Call event_base_loopbreak from the event's callback 2019-07-17 15:32:38 +01:00
torcontrol.h Remove unused includes 2019-10-15 22:56:43 +00:00
txdb.cpp Add some general std::vector utility functions 2019-10-16 08:56:57 -07:00
txdb.h Remove unused includes 2019-10-15 22:56:43 +00:00
txmempool.cpp feefilter: Compute the absolute fee rather than stored rate to match mempool acceptance logic 2019-10-03 14:03:27 -04:00
txmempool.h Remove unused includes 2019-10-15 22:56:43 +00:00
ui_interface.cpp Merge #16092: Don't use global (external) symbols for symbols that are used in only one translation unit 2019-06-18 15:59:53 -04:00
ui_interface.h Remove unused includes 2019-10-15 22:56:43 +00:00
uint256.cpp Remove unused includes 2019-10-15 22:56:43 +00:00
uint256.h Remove unused includes 2019-10-15 22:56:43 +00:00
undo.h Extract CSipHasher to it's own file in crypto/ directory. 2018-11-05 09:25:15 -08:00
validation.cpp Merge #17242: refactor: Remove unused cacheSigStore from CheckInputsFromMempooAndCache 2019-10-25 08:14:11 -04:00
validation.h Merge #17004: validation: Remove REJECT code from CValidationState 2019-10-24 10:49:45 +02:00
validationinterface.cpp Remove unused includes 2019-10-15 22:56:43 +00:00
validationinterface.h Remove extra CBlockIndex declaration 2019-06-25 15:02:34 -04:00
version.h Update copyright headers to 2018 2018-07-27 07:15:02 -04:00
versionbits.cpp doc: Improve versionbits.h documentation 2019-08-15 11:02:55 -04:00
versionbits.h doc: Improve versionbits.h documentation 2019-08-15 11:02:55 -04:00
versionbitsinfo.cpp [Consensus] Bury segwit deployment 2019-08-14 15:52:52 -04:00
versionbitsinfo.h MOVEONLY: Move versionbits info out of versionbits.o 2018-09-23 22:55:11 +02:00
walletinitinterface.h refactor: Cleanup walletinitinterface.h 2019-09-08 17:29:30 +03:00
warnings.cpp scripted-diff: Make translation bilingual 2019-07-24 16:33:20 +03:00
warnings.h Remove unused includes 2019-10-15 22:56:43 +00:00