sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-26 04:22:55 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
6915f93cc9
dash/src
History
Wladimir J. van der Laan 711d16ca4a
Merge #11667: Add scripts to dumpwallet RPC 
656fde5 Add script birthtime metadata to dump and import wallet (MeshCollider)
1bab9b2 Add script dump note to RPC help text and release notes (MeshCollider)
68c1e00 Add test for importwallet (MeshCollider)
9e1184d Add dumpwallet scripts test (MeshCollider)
ef0c730 Add scripts to importwallet RPC (MeshCollider)
b702ae8 Add CScripts to dumpwallet RPC (MeshCollider)
cdc260a Add GetCScripts to CBasicKeyStore (MeshCollider)

Pull request description:

  As discussed in https://github.com/bitcoin/bitcoin/pull/11289#issuecomment-334600457, adds the CScripts from the wallet to the `dumpwallet` RPC and then allows them to be imported with the `importwallet` RPC. Includes a basic test, and modifies the helptext of the dumpwallet RPC.

  Notes:
  - Reviewers: use `?w=1` to avoid the indentation-only change in commit `Add scripts to importwallet RPC `
  - currently the scripts are followed with `# addr=` comments just as the other keys are, unsure if this might confuse users into thinking all the scripts are for valid P2SH addresses though, but I don't think that should be an issue.
  - there are no birthtimes for scripts, so script imports don't affect rescans
  - `importwallet` imports the CScripts but I'm not sure how to approach specifying whether scripts are for P2SH addresses, BIP173 addresses, etc. whether that matters or not. Otherwise the RPC helptext might just need modification.

  Fixes #11715

