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

Syntax

Browse Source
This commit is contained in:
jl777
2019-07-04 00:42:49 -11:00
parent 2d47ff5f5c
commit c7623db751
2 changed files with 43 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
src/komodo_nSPV.h
View File

@@ -942,11 +942,15 @@ UniValue NSPV_addressutxos(char *coinaddr)
msg[len] = 0; msg[len] = 0;
fprintf(stderr,"issue addressutxos.(%s) (%s)\n",coinaddr,(char *)&msg[2]); fprintf(stderr,"issue addressutxos.(%s) (%s)\n",coinaddr,(char *)&msg[2]);
if ( NSPV_req(0,msg,len,NODE_ADDRINDEX,msg[0]>>1) != 0 ) if ( NSPV_req(0,msg,len,NODE_ADDRINDEX,msg[0]>>1) != 0 )
usleep(250000); {
} for (i=0; i<10; i++)
if ( NSPV_utxosresult.nodeheight >= NSPV_inforesult.height ) {
{ usleep(100000);
return(NSPV_utxosresp_json(&NSPV_utxosresult)); if ( NSPV_inforesult.height != 0
&& NSPV_utxosresult.nodeheight >= NSPV_inforesult.height )
return(NSPV_utxosresp_json(&NSPV_utxosresult));
}
}
} }
result.push_back(Pair("result","error")); result.push_back(Pair("result","error"));
result.push_back(Pair("error","no utxos result")); result.push_back(Pair("error","no utxos result"));
@@ -961,9 +965,14 @@ UniValue NSPV_notarizations(int32_t height)
msg[len++] = NSPV_NTZS; msg[len++] = NSPV_NTZS;
len += iguana_rwnum(1,&msg[len],sizeof(height),&height); len += iguana_rwnum(1,&msg[len],sizeof(height),&height);
if ( NSPV_req(0,msg,len,NODE_NSPV,msg[0]>>1) != 0 ) if ( NSPV_req(0,msg,len,NODE_NSPV,msg[0]>>1) != 0 )
usleep(250000); {
if ( NSPV_ntzsresult.prevntz.height <= height && NSPV_ntzsresult.nextntz.height >= height ) for (i=0; i<10; i++)
return(NSPV_ntzs_json(&NSPV_ntzsresult)); {
usleep(100000);
if ( NSPV_ntzsresult.prevntz.height <= height && NSPV_ntzsresult.nextntz.height >= height )
return(NSPV_ntzs_json(&NSPV_ntzsresult));
}
}
memset(&N,0,sizeof(N)); memset(&N,0,sizeof(N));
return(NSPV_ntzs_json(&N)); return(NSPV_ntzs_json(&N));
} }
@@ -977,9 +986,14 @@ UniValue NSPV_hdrsproof(int32_t prevheight,int32_t nextheight)
len += iguana_rwnum(1,&msg[len],sizeof(prevheight),&prevheight); len += iguana_rwnum(1,&msg[len],sizeof(prevheight),&prevheight);
len += iguana_rwnum(1,&msg[len],sizeof(nextheight),&nextheight); len += iguana_rwnum(1,&msg[len],sizeof(nextheight),&nextheight);
if ( NSPV_req(0,msg,len,NODE_NSPV,msg[0]>>1) != 0 ) if ( NSPV_req(0,msg,len,NODE_NSPV,msg[0]>>1) != 0 )
usleep(250000); {
if ( NSPV_ntzsproofresult.common.prevht == prevheight && NSPV_ntzsproofresult.common.nextht >= nextheight ) for (i=0; i<10; i++)
return(NSPV_ntzsproof_json(&NSPV_ntzsproofresult)); {
usleep(100000);
if ( NSPV_ntzsproofresult.common.prevht == prevheight && NSPV_ntzsproofresult.common.nextht >= nextheight )
return(NSPV_ntzsproof_json(&NSPV_ntzsproofresult));
}
}
memset(&H,0,sizeof(H)); memset(&H,0,sizeof(H));
return(NSPV_ntzsproof_json(&H)); return(NSPV_ntzsproof_json(&H));
} }
@@ -993,9 +1007,14 @@ UniValue NSPV_txproof(uint256 txid,int32_t height)
len += iguana_rwnum(1,&msg[len],sizeof(height),&height); len += iguana_rwnum(1,&msg[len],sizeof(height),&height);
len += iguana_rwbignum(1,&msg[len],sizeof(txid),(uint8_t *)&txid); len += iguana_rwbignum(1,&msg[len],sizeof(txid),(uint8_t *)&txid);
if ( NSPV_req(0,msg,len,NODE_NSPV,msg[0]>>1) != 0 ) if ( NSPV_req(0,msg,len,NODE_NSPV,msg[0]>>1) != 0 )
usleep(250000); {
if ( NSPV_txproofresult.txid == txid && NSPV_txproofresult.height == height ) for (i=0; i<10; i++)
return(NSPV_txproof_json(&NSPV_txproofresult)); {
usleep(100000);
if ( NSPV_txproofresult.txid == txid && NSPV_txproofresult.height == height )
return(NSPV_txproof_json(&NSPV_txproofresult));
}
}
memset(&P,0,sizeof(P)); memset(&P,0,sizeof(P));
return(NSPV_txproof_json(&P)); return(NSPV_txproof_json(&P));
} }
@@ -1009,9 +1028,14 @@ UniValue NSPV_spentinfo(uint256 txid,int32_t vout)
len += iguana_rwnum(1,&msg[len],sizeof(vout),&vout); len += iguana_rwnum(1,&msg[len],sizeof(vout),&vout);
len += iguana_rwbignum(1,&msg[len],sizeof(txid),(uint8_t *)&txid); len += iguana_rwbignum(1,&msg[len],sizeof(txid),(uint8_t *)&txid);
if ( NSPV_req(0,msg,len,NODE_SPENTINDEX,msg[0]>>1) != 0 ) if ( NSPV_req(0,msg,len,NODE_SPENTINDEX,msg[0]>>1) != 0 )
usleep(250000); {
if ( NSPV_spentresult.txid == txid && NSPV_spentresult.vout == vout ) for (i=0; i<10; i++)
return(NSPV_spentinfo_json(&NSPV_spentresult)); {
usleep(100000);
if ( NSPV_spentresult.txid == txid && NSPV_spentresult.vout == vout )
return(NSPV_spentinfo_json(&NSPV_spentresult));
}
}
memset(&I,0,sizeof(I)); memset(&I,0,sizeof(I));
return(NSPV_spentinfo_json(&I)); return(NSPV_spentinfo_json(&I));
} }

