From cf42d799101a6ad64bfedbb1995af07e2199b035 Mon Sep 17 00:00:00 2001 From: jl777 Date: Sat, 28 May 2016 19:47:45 -0500 Subject: [PATCH] test --- basilisk/basilisk_bitcoin.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/basilisk/basilisk_bitcoin.c b/basilisk/basilisk_bitcoin.c index 259b71557..3a42fa185 100755 --- a/basilisk/basilisk_bitcoin.c +++ b/basilisk/basilisk_bitcoin.c @@ -463,7 +463,10 @@ double basilisk_bitcoin_rawtxmetric_dependents(struct supernet_info *myinfo,stru } else if ( ptr->vals != 0 ) { - txfee = j64bits(ptr->vals,"txfee"); + if ( (txfee= j64bits(ptr->vals,"txfee")) == 0 ) + txfee = coin->chain->txfee; + if ( txfee == 0 ) + txfee = 10000; addresses = jarray(&numaddrs,ptr->vals,"addresses"); for (inputsum=i=0; inumptrs; i++) { @@ -638,11 +641,11 @@ void *basilisk_bitcoinrawtx(struct basilisk_item *Lptr,struct supernet_info *myi amount = j64bits(valsobj,"amount"); if ( (txfee= j64bits(valsobj,"txfee")) == 0 ) txfee = coin->chain->txfee; + if ( txfee == 0 ) + txfee = 10000; minconf = juint(valsobj,"minconf"); locktime = juint(valsobj,"locktime"); addresses = jobj(valsobj,"addresses"); - if ( (txfee= j64bits(valsobj,"txfee")) == 0 ) - txfee = 10000; if ( changeaddr == 0 || changeaddr[0] == 0 || spendscriptstr == 0 || spendscriptstr[0] == 0 || amount == 0 || addresses == 0 ) { Lptr->retstr = clonestr("{\"error\":\"invalid changeaddr or spendscript or addresses\"}");