3.5.7.9-leisure

gridcoin · gridcoin · commit 7d2417893aae · 2016-09-27T19:38:27.000-05:00
Gridcoin Research 3.5.7.9/MSI=41.4 Mandatory Upgrade for TESTNET Leisure Upgrade for PROD - At block 196300 in TestNet, we require POR blocks to be signed (with the CPID private key) - After staking a testnet POR block, run the command "showblock blocknumber" and verify the block signature is valid - Test voting in TestNet - Test Binary superblocks: Verify the superblock is staked, the block number, and in showblock, verify the superblock is binary, and verify the constiuent magnitude (and POR payment) is correct. - Testnet Thread (please go here to continue testing): https://cryptocointalk.com/topic/40141-testnet-research-age/page-34 - Fixed log spam in testnet
diff --git a/Makefile.Debug b/Makefile.Debug
@@ -1,6 +1,6 @@
 #############################################################################
 # Makefile for building: gridcoinresearch
-# Generated by qmake (2.01a) (Qt 4.8.4) on: Sun Sep 25 12:57:44 2016
+# Generated by qmake (2.01a) (Qt 4.8.4) on: Tue Sep 27 19:34:35 2016
 # Project:  gridcoinresearch.pro
 # Template: app
 #############################################################################
diff --git a/Makefile.Release b/Makefile.Release
@@ -1,6 +1,6 @@
 #############################################################################
 # Makefile for building: gridcoinresearch
-# Generated by qmake (2.01a) (Qt 4.8.4) on: Sun Sep 25 12:57:44 2016
+# Generated by qmake (2.01a) (Qt 4.8.4) on: Tue Sep 27 19:34:35 2016
 # Project:  gridcoinresearch.pro
 # Template: app
 #############################################################################
diff --git a/contrib/Installer/GridcoinInstaller/GridcoinResearch.vdproj b/contrib/Installer/GridcoinInstaller/GridcoinResearch.vdproj
@@ -232,19 +232,19 @@
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_6408A3D03D15E306A4C3FC5FD95ADA69"
+        "OwnerKey" = "8:_D0966638AB084779AFD69795C33FC8EB"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_32F2DC723F30362B0B78F9A291EC0098"
+        "OwnerKey" = "8:_7A0EA93E644A4D9E8037FBB3C062DD65"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_DEB886DE05C496A5AD26B43C4B1B90B9"
+        "OwnerKey" = "8:_6AEABB5004EC4B57225B51B085DB5625"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
@@ -256,19 +256,19 @@
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_6AEABB5004EC4B57225B51B085DB5625"
+        "OwnerKey" = "8:_DEB886DE05C496A5AD26B43C4B1B90B9"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_7A0EA93E644A4D9E8037FBB3C062DD65"
+        "OwnerKey" = "8:_32F2DC723F30362B0B78F9A291EC0098"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_D0966638AB084779AFD69795C33FC8EB"
+        "OwnerKey" = "8:_6408A3D03D15E306A4C3FC5FD95ADA69"
         "MsmSig" = "8:_UNDEFINED"
         }
     }
@@ -463,6 +463,11 @@
             "AssemblyAsmDisplayName" = "8:GRCSec, Version=1.0.0.3, Culture=neutral, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
+                    "_32F2DC723F30362B0B78F9A291EC0098"
+                    {
+                    "Name" = "8:GRCSec.dll"
+                    "Attributes" = "3:512"
+                    }
                 }
             "SourcePath" = "8:GRCSec.dll"
             "TargetName" = "8:"
@@ -580,6 +585,11 @@
             "AssemblyAsmDisplayName" = "8:OpenPop, Version=2.0.5.0, Culture=neutral, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
+                    "_5644D8F767F33372E534FBD5A2384D12"
+                    {
+                    "Name" = "8:openpopstake.dll"
+                    "Attributes" = "3:512"
+                    }
                 }
             "SourcePath" = "8:openpopstake.dll"
             "TargetName" = "8:"
@@ -606,6 +616,11 @@
             "AssemblyAsmDisplayName" = "8:MySql.Data, Version=6.6.4.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
