psbt: Actually use SIGHASH_DEFAULT

achow101 · achow101 · commit 96f78ed1fdd9 · 2021-07-21T15:10:30.000-04:00
Make the behavior align with the help text by actually using
SIGHASH_DEFAULT as the default sighash for signing PSBTs.
diff --git a/src/core_read.cpp b/src/core_read.cpp
@@ -257,7 +257,7 @@ std::vector<unsigned char> ParseHexUV(const UniValue& v, const std::string& strN
 
 int ParseSighashString(const UniValue& sighash)
 {
-    int hash_type = SIGHASH_ALL;
+    int hash_type = SIGHASH_DEFAULT;
     if (!sighash.isNull()) {
         static std::map<std::string, int> map_sighash_values = {
             {std::string("DEFAULT"), int(SIGHASH_DEFAULT)},
diff --git a/src/wallet/scriptpubkeyman.cpp b/src/wallet/scriptpubkeyman.cpp
@@ -624,7 +624,7 @@ TransactionError LegacyScriptPubKeyMan::FillPSBT(PartiallySignedTransaction& psb
         }
 
         // Get the Sighash type
-        if (sign && input.sighash_type > 0 && input.sighash_type != sighash_type) {
+        if (sign && input.sighash_type > 0 && sighash_type > 0 && input.sighash_type != sighash_type) {
             return TransactionError::SIGHASH_MISMATCH;
         }
 
@@ -2092,7 +2092,7 @@ TransactionError DescriptorScriptPubKeyMan::FillPSBT(PartiallySignedTransaction&
         }
 
         // Get the Sighash type
-        if (sign && input.sighash_type > 0 && input.sighash_type != sighash_type) {
+        if (sign && input.sighash_type > 0 && sighash_type > 0 && input.sighash_type != sighash_type) {
             return TransactionError::SIGHASH_MISMATCH;
         }
 
diff --git a/src/wallet/scriptpubkeyman.h b/src/wallet/scriptpubkeyman.h
@@ -234,7 +234,7 @@ class ScriptPubKeyMan
     /** Sign a message with the given script */
     virtual SigningResult SignMessage(const std::string& message, const PKHash& pkhash, std::string& str_sig) const { return SigningResult::SIGNING_FAILED; };
     /** Adds script and derivation path information to a PSBT, and optionally signs it. */
-    virtual TransactionError FillPSBT(PartiallySignedTransaction& psbt, const PrecomputedTransactionData& txdata, int sighash_type = 1 /* SIGHASH_ALL */, bool sign = true, bool bip32derivs = false, int* n_signed = nullptr) const { return TransactionError::INVALID_PSBT; }
+    virtual TransactionError FillPSBT(PartiallySignedTransaction& psbt, const PrecomputedTransactionData& txdata, int sighash_type = 0 /* SIGHASH_DEFAULT */, bool sign = true, bool bip32derivs = false, int* n_signed = nullptr) const { return TransactionError::INVALID_PSBT; }
 
     virtual uint256 GetID() const { return uint256(); }
 
@@ -398,7 +398,7 @@ class LegacyScriptPubKeyMan : public ScriptPubKeyMan, public FillableSigningProv
 
     bool SignTransaction(CMutableTransaction& tx, const std::map<COutPoint, Coin>& coins, int sighash, std::map<int, std::string>& input_errors) const override;
     SigningResult SignMessage(const std::string& message, const PKHash& pkhash, std::string& str_sig) const override;
-    TransactionError FillPSBT(PartiallySignedTransaction& psbt, const PrecomputedTransactionData& txdata, int sighash_type = 1 /* SIGHASH_ALL */, bool sign = true, bool bip32derivs = false, int* n_signed = nullptr) const override;
+    TransactionError FillPSBT(PartiallySignedTransaction& psbt, const PrecomputedTransactionData& txdata, int sighash_type = 0 /* SIGHASH_DEFAULT */, bool sign = true, bool bip32derivs = false, int* n_signed = nullptr) const override;
 
     uint256 GetID() const override;
 
@@ -603,7 +603,7 @@ class DescriptorScriptPubKeyMan : public ScriptPubKeyMan
 
     bool SignTransaction(CMutableTransaction& tx, const std::map<COutPoint, Coin>& coins, int sighash, std::map<int, std::string>& input_errors) const override;
     SigningResult SignMessage(const std::string& message, const PKHash& pkhash, std::string& str_sig) const override;
-    TransactionError FillPSBT(PartiallySignedTransaction& psbt, const PrecomputedTransactionData& txdata, int sighash_type = 1 /* SIGHASH_ALL */, bool sign = true, bool bip32derivs = false, int* n_signed = nullptr) const override;
+    TransactionError FillPSBT(PartiallySignedTransaction& psbt, const PrecomputedTransactionData& txdata, int sighash_type = 0 /* SIGHASH_DEFAULT */, bool sign = true, bool bip32derivs = false, int* n_signed = nullptr) const override;
 
     uint256 GetID() const override;
 
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
@@ -581,7 +581,7 @@ class CWallet final : public WalletStorage, public interfaces::Chain::Notificati
      */
     TransactionError FillPSBT(PartiallySignedTransaction& psbtx,
                   bool& complete,
-                  int sighash_type = 1 /* SIGHASH_ALL */,
+                  int sighash_type = 0 /* SIGHASH_DEFAULT */,
                   bool sign = true,
                   bool bip32derivs = true,
                   size_t* n_signed = nullptr) const;

Original file line number	Diff line number	Diff line change
`@@ -257,7 +257,7 @@ std::vector<unsigned char> ParseHexUV(const UniValue& v, const std::string& strN`
`257`	`257`
`258`	`258`	`int ParseSighashString(const UniValue& sighash)`
`259`	`259`	`{`
`260`		`- int hash_type = SIGHASH_ALL;`
	`260`	`+ int hash_type = SIGHASH_DEFAULT;`
`261`	`261`	`if (!sighash.isNull()) {`
`262`	`262`	`static std::map<std::string, int> map_sighash_values = {`
`263`	`263`	`{std::string("DEFAULT"), int(SIGHASH_DEFAULT)},`
Original file line number	Diff line number	Diff line change
`@@ -624,7 +624,7 @@ TransactionError LegacyScriptPubKeyMan::FillPSBT(PartiallySignedTransaction& psb`
`624`	`624`	`}`
`625`	`625`
`626`	`626`	`// Get the Sighash type`
`627`		`- if (sign && input.sighash_type > 0 && input.sighash_type != sighash_type) {`
	`627`	`+ if (sign && input.sighash_type > 0 && sighash_type > 0 && input.sighash_type != sighash_type) {`
`628`	`628`	`return TransactionError::SIGHASH_MISMATCH;`
`629`	`629`	`}`
`630`	`630`
`@@ -2092,7 +2092,7 @@ TransactionError DescriptorScriptPubKeyMan::FillPSBT(PartiallySignedTransaction&`
`2092`	`2092`	`}`
`2093`	`2093`
`2094`	`2094`	`// Get the Sighash type`
`2095`		`- if (sign && input.sighash_type > 0 && input.sighash_type != sighash_type) {`
	`2095`	`+ if (sign && input.sighash_type > 0 && sighash_type > 0 && input.sighash_type != sighash_type) {`
`2096`	`2096`	`return TransactionError::SIGHASH_MISMATCH;`
`2097`	`2097`	`}`
`2098`	`2098`