neobytes-project/neobytes
neobytes-project/neobytes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

fixed hashing for IX

Browse Source
This commit is contained in:
Evan Duffield 2015-02-01 13:37:20 -07:00
parent 6c8b23c0b2
commit 2feb0fd2f8
1 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/instantx.cpp
View File

@ -108,20 +108,20 @@ void ProcessMessageInstantX(CNode* pfrom, std::string& strCommand, CDataStream&
CInv inv(MSG_TXLOCK_VOTE, ctx.GetHash());
pfrom->AddInventoryKnown(inv);
if(mapTxLockVote.count(inv.hash)){
if(mapTxLockVote.count(ctx.GetHash())){
return;
}
mapTxLockVote.insert(make_pair(inv.hash, 1));
mapTxLockVote.insert(make_pair(ctx.GetHash(), 1));
ProcessConsensusVote(ctx);
LOCK(cs_vNodes);
BOOST_FOREACH(CNode* pnode, vNodes)
{
printf("relay txlvote to %s : %s\n", pnode->addr.ToString().c_str(), ctx.tx.ToString().c_str());
pnode->PushMessage("txlvote", ctx);
}
return;
}
}
@ -144,7 +144,7 @@ void DoConsensusVote(CTransaction& tx, bool approved, int64_t nBlockHeight)
LogPrintf("InstantX::DoConsensusVote - Signature invalid\n");
return;
}
LOCK(cs_vNodes);
BOOST_FOREACH(CNode* pnode, vNodes)
{
@ -224,15 +224,7 @@ void CleanTransactionLocksList()
uint256 CConsensusVote::GetHash() const
{
std::string strHash = tx.GetHash().ToString().c_str();
strHash += vinMasternode.ToString().c_str();
strHash += boost::lexical_cast<std::string>(nBlockHeight);
strHash += boost::lexical_cast<std::string>(approved);
printf("%s\n", strHash.c_str());
return Hash(BEGIN(strHash), END(strHash));
return vinMasternode.prevout.hash + tx.GetHash();
}