Skip to content

[0.18] Backport 15749: importmulti only imports origin info for PKH outputs #15803

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
maflcko merged 3 commits into from
Apr 16, 2019
Merged

[0.18] Backport 15749: importmulti only imports origin info for PKH outputs #15803

maflcko merged 3 commits into from
Apr 16, 2019

Conversation

@meshcollider
Copy link
Contributor

@meshcollider meshcollider commented Apr 12, 2019 •
edited by fanquake
Loading

Clean backport of #15749 by sipa to 0.18

@meshcollider meshcollider added this to the 0.18.0 milestone Apr 12, 2019
@meshcollider meshcollider requested a review from sipa April 12, 2019 01:41
@fanquake
Copy link
Member

fanquake commented Apr 15, 2019

@meshcollider These commits are missing the Github-Pull: and Rebased-From: info.

@maflcko
Copy link
Member

maflcko commented Apr 15, 2019

The backport should include the metadata. You may use a script to do it for you: https://github.com/bitcoin-core/bitcoin-maintainer-tools#backport

@meshcollider
Copy link
Contributor Author

meshcollider commented Apr 16, 2019

Sorry, fixed, forgot about the metadata

@fanquake
Copy link
Member

fanquake commented Apr 16, 2019

utACK 235550d

@maflcko
Copy link
Member

maflcko commented Apr 16, 2019

ACK 235550d (Checked that they are clean cherry-picks)

@maflcko maflcko merged commit 235550d into bitcoin:0.18 Apr 16, 2019
maflcko pushed a commit that referenced this pull request Apr 16, 2019
Merge #15803: [0.18] Backport 15749: importmulti only imports origin …
e57462c 
…info for PKH outputs

235550d Take non-importing keys into account for spendability warning in descriptor import (Pieter Wuille)
802dcd3 Import all origin info in importmulti; even for non-importing pubkeys (Pieter Wuille)
7fcbe7d 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 235550d (Checked that they are clean cherry-picks)

Tree-SHA512: 1ccc19f51137ac4ef971c0bcca4c87ab2383610aa51c5d02680c485b9ce6abd698dddd7f4a45946d56b1aa741cc3fd94b4180ff15901824d20eeba89b4f12853
@fanquake fanquake mentioned this pull request Apr 16, 2019
Merged
@meshcollider meshcollider deleted the 201904_backport_15749 branch April 16, 2019 11:58
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Dec 16, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@sipa sipa Awaiting requested review from sipa

Assignees

No one assigned

Labels

Backport RPC/REST/ZMQ Wallet

Projects

None yet

Milestone

0.18.0

Development

Successfully merging this pull request may close these issues.

4 participants

@meshcollider @fanquake @maflcko @sipa