fanquake 744157ef1a Merge bitcoin/bitcoin#28602: descriptors: Disallow hybrid and uncompressed keys when inferring ...

74c77825e5 test: Unit test for inferring scripts with hybrid and uncompressed keys (Andrew Chow)
f895f97014 test: Scripts with hybrid pubkeys are migrated to watchonly (Andrew Chow)
37b9b73477 descriptors: Move InferScript's pubkey validity checks to InferPubkey (Andrew Chow)
b7485f11ab descriptors: Check result of InferPubkey (Andrew Chow)

Pull request description:

  `InferDescriptor` was not always checking that the pubkey it was placing into the descriptor was an allowed pubkey. For example, given a P2WPKH script that uses an uncompressed pubkey, it would produce a `wpkh()` with the uncompressed key. Additionally, the hybrid key check was only being done for `pk()` scripts, where it should've been done for all scripts.

  This PR moves the key checking into `InferPubkey`. If the key is not valid for the context, then `nullptr` is returned and the inferring will fall through to the defaults of either `raw()` or `addr()`.

  This also resolves an issue with migrating legacy wallets that contain hybrid pubkeys as such watchonly scripts will become `raw()` or `addr()` and go to the watchonly wallet. Note that a legacy wallet cannot sign for hybrid pubkeys. A test has been added for the migration case.

  Also added unit tests for `InferDescriptor` itself as the edge cases with that function are not covered by the descriptor roundtrip test.

ACKs for top commit:
  furszy:
    ACK 74c77825
  Sjors:
    utACK 74c77825e5

Tree-SHA512: ed5f63e42a2e46120245a6b0288b90d2a6912860814c6c08fe393332add1cb364dc5eca72f16980352143570aef0c07bf1a91acd294099463bd028b6ce2fe40c

2023-10-11 12:50:43 +02:00

..

bench

Merge bitcoin/bitcoin#27598: bench: Add SHA256 implementation specific benchmarks

2023-10-04 16:04:07 +01:00

common

Rename script/standard.{cpp/h} to script/solver.{cpp/h}

2023-08-14 17:39:49 -04:00

compat

Sort includes in compat.h

2023-08-08 17:50:41 +02:00

config

…

consensus

consensus/validation.h: remove needless GetTransactionOutputWeight helper

2023-09-08 11:16:06 +02:00

crc32c

Update crc32c subtree to latest upstream master

2022-08-13 13:55:38 +01:00

crypto

Add ability to specify SHA256 implementation for benchmark purposes

2023-09-20 21:11:55 +01:00

index

validation: indexing changes for assumeutxo

2023-09-30 06:38:47 -04:00

init

init: remove config option names from translated -loglevel strings

2023-06-15 10:27:56 -06:00

interfaces

validation: pass ChainstateRole for validationinterface calls

2023-09-30 06:38:47 -04:00

ipc

refactor: Move system from util to common library

2023-05-20 12:08:13 +02:00

kernel

Merge bitcoin/bitcoin#28591: kernel: chainparams updates for 26.x

2023-10-09 14:54:08 +01:00

leveldb

Update leveldb-subtree subtree to latest upstream

2022-09-29 16:43:30 +01:00

logging

Use steady clock for logging timer

2023-01-31 18:48:50 +01:00

minisketch

Update minisketch subtree to latest upstream

2022-10-23 15:03:04 +01:00

node

blockstorage: Let FlushChainstateBlockFile return true in case of missing cursor

2023-10-06 19:43:32 +02:00

policy

Merge bitcoin/bitcoin#27609: rpc: allow submitpackage to be called outside of regtest

2023-10-05 19:08:19 -04:00

primitives

Remove CHashWriter type

2023-09-19 16:38:08 +02:00

qt

Merge bitcoin/bitcoin#28611: Adjust Gradle properties to fix apk build

2023-10-09 14:12:00 +01:00

rpc

rpc: Use Ensure(Any)Chainman in assumeutxo related RPCs

2023-10-06 19:43:32 +02:00

script

