From f70bfc86596beac8abcb44144170dc5bd79a9166 Mon Sep 17 00:00:00 2001 From: jl777 Date: Mon, 26 Dec 2016 16:13:07 +0200 Subject: [PATCH] test --- basilisk/basilisk.h | 2 +- basilisk/basilisk_bitcoin.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/basilisk/basilisk.h b/basilisk/basilisk.h index 2f8e95527..e4bd8c5ef 100755 --- a/basilisk/basilisk.h +++ b/basilisk/basilisk.h @@ -17,7 +17,7 @@ #define H_BASILISK_H //#define BASILISK_DISABLESENDTX -//#define BASILISK_DISABLEWAITTX +#define BASILISK_DISABLEWAITTX #include "../iguana/iguana777.h" diff --git a/basilisk/basilisk_bitcoin.c b/basilisk/basilisk_bitcoin.c index 5a452141a..89a8d23d7 100755 --- a/basilisk/basilisk_bitcoin.c +++ b/basilisk/basilisk_bitcoin.c @@ -943,10 +943,10 @@ HASH_ARRAY_STRING(basilisk,value,hash,vals,hexstr) if ( (txoutjson= cJSON_Parse(retstr)) != 0 ) { printf("TX.(%s)\n",jprint(txoutjson,0)); + retjson = cJSON_CreateObject(); + jaddstr(retjson,"result","success"); if ( (array= jarray(&n,txoutjson,"vout")) != 0 && vout < n && (txjson= jitem(array,vout)) != 0 ) { - retjson = cJSON_CreateObject(); - jaddstr(retjson,"result","success"); printf("txjson.(%s)\n",jprint(txjson,0)); if ( (coinaddr= jstr(txoutjson,"address")) != 0 && (value= j64bits(txjson,"value") * SATOSHIDEN) != 0 ) { @@ -965,7 +965,9 @@ HASH_ARRAY_STRING(basilisk,value,hash,vals,hexstr) return(jprint(retjson,1)); } } + jaddnum(retjson,"numconfirms",0); free_json(txoutjson); + return(jprint(retjson,1)); } return(retstr); }