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-23 05:52:40 -11:00
parent b2617a2dee
commit 1960a3d2c6
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/cc/faucet.cpp
View File

@@ -27,11 +27,11 @@
CC *MakeFaucetCond(CPubKey pk) CC *MakeFaucetCond(CPubKey pk)
{ {
std::vector<CC*> pks; uint8_t evalcode = EVAL_ASSETS; std::vector<CC*> pks; uint8_t evalcode = EVAL_FAUCET;
pks.push_back(CCNewSecp256k1(pk)); pks.push_back(CCNewSecp256k1(pk));
CC *assetCC = CCNewEval(E_MARSHAL(ss << evalcode)); CC *faucetCC = CCNewEval(E_MARSHAL(ss << evalcode));
CC *Sig = CCNewThreshold(1, pks); CC *Sig = CCNewThreshold(1, pks);
return CCNewThreshold(2, {assetCC, Sig}); return CCNewThreshold(2, {faucetCC, Sig});
} }
CTxOut MakeFaucetVout(CAmount nValue,CPubKey pk) CTxOut MakeFaucetVout(CAmount nValue,CPubKey pk)
@@ -112,7 +112,6 @@ bool FaucetValidate(Eval* eval,const CTransaction &tx)
bool ProcessFaucet(Eval* eval, std::vector<uint8_t> paramsNull,const CTransaction &ctx, unsigned int nIn) bool ProcessFaucet(Eval* eval, std::vector<uint8_t> paramsNull,const CTransaction &ctx, unsigned int nIn)
{ {
return(true);
if ( paramsNull.size() != 0 ) // Don't expect params if ( paramsNull.size() != 0 ) // Don't expect params
return eval->Invalid("Cannot have params"); return eval->Invalid("Cannot have params");
else if ( ctx.vout.size() == 0 ) else if ( ctx.vout.size() == 0 )

8
src/script/interpreter.cpp
View File

@@ -1313,14 +1313,14 @@ int TransactionSignatureChecker::CheckCryptoCondition(
} catch (logic_error ex) { } catch (logic_error ex) {
return 0; return 0;
} }
int32_t z; //uint8_t *ptr; //int32_t z; uint8_t *ptr;
//ptr = (uint8_t *)scriptCode.data(); //ptr = (uint8_t *)scriptCode.data();
//for (z=0; z<scriptCode.size(); z++) //for (z=0; z<scriptCode.size(); z++)
// fprintf(stderr,"%02x",ptr[z]); // fprintf(stderr,"%02x",ptr[z]);
//fprintf(stderr," <- CScript\n"); //fprintf(stderr," <- CScript\n");
for (z=0; z<32; z++) //for (z=0; z<32; z++)
fprintf(stderr,"%02x",((uint8_t *)&sighash)[z]); // fprintf(stderr,"%02x",((uint8_t *)&sighash)[z]);
fprintf(stderr," sighash nIn.%d nHashType.%d %.8f id.%d\n",(int32_t)nIn,(int32_t)nHashType,(double)amount/COIN,(int32_t)consensusBranchId); //fprintf(stderr," sighash nIn.%d nHashType.%d %.8f id.%d\n",(int32_t)nIn,(int32_t)nHashType,(double)amount/COIN,(int32_t)consensusBranchId);
VerifyEval eval = [] (CC *cond, void *checker) { VerifyEval eval = [] (CC *cond, void *checker) {
return ((TransactionSignatureChecker*)checker)->CheckEvalCondition(cond); return ((TransactionSignatureChecker*)checker)->CheckEvalCondition(cond);