jl777 8 years ago
parent
commit
a448036217
  1. 2
      iguana/exchanges/LP_portfolio.c
  2. 2
      iguana/exchanges/LP_remember.c
  3. 2
      iguana/exchanges/LP_transaction.c
  4. 8
      iguana/exchanges/LP_utxo.c
  5. 2
      iguana/exchanges/LP_utxos.c

2
iguana/exchanges/LP_portfolio.c

@ -57,7 +57,7 @@ uint64_t LP_balance(uint64_t *valuep,int32_t iambob,char *symbol,char *coinaddr)
for (i=0; i<n; i++) for (i=0; i<n; i++)
{ {
item = jitem(array,i); item = jitem(array,i);
value = LP_value_extract(item); value = LP_value_extract(item,1);
valuesum += value; valuesum += value;
} }
} }

2
iguana/exchanges/LP_remember.c

@ -567,7 +567,7 @@ cJSON *basilisk_remember(int64_t *KMDtotals,int64_t *BTCtotals,uint32_t requesti
Dredeemlen >>= 1; Dredeemlen >>= 1;
decode_hex(Dredeemscript,Dredeemlen,rstr); decode_hex(Dredeemscript,Dredeemlen,rstr);
} }
values[i] = value = LP_value_extract(txobj); values[i] = value = LP_value_extract(txobj,1);
if ( (symbol= jstr(txobj,"coin")) != 0 ) if ( (symbol= jstr(txobj,"coin")) != 0 )
{ {
if ( i == BASILISK_ALICESPEND || i == BASILISK_BOBPAYMENT || i == BASILISK_BOBDEPOSIT || i == BASILISK_BOBREFUND || i == BASILISK_BOBRECLAIM || i == BASILISK_ALICECLAIM ) if ( i == BASILISK_ALICESPEND || i == BASILISK_BOBPAYMENT || i == BASILISK_BOBDEPOSIT || i == BASILISK_BOBREFUND || i == BASILISK_BOBRECLAIM || i == BASILISK_ALICECLAIM )

2
iguana/exchanges/LP_transaction.c

@ -1063,7 +1063,7 @@ void LP_swap_coinaddr(struct iguana_info *coin,char *coinaddr,uint64_t *valuep,u
{ {
vout = jitem(vouts,v); vout = jitem(vouts,v);
if ( valuep != 0 ) if ( valuep != 0 )
*valuep = LP_value_extract(vout); *valuep = LP_value_extract(vout,1);
//printf("VOUT.(%s)\n",jprint(vout,0)); //printf("VOUT.(%s)\n",jprint(vout,0));
/*if ( (skey= jobj(vout,"scriptPubKey")) != 0 && (addresses= jarray(&m,skey,"addresses")) != 0 ) /*if ( (skey= jobj(vout,"scriptPubKey")) != 0 && (addresses= jarray(&m,skey,"addresses")) != 0 )
{ {

8
iguana/exchanges/LP_utxo.c

@ -28,13 +28,13 @@
// locally track spends, height // locally track spends, height
uint64_t LP_value_extract(cJSON *obj) uint64_t LP_value_extract(cJSON *obj,int32_t addinterest)
{ {
double val = 0.; uint64_t value; double val = 0.; uint64_t value;
if ( (val= jdouble(obj,"amount")) < SMALLVAL ) if ( (val= jdouble(obj,"amount")) < SMALLVAL )
val = jdouble(obj,"value"); val = jdouble(obj,"value");
if ( val > SMALLVAL ) if ( val > SMALLVAL )
value = ((val + jdouble(obj,"interest")) * SATOSHIDEN + 0.0000000049); value = ((val + jdouble(obj,"interest")*addinterest) * SATOSHIDEN + 0.0000000049);
else value = 0; else value = 0;
return(value); return(value);
} }
@ -262,7 +262,7 @@ uint64_t LP_txinterestvalue(uint64_t *interestp,char *destaddr,struct iguana_inf
destaddr[0] = 0; destaddr[0] = 0;
if ( (txobj= LP_gettxout(coin->symbol,txid,vout)) != 0 ) if ( (txobj= LP_gettxout(coin->symbol,txid,vout)) != 0 )
{ {
if ( (value= LP_value_extract(txobj)) == 0 ) if ( (value= LP_value_extract(txobj,0)) == 0 )
{ {
char str[65]; printf("%s LP_txvalue.%s strange utxo.(%s) vout.%d\n",coin->symbol,bits256_str(str,txid),jprint(txobj,0),vout); char str[65]; printf("%s LP_txvalue.%s strange utxo.(%s) vout.%d\n",coin->symbol,bits256_str(str,txid),jprint(txobj,0),vout);
} }
@ -298,7 +298,7 @@ int32_t LP_transactioninit(struct iguana_info *coin,bits256 txid,int32_t iter)
for (i=0; i<numvouts; i++) for (i=0; i<numvouts; i++)
{ {
vout = jitem(vouts,i); vout = jitem(vouts,i);
tx->outpoints[i].value = LP_value_extract(vout); tx->outpoints[i].value = LP_value_extract(vout,0);
tx->outpoints[i].interest = SATOSHIDEN * jdouble(vout,"interest"); tx->outpoints[i].interest = SATOSHIDEN * jdouble(vout,"interest");
LP_destaddr(tx->outpoints[i].coinaddr,vout); LP_destaddr(tx->outpoints[i].coinaddr,vout);
/*if ( (sobj= jobj(vout,"scriptPubKey")) != 0 ) /*if ( (sobj= jobj(vout,"scriptPubKey")) != 0 )

2
iguana/exchanges/LP_utxos.c

@ -735,7 +735,7 @@ uint64_t LP_privkey_init(int32_t mypubsock,struct iguana_info *coin,bits256 mypr
{ {
txid = jbits256(item,"txid"); txid = jbits256(item,"txid");
vout = juint(item,"vout"); vout = juint(item,"vout");
value = LP_value_extract(item); value = LP_value_extract(item,0);
height = coin->height - jint(item,"confirmations"); height = coin->height - jint(item,"confirmations");
} }
else else

Loading…
Cancel
Save