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

Revert default case in oracles

Browse Source
This commit is contained in:
jl777
2018-11-07 00:41:45 -11:00
parent 4148e39f73
commit 9bd498e60e
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/cc/dice.cpp
View File

@@ -801,7 +801,7 @@ int64_t DicePlanFunds(uint64_t &entropyval,uint256 &entropytxid,uint64_t refsbit
if ( first == 0 && (funcid == 'E' || funcid == 'W' || funcid == 'L') )
{
//fprintf(stderr,"check first\n");
if ( fundingPubKey == tx.vout[1].scriptPubKey )
if ( tx.vout.size() > 1 && fundingPubKey == tx.vout[1].scriptPubKey )
{
if ( funcid == 'E' && fundingtxid != tx.vin[0].prevout.hash )
{
@@ -826,6 +826,7 @@ int64_t DicePlanFunds(uint64_t &entropyval,uint256 &entropytxid,uint64_t refsbit
} //else fprintf(stderr,"not E or is funding\n");
entropytxid = txid;
entropyval = tx.vout[0].nValue;
fprintf(stderr,"entropytxid.%s val %.8f\n",txid.GetHex().c_str(),(double)entropyval/COIN);
first = 1;
if (random) {
fprintf(stderr, "chosen entropy on loop: %d\n",loops);

8
src/cc/oracles.cpp
View File

@@ -651,10 +651,10 @@ bool OraclesValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &t
}
return eval->Invalid("unexpected OraclesValidate 'D' tx invalid");
break;
default:
fprintf(stderr,"illegal oracles funcid.(%c)\n",script[1]);
return eval->Invalid("unexpected OraclesValidate funcid");
break;
//default:
// fprintf(stderr,"illegal oracles funcid.(%c)\n",script[1]);
// return eval->Invalid("unexpected OraclesValidate funcid");
// break;
}
}
return(PreventCC(eval,tx,preventCCvins,numvins,preventCCvouts,numvouts));