diff --git a/basilisk/basilisk.c b/basilisk/basilisk.c index 82a874695..f0ee0d4f2 100755 --- a/basilisk/basilisk.c +++ b/basilisk/basilisk.c @@ -63,6 +63,7 @@ cJSON *basilisk_resultsjson(struct supernet_info *myinfo,char *symbol,char *remo jaddstr(hexjson,"method","result"); retjson = basilisk_json(myinfo,hexjson,basilisktag,timeoutmillis); free_json(hexjson); + printf("resultsjson.(%s)\n",jprint(retjson,0)); } else // local request retjson = hexjson; @@ -278,6 +279,8 @@ char *basilisk_hexmsg(struct supernet_info *myinfo,struct category_info *cat,voi { printf("basilisk.(%s)\n",jprint(json,0)); //basilisk.({"basilisktag":2955372280,"agent":"basilisk","method":"rawtx","vals":{"changeaddr":"1FNhoaBYzf7safMBjoCsJYgxtah3K95sep","addresses":["1Hgzt5xsnbfc8UTWqWKSTLRm5bEYHYBoCE"],"timeout":5000,"amount":"20000","spendscript":"76a914b7128d2ee837cf03e30a2c0e3e0181f7b9669bb688ac"},"basilisktag":2955372280}) + // basilisk.({"agent":"basilisk","method":"rawtx","activecoin":"BTC","basilisktag":1398466607}) + agent = jstr(json,"agent"); method = jstr(json,"method"); basilisktag = juint(json,"basilisktag"); diff --git a/basilisk/basilisk_bitcoin.c b/basilisk/basilisk_bitcoin.c index 1d7e72920..c78f591f1 100755 --- a/basilisk/basilisk_bitcoin.c +++ b/basilisk/basilisk_bitcoin.c @@ -579,9 +579,7 @@ char *basilisk_bitcoinrawtx(struct supernet_info *myinfo,struct iguana_info *coi spendlen = (int32_t)strlen(spendscriptstr) >> 1; decode_hex(buf,spendlen,spendscriptstr); bitcoin_txoutput(coin,txobj,buf,spendlen,amount); - printf("call calcrawtx\n"); rawtx = iguana_calcrawtx(myinfo,coin,&vins,txobj,amount,changeaddr,txfee,addresses,minconf); - printf("back calcrawtx\n"); } else printf("error creating txobj\n"); } //else rawtx = bitcoin_calcrawtx(myinfo,coin,vinsp,satoshis,spendscriptstr,changeaddr,txfee,addresses,minconf,locktime); if ( rawtx != 0 ) @@ -607,6 +605,7 @@ char *basilisk_bitcoinrawtx(struct supernet_info *myinfo,struct iguana_info *coi jaddstr(hexjson,"agent","basilisk"); jaddstr(hexjson,"method","rawtx"); jaddstr(hexjson,"activecoin",coin->symbol); + jadd(hexjson,"vals",jduplicate(valsobj)); if ( (ptr= basilisk_issue(myinfo,hexjson,timeoutmillis,0,1,basilisktag)) != 0 ) { for (i=0; inumresults; i++) diff --git a/iguana/iguana_payments.c b/iguana/iguana_payments.c index cf8f16e0b..e7bfa6363 100755 --- a/iguana/iguana_payments.c +++ b/iguana/iguana_payments.c @@ -321,13 +321,11 @@ char *iguana_calcrawtx(struct supernet_info *myinfo,struct iguana_info *coin,cJS *vinsp = 0; max = 10000; unspents = calloc(max,sizeof(*unspents)); - printf("unspentslist\n"); if ( (num= iguana_unspentslists(myinfo,coin,&avail,unspents,max,satoshis,minconf,addresses)) <= 0 ) { free(unspents); return(0); } - printf("got num.%d\n",num); if ( txobj != 0 && avail >= satoshis+txfee ) { if ( (vins= iguana_inputsjson(myinfo,coin,&total,satoshis + txfee,unspents,num)) != 0 )