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

tst

Browse Source
This commit is contained in:
jl777
2018-07-24 07:30:20 -11:00
parent 06b1503b44
commit 05c8a62689
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/cc/rewards.cpp
View File

@@ -165,7 +165,7 @@ uint64_t RewardsPlanFunds(uint64_t &refsbits,struct CCcontract_info *cp,CPubKey
{ {
if ( GetTransaction(it->first.txhash,vintx,hashBlock,false) != 0 ) if ( GetTransaction(it->first.txhash,vintx,hashBlock,false) != 0 )
{ {
xxx if ( (nValue= IsRewardsvout(cp,vintx,(int32_t)it->first.index)) > 0 ) if ( (nValue= IsRewardsvout(cp,vintx,(int32_t)it->first.index)) > 0 )
{ {
totalinputs += nValue; totalinputs += nValue;
} }
@@ -182,7 +182,7 @@ std::string RewardsUnlock(uint64_t txfee)
txfee = 10000; txfee = 10000;
rewardspk = GetUnspendable(cp,0); rewardspk = GetUnspendable(cp,0);
mypk = pubkey2pk(Mypubkey()); mypk = pubkey2pk(Mypubkey());
if ( (amount= AddRewardsInputs(cp,mtx,mypk,(1LL << 30),1)) > 0 && (reward= RewardsCalc(claim,mtx.vin[0].prevout.hash)) > txfee ) if ( (amount= AddRewardsInputs(cp,mtx,mypk,(1LL << 30),1)) > 0 && (reward= RewardsCalc(amount,mtx.vin[0].prevout.hash)) > txfee )
{ {
if ( (inputs= AddRewardsInputs(cp,mtx,mypk,reward+amount+txfee,30)) > 0 ) if ( (inputs= AddRewardsInputs(cp,mtx,mypk,reward+amount+txfee,30)) > 0 )
{ {
@@ -191,7 +191,7 @@ std::string RewardsUnlock(uint64_t txfee)
if ( CCchange != 0 ) if ( CCchange != 0 )
mtx.vout.push_back(MakeCC1vout(cp->evalcode,CCchange,rewardspk)); mtx.vout.push_back(MakeCC1vout(cp->evalcode,CCchange,rewardspk));
mtx.vout.push_back(CTxOut(amount+reward,CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG)); mtx.vout.push_back(CTxOut(amount+reward,CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG));
opret << OP_RETURN << E_MARSHAL(ss << cp->evalcode << 'U' << sbits); opret << OP_RETURN << E_MARSHAL(ss << cp->evalcode << 'U');
return(FinalizeCCTx(cp,mtx,mypk,txfee,opret)); return(FinalizeCCTx(cp,mtx,mypk,txfee,opret));
} }
} else fprintf(stderr,"cant find rewards inputs\n"); } else fprintf(stderr,"cant find rewards inputs\n");