Merge pull request miketout#319 from Asherda/dev

Dev
Mr-Bossman · Feb 14, 2021 · d3cffbe · d3cffbe
2 parents 87fb544 + ced45b3
commit d3cffbe
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/primitives/block.cpp b/src/primitives/block.cpp
@@ -176,7 +176,7 @@ int32_t CBlockHeader::GetPBaaSHeader(CPBaaSBlockHeader &pbh, const uint160 &cID)
         CPBaaSSolutionDescriptor d = CVerusSolutionVector::solutionTools.GetDescriptor(nSolution);
         if (CVerusSolutionVector::solutionTools.HasPBaaSHeader(nSolution) != 0)
         {
-            int32_t len = CVerusSolutionVector::solutionTools.ExtraDataLen(nSolution);
+            int32_t len = CVerusSolutionVector::solutionTools.ExtraDataLen(nSolution, true);
             int32_t numHeaders = d.numPBaaSHeaders;
             if (numHeaders * sizeof(CPBaaSBlockHeader) > len)
             {

diff --git a/src/primitives/solutiondata.h b/src/primitives/solutiondata.h
@@ -368,11 +368,11 @@ class CConstVerusSolutionVector
             return GetDescriptor(vch).numPBaaSHeaders * sizeof(CPBaaSBlockHeader) + OVERHEAD_SIZE;
         }
 
-        static uint32_t ExtraDataLen(const std::vector<unsigned char> &vch)
+        static uint32_t ExtraDataLen(const std::vector<unsigned char> &vch, bool allowPBaaSHeader=false)
         {
             int len;
 
-            if (Version(vch) < CActivationHeight::ACTIVATE_PBAAS)
+            if (!(Version(vch) >= CActivationHeight::ACTIVATE_PBAAS || (allowPBaaSHeader && Version(vch) >= CActivationHeight::ACTIVATE_PBAAS_HEADER)))
             {
                 len = 0;
             }