Support p2sh-segwit stake outputs

Author: ComputerCraftr

src/miner.cpp

@@ -746,11 +746,12 @@ static inline void PoSMiner(std::shared_ptr<CWallet> pwallet, ChainstateManager*
         LogPrintf("Set proof-of-stake timeout: %ums for %u UTXOs\n", pos_timio, vCoins.size());
     }
 
-    const std::string strMintMessage = _("Info: Minting suspended due to locked wallet.").translated;
+    const std::string strMintWalletMessage = _("Info: Minting suspended due to locked wallet.").translated;
     const std::string strMintSyncMessage = _("Info: Minting suspended while synchronizing wallet.").translated;
     const std::string strMintDisabledMessage = _("Info: Minting disabled by 'nostaking' option.").translated;
     const std::string strMintBlockMessage = _("Info: Minting suspended due to block creation failure.").translated;
     const std::string strMintEmpty = "";
+
     if (!gArgs.GetBoolArg("-staking", true)) {
         SetMintWarning(strMintDisabledMessage);
         LogPrintf("proof-of-stake minter disabled\n");
@@ -761,8 +762,8 @@ static inline void PoSMiner(std::shared_ptr<CWallet> pwallet, ChainstateManager*
         bool fNeedToClear = false;
         while (true) {
             while (pwallet->IsLocked()) {
-                if (GetMintWarning() != strMintMessage) {
-                    SetMintWarning(strMintMessage);
+                if (GetMintWarning() != strMintWalletMessage) {
+                    SetMintWarning(strMintWalletMessage);
                     uiInterface.NotifyAlertChanged();
                 }
                 fNeedToClear = true;

src/validation.cpp

@@ -5760,6 +5760,10 @@ bool CheckBlockSignature(const CBlock& block)
                 if (Hash160(pubkey) != uint160(vSolutions[0])) {
                     return error("%s : pubkey used for block signature (%s) does not correspond to first output", __func__, HexStr(pubkey));
                 }
+            } else if (whichType == TxoutType::SCRIPTHASH) {
+                if (Hash160(CScript() << OP_0 << ToByteVector(Hash160(pubkey))) != uint160(vSolutions[0])) { // p2sh-p2wpkh
+                    return error("%s : pubkey used for block signature (%s) is not used in first %s output", __func__, HexStr(pubkey), GetTxnOutputType(whichType));
+                }
             } else
                 return error("%s : unable to verify pubkey belongs to first output of type=%s", __func__, GetTxnOutputType(whichType));
         } else if ((fProofOfStake && block.vtx[1]->vout.size() > 2) || (!fProofOfStake && block.vtx[0]->vout.size() > 1)) { // check for pubkey in OP_RETURN output - this can be any arbitrary pubkey as it will be covered by the coinstake TX signature hash

src/wallet/wallet.cpp

@@ -4693,6 +4693,15 @@ bool CWallet::GetBlockSigningPubKey(const CBlock& block, CPubKey& pubkey, bool&
                 std::unique_ptr<SigningProvider> provider = GetSolvingProvider(txout.scriptPubKey);
                 if (!provider || !provider->GetPubKey(CKeyID(uint160(vSolutions[0])), pubkey)) // extract pubkey from output to put in coinbase
                     return false;
+            } else if (outputType == TxoutType::SCRIPTHASH) {
+                CScript subscript;
+                std::unique_ptr<SigningProvider> provider = GetSolvingProvider(txout.scriptPubKey);
+                if (provider && provider->GetCScript(CScriptID(uint160(vSolutions[0])), subscript)) { // extract pubkey from script to put in coinbase
+                    outputType = Solver(subscript, vSolutions);
+                    if (outputType != TxoutType::WITNESS_V0_KEYHASH || !provider->GetPubKey(CKeyID(uint160(vSolutions[0])), pubkey))
+                        return false;
+                } else
+                    return false;
             } else
                 return false;
         } else