+                    "_6408A3D03D15E306A4C3FC5FD95ADA69"
+                    {
+                    "Name" = "8:MySql.Data.dll"
+                    "Attributes" = "3:512"
+                    }
                 }
             "SourcePath" = "8:MySql.Data.dll"
             "TargetName" = "8:"
@@ -632,6 +647,11 @@
             "AssemblyAsmDisplayName" = "8:SQLite.NET, Version=0.21.1869.3794, Culture=neutral, PublicKeyToken=c273bd375e695f9c"
                 "ScatterAssemblies"
                 {
+                    "_6AEABB5004EC4B57225B51B085DB5625"
+                    {
+                    "Name" = "8:sqlitestake.net.dll"
+                    "Attributes" = "3:512"
+                    }
                 }
             "SourcePath" = "8:sqlitestake.net.dll"
             "TargetName" = "8:"
@@ -889,6 +909,11 @@
             "AssemblyAsmDisplayName" = "8:ICSharpCode.SharpZipLib, Version=0.86.0.518, Culture=neutral, PublicKeyToken=1b03e6acf1164f73"
                 "ScatterAssemblies"
                 {
+                    "_DEB886DE05C496A5AD26B43C4B1B90B9"
+                    {
+                    "Name" = "8:icsharpcode.sharpziplib.dll"
+                    "Attributes" = "3:512"
+                    }
                 }
             "SourcePath" = "8:icsharpcode.sharpziplib.dll"
             "TargetName" = "8:"
@@ -1095,19 +1120,19 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:Gridcoin Research"
-        "ProductCode" = "8:{5352F47F-B73B-4E0D-8BED-D64E59DBA238}"
-        "PackageCode" = "8:{63E01D50-F3D7-4B0A-83BC-4A2E67469250}"
+        "ProductCode" = "8:{FA40F114-AB22-43BA-ACB1-7676683BAD78}"
+        "PackageCode" = "8:{FEC4042F-2340-4209-98A0-AF797CED52AD}"
         "UpgradeCode" = "8:{9617E9EA-252F-43CE-B53E-B48C85F71192}"
         "AspNetVersion" = "8:4.0.30319.0"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:FALSE"
         "InstallAllUsers" = "11:TRUE"
-        "ProductVersion" = "8:41.3"
+        "ProductVersion" = "8:41.4"
         "Manufacturer" = "8:GridcoinResearch"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:"
-        "Title" = "8:Gridcoin Research 41.3"
+        "Title" = "8:Gridcoin Research 41.4"
         "Subject" = "8:"
         "ARPCONTACT" = "8:The Gridcoin Developers"
         "Keywords" = "8:Gridcoin Research"
diff --git a/src/clientversion.h b/src/clientversion.h
@@ -9,7 +9,7 @@
 #define CLIENT_VERSION_MAJOR       3
 #define CLIENT_VERSION_MINOR       5
 #define CLIENT_VERSION_REVISION    7
-#define CLIENT_VERSION_BUILD       8
+#define CLIENT_VERSION_BUILD       9
 
 // Converts the parameter X to a string after macro replacement on X has been performed.
 // Don't merge these into one macro!
diff --git a/src/main.cpp b/src/main.cpp
@@ -1070,7 +1070,9 @@ MiningCPID GetNextProject(bool bForce)
 									uint256 pbh = 1;
 									GlobalCPUMiningCPID.cpidv2 = ComputeCPIDv2(GlobalCPUMiningCPID.email,GlobalCPUMiningCPID.boincruntimepublickey, pbh);
 									GlobalCPUMiningCPID.lastblockhash = "0";
