cryptogera/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-02-05 05:01:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
bitcoin/src
History
Samuel Dobson 9dd7bd47be
Merge #18034: Get the OutputType for a descriptor 
7e80f646b24a2abf3c031a649bcc706a695f80da Get the OutputType for a descriptor (Andrew Chow)

Pull request description:

  Adds a `GetOutputType()` method to get the OutputType of a descriptor. Some descriptors don't have a determinate OutputType, so we actually use an `Optional<OutputType>`. For descriptors with indeterminate OutputType, we return `nullopt`.

  `addr()` and `raw()` use OutputTypes as determined by the CTxDestination they have. For simplicity, `ScriptHash` destinations are `LEGACY` even though they could be `P2SH_SEGWIT`.
  `combo()`, `pk()`, and `multi()` are `nullopt` as they either don't have an OutputType or they have multiple. `DescriptorImpl` defaults to `nullopt`.
  `pkh()` is `LEGACY` as expected
  `wpkh()` and `wsh()` are `BECH32` as expected.
  `sh()` checks whether the sub-descriptor is `BECH32`. If so, it is `P2SH_SEGWIT`. Otherwise it is `LEGACY`.

  The descriptor tests are updated to check the OutputType too.

ACKs for top commit:
  fjahr:
    ACK 7e80f646b24a2abf3c031a649bcc706a695f80da
  meshcollider:
    utACK 7e80f646b24a2abf3c031a649bcc706a695f80da
  instagibbs:
    cursory ACK 7e80f646b2
  Sjors:
    Code review ACK 7e80f646b24a2abf3c031a649bcc706a695f80da
  jonatack:
    ACK 7e80f64 code review/build/tests

