Skip to content

Commit

Permalink
Merge pull request #979 from tomasbrod/sigcheckstupid
Browse files Browse the repository at this point in the history 
 Improve the dpor signature verification. (2nd)
  • Loading branch information
@denravonska
denravonska committed Feb 28, 2018
2 parents 6fe7bb7 + 40643d4 commit 3754746
Show file tree
Hide file tree
Showing 2 changed files with 68 additions and 74 deletions.
140 changes: 67 additions & 73 deletions src/main.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2211,7 +2211,7 @@ int GetNumBlocksOfPeers()
bool IsInitialBlockDownload()
{
LOCK(cs_main);
if (pindexBest == NULL || nBestHeight < GetNumBlocksOfPeers())
if ((pindexBest == NULL || nBestHeight < GetNumBlocksOfPeers()) && nBestHeight<1185000)
return true;
static int64_t nLastUpdate;
static CBlockIndex* pindexLastBest;
Expand Down Expand Up @@ -2595,9 +2595,15 @@ bool CBlock::DisconnectBlock(CTxDB& txdb, CBlockIndex* pindex)
if(!sMType.empty())
{
std::string sMKey = ExtractXML(vtx[i].hashBoinc, "<MK>", "</MK>");
DeleteCache(sMKey, sMType);
DeleteCache(sMType, sMKey);
if(fDebug)
printf("DisconnectBlock: Delete contract %s %s\n", sMType.c_str(), sMKey.c_str());

if("beacon"==sMType)
{
sMKey=sMKey+"A";
DeleteCache("beaconalt", sMKey+"."+ToString(vtx[i].nTime));
}
}
}

