jl777 7 years ago
parent
commit
6ca9d65183
  1. 6
      iguana/exchanges/LP_rpc.c
  2. 9
      iguana/exchanges/LP_utxo.c

6
iguana/exchanges/LP_rpc.c

@ -549,7 +549,7 @@ cJSON *LP_importprivkey(char *symbol,char *wifstr,char *label,int32_t flag)
int32_t LP_importaddress(char *symbol,char *address) int32_t LP_importaddress(char *symbol,char *address)
{ {
char buf[1024],*retstr; cJSON *validatejson,*retjson; int32_t isvalid=0,doneflag = 0; struct iguana_info *coin; char buf[1024],*retstr; cJSON *validatejson; int32_t isvalid=0,doneflag = 0; struct iguana_info *coin;
if ( symbol == 0 || symbol[0] == 0 ) if ( symbol == 0 || symbol[0] == 0 )
return(-2); return(-2);
coin = LP_coinfind(symbol); coin = LP_coinfind(symbol);
@ -557,11 +557,11 @@ int32_t LP_importaddress(char *symbol,char *address)
return(-2); return(-2);
if ( coin->electrum != 0 ) if ( coin->electrum != 0 )
{ {
if ( (retjson= electrum_address_subscribe(symbol,coin->electrum,&retjson,address)) != 0 ) /*if ( (retjson= electrum_address_subscribe(symbol,coin->electrum,&retjson,address)) != 0 )
{ {
printf("importaddress.(%s) -> %s\n",address,jprint(retjson,0)); printf("importaddress.(%s) -> %s\n",address,jprint(retjson,0));
free_json(retjson); free_json(retjson);
} }*/
return(0); return(0);
} }
else else

9
iguana/exchanges/LP_utxo.c

@ -531,9 +531,12 @@ int32_t LP_numconfirms(char *symbol,char *coinaddr,bits256 txid,int32_t vout,int
else else
{ {
if ( (ht= LP_txheight(coin,txid)) > 0 && ht <= coin->height ) if ( (ht= LP_txheight(coin,txid)) > 0 && ht <= coin->height )
numconfirms = (coin->height - ht); numconfirms = (LP_getheight(coin) - ht);
else if ( mempool != 0 && LP_waitmempool(symbol,coinaddr,txid,-1) >= 0 ) else if ( mempool != 0 )
numconfirms = 0; {
if (LP_waitmempool(symbol,coinaddr,txid,30) >= 0 )
numconfirms = 0;
}
} }
//#endif //#endif
return(numconfirms); return(numconfirms);

Loading…
Cancel
Save