sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-27 13:03:17 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

add transaction scanning for new transactions

Browse Source
This commit is contained in:
Evan Duffield 2015-02-03 18:35:29 -07:00
parent e3ef585263
commit d4896934e1
2 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/instantx.cpp
View File

@ -103,7 +103,6 @@ void ProcessMessageInstantX(CNode* pfrom, std::string& strCommand, CDataStream&
if((*i).second.CountSignatures() >= INSTANTX_SIGNATURES_REQUIRED){
LogPrintf("ProcessMessageInstantX::txlreq - Found Existing Complete IX Lock\n");
uint256 txHash = (*i).second.txHash;
CValidationState state;
bool fMissingInputs = false;
DisconnectBlockAndInputs(state, tx);

30
src/main.cpp
View File

@ -908,6 +908,30 @@ bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState &state, const CTransa
}
}
// ----------- instantX transaction scanning -----------
std::map<uint256, CTransactionLock>::iterator it = mapTxLocks.begin();
while(it != mapTxLocks.end()) {
if(mapTxLockReq.count((*it).second.txHash)){
CTransaction& tx2 = mapTxLockReq[(*it).second.txHash];
for (unsigned int a = 0; a < tx2.vin.size(); a++) {
//we found the locked tx in the block
if(tx2.GetHash() == tx.GetHash()) continue;
//if there's a lock, look for conflicting inputs
for (unsigned int b = 0; b < tx.vin.size(); b++) {
if(tx2.vin[a].prevout == tx.vin[b].prevout) {
return false;
}
}
}
}
it++;
}
{
CCoinsView dummy;
CCoinsViewCache view(dummy);
@ -2903,11 +2927,9 @@ bool CheckBlock(const CBlock& block, CValidationState& state, bool fCheckPOW, bo
for (unsigned int a = 0; a < tx.vin.size(); a++) {
for (unsigned int b = 0; b < block.vtx.size(); b++) {
//we found the locked tx in the block
if(tx.GetHash() == block.vtx[b].GetHash()) {
printf("CheckBlock -- found locked transaction\n");
continue;
}
if(tx.GetHash() == block.vtx[b].GetHash()) continue;
//if there's a lock, look for conflicting inputs
for (unsigned int c = 0; c < block.vtx[b].vin.size(); c++) {
if(tx.vin[a].prevout == block.vtx[b].vin[c].prevout) {
return state.DoS(100, error("CheckBlock() : found conflicting transaction with transaction lock"),