This commit is contained in:
jl777
2018-04-09 21:52:41 +03:00
parent e12ea51956
commit d3b5a9083e

View File

@@ -672,15 +672,17 @@ uint64_t komodo_commission(const CBlock &block)
uint32_t komodo_stake(arith_uint256 bnTarget,int32_t nHeight,uint256 txid,int32_t vout,uint32_t blocktime,uint32_t prevtime) uint32_t komodo_stake(arith_uint256 bnTarget,int32_t nHeight,uint256 txid,int32_t vout,uint32_t blocktime,uint32_t prevtime)
{ {
CBlockIndex *pindex; arith_uint256 hashval; uint256 hash; int32_t i,iter=0; uint32_t txtime,winner = 0; uint64_t diff,value,coinage,supply = ASSETCHAINS_SUPPLY + nHeight*ASSETCHAINS_REWARD/SATOSHIDEN; CBlockIndex *pindex; arith_uint256 hashval; uint256 hash; int32_t minage,i,iter=0; uint32_t txtime,winner = 0; uint64_t diff,value,coinage,supply = ASSETCHAINS_SUPPLY + nHeight*ASSETCHAINS_REWARD/SATOSHIDEN;
if ( nHeight < 200 ) if ( nHeight < 30 )
return(blocktime); return(blocktime);
txtime = komodo_txtime(&value,txid,vout); txtime = komodo_txtime(&value,txid,vout);
if ( value == 0 ) if ( value == 0 )
return(0); return(0);
if ( txtime == 0 ) if ( txtime == 0 )
txtime = prevtime; txtime = prevtime;
if ( blocktime > txtime+6000 && (pindex= komodo_chainactive(nHeight-200)) != 0 ) if ( (minage= nHeight*30) > 6000 )
minage = 6000;
if ( blocktime > txtime+minage && (pindex= komodo_chainactive(nHeight>200?nHeight-200:1)) != 0 )
{ {
hash = pindex->GetBlockHash(); // hash pubkey hash = pindex->GetBlockHash(); // hash pubkey
diff = (blocktime - txtime); diff = (blocktime - txtime);
@@ -794,7 +796,7 @@ int32_t komodo_check_deposit(int32_t height,const CBlock& block,uint32_t prevtim
} }
bnTarget.SetCompact(block.nBits, &fNegative, &fOverflow); bnTarget.SetCompact(block.nBits, &fNegative, &fOverflow);
eligible = komodo_stake(bnTarget,height,block.vtx[txn_count-1].vin[0].prevout.hash,block.vtx[txn_count-1].vin[0].prevout.n,block.nTime,prevtime); eligible = komodo_stake(bnTarget,height,block.vtx[txn_count-1].vin[0].prevout.hash,block.vtx[txn_count-1].vin[0].prevout.n,block.nTime,prevtime);
if ( eligible == 0 || eligible > block.nTime ) if ( height > 100 && (eligible == 0 || eligible > block.nTime) )
{ {
fprintf(stderr,"eligible.%u vs blocktime.%u, lag.%d\n",eligible,(uint32_t)block.nTime,(int32_t)(eligible - block.nTime)); fprintf(stderr,"eligible.%u vs blocktime.%u, lag.%d\n",eligible,(uint32_t)block.nTime,(int32_t)(eligible - block.nTime));
return(-1); return(-1);