descriptors: Move InferScript's pubkey validity checks to InferPubkey

2023-10-09 14:07:37 -04:00

secp256k1

Update secp256k1 subtree to upstream release 0.4.0

2023-09-04 12:51:20 -04:00

support

Add make_secure_unique helper

2023-09-27 15:05:15 -04:00

test

test: Unit test for inferring scripts with hybrid and uncompressed keys

2023-10-09 14:07:37 -04:00

univalue

Remove unused raw-pointer read helper from univalue

2023-07-27 14:24:52 +02:00

util

Merge bitcoin/bitcoin#26312: Remove Sock::Get() and Sock::Sock()

2023-10-03 09:57:46 -04:00

wallet

wallet: No BDB creation, unless -deprecatedrpc=create_bdb

2023-10-05 15:47:44 +02:00

zmq

validationinterface: only send zmq notifications for active

2023-09-30 06:38:47 -04:00

.bear-tidy-config

ci: filter all subtrees from tidy output

2023-06-29 11:59:31 +01:00

.clang-format

…

.clang-tidy

ci: use LLVM/Clang 17 in tidy job

2023-10-10 11:02:10 +01:00

addrdb.cpp

Merge bitcoin/bitcoin#28473: refactor: Serialization parameter cleanups

2023-09-15 14:27:20 +01:00

addrdb.h

Use serialization parameters for CAddress serialization

2023-09-05 10:13:25 +02:00

addresstype.cpp

Add PubKeyDestination for P2PK scripts

2023-09-12 12:14:31 -04:00

addresstype.h

Add PubKeyDestination for P2PK scripts

2023-09-12 12:14:31 -04:00

addrman_impl.h

rpc: getrawaddrman for addrman entries

2023-10-02 15:34:28 +02:00

addrman.cpp

rpc: getrawaddrman for addrman entries

2023-10-02 15:34:28 +02:00

addrman.h

rpc: getrawaddrman for addrman entries

2023-10-02 15:34:28 +02:00

arith_uint256.cpp

scripted-diff: Bump copyright headers

2022-12-24 23:49:50 +00:00

arith_uint256.h

Fix clang-tidy readability-const-return-type violations

2023-02-01 11:33:35 +01:00

attributes.h

Introduce platform-agnostic ALWAYS_INLINE macro

2023-05-04 20:57:51 +01:00

banman.cpp

refactor: Move system from util to common library

2023-05-20 12:08:13 +02:00

banman.h

refactor: Move fs.* to util/fs.*

2023-03-23 12:55:18 +01:00

base58.cpp

scripted-diff: Bump copyright headers

2022-12-24 23:49:50 +00:00

base58.h

scripted-diff: Bump copyright headers

2022-12-24 23:49:50 +00:00

bech32.cpp

scripted-diff: Bump copyright headers

2022-12-24 23:49:50 +00:00

bech32.h

…

bip324.cpp

net: merge V2Transport constructors, move key gen

2023-09-10 16:11:52 -04:00

bip324.h

net: merge V2Transport constructors, move key gen

2023-09-10 16:11:52 -04:00

bitcoin-chainstate.cpp

[refactor] Add missing includes for next commit

2023-09-12 22:51:42 +02:00

bitcoin-cli-res.rc

…

bitcoin-cli.cpp

refactor: Move system from util to common library

2023-05-20 12:08:13 +02:00

bitcoin-tx-res.rc

…

bitcoin-tx.cpp

kernel: Remove Univalue from kernel library

2023-07-25 17:40:07 +02:00

bitcoin-util-res.rc

…

bitcoin-util.cpp

[refactor] Add missing includes for next commit

2023-09-12 22:51:42 +02:00

bitcoin-wallet-res.rc

…

bitcoin-wallet.cpp

refactor: Move system from util to common library

2023-05-20 12:08:13 +02:00

bitcoind-res.rc

…

bitcoind.cpp

Remove the syscall sandbox

2023-06-16 10:38:19 +01:00

blockencodings.cpp

refactor: Fix logging.h includes