-
+									// Sign the block
+									GlobalCPUMiningCPID.BoincSignature = SignBlockWithCPID(GlobalCPUMiningCPID.cpid,GlobalCPUMiningCPID.lastblockhash);
+								
 									if (!IsCPIDValidv2(GlobalCPUMiningCPID,1))
 									{
 										printf("CPID INVALID 2 %s, %s  ",GlobalCPUMiningCPID.cpid.c_str(),GlobalCPUMiningCPID.cpidv2.c_str());
@@ -3522,7 +3524,7 @@ bool CBlock::ConnectBlock(CTxDB& txdb, CBlockIndex* pindex, bool fJustCheck, boo
     pindex->nMoneySupply = ReturnCurrentMoneySupply(pindex) + nValueOut - nValueIn;
 
 	// Gridcoin: Store verified magnitude and CPID in block index (7-11-2015)
-	if (pindex->nHeight > nNewIndex)
+	if (pindex->nHeight > nNewIndex2)
 	{
 		pindex->sCPID  = bb.cpid;
 		pindex->nMagnitude = bb.Magnitude;
@@ -3708,7 +3710,7 @@ bool CBlock::ConnectBlock(CTxDB& txdb, CBlockIndex* pindex, bool fJustCheck, boo
 	//  End of Network Consensus
 
 	// Gridcoin: Track payments to CPID, and last block paid
-	if (!bb.cpid.empty() && bb.cpid != "INVESTOR" && pindex->nHeight > nNewIndex)
+	if (!bb.cpid.empty() && bb.cpid != "INVESTOR" && pindex->nHeight > nNewIndex2)
 	{
 		StructCPID stCPID = GetInitializedStructCPID2(bb.cpid,mvResearchAge);
 		stCPID.InterestSubsidy += bb.InterestSubsidy;
@@ -4487,7 +4489,7 @@ bool CBlock::CheckBlock(std::string sCaller, int height1, int64_t Mint, bool fCh
 					if (fDebug10) printf("BV %f, CV %f   ",bv,cvn);
 					//if (bv+10 < cvn) return error("ConnectBlock[]: Old client version after mandatory upgrade - block rejected\r\n");
 					if (bv < 3517 && IsResearchAgeEnabled(height1) && !fTestNet) return error("CheckBlock[]:  Old client spamming new blocks after mandatory upgrade \r\n");
-					if (bv < 3578 && fTestNet) return DoS(25, error("CheckBlock[]:  Old testnet client spamming new blocks after mandatory upgrade \r\n"));
+					if (bv < 3579 && fTestNet) return DoS(25, error("CheckBlock[]:  Old testnet client spamming new blocks after mandatory upgrade \r\n"));
 			}
 
 			if (bb.cpid != "INVESTOR" && height1 > nGrandfather)
@@ -5063,9 +5065,8 @@ void GridcoinServices()
 
 bool AskForOutstandingBlocks(uint256 hashStart)
 {
-	if (!fTestNet && IsLockTimeWithinMinutes(nLastAskedForBlocks,2)) return true;
+	if (IsLockTimeWithinMinutes(nLastAskedForBlocks,2)) return true;
 	nLastAskedForBlocks = GetAdjustedTime();
-	if (fTestNet) mapAlreadyAskedFor.clear();
 		
 	int iAsked = 0;
 	LOCK(cs_vNodes);
@@ -5538,7 +5539,7 @@ bool LoadBlockIndex(bool fAllowNew)
         bnProofOfWorkLimit = bnProofOfWorkLimitTestNet; // 16 bits PoW target limit for testnet
         nStakeMinAge = 1 * 60 * 60; // test net min age is 1 hour
         nCoinbaseMaturity = 10; // test maturity is 10 blocks
-		nGrandfather = 195500;
+		nGrandfather = 196300;
 		nNewIndex = 10;
 		nNewIndex2 = 36500;
 		bRemotePaymentsEnabled = false;
@@ -5951,7 +5952,7 @@ bool IsCPIDValidv2(MiningCPID& mc, int height)
 	if (height < nGrandfather) return true;
 	bool result = false;
 	int cpidV2CutOverHeight = fTestNet ? 0 : 97000;
-	int cpidV3CutOverHeight = fTestNet ? 195500 : 700000;
+	int cpidV3CutOverHeight = fTestNet ? 196300 : 705000;
 	if (height < cpidV2CutOverHeight)
 	{
 		result = IsCPIDValid_Retired(mc.cpid,mc.enccpid);
@@ -7332,7 +7333,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
 
 
 		// Ensure testnet users are running latest version as of 12-3-2015 (works in conjunction with block spamming)
-		if (pfrom->nVersion < 180319 && fTestNet)
+		if (pfrom->nVersion < 180320 && fTestNet)
 		{
 		    // disconnect from peers older than this proto version
             if (fDebug10) printf("Testnet partner %s using obsolete version %i; disconnecting\n", pfrom->addr.ToString().c_str(), pfrom->nVersion);
@@ -10261,7 +10262,7 @@ void TestScan()
 	BOOST_FOREACH(const PAIRTYPE(uint256, CBlockIndex*)& item, mapBlockIndex)
     {
         CBlockIndex* pindex = item.second;
-		if (LessVerbose(1) || pindex->nHeight > nNewIndex)
+		if (LessVerbose(1) || pindex->nHeight > nNewIndex2)
 		{
 			printf("map block index h %f ,  cpid %s   , Mag  %f , RS %f, INT %f \r\n",(double)pindex->nHeight,pindex->sCPID.c_str(), (double)pindex->nMagnitude,
 				pindex->nResearchSubsidy,pindex->nInterestSubsidy);
@@ -10276,7 +10277,7 @@ void TestScan2()
     while (pindex->nHeight > 1)
 	{
         pindex = pindex->pprev;
-		if (LessVerbose(1) || pindex->nHeight > nNewIndex)
+		if (LessVerbose(1) || pindex->nHeight > nNewIndex2)
 		{
 			printf("map block index h %f ,  cpid %s   , Mag  %f , RS %f, INT %f \r\n",(double)pindex->nHeight,pindex->sCPID.c_str(), (double)pindex->nMagnitude,
 				pindex->nResearchSubsidy,pindex->nInterestSubsidy);
@@ -10437,7 +10438,7 @@ CBlockIndex* GetHistoricalMagnitude_ScanChain(std::string cpid)
 	// Limit lookback to 6 months
 	int nMinIndex = pindexBest->nHeight-(6*30*BLOCKS_PER_DAY);
 	if (nMinIndex < 2) nMinIndex=2;
-    while (pindex->nHeight > nNewIndex && pindex->nHeight > nMinIndex)
+    while (pindex->nHeight > nNewIndex2 && pindex->nHeight > nMinIndex)
 	{
   	    //8-5-2015; R HALFORD; Find the last block the CPID staked with a research subsidy (IE dont count interest blocks)
 		if (!pindex || !pindex->pprev) return pindexGenesisBlock;
diff --git a/src/rpcblockchain.cpp b/src/rpcblockchain.cpp
@@ -482,8 +482,8 @@ Object blockToJSON(const CBlock& block, const CBlockIndex* blockindex, bool fPri
 		bool bIsBinary = Contains(bb.superblock,"<BINARY>");
 		result.push_back(Pair("IsBinary",bIsBinary));
 	}
-	result.push_back(Pair("IsSuperBlock", (double)blockindex->nIsSuperBlock));
-	result.push_back(Pair("IsContract", (double)blockindex->nIsContract));
+	result.push_back(Pair("IsSuperBlock", (int)blockindex->nIsSuperBlock));
+	result.push_back(Pair("IsContract", (int)blockindex->nIsContract));
     return result;
 }
 
diff --git a/src/txdb-leveldb.cpp b/src/txdb-leveldb.cpp
@@ -404,15 +404,14 @@ bool CTxDB::LoadBlockIndex()
         pindexNew->nBits          = diskindex.nBits;
         pindexNew->nNonce         = diskindex.nNonce;
 
-		//10-4-2015 - Gridcoin - New Accrual Fields
+		//9-26-2016 - Gridcoin - New Accrual Fields
 
 		if (diskindex.nHeight > nNewIndex)
 		{
 			pindexNew->sCPID             = diskindex.sCPID;
 			pindexNew->nResearchSubsidy  = diskindex.nResearchSubsidy;
 			pindexNew->nInterestSubsidy  = diskindex.nInterestSubsidy;
 			pindexNew->nMagnitude        = diskindex.nMagnitude;
-			
 			pindexNew->nIsContract       = diskindex.nIsContract;
 			pindexNew->nIsSuperBlock     = diskindex.nIsSuperBlock;
 		}
diff --git a/src/version.h b/src/version.h
@@ -25,7 +25,7 @@ extern int MINOR_VERSION;
 ///////////////////////////////////////////////////////////
 // network protocol versioning                           //
 //                                                       //
-static const int PROTOCOL_VERSION =       180319;        //
+static const int PROTOCOL_VERSION =       180320;        //
 // disconnect from peers older than this proto version   //
 static const int MIN_PEER_PROTO_VERSION = 180284;        // 
 ///////////////////////////////////////////////////////////
diff --git a/src/wallet.cpp b/src/wallet.cpp
@@ -19,6 +19,7 @@ using namespace std;
 static unsigned int GetStakeSplitAge() { return IsProtocolV2(nBestHeight) ? (10 * 24 * 60 * 60) : (1 * 24 * 60 * 60); }
 static int64_t GetStakeCombineThreshold() { return IsProtocolV2(nBestHeight) ? (50 * COIN) : (1000 * COIN); }
 bool IsLockTimeWithinMinutes(int64_t locktime, int minutes);
+std::string SignBlockWithCPID(std::string sCPID, std::string sBlockHash);
 std::vector<std::string> split(std::string s, std::string delim);
 StructCPID GetLifetimeCPID(std::string cpid,std::string sFrom);
 double cdbl(std::string s, int place);
@@ -1944,8 +1945,12 @@ bool CWallet::CreateCoinStake(const CKeyStore& keystore, unsigned int nBits, int
 			 miningcpid.lastblockhash = pindexPrev->GetBlockHash().GetHex();
 			 miningcpid.RSAWeight = GetRSAWeightByCPID(miningcpid.cpid);
 			 hashBoinc = SerializeBoincBlock(miningcpid);
+			 // Sign
+			 miningcpid.BoincSignature = SignBlockWithCPID(miningcpid.cpid,miningcpid.lastblockhash);
+
 			 if (!IsCPIDValidv2(miningcpid,pindexPrev->nHeight))
 			 {
+				
 				 printf("Unable to create boinc block->CPID INVALID cpid %s %s %s",miningcpid.cpid.c_str(),miningcpid.boincruntimepublickey.c_str(),miningcpid.email.c_str());
 				
 				 MilliSleep(300);

Original file line number	Diff line number	Diff line change
`@@ -232,19 +232,19 @@`
`232`	`232`	`"Entry"`
`233`	`233`	`{`
`234`	`234`	`"MsmKey" = "8:_UNDEFINED"`
`235`		`- "OwnerKey" = "8:_6408A3D03D15E306A4C3FC5FD95ADA69"`
	`235`	`+ "OwnerKey" = "8:_D0966638AB084779AFD69795C33FC8EB"`
`236`	`236`	`"MsmSig" = "8:_UNDEFINED"`
`237`	`237`	`}`
`238`	`238`	`"Entry"`
`239`	`239`	`{`
`240`	`240`	`"MsmKey" = "8:_UNDEFINED"`
`241`		`- "OwnerKey" = "8:_32F2DC723F30362B0B78F9A291EC0098"`
	`241`	`+ "OwnerKey" = "8:_7A0EA93E644A4D9E8037FBB3C062DD65"`
`242`	`242`	`"MsmSig" = "8:_UNDEFINED"`
`243`	`243`	`}`
`244`	`244`	`"Entry"`
`245`	`245`	`{`
`246`	`246`	`"MsmKey" = "8:_UNDEFINED"`
`247`		`- "OwnerKey" = "8:_DEB886DE05C496A5AD26B43C4B1B90B9"`
	`247`	`+ "OwnerKey" = "8:_6AEABB5004EC4B57225B51B085DB5625"`
`248`	`248`	`"MsmSig" = "8:_UNDEFINED"`
`249`	`249`	`}`
`250`	`250`	`"Entry"`
`@@ -256,19 +256,19 @@`
`256`	`256`	`"Entry"`
`257`	`257`	`{`
`258`	`258`	`"MsmKey" = "8:_UNDEFINED"`
`259`		`- "OwnerKey" = "8:_6AEABB5004EC4B57225B51B085DB5625"`
	`259`	`+ "OwnerKey" = "8:_DEB886DE05C496A5AD26B43C4B1B90B9"`
`260`	`260`	`"MsmSig" = "8:_UNDEFINED"`
`261`	`261`	`}`
`262`	`262`	`"Entry"`
`263`	`263`	`{`
`264`	`264`	`"MsmKey" = "8:_UNDEFINED"`
`265`		`- "OwnerKey" = "8:_7A0EA93E644A4D9E8037FBB3C062DD65"`
	`265`	`+ "OwnerKey" = "8:_32F2DC723F30362B0B78F9A291EC0098"`
`266`	`266`	`"MsmSig" = "8:_UNDEFINED"`
`267`	`267`	`}`
`268`	`268`	`"Entry"`
`269`	`269`	`{`
`270`	`270`	`"MsmKey" = "8:_UNDEFINED"`
`271`		`- "OwnerKey" = "8:_D0966638AB084779AFD69795C33FC8EB"`
	`271`	`+ "OwnerKey" = "8:_6408A3D03D15E306A4C3FC5FD95ADA69"`
`272`	`272`	`"MsmSig" = "8:_UNDEFINED"`
`273`	`273`	`}`
`274`	`274`	`}`
`@@ -463,6 +463,11 @@`
`463`	`463`	`"AssemblyAsmDisplayName" = "8:GRCSec, Version=1.0.0.3, Culture=neutral, processorArchitecture=MSIL"`
`464`	`464`	`"ScatterAssemblies"`
`465`	`465`	`{`
	`466`	`+ "_32F2DC723F30362B0B78F9A291EC0098"`
	`467`	`+ {`
	`468`	`+ "Name" = "8:GRCSec.dll"`
	`469`	`+ "Attributes" = "3:512"`
	`470`	`+ }`
`466`	`471`	`}`
`467`	`472`	`"SourcePath" = "8:GRCSec.dll"`
`468`	`473`	`"TargetName" = "8:"`
`@@ -580,6 +585,11 @@`
`580`	`585`	`"AssemblyAsmDisplayName" = "8:OpenPop, Version=2.0.5.0, Culture=neutral, processorArchitecture=MSIL"`
`581`	`586`	`"ScatterAssemblies"`
`582`	`587`	`{`
	`588`	`+ "_5644D8F767F33372E534FBD5A2384D12"`
	`589`	`+ {`
	`590`	`+ "Name" = "8:openpopstake.dll"`
	`591`	`+ "Attributes" = "3:512"`
	`592`	`+ }`
`583`	`593`	`}`
`584`	`594`	`"SourcePath" = "8:openpopstake.dll"`
`585`	`595`	`"TargetName" = "8:"`
`@@ -606,6 +616,11 @@`
`606`	`616`	`"AssemblyAsmDisplayName" = "8:MySql.Data, Version=6.6.4.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL"`
`607`	`617`	`"ScatterAssemblies"`
`608`	`618`	`{`
	`619`	`+ "_6408A3D03D15E306A4C3FC5FD95ADA69"`
	`620`	`+ {`
	`621`	`+ "Name" = "8:MySql.Data.dll"`
	`622`	`+ "Attributes" = "3:512"`
	`623`	`+ }`
`609`	`624`	`}`
`610`	`625`	`"SourcePath" = "8:MySql.Data.dll"`
`611`	`626`	`"TargetName" = "8:"`
`@@ -632,6 +647,11 @@`
`632`	`647`	`"AssemblyAsmDisplayName" = "8:SQLite.NET, Version=0.21.1869.3794, Culture=neutral, PublicKeyToken=c273bd375e695f9c"`
`633`	`648`	`"ScatterAssemblies"`
`634`	`649`	`{`
	`650`	`+ "_6AEABB5004EC4B57225B51B085DB5625"`
	`651`	`+ {`
	`652`	`+ "Name" = "8:sqlitestake.net.dll"`
	`653`	`+ "Attributes" = "3:512"`
	`654`	`+ }`
`635`	`655`	`}`
`636`	`656`	`"SourcePath" = "8:sqlitestake.net.dll"`
`637`	`657`	`"TargetName" = "8:"`
`@@ -889,6 +909,11 @@`
`889`	`909`	`"AssemblyAsmDisplayName" = "8:ICSharpCode.SharpZipLib, Version=0.86.0.518, Culture=neutral, PublicKeyToken=1b03e6acf1164f73"`
`890`	`910`	`"ScatterAssemblies"`
`891`	`911`	`{`
	`912`	`+ "_DEB886DE05C496A5AD26B43C4B1B90B9"`
	`913`	`+ {`
	`914`	`+ "Name" = "8:icsharpcode.sharpziplib.dll"`
	`915`	`+ "Attributes" = "3:512"`
	`916`	`+ }`
`892`	`917`	`}`
`893`	`918`	`"SourcePath" = "8:icsharpcode.sharpziplib.dll"`
`894`	`919`	`"TargetName" = "8:"`
`@@ -1095,19 +1120,19 @@`
`1095`	`1120`	`{`
`1096`	`1121`	`"Name" = "8:Microsoft Visual Studio"`
`1097`	`1122`	`"ProductName" = "8:Gridcoin Research"`
`1098`		`- "ProductCode" = "8:{5352F47F-B73B-4E0D-8BED-D64E59DBA238}"`
`1099`		`- "PackageCode" = "8:{63E01D50-F3D7-4B0A-83BC-4A2E67469250}"`
	`1123`	`+ "ProductCode" = "8:{FA40F114-AB22-43BA-ACB1-7676683BAD78}"`
	`1124`	`+ "PackageCode" = "8:{FEC4042F-2340-4209-98A0-AF797CED52AD}"`
`1100`	`1125`	`"UpgradeCode" = "8:{9617E9EA-252F-43CE-B53E-B48C85F71192}"`
`1101`	`1126`	`"AspNetVersion" = "8:4.0.30319.0"`
`1102`	`1127`	`"RestartWWWService" = "11:FALSE"`
`1103`	`1128`	`"RemovePreviousVersions" = "11:TRUE"`
`1104`	`1129`	`"DetectNewerInstalledVersion" = "11:FALSE"`
`1105`	`1130`	`"InstallAllUsers" = "11:TRUE"`
`1106`		`- "ProductVersion" = "8:41.3"`
	`1131`	`+ "ProductVersion" = "8:41.4"`
`1107`	`1132`	`"Manufacturer" = "8:GridcoinResearch"`
`1108`	`1133`	`"ARPHELPTELEPHONE" = "8:"`
`1109`	`1134`	`"ARPHELPLINK" = "8:"`
`1110`		`- "Title" = "8:Gridcoin Research 41.3"`
	`1135`	`+ "Title" = "8:Gridcoin Research 41.4"`
`1111`	`1136`	`"Subject" = "8:"`
`1112`	`1137`	`"ARPCONTACT" = "8:The Gridcoin Developers"`
`1113`	`1138`	`"Keywords" = "8:Gridcoin Research"`
Original file line number	Diff line number	Diff line change
`@@ -482,8 +482,8 @@ Object blockToJSON(const CBlock& block, const CBlockIndex* blockindex, bool fPri`
`482`	`482`	`bool bIsBinary = Contains(bb.superblock,"<BINARY>");`
`483`	`483`	`result.push_back(Pair("IsBinary",bIsBinary));`
`484`	`484`	`}`
`485`		`- result.push_back(Pair("IsSuperBlock", (double)blockindex->nIsSuperBlock));`
`486`		`- result.push_back(Pair("IsContract", (double)blockindex->nIsContract));`
	`485`	`+ result.push_back(Pair("IsSuperBlock", (int)blockindex->nIsSuperBlock));`
	`486`	`+ result.push_back(Pair("IsContract", (int)blockindex->nIsContract));`
`487`	`487`	`return result;`
`488`	`488`	`}`
`489`	`489`