diff options
| author | MeshCollider <dobsonsa68@gmail.com> | 2019-04-10 00:33:10 +1200 |
|---|---|---|
| committer | MeshCollider <dobsonsa68@gmail.com> | 2019-04-10 00:33:35 +1200 |
| commit | 54798c3a31b0fe3dbe3b0c2dd957ecce75e29797 (patch) | |
| tree | 32b35f90931a250321f7b9c6a58ada0c1ddc4b0b /test/functional/p2p_segwit.py | |
| parent | db2985651d9f18a123edcbaf777992297dd0a688 (diff) | |
| parent | b5d39877242504160a7f2c24c60c07a845d7a064 (diff) | |
Merge #15749: Fix: importmulti only imports origin info for PKH outputs
b5d398772 Take non-importing keys into account for spendability warning in descriptor import (Pieter Wuille)
6e597001a Import all origin info in importmulti; even for non-importing pubkeys (Pieter Wuille)
9a93c91c8 Keep full pubkeys in FlatSigningProvider::origins (Pieter Wuille)
Pull request description:
This fixes #15743 and #15742.
Since #15263, pubkeys are no longer imported for non-PKH (or WPKH, or any wrapped form of those) outputs, as that would incorrectly mark outputs to single-key versions of multisig policies as watched.
As a side effect, this change also caused origin info not to be imported anymore for multisig policies.
Fix this by plumbing through the full pubkey information for origins in FlatSigningProvider, and then importing all origin info we have in `importmulti` (knowing more never hurts, and additional origin information has no negative consequences like importing the pubkeys themselves).
ACKs for commit b5d398:
MeshCollider:
utACK https://github.com/bitcoin/bitcoin/pull/15749/commits/b5d39877242504160a7f2c24c60c07a845d7a064
Tree-SHA512: 37caa2be8d01b8baa12f70a58eaa7c583f5f0afbe012e02936dd8790dc5dc852f880b77258b34ddb68cae30c029585f2d1c4f5d00015380557a1e8b471e500f3
Diffstat (limited to 'test/functional/p2p_segwit.py')
0 files changed, 0 insertions, 0 deletions