diff --git a/iguana/iguana777.c b/iguana/iguana777.c index 35b7a3ebb..1b78b231d 100755 --- a/iguana/iguana777.c +++ b/iguana/iguana777.c @@ -416,7 +416,7 @@ int32_t iguana_utxogen(struct iguana_info *coin,int32_t helperid,int32_t convert printf("skip utxogen as spendvectorsaved.%u\n",coin->spendvectorsaved); return(0); } - incr = IGUANA_NUMHELPERS; + incr = 1;//IGUANA_NUMHELPERS; //if ( 1 || coin->PREFETCHLAG > 0 ) // data issues on slow systems // incr = 1; max = coin->bundlescount; diff --git a/iguana/iguana_wallet.c b/iguana/iguana_wallet.c index b4bd06d96..3987cc44f 100755 --- a/iguana/iguana_wallet.c +++ b/iguana/iguana_wallet.c @@ -812,6 +812,66 @@ STRING_AND_INT(bitcoinrpc,getreceivedbyaccount,account,minconf) return(jprint(retjson,1)); } +STRING_AND_THREEINTS(bitcoinrpc,listtransactions,account,count,skip,includewatchonly) +{ + cJSON *retjson,*retarray,*txids,*item,*array; int32_t i,j,total,m,n = 0; struct iguana_waccount *wacct; char *coinaddr; + if ( remoteaddr != 0 ) + return(clonestr("{\"error\":\"no remote\"}")); + retjson = cJSON_CreateObject(); + retarray = cJSON_CreateArray(); + if ( (wacct= iguana_waccountfind(coin,account)) != 0 ) + { + if ( (array= getaddressesbyaccount(myinfo,coin,account)) != 0 ) + { + if ( (n= cJSON_GetArraySize(array)) > 0 ) + { + total = 0; + for (i=0; i 0 ) + { + for (j=0; jaccount); + jaddstr(item,"address",coinaddr); + jaddi(retarray,item); + } + } + } + } + free_json(txids); + } + } + } + } + } + jadd(retjson,"result",retarray); + return(jprint(retjson,1)); +} + THREE_INTS(bitcoinrpc,listreceivedbyaccount,minconf,includeempty,watchonly) { cJSON *retjson,*item,*array; struct iguana_waccount *wacct,*tmp; int64_t balance; @@ -847,6 +907,8 @@ THREE_INTS(bitcoinrpc,listreceivedbyaddress,minconf,includeempty,flag) txids = cJSON_CreateArray(); vouts = cJSON_CreateArray(); jaddnum(item,"amount",dstr(iguana_addressreceived(myinfo,coin,json,remoteaddr,txids,vouts,waddr->coinaddr,minconf))); + jadd(item,"txids",txids); + jadd(item,"vouts",vouts); jaddi(array,item); } } @@ -855,15 +917,6 @@ THREE_INTS(bitcoinrpc,listreceivedbyaddress,minconf,includeempty,flag) return(jprint(retjson,1)); } -STRING_AND_THREEINTS(bitcoinrpc,listtransactions,account,count,skip,includewatchonly) -{ - cJSON *retjson; - if ( remoteaddr != 0 ) - return(clonestr("{\"error\":\"no remote\"}")); - retjson = cJSON_CreateObject(); - return(jsuccess()); -} - TWO_INTS(bitcoinrpc,listaccounts,minconf,includewatchonly) { cJSON *retjson,*array; int64_t balance; struct iguana_waccount *wacct,*tmp; @@ -882,11 +935,9 @@ TWO_INTS(bitcoinrpc,listaccounts,minconf,includewatchonly) ZERO_ARGS(bitcoinrpc,listaddressgroupings) { - cJSON *retjson; if ( remoteaddr != 0 ) return(clonestr("{\"error\":\"no remote\"}")); - retjson = cJSON_CreateObject(); - return(jprint(retjson,1)); + return(clonestr("{\"result\":\"success\"}")); } S_D_SS(bitcoinrpc,sendtoaddress,address,amount,comment,comment2) diff --git a/iguana/ramchain_api.c b/iguana/ramchain_api.c index 1edf689f5..46efe5be0 100755 --- a/iguana/ramchain_api.c +++ b/iguana/ramchain_api.c @@ -597,14 +597,6 @@ ZERO_ARGS(bitcoinrpc,getrawchangeaddress) return(jprint(retjson,1)); } -HASH_AND_STRING(bitcoinrpc,verifytx,txid,txbytes) -{ - cJSON *retjson; - retjson = bitcoin_txtest(coin,txbytes,txid); - //printf("verifytx.(%s) %p\n",jprint(retjson,0),retjson); - return(jprint(retjson,1)); -} - STRING_AND_INT(iguana,bundleaddresses,activecoin,height) { struct iguana_info *ptr;