From 84f1f1bfdf900cd28099e428441aa42f9d11a0ed Mon Sep 17 00:00:00 2001 From: Pieter Wuille Date: Thu, 19 Jul 2018 17:25:21 -0700 Subject: [PATCH] Make SigningProvider expose key origin information --- src/script/sign.cpp | 9 +++++++-- src/script/sign.h | 2 ++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/script/sign.cpp b/src/script/sign.cpp index 1982e8a83..47931e21d 100644 --- a/src/script/sign.cpp +++ b/src/script/sign.cpp @@ -645,9 +645,14 @@ bool PublicOnlySigningProvider::GetCScript(const CScriptID &scriptid, CScript& s return m_provider->GetCScript(scriptid, script); } -bool PublicOnlySigningProvider::GetPubKey(const CKeyID &address, CPubKey& pubkey) const +bool PublicOnlySigningProvider::GetPubKey(const CKeyID& keyid, CPubKey& pubkey) const { - return m_provider->GetPubKey(address, pubkey); + return m_provider->GetPubKey(keyid, pubkey); +} + +bool PublicOnlySigningProvider::GetKeyOrigin(const CKeyID& keyid, KeyOriginInfo& info) const +{ + return m_provider->GetKeyOrigin(keyid, info); } bool FlatSigningProvider::GetCScript(const CScriptID& scriptid, CScript& script) const { return LookupHelper(scripts, scriptid, script); } diff --git a/src/script/sign.h b/src/script/sign.h index e0668f8c5..323fe70f3 100644 --- a/src/script/sign.h +++ b/src/script/sign.h @@ -34,6 +34,7 @@ public: virtual bool GetCScript(const CScriptID &scriptid, CScript& script) const { return false; } virtual bool GetPubKey(const CKeyID &address, CPubKey& pubkey) const { return false; } virtual bool GetKey(const CKeyID &address, CKey& key) const { return false; } + virtual bool GetKeyOrigin(const CKeyID& id, KeyOriginInfo& info) const { return false; } }; extern const SigningProvider& DUMMY_SIGNING_PROVIDER; @@ -47,6 +48,7 @@ public: PublicOnlySigningProvider(const SigningProvider* provider) : m_provider(provider) {} bool GetCScript(const CScriptID &scriptid, CScript& script) const; bool GetPubKey(const CKeyID &address, CPubKey& pubkey) const; + bool GetKeyOrigin(const CKeyID& keyid, KeyOriginInfo& info) const; }; struct FlatSigningProvider final : public SigningProvider