Several governance object related fixes:

src/governance-classes.cpp

@@ -158,6 +158,8 @@ std::vector<CGovernanceObject*> CGovernanceTriggerManager::GetActiveTriggers()
 {
     std::vector<CGovernanceObject*> vecResults;
 
+    cout << "GetActiveTriggers: mapTrigger.size() = " << mapTrigger.size() << endl;
+
     // LOOK AT THESE OBJECTS AND COMPILE A VALID LIST OF TRIGGERS
     std::map<uint256, int>::iterator it1 = mapTrigger.begin();
     while(it1 != mapTrigger.end()){
@@ -167,12 +169,15 @@ std::vector<CGovernanceObject*> CGovernanceTriggerManager::GetActiveTriggers()
 
         if(pObj)
         {
+            cout << "GetActiveTriggers: pObj->GetDataAsString() = " << pObj->GetDataAsString() << endl;
             CSuperblock t(pObj);
             vecResults.push_back(&t);
         }
-
+        ++it1;
     }
 
+    cout << "GetActiveTriggers: vecResults.size() = " << vecResults.size() << endl;
+
     return vecResults;
 } 
 
@@ -201,6 +206,8 @@ bool CSuperblockManager::IsSuperblockTriggered(int nBlockHeight)
     std::vector<CGovernanceObject*> vecTriggers = triggerman.GetActiveTriggers();
     //int nYesCount = 0;
 
+    cout << "Number triggers = " << vecTriggers.size() << endl;
+
     printf("1");
 
     BOOST_FOREACH(CGovernanceObject* pObj, vecTriggers)
@@ -426,4 +433,4 @@ std::string CSuperblockManager::GetRequiredPaymentsString(int nBlockHeight)
     }
 
     return ret;
-}
+}

src/governance.cpp

@@ -271,6 +271,8 @@ bool CGovernanceManager::AddGovernanceObject(CGovernanceObject& govobj)
     LOCK(cs);
     std::string strError = "";
 
+    cout << "CGovernanceManager::AddGovernanceObject START" << endl;
+
     // MAKE SURE THIS OBJECT IS OK
 
     if(!govobj.IsValidLocally(pCurrentBlockIndex, strError, true)) {
@@ -292,8 +294,14 @@ bool CGovernanceManager::AddGovernanceObject(CGovernanceObject& govobj)
 
     // SHOULD WE ADD THIS OBJECT TO ANY OTHER MANANGERS?
 
+    cout << "CGovernanceManager::AddGovernanceObject Before trigger block, strData = "
+         << govobj.GetDataAsString()
+         << ", nObjectType = " << govobj.nObjectType
+         << endl;
+
     if(govobj.nObjectType == GOVERNANCE_OBJECT_TRIGGER)
     {
+        cout << "CGovernanceManager::AddGovernanceObject Before AddNewTrigger" << endl;
         triggerman.AddNewTrigger(govobj.GetHash());
     }
 
@@ -688,7 +696,7 @@ uint256 CGovernanceObject::GetHash()
     // fee_tx is left out on purpose
     uint256 h1 = ss.GetHash();
 
-    printf("%i %s %i %s\n", nRevision, strName, nTime, strData);
+    printf("%i %s %li %s\n", nRevision, strName.c_str(), nTime, strData.c_str());
 
     return h1;
 }
@@ -704,16 +712,29 @@ uint256 CGovernanceObject::GetHash()
 void CGovernanceObject::LoadData()
 {
     // todo : 12.1
-    return;
+    //return;
+
+    if(strData.empty())  {
+        return;
+    }
 
     // ATTEMPT TO LOAD JSON STRING FROM STRDATA
     UniValue objResult(UniValue::VOBJ);
     if(!GetData(objResult)) fUnparsable = true;
 
+    cout << "CGovernanceObject::LoadData strData = "
+         << GetDataAsString()
+         << endl;
+
     try
     {
-        // std::string strObjectType = objResult["type"].get_str();
-        // nObjectType = boost::lexical_cast<int>(strObjectType);
+        //std::string strObjectType = objResult["type"].get_str();
+        //nObjectType = boost::lexical_cast<int>(strObjectType);
+
+        std::vector<UniValue> arr1 = objResult.getValues();
+        std::vector<UniValue> arr2 = arr1.at( 0 ).getValues();
+        UniValue obj = arr2.at( 1 );
+        nObjectType = obj["type"].get_int();
     }
     catch (int e)
     {
@@ -789,7 +810,7 @@ std::string CGovernanceObject::GetDataAsString()
     vector<unsigned char> v = ParseHex(strData);
     string s(v.begin(), v.end());
 
-    return strData;
+    return s;
 }
 
 void CGovernanceObject::UpdateLocalValidity(const CBlockIndex *pCurrentBlockIndex)

src/governance.h

@@ -234,6 +234,7 @@ class CGovernanceObject
         READWRITE(nTime);
         READWRITE(nCollateralHash);
         READWRITE(strData);
+        READWRITE(nObjectType);
 
         // AFTER DESERIALIZATION OCCURS, CACHED VARIABLES MUST BE CALCULATED MANUALLY
     }

src/rpcgovernance.cpp

@@ -200,6 +200,9 @@ UniValue gobject(const UniValue& params, bool fHelp)
 
         CGovernanceObject govobj(hashParent, nRevision, strName, nTime, fee_tx, strData);
 
+        cout << "gobject: submit strName = " << strName
+             << ", strData = " << govobj.GetDataAsString() << endl;
+
         std::string strError = "";
         if(!govobj.IsValidLocally(pindex, strError, true)){
             throw JSONRPCError(RPC_INTERNAL_ERROR, "Governance object is not valid - " + govobj.GetHash().ToString() + " - " + strError);