Pass HD path data through SignatureData
This commit is contained in:
parent
03a99586a3
commit
cad5dd2368
3 changed files with 20 additions and 24 deletions
|
@ -50,10 +50,6 @@ static bool GetCScript(const SigningProvider& provider, const SignatureData& sig
|
|||
|
||||
static bool GetPubKey(const SigningProvider& provider, SignatureData& sigdata, const CKeyID& address, CPubKey& pubkey)
|
||||
{
|
||||
if (provider.GetPubKey(address, pubkey)) {
|
||||
sigdata.misc_pubkeys.emplace(pubkey.GetID(), pubkey);
|
||||
return true;
|
||||
}
|
||||
// Look for pubkey in all partial sigs
|
||||
const auto it = sigdata.signatures.find(address);
|
||||
if (it != sigdata.signatures.end()) {
|
||||
|
@ -63,7 +59,15 @@ static bool GetPubKey(const SigningProvider& provider, SignatureData& sigdata, c
|
|||
// Look for pubkey in pubkey list
|
||||
const auto& pk_it = sigdata.misc_pubkeys.find(address);
|
||||
if (pk_it != sigdata.misc_pubkeys.end()) {
|
||||
pubkey = pk_it->second;
|
||||
pubkey = pk_it->second.first;
|
||||
return true;
|
||||
}
|
||||
// Query the underlying provider
|
||||
if (provider.GetPubKey(address, pubkey)) {
|
||||
KeyOriginInfo info;
|
||||
if (provider.GetKeyOrigin(address, info)) {
|
||||
sigdata.misc_pubkeys.emplace(address, std::make_pair(pubkey, std::move(info)));
|
||||
}
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
|
@ -543,7 +547,7 @@ void PSBTInput::FillSignatureData(SignatureData& sigdata) const
|
|||
sigdata.witness_script = witness_script;
|
||||
}
|
||||
for (const auto& key_pair : hd_keypaths) {
|
||||
sigdata.misc_pubkeys.emplace(key_pair.first.GetID(), key_pair.first);
|
||||
sigdata.misc_pubkeys.emplace(key_pair.first.GetID(), key_pair);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -571,6 +575,9 @@ void PSBTInput::FromSignatureData(const SignatureData& sigdata)
|
|||
if (witness_script.empty() && !sigdata.witness_script.empty()) {
|
||||
witness_script = sigdata.witness_script;
|
||||
}
|
||||
for (const auto& entry : sigdata.misc_pubkeys) {
|
||||
hd_keypaths.emplace(entry.second);
|
||||
}
|
||||
}
|
||||
|
||||
void PSBTInput::Merge(const PSBTInput& input)
|
||||
|
@ -612,7 +619,7 @@ void PSBTOutput::FillSignatureData(SignatureData& sigdata) const
|
|||
sigdata.witness_script = witness_script;
|
||||
}
|
||||
for (const auto& key_pair : hd_keypaths) {
|
||||
sigdata.misc_pubkeys.emplace(key_pair.first.GetID(), key_pair.first);
|
||||
sigdata.misc_pubkeys.emplace(key_pair.first.GetID(), key_pair);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -624,6 +631,9 @@ void PSBTOutput::FromSignatureData(const SignatureData& sigdata)
|
|||
if (witness_script.empty() && !sigdata.witness_script.empty()) {
|
||||
witness_script = sigdata.witness_script;
|
||||
}
|
||||
for (const auto& entry : sigdata.misc_pubkeys) {
|
||||
hd_keypaths.emplace(entry.second);
|
||||
}
|
||||
}
|
||||
|
||||
bool PSBTOutput::IsNull() const
|
||||
|
|
|
@ -109,7 +109,7 @@ struct SignatureData {
|
|||
CScript witness_script; ///< The witnessScript (if any) for the input. witnessScripts are used in P2WSH outputs.
|
||||
CScriptWitness scriptWitness; ///< The scriptWitness of an input. Contains complete signatures or the traditional partial signatures format. scriptWitness is part of a transaction input per BIP 144.
|
||||
std::map<CKeyID, SigPair> signatures; ///< BIP 174 style partial signatures for the input. May contain all signatures necessary for producing a final scriptSig or scriptWitness.
|
||||
std::map<CKeyID, CPubKey> misc_pubkeys;
|
||||
std::map<CKeyID, std::pair<CPubKey, KeyOriginInfo>> misc_pubkeys;
|
||||
|
||||
SignatureData() {}
|
||||
explicit SignatureData(const CScript& script) : scriptSig(script) {}
|
||||
|
|
|
@ -4462,7 +4462,7 @@ bool FillPSBT(const CWallet* pwallet, PartiallySignedTransaction& psbtx, const C
|
|||
}
|
||||
|
||||
SignatureData sigdata;
|
||||
complete &= SignPSBTInput(HidingSigningProvider(pwallet, !sign, false), *psbtx.tx, input, sigdata, i, sighash_type);
|
||||
complete &= SignPSBTInput(HidingSigningProvider(pwallet, !sign, !bip32derivs), *psbtx.tx, input, sigdata, i, sighash_type);
|
||||
|
||||
if (it != pwallet->mapWallet.end()) {
|
||||
// Drop the unnecessary UTXO if we added both from the wallet.
|
||||
|
@ -4472,13 +4472,6 @@ bool FillPSBT(const CWallet* pwallet, PartiallySignedTransaction& psbtx, const C
|
|||
input.witness_utxo.SetNull();
|
||||
}
|
||||
}
|
||||
|
||||
// Get public key paths
|
||||
if (bip32derivs) {
|
||||
for (const auto& pubkey_it : sigdata.misc_pubkeys) {
|
||||
AddKeypathToMap(pwallet, pubkey_it.first, input.hd_keypaths);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Fill in the bip32 keypaths and redeemscripts for the outputs so that hardware wallets can identify change
|
||||
|
@ -4496,15 +4489,8 @@ bool FillPSBT(const CWallet* pwallet, PartiallySignedTransaction& psbtx, const C
|
|||
psbt_out.FillSignatureData(sigdata);
|
||||
|
||||
MutableTransactionSignatureCreator creator(psbtx.tx.get_ptr(), 0, out.nValue, 1);
|
||||
ProduceSignature(*pwallet, creator, out.scriptPubKey, sigdata);
|
||||
ProduceSignature(HidingSigningProvider(pwallet, true, !bip32derivs), creator, out.scriptPubKey, sigdata);
|
||||
psbt_out.FromSignatureData(sigdata);
|
||||
|
||||
// Get public key paths
|
||||
if (bip32derivs) {
|
||||
for (const auto& pubkey_it : sigdata.misc_pubkeys) {
|
||||
AddKeypathToMap(pwallet, pubkey_it.first, psbt_out.hd_keypaths);
|
||||
}
|
||||
}
|
||||
}
|
||||
return complete;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue