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

+print

Browse Source
This commit is contained in:
jl777
2018-08-15 08:09:21 -11:00
parent 8d13c0ef19
commit 5159767093
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/cc/faucet.cpp
View File

@@ -121,8 +121,12 @@ bool FaucetValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx
SetCCtxids(txids,destaddr); SetCCtxids(txids,destaddr);
for (std::vector<std::pair<CAddressIndexKey, CAmount> >::const_iterator it=txids.begin(); it!=txids.end(); it++) for (std::vector<std::pair<CAddressIndexKey, CAmount> >::const_iterator it=txids.begin(); it!=txids.end(); it++)
{ {
//int height = it->first.blockHeight;
if ( CCduration(numblocks,it->first.txhash) > 0 && numblocks > 3 ) if ( CCduration(numblocks,it->first.txhash) > 0 && numblocks > 3 )
return eval->Invalid("faucet is only for brand new addresses"); {
fprintf(stderr,"would return error %s numblocks.%d ago\n",uint256_str(str,it->first.txhash),numblocks);
//return eval->Invalid("faucet is only for brand new addresses");
}
} }
retval = PreventCC(eval,tx,preventCCvins,numvins,preventCCvouts,numvouts); retval = PreventCC(eval,tx,preventCCvins,numvins,preventCCvouts,numvouts);
if ( retval != 0 ) if ( retval != 0 )

2
src/cc/rewards.cpp
View File

@@ -69,7 +69,7 @@
int64_t RewardsCalc(int64_t amount,uint256 txid,uint64_t APR,uint64_t minseconds,uint64_t maxseconds,uint64_t mindeposit) int64_t RewardsCalc(int64_t amount,uint256 txid,uint64_t APR,uint64_t minseconds,uint64_t maxseconds,uint64_t mindeposit)
{ {
int32_t numblocks; uint64_t duration,reward = 0; int32_t numblocks; uint64_t duration,reward = 0;
fprintf(stderr,"minseconds %llu maxseconds %llu\n",(long long)minseconds,(long long)maxseconds); //fprintf(stderr,"minseconds %llu maxseconds %llu\n",(long long)minseconds,(long long)maxseconds);
if ( (duration= CCduration(numblocks,txid)) < minseconds ) if ( (duration= CCduration(numblocks,txid)) < minseconds )
{ {
fprintf(stderr,"duration %llu < minseconds %llu\n",(long long)duration,(long long)minseconds); fprintf(stderr,"duration %llu < minseconds %llu\n",(long long)duration,(long long)minseconds);