Tree-SHA512: c5a813447b62e982435e1c948066f8d6c148c9ebffb0a5eb5a9028b173b01d5ead2f076a5ca3f7f37698538baa346f82a977ee48f583d89cb4e5ebd9111b2341
2020-02-22 08:02:52 +13:00
..
bench
Merge #17261: Make ScriptPubKeyMan an actual interface and the wallet to have multiple
2020-01-30 17:21:21 +13:00
compat
scripted-diff: Bump copyright of files changed in 2019
2019-12-30 10:42:20 +13:00
config
…
consensus
scripted-diff: Bump copyright of files changed in 2019
2019-12-30 10:42:20 +13:00
crc32c
Import crc32c using subtree merge as as 'src/crc32c'
2020-01-28 17:00:01 +01:00
crypto
Merge #17691: doc: Add missed copyright headers
2020-01-16 15:58:35 -05:00
index
scripted-diff: Bump copyright of files changed in 2019
2019-12-30 10:42:20 +13:00
interfaces
Refactor: Replace SigningProvider pointers with unique_ptrs
2020-01-23 16:35:08 -05:00
leveldb
Update to leveldb upstream using subtree merge
2020-01-28 16:59:07 +01:00
logging
scripted-diff: Bump copyright of files changed in 2019
2019-12-30 10:42:20 +13:00
node
Merge #18037: Util: Allow scheduler to be mocked
2020-02-17 17:01:50 -08:00
policy
scripted-diff: Bump copyright of files changed in 2020
2020-01-15 02:18:00 +07:00
primitives
scripted-diff: Bump copyright of files changed in 2019
2019-12-30 10:42:20 +13:00
qt
Merge #18121: gui: Throttle GUI update pace when -reindex
2020-02-13 08:48:07 +01:00
rpc
Merge #18122: rpc: update validateaddress RPCExamples to bech32
2020-02-20 20:28:46 +08:00
script
Merge #18034: Get the OutputType for a descriptor
2020-02-22 08:02:52 +13:00
secp256k1
…
support
scripted-diff: Bump copyright of files changed in 2019
2019-12-30 10:42:20 +13:00
test
Merge #18034: Get the OutputType for a descriptor
2020-02-22 08:02:52 +13:00
univalue
Update univalue subtree
2020-02-09 07:44:29 -08:00
util
Merge #13339: wallet: Replace %w by wallet name in -walletnotify script
2020-02-17 11:59:23 +01:00
wallet
Merge #18122: rpc: update validateaddress RPCExamples to bech32
2020-02-20 20:28:46 +08:00
zmq
scripted-diff: Add missing spaces in RPCResult, Fix type names
2020-02-09 05:12:43 -08: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
Merge #16702: p2p: supplying and using asmap to improve IP bucketing in addrman
2020-01-29 13:55:43 +01:00
addrman.h
Merge #16702: p2p: supplying and using asmap to improve IP bucketing in addrman
2020-01-29 13:55:43 +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
scripted-diff: Bump copyright of files changed in 2020
2020-01-15 02:18:00 +07: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
…
bitcoin-cli-res.rc
…
bitcoin-cli.cpp
scripted-diff: Bump copyright of files changed in 2019
2019-12-30 10:42:20 +13:00
bitcoin-tx-res.rc
…
bitcoin-tx.cpp
scripted-diff: Bump copyright of files changed in 2019
2019-12-30 10:42:20 +13:00
bitcoin-wallet-res.rc
…
bitcoin-wallet.cpp
bitcoin-wallet: Use PACKAGE_NAME in usage help
2020-01-14 18:19:00 +00:00
bitcoind-res.rc
…
bitcoind.cpp
Merge #16839: Replace Connman and BanMan globals with NodeContext local
2019-10-30 12:35:41 +01:00
blockencodings.cpp
scripted-diff: Bump copyright of files changed in 2019
2019-12-30 10:42:20 +13:00
blockencodings.h
scripted-diff: Bump copyright of files changed in 2019
2019-12-30 10:42:20 +13: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
[test] add chainparams property to indicate chain allows time mocking
2020-02-13 08:59:51 -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
contrib: Remove invalid nodes from seeds list
2019-10-02 08:51:12 +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
Convert compression.h to new serialization framework
2020-01-21 20:29:11 -08:00
compat.h
…
compressor.cpp
scripted-diff: Bump copyright of files changed in 2019
2019-12-30 10:42:20 +13:00
compressor.h
Convert compression.h to new serialization framework
2020-01-21 20:29:11 -08: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
scripted-diff: Bump copyright of files changed in 2019
2019-12-30 10:42:20 +13:00
core_write.cpp
scripted-diff: Bump copyright of files changed in 2019
2019-12-30 10:42:20 +13:00
cuckoocache.h
Use correct C++11 header for std::swap()
2019-11-29 21:23:25 +02: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
…
flatfile.h
Get rid of VARINT default argument
2020-02-10 12:00:10 -08:00
fs.cpp
scripted-diff: Add missed copyright headers
2020-01-04 20:18:28 +02:00
fs.h
scripted-diff: Bump copyright of files changed in 2019
2019-12-30 10:42:20 +13:00
hash.cpp
…
hash.h
…
httprpc.cpp
scripted-diff: Bump copyright of files changed in 2019
2019-12-30 10:42:20 +13:00
httprpc.h
scripted-diff: Bump copyright of files changed in 2019
2019-12-30 10:42:20 +13:00
httpserver.cpp
net: Avoid using C-style NUL-terminated strings as arguments in the netbase interface
2020-01-08 12:35:59 +00:00
httpserver.h
scripted-diff: Bump copyright of files changed in 2019
2019-12-30 10:42:20 +13:00
indirectmap.h
…
init.cpp
Merge #18037: Util: Allow scheduler to be mocked
2020-02-17 17:01:50 -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
Merge #17398: build: Update leveldb to 1.22+
2020-02-10 11:36:09 +01:00
Makefile.bench.include
[test] move wallet helper functions into test library
2019-11-25 16:40:09 +01: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
Restore English translation option
2020-01-06 22:58:47 -05: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_util.include
[test] move wallet helper functions into test library
2019-11-25 16:40:09 +01:00
Makefile.test.include
wallet: Improve LegacyScriptPubKeyMan::CanProvide script recognition
2020-02-12 11:48:30 -05:00
memusage.h
…
merkleblock.cpp
scripted-diff: Bump copyright of files changed in 2019
2019-12-30 10:42:20 +13:00
merkleblock.h
…
miner.cpp
rpc: Remove mempool global from miner
2019-12-23 06:12:10 +07: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
scripted-diff: Bump copyright of files changed in 2019
2019-12-30 10:42:20 +13:00
net_processing.cpp
net: reference instead of copy in BlockConnected range loop
2020-02-02 10:27:47 +01:00
net_processing.h
Use rolling bloom filter of recent block tx's for AlreadyHave() check
2020-01-29 09:37:21 -05:00
net_types.h
refactor: Remove addrdb.h dependency from node.h
2019-10-29 11:30:12 +02:00
net.cpp
Mark asmap const in statistics code
2020-01-31 14:51:37 -08:00
net.h
Mark asmap const in statistics code
2020-01-31 14:51:37 -08:00
netaddress.cpp
Use ASNs for mapped IPv4 addresses correctly
2020-01-31 14:51:37 -08:00
netaddress.h
Merge #18023: Fix some asmap issues
2020-02-05 13:59:42 +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
Merge #17708: prevector: avoid misaligned member accesses
2020-02-12 17:48:30 +01:00
protocol.cpp
p2p: Remove BIP61 reject messages
2019-10-02 10:39:14 -04:00
protocol.h
Merge #17474: Bugfix: GUI: Recognise NETWORK_LIMITED in formatServicesStr
2019-12-11 17:00:27 -05: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
scripted-diff: Bump copyright of files changed in 2019
2019-12-30 10:42:20 +13:00
random.h
scripted-diff: Bump copyright of files changed in 2019
2019-12-30 10:42:20 +13:00
randomenv.cpp
Put bounds on the number of CPUID leaves explored
2019-11-20 10:54:08 -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
…
reverselock.h
…
scheduler.cpp
[util] allow scheduler to be mocked
2020-02-13 08:59:51 -08:00
scheduler.h
[util] allow scheduler to be mocked
2020-02-13 08:59:51 -08:00
serialize.h
Get rid of VARINT default argument
2020-02-10 12:00:10 -08:00
shutdown.cpp
…
shutdown.h
…
span.h
…
streams.h
scripted-diff: Bump copyright of files changed in 2019
2019-12-30 10:42:20 +13:00
sync.cpp
scripted-diff: Bump copyright of files changed in 2020
2020-01-15 02:18:00 +07:00
sync.h
scripted-diff: Bump copyright of files changed in 2020
2020-01-15 02:18:00 +07: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
Make UpdateTransactionsFromBlock use Epochs
2020-01-14 19:30:13 -08:00
txmempool.h
Merge #17925: Improve UpdateTransactionsFromBlock with Epochs
2020-02-03 11:54:34 +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
Convert undo.h to new serialization framework
2020-02-06 19:08:11 -08:00
validation.cpp
Merge #16974: Walk pindexBestHeader back to ChainActive().Tip() if it is invalid
2020-02-03 12:28:38 +01:00
validation.h
scripted-diff: Bump copyright of files changed in 2020
2020-01-15 02:18:00 +07:00
validationinterface.cpp
scripted-diff: Bump copyright of files changed in 2020
2020-01-15 02:18:00 +07:00
validationinterface.h
scripted-diff: Bump copyright of files changed in 2020
2020-01-15 02:18:00 +07: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