Merge pull request #140 from MyHush/dpow_regtest

Isolate notarization data for testnet + regtest to different files

qa/rpc-tests/dpow.py

@@ -25,12 +25,13 @@ class DPoWTest(BitcoinTestFramework):
         self.nodes[0].generate(3)
         rpc = self.nodes[0]
 
-        # Verify that basic RPC functions exist and work
-        result = rpc.calc_MoM(2,20)
-        print result
-
 	result = rpc.getinfo()
-	assert result.notarized,42
+	print result
+	# TODO: actually do notarizations on regtest and test for specific data
+	# regtest should have no notarization data, this test makes sure we do not see mainnet values as well!
+	assert_equal(result['notarized'],0)
+	assert_equal(result['notarizedhash'],'0000000000000000000000000000000000000000000000000000000000000000')
+	assert_equal(result['notarizedtxid'],'0000000000000000000000000000000000000000000000000000000000000000')
 
 if __name__ == '__main__':
     DPoWTest().main()

src/komodo_validation011.h

@@ -54,6 +54,7 @@
 }*/
 
 #include <wallet/wallet.h>
+#include <chainparams.h>
 #include <base58.h>
 
 #define SATOSHIDEN ((uint64_t)100000000L)
@@ -1001,17 +1002,19 @@ int32_t komodo_notarizeddata(int32_t nHeight,uint256 *notarized_hashp,uint256 *n
 void komodo_notarized_update(int32_t nHeight,int32_t notarized_height,uint256 notarized_hash,uint256 notarized_desttxid,uint256 MoM,int32_t MoMdepth)
 {
     static int didinit; static uint256 zero; static FILE *fp; CBlockIndex *pindex; struct notarized_checkpoint *np,N; long fpos;
-	LogPrintf("dpow: komodod_notarized_update\n");
     if ( didinit == 0 )
     {
         char fname[512];int32_t latestht = 0;
         //decode_hex(NOTARY_PUBKEY33,33,(char *)NOTARY_PUBKEY.c_str());
         pthread_mutex_init(&komodo_mutex,NULL);
+        std::string suffix = Params().NetworkIDString() == "main" ? "" : "_" + Params().NetworkIDString();
+        std::string sep;
 #ifdef _WIN32
-        sprintf(fname,"%s\\notarizations",GetDefaultDataDir().string().c_str());
+        sep = "\\";
 #else
-        sprintf(fname,"%s/notarizations",GetDefaultDataDir().string().c_str());
+        sep = "/";
 #endif
+        sprintf(fname,"%s%snotarizations%s",GetDefaultDataDir().string().c_str(), sep.c_str(), suffix.c_str());
         LogPrintf("dpow: fname.(%s)\n",fname);
         if ( (fp= fopen(fname,"rb+")) == 0 )
             fp = fopen(fname,"wb+");
@@ -1045,7 +1048,7 @@ void komodo_notarized_update(int32_t nHeight,int32_t notarized_height,uint256 no
     }
     if ( notarized_height == 0 )
 	{
-        LogPrintf("dpow: notarized_height=0, aborting\n");
+        //LogPrintf("dpow: notarized_height=0, aborting\n");
         return;
 	}
     if ( notarized_height >= nHeight )
@@ -1068,7 +1071,7 @@ void komodo_notarized_update(int32_t nHeight,int32_t notarized_height,uint256 no
     NOTARIZED_HEIGHT = np->notarized_height = notarized_height;
     NOTARIZED_HASH = np->notarized_hash = notarized_hash;
     NOTARIZED_DESTTXID = np->notarized_desttxid = notarized_desttxid;
-    LogPrintf("dpow: NOTARIZED (HEIGHT,HASH,DESTTXID) = (%d, %s, %s)\n", NOTARIZED_HEIGHT, NOTARIZED_HASH.GetHex().c_str(), NOTARIZED_DESTTXID.GetHex().c_str());
+    LogPrintf("dpow: komodo_notarized_update NOTARIZED (HEIGHT,HASH,DESTTXID) = (%d, %s, %s)\n", NOTARIZED_HEIGHT, NOTARIZED_HASH.GetHex().c_str(), NOTARIZED_DESTTXID.GetHex().c_str());
     if ( MoM != zero && MoMdepth > 0 )
     {
         NOTARIZED_MOM = np->MoM = MoM;