test

iguana/iguana777.h

@@ -475,8 +475,8 @@ struct iguana_bundlereq
 struct iguana_bitmap { int32_t width,height,amplitude; char name[52]; uint8_t data[IGUANA_WIDTH*IGUANA_HEIGHT*3]; };
 
 struct iguana_waddress { UT_hash_handle hh; uint8_t rmd160[20],type,pubkey[33],wiftype; uint32_t symbolbits; bits256 privkey; char coinaddr[36],wifstr[54]; };
-struct iguana_waccount { UT_hash_handle hh; char account[128]; struct iguana_waddress *waddrs; };
+struct iguana_waccount { UT_hash_handle hh; char account[128]; struct iguana_waddress *waddr,*current; };
-struct iguana_wallet { UT_hash_handle hh; struct iguana_waccount *waccts; };
+struct iguana_wallet { UT_hash_handle hh; struct iguana_waccount *wacct; };
 
 struct scriptinfo { UT_hash_handle hh; uint32_t fpos; uint16_t scriptlen; uint8_t script[]; };
 struct hhbits256 { UT_hash_handle hh; bits256 txid; int32_t height; uint16_t firstvout; };
@@ -771,10 +771,10 @@ int32_t iguana_sendblockreq(struct iguana_info *coin,struct iguana_peer *addr,st
 int32_t iguana_send_supernet(struct iguana_info *coin,struct iguana_peer *addr,char *jsonstr,int32_t delay);
 
 struct iguana_waccount *iguana_waccountfind(struct iguana_info *coin,char *account);
-struct iguana_waccount *iguana_waccountadd(struct iguana_info *coin,char *walletaccount,struct iguana_waddress *waddr);
+struct iguana_waddress *iguana_waccountadd(struct iguana_info *coin,struct iguana_waccount **wacctp,char *walletaccount,char *coinaddr);
-int32_t iguana_waccountswitch(struct iguana_info *coin,char *account,struct iguana_waccount *oldwaddr,int32_t oldind,char *coinaddr);
+struct iguana_waddress *iguana_waccountswitch(struct iguana_info *coin,char *account,char *coinaddr);
 struct iguana_waddress *iguana_waddresscalc(uint8_t pubval,uint8_t wiftype,struct iguana_waddress *addr,bits256 privkey);
-struct iguana_waccount *iguana_waddressfind(struct iguana_info *coin,int32_t *indp,char *coinaddr);
+struct iguana_waddress *iguana_waddressfind(struct iguana_info *coin,struct iguana_waccount *wacct,char *coinaddr);
 char *iguana_coinjson(struct iguana_info *coin,char *method,cJSON *json);
 cJSON *iguana_peersjson(struct iguana_info *coin,int32_t addronly);
 //int32_t btc_priv2wif(char *wifstr,uint8_t privkey[32],uint8_t addrtype);
@@ -924,6 +924,7 @@ int32_t iguana_spentflag(struct iguana_info *coin,int64_t *RTspendp,int32_t *spe
 int32_t iguana_voutscript(struct iguana_info *coin,struct iguana_bundle *bp,uint8_t *scriptspace,char *asmstr,struct iguana_unspent *u,struct iguana_pkhash *p,int32_t txi);
 cJSON *iguana_unspentjson(struct iguana_info *coin,int32_t hdrsi,uint32_t unspentind,struct iguana_txid *T,struct iguana_unspent *up,uint8_t rmd160[20],char *coinaddr,uint8_t *pubkey33);
 int32_t bitcoin_standardspend(uint8_t *script,int32_t n,uint8_t rmd160[20]);
+struct iguana_waddress *iguana_waddresssearch(struct iguana_info *coin,struct iguana_waccount **wacctp,char *coinaddr);
 
 extern int32_t HDRnet,netBLOCKS;
 

iguana/iguana_bundles.c

@@ -419,19 +419,19 @@ struct iguana_txid *iguana_bundletx(struct iguana_info *coin,struct iguana_bundl
 void iguana_bundlepurgefiles(struct iguana_info *coin,struct iguana_bundle *bp)
 {
     static const bits256 zero;
-    char fname[1024]; FILE *fp; int32_t hdrsi,m = 0; uint32_t ipbits = 0;
+    char fname[1024]; FILE *fp; int32_t hdrsi,j,m = 0; uint32_t ipbits = 0;
     if ( bp->purgetime == 0 && time(NULL) > bp->emitfinish+30 )
     {
-        //printf("purged hdrsi.[%d] lag.%ld\n",bp->hdrsi,time(NULL) - bp->emitfinish);
+        printf("purged hdrsi.[%d] lag.%ld\n",bp->hdrsi,time(NULL) - bp->emitfinish);
-        //for (j=m=0; j<sizeof(coin->peers.active)/sizeof(*coin->peers.active); j++)
+        for (j=m=0; j<bp->n; j++)
         {
             //if ( (ipbits= (uint32_t)coin->peers.active[j].ipbits) != 0 )
             {
-                if ( iguana_peerfname(coin,&hdrsi,GLOBAL_TMPDIR,fname,ipbits,bp->hashes[0],zero,1,1) >= 0 )
+                if ( iguana_peerfname(coin,&hdrsi,GLOBAL_TMPDIR,fname,ipbits,bp->hashes[j],zero,1,1) >= 0 )
                 {
                     if ( (fp= fopen(fname,"rb")) != 0 )
                     {
-                        //printf("purge.(%s)\n",fname);
+                        printf("purge.(%s)\n",fname);
                         fclose(fp);
                         if ( OS_removefile(fname,0) > 0 )
                             coin->peers.numfiles--, m++;

iguana/iguana_unspents.c

@@ -1099,7 +1099,7 @@ cJSON *iguana_unspentjson(struct iguana_info *coin,int32_t hdrsi,uint32_t unspen
      "spendable" : true
      },*/
     //struct iguana_unspent { uint64_t value; uint32_t txidind,pkind,prevunspentind; uint16_t hdrsi:12,type:4,vout; } __attribute__((packed));
-    struct iguana_waccount *wacct; int32_t height,ind; char scriptstr[8192],asmstr[sizeof(scriptstr)+1024]; cJSON *item; uint32_t checkind;
+    struct iguana_waccount *wacct; struct iguana_waddress *waddr; int32_t height; char scriptstr[8192],asmstr[sizeof(scriptstr)+1024]; cJSON *item; uint32_t checkind;
     item = cJSON_CreateObject();
     jaddbits256(item,"txid",T[up->txidind].txid);
     jaddnum(item,"vout",up->vout);
@@ -1112,7 +1112,7 @@ cJSON *iguana_unspentjson(struct iguana_info *coin,int32_t hdrsi,uint32_t unspen
         jaddnum(item,"confirmations",coin->blocks.hwmchain.height - height);
         jaddnum(item,"checkind",checkind);
     }
-    if ( (wacct= iguana_waddressfind(coin,&ind,coinaddr)) != 0 )
+    if ( (waddr= iguana_waddresssearch(coin,&wacct,coinaddr)) != 0 )
     {
         jaddstr(item,"account",wacct->account);
         jadd(item,"spendable",jtrue());

iguana/iguana_wallet.c

@@ -15,77 +15,53 @@
 
 #include "iguana777.h"
 
-struct iguana_waddress *iguana_waddresscalc(uint8_t pubtype,uint8_t wiftype,struct iguana_waddress *addr,bits256 privkey)
+struct iguana_waddress *iguana_waddressfind(struct iguana_info *coin,struct iguana_waccount *wacct,char *coinaddr)
 {
-    memset(addr,0,sizeof(*addr));
+    struct iguana_waddress *waddr;
-    addr->privkey = privkey;
+    HASH_FIND(hh,wacct,coinaddr,strlen(coinaddr)+1,waddr);
-    bitcoin_pubkey33(addr->pubkey,addr->privkey);
+    return(waddr);
-    calc_rmd160_sha256(addr->rmd160,addr->pubkey,33);
+}
-    bitcoin_address(addr->coinaddr,pubtype,addr->rmd160,sizeof(addr->rmd160));
+
-    if ( bitcoin_priv2wif(addr->wifstr,addr->privkey,wiftype) > 0 )
+struct iguana_waddress *iguana_waddresscreate(struct iguana_info *coin,struct iguana_waccount *wacct,char *coinaddr)
+{
+    struct iguana_waddress *waddr; int32_t len = (int32_t)strlen(coinaddr)+1;
+    HASH_FIND(hh,wacct,coinaddr,len,waddr);
+    if ( waddr == 0 )
     {
-        addr->wiftype = wiftype;
+        waddr = mycalloc('w',1,sizeof(*waddr) + len);
-        addr->type = pubtype;
+        strcpy(waddr->coinaddr,coinaddr);
-        return(addr);
+        HASH_ADD_KEYPTR(hh,wacct,waddr->coinaddr,len,wacct);
     }
-    return(0);
+    return(waddr);
 }
 
-void iguana_walletlock(struct supernet_info *myinfo)
+struct iguana_waddress *iguana_waddressadd(struct iguana_info *coin,struct iguana_waccount *wacct,struct iguana_waddress *waddr)
 {
-    memset(&myinfo->persistent_priv,0,sizeof(myinfo->persistent_priv));
+    HASH_ADD_KEYPTR(hh,wacct,waddr->coinaddr,(int32_t)strlen(waddr->coinaddr)+1,wacct);
-    memset(myinfo->secret,0,sizeof(myinfo->secret));
+    return(waddr);
-    printf("wallet locked\n");
 }
 
-int32_t iguana_ismine(struct supernet_info *myinfo,uint8_t pubkey[65],uint8_t rmd160[20])
+struct iguana_waddress *iguana_waddressdelete(struct iguana_info *coin,struct iguana_waccount *wacct,char *coinaddr)
 {
-    /*int32_t i;
+    struct iguana_waddress *waddr = 0; int32_t len = (int32_t)strlen(coinaddr)+1;
-    for (i=0; i<myinfo->numaddrs; i++)
+    HASH_FIND(hh,wacct,coinaddr,len,waddr);
-    {
+    if ( waddr != 0 )
-        if ( memcmp(myinfo->addrs[i].rmd160,rmd160,sizeof(myinfo->addrs[i].rmd160)) == 0 )
+        HASH_DELETE(hh,wacct,waddr);
-        {
+    return(waddr);
-            memcpy(pubkey,myinfo->addrs[i].pubkey,bitcoin_pubkeylen(myinfo->addrs[i].pubkey));
-            return(i);
-        }
-    }*/
-    return(0);
 }
 
-uint8_t *iguana_rmdarray(struct iguana_info *coin,int32_t *numrmdsp,cJSON *array,int32_t firsti)
+struct iguana_waddress *iguana_waddresssearch(struct iguana_info *coin,struct iguana_waccount **wacctp,char *coinaddr)
 {
-    int32_t i,n,j=0; char *coinaddr,rmdstr[41]; uint8_t *addrtypes,*rmdarray = 0;
+    struct iguana_waccount *wacct,*tmp; struct iguana_waddress *waddr;
-    *numrmdsp = 0;
+    HASH_ITER(hh,coin->wallet,wacct,tmp)
-    if ( array != 0 && (n= cJSON_GetArraySize(array)) > 0 )
     {
-        *numrmdsp = n - firsti;
+        if ( (waddr= iguana_waddressfind(coin,wacct,coinaddr)) != 0 )
-        rmdarray = calloc(1,(n-firsti) * (21 + 33));
-        addrtypes = &rmdarray[(n-firsti) * 20];
-        for (i=firsti; i<n; i++)
         {
-            if ( (coinaddr= jstr(jitem(array,i),0)) != 0 )
+            (*wacctp) = wacct;
-            {
+            return(waddr);
-                bitcoin_addr2rmd160(&addrtypes[j],&rmdarray[20 * j],coinaddr);
-                init_hexbytes_noT(rmdstr,&rmdarray[20 * j],20);
-                printf("(%s %s) ",coinaddr,rmdstr);
-                j++;
-            }
         }
-        printf("rmdarray[%d]\n",n);
     }
-    return(rmdarray);
+    return(0);
-}
-
-struct iguana_waccount *iguana_waccountcreate(struct iguana_info *coin,char *account)
-{
-    struct iguana_waccount *waddr; int32_t len = (int32_t)strlen(account)+1;
-    HASH_FIND(hh,coin->wallet,account,len,waddr);
-    if ( waddr != 0 )
-        return(waddr);
-    waddr = mycalloc('w',1,sizeof(*waddr) + len);
-    strcpy(waddr->account,account);
-    HASH_ADD(hh,coin->wallet,account,len,waddr);
-    return(waddr);
 }
 
 struct iguana_waccount *iguana_waccountfind(struct iguana_info *coin,char *account)
@@ -95,12 +71,29 @@ struct iguana_waccount *iguana_waccountfind(struct iguana_info *coin,char *accou
     return(waddr);
 }
 
-struct iguana_waccount *iguana_waccountadd(struct iguana_info *coin,char *walletaccount,struct iguana_waddress *waddr)
+struct iguana_waccount *iguana_waccountcreate(struct iguana_info *coin,char *account)
+{
+    struct iguana_waccount *wacct; int32_t len = (int32_t)strlen(account)+1;
+    HASH_FIND(hh,coin->wallet,account,len,wacct);
+    if ( wacct == 0 )
+    {
+        wacct = mycalloc('w',1,sizeof(*wacct) + len);
+        strcpy(wacct->account,account);
+        HASH_ADD_KEYPTR(hh,coin->wallet,account,len,wacct);
+    }
+    return(wacct);
+}
+
+struct iguana_waddress *iguana_waccountswitch(struct iguana_info *coin,char *account,char *coinaddr)
 {
-    struct iguana_waccount *acct;
+    struct iguana_waccount *wacct = 0; struct iguana_waddress *waddr = 0;
-    if ( (acct= iguana_waccountfind(coin,walletaccount)) == 0 )
+    if ( (waddr= iguana_waddresssearch(coin,&wacct,coinaddr)) != 0 )
-        acct = iguana_waccountcreate(coin,walletaccount);
+    {
-    return(acct);
+        HASH_DELETE(hh,wacct,waddr);
+        if ( (wacct= iguana_waccountcreate(coin,account)) != 0 )
+            waddr = iguana_waddresscreate(coin,wacct,coinaddr);
+    }
+    return(waddr);
 }
 
 uint8_t *iguana_walletrmds(struct supernet_info *myinfo,struct iguana_info *coin,int32_t *numrmdsp)
@@ -110,7 +103,7 @@ uint8_t *iguana_walletrmds(struct supernet_info *myinfo,struct iguana_info *coin
     {
         HASH_ITER(hh,coin->wallet,acct,tmp)
         {
-            HASH_ITER(hh,acct->waddrs,waddr,tmp2)
+            HASH_ITER(hh,acct->waddr,waddr,tmp2)
             {
                 if ( iter == 0 )
                     n++;
@@ -133,46 +126,84 @@ uint8_t *iguana_walletrmds(struct supernet_info *myinfo,struct iguana_info *coin
     return(rmdarray);
 }
 
-int32_t iguana_waccountswitch(struct iguana_info *coin,char *account,struct iguana_waccount *oldwaddr,int32_t oldind,char *coinaddr)
+char *getaddressesbyaccount(struct supernet_info *myinfo,struct iguana_info *coin,char *account)
+{
+    struct iguana_waccount *subset; struct iguana_waddress *waddr,*tmp; cJSON *retjson,*array;
+    retjson = cJSON_CreateObject();
+    array = cJSON_CreateArray();
+    if ( (subset= iguana_waccountfind(coin,account)) != 0 )
+    {
+        HASH_ITER(hh,subset->waddr,waddr,tmp)
+        {
+            jaddistr(array,waddr->coinaddr);
+        }
+    } else jaddstr(retjson,"result","cant find account");
+    jadd(retjson,"addresses",array);
+    return(jprint(retjson,1));
+}
+
+struct iguana_waddress *iguana_waccountadd(struct iguana_info *coin,struct iguana_waccount **wacctp,char *walletaccount,char *coinaddr)
+{
+    struct iguana_waccount *wacct; struct iguana_waddress *waddr = 0;
+    if ( (wacct= iguana_waccountfind(coin,walletaccount)) == 0 )
+        wacct = iguana_waccountcreate(coin,walletaccount);
+    if ( wacct != 0 )
+        waddr = iguana_waddresscreate(coin,wacct,coinaddr);
+    return(waddr);
+}
+
+struct iguana_waddress *iguana_waddresscalc(uint8_t pubtype,uint8_t wiftype,struct iguana_waddress *addr,bits256 privkey)
 {
-    // what if coinaddr is already in an account?
+    addr->privkey = privkey;
-    //printf("change %s walletaccount.(%s) (%s) <- %s\n",coin->symbol,waddr->account,waddr->coinaddr,coinaddr);
+    bitcoin_pubkey33(addr->pubkey,addr->privkey);
+    calc_rmd160_sha256(addr->rmd160,addr->pubkey,33);
+    bitcoin_address(addr->coinaddr,pubtype,addr->rmd160,sizeof(addr->rmd160));
+    if ( bitcoin_priv2wif(addr->wifstr,addr->privkey,wiftype) > 0 )
+    {
+        addr->wiftype = wiftype;
+        addr->type = pubtype;
+        return(addr);
+    }
     return(0);
 }
 
-struct iguana_waccount *iguana_waddressfind(struct iguana_info *coin,int32_t *indp,char *coinaddr)
+void iguana_walletlock(struct supernet_info *myinfo)
+{
+    memset(&myinfo->persistent_priv,0,sizeof(myinfo->persistent_priv));
+    memset(myinfo->secret,0,sizeof(myinfo->secret));
+    printf("wallet locked\n");
+}
+
+uint8_t *iguana_rmdarray(struct iguana_info *coin,int32_t *numrmdsp,cJSON *array,int32_t firsti)
 {
-    int32_t n=0; struct iguana_waccount *acct,*tmp; struct iguana_waddress *waddr,*tmp2;
+    int32_t i,n,j=0; char *coinaddr,rmdstr[41]; uint8_t *addrtypes,*rmdarray = 0;
-    *indp = -1;
+    *numrmdsp = 0;
-    HASH_ITER(hh,coin->wallet,acct,tmp)
+    if ( array != 0 && (n= cJSON_GetArraySize(array)) > 0 )
     {
-        HASH_ITER(hh,acct->waddrs,waddr,tmp2)
+        *numrmdsp = n - firsti;
+        rmdarray = calloc(1,(n-firsti) * (21 + 33));
+        addrtypes = &rmdarray[(n-firsti) * 20];
+        for (i=firsti; i<n; i++)
         {
-            if ( strcmp(coinaddr,waddr->coinaddr) == 0 )
+            if ( (coinaddr= jstr(jitem(array,i),0)) != 0 )
             {
-                *indp = n;
+                bitcoin_addr2rmd160(&addrtypes[j],&rmdarray[20 * j],coinaddr);
-                return(acct);
+                init_hexbytes_noT(rmdstr,&rmdarray[20 * j],20);
+                printf("(%s %s) ",coinaddr,rmdstr);
+                j++;
             }
-            n++;
         }
+        printf("rmdarray[%d]\n",n);
     }
-    return(0);
+    return(rmdarray);
 }
 
-char *getaddressesbyaccount(struct supernet_info *myinfo,struct iguana_info *coin,char *account)
+struct iguana_waddress *iguana_ismine(struct iguana_info *coin,uint8_t addrtype,uint8_t pubkey[65],uint8_t rmd160[20])
 {
-    struct iguana_waccount *subset; struct iguana_waddress *waddr,*tmp; cJSON *retjson,*array;
+    char coinaddr[65]; struct iguana_waccount *wacct; struct iguana_waddress *waddr = 0;
-    retjson = cJSON_CreateObject();
+    if ( bitcoin_address(coinaddr,addrtype,rmd160,20) > 0 )
-    array = cJSON_CreateArray();
+        waddr = iguana_waddresssearch(coin,&wacct,coinaddr);
-    if ( (subset= iguana_waccountfind(coin,account)) != 0 )
+    return(waddr);
-    {
-        HASH_ITER(hh,subset->waddrs,waddr,tmp)
-        {
-            jaddistr(array,waddr->coinaddr);
-        }
-    } else jaddstr(retjson,"result","cant find account");
-    jadd(retjson,"addresses",array);
-    return(jprint(retjson,1));
 }
 
 int32_t iguana_addressvalidate(struct iguana_info *coin,uint8_t *addrtypep,uint8_t rmd160[20],char *address)
@@ -184,78 +215,91 @@ int32_t iguana_addressvalidate(struct iguana_info *coin,uint8_t *addrtypep,uint8
     else return(-1);
 }
 
+cJSON *iguana_waddressjson(cJSON *item,struct iguana_waddress *waddr)
+{
+    char str[256];
+    if ( item == 0 )
+        item = cJSON_CreateObject();
+    jaddstr(item,"address",waddr->coinaddr);
+    init_hexbytes_noT(str,waddr->pubkey,33);
+    jaddstr(item,"pubkey",str);
+    //jaddstr(item,"privkey",bits256_str(str,waddr->privkey));
+    //jaddstr(item,"wif",waddr->wifstr);
+    init_hexbytes_noT(str,waddr->rmd160,20);
+    jaddstr(item,"rmd160",str);
+    return(item);
+}
+
 char *getnewaddress(struct supernet_info *myinfo,struct iguana_info *coin,char *account)
 {
-    struct iguana_waddress addr; char str[67]; cJSON *retjson = cJSON_CreateObject();
+    struct iguana_waccount *wacct; struct iguana_waddress addr,*waddr; cJSON *retjson = cJSON_CreateObject();
-    if ( iguana_waddresscalc(coin->chain->pubtype,coin->chain->wiftype,&addr,rand256(1)) == 0 )
+    memset(&addr,0,sizeof(addr));
+    if ( iguana_waddresscalc(coin->chain->pubtype,coin->chain->wiftype,&addr,rand256(1)) != 0 )
     {
-        jaddstr(retjson,"result",addr.coinaddr);
+        if ( (wacct= iguana_waccountfind(coin,account)) == 0 )
-        init_hexbytes_noT(str,addr.pubkey,33);
+            wacct = iguana_waccountcreate(coin,account);
-        jaddstr(retjson,"pubkey",str);
+        if ( wacct != 0 )
-        jaddstr(retjson,"privkey",bits256_str(str,addr.privkey));
+        {
-        jaddstr(retjson,"wif",addr.wifstr);
+            waddr = mycalloc('w',1,sizeof(*waddr));
-        init_hexbytes_noT(str,addr.rmd160,20);
+            memcpy(waddr,&addr,sizeof(*waddr));
-        jaddstr(retjson,"rmd160",str);
+            wacct->current = iguana_waddressadd(coin,wacct,waddr);
-        if ( iguana_waccountadd(coin,account,&addr) < 0 )
+            retjson = iguana_waddressjson(retjson,waddr);
-            jaddstr(retjson,"account","error adding to account");
+            jaddstr(retjson,"account",account);
-        else jaddstr(retjson,"account",account);
+            jaddstr(retjson,"result","success");
+        } else jaddstr(retjson,"error","cant create account");
     } else jaddstr(retjson,"error","cant create address");
     return(jprint(retjson,1));
 }
 
 char *getaccountaddress(struct supernet_info *myinfo,struct iguana_info *coin,char *account)
 {
-    struct iguana_waccount *wacct; struct iguana_waddress *waddr=0,addr; char str[67];cJSON *retjson;
+    struct iguana_waccount *wacct; struct iguana_waddress *waddr=0; cJSON *retjson;
     if ( account != 0 && account[0] != 0 )
     {
         if ( (wacct= iguana_waccountfind(coin,account)) == 0 )
+            wacct = iguana_waccountcreate(coin,account);
+        if ( wacct != 0 )
         {
-            if ( (waddr= iguana_waddresscalc(coin->chain->pubtype,coin->chain->wiftype,&addr,rand256(1))) == 0 )
+            if ( (waddr= wacct->current) == 0 )
-                return(clonestr("{\"error\":\"cant generate address\"}"));
+                return(getnewaddress(myinfo,coin,account));
-            iguana_waccountswitch(coin,account,0,-1,addr.coinaddr);
+            retjson = iguana_waddressjson(0,waddr);
-        }
+            jaddstr(retjson,"account",account);
-        retjson = cJSON_CreateObject();
+            jaddstr(retjson,"result","success");
-        jaddstr(retjson,"result",waddr->coinaddr);
+            return(jprint(retjson,1));
-        init_hexbytes_noT(str,addr.pubkey,33);
+        } else return(clonestr("{\"error\":\"cant find account\"}"));
-        jaddstr(retjson,"pubkey",str);
-        jaddstr(retjson,"privkey",bits256_str(str,waddr->privkey));
-        jaddstr(retjson,"wif",waddr->wifstr);
-        init_hexbytes_noT(str,waddr->rmd160,20);
-        jaddstr(retjson,"rmd160",str);
-        jaddstr(retjson,"account",account);
-        return(jprint(retjson,1));
     }
     return(clonestr("{\"error\":\"no account specified\"}"));
 }
 
 char *setaccount(struct supernet_info *myinfo,struct iguana_info *coin,char *account,char *coinaddr)
 {
-    struct iguana_waccount *wacct; uint8_t addrtype,rmd160[20]; struct iguana_waddress *waddr=0,addr; int32_t ind=-1;
+    uint8_t addrtype,rmd160[20]; struct iguana_waddress *waddr=0;
     if ( coinaddr != 0 && coinaddr[0] != 0 && account != 0 && account[0] != 0 )
     {
         if ( iguana_addressvalidate(coin,&addrtype,rmd160,coinaddr) < 0 )
             return(clonestr("{\"error\":\"invalid coin address\"}"));
-        if ( (wacct= iguana_waddressfind(coin,&ind,coinaddr)) == 0 )
+        if ( (waddr= iguana_waccountswitch(coin,account,coinaddr)) != 0 )
         {
-            if ( (waddr= iguana_waddresscalc(coin->chain->pubtype,coin->chain->wiftype,&addr,rand256(1))) == 0 )
+            
-                return(clonestr("{\"error\":\"cant generate address\"}"));
+        } else return(clonestr("{\"error\":\"couldnt set account\"}"));
-        }
-        iguana_waccountswitch(coin,account,wacct,ind,coinaddr);
-        return(clonestr("{\"result\":\"account set\"}"));
     }
     return(clonestr("{\"error\":\"need address and account\"}"));
 }
 
 char *getaccount(struct supernet_info *myinfo,struct iguana_info *coin,char *coinaddr)
 {
-    struct iguana_waccount *wacct; uint8_t addrtype,rmd160[20]; cJSON *retjson; int32_t ind;
+    struct iguana_waccount *wacct; struct iguana_waddress *waddr; uint8_t addrtype,rmd160[20]; cJSON *retjson;
     if ( iguana_addressvalidate(coin,&addrtype,rmd160,coinaddr) < 0 )
         return(clonestr("{\"error\":\"invalid coin address\"}"));
-    if ( (wacct= iguana_waddressfind(coin,&ind,coinaddr)) == 0 )
+    if ( (waddr= iguana_waddresssearch(coin,&wacct,coinaddr)) == 0 )
         return(clonestr("{\"result\":\"no account for address\"}"));
-    retjson = cJSON_CreateObject();
+    if ( wacct != 0 )
-    jaddstr(retjson,"result",wacct->account);
+    {
-    return(jprint(retjson,1));
+        retjson = iguana_waddressjson(0,waddr);
+        jaddstr(retjson,"account",wacct->account);
+        jaddstr(retjson,"result","success");
+        return(jprint(retjson,1));
+    } else return(clonestr("{\"result\":\"\"}"));
 }
 
 char *sendtoaddress(struct supernet_info *myinfo,struct iguana_info *coin,char *coinaddr,double amount,char *comment,char *comment2)
@@ -282,7 +326,7 @@ char *jsuccess()
 
 bits256 iguana_str2priv(struct iguana_info *coin,char *str)
 {
-    bits256 privkey; int32_t ind,n; uint8_t addrtype; struct iguana_waccount *wacct;
+    bits256 privkey; int32_t n; uint8_t addrtype; struct iguana_waccount *wacct=0; struct iguana_waddress *waddr;
     memset(&privkey,0,sizeof(privkey));
     if ( str != 0 )
     {
@@ -291,13 +335,20 @@ bits256 iguana_str2priv(struct iguana_info *coin,char *str)
             decode_hex(privkey.bytes,sizeof(privkey),str);
         else if ( bitcoin_wif2priv(&addrtype,&privkey,str) != sizeof(bits256) )
         {
-            if ( (wacct= iguana_waddressfind(coin,&ind,str)) != 0 )
+            if ( (waddr= iguana_waddresssearch(coin,&wacct,str)) != 0 )
-                privkey = wacct->waddrs[ind].privkey;
+                privkey = waddr->privkey;
         }
     }
     return(privkey);
 }
 
+char *iguana_addressconv(struct iguana_info *coin,char *destaddr,struct iguana_info *other,int32_t isp2sh,uint8_t rmd160[20])
+{
+    if ( bitcoin_address(destaddr,isp2sh != 0 ? other->chain->pubtype : other->chain->p2shtype,rmd160,20) == destaddr )
+        return(destaddr);
+    else return(0);
+}
+
 #include "../includes/iguana_apidefs.h"
 #include "../includes/iguana_apideclares.h"
 
@@ -310,13 +361,6 @@ INT_ARRAY_STRING(bitcoinrpc,createmultisig,M,array,account)
     return(jprint(retjson,1));
 }
 
-char *iguana_addressconv(struct iguana_info *coin,char *destaddr,struct iguana_info *other,int32_t isp2sh,uint8_t rmd160[20])
-{
-    if ( bitcoin_address(destaddr,isp2sh != 0 ? other->chain->pubtype : other->chain->p2shtype,rmd160,20) == destaddr )
-        return(destaddr);
-    else return(0);
-}
-
 STRING_ARG(bitcoinrpc,validateaddress,address)
 {
     cJSON *retjson; int32_t i; uint8_t addrtype,rmd160[20],pubkey[65]; struct iguana_info *other; char checkaddr[64],str[256];
@@ -331,7 +375,7 @@ STRING_ARG(bitcoinrpc,validateaddress,address)
         jaddnum(retjson,"addrtype",addrtype);
         init_hexbytes_noT(str,rmd160,sizeof(rmd160));
         jaddstr(retjson,"rmd160",str);
-        if ( iguana_ismine(myinfo,pubkey,rmd160) > 0 )
+        if ( iguana_ismine(coin,addrtype,pubkey,rmd160) > 0 )
         {
             init_hexbytes_noT(str,pubkey,bitcoin_pubkeylen(pubkey));
             jaddstr(retjson,"pubkey",str);
@@ -371,6 +415,34 @@ ZERO_ARGS(bitcoinrpc,getinfo)
     return(jprint(retjson,1));
 }
 
+TWO_STRINGS(bitcoinrpc,setaccount,address,account)
+{
+    if ( remoteaddr != 0 )
+        return(clonestr("{\"error\":\"no remote\"}"));
+    return(setaccount(myinfo,coin,account,address));
+}
+
+STRING_ARG(bitcoinrpc,getaccount,address)
+{
+    if ( remoteaddr != 0 )
+        return(clonestr("{\"error\":\"no remote\"}"));
+    return(getaccount(myinfo,coin,address));
+}
+
+STRING_ARG(bitcoinrpc,getnewaddress,account)
+{
+    if ( remoteaddr != 0 )
+        return(clonestr("{\"error\":\"no remote\"}"));
+    return(getnewaddress(myinfo,coin,account));
+}
+
+STRING_ARG(bitcoinrpc,getaccountaddress,account)
+{
+    if ( remoteaddr != 0 )
+        return(clonestr("{\"error\":\"no remote\"}"));
+    return(getaccountaddress(myinfo,coin,account));
+}
+
 ZERO_ARGS(bitcoinrpc,walletlock)
 {
     if ( remoteaddr != 0 )
@@ -437,182 +509,208 @@ FOUR_STRINGS(bitcoinrpc,walletpassphrasechange,oldpassword,newpassword,oldperman
     return(retstr);
 }
 
-TWO_STRINGS(bitcoinrpc,setaccount,address,account)
+TWOSTRINGS_AND_INT(bitcoinrpc,importprivkey,wif,account,rescan)
 {
+    bits256 privkey; cJSON *retjson; struct iguana_waddress addr,*waddr; struct iguana_waccount *wacct = 0;
     if ( remoteaddr != 0 )
         return(clonestr("{\"error\":\"no remote\"}"));
-    return(setaccount(myinfo,coin,account,address));
+    privkey = iguana_str2priv(coin,wif);
+    if ( bits256_nonz(privkey) == 0 )
+        return(clonestr("{\"error\":\"illegal privkey\"}"));
+    memset(&addr,0,sizeof(addr));
+    if ( iguana_waddresscalc(coin->chain->pubtype,coin->chain->wiftype,&addr,privkey) != 0 )
+    {
+        if ( (waddr= iguana_waddresssearch(coin,&wacct,addr.coinaddr)) != 0 )
+        {
+            if ( account != 0 && account[0] != 0 )
+                waddr = iguana_waccountswitch(coin,account,addr.coinaddr);
+        }
+        iguana_waddresscalc(coin->chain->pubtype,coin->chain->wiftype,waddr,privkey);
+        retjson = cJSON_CreateObject();
+        jaddstr(retjson,"result","privkey imported");
+        return(jprint(retjson,1));
+    }
+    return(clonestr("{\"error\":\"cant calculate waddress\"}"));
 }
 
-STRING_ARG(bitcoinrpc,getaccount,address)
+STRING_ARG(bitcoinrpc,dumpprivkey,address)
 {
+    cJSON *retjson; struct iguana_waddress *waddr; struct iguana_waccount *wacct;
     if ( remoteaddr != 0 )
         return(clonestr("{\"error\":\"no remote\"}"));
-    return(getaccount(myinfo,coin,address));
+    if ( (waddr= iguana_waddresssearch(coin,&wacct,address)) != 0 )
+    {
+        retjson = cJSON_CreateObject();
+        jaddstr(retjson,"result",waddr->wifstr);
+        return(jprint(retjson,1));
+    } else return(clonestr("{\"error\":\"no privkey for address\"}"));
 }
 
-STRING_ARG(bitcoinrpc,getnewaddress,account)
+ZERO_ARGS(bitcoinrpc,checkwallet)
 {
+    cJSON *retjson;
     if ( remoteaddr != 0 )
         return(clonestr("{\"error\":\"no remote\"}"));
-    return(getnewaddress(myinfo,coin,account));
+    retjson = cJSON_CreateObject();
+    jaddstr(retjson,"result","success");
+    return(jprint(retjson,1));
 }
 
-STRING_ARG(bitcoinrpc,getaccountaddress,account)
+ZERO_ARGS(bitcoinrpc,repairwallet)
 {
+    cJSON *retjson;
     if ( remoteaddr != 0 )
         return(clonestr("{\"error\":\"no remote\"}"));
-    return(getaccountaddress(myinfo,coin,account));
+    retjson = cJSON_CreateObject();
+    jaddstr(retjson,"result","success");
+    return(jprint(retjson,1));
 }
 
-TWOSTRINGS_AND_INT(bitcoinrpc,importprivkey,wif,account,rescan)
+STRING_ARG(bitcoinrpc,dumpwallet,filename)
 {
-    cJSON *retjson = cJSON_CreateObject();
+    cJSON *retjson;
+    if ( remoteaddr != 0 )
+        return(clonestr("{\"error\":\"no remote\"}"));
+    retjson = cJSON_CreateObject();
     return(jprint(retjson,1));
 }
 
-STRING_ARG(bitcoinrpc,dumpprivkey,address)
+STRING_ARG(bitcoinrpc,backupwallet,filename)
 {
-    cJSON *retjson = cJSON_CreateObject();
+    cJSON *retjson;
+    if ( remoteaddr != 0 )
+        return(clonestr("{\"error\":\"no remote\"}"));
+    retjson = cJSON_CreateObject();
+    return(jprint(retjson,1));
+}
+
+STRING_ARG(bitcoinrpc,importwallet,filename)
+{
+    cJSON *retjson;
+    if ( remoteaddr != 0 )
+        return(clonestr("{\"error\":\"no remote\"}"));
+    retjson = cJSON_CreateObject();
     return(jprint(retjson,1));
 }
 
 // multiple address
 THREE_INTS(bitcoinrpc,getbalance,confirmations,includeempty,watchonly)
 {
-    cJSON *retjson = cJSON_CreateObject();
+    cJSON *retjson;
+    if ( remoteaddr != 0 )
+        return(clonestr("{\"error\":\"no remote\"}"));
+    retjson = cJSON_CreateObject();
     return(jprint(retjson,1));
 }
 
 STRING_ARG(bitcoinrpc,getaddressesbyaccount,account)
 {
-    cJSON *retjson = cJSON_CreateObject();
+    cJSON *retjson;
+    if ( remoteaddr != 0 )
+        return(clonestr("{\"error\":\"no remote\"}"));
+    retjson = cJSON_CreateObject();
     return(jprint(retjson,1));
 }
 
 STRING_AND_INT(bitcoinrpc,getreceivedbyaccount,account,includeempty)
 {
-    cJSON *retjson = cJSON_CreateObject();
+    cJSON *retjson;
+    if ( remoteaddr != 0 )
+        return(clonestr("{\"error\":\"no remote\"}"));
+    retjson = cJSON_CreateObject();
     return(jprint(retjson,1));
 }
 
 THREE_INTS(bitcoinrpc,listreceivedbyaccount,confirmations,includeempty,watchonly)
 {
-    cJSON *retjson = cJSON_CreateObject();
+    cJSON *retjson;
+    if ( remoteaddr != 0 )
+        return(clonestr("{\"error\":\"no remote\"}"));
+    retjson = cJSON_CreateObject();
     return(jprint(retjson,1));
 }
 
 THREE_INTS(bitcoinrpc,listreceivedbyaddress,minconf,includeempty,flag)
 {
-    //cJSON *retjson;
+    cJSON *retjson;
     if ( remoteaddr != 0 )
         return(clonestr("{\"error\":\"no remote\"}"));
+    retjson = cJSON_CreateObject();
     return(jsuccess());
 }
 
 STRING_AND_THREEINTS(bitcoinrpc,listtransactions,account,count,skip,includewatchonly)
 {
-    //cJSON *retjson;
+    cJSON *retjson;
     if ( remoteaddr != 0 )
         return(clonestr("{\"error\":\"no remote\"}"));
+    retjson = cJSON_CreateObject();
     return(jsuccess());
 }
 
 S_D_SS(bitcoinrpc,sendtoaddress,address,amount,comment,comment2)
 {
-    //cJSON *retjson;
+    cJSON *retjson;
     if ( remoteaddr != 0 )
         return(clonestr("{\"error\":\"no remote\"}"));
+    retjson = cJSON_CreateObject();
     return(jsuccess());
 }
 
 SS_D_I_SS(bitcoinrpc,sendfrom,fromaccount,toaddress,amount,minconf,comment,comment2)
 {
-    //cJSON *retjson;
+    cJSON *retjson;
     if ( remoteaddr != 0 )
         return(clonestr("{\"error\":\"no remote\"}"));
+    retjson = cJSON_CreateObject();
     return(jsuccess());
 }
 
 DOUBLE_ARG(bitcoinrpc,settxfee,amount)
 {
-    cJSON *retjson = cJSON_CreateObject();
+    cJSON *retjson;
+    if ( remoteaddr != 0 )
+        return(clonestr("{\"error\":\"no remote\"}"));
+    retjson = cJSON_CreateObject();
     return(jprint(retjson,1));
 }
 
 SS_D_I_S(bitcoinrpc,move,fromaccount,toaccount,amount,minconf,comment)
 {
-    cJSON *retjson = cJSON_CreateObject();
+    cJSON *retjson;
+    if ( remoteaddr != 0 )
+        return(clonestr("{\"error\":\"no remote\"}"));
+    retjson = cJSON_CreateObject();
     return(jprint(retjson,1));
 }
 
 S_A_I_S(bitcoinrpc,sendmany,fromaccount,array,minconf,comment)
 {
-    cJSON *retjson = cJSON_CreateObject();
+    cJSON *retjson;
+    if ( remoteaddr != 0 )
+        return(clonestr("{\"error\":\"no remote\"}"));
+    retjson = cJSON_CreateObject();
     return(jprint(retjson,1));
 }
 
 // entire wallet funcs
 TWO_INTS(bitcoinrpc,listaccounts,minconf,includewatchonly)
 {
-    cJSON *retjson = cJSON_CreateObject();
+    cJSON *retjson;
+    if ( remoteaddr != 0 )
+        return(clonestr("{\"error\":\"no remote\"}"));
+    retjson = cJSON_CreateObject();
     return(jprint(retjson,1));
 }
 
 ZERO_ARGS(bitcoinrpc,listaddressgroupings)
 {
-    cJSON *retjson = cJSON_CreateObject();
+    cJSON *retjson;
-    return(jprint(retjson,1));
+    if ( remoteaddr != 0 )
-}
+        return(clonestr("{\"error\":\"no remote\"}"));
-
+    retjson = cJSON_CreateObject();
-ZERO_ARGS(bitcoinrpc,checkwallet)
-{
-    cJSON *retjson = cJSON_CreateObject();
-    return(jprint(retjson,1));
-}
-
-ZERO_ARGS(bitcoinrpc,repairwallet)
-{
-    cJSON *retjson = cJSON_CreateObject();
-    return(jprint(retjson,1));
-}
-
-STRING_ARG(bitcoinrpc,dumpwallet,filename)
-{
-    cJSON *retjson = cJSON_CreateObject();
-    return(jprint(retjson,1));
-}
-
-STRING_ARG(bitcoinrpc,backupwallet,filename)
-{
-    cJSON *retjson = cJSON_CreateObject();
-    return(jprint(retjson,1));
-}
-
-STRING_ARG(bitcoinrpc,importwallet,filename)
-{
-    cJSON *retjson = cJSON_CreateObject();
     return(jprint(retjson,1));
 }
 
 #include "../includes/iguana_apiundefs.h"
 
-/*
- 
- sendtoaddress
- encryptwallet
- sendfrom
- walletlock
- walletpassphrase
- walletpassphrasechange
- 
- validateaddress
- 
- listreceivedbyaddress
- listtransactions
- 
- not implemented yet but needed by GUI
- 
- addmultisigaddress (for generating address)
- setaccount       (to give labels to address)
- */