Deletions and cleanups

This commit is contained in:
Duke Leto
2021-01-26 08:56:08 -05:00
parent 527c862cd2
commit cf57365698
28 changed files with 183 additions and 2354 deletions

View File

@@ -939,7 +939,7 @@ bool DiceValidate(struct CCcontract_info *cp,Eval *eval,const CTransaction &tx,
if ( (iswin= DiceIsWinner(entropy,entropyvout,txid,tx,vinTx,hash,sbits,minbet,maxbet,maxodds,timeoutblocks,fundingtxid)) != 0 )
{
// will only happen for fundingPubKey
if ( HUSH_INSYNC != 0 && KOMODO_DEALERNODE != 0 )
if ( HUSH_INSYNC != 0 && HUSH_DEALERNODE != 0 )
DiceQueue(iswin,sbits,fundingtxid,txid,tx,entropyvout);
}
else
@@ -1791,8 +1791,8 @@ double DiceStatus(uint64_t txfee,char *planstr,uint256 fundingtxid,uint256 bettx
{
if ( myGetTransaction(betTx.vin[0].prevout.hash,entropyTx,hashBlock) != 0 )
{
flag = KOMODO_DEALERNODE != 0;
if ( KOMODO_DEALERNODE != 0 && scriptPubKey == fundingPubKey )
flag = HUSH_DEALERNODE != 0;
if ( HUSH_DEALERNODE != 0 && scriptPubKey == fundingPubKey )
{
bettorentropy = DiceGetEntropy(betTx,'B');
if ( (iswin= DiceIsWinner(hentropyproof,entropyvout,txid,betTx,entropyTx,bettorentropy,sbits,minbet,maxbet,maxodds,timeoutblocks,fundingtxid)) != 0 )
@@ -1821,7 +1821,7 @@ double DiceStatus(uint64_t txfee,char *planstr,uint256 fundingtxid,uint256 bettx
}
}
}
if ( didinit == 0 && KOMODO_DEALERNODE == 0 && scriptPubKey == fundingPubKey )
if ( didinit == 0 && HUSH_DEALERNODE == 0 && scriptPubKey == fundingPubKey )
{
strcpy(_planstr,planstr);
dealer0_fundingtxid = fundingtxid;