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

Reduce faucetget opreturn size, add rewards recover funds mode

Browse Source
This commit is contained in:
jl777
2018-08-17 23:02:49 -11:00
parent 2703f76b3e
commit bc32996926
2 changed files with 55 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/cc/faucet.cpp
View File

@@ -170,7 +170,7 @@ int64_t AddFaucetInputs(struct CCcontract_info *cp,CMutableTransaction &mtx,CPub
std::string FaucetGet(uint64_t txfee) std::string FaucetGet(uint64_t txfee)
{ {
CMutableTransaction mtx,tmpmtx; CPubKey mypk,faucetpk; int64_t inputs,CCchange=0,nValue=FAUCETSIZE; struct CCcontract_info *cp,C; std::string rawhex; int32_t i,j,len; uint8_t buf[32768]; bits256 hash; CMutableTransaction mtx,tmpmtx; CPubKey mypk,faucetpk; int64_t inputs,CCchange=0,nValue=FAUCETSIZE; struct CCcontract_info *cp,C; std::string rawhex; uint32_t j; int32_t i,len; uint8_t buf[32768]; bits256 hash;
cp = CCinit(&C,EVAL_FAUCET); cp = CCinit(&C,EVAL_FAUCET);
if ( txfee == 0 ) if ( txfee == 0 )
txfee = 10000; txfee = 10000;
@@ -184,10 +184,11 @@ std::string FaucetGet(uint64_t txfee)
mtx.vout.push_back(MakeCC1vout(EVAL_FAUCET,CCchange,faucetpk)); mtx.vout.push_back(MakeCC1vout(EVAL_FAUCET,CCchange,faucetpk));
mtx.vout.push_back(CTxOut(nValue,CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG)); mtx.vout.push_back(CTxOut(nValue,CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG));
fprintf(stderr,"start at %u\n",(uint32_t)time(NULL)); fprintf(stderr,"start at %u\n",(uint32_t)time(NULL));
for (i=0; i<1000000; i++) j = rand() & 0xfffffff;
for (i=0; i<1000000; i++,j++)
{ {
tmpmtx = mtx; tmpmtx = mtx;
rawhex = FinalizeCCTx(-1LL,cp,tmpmtx,mypk,txfee,CScript() << OP_RETURN << E_MARSHAL(ss << (uint8_t)EVAL_FAUCET << (uint8_t)'G' << mypk << i)); rawhex = FinalizeCCTx(-1LL,cp,tmpmtx,mypk,txfee,CScript() << OP_RETURN << E_MARSHAL(ss << (uint8_t)EVAL_FAUCET << (uint8_t)'G' << j));
if ( (len= (int32_t)rawhex.size()) > 0 && len < 65536 ) if ( (len= (int32_t)rawhex.size()) > 0 && len < 65536 )
{ {
len >>= 1; len >>= 1;

77
src/cc/rewards.cpp
View File

@@ -241,17 +241,27 @@ bool RewardsValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &t
case 'U': case 'U':
//vin.0: locked funds CC vout.0 from lock //vin.0: locked funds CC vout.0 from lock
//vin.1+: funding CC vout.0 from 'F' and 'A' and 'U' //vin.1+: funding CC vout.0 from 'F' and 'A' and 'U'
//vout.0: funding CC change //vout.0: funding CC change or recover normal payout
//vout.1: normal output to unlock address //vout.1: normal output to unlock address
//vout.n-1: opreturn 'U' sbits fundingtxid //vout.n-1: opreturn 'U' sbits fundingtxid
if ( eval->GetTxUnconfirmed(tx.vin[0].prevout.hash,vinTx,hashBlock) == 0 )
return eval->Invalid("always should find vin.0, but didnt");
for (i=0; i<numvins; i++) for (i=0; i<numvins; i++)
{ {
if ( (*cp->ismyvin)(tx.vin[i].scriptSig) == 0 ) if ( (*cp->ismyvin)(tx.vin[i].scriptSig) == 0 )
return eval->Invalid("unexpected normal vin for unlock"); return eval->Invalid("unexpected normal vin for unlock");
} }
if ( eval->GetTxUnconfirmed(tx.vin[0].prevout.hash,vinTx,hashBlock) == 0 ) if ( numvouts == 1 && numvins == 1 )
return eval->Invalid("always should find vin.0, but didnt"); {
else if ( vinTx.vout[0].scriptPubKey.IsPayToCryptoCondition() == 0 ) if ( tx.vout[0].scriptPubKey.IsPayToCryptoCondition() != 0 )
return eval->Invalid("unlock recover tx vout.0 is not normal output");
else if ( tx.vout[0].scriptPubKey != vinTx.vout[1].scriptPubKey )
return eval->Invalid("unlock recover tx vout.0 mismatched scriptPubKey");
else if ( tx.vout[0].nValue > vinTx.vout[0].nValue )
return eval->Invalid("unlock recover tx vout.0 mismatched amounts");
else return(true);
}
if ( vinTx.vout[0].scriptPubKey.IsPayToCryptoCondition() == 0 )
return eval->Invalid("lock tx vout.0 is normal output"); return eval->Invalid("lock tx vout.0 is normal output");
else if ( tx.vout.size() < 3 ) else if ( tx.vout.size() < 3 )
return eval->Invalid("unlock tx not enough vouts"); return eval->Invalid("unlock tx not enough vouts");
@@ -541,9 +551,9 @@ std::string RewardsAddfunding(uint64_t txfee,char *planstr,uint256 fundingtxid,i
std::string RewardsLock(uint64_t txfee,char *planstr,uint256 fundingtxid,int64_t deposit) std::string RewardsLock(uint64_t txfee,char *planstr,uint256 fundingtxid,int64_t deposit)
{ {
CMutableTransaction mtx; CPubKey mypk,rewardspk; CScript opret; uint64_t lockedfunds,sbits,funding,APR,minseconds,maxseconds,mindeposit; struct CCcontract_info *cp,C; CMutableTransaction mtx; CPubKey mypk,rewardspk; CScript opret; uint64_t lockedfunds,sbits,funding,APR,minseconds,maxseconds,mindeposit; struct CCcontract_info *cp,C;
if ( deposit < 0 ) if ( deposit < txfee )
{ {
fprintf(stderr,"negative parameter error\n"); fprintf(stderr,"deposit amount less than txfee\n");
return(""); return("");
} }
cp = CCinit(&C,EVAL_REWARDS); cp = CCinit(&C,EVAL_REWARDS);
@@ -614,31 +624,46 @@ std::string RewardsUnlock(uint64_t txfee,char *planstr,uint256 fundingtxid,uint2
return(""); return("");
} }
} }
if ( amount > 0) { if ( amount > txfee )
reward= RewardsCalc(amount,mtx.vin[0].prevout.hash,APR,minseconds,maxseconds,mindeposit); {
if (scriptPubKey.size() > 0) { reward = RewardsCalc(amount,mtx.vin[0].prevout.hash,APR,minseconds,maxseconds,mindeposit);
if (reward > txfee) { if ( scriptPubKey.size() > 0 )
if ( (inputs= AddRewardsInputs(ignore,0,cp,mtx,rewardspk,reward+txfee,30,sbits,fundingtxid)) > 0 ) { {
if ( inputs >= (reward + 2*txfee) ) if ( reward > txfee )
CCchange = (inputs - (reward + txfee)); {
fprintf(stderr,"inputs %.8f CCchange %.8f amount %.8f reward %.8f\n",(double)inputs/COIN,(double)CCchange/COIN,(double)amount/COIN,(double)reward/COIN); if ( (inputs= AddRewardsInputs(ignore,0,cp,mtx,rewardspk,reward+txfee,30,sbits,fundingtxid)) > 0 )
mtx.vout.push_back(MakeCC1vout(cp->evalcode,CCchange,rewardspk)); {
mtx.vout.push_back(CTxOut(amount+reward,scriptPubKey)); if ( inputs >= (reward + 2*txfee) )
return(FinalizeCCTx(-1LL,cp,mtx,mypk,txfee,EncodeRewardsOpRet('U',sbits,fundingtxid))); CCchange = (inputs - (reward + txfee));
fprintf(stderr,"inputs %.8f CCchange %.8f amount %.8f reward %.8f\n",(double)inputs/COIN,(double)CCchange/COIN,(double)amount/COIN,(double)reward/COIN);
mtx.vout.push_back(MakeCC1vout(cp->evalcode,CCchange,rewardspk));
mtx.vout.push_back(CTxOut(amount+reward,scriptPubKey));
return(FinalizeCCTx(-1LL,cp,mtx,mypk,txfee,EncodeRewardsOpRet('U',sbits,fundingtxid)));
}
else
{
mtx.vout.push_back(CTxOut(amount-txfee,scriptPubKey));
//CCerror = "cant find enough rewards inputs";
fprintf(stderr,"not enough rewards funds to payout %.8f, recover mode tx\n",(double)(rewards+txfee)/COIN);
return(FinalizeCCTx(-1LL,cp,mtx,mypk,txfee,opret));
}
} }
CCerror = "cant find enough rewards inputs"; else
fprintf(stderr,"%s\n", CCerror.c_str()); {
} else {
CCerror = strprintf("reward %.8f is <= the transaction fee", reward); CCerror = strprintf("reward %.8f is <= the transaction fee", reward);
fprintf(stderr,"%s\n", CCerror.c_str()); fprintf(stderr,"%s\n", CCerror.c_str());
} }
} else { }
else
{
CCerror = "invalid scriptPubKey"; CCerror = "invalid scriptPubKey";
fprintf(stderr,"%s\n", CCerror.c_str()); fprintf(stderr,"%s\n", CCerror.c_str());
} }
} else { }
CCerror = "amount must be positive"; else
fprintf(stderr,"%s\n", CCerror.c_str()); {
CCerror = "amount must be more than txfee";
fprintf(stderr,"%s\n", CCerror.c_str());
} }
fprintf(stderr,"amount %.8f -> reward %.8f\n",(double)amount/COIN,(double)reward/COIN); fprintf(stderr,"amount %.8f -> reward %.8f\n",(double)amount/COIN,(double)reward/COIN);
return(""); return("");