2023-08-05 10:42:56 +02:00

blockencodings.h

script: remove out-of-date snprintf TODO

2023-02-15 14:42:28 -08:00

blockfilter.cpp

Remove unused GetType() from OverrideStream, CVectorWriter, SpanReader

2023-09-19 14:19:57 +00:00

blockfilter.h

Remove unused includes from blockfilter.h

2023-08-17 18:28:15 +02:00

chain.cpp

scripted-diff: Bump copyright headers

2022-12-24 23:49:50 +00:00

chain.h

chain: Rename HaveTxsDownloaded to HaveNumChainTxs

2023-10-06 19:43:32 +02:00

chainparams.cpp

test: Throw error when -signetchallenge is non-hex

2023-05-25 19:24:05 +02:00

chainparams.h

test: Throw error when -signetchallenge is non-hex

2023-05-25 19:24:05 +02:00

chainparamsbase.cpp

refactor: Use ChainType enum exhaustively

2023-05-10 10:39:58 +02:00

chainparamsbase.h

refactor: Use ChainType enum exhaustively

2023-05-10 10:39:58 +02:00

chainparamsseeds.h

p2p: update hardcoded mainnet seeds for 25.x

2023-04-20 06:08:22 -07:00

checkqueue.h

Remove the syscall sandbox

2023-06-16 10:38:19 +01:00

clientversion.cpp

scripted-diff: Bump copyright headers

2022-12-24 23:49:50 +00:00

clientversion.h

scripted-diff: Bump copyright headers

2022-12-24 23:49:50 +00:00

coins.cpp

Merge bitcoin/bitcoin#26331: Implement CCoinsViewErrorCatcher::HaveCoin and check disk space periodically

2023-10-09 14:52:00 -04:00

coins.h

Merge bitcoin/bitcoin#26331: Implement CCoinsViewErrorCatcher::HaveCoin and check disk space periodically

2023-10-09 14:52:00 -04:00

compressor.cpp

Clean up things that include script/standard.h

2023-08-14 17:38:27 -04:00

compressor.h

…

core_io.h

kernel: Remove Univalue from kernel library

2023-07-25 17:40:07 +02:00

core_memusage.h

…

core_read.cpp

kernel: Remove Univalue from kernel library

2023-07-25 17:40:07 +02:00

core_write.cpp

Rename script/standard.{cpp/h} to script/solver.{cpp/h}

2023-08-14 17:39:49 -04:00

cuckoocache.h

clang-tidy: Fix modernize-use-default-member-init in headers

2023-01-31 11:50:10 +00:00

dbwrapper.cpp

dbwrapper: Use DataStream for batch operations

2023-09-12 12:07:39 +02:00

dbwrapper.h

dbwrapper: Use DataStream for batch operations

2023-09-12 12:07:39 +02:00

deploymentinfo.cpp

Decouple RegTestChainParams from ArgsManager

2023-03-15 16:42:42 +01:00

deploymentinfo.h

Decouple RegTestChainParams from ArgsManager

2023-03-15 16:42:42 +01:00

deploymentstatus.cpp

scripted-diff: Bump copyright headers

2022-12-24 23:49:50 +00:00

deploymentstatus.h

scripted-diff: Bump copyright headers

2022-12-24 23:49:50 +00:00

dummywallet.cpp

move-only: Extract common/args and common/config.cpp from util/system

2023-04-19 10:48:30 +02:00

external_signer.cpp

Fix clang-tidy performance-unnecessary-copy-initialization warnings

2023-05-09 18:48:52 +02:00

external_signer.h

refactor: Move system from util to common library

2023-05-20 12:08:13 +02:00

flatfile.cpp

refactor: Extract util/fs_helpers from util/system

2023-03-23 12:52:00 +01:00

flatfile.h

Merge bitcoin/bitcoin#27254: refactor: Extract util/fs from util/system

2023-04-03 14:41:22 +01:00

hash.cpp

scripted-diff: Bump copyright headers

2022-12-24 23:49:50 +00:00