Expand Down Expand Up @@ -3152,43 +3158,14 @@ bool CBlock::ConnectBlock(CTxDB& txdb, CBlockIndex* pindex, bool fJustCheck, boo
{
/* ignore on bad blocks already in chain */
const std::set<uint256> vSkipHashBoincSignCheck =
{ uint256("0001efda66323dcbc8c3fdf80dab2421660b4eb5c6531f350bb5e64ec35310f1")
,uint256("0c2e56ce569ea3d3458cb0b0bc1cbabc508d046506f1d6e1bf030cc72fc53459")
,uint256("1362e347495f02df6871bf50ca865fd63c9c3e4dc100008c63f466538e2fab54")
,uint256("13e8dee125c5d40d49df77428ad255deee69c44f96bae68b971ab20b0791db95")
,uint256("1d30c6d4dce377d69c037f1a725aabbc6bafa72a95456dbe2b2538bc1da115bd")
,uint256("2ab1625f6b2a97eae7c592baef9e0495a9ce1585c6fc3df2340330b8eb5c35c8")
,uint256("2cbf2624b682970c8908b0bb0ddc4baac1e0f5c76cbd1acd5f0447d521447173")
,uint256("31e67a4740e7acd937ae8f961a8c97dbe89bb47fa1330f0355421d2cbdf42503")
,uint256("36aba1c714cb152c4227db3701c892aed7198b1ad56152fa82fe34add701a47c")
,uint256("41cd6208f0cd9b916fe8913766fe17cef0c7c57951ff9257bff13994a7d00ede")
,uint256("471292b59e5f3ad94c39b3784a9a3f7a8324b9b56ff0ad00bd48c31658537c30")
,uint256("54f02e84fb18b56c4187eb5b390b8f34877dcd06fe833a3b3a2fb3e396a4a3d8")
,uint256("58282559939ced7ebed7d390559c7ac821932958f8f2399ad40d1188eb0a57f9")
,uint256("58b2d6d0ff7e3ebcaca1058be7574a87efadd4b7f5c661f9e14255f851a6185e")
,uint256("5b63d4edbdec06ddc2182703ce45a3ced70db0d813e329070e83bf37347a6c2c")
,uint256("5f5e7f5cf56693aab10957f3dae7cc7e77f66a711169f7e77ac60fb78423801b")
,uint256("6085d4d0cd800d79794c1b9a09db4a8cc3d6b1ed49b43ebe8df2ea6ff4e9a0e1")
,uint256("6135a88409e2122e9817faef7f54dd1af13893324ebdb7ec5910aa337ab83b41")
,uint256("69da74d1af75cdaba599ecb75c222e71a6d49af9d5fa90b494c9f451bc0f5b1d")
,uint256("6c081be0c814b3e585f87c767db9beb447a3e1352011476bdf0cc978996d9f05")
,uint256("7e2b19def67236ef2da1435751d86b9f2d92c6deea42b4ddf97851736eb4400c")
,uint256("812295584ed802c3bf3ec0358f508df99c24213e3f3a943facf95a7cf112d833")
,uint256("873f421b779b06ce9f0ef75793af2cee4c2bf19aea2fb1554ed407692cbbf44e")
,uint256("8749688550e1ac05fd01f9b5be1529808efc171b4df3221640bbbec0a483499e")
,uint256("883398dc059c0c9d950dff6b6d72eea3dc61aeedec23f336581f284ba0dbfb44")
,uint256("91f4825aef14d2831927f3f996ed84a031e4ee7643b28c60abc9991a9ff5c793")
,uint256("934c6291209d90bb5d3987885b413c18e39f0e28430e8d302f20888d2a35e725")
,uint256("9387774230f23a898b11c016533f7c5da6d095edec0e9347a147be8c3cada3ac")
,uint256("95f15ad917588323446ea3d71dd8fbe0dc19522ed542607f0c6b62a20f5a544c")
,uint256("9f3185895eb91a0d00394fe3f538b13248da97e2550fd69b6355cd8fa5c704fe")
,uint256("b911f04701d118e93961c372c4672a85a942c1c19ab0df8a7b8374b91b7a1616")
,uint256("da97666feb62c9391ef1bdb44c27aae5bee8ff01194fbe698685ab93e4535c08")
,uint256("dbd1de3f858fa5bd6c0e154ea0ca4807e0794c4d5d10946354ba5dff38190ad8")
,uint256("dd4071743eb5d8fa0b997039968d0d6a66cd87c370a1aa1b33aa32c02fc276a1")
,uint256("e9035d821668a0563b632e9c84bc5af73f53eafcca1e053ac6da53907c7f6940")
,uint256("eab8c19853065b52cfbd939299217d694272b93e34118996a151efeef5f4aac1")
,uint256("f6fb998e0df3ccb4d7bb82fc84eefde186c28570ca6048d7759012d64234f305")
{ uint256("58b2d6d0ff7e3ebcaca1058be7574a87efadd4b7f5c661f9e14255f851a6185e") //P1144550 S
,uint256("471292b59e5f3ad94c39b3784a9a3f7a8324b9b56ff0ad00bd48c31658537c30") //P1146939 S
,uint256("5b63d4edbdec06ddc2182703ce45a3ced70db0d813e329070e83bf37347a6c2c") //P1152917 S
,uint256("e9035d821668a0563b632e9c84bc5af73f53eafcca1e053ac6da53907c7f6940") //P1154121 S
,uint256("1d30c6d4dce377d69c037f1a725aabbc6bafa72a95456dbe2b2538bc1da115bd") //P1168122 S
,uint256("934c6291209d90bb5d3987885b413c18e39f0e28430e8d302f20888d2a35e725") //P1168193 S
,uint256("58282559939ced7ebed7d390559c7ac821932958f8f2399ad40d1188eb0a57f9") //P1170167 S
,uint256("946996f693a33fa1334c1f068574238a463d438b1a3d2cd6d1dd51404a99c73d") //P1176436 S
};
if( vSkipHashBoincSignCheck.count(pindex->GetBlockHash())==0 )
return DoS(20, error(
Expand Down Expand Up @@ -5219,6 +5196,25 @@ bool IsCPIDValidv3(std::string cpidv2, bool allow_investor)
return result;
}

std::set<std::string> GetAlternativeBeaconKeys(const std::string& cpid)
{
int64_t iMaxSeconds = 60 * 24 * 30 * 6 * 60;
std::set<std::string> result;

for(const auto& item : AppCacheFilter("beaconalt;"+cpid))
{
const std::string& pubkey = item.second;
const int64_t iAge = pindexBest != NULL
? pindexBest->nTime - mvApplicationCacheTimestamp[item.first]
: 0;
if (iAge > iMaxSeconds)
continue;

result.emplace(pubkey);
}
return result;
}

bool IsCPIDValidv2(MiningCPID& mc, int height)
{
//09-25-2016: Transition to CPID Keypairs.
Expand All @@ -5239,12 +5235,29 @@ bool IsCPIDValidv2(MiningCPID& mc, int height)
{
if (mc.cpid.empty()) return error("IsCPIDValidv2(): cpid empty");
if (!IsResearcher(mc.cpid)) return true; /* is investor? */
// V3 requires a beacon, a beacon public key and a valid block signature signed by the CPID's private key
result = VerifyCPIDSignature(mc.cpid,mc.lastblockhash,mc.BoincSignature);

bool scval = CheckMessageSignature("R","cpid", mc.cpid + mc.lastblockhash, mc.BoincSignature, mc.BoincPublicKey);
if(scval!=result)
printf("WARNING: IsCPIDValidv2(): inconsistent result\n");
const std::string sBPK_n = GetBeaconPublicKey(mc.cpid, false);
bool kmval = sBPK_n == mc.BoincPublicKey;
const bool scval_n = CheckMessageSignature("R","cpid", mc.cpid + mc.lastblockhash, mc.BoincSignature, sBPK_n);

result= scval_n;
if(!scval_n)
{
for(const std::string& key_alt : GetAlternativeBeaconKeys(mc.cpid))
{
const bool scval_alt = CheckMessageSignature("R","cpid", mc.cpid + mc.lastblockhash, mc.BoincSignature, key_alt);
kmval = key_alt == mc.BoincPublicKey;
if(scval_alt)
{
printf("WARNING: IsCPIDValidv2: good signature with alternative key\n");
result= true;
}
}
}

if( !kmval )
printf("WARNING: IsCPIDValidv2: block key mismatch\n");

}

return result;
Expand Down Expand Up @@ -8421,35 +8434,6 @@ bool MemorizeMessage(const CTransaction &tx, double dAmount, std::string sRecipi
sMessageValue="";
}

if (sMessageType=="beacon" && sMessageAction=="A")
{
// If the Beacon Public Key is Not Empty - do not overwrite with a new beacon value unless the public key is the same
std::string sBPK = GetBeaconPublicKey(sMessageKey,false);
if (!sBPK.empty())
{
std::string out_cpid = "";
std::string out_address = "";
std::string out_publickey = "";
GetBeaconElements(sMessageValue, out_cpid, out_address, out_publickey);
if (fDebug10 && LessVerbose(50))
{
printf("\r\n**Beacon Debug Message : beaconpubkey %s, message key %s, cpid %s, addr %s, base64 pub key %s \r\n ",sBPK.c_str(),
sMessageKey.c_str(),out_cpid.c_str(),out_address.c_str(), out_publickey.c_str());
}
if (sBPK == out_publickey)
{
// allow key to be reloaded in since this is a refreshed beacon
if (fDebug10) printf("\r\n**Beacon Being Overwritten %s \r\n %s : %s\r\n",sBPK.c_str(),sMessageKey.c_str(),sBPK.c_str());
}
else
{
// In this case, the current Beacon is not empty and the keys are different - Do not overwrite this beacon
sMessageValue="";
if (fDebug10) printf("\r\n**Beacon Public Key Not Empty %s : %s\r\n",sMessageKey.c_str(),sBPK.c_str());
}
}
}

if (sMessageType=="superblock")
{
// Deny access to superblock processing runtime data
Expand All @@ -8467,6 +8451,16 @@ bool MemorizeMessage(const CTransaction &tx, double dAmount, std::string sRecipi

if (sMessageAction=="A")
{
/* With this we allow verifying blocks with stupid beacon */
if("beacon"==sMessageType)
{
std::string out_cpid = "";
std::string out_address = "";
std::string out_publickey = "";
GetBeaconElements(sMessageValue, out_cpid, out_address, out_publickey);
WriteCache("beaconalt",sMessageKey+"."+ToString(nTime),out_publickey,nTime);
}

// Ensure we have the TXID of the contract in memory
if (!(sMessageType=="project" || sMessageType=="projectmapping" || sMessageType=="beacon" ))
{
Expand Down
2 changes: 1 addition & 1 deletion src/miner.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -837,7 +837,7 @@ bool IsMiningAllowed(CWallet *pwallet)
}

if (vNodes.empty() || (!fTestNet&& IsInitialBlockDownload()) ||
(!fTestNet&& (vNodes.size() < 3 || nBestHeight < GetNumBlocksOfPeers()))
(!fTestNet&& vNodes.size() < 3)
)
{
LOCK(MinerStatus.lock);
Expand Down

0 comments on commit 3754746

Please sign in to comment.