diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2019-04-16 07:55:06 -0400 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2019-04-16 07:55:31 -0400 |
| commit | e57462c6ba6023e0ed5417067364dcea2f88b36d (patch) | |
| tree | 974d850ceca0b5096c2b03898c88c727e620224e /src/test/util_tests.cpp | |
| parent | fa3993bfe856133ffd54bff1b7d77838321d372d (diff) | |
| parent | 235550d01992555a316c9c4639f5bec6255a244f (diff) | |
| download | bitcoin-e57462c6ba6023e0ed5417067364dcea2f88b36d.tar.xz | |
Merge #15803: [0.18] Backport 15749: importmulti only imports origin info for PKH outputs
235550d019 Take non-importing keys into account for spendability warning in descriptor import (Pieter Wuille)
802dcd37d1 Import all origin info in importmulti; even for non-importing pubkeys (Pieter Wuille)
7fcbe7dc11 Keep full pubkeys in FlatSigningProvider::origins (Pieter Wuille)
Pull request description:
Clean backport of #15749 by sipa to 0.18
ACKs for commit 235550:
fanquake:
utACK 235550d
MarcoFalke:
ACK 235550d019 (Checked that they are clean cherry-picks)
Tree-SHA512: 1ccc19f51137ac4ef971c0bcca4c87ab2383610aa51c5d02680c485b9ce6abd698dddd7f4a45946d56b1aa741cc3fd94b4180ff15901824d20eeba89b4f12853
Diffstat (limited to 'src/test/util_tests.cpp')
0 files changed, 0 insertions, 0 deletions