From 4fc0f1977580a1fad68132aea3593e6e84f50383 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Tue, 18 Dec 2018 10:13:04 -1100
Subject: [PATCH 1/2] Fix warnings

---
 src/cc/dapps/zmigrate.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/cc/dapps/zmigrate.c b/src/cc/dapps/zmigrate.c
index f1fb4b0a6..145f4575f 100644
--- a/src/cc/dapps/zmigrate.c
+++ b/src/cc/dapps/zmigrate.c
@@ -649,55 +649,55 @@ int64_t z_getbalance(char *refcoin,char *acname,char *coinaddr)
 
 int32_t z_exportkey(char *privkey,char *refcoin,char *acname,char *zaddr)
 {
-    cJSON *retjson; char *retstr,cmpstr[64]; int64_t amount=0;
+    cJSON *retjson; char *retstr,cmpstr[64]; int64_t amount=0; int32_t retval = -1;
     privkey[0] = 0;
     if ( (retjson= get_komodocli(refcoin,&retstr,acname,"z_exportkey",zaddr,"","","")) != 0 )
     {
         fprintf(stderr,"z_exportkey.(%s) %s returned json!\n",refcoin,acname);
         free_json(retjson);
-        return(-1);
     }
     else if ( retstr != 0 )
     {
         //printf("retstr %s -> %.8f\n",retstr,dstr(amount));
         strcpy(privkey,retstr);
         free(retstr);
-        return(0);
+        retval = 0;
     }
+    return(retval);
 }
 
 int32_t getnewaddress(char *coinaddr,char *refcoin,char *acname)
 {
-    cJSON *retjson; char *retstr; int64_t amount=0;
+    cJSON *retjson; char *retstr; int64_t amount=0; int32_t retval = -1;
     if ( (retjson= get_komodocli(refcoin,&retstr,acname,"getnewaddress","","","","")) != 0 )
     {
         fprintf(stderr,"getnewaddress.(%s) %s returned json!\n",refcoin,acname);
         free_json(retjson);
-        return(-1);
     }
     else if ( retstr != 0 )
     {
         strcpy(coinaddr,retstr);
         free(retstr);
-        return(0);
+        retval = 0;
     }
+    return(retval);
 }
 
 int32_t z_getnewaddress(char *coinaddr,char *refcoin,char *acname,char *typestr)
 {
-    cJSON *retjson; char *retstr; int64_t amount=0;
+    cJSON *retjson; char *retstr; int64_t amount=0; int32_t retval = -1;
     if ( (retjson= get_komodocli(refcoin,&retstr,acname,"z_getnewaddress",typestr,"","","")) != 0 )
     {
         fprintf(stderr,"z_getnewaddress.(%s) %s returned json!\n",refcoin,acname);
         free_json(retjson);
-        return(-1);
     }
     else if ( retstr != 0 )
     {
         strcpy(coinaddr,retstr);
         free(retstr);
-        return(0);
+        retval = 0;
     }
+    return(retval);
 }
 
 int64_t find_onetime_amount(char *coinstr,char *coinaddr)
@@ -768,7 +768,7 @@ void importaddress(char *refcoin,char *acname,char *depositaddr)
 
 int32_t z_sendmany(char *opidstr,char *coinstr,char *acname,char *srcaddr,char *destaddr,int64_t amount)
 {
-    cJSON *retjson; char *retstr,params[1024],addr[128];
+    cJSON *retjson; char *retstr,params[1024],addr[128]; int32_t retval = -1;
     sprintf(params,"'[{\"address\":\"%s\",\"amount\":%.8f}]'",destaddr,dstr(amount));
     sprintf(addr,"\"%s\"",srcaddr);
     printf("z_sendmany from.(%s) -> %s\n",srcaddr,params);
@@ -776,15 +776,15 @@ int32_t z_sendmany(char *opidstr,char *coinstr,char *acname,char *srcaddr,char *
     {
         printf("unexpected json z_sendmany.(%s)\n",jprint(retjson,0));
         free_json(retjson);
-        return(-1);
     }
     else if ( retstr != 0 )
     {
         fprintf(stderr,"z_sendmany.(%s) -> opid.(%s)\n",coinstr,retstr);
         strcpy(opidstr,retstr);
         free(retstr);
-        return(0);
+        retval = 0;
     }
+    return(retval);
 }
 
 int32_t z_mergetoaddress(char *opidstr,char *coinstr,char *acname,char *destaddr)

From 2d9c9864d71b8880f3399d3a46ac1097f0aa2975 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Wed, 19 Dec 2018 09:26:37 -1100
Subject: [PATCH 2/2] Skip unspendables in zmigrate

---
 src/cc/dapps/zmigrate.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/cc/dapps/zmigrate.c b/src/cc/dapps/zmigrate.c
index 145f4575f..d9ec6ec19 100644
--- a/src/cc/dapps/zmigrate.c
+++ b/src/cc/dapps/zmigrate.c
@@ -712,6 +712,10 @@ int64_t find_onetime_amount(char *coinstr,char *coinaddr)
             for (i=0; i<n; i++)
             {
                 item = jitem(array,i);
+                if (is_cJSON_False(jobj(item, "spendable")) != 0)
+                {
+                    continue;
+                }
                 if ( (addr= jstr(item,"address")) != 0 )
                 {
                     strcpy(coinaddr,addr);