hash.h

Remove CHashWriter type

2023-09-19 16:38:08 +02:00

headerssync.cpp

headerssync: update params for 26.x

2023-10-05 11:36:03 +01:00

headerssync.h

[headerssync] Make m_commit_offset protected

2022-12-12 21:06:04 +00:00

httprpc.cpp

scripted-diff: Use UniValue::find_value method

2023-05-09 18:47:14 +02:00

httprpc.h

…

httpserver.cpp

http: bugfix: track closed connection

2023-10-03 13:35:46 +01:00

httpserver.h

scripted-diff: Bump copyright headers

2022-12-24 23:49:50 +00:00

i2p.cpp

i2p: avoid using Sock::Get() for checking for a valid socket

2023-08-24 14:39:58 +02:00

i2p.h

i2p: avoid using Sock::Get() for checking for a valid socket

2023-08-24 14:39:58 +02:00

indirectmap.h

…

init.cpp

Merge bitcoin/bitcoin#26331: Implement CCoinsViewErrorCatcher::HaveCoin and check disk space periodically

2023-10-09 14:52:00 -04:00

init.h

refactor: index, decouple 'Init' from 'Start'

2023-07-10 10:47:17 -03:00

key_io.cpp

Merge bitcoin/bitcoin#28246: wallet: Use CTxDestination in CRecipient instead of just scriptPubKey

2023-09-19 16:48:43 +00:00

key_io.h

Clean up things that include script/standard.h

2023-08-14 17:38:27 -04:00

key.cpp

key: don't allocate secure mem for null (invalid) key

2023-09-27 15:05:26 -04:00

key.h

key: don't allocate secure mem for null (invalid) key

2023-09-27 15:05:26 -04:00

logging.cpp

[log] add category TXPACKAGES for orphanage and package relay

2023-08-29 16:41:22 +01:00

logging.h

[log] add category TXPACKAGES for orphanage and package relay

2023-08-29 16:41:22 +01:00

Makefile.am

Merge bitcoin/bitcoin#28385: [refactor] rewrite DisconnectedBlockTransactions to not use boost

2023-09-23 18:42:36 +01:00

Makefile.bench.include

[bench] DisconnectedBlockTransactions

2023-09-13 11:37:13 +01:00

Makefile.crc32c.include

build: Create .la library for crc32c

2022-04-26 16:25:38 -04:00

Makefile.leveldb.include

Use more specific path when including memenv.h header

2022-06-23 15:33:01 +02:00

Makefile.minisketch.include

build: Build minisketch test in make check, not in make

2022-07-21 10:42:09 +01:00

Makefile.qt_locale.include

qt: Translation updates from Transifex

2023-09-01 07:39:00 +01:00

Makefile.qt.include

Build: Log when test -f fails in Makefile

2023-02-03 22:33:14 +01:00

Makefile.qttest.include

build: extract $(BOOST_CPPFLAGS) from $(BITCOIN_INCLUDES)

2022-09-13 17:15:17 +01:00

Makefile.test_fuzz.include

[fuzz] Move ConsumeNetAddr to fuzz/util/net.h

2022-11-17 14:52:45 +00:00

Makefile.test_util.include

Merge bitcoin/bitcoin#27425: test: move remaining rand code from util/setup_common to util/random

2023-07-19 10:26:11 +01:00

Makefile.test.include

Add package evaluation fuzzer

2023-09-27 16:27:05 -04:00

Makefile.univalue.include

…

mapport.cpp

Remove the syscall sandbox

2023-06-16 10:38:19 +01:00

mapport.h

Remove configure-time setting of DEFAULT_UPNP

2023-01-28 15:24:13 +00:00

memusage.h

add std::list to memusage

2023-09-13 11:37:45 +01:00

merkleblock.cpp

…

merkleblock.h

…

net_permissions.cpp

Merge bitcoin/bitcoin#26261: p2p: cleanup LookupIntern, Lookup and LookupHost

2023-05-30 11:39:59 -04:00

