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-09-04 07:47:21 -11:00
parent 7af451d0ef
commit 26ac547342
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/cc/CCtx.cpp
View File

@@ -121,7 +121,7 @@ std::string FinalizeCCTx(uint64_t CCmask,struct CCcontract_info *cp,CMutableTran
} }
else if ( strcmp(destaddr,cp->unspendableaddr2) == 0 ) else if ( strcmp(destaddr,cp->unspendableaddr2) == 0 )
{ {
fprintf(stderr,"matched %s unspendable2!\n",cp->unspendableaddr2); //fprintf(stderr,"matched %s unspendable2!\n",cp->unspendableaddr2);
privkey = cp->unspendablepriv2; privkey = cp->unspendablepriv2;
if ( othercond2 == 0 ) if ( othercond2 == 0 )
othercond2 = MakeCCcond1(cp->evalcode,cp->unspendablepk2); othercond2 = MakeCCcond1(cp->evalcode,cp->unspendablepk2);

10
src/cc/oracles.cpp
View File

@@ -285,7 +285,7 @@ int64_t IsOraclesvout(struct CCcontract_info *cp,const CTransaction& tx,int32_t
return(0); return(0);
} }
bool OraclesDataValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx,uint256 oracletxid,CPubKey publisher,uint64_t txfee,int64_t datafee) bool OraclesDataValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx,uint256 oracletxid,CPubKey publisher,int64_t datafee)
{ {
static uint256 zerohash; static uint256 zerohash;
CTransaction vinTx; uint256 hashBlock,activehash; int32_t i,numvins,numvouts; int64_t inputs=0,outputs=0,assetoshis; CScript scriptPubKey; CTransaction vinTx; uint256 hashBlock,activehash; int32_t i,numvins,numvouts; int64_t inputs=0,outputs=0,assetoshis; CScript scriptPubKey;
@@ -340,10 +340,10 @@ bool OraclesDataValidate(struct CCcontract_info *cp,Eval* eval,const CTransactio
else if ( i < 2 ) else if ( i < 2 )
return eval->Invalid("vout0 or vout1 is normal"); return eval->Invalid("vout0 or vout1 is normal");
} }
if ( inputs != outputs+txfee+datafee ) if ( inputs != outputs+datafee )
{ {
fprintf(stderr,"inputs %llu vs outputs %llu + datafee %llu + txfee %llu\n",(long long)inputs,(long long)outputs,(long long)datafee,(long long)txfee); fprintf(stderr,"inputs %llu vs outputs %llu + datafee %llu\n",(long long)inputs,(long long)outputs,(long long)datafee);
return eval->Invalid("mismatched inputs != outputs + datafee + txfee"); return eval->Invalid("mismatched inputs != outputs + datafee");
} }
else return(true); else return(true);
} }
@@ -397,7 +397,7 @@ bool OraclesValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &t
// vout.3: change, if any // vout.3: change, if any
if ( numvins >= 2 && numvouts >= 3 && DecodeOraclesData(tx.vout[numvouts-1].scriptPubKey,oracletxid,batontxid,publisher,data) == 'D' ) if ( numvins >= 2 && numvouts >= 3 && DecodeOraclesData(tx.vout[numvouts-1].scriptPubKey,oracletxid,batontxid,publisher,data) == 'D' )
{ {
if ( OraclesDataValidate(cp,eval,tx,oracletxid,publisher,txfee,tx.vout[2].nValue) != 0 ) if ( OraclesDataValidate(cp,eval,tx,oracletxid,publisher,tx.vout[2].nValue) != 0 )
{ {
return(true); return(true);
} else return(false); } else return(false);