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

Merge remote-tracking branch 'jl/dev' into momo

Browse Source
This commit is contained in:
Scott Sadler
2018-05-30 21:34:07 -03:00
parent 91d929221c 5e193eea72
commit c3aa599831
14 changed files with 90 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/komodo_notary.h
View File

@@ -393,7 +393,7 @@ struct notarized_checkpoint *komodo_npptr_for_height(int32_t height, int *idx)
{
*idx = i;
np = &sp->NPOINTS[i];
if ( np->MoMdepth > 0 && height > np->notarized_height-np->MoMdepth && height <= np->notarized_height )
if ( np->MoMdepth != 0 && height > np->notarized_height-(np->MoMdepth&0xffff) && height <= np->notarized_height )
return(np);
}
}
@@ -464,7 +464,7 @@ int32_t komodo_MoMdata(int32_t *notarized_htp,uint256 *MoMp,uint256 *kmdtxidp,in
*MoMoMdepthp = np->MoMoMdepth;
*kmdstartip = np->kmdstarti;
*kmdendip = np->kmdendi;
return(np->MoMdepth);
return(np->MoMdepth & 0xffff);
}
*notarized_htp = *MoMoMoffsetp = *MoMoMdepthp = *kmdstartip = *kmdendip = 0;
memset(MoMp,0,sizeof(*MoMp));