add missing txblockhash to ser function

navcoin · Nov 21, 2019 · 2eee7d5 · 2eee7d5
1 parent 29f404d
commit 2eee7d5
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/src/consensus/cfund.h b/src/consensus/cfund.h
@@ -102,8 +102,8 @@ class CPaymentRequest
         std::string thisMapState = "";
         std::string bMapState = "";
 
-        for (auto &it:mapState) thisMapState += it.first.ToString()+","+to_string(it.second);
-        for (auto &it:b.mapState) bMapState += it.first.ToString()+","+to_string(it.second);
+        for (auto &it:mapState) thisMapState += it.first.ToString()+":"+to_string(it.second)+",";
+        for (auto &it:b.mapState) bMapState += it.first.ToString()+":"+to_string(it.second)+",";
 
         return nAmount == b.nAmount
                 && thisMapState == bMapState
@@ -128,8 +128,8 @@ class CPaymentRequest
         {
             std::string thisMapState = "";
             std::string bMapState = "";
-            for (auto &it:mapState) thisMapState += it.first.ToString()+","+to_string(it.second);
-            for (auto &it:b.mapState) bMapState += it.first.ToString()+","+to_string(it.second);
+            for (auto &it:mapState) thisMapState += it.first.ToString()+":"+to_string(it.second)+",";
+            for (auto &it:b.mapState) bMapState += it.first.ToString()+":"+to_string(it.second)+",";
             thisMapState.pop_back();
             bMapState.pop_back();
             ret += strprintf("mapState: %d => %d, ", thisMapState, bMapState);
@@ -224,6 +224,7 @@ class CPaymentRequest
         READWRITE(nVotesNo);
         READWRITE(hash);
         READWRITE(proposalhash);
+        READWRITE(txblockhash);
         READWRITE(strDZeel);
 
         // Version-based read/write
@@ -294,8 +295,8 @@ class CProposal
         std::string thisMapState = "";
         std::string bMapState = "";
 
-        for (auto &it:mapState) thisMapState += it.first.ToString()+","+to_string(it.second);
-        for (auto &it:b.mapState) bMapState += it.first.ToString()+","+to_string(it.second);
+        for (auto &it:mapState) thisMapState += it.first.ToString()+":"+to_string(it.second)+",";
+        for (auto &it:b.mapState) bMapState += it.first.ToString()+":"+to_string(it.second)+",";
 
         return nAmount == b.nAmount
                 && nFee == b.nFee
@@ -322,8 +323,8 @@ class CProposal
         {
             std::string thisMapState = "";
             std::string bMapState = "";
-            for (auto &it:mapState) thisMapState += it.first.ToString()+","+to_string(it.second);
-            for (auto &it:b.mapState) bMapState += it.first.ToString()+","+to_string(it.second);
+            for (auto &it:mapState) thisMapState += it.first.ToString()+":"+to_string(it.second)+",";
+            for (auto &it:b.mapState) bMapState += it.first.ToString()+":"+to_string(it.second)+",";
             thisMapState.pop_back();
             bMapState.pop_back();
             ret += strprintf("mapState: %d => %d, ", thisMapState, bMapState);