Add SignTransaction function to ScriptPubKeyMan and LegacyScriptPubKeyMan

achow101 · achow101 · commit d999dd588cab · 2020-03-08T12:26:32.000-04:00
diff --git a/src/wallet/scriptpubkeyman.cpp b/src/wallet/scriptpubkeyman.cpp
@@ -5,6 +5,7 @@
 #include <key_io.h>
 #include <outputtype.h>
 #include <script/descriptor.h>
+#include <script/sign.h>
 #include <util/bip32.h>
 #include <util/strencodings.h>
 #include <util/translation.h>
@@ -505,6 +506,11 @@ bool LegacyScriptPubKeyMan::CanProvide(const CScript& script, SignatureData& sig
     }
 }
 
+bool LegacyScriptPubKeyMan::SignTransaction(CMutableTransaction& tx, const std::map<COutPoint, Coin>& coins, int sighash, std::map<int, std::string>& input_errors) const
+{
+    return ::SignTransaction(tx, this, coins, sighash, input_errors);
+}
+
 const CKeyMetadata* LegacyScriptPubKeyMan::GetMetadata(const CTxDestination& dest) const
 {
     LOCK(cs_KeyStore);
diff --git a/src/wallet/scriptpubkeyman.h b/src/wallet/scriptpubkeyman.h
@@ -210,6 +210,9 @@ class ScriptPubKeyMan
       */
     virtual bool CanProvide(const CScript& script, SignatureData& sigdata) { return false; }
 
+    /** Creates new signatures and adds them to the transaction. Returns whether all inputs were signed */
+    virtual bool SignTransaction(CMutableTransaction& tx, const std::map<COutPoint, Coin>& coins, int sighash, std::map<int, std::string>& input_errors) const { return false; }
+
     virtual uint256 GetID() const { return uint256(); }
 
     /** Prepends the wallet name in logging output to ease debugging in multi-wallet use cases */
@@ -350,6 +353,8 @@ class LegacyScriptPubKeyMan : public ScriptPubKeyMan, public FillableSigningProv
 
     bool CanProvide(const CScript& script, SignatureData& sigdata) override;
 
+    bool SignTransaction(CMutableTransaction& tx, const std::map<COutPoint, Coin>& coins, int sighash, std::map<int, std::string>& input_errors) const override;
+
     uint256 GetID() const override;
 
     // Map from Key ID to key metadata.

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`#include <key_io.h>`
`6`	`6`	`#include <outputtype.h>`
`7`	`7`	`#include <script/descriptor.h>`
	`8`	`+#include <script/sign.h>`
`8`	`9`	`#include <util/bip32.h>`
`9`	`10`	`#include <util/strencodings.h>`
`10`	`11`	`#include <util/translation.h>`
`@@ -505,6 +506,11 @@ bool LegacyScriptPubKeyMan::CanProvide(const CScript& script, SignatureData& sig`
`505`	`506`	`}`
`506`	`507`	`}`
`507`	`508`
	`509`	`+bool LegacyScriptPubKeyMan::SignTransaction(CMutableTransaction& tx, const std::map<COutPoint, Coin>& coins, int sighash, std::map<int, std::string>& input_errors) const`
	`510`	`+{`
	`511`	`+ return ::SignTransaction(tx, this, coins, sighash, input_errors);`
	`512`	`+}`
	`513`	`+`
`508`	`514`	`const CKeyMetadata* LegacyScriptPubKeyMan::GetMetadata(const CTxDestination& dest) const`
`509`	`515`	`{`
`510`	`516`	`LOCK(cs_KeyStore);`