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

test

Browse Source
This commit is contained in:
jl777
2016-10-22 10:37:11 -03:00
parent 09c5c3d332
commit b927fb3535
2 changed files with 27 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/komodo.h
View File

@@ -21,7 +21,6 @@
#include <pthread.h> #include <pthread.h>
#include "uthash.h" #include "uthash.h"
#define KOMODO_INTEREST ((uint64_t)0.05 * COIN)
#include "komodo_interest.h" #include "komodo_interest.h"
#define KOMODO_TESTNET_EXPIRATION 60000 #define KOMODO_TESTNET_EXPIRATION 60000
@@ -244,11 +243,34 @@ int32_t komodo_threshold(int32_t height,uint64_t signedmask)
for (i=0; i<numnotaries; i++) for (i=0; i<numnotaries; i++)
if ( ((1LL << i) & signedmask) != 0 ) if ( ((1LL << i) & signedmask) != 0 )
wt++; wt++;
if ( wt > (numnotaries >> 1) || (wt > numnotaries/5 && (signedmask & 3) != 0) ) if ( wt > (numnotaries >> 1) || (wt > 7 && (signedmask & 3) != 0) )
return(1); // N/2+1 || N/3 + devsig return(1); // N/2+1 || N/3 + devsig
else return(0); else return(0);
} }
uint32_t komodo_txtime(uint256 hash)
{
CTransaction tx;
uint256 hashBlock;
if (!GetTransaction(hash, tx, hashBlock, true))
{
//printf("null GetTransaction\n");
return(tx.nLockTime);
}
/*if (!hashBlock.IsNull()) {
BlockMap::iterator mi = mapBlockIndex.find(hashBlock);
if (mi != mapBlockIndex.end() && (*mi).second)
{
CBlockIndex* pindex = (*mi).second;
if (chainActive.Contains(pindex))
return(pindex->GetBlockTime());
}
//printf("cant find in iterator\n");
}*/
//printf("null hashBlock\n");
return(0);
}
void komodo_nutxoadd(int32_t addflag,int32_t height,int32_t notaryid,uint256 txhash,uint64_t voutmask,int32_t numvouts) void komodo_nutxoadd(int32_t addflag,int32_t height,int32_t notaryid,uint256 txhash,uint64_t voutmask,int32_t numvouts)
{ {
struct nutxo_entry *np; struct nutxo_entry *np;

27
src/komodo_interest.h
View File

@@ -1,31 +1,10 @@
uint32_t komodo_txtime(uint256 hash)
{
CTransaction tx; #define KOMODO_INTEREST ((uint64_t)0.05 * COIN)
uint256 hashBlock;
if (!GetTransaction(hash, tx, hashBlock, true))
{
//printf("null GetTransaction\n");
return(tx.nLockTime);
}
/*if (!hashBlock.IsNull()) {
BlockMap::iterator mi = mapBlockIndex.find(hashBlock);
if (mi != mapBlockIndex.end() && (*mi).second)
{
CBlockIndex* pindex = (*mi).second;
if (chainActive.Contains(pindex))
return(pindex->GetBlockTime());
}
//printf("cant find in iterator\n");
}*/
//printf("null hashBlock\n");
return(0);
}
uint64_t komodo_interest(uint64_t nValue,uint32_t nLockTime,uint32_t tiptime) uint64_t komodo_interest(uint64_t nValue,uint32_t nLockTime,uint32_t tiptime)
{ {
int32_t minutes; uint64_t interest = 0; int32_t minutes; uint64_t interest = 0;
if ( tiptime == 0 )
tiptime = chainActive.Tip()->nTime;
if ( nLockTime >= LOCKTIME_THRESHOLD && tiptime != 0 && nLockTime < tiptime && nValue >= COIN ) if ( nLockTime >= LOCKTIME_THRESHOLD && tiptime != 0 && nLockTime < tiptime && nValue >= COIN )
{ {
minutes = (tiptime - nLockTime) / 60; minutes = (tiptime - nLockTime) / 60;