This PR adds “key origin” (master fingeprint + key path) information to what is exposed from SigningProviders, allowing this information to be used by the generic PSBT code instead of having the RPC pull it directly from the wallet.
This is also a preparation to having PSBT interact with output descriptors, which can then directly expose key origin information for the scripts they generate.
623@@ -624,3 +624,8 @@ bool PublicOnlySigningProvider::GetPubKey(const CKeyID &address, CPubKey& pubkey
624 {
625 return m_provider->GetPubKey(address, pubkey);
626 }
627+
628+bool PublicOnlySigningProvider::GetKeyOrigin(const CKeyID &keyid, KeyOriginInfo& info) const
Commit “Make SigningProvider expose key origin information”
nit CKeyID& keyid.
4377@@ -4378,4 +4378,3 @@ void CWallet::LearnAllRelatedScripts(const CPubKey& key)
4378 // OutputType::P2SH_SEGWIT always adds all necessary scripts for all types.
4379 LearnRelatedScripts(key, OutputType::P2SH_SEGWIT);
4380 }
4381-
Commit “Make SigningProvider expose key origin information”
nit, remove.
47@@ -47,6 +48,7 @@ class PublicOnlySigningProvider : public SigningProvider
48 PublicOnlySigningProvider(const SigningProvider* provider) : m_provider(provider) {}
49 bool GetCScript(const CScriptID &scriptid, CScript& script) const;
50 bool GetPubKey(const CKeyID &address, CPubKey& pubkey) const;
51+ bool GetKeyOrigin(const CKeyID &address, KeyOriginInfo& info) const;
Commit “Make SigningProvider expose key origin information”
nit, CKeyID& address.
632 {
633+ if (m_hide_secret) return false;
634+ return m_provider->GetKey(keyid, key);
635+}
636+
637+bool HidingSigningProvider::GetKeyOrigin(const CKeyID &keyid, KeyOriginInfo& info) const
Commit “Generalize PublicOnlySigningProvider into HidingSigningProvider”
nit, CKeyID& keyid.
51- PublicOnlySigningProvider(const SigningProvider* provider) : m_provider(provider) {}
52- bool GetCScript(const CScriptID &scriptid, CScript& script) const;
53- bool GetPubKey(const CKeyID &address, CPubKey& pubkey) const;
54- bool GetKeyOrigin(const CKeyID &address, KeyOriginInfo& info) const;
55+ HidingSigningProvider(const SigningProvider* provider, bool hide_secret, bool hide_origin) : m_hide_secret(hide_secret), m_hide_origin(hide_origin), m_provider(provider) {}
56+ bool GetCScript(const CScriptID &scriptid, CScript& script) const override;
Commit “Generalize PublicOnlySigningProvider into HidingSigningProvider”
nit, CScriptID& scriptid and some more below.
Concept ACK
Thanks for taking another look at this code
4460@@ -4461,21 +4461,14 @@ bool FillPSBT(const CWallet* pwallet, PartiallySignedTransaction& psbtx, const C
4461 }
4462
4463 SignatureData sigdata;
4464- complete &= SignPSBTInput(HidingSigningProvider(pwallet, !sign, false), *psbtx.tx, input, sigdata, i, sighash_type);
4465+ complete &= SignPSBTInput(HidingSigningProvider(pwallet, !sign, !bip32derivs), *psbtx.tx, input, sigdata, i, sighash_type);
619@@ -620,7 +620,12 @@ bool PublicOnlySigningProvider::GetCScript(const CScriptID &scriptid, CScript& s
620 return m_provider->GetCScript(scriptid, script);
621 }
622
623-bool PublicOnlySigningProvider::GetPubKey(const CKeyID &address, CPubKey& pubkey) const
624+bool PublicOnlySigningProvider::GetPubKey(const CKeyID& keyid, CPubKey& pubkey) const
625 {
626 return m_provider->GetPubKey(address, pubkey);
In commit “Make SigningProvider expose key origin information”
You should change address to keyid in this commit instead of “Generalize PublicOnlySigningProvider into HidingSigningProvider”
If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.
[MOVEONLY] Move ParseHDKeypair is move-only
4463- }
4464- return true;
4465-}
4466-
4467-void AddKeypathToMap(const CWallet* pwallet, const CKeyID& keyID, std::map<CPubKey, std::vector<uint32_t>>& hd_keypaths)
4468+void AddKeypathToMap(const CWallet* pwallet, const CKeyID& keyID, std::map<CPubKey, KeyOriginInfo>& hd_keypaths)