Tree-SHA512: 36c55837b3a58b9d3499d4c0c2ae82153d62aa71919e751574651b63a1d2b8ecc83796db4553cc65dad9b5341c3a42ae2fcf4d62598c30af267f8e1461ba8272
2017-12-21 13:03:26 +01:00
..
bench Merge #11558: Minimal code changes to allow msvc compilation 2017-12-13 14:05:25 +01:00
compat Merge #11140: Trivial: Improve #endif comments 2017-11-17 15:34:51 +01:00
config
consensus scripted-diff: Replace #include "" with #include <> (ryanofsky) 2017-11-16 08:23:01 +13:00
crypto scripted-diff: Replace #include "" with #include <> (ryanofsky) 2017-11-16 08:23:01 +13:00
leveldb
obj
obj-test
policy Remove dead feeest-file read code for old versions 2017-12-19 11:19:28 -05:00
primitives scripted-diff: Replace #include "" with #include <> (ryanofsky) 2017-11-16 08:23:01 +13:00
qt Merge #10839: Don't use pass by reference to const for cheaply-copied types (bool, char, etc.) 2017-12-14 18:28:01 +01:00
rpc Merge #11178: Add iswitness parameter to decode- and fundrawtransaction RPCs 2017-12-19 09:55:11 +01:00
script Merge #10657: Utils: Improvements to ECDSA key-handling code 2017-12-20 18:00:32 +01:00
secp256k1 Bump secp256k1 subtree 2017-09-29 16:02:39 +02:00
support Merge #11558: Minimal code changes to allow msvc compilation 2017-12-13 14:05:25 +01:00
test Merge #11879: [tests] remove redundant univalue_tests.cpp 2017-12-20 16:53:02 +01:00
univalue univalue: Bump subtree 2017-12-19 16:44:57 -05:00
wallet Merge #11667: Add scripts to dumpwallet RPC 2017-12-21 13:03:26 +01:00
zmq Merge #10493: Use range-based for loops (C++11) when looping over map elements 2017-11-30 17:10:05 -05:00
.clang-format
addrdb.cpp Remove includes in .cpp files for things the corresponding .h file already included 2017-11-16 22:26:34 +01:00
addrdb.h scripted-diff: Replace #include "" with #include <> (ryanofsky) 2017-11-16 08:23:01 +13:00
addrman.cpp Merge #10493: Use range-based for loops (C++11) when looping over map elements 2017-11-30 17:10:05 -05:00
addrman.h Merge #10493: Use range-based for loops (C++11) when looping over map elements 2017-11-30 17:10:05 -05:00
amount.h
arith_uint256.cpp scripted-diff: Replace #include "" with #include <> (ryanofsky) 2017-11-16 08:23:01 +13:00
arith_uint256.h Merge #10749: Use compile-time constants instead of unnamed enumerations (remove "enum hack") 2017-11-11 18:07:28 -05:00
base58.cpp scripted-diff: Replace #include "" with #include <> (ryanofsky) 2017-11-16 08:23:01 +13:00
base58.h scripted-diff: Replace #include "" with #include <> (ryanofsky) 2017-11-16 08:23:01 +13:00
bech32.cpp scripted-diff: Replace #include "" with #include <> (ryanofsky) 2017-11-16 08:23:01 +13:00
bech32.h
bitcoin-cli-res.rc
bitcoin-cli.cpp cli: Reject arguments to -getinfo 2017-11-17 15:11:50 +01:00
bitcoin-tx-res.rc
bitcoin-tx.cpp scripted-diff: Replace #include "" with #include <> (ryanofsky) 2017-11-16 08:23:01 +13:00
bitcoind-res.rc
bitcoind.cpp Create walletdir if datadir doesn't exist and fix tests 2017-11-18 00:50:59 +13:00
blockencodings.cpp scripted-diff: Replace #include "" with #include <> (ryanofsky) 2017-11-16 08:23:01 +13:00
blockencodings.h scripted-diff: Replace #include "" with #include <> (ryanofsky) 2017-11-16 08:23:01 +13:00
bloom.cpp scripted-diff: Replace #include "" with #include <> (ryanofsky) 2017-11-16 08:23:01 +13:00
bloom.h scripted-diff: Replace #include "" with #include <> (ryanofsky) 2017-11-16 08:23:01 +13:00
chain.cpp Merge #11337: Fix code constness in CBlockIndex::GetAncestor() overloads 2017-12-01 15:19:07 +01:00
chain.h scripted-diff: Replace #include "" with #include <> (ryanofsky) 2017-11-16 08:23:01 +13:00
chainparams.cpp [net] add seed.testnet.bitcoin.sprovoost.nl to testnet DNS seeds 2017-12-16 16:48:48 +01:00
chainparams.h scripted-diff: Replace #include "" with #include <> (ryanofsky) 2017-11-16 08:23:01 +13:00
chainparamsbase.cpp scripted-diff: Replace #include "" with #include <> (ryanofsky) 2017-11-16 08:23:01 +13:00
chainparamsbase.h
chainparamsseeds.h
checkpoints.cpp Remove includes in .cpp files for things the corresponding .h file already included 2017-11-16 22:26:34 +01:00
checkpoints.h scripted-diff: Replace #include "" with #include <> (ryanofsky) 2017-11-16 08:23:01 +13:00
checkqueue.h scripted-diff: Replace #include "" with #include <> (ryanofsky) 2017-11-16 08:23:01 +13:00
clientversion.cpp Remove includes in .cpp files for things the corresponding .h file already included 2017-11-16 22:26:34 +01:00
clientversion.h scripted-diff: Replace #include "" with #include <> (ryanofsky) 2017-11-16 08:23:01 +13:00
coins.cpp Remove includes in .cpp files for things the corresponding .h file already included 2017-11-16 22:26:34 +01:00
coins.h scripted-diff: Replace #include "" with #include <> (ryanofsky) 2017-11-16 08:23:01 +13:00
compat.h Merge #11558: Minimal code changes to allow msvc compilation 2017-12-13 14:05:25 +01:00
compressor.cpp scripted-diff: Replace #include "" with #include <> (ryanofsky) 2017-11-16 08:23:01 +13:00
compressor.h scripted-diff: Replace #include "" with #include <> (ryanofsky) 2017-11-16 08:23:01 +13:00
core_io.h Merge #11178: Add iswitness parameter to decode- and fundrawtransaction RPCs 2017-12-19 09:55:11 +01:00
core_memusage.h scripted-diff: Replace #include "" with #include <> (ryanofsky) 2017-11-16 08:23:01 +13:00
core_read.cpp Merge #11178: Add iswitness parameter to decode- and fundrawtransaction RPCs 2017-12-19 09:55:11 +01:00
core_write.cpp scripted-diff: Replace #include "" with #include <> (ryanofsky) 2017-11-16 08:23:01 +13:00
cuckoocache.h
dbwrapper.cpp Merge #10574: Remove includes in .cpp files for things the corresponding .h file already included 2017-12-12 14:56:25 +01:00
dbwrapper.h scripted-diff: Replace #include "" with #include <> (ryanofsky) 2017-11-16 08:23:01 +13:00
fs.cpp scripted-diff: Replace #include "" with #include <> (ryanofsky) 2017-11-16 08:23:01 +13:00
fs.h
hash.cpp Remove unused include in hash.cpp 2017-12-13 20:08:49 +09:00
hash.h scripted-diff: Replace #include "" with #include <> (ryanofsky) 2017-11-16 08:23:01 +13:00
httprpc.cpp scripted-diff: Replace #include "" with #include <> (ryanofsky) 2017-11-16 08:23:01 +13:00
httprpc.h
httpserver.cpp scripted-diff: Replace #include "" with #include <> (ryanofsky) 2017-11-16 08:23:01 +13:00
httpserver.h
indirectmap.h
init.cpp Merge #11831: Always return true if AppInitMain got to the end 2017-12-12 10:27:53 +01:00
init.h
key.cpp Merge #10657: Utils: Improvements to ECDSA key-handling code 2017-12-20 18:00:32 +01:00
key.h Merge #10657: Utils: Improvements to ECDSA key-handling code 2017-12-20 18:00:32 +01:00
keystore.cpp Add GetCScripts to CBasicKeyStore 2017-12-20 18:47:55 +13:00
keystore.h Add GetCScripts to CBasicKeyStore 2017-12-20 18:47:55 +13:00
limitedmap.h
Makefile.am Add -walletdir parameter to specify custom wallet dir 2017-11-18 00:50:58 +13:00
Makefile.bench.include build: Make "make clean" remove all files created when running "make check" 2017-10-04 14:54:41 +02:00
Makefile.leveldb.include
Makefile.qt.include Merge #11621: [build] Add temp_bitcoin_locale_qrc to CLEAN_QT to fix make distcheck 2017-11-17 14:04:02 +01:00
Makefile.qttest.include
Makefile.test.include [tests] remove redundant univalue_tests.cpp 2017-12-12 12:45:53 -05:00
memusage.h scripted-diff: Replace #include "" with #include <> (ryanofsky) 2017-11-16 08:23:01 +13:00
merkleblock.cpp scripted-diff: Replace #include "" with #include <> (ryanofsky) 2017-11-16 08:23:01 +13:00
merkleblock.h scripted-diff: Replace #include "" with #include <> (ryanofsky) 2017-11-16 08:23:01 +13:00
miner.cpp Remove includes in .cpp files for things the corresponding .h file already included 2017-11-16 22:26:34 +01:00
miner.h Make boost::multi_index comparators const 2017-12-07 10:06:38 -05:00
net_processing.cpp Merge #11558: Minimal code changes to allow msvc compilation 2017-12-13 14:05:25 +01:00
net_processing.h scripted-diff: Replace #include "" with #include <> (ryanofsky) 2017-11-16 08:23:01 +13:00
net.cpp Merge #11616: Update ban-state in case of dirty-state during periodic sweep 2017-12-15 10:43:34 +01:00
net.h Add Clang thread safety analysis annotations 2017-11-23 07:59:58 +01:00
netaddress.cpp Remove includes in .cpp files for things the corresponding .h file already included 2017-11-16 22:26:34 +01:00
netaddress.h scripted-diff: Replace #include "" with #include <> (ryanofsky) 2017-11-16 08:23:01 +13:00
netbase.cpp Merge #11363: net: Split socket create/connect 2017-12-13 05:42:32 +01:00
netbase.h Merge #11363: net: Split socket create/connect 2017-12-13 05:42:32 +01:00
netmessagemaker.h scripted-diff: Replace #include "" with #include <> (ryanofsky) 2017-11-16 08:23:01 +13:00
noui.cpp scripted-diff: Replace #include "" with #include <> (ryanofsky) 2017-11-16 08:23:01 +13:00
noui.h
pow.cpp scripted-diff: Replace #include "" with #include <> (ryanofsky) 2017-11-16 08:23:01 +13:00
pow.h scripted-diff: Replace #include "" with #include <> (ryanofsky) 2017-11-16 08:23:01 +13:00
prevector.h
protocol.cpp scripted-diff: Replace #include "" with #include <> (ryanofsky) 2017-11-16 08:23:01 +13:00
protocol.h Add NODE_NETWORK_LIMITED flags and min block amount constants 2017-12-05 11:03:59 -10:00
pubkey.cpp Merge #10657: Utils: Improvements to ECDSA key-handling code 2017-12-20 18:00:32 +01:00
pubkey.h Merge #10657: Utils: Improvements to ECDSA key-handling code 2017-12-20 18:00:32 +01:00
random.cpp scripted-diff: Replace #include "" with #include <> (ryanofsky) 2017-11-16 08:23:01 +13:00
random.h Merge #11558: Minimal code changes to allow msvc compilation 2017-12-13 14:05:25 +01:00
rest.cpp scripted-diff: Replace #include "" with #include <> (ryanofsky) 2017-11-16 08:23:01 +13:00
reverse_iterator.h
reverselock.h
scheduler.cpp scripted-diff: Replace #include "" with #include <> (ryanofsky) 2017-11-16 08:23:01 +13:00
scheduler.h scripted-diff: Replace #include "" with #include <> (ryanofsky) 2017-11-16 08:23:01 +13:00
serialize.h Merge #10493: Use range-based for loops (C++11) when looping over map elements 2017-11-30 17:10:05 -05:00
streams.h Merge #10839: Don't use pass by reference to const for cheaply-copied types (bool, char, etc.) 2017-12-14 18:28:01 +01:00
sync.cpp threads: add a thread_local autoconf check 2017-11-27 15:01:47 -08:00
sync.h Switched sync.{cpp,h} to std threading primitives. 2017-11-18 11:35:14 -08:00
threadinterrupt.cpp scripted-diff: Replace #include "" with #include <> (ryanofsky) 2017-11-16 08:23:01 +13:00
threadinterrupt.h
threadsafety.h
timedata.cpp scripted-diff: Replace #include "" with #include <> (ryanofsky) 2017-11-16 08:23:01 +13:00
timedata.h
tinyformat.h [Util] Update tinyformat.h 2017-10-29 21:12:12 +08:00
torcontrol.cpp scripted-diff: Replace #include "" with #include <> (ryanofsky) 2017-11-16 08:23:01 +13:00
torcontrol.h scripted-diff: Replace #include "" with #include <> (ryanofsky) 2017-11-16 08:23:01 +13:00
txdb.cpp scripted-diff: Replace #include "" with #include <> (ryanofsky) 2017-11-16 08:23:01 +13:00
txdb.h scripted-diff: Replace #include "" with #include <> (ryanofsky) 2017-11-16 08:23:01 +13:00
txmempool.cpp scripted-diff: Replace #include "" with #include <> (ryanofsky) 2017-11-16 08:23:01 +13:00
txmempool.h Make boost::multi_index comparators const 2017-12-07 10:06:38 -05:00
ui_interface.cpp scripted-diff: Replace #include "" with #include <> (ryanofsky) 2017-11-16 08:23:01 +13:00
ui_interface.h
uint256.cpp scripted-diff: Replace #include "" with #include <> (ryanofsky) 2017-11-16 08:23:01 +13:00
uint256.h scripted-diff: Replace #include "" with #include <> (ryanofsky) 2017-11-16 08:23:01 +13:00
undo.h Remove trailing whitespace causing travis failure 2017-11-16 08:23:03 +13:00
util.cpp Merge #10574: Remove includes in .cpp files for things the corresponding .h file already included 2017-12-12 14:56:25 +01:00
util.h Merge #11583: Do not make it trivial for inbound peers to generate log entries 2017-12-11 17:06:22 +01:00
utilmoneystr.cpp scripted-diff: Replace #include "" with #include <> (ryanofsky) 2017-11-16 08:23:01 +13:00
utilmoneystr.h scripted-diff: Replace #include "" with #include <> (ryanofsky) 2017-11-16 08:23:01 +13:00
utilstrencodings.cpp scripted-diff: Replace #include "" with #include <> (ryanofsky) 2017-11-16 08:23:01 +13:00
utilstrencodings.h
utiltime.cpp scripted-diff: Replace #include "" with #include <> (ryanofsky) 2017-11-16 08:23:01 +13:00
utiltime.h
validation.cpp Merge #10574: Remove includes in .cpp files for things the corresponding .h file already included 2017-12-12 14:56:25 +01:00
validation.h Merge #10279: Add a CChainState class to validation.cpp to take another step towards clarifying internal interfaces 2017-12-12 14:36:57 +01:00
validationinterface.cpp Fix shutdown in case of errors during initialization 2017-11-28 12:12:05 +01:00
validationinterface.h scripted-diff: Replace #include "" with #include <> (ryanofsky) 2017-11-16 08:23:01 +13:00
version.h
versionbits.cpp scripted-diff: Replace #include "" with #include <> (ryanofsky) 2017-11-16 08:23:01 +13:00
versionbits.h scripted-diff: Replace #include "" with #include <> (ryanofsky) 2017-11-16 08:23:01 +13:00
warnings.cpp scripted-diff: Replace #include "" with #include <> (ryanofsky) 2017-11-16 08:23:01 +13:00
warnings.h