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-21 09:04:45 -03:00
parent dae9e3bbf1
commit a5f315c78c
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/komodo.h
View File

@@ -270,7 +270,7 @@ void komodo_notarysinit(int32_t height,uint8_t pubkeys[64][33],int32_t num)
pthread_mutex_unlock(&komodo_mutex); pthread_mutex_unlock(&komodo_mutex);
} }
int32_t komodo_heightnotary(int32_t *notaryidp,int32_t height,uint8_t *pubkey33) int32_t komodo_chosennotary(int32_t *notaryidp,int32_t height,uint8_t *pubkey33)
{ {
// -1 if not notary, 0 if notary, 1 if special notary // -1 if not notary, 0 if notary, 1 if special notary
struct knotary_entry *kp; int32_t numnotaries,modval = -1; struct knotary_entry *kp; int32_t numnotaries,modval = -1;
@@ -421,7 +421,7 @@ int32_t komodo_stateupdate(int32_t height,uint8_t notarypubs[][33],uint8_t numno
int32_t komodo_voutupdate(int32_t notaryid,uint8_t *scriptbuf,int32_t scriptlen,int32_t height,uint256 txhash,int32_t i,int32_t j,uint64_t *voutmaskp,int32_t *specialtxp,int32_t *notarizedheightp) int32_t komodo_voutupdate(int32_t notaryid,uint8_t *scriptbuf,int32_t scriptlen,int32_t height,uint256 txhash,int32_t i,int32_t j,uint64_t *voutmaskp,int32_t *specialtxp,int32_t *notarizedheightp)
{ {
int32_t k,opretlen,len = 0; uint256 kmdtxid,btctxid; uint8_t crypto777[33]; int32_t k,opretlen,nid,len = 0; uint256 kmdtxid,btctxid; uint8_t crypto777[33];
if ( scriptlen == 35 && scriptbuf[0] == 33 && scriptbuf[34] == 0xac ) if ( scriptlen == 35 && scriptbuf[0] == 33 && scriptbuf[34] == 0xac )
{ {
decode_hex(crypto777,33,(char *)CRYPTO777_PUBSECPSTR); decode_hex(crypto777,33,(char *)CRYPTO777_PUBSECPSTR);
@@ -436,19 +436,19 @@ int32_t komodo_voutupdate(int32_t notaryid,uint8_t *scriptbuf,int32_t scriptlen,
*specialtxp = 1; *specialtxp = 1;
printf(">>>>>>>> "); printf(">>>>>>>> ");
} }
else if ( (k= komodo_heightnotary(height,scriptbuf + 1)) >= 0 ) else if ( komodo_chosennotary(&nid,height,scriptbuf + 1) >= 0 )
{ {
//printf("found notary.k%d\n",k); //printf("found notary.k%d\n",k);
if ( notaryid < 64 ) if ( notaryid < 64 )
{ {
if ( notaryid < 0 ) if ( notaryid < 0 )
{ {
notaryid = k; notaryid = nid;
*voutmaskp |= (1LL << j); *voutmaskp |= (1LL << j);
} }
else if ( notaryid != k ) else if ( notaryid != nid )
{ {
printf("mismatch notaryid.%d k.%d\n",notaryid,k); printf("mismatch notaryid.%d k.%d\n",notaryid,nid);
notaryid = 64; notaryid = 64;
*voutmaskp = 0; *voutmaskp = 0;
} }
@@ -525,7 +525,7 @@ void komodo_connectblock(CBlockIndex *pindex,CBlock& block)
} }
} }
} }
if ( notaryid >= 0 && voutmask != 0 ) if ( notaryid >= 0 && notaryid < 64 && voutmask != 0 )
komodo_nutxoadd(1,height,notaryid,txhash,voutmask,numvouts); komodo_nutxoadd(1,height,notaryid,txhash,voutmask,numvouts);
signedmask = 0; signedmask = 0;
numvins = block.vtx[i].vin.size(); numvins = block.vtx[i].vin.size();

4
src/pow.cpp
View File

@@ -104,7 +104,7 @@ bool CheckEquihashSolution(const CBlockHeader *pblock, const CChainParams& param
return true; return true;
} }
int32_t komodo_heightnotary(int32_t *notaryidp,int32_t height,uint8_t *pubkey33); int32_t komodo_chosennotary(int32_t *notaryidp,int32_t height,uint8_t *pubkey33);
bool CheckProofOfWork(int32_t height,uint8_t *pubkey33,uint256 hash, unsigned int nBits, const Consensus::Params& params) bool CheckProofOfWork(int32_t height,uint8_t *pubkey33,uint256 hash, unsigned int nBits, const Consensus::Params& params)
{ {
@@ -114,7 +114,7 @@ bool CheckProofOfWork(int32_t height,uint8_t *pubkey33,uint256 hash, unsigned in
bnTarget.SetCompact(nBits, &fNegative, &fOverflow); bnTarget.SetCompact(nBits, &fNegative, &fOverflow);
if ( height > 34000 ) // 0 -> non-special notary if ( height > 34000 ) // 0 -> non-special notary
{ {
special = komodo_heightnotary(&notaryid,height,pubkey33); special = komodo_chosennotary(&notaryid,height,pubkey33);
for (i=0; i<33; i++) for (i=0; i<33; i++)
{ {
if ( pubkey33[i] != 0 ) if ( pubkey33[i] != 0 )