0
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-03-09 15:37:00 -04:00
bitcoin-core/src/wallet
Wladimir J. van der Laan b312579c69
Merge #14454: Add SegWit support to importmulti
c11875c590 Add segwit address tests for importmulti (MeshCollider)
201451b1ca Make getaddressinfo return solvability (MeshCollider)
1753d217ea Add release notes for importmulti segwit change (MeshCollider)
353c064596 Fix typo in test_framework/blocktools (MeshCollider)
f6ed748cf0 Add SegWit support to importmulti with some ProcessImport cleanup (MeshCollider)

Pull request description:

  Add support for segwit to importmulti, supports P2WSH, P2WPKH, P2SH-P2WPKH, P2SH-P2WSH. Adds a new `witnessscript` parameter which must be used for the witness scripts in the relevant situations.

  Also includes some tests for the various import types.

  ~Also makes the change in #14019 redundant, but cherry-picks the test from that PR to test the behavior (@achow101).~

  Fixes #12253, also addresses the second point in #12703, and fixes #14407

Tree-SHA512: 775a755c524d1c387a99acddd772f677d2073876b72403dcfb92c59f9b405ae13ceedcf4dbd2ee1d7a8db91c494f67ca137161032ee3a2071282eeb411be090a
2018-10-31 17:44:31 +01:00
..
test Merge #11634: wallet: Add missing cs_wallet/cs_KeyStore locks to wallet 2018-10-24 05:01:29 -04:00
coincontrol.cpp Add -avoidpartialspends and m_avoid_partial_spends 2018-07-24 15:05:37 +09:00
coincontrol.h Update copyright headers to 2018 2018-07-27 07:15:02 -04:00
coinselection.cpp util: Replace boost::signals2 with std::function 2018-08-24 08:34:38 -04:00
coinselection.h amount: Move CAmount CENT to unit test header 2018-09-17 14:34:56 -04:00
crypter.cpp Make objects in range declarations immutable by default. Avoid unnecessary copying of objects in range declarations. 2018-08-27 18:19:33 +02:00
crypter.h Update copyright headers to 2018 2018-07-27 07:15:02 -04:00
db.cpp wallet: Fix duplicate fileid 2018-10-24 23:08:16 +08:00
db.h wallet: Fix duplicate fileid 2018-10-24 23:08:16 +08:00
feebumper.cpp [wallet] Kill accounts 2018-08-30 16:08:42 +02:00
feebumper.h Update copyright headers to 2018 2018-07-27 07:15:02 -04:00
fees.cpp Update copyright headers to 2018 2018-07-27 07:15:02 -04:00
fees.h Update copyright headers to 2018 2018-07-27 07:15:02 -04:00
init.cpp wallet: Remove trailing separators from -walletdir arg 2018-09-12 21:05:53 -04:00
rpcdump.cpp Merge #14454: Add SegWit support to importmulti 2018-10-31 17:44:31 +01:00
rpcwallet.cpp Merge #14454: Add SegWit support to importmulti 2018-10-31 17:44:31 +01:00
rpcwallet.h Update copyright headers to 2018 2018-07-27 07:15:02 -04:00
wallet.cpp wallet: Add missing locks 2018-10-09 11:58:32 +02:00
wallet.h Add GUARDED_BY(cs_wallet) for setExternalKeyPool, mapKeyMetadata, m_script_metadata and setLockedCoins 2018-10-09 15:04:26 +02:00
walletdb.cpp Merge #13249: Make objects in range declarations immutable by default. Avoid unnecessary copying of objects in range declarations. 2018-09-04 15:50:08 +02:00
walletdb.h [wallet] Kill accounts 2018-08-30 16:08:42 +02:00
walletutil.cpp Remove fs::relative call and fix listwalletdir tests 2018-10-25 15:33:56 +01:00
walletutil.h wallet: Add ListWalletDir utility 2018-10-18 23:26:06 +01:00