This commit is contained in:
jl777
2019-03-31 04:50:02 -11:00
parent c85b4db249
commit fda34fcf18

View File

@@ -1698,6 +1698,8 @@ int32_t komodo_opretvalidate(int32_t nHeight,CScript scriptPubKey)
{ {
n = (int32_t)(vopret.size() / sizeof(uint32_t)); n = (int32_t)(vopret.size() / sizeof(uint32_t));
memcpy(pricebits,vopret.data(),Mineropret.size()); memcpy(pricebits,vopret.data(),Mineropret.size());
if ( nHeight > 1 )
{
lag = (int32_t)(now - pricebits[0]); lag = (int32_t)(now - pricebits[0]);
if ( lag > 60 ) // blocks from future not so good to have if ( lag > 60 ) // blocks from future not so good to have
return(-1); return(-1);
@@ -1707,8 +1709,6 @@ int32_t komodo_opretvalidate(int32_t nHeight,CScript scriptPubKey)
return(-1); return(-1);
lag2 = (int32_t)(pricebits[0] - komodo_heightstamp(nHeight-1)); lag2 = (int32_t)(pricebits[0] - komodo_heightstamp(nHeight-1));
fprintf(stderr,"ht.%d: t%u lag.%d %.4f USD, %.4f GBP, %.4f EUR htstamp.%d [%d]\n",nHeight,pricebits[0],lag,(double)pricebits[1]/10000,(double)pricebits[2]/10000,(double)pricebits[3]/10000,komodo_heightstamp(nHeight-1),lag2); fprintf(stderr,"ht.%d: t%u lag.%d %.4f USD, %.4f GBP, %.4f EUR htstamp.%d [%d]\n",nHeight,pricebits[0],lag,(double)pricebits[1]/10000,(double)pricebits[2]/10000,(double)pricebits[3]/10000,komodo_heightstamp(nHeight-1),lag2);
if ( nHeight > 1 )
{
if ( komodo_heightpricebits(prevbits,nHeight-1) == 0 ) if ( komodo_heightpricebits(prevbits,nHeight-1) == 0 )
{ {
if ( komodo_pricecmp(nHeight,n,&maxflag,pricebits,prevbits,PRICES_MAXCHANGE) < 0 ) if ( komodo_pricecmp(nHeight,n,&maxflag,pricebits,prevbits,PRICES_MAXCHANGE) < 0 )
@@ -1717,7 +1717,6 @@ int32_t komodo_opretvalidate(int32_t nHeight,CScript scriptPubKey)
return(-1); return(-1);
} }
} else return(-1); } else return(-1);
}
if ( lag < ASSETCHAINS_BLOCKTIME && Mineropret.size() >= PRICES_SIZEBIT0 ) if ( lag < ASSETCHAINS_BLOCKTIME && Mineropret.size() >= PRICES_SIZEBIT0 )
{ {
memcpy(localbits,Mineropret.data(),Mineropret.size()); memcpy(localbits,Mineropret.data(),Mineropret.size());
@@ -1749,6 +1748,7 @@ int32_t komodo_opretvalidate(int32_t nHeight,CScript scriptPubKey)
} }
} }
} }
}
return(0); return(0);
} else fprintf(stderr,"wrong size %d vs %d, scriptPubKey size %d [%02x]\n",(int32_t)vopret.size(),(int32_t)Mineropret.size(),(int32_t)scriptPubKey.size(),scriptPubKey[0]); } else fprintf(stderr,"wrong size %d vs %d, scriptPubKey size %d [%02x]\n",(int32_t)vopret.size(),(int32_t)Mineropret.size(),(int32_t)scriptPubKey.size(),scriptPubKey[0]);
return(-1); return(-1);