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

Test

Browse Source
This commit is contained in:
jl777
2018-07-21 19:10:59 -11:00
parent 9b4aec0f88
commit 96fc3db2df
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/cc/assets.cpp
View File

@@ -1115,8 +1115,6 @@ bool AssetValidate(Eval* eval,CTransaction &tx,int32_t numvouts,uint8_t funcid,u
return eval->Invalid("not enough vouts for fillbuy"); return eval->Invalid("not enough vouts for fillbuy");
else if ( tmporigpubkey != origpubkey ) else if ( tmporigpubkey != origpubkey )
return eval->Invalid("mismatched origpubkeys for fillbuy"); return eval->Invalid("mismatched origpubkeys for fillbuy");
if ( inputs != outputs )
return eval->Invalid("mismatched inputs vs outputs for fillbuy");
else else
{ {
if ( ConstrainVout(tx.vout[1],0,0,0) == 0 ) if ( ConstrainVout(tx.vout[1],0,0,0) == 0 )
@@ -1132,7 +1130,7 @@ bool AssetValidate(Eval* eval,CTransaction &tx,int32_t numvouts,uint8_t funcid,u
else if ( ConstrainVout(tx.vout[0],1,(char *)AssetsCCaddr,0) == 0 ) else if ( ConstrainVout(tx.vout[0],1,(char *)AssetsCCaddr,0) == 0 )
return eval->Invalid("mismatched vout0 AssetsCCaddr for fillbuy"); return eval->Invalid("mismatched vout0 AssetsCCaddr for fillbuy");
} }
} else return eval->Invalid("vin2 not asset for fillbuy"); }
fprintf(stderr,"fillbuy validated\n"); fprintf(stderr,"fillbuy validated\n");
break; break;
@@ -1208,7 +1206,7 @@ bool AssetValidate(Eval* eval,CTransaction &tx,int32_t numvouts,uint8_t funcid,u
else if ( ConstrainVout(tx.vout[0],1,(char *)AssetsCCaddr,0) == 0 ) else if ( ConstrainVout(tx.vout[0],1,(char *)AssetsCCaddr,0) == 0 )
return eval->Invalid("mismatched vout0 AssetsCCaddr for fill"); return eval->Invalid("mismatched vout0 AssetsCCaddr for fill");
} }
} else return eval->Invalid("vin2 not enough asset2 for fillbuy"); }
fprintf(stderr,"fill validated\n") fprintf(stderr,"fill validated\n")
break; break;
} }
@@ -1224,7 +1222,7 @@ bool AssetValidate(Eval* eval,CTransaction &tx,int32_t numvouts,uint8_t funcid,u
{ {
for (i=preventCCvouts; i<numvouts; i++) for (i=preventCCvouts; i<numvouts; i++)
{ {
else if ( tx.vout[i].scriptPubKey.IsPayToCryptoCondition() != 0 ) if ( tx.vout[i].scriptPubKey.IsPayToCryptoCondition() != 0 )
return eval->Invalid("invalid CC vout"); return eval->Invalid("invalid CC vout");
} }
} }

3
src/main.h
View File

@@ -102,7 +102,8 @@ static const unsigned int DATABASE_FLUSH_INTERVAL = 24 * 60 * 60;
/** Maximum length of reject messages. */ /** Maximum length of reject messages. */
static const unsigned int MAX_REJECT_MESSAGE_LENGTH = 111; static const unsigned int MAX_REJECT_MESSAGE_LENGTH = 111;
static const bool DEFAULT_ADDRESSINDEX = false; //static const bool DEFAULT_ADDRESSINDEX = false;
#define DEFAULT_ADDRESSINDEX (GetArg("-ac_cc",0) != 0)
static const bool DEFAULT_TIMESTAMPINDEX = false; static const bool DEFAULT_TIMESTAMPINDEX = false;
static const bool DEFAULT_SPENTINDEX = false; static const bool DEFAULT_SPENTINDEX = false;
static const unsigned int DEFAULT_DB_MAX_OPEN_FILES = 1000; static const unsigned int DEFAULT_DB_MAX_OPEN_FILES = 1000;