diff --git a/iguana/iguana777.h b/iguana/iguana777.h index 533e505d7..cfb119a06 100755 --- a/iguana/iguana777.h +++ b/iguana/iguana777.h @@ -26,11 +26,7 @@ typedef int32_t (*blockhashfunc)(uint8_t *blockhashp,uint8_t *serialized,int32_t #define IGUANA_SERIALIZE_SPENDVECTORGEN //#define IGUANA_DISABLEPEERS #define _IGUANA_MAXSTUCKTIME 10 -#ifdef __PNACL__ -#define IGUANA_MAXITERATIONS 777 -#else #define IGUANA_MAXITERATIONS 10000 -#endif #define IGUANA_DEFAULTLAG 30 #define IGUANA_MAXCOINS 64 diff --git a/iguana/iguana_rpc.c b/iguana/iguana_rpc.c index ac3b3b3cf..0be58806b 100755 --- a/iguana/iguana_rpc.c +++ b/iguana/iguana_rpc.c @@ -511,6 +511,7 @@ static char *getrawchangeaddress(RPCARGS) #define false 0 struct RPC_info { char *name; char *(*rpcfunc)(RPCARGS); int32_t flag0,remoteflag; } RPCcalls[] = { + { "listunspent", &listunspent, false, false }, { "getblockhash", &getblockhash, false, true }, { "walletpassphrase", &walletpassphrase, true, false }, { "SuperNET", &SuperNET, false, true }, @@ -557,7 +558,6 @@ struct RPC_info { char *name; char *(*rpcfunc)(RPCARGS); int32_t flag0,remotefla { "dumpwallet", &dumpwallet, true, false }, { "importwallet", &importwallet, false, false }, { "importprivkey", &importprivkey, false, false }, - { "listunspent", &listunspent, false, false }, { "getrawtransaction", &getrawtransaction, false, false }, { "createrawtransaction", &createrawtransaction, false, false }, { "decoderawtransaction", &decoderawtransaction, false, true }, diff --git a/iguana/iguana_unspents.c b/iguana/iguana_unspents.c index dc8d12d1e..a4f0913f8 100755 --- a/iguana/iguana_unspents.c +++ b/iguana/iguana_unspents.c @@ -834,7 +834,7 @@ int64_t iguana_pkhashbalance(struct iguana_info *coin,cJSON *array,int64_t *spen int32_t iguana_pkhasharray(struct iguana_info *coin,cJSON *array,int32_t minconf,int32_t maxconf,int64_t *totalp,struct iguana_pkhash *P,int32_t max,uint8_t rmd160[20],char *coinaddr,uint8_t *pubkey33) { int32_t i,n,m; int64_t spent,balance,netbalance,total; uint32_t lastunspentind; struct iguana_ramchain *ramchain; - if ( coin->RTramchain_busy != 0 ) + if ( 0 && coin->RTramchain_busy != 0 ) { printf("iguana_pkhasharray: unexpected access when RTramchain_busy\n"); return(-1); @@ -864,7 +864,7 @@ int32_t iguana_pkhasharray(struct iguana_info *coin,cJSON *array,int32_t minconf void iguana_unspents(struct supernet_info *myinfo,struct iguana_info *coin,cJSON *array,int32_t minconf,int32_t maxconf,uint8_t *rmdarray,int32_t numrmds) { int64_t total,sum=0; struct iguana_pkhash *P; uint8_t *addrtypes,*pubkeys; int32_t i,flag = 0; char coinaddr[64]; - if ( coin->RTramchain_busy != 0 ) + if ( 0 && coin->RTramchain_busy != 0 ) { printf("iguana_pkhasharray: unexpected access when RTramchain_busy\n"); return; diff --git a/includes/iguana_apideclares.h b/includes/iguana_apideclares.h index ad2045d45..ee3a976f4 100755 --- a/includes/iguana_apideclares.h +++ b/includes/iguana_apideclares.h @@ -13,6 +13,7 @@ * * ******************************************************************************/ +TWOINTS_AND_ARRAY(bitcoinrpc,listunspent,minconf,maxconf,array); HASH_AND_STRING(bitcoinrpc,verifytx,txid,txbytes); INT_ARG(bitcoinrpc,getblockhash,height); @@ -32,7 +33,6 @@ ZERO_ARGS(bitcoinrpc,getrawchangeaddress); TWO_INTS(bitcoinrpc,listaccounts,minconf,includewatchonly); THREE_INTS(bitcoinrpc,listreceivedbyaddress,minconf,includeempty,flag); -TWOINTS_AND_ARRAY(bitcoinrpc,listunspent,minconf,maxconf,array); ZERO_ARGS(bitcoinrpc,walletlock); ZERO_ARGS(bitcoinrpc,checkwallet);