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

Fix

Browse Source
This commit is contained in:
jl777
2018-03-24 14:02:43 +02:00
parent 375a0ca39d
commit 66b1416d7d
2 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/komodo_notary.h
View File

@@ -398,23 +398,28 @@ int32_t komodo_notarized_height(uint256 *hashp,uint256 *txidp)
} }
} }
int32_t komodo_MoMdata(int32_t *notarized_htp,uint256 *MoMp,int32_t nHeight) int32_t komodo_MoMdata(int32_t *notarized_htp,uint256 *MoMp,uint256 *kmdtxidp,int32_t nHeight)
{ {
int32_t i; struct komodo_state *sp; struct notarized_checkpoint *np = 0; int32_t i; char symbol[KOMODO_ASSETCHAIN_MAXLEN],dest[KOMODO_ASSETCHAIN_MAXLEN]; struct komodo_state *sp; struct notarized_checkpoint *np = 0;
np = 0; np = 0;
for (i=sp->NUM_NPOINTS-1; i>=0; i--) if ( (sp= komodo_stateptr(symbol,dest)) != 0 )
{ {
np = &sp->NPOINTS[i]; for (i=sp->NUM_NPOINTS-1; i>=0; i--)
if ( np->MoMdepth > 0 && nHeight > np->nHeight-np->MoMdepth && nHeight <= np->nHeight )
{ {
printf("komodo_MoMdata %d i.%d np->ht %d MoMdepth.%d\n",nHeight,i,np->nHeight,np->MoMdepth); np = &sp->NPOINTS[i];
*notarized_htp = np->nHeight; if ( np->MoMdepth > 0 && nHeight > np->nHeight-np->MoMdepth && nHeight <= np->nHeight )
*MoMp = np->MoM; {
return(np->MoMdepth); printf("komodo_MoMdata.(%s -> %s) %d i.%d np->ht %d MoMdepth.%d\n",symbol,dest,nHeight,i,np->nHeight,np->MoMdepth);
*notarized_htp = np->nHeight;
*MoMp = np->MoM;
*kmdtxidp = np->NOTARIZED_DESTTXID;
return(np->MoMdepth);
}
} }
} }
*notarized_htp = 0; *notarized_htp = 0;
memset(MoMp,0,sizeof(*MoMp)); memset(MoMp,0,sizeof(*MoMp));
memset(kmdtxidp,0,sizeof(*kmdtxidp));
return(0); return(0);
} }

8
src/rpcblockchain.cpp
View File

@@ -588,7 +588,15 @@ UniValue height_MoM(const UniValue& params, bool fHelp)
LOCK(cs_main); LOCK(cs_main);
height = atoi(params[0].get_str().c_str()); height = atoi(params[0].get_str().c_str());
if ( height <= 0 ) if ( height <= 0 )
{
if ( chainActive.Tip() == 0 )
{
ret.push_back(Pair("error",(char *)"no active chain yet"));
return(ret)
}
height = chainActive.Tip()->nHeight; height = chainActive.Tip()->nHeight;
}
fprintf(stderr,"height_MoM height.%d\n",height);
depth = komodo_MoMdata(&notarized_height,&MoM,height); depth = komodo_MoMdata(&notarized_height,&MoM,height);
ret.push_back(Pair("coin",(char *)(ASSETCHAINS_SYMBOL[0] == 0 ? "KMD" : ASSETCHAINS_SYMBOL))); ret.push_back(Pair("coin",(char *)(ASSETCHAINS_SYMBOL[0] == 0 ? "KMD" : ASSETCHAINS_SYMBOL)));
ret.push_back(Pair("height",height)); ret.push_back(Pair("height",height));