net_permissions.h

scripted-diff: Bump copyright headers

2022-12-24 23:49:50 +00:00

net_processing.cpp

chain: Rename HaveTxsDownloaded to HaveNumChainTxs

2023-10-06 19:43:32 +02:00

net_processing.h

[net processing] PeerManager holds a FastRandomContext

2023-10-03 11:23:24 +01:00

net_types.cpp

scripted-diff: Bump copyright headers

2022-12-24 23:49:50 +00:00

net_types.h

…

net.cpp

net: raise V1_PREFIX_LEN from 12 to 16

2023-10-04 11:04:43 -04:00

net.h

net: raise V1_PREFIX_LEN from 12 to 16

2023-10-04 11:04:43 -04:00

netaddress.cpp

Inline short, often-called, rarely-changed basic CNetAddr getters

2023-07-19 12:43:05 -06:00

netaddress.h

Merge bitcoin/bitcoin#28078: net, refactor: remove unneeded exports, use helpers over low-level code, use optional

2023-09-21 11:26:16 -04:00

netbase.cpp

net: don't check if the socket is valid in ConnectSocketDirectly()

2023-08-24 14:40:03 +02:00

netbase.h

p2p, refactor: return std::optional<CNetAddr> in LookupHost

2023-05-26 13:41:07 -03:00

netgroup.cpp

refactor: Use HashWriter over legacy CHashWriter (via SerializeHash)

2023-08-25 17:09:32 +02:00

netgroup.h

[netgroupman] Remove NetGroupManager::GetAsmap()

2022-04-20 14:35:53 +01:00

netmessagemaker.h

Remove unused GetType() from OverrideStream, CVectorWriter, SpanReader

2023-09-19 14:19:57 +00:00

noui.cpp

scripted-diff: Bump copyright headers

2022-12-24 23:49:50 +00:00

noui.h

…

outputtype.cpp

Clean up things that include script/standard.h

2023-08-14 17:38:27 -04:00

outputtype.h

Move CTxDestination to its own file

2023-08-14 17:38:27 -04:00

pow.cpp

scripted-diff: Bump copyright headers

2022-12-24 23:49:50 +00:00

pow.h

scripted-diff: Bump copyright headers

2022-12-24 23:49:50 +00:00

prevector.h

util: implement prevector's move ctor & move assignment

2023-03-26 15:49:52 +02:00

protocol.cpp

net: advertise NODE_P2P_V2 if CLI arg -v2transport is on

2023-10-02 18:09:53 -04:00

protocol.h

net: advertise NODE_P2P_V2 if CLI arg -v2transport is on

2023-10-02 18:09:53 -04:00

psbt.cpp

script/sign: Miniscript support in Tapscript

2023-10-08 02:43:24 +02:00

psbt.h

Remove unused GetType() from OverrideStream, CVectorWriter, SpanReader

2023-09-19 14:19:57 +00:00

pubkey.cpp

pubkey: introduce a GetEvenCorrespondingCPubKey helper

2023-10-08 02:43:19 +02:00

pubkey.h

pubkey: introduce a GetEvenCorrespondingCPubKey helper

2023-10-08 02:43:19 +02:00

random.cpp

[refactor] Remove compat.h from kernel headers

2023-09-12 22:51:48 +02:00

random.h

crypto: refactor ChaCha20 classes to use Span<std::byte> interface

2023-08-17 15:26:34 -04:00

randomenv.cpp

[refactor] Remove compat.h from kernel headers

2023-09-12 22:51:48 +02:00

randomenv.h

…

rest.cpp

rest: bugfix, fix crash error when calling /deploymentinfo

2023-06-12 10:24:14 -03:00

rest.h

Handle query string when parsing data format

2022-03-10 12:01:53 +01:00

reverse_iterator.h

doc: remove usages of C++11

2023-01-12 13:42:44 +00:00

scheduler.cpp

Remove the syscall sandbox

2023-06-16 10:38:19 +01:00

scheduler.h

scripted-diff: Bump copyright headers

