duke
/
VerusCoin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge pull request #421 from VerusCoin/dev 

Dev
pull/384/merge v0.9.2-2
Asher Dawes 2 years ago
committed by GitHub
parent
79cde17c08 ab40a940c9
commit
79d6171c95
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 29 additions and 19 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 48
      src/miner.cpp

48
src/miner.cpp
View File

@ -2227,6 +2227,7 @@ CBlockTemplate* CreateNewBlock(const CChainParams& chainparams, const std::vecto
// go through all outputs and record all currency and identity definitions, either import-based definitions or
// identity reservations to check for collision, which is disallowed
bool disqualified = false;
for (int j = 0; j < tx.vout.size(); j++)
{
auto &oneOut = tx.vout[j];
@ -2251,7 +2252,7 @@ CBlockTemplate* CreateNewBlock(const CChainParams& chainparams, const std::vecto
}
else
{
continue;
disqualified = true;
}
break;
}
@ -2268,7 +2269,7 @@ CBlockTemplate* CreateNewBlock(const CChainParams& chainparams, const std::vecto
}
else
{
continue;
disqualified = true;
}
break;
}
@ -2300,7 +2301,8 @@ CBlockTemplate* CreateNewBlock(const CChainParams& chainparams, const std::vecto
if (currencyDestAndExport.count(checkKey))
{
// skip this in the block, but should we keep in mempool?
continue;
disqualified = true;
break;
}
currencyDestAndExport.insert(checkKey);
}
@ -2309,7 +2311,8 @@ CBlockTemplate* CreateNewBlock(const CChainParams& chainparams, const std::vecto
std::pair<uint160, uint160> checkKey({ccx.destSystemID, GetDestinationID(TransferDestinationToDestination(oneTransfer.destination))});
if (idDestAndExport.count(checkKey))
{
continue;
disqualified = true;
break;
}
idDestAndExport.insert(checkKey);
}
@ -2336,7 +2339,8 @@ CBlockTemplate* CreateNewBlock(const CChainParams& chainparams, const std::vecto
{
if (currencyImports.count(oneTransfer.FirstCurrency()))
{
continue;
disqualified = true;
break;
}
currencyImports.insert(oneTransfer.FirstCurrency());
}
@ -2345,7 +2349,8 @@ CBlockTemplate* CreateNewBlock(const CChainParams& chainparams, const std::vecto
uint160 checkKey = GetDestinationID(TransferDestinationToDestination(oneTransfer.destination));
if (newIDRegistrations.count(checkKey))
{
continue;
disqualified = true;
break;
}
newIDRegistrations.insert(checkKey);
}
@ -2370,7 +2375,8 @@ CBlockTemplate* CreateNewBlock(const CChainParams& chainparams, const std::vecto
{
std::list<CTransaction> removed;
mempool.remove(tx, removed, true);
continue;
disqualified = true;
break;
}
if (destCurrency.SystemOrGatewayID() != ASSETCHAINS_CHAINID)
@ -2380,7 +2386,8 @@ CBlockTemplate* CreateNewBlock(const CChainParams& chainparams, const std::vecto
std::pair<uint160, uint160> checkKey({destCurrency.SystemOrGatewayID(), rt.FirstCurrency()});
if (currencyDestAndExport.count(checkKey))
{
continue;
disqualified = true;
break;
}
currencyDestAndExport.insert(checkKey);
}
@ -2389,30 +2396,33 @@ CBlockTemplate* CreateNewBlock(const CChainParams& chainparams, const std::vecto
std::pair<uint160, uint160> checkKey({destCurrency.SystemOrGatewayID(), GetDestinationID(TransferDestinationToDestination(rt.destination))});
if (idDestAndExport.count(checkKey))
{
continue;
disqualified = true;
break;
}
idDestAndExport.insert(checkKey);
}
}
if (++exportTransferCount[destCurrencyID] > destSystem.MaxTransferExportCount())
if (++exportTransferCount[destCurrencyID] > destSystem.MaxTransferExportCount() ||
(rt.IsCurrencyExport() && ++currencyExportTransferCount[destCurrencyID] > destSystem.MaxCurrencyDefinitionExportCount()) ||
(rt.IsIdentityExport() && ++identityExportTransferCount[destCurrencyID] > destSystem.MaxIdentityDefinitionExportCount()))
{
continue;
}
if (rt.IsCurrencyExport() && ++currencyExportTransferCount[destCurrencyID] > destSystem.MaxCurrencyDefinitionExportCount())
{
continue;
}
if (rt.IsIdentityExport() && ++identityExportTransferCount[destCurrencyID] > destSystem.MaxIdentityDefinitionExportCount())
{
continue;
disqualified = true;
}
}
break;
}
}
if (disqualified)
{
break;
}
}
}
if (disqualified)
{
continue;
}
UpdateCoins(tx, view, nHeight);

Write Preview
Loading…
Cancel
Save