DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

try again

Browse Source
This commit is contained in:
blackjok3r
2018-11-28 21:46:41 +08:00
parent d1fa5c68b4
commit ea8cf3fc1c
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/miner.cpp
View File

@@ -218,7 +218,6 @@ CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn,int32_t gpucount)
// TODO: It will be much faster here to just compare scriptpubkey! // TODO: It will be much faster here to just compare scriptpubkey!
CTxDestination ToAddress; int numNotaryVins = 0; bool fToCryptoAddress = false; CTxDestination ToAddress; int numNotaryVins = 0; bool fToCryptoAddress = false;
if (ExtractDestination(tx.vout[0].scriptPubKey, ToAddress)) { if (ExtractDestination(tx.vout[0].scriptPubKey, ToAddress)) {
fprintf(stderr, "%s %s\n",CRYPTO777_KMDADDR, CBitcoinAddress(ToAddress).ToString().c_str());
if ( strcmp(CRYPTO777_KMDADDR,CBitcoinAddress(ToAddress).ToString().c_str()) == 0 ) if ( strcmp(CRYPTO777_KMDADDR,CBitcoinAddress(ToAddress).ToString().c_str()) == 0 )
fToCryptoAddress = true; fToCryptoAddress = true;
} }
@@ -263,7 +262,6 @@ CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn,int32_t gpucount)
if ( NOTARYADDRS[0][0] != 0 && NUM_NOTARIES != 0 && fToCryptoAddress ) if ( NOTARYADDRS[0][0] != 0 && NUM_NOTARIES != 0 && fToCryptoAddress )
{ {
uint256 hash; CTransaction tx1; CTxDestination address; uint256 hash; CTransaction tx1; CTxDestination address;
fprintf(stderr, "Checking vins for notarisation.\n");
if (GetTransaction(txin.prevout.hash,tx1,hash,false)) if (GetTransaction(txin.prevout.hash,tx1,hash,false))
{ {
if (ExtractDestination(tx1.vout[txin.prevout.n].scriptPubKey, address)) { if (ExtractDestination(tx1.vout[txin.prevout.n].scriptPubKey, address)) {
@@ -276,6 +274,7 @@ CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn,int32_t gpucount)
} }
dPriority += (double)nValueIn * nConf; dPriority += (double)nValueIn * nConf;
} }
fprintf(stderr, "minsigs.%i vs numsigs.%i\n",(NUM_NOTARIES/5),numNotaryVins);
if ( numNotaryVins > NUM_NOTARIES / 5 ) if ( numNotaryVins > NUM_NOTARIES / 5 )
fNotarisation = true; fNotarisation = true;
nTotalIn += tx.GetJoinSplitValueIn(); nTotalIn += tx.GetJoinSplitValueIn();