From a30a668ee14339ed68efe3cfd2a862a91989f8a3 Mon Sep 17 00:00:00 2001 From: jl777 Date: Mon, 10 Apr 2017 16:15:50 +0300 Subject: [PATCH] Test --- .gitignore | 2 ++ basilisk/basilisk_swap.c | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index a3f55af61..6c933d9cb 100755 --- a/.gitignore +++ b/.gitignore @@ -300,3 +300,5 @@ iguana/DB/SWAPS/3611231334-1171171579 iguana/DB/SWAPS/1505015888-2633757068 iguana/DB/SWAPS/3430299677-3087427598 + +iguana/DB/SWAPS/2275651697-591036515 diff --git a/basilisk/basilisk_swap.c b/basilisk/basilisk_swap.c index a44448fab..8e8eb7319 100755 --- a/basilisk/basilisk_swap.c +++ b/basilisk/basilisk_swap.c @@ -687,7 +687,7 @@ int32_t basilisk_rawtx_spendscript(struct basilisk_swap *swap,int32_t height,str void basilisk_swap_coinaddr(struct supernet_info *myinfo,struct basilisk_swap *swap,struct iguana_info *coin,char *coinaddr,uint8_t *data,int32_t datalen) { - cJSON *txobj,*vouts,*vout,*addresses,*item; uint8_t extraspace[8192]; bits256 signedtxid; struct iguana_msgtx msgtx; char *addr; int32_t n,m,suppress_pubkeys = 0; + cJSON *txobj,*vouts,*vout,*addresses,*item,*skey; uint8_t extraspace[8192]; bits256 signedtxid; struct iguana_msgtx msgtx; char *addr; int32_t n,m,suppress_pubkeys = 0; if ( (txobj= bitcoin_data2json(coin,coin->longestchain,&signedtxid,&msgtx,extraspace,sizeof(extraspace),data,datalen,0,suppress_pubkeys)) != 0 ) { char str[65]; printf("got txid.%s (%s)\n",bits256_str(str,signedtxid),jprint(txobj,0)); @@ -695,7 +695,7 @@ void basilisk_swap_coinaddr(struct supernet_info *myinfo,struct basilisk_swap *s { vout = jitem(vouts,0); printf("VOUT.(%s)\n",jprint(vout,0)); - if ( (addresses= jarray(&m,vout,"addresses")) != 0 ) + if ( (skey= jobj(vout,"scriptPubKey")) != 0 && (addresses= jarray(&m,skey,"addresses")) != 0 ) { item = jitem(addresses,0); printf("item.(%s)\n",jprint(item,0));