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

Test

Browse Source
This commit is contained in:
jl777
2018-07-24 00:56:29 -11:00
parent a35184925b
commit da8b0b3336
2 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/cc/CCcustom.cpp
View File

@@ -30,6 +30,8 @@
2. initialize the variables in the CCinit function below 2. initialize the variables in the CCinit function below
3. write a Validate function to reject any unsanctioned usage of vin/vout 3. write a Validate function to reject any unsanctioned usage of vin/vout
4. make helper functions to create rawtx for RPC functions 4. make helper functions to create rawtx for RPC functions
5. add rpc calls to rpcserver.cpp and rpcserver.h and in one of the rpc.cpp files
6. add the new .cpp files to src/Makefile.am
*/ */
//BTCD Address: RAssetsAtGnvwgK9gVHBbAU4sVTah1hAm5 //BTCD Address: RAssetsAtGnvwgK9gVHBbAU4sVTah1hAm5

20
src/cc/faucet.cpp
View File

@@ -79,7 +79,7 @@ bool FaucetExactAmounts(struct CCcontract_info *cp,Eval* eval,const CTransaction
bool FaucetValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx) bool FaucetValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx)
{ {
int32_t numvins,numvouts,preventCCvins,preventCCvouts,i; int32_t numvins,numvouts,preventCCvins,preventCCvouts,i; bool retval;
numvins = tx.vin.size(); numvins = tx.vin.size();
numvouts = tx.vout.size(); numvouts = tx.vout.size();
preventCCvins = preventCCvouts = -1; preventCCvins = preventCCvouts = -1;
@@ -87,18 +87,23 @@ bool FaucetValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx
return eval->Invalid("no vouts"); return eval->Invalid("no vouts");
else else
{ {
fprintf(stderr,"check vins\n"); //fprintf(stderr,"check vins\n");
for (i=0; i<numvins; i++) for (i=0; i<numvins; i++)
{ {
if ( IsCCInput(tx.vin[0].scriptSig) == 0 ) if ( IsCCInput(tx.vin[0].scriptSig) == 0 )
{
fprintf(stderr,"faucetget invalid vini\n");
return eval->Invalid("illegal normal vini"); return eval->Invalid("illegal normal vini");
}
} }
fprintf(stderr,"check amounts\n"); //fprintf(stderr,"check amounts\n");
if ( FaucetExactAmounts(cp,eval,tx,1,10000) == false ) if ( FaucetExactAmounts(cp,eval,tx,1,10000) == false )
{
fprintf(stderr,"faucetget invalid amount\n");
return false; return false;
}
else else
{ {
fprintf(stderr,"check rest\n");
preventCCvouts = 1; preventCCvouts = 1;
if ( IsFaucetvout(cp,tx,0) != 0 ) if ( IsFaucetvout(cp,tx,0) != 0 )
{ {
@@ -107,8 +112,11 @@ bool FaucetValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx
} else i = 0; } else i = 0;
if ( tx.vout[i].nValue != COIN ) if ( tx.vout[i].nValue != COIN )
return eval->Invalid("invalid faucet output"); return eval->Invalid("invalid faucet output");
fprintf(stderr,"check CC\n"); retval = PreventCC(eval,tx,preventCCvins,numvins,preventCCvouts,numvouts);
return(PreventCC(eval,tx,preventCCvins,numvins,preventCCvouts,numvouts)); if ( retval != 0 )
fprintf(stderr,"faucetget validated\n");
else fprintf(stderr,"faucetget invalid\n");
return(retval);
} }
} }
} }