make unsupported funcid illegal
This commit is contained in:
@@ -249,8 +249,8 @@ bool AssetsValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx
|
|||||||
}
|
}
|
||||||
fprintf(stderr,"fillbuy validated\n");
|
fprintf(stderr,"fillbuy validated\n");
|
||||||
break;
|
break;
|
||||||
case 'e': // selloffer
|
//case 'e': // selloffer
|
||||||
break; // disable swaps
|
// break; // disable swaps
|
||||||
case 's': // selloffer
|
case 's': // selloffer
|
||||||
//vin.0: normal input
|
//vin.0: normal input
|
||||||
//vin.1+: valid CC output for sale
|
//vin.1+: valid CC output for sale
|
||||||
@@ -322,6 +322,7 @@ bool AssetsValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx
|
|||||||
fprintf(stderr,"fill validated\n");
|
fprintf(stderr,"fill validated\n");
|
||||||
break;
|
break;
|
||||||
case 'E': // fillexchange
|
case 'E': // fillexchange
|
||||||
|
return(false);
|
||||||
break; // disable asset swaps
|
break; // disable asset swaps
|
||||||
//vin.0: normal input
|
//vin.0: normal input
|
||||||
//vin.1: unspendable.(vout.0 assetoshis from selloffer) sellTx.vout[0]
|
//vin.1: unspendable.(vout.0 assetoshis from selloffer) sellTx.vout[0]
|
||||||
@@ -371,6 +372,10 @@ bool AssetsValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx
|
|||||||
}
|
}
|
||||||
fprintf(stderr,"fill validated\n");
|
fprintf(stderr,"fill validated\n");
|
||||||
break;
|
break;
|
||||||
|
default:
|
||||||
|
fprintf(stderr,"illegal assets funcid.(%c)\n",funcid);
|
||||||
|
return(false);
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
return(PreventCC(eval,tx,preventCCvins,numvins,preventCCvouts,numvouts));
|
return(PreventCC(eval,tx,preventCCvins,numvins,preventCCvouts,numvouts));
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -348,6 +348,10 @@ bool ChannelsValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &
|
|||||||
return eval->Invalid("invalid amount, refund amount and funds in channel must match!");
|
return eval->Invalid("invalid amount, refund amount and funds in channel must match!");
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
default:
|
||||||
|
fprintf(stderr,"illegal channels funcid.(%c)\n",funcid);
|
||||||
|
return(false);
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
retval = PreventCC(eval,tx,preventCCvins,numvins,preventCCvouts,numvouts);
|
retval = PreventCC(eval,tx,preventCCvins,numvins,preventCCvouts,numvouts);
|
||||||
|
|||||||
@@ -685,6 +685,13 @@ bool DiceValidate(struct CCcontract_info *cp,Eval *eval,const CTransaction &tx)
|
|||||||
else if ( DiceVerifyTimeout(vinTx,timeoutblocks) == 0 )
|
else if ( DiceVerifyTimeout(vinTx,timeoutblocks) == 0 )
|
||||||
return eval->Invalid("invalid timeout claim for timeout");
|
return eval->Invalid("invalid timeout claim for timeout");
|
||||||
break;
|
break;
|
||||||
|
case 'R':
|
||||||
|
fprintf(stderr,"add validation for refunds\n");
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
fprintf(stderr,"illegal dice funcid.(%c)\n",funcid);
|
||||||
|
return(false);
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return(PreventCC(eval,tx,preventCCvins,numvins,preventCCvouts,numvouts));
|
return(PreventCC(eval,tx,preventCCvins,numvins,preventCCvouts,numvouts));
|
||||||
|
|||||||
@@ -651,6 +651,10 @@ bool OraclesValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &t
|
|||||||
}
|
}
|
||||||
return eval->Invalid("unexpected OraclesValidate 'D' tx invalid");
|
return eval->Invalid("unexpected OraclesValidate 'D' tx invalid");
|
||||||
break;
|
break;
|
||||||
|
default:
|
||||||
|
fprintf(stderr,"illegal oracles funcid.(%c)\n",funcid);
|
||||||
|
return(false);
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return(PreventCC(eval,tx,preventCCvins,numvins,preventCCvouts,numvouts));
|
return(PreventCC(eval,tx,preventCCvins,numvins,preventCCvouts,numvouts));
|
||||||
|
|||||||
@@ -287,6 +287,10 @@ bool RewardsValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &t
|
|||||||
return eval->Invalid("unlock tx vout.2 isnt 0");
|
return eval->Invalid("unlock tx vout.2 isnt 0");
|
||||||
preventCCvouts = 1;
|
preventCCvouts = 1;
|
||||||
break;
|
break;
|
||||||
|
default:
|
||||||
|
fprintf(stderr,"illegal rewards funcid.(%c)\n",funcid);
|
||||||
|
return(false);
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return(PreventCC(eval,tx,preventCCvins,numvins,preventCCvouts,numvouts));
|
return(PreventCC(eval,tx,preventCCvins,numvins,preventCCvouts,numvouts));
|
||||||
|
|||||||
Reference in New Issue
Block a user