Add P2C tweaks and script paths to the signing provider

Author: elichai

src/script/signingprovider.cpp

@@ -44,6 +44,18 @@ bool HidingSigningProvider::GetKeyOrigin(const CKeyID& keyid, KeyOriginInfo& inf
     return m_provider->GetKeyOrigin(keyid, info);
 }
 
+bool HidingSigningProvider::GetScriptPaths(const CKeyID &addressid, std::vector<ScriptPath>& paths) const
+{
+    if (m_hide_origin) return false;
+    return m_provider->GetScriptPaths(addressid, paths);
+}
+
+bool HidingSigningProvider::GetP2CTweaks(const CKeyID &addressid, CPubKey& base, uint256& tweak) const
+{
+    if (m_hide_origin) return false;
+    return m_provider->GetP2CTweaks(addressid, base, tweak);
+}
+
 bool FlatSigningProvider::GetCScript(const CScriptID& scriptid, CScript& script) const { return LookupHelper(scripts, scriptid, script); }
 bool FlatSigningProvider::GetPubKey(const CKeyID& keyid, CPubKey& pubkey) const { return LookupHelper(pubkeys, keyid, pubkey); }
 bool FlatSigningProvider::GetKeyOrigin(const CKeyID& keyid, KeyOriginInfo& info) const
@@ -55,6 +67,21 @@ bool FlatSigningProvider::GetKeyOrigin(const CKeyID& keyid, KeyOriginInfo& info)
 }
 bool FlatSigningProvider::GetKey(const CKeyID& keyid, CKey& key) const { return LookupHelper(keys, keyid, key); }
 
+
+bool FlatSigningProvider::GetScriptPaths(const CKeyID &addressid, std::vector<ScriptPath>& paths) const { return LookupHelper(taproot_paths, addressid, paths); }
+
+bool FlatSigningProvider::GetP2CTweaks(const CKeyID &addressid, CPubKey& base, uint256& tweak) const
+{
+    std::pair<CPubKey, uint256> out;
+    bool ret = LookupHelper(p2c_tweaks, addressid, out);
+    if(ret) {
+        base = out.first;
+        tweak = out.second;
+    }
+    return ret;
+}
+
+
 FlatSigningProvider Merge(const FlatSigningProvider& a, const FlatSigningProvider& b)
 {
     FlatSigningProvider ret;

src/script/signingprovider.h

@@ -14,6 +14,18 @@
 
 struct KeyOriginInfo;
 
+struct ScriptPath
+{
+    uint8_t version = 0xc0;
+    CScript leaf;
+    std::vector<uint256> path;
+
+    void clear() {
+        leaf.clear();
+        path.clear();
+    }
+};
+
 /** An interface to be implemented by keystores that support signing. */
 class SigningProvider
 {
@@ -25,6 +37,14 @@ class SigningProvider
     virtual bool GetKey(const CKeyID &address, CKey& key) const { return false; }
     virtual bool HaveKey(const CKeyID &address) const { return false; }
     virtual bool GetKeyOrigin(const CKeyID& keyid, KeyOriginInfo& info) const { return false; }
+    virtual bool GetScriptPaths(const CKeyID &addressid, std::vector<ScriptPath>& paths) const { return false; }
+    virtual bool GetP2CTweaks(const CKeyID &addressid, CPubKey& base, uint256& tweak) const { return false; }
+
+    SigningProvider() = default;
+protected:
+    // This prevents accidental object slicing.
+    SigningProvider(const SigningProvider&) = default;
+    SigningProvider& operator=(const SigningProvider&) = default;
 };
 
 extern const SigningProvider& DUMMY_SIGNING_PROVIDER;
@@ -42,6 +62,8 @@ class HidingSigningProvider : public SigningProvider
     bool GetPubKey(const CKeyID& keyid, CPubKey& pubkey) const override;
     bool GetKey(const CKeyID& keyid, CKey& key) const override;
     bool GetKeyOrigin(const CKeyID& keyid, KeyOriginInfo& info) const override;
+    bool GetScriptPaths(const CKeyID &addressid, std::vector<ScriptPath>& paths) const override;
+    bool GetP2CTweaks(const CKeyID &addressid, CPubKey& base, uint256& tweak) const override;
 };
 
 struct FlatSigningProvider final : public SigningProvider
@@ -50,11 +72,16 @@ struct FlatSigningProvider final : public SigningProvider
     std::map<CKeyID, CPubKey> pubkeys;
     std::map<CKeyID, std::pair<CPubKey, KeyOriginInfo>> origins;
     std::map<CKeyID, CKey> keys;
+    std::map<CKeyID, std::vector<ScriptPath>> taproot_paths;
+    std::map<CKeyID, std::pair<CPubKey, uint256>> p2c_tweaks;
 
     bool GetCScript(const CScriptID& scriptid, CScript& script) const override;
     bool GetPubKey(const CKeyID& keyid, CPubKey& pubkey) const override;
     bool GetKeyOrigin(const CKeyID& keyid, KeyOriginInfo& info) const override;
     bool GetKey(const CKeyID& keyid, CKey& key) const override;
+    bool GetScriptPaths(const CKeyID &addressid, std::vector<ScriptPath>& paths) const override;
+    bool GetP2CTweaks(const CKeyID &addressid, CPubKey& base, uint256& tweak) const override;
+
 };
 
 FlatSigningProvider Merge(const FlatSigningProvider& a, const FlatSigningProvider& b);