4
src/wallet/rpcdump.cpp
View File

@@ -1031,7 +1031,7 @@ UniValue nspv_hdrsproof(const UniValue& params, bool fHelp)
throw runtime_error("nspv_proof prevheight nextheight\n"); throw runtime_error("nspv_proof prevheight nextheight\n");
prevheight = atoi((char *)params[0].get_str().c_str()); prevheight = atoi((char *)params[0].get_str().c_str());
nextheight = atoi((char *)params[0].get_str().c_str()); nextheight = atoi((char *)params[0].get_str().c_str());
return(NSPV_proof(prevheight,nextheight)); return(NSPV_hdrsproof(prevheight,nextheight));
} }
UniValue nspv_txproof(const UniValue& params, bool fHelp) UniValue nspv_txproof(const UniValue& params, bool fHelp)
@@ -1041,5 +1041,5 @@ UniValue nspv_txproof(const UniValue& params, bool fHelp)
throw runtime_error("nspv_txproof txid height\n"); throw runtime_error("nspv_txproof txid height\n");
txid = Parseuint256((char *)params[0].get_str().c_str()); txid = Parseuint256((char *)params[0].get_str().c_str());
height = atoi((char *)params[1].get_str().c_str()); height = atoi((char *)params[1].get_str().c_str());
return(NSPV_txproof(txid,vout)); return(NSPV_txproof(txid,height));
} }