Browse Source

Test

etomic
jl777 7 years ago
parent
commit
6f5bb98d6b
  1. 3
      iguana/exchanges/LP_bitcoin.c
  2. 4
      iguana/exchanges/LP_socket.c

3
iguana/exchanges/LP_bitcoin.c

@ -3350,7 +3350,7 @@ int32_t iguana_rwmsgtx(uint8_t taddr,uint8_t pubtype,uint8_t p2shtype,uint8_t is
if ( json != 0 ) if ( json != 0 )
jaddnum(json,"timestamp",msg->timestamp); jaddnum(json,"timestamp",msg->timestamp);
} }
if ( rwflag == 0 ) if ( rwflag == 0 && zcash == 0 )
{ {
/* /*
normal: nVersion|txins|txouts|nLockTime. normal: nVersion|txins|txouts|nLockTime.
@ -3366,7 +3366,6 @@ int32_t iguana_rwmsgtx(uint8_t taddr,uint8_t pubtype,uint8_t p2shtype,uint8_t is
printf("SEGWIT transaction\n"); printf("SEGWIT transaction\n");
} }
} }
printf("segwit.%d \n",segwitflag);
len += iguana_rwvarint32(rwflag,&serialized[len],&msg->tx_in); len += iguana_rwvarint32(rwflag,&serialized[len],&msg->tx_in);
if ( rwflag == 0 ) if ( rwflag == 0 )
{ {

4
iguana/exchanges/LP_socket.c

@ -681,12 +681,12 @@ cJSON *LP_cache_transaction(struct iguana_info *coin,bits256 txid,uint8_t *seria
cJSON *_electrum_transaction(char *symbol,struct electrum_info *ep,cJSON **retjsonp,bits256 txid) cJSON *_electrum_transaction(char *symbol,struct electrum_info *ep,cJSON **retjsonp,bits256 txid)
{ {
char *hexstr,str[65]; int32_t len; cJSON *hexjson,*txobj=0; struct iguana_info *coin; uint8_t *serialized; struct LP_transaction *tx; char *hexstr,str[65]; int32_t len; cJSON *hexjson,*txobj=0; struct iguana_info *coin; uint8_t *serialized; struct LP_transaction *tx;
printf("electrum_transaction %s %s\n",symbol,bits256_str(str,txid)); //printf("electrum_transaction %s %s\n",symbol,bits256_str(str,txid));
if ( bits256_nonz(txid) != 0 && (coin= LP_coinfind(symbol)) != 0 ) if ( bits256_nonz(txid) != 0 && (coin= LP_coinfind(symbol)) != 0 )
{ {
if ( (tx= LP_transactionfind(coin,txid)) != 0 && tx->serialized != 0 ) if ( (tx= LP_transactionfind(coin,txid)) != 0 && tx->serialized != 0 )
{ {
char str[65]; printf("%s cache hit -> TRANSACTION.(%s)\n",symbol,bits256_str(str,txid)); //char str[65]; printf("%s cache hit -> TRANSACTION.(%s)\n",symbol,bits256_str(str,txid));
if ( (txobj= LP_transaction_fromdata(coin,txid,tx->serialized,tx->len)) != 0 ) if ( (txobj= LP_transaction_fromdata(coin,txid,tx->serialized,tx->len)) != 0 )
{ {
*retjsonp = txobj; *retjsonp = txobj;

Loading…
Cancel
Save