Merge pull request #96 from BlockMechanic/segwit

Segwit
Crowndev · Aug 19, 2022 · 862d956 · 862d956
2 parents 2a53153 + 6440b78
commit 862d956
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/src/systemnode/systemnode.cpp b/src/systemnode/systemnode.cpp
@@ -270,7 +270,6 @@ int64_t CSystemnode::GetLastPaid() const
 bool CSystemnode::GetRecentPaymentBlocks(std::vector<const CBlockIndex*>& vPaymentBlocks, bool limitMostRecent) const
 {
     vPaymentBlocks.clear();
-
     int nMinimumValidBlockHeight = ::ChainActive().Height() - Params().ValidStakePointerDuration();
     if (nMinimumValidBlockHeight < 1)
         nMinimumValidBlockHeight = 1;
@@ -285,14 +284,17 @@ bool CSystemnode::GetRecentPaymentBlocks(std::vector<const CBlockIndex*>& vPayme
         CBlock block;
         if (!ReadBlockFromDisk(block, pindex, Params().GetConsensus()))
             continue;
-        CTxOutAsset out = (block.vtx[0]->nVersion >= TX_ELE_VERSION ? block.vtx[0]->vpout[2] : block.vtx[0]->vout[2]);
+
         int m = (block.vtx[0]->nVersion >= TX_ELE_VERSION ? block.vtx[0]->vpout.size() : block.vtx[0]->vout.size());
-
-        if (m > 2 && out.scriptPubKey == snpayee) {
-            vPaymentBlocks.emplace_back(pindex);
-            fBlockFound = true;
-            if (limitMostRecent)
-                return fBlockFound;
+
+        if (m > 2) {
+            CTxOutAsset out = (block.vtx[0]->nVersion >= TX_ELE_VERSION ? block.vtx[0]->vpout[2] : block.vtx[0]->vout[2]);
+            if (out.scriptPubKey == snpayee){
+                vPaymentBlocks.emplace_back(pindex);
+                fBlockFound = true;
+                if (limitMostRecent)
+                    return fBlockFound;
+            }
         }
         pindex = ::ChainActive().Next(pindex);
     }

diff --git a/src/validation.cpp b/src/validation.cpp
@@ -1956,8 +1956,8 @@ DisconnectResult CChainState::DisconnectBlock(const CBlock& block, const CBlockI
         // restore inputs
         if (i > 0 && !tx.IsCoinStake()) { // not coinbases
             int nOffSet = 1;
-            if (pindex->nHeight >= Params().PoSStartHeight())
-                nOffSet = 2;
+            //if (pindex->nHeight >= Params().PoSStartHeight())
+            //    nOffSet = 2;
             CTxUndo &txundo = blockUndo.vtxundo[i-nOffSet];
             if (txundo.vprevout.size() != tx.vin.size()) {
                 error("DisconnectBlock(): transaction and undo data inconsistent %d vs %d i=%d, nOffSet=%d", txundo.vprevout.size(), tx.vin.size(), i, nOffSet);