2022-12-24 23:49:50 +00:00

serialize.h

serialize: make GetSizeOfCompactSize constexpr

2023-10-08 02:43:17 +02:00

shutdown.cpp

kernel: Add fatalError method to notifications

2023-06-28 09:52:33 +02:00

shutdown.h

kernel: Add fatalError method to notifications

2023-06-28 09:52:33 +02:00

signet.cpp

Remove unused GetType() from OverrideStream, CVectorWriter, SpanReader

2023-09-19 14:19:57 +00:00

signet.h

…

span.h

refactor: Use reinterpret_cast where appropriate

2023-07-24 15:32:35 +02:00

streams.cpp

streams: Teach AutoFile how to XOR

2023-07-19 18:12:42 +02:00

streams.h

Merge bitcoin/bitcoin#28508: refactor: Remove SER_GETHASH, hard-code client version in CKeyPool serialize

2023-10-02 12:33:54 +02:00

sync.cpp

…

sync.h

sync: modernize CSemaphore / CSemaphoreGrant

2023-10-02 18:11:11 -04:00

threadsafety.h

…

timedata.cpp

move-only: Extract common/args and common/config.cpp from util/system

2023-04-19 10:48:30 +02:00

timedata.h

scripted-diff: Bump copyright headers

2022-12-24 23:49:50 +00:00

tinyformat.h

clang-tidy: Fix modernize-use-default-member-init in headers

2023-01-31 11:50:10 +00:00

torcontrol.cpp

doc, refactor: Changing -torcontrol help to specify that a default port is used

2023-08-17 23:58:47 -05:00

torcontrol.h

doc, refactor: Changing -torcontrol help to specify that a default port is used

2023-08-17 23:58:47 -05:00

txdb.cpp

Merge bitcoin/bitcoin#28195: blockstorage: Drop legacy -txindex check

2023-09-05 11:37:35 +01:00

txdb.h

move-only: Move CBlockTreeDB to node/blockstorage

2023-08-01 15:27:33 +02:00

txmempool.cpp

Handle over-sized (in virtual bytes) packages with no in-mempool ancestors

2023-09-20 10:34:09 -04:00

txmempool.h

Merge bitcoin/bitcoin#28385: [refactor] rewrite DisconnectedBlockTransactions to not use boost

2023-09-23 18:42:36 +01:00

txorphanage.cpp

[log] add more logs related to orphan handling

2023-08-29 16:41:22 +01:00

txorphanage.h

scripted-diff: Following the C++ Standard rules for identifiers with _.

2023-06-20 10:23:08 +02:00

txrequest.cpp

refactor: use Span for SipHash::Write

2023-07-17 13:27:46 +02:00

txrequest.h

…

uint256.cpp

refactor: modernize the implementation of uint256.*

2022-12-10 14:34:44 -06:00

uint256.h

Merge bitcoin/bitcoin#27927: util: Allow std::byte and char Span serialization

2023-06-28 15:12:12 -04:00

undo.h

…

validation.cpp

chain: Rename HaveTxsDownloaded to HaveNumChainTxs

2023-10-06 19:43:32 +02:00

validation.h

doc: Add and edit some comments around assumeutxo

2023-10-06 18:12:31 +02:00

validationinterface.cpp

validation: pass ChainstateRole for validationinterface calls

2023-09-30 06:38:47 -04:00

validationinterface.h

validation: pass ChainstateRole for validationinterface calls

2023-09-30 06:38:47 -04:00

version.h

Use serialization parameters for CAddress serialization

2023-09-05 10:13:25 +02:00

versionbits.cpp

refactor: use braced init for integer constants instead of c style casts

2023-01-03 19:31:29 -06:00

versionbits.h

scripted-diff: Bump copyright headers

2022-12-24 23:49:50 +00:00

walletinitinterface.h

scripted-diff: Bump copyright headers

2022-12-24 23:49:50 +00:00

warnings.cpp

refactor: Move system from util to common library

2023-05-20 12:08:13 +02:00

warnings.h

…