From 45d91c8f0d034c99a22f6072c299b1734375744e Mon Sep 17 00:00:00 2001 From: jl777 Date: Tue, 18 Dec 2018 04:30:25 -1100 Subject: [PATCH 1/5] z_mergetoaddress loop at start of migrate --- src/cc/dapps/zmigrate.c | 78 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 77 insertions(+), 1 deletion(-) diff --git a/src/cc/dapps/zmigrate.c b/src/cc/dapps/zmigrate.c index 3f26c50a1..61a863e16 100644 --- a/src/cc/dapps/zmigrate.c +++ b/src/cc/dapps/zmigrate.c @@ -647,6 +647,25 @@ int64_t z_getbalance(char *refcoin,char *acname,char *coinaddr) return (amount); } +int32_t z_exportkey(char *privkey,char *refcoin,char *acname,char *zaddr) +{ + cJSON *retjson; char *retstr,cmpstr[64]; int64_t amount=0; + 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); + } +} + int32_t getnewaddress(char *coinaddr,char *refcoin,char *acname) { cJSON *retjson; char *retstr; int64_t amount=0; @@ -664,6 +683,23 @@ int32_t getnewaddress(char *coinaddr,char *refcoin,char *acname) } } +int32_t z_getnewaddress(char *coinaddr,char *refcoin,char *acname) +{ + cJSON *retjson; char *retstr; int64_t amount=0; + if ( (retjson= get_komodocli(refcoin,&retstr,acname,"z_getnewaddress","","","","")) != 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); + } +} + int64_t find_onetime_amount(char *coinstr,char *coinaddr) { cJSON *array,*item; int32_t i,n; char *addr; int64_t amount = 0; @@ -751,6 +787,39 @@ int32_t z_sendmany(char *opidstr,char *coinstr,char *acname,char *srcaddr,char * } } +int32_t z_mergetoaddress(char *opidstr,char *coinstr,char *acname,char *destaddr) +{ + cJSON *retjson; char *retstr,addr[128],*opstr; int32_t retval = -1; + sprintf(addr,"\"ANY_SPROUT\""); + //printf("z_sendmany from.(%s) -> %s\n",addr,destaddr); + if ( (retjson= get_komodocli(coinstr,&retstr,acname,"z_mergetoaddress",addr,destaddr,"","")) != 0 ) + { + /*{ + "remainingUTXOs": 0, + "remainingTransparentValue": 0.00000000, + "remainingNotes": 222, + "remainingShieldedValue": 5413.39093055, + "mergingUTXOs": 0, + "mergingTransparentValue": 0.00000000, + "mergingNotes": 10, + "mergingShieldedValue": 822.47447172, + "opid": "opid-f28f6261-4120-436c-aca5-859870a40a70" + }*/ + if ( (opstr= jstr(retjson,"opid")) != 0 ) + strcpy(opidstr,opstr); + retval = jint(retjson,"remainingNotes"); + fprintf(stderr,"%s\n",jprint(retjson,0)); + free_json(retjson); + } + else if ( retstr != 0 ) + { + fprintf(stderr,"z_mergetoaddress.(%s) -> opid.(%s)\n",coinstr,retstr); + strcpy(opidstr,retstr); + free(retstr); + } + return(retval); +} + int32_t empty_mempool(char *coinstr,char *acname) { cJSON *array; int32_t n; @@ -907,11 +976,18 @@ int32_t main(int32_t argc,char **argv) } zsaddr = clonestr(argv[2]); printf("%s: %s %s\n",REFCOIN_CLI,coinstr,zsaddr); - uint32_t lastopid; char coinaddr[64],zcaddr[128],opidstr[128]; int32_t finished; int64_t amount,stdamount,txfee; + uint32_t lastopid; char coinaddr[64],privkey[1024],zcaddr[128],opidstr[128]; int32_t finished; int64_t amount,stdamount,txfee; //stdamount = 500 * SATOSHIDEN; txfee = 10000; again: printf("start processing zmigrate\n"); + if ( z_getnewaddress(zcaddr,coinstr,"") == 0 ) + { + z_exportkey(privkey,coinstr,"",zcaddr); + printf("zcaddr.(%s) -> z_exportkey.(%s)\n",zcaddr,privkey); + while ( z_mergetoaddress(opidstr,coinstr,"",zcaddr) > 0 ) + ; + } lastopid = (uint32_t)time(NULL); finished = 0; while ( 1 ) From a7cd4c0d714a006d9daa29c3a81b4e346a5cbf7f Mon Sep 17 00:00:00 2001 From: jl777 Date: Tue, 18 Dec 2018 04:33:24 -1100 Subject: [PATCH 2/5] z_getnewaddress sprout --- src/cc/dapps/zmigrate.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/cc/dapps/zmigrate.c b/src/cc/dapps/zmigrate.c index 61a863e16..018af2c3b 100644 --- a/src/cc/dapps/zmigrate.c +++ b/src/cc/dapps/zmigrate.c @@ -683,10 +683,10 @@ int32_t getnewaddress(char *coinaddr,char *refcoin,char *acname) } } -int32_t z_getnewaddress(char *coinaddr,char *refcoin,char *acname) +int32_t z_getnewaddress(char *coinaddr,char *refcoin,char *acname,char *typestr) { cJSON *retjson; char *retstr; int64_t amount=0; - if ( (retjson= get_komodocli(refcoin,&retstr,acname,"z_getnewaddress","","","","")) != 0 ) + 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); @@ -981,7 +981,7 @@ int32_t main(int32_t argc,char **argv) txfee = 10000; again: printf("start processing zmigrate\n"); - if ( z_getnewaddress(zcaddr,coinstr,"") == 0 ) + if ( z_getnewaddress(zcaddr,coinstr,"","sprout") == 0 ) { z_exportkey(privkey,coinstr,"",zcaddr); printf("zcaddr.(%s) -> z_exportkey.(%s)\n",zcaddr,privkey); From 92fc71b75385ab4c6e034aebd34fe8bffe706a2b Mon Sep 17 00:00:00 2001 From: jl777 Date: Tue, 18 Dec 2018 04:35:49 -1100 Subject: [PATCH 3/5] [] --- src/cc/dapps/zmigrate.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cc/dapps/zmigrate.c b/src/cc/dapps/zmigrate.c index 018af2c3b..c11e84e06 100644 --- a/src/cc/dapps/zmigrate.c +++ b/src/cc/dapps/zmigrate.c @@ -790,7 +790,7 @@ int32_t z_sendmany(char *opidstr,char *coinstr,char *acname,char *srcaddr,char * int32_t z_mergetoaddress(char *opidstr,char *coinstr,char *acname,char *destaddr) { cJSON *retjson; char *retstr,addr[128],*opstr; int32_t retval = -1; - sprintf(addr,"\"ANY_SPROUT\""); + sprintf(addr,"[\"ANY_SPROUT\"]"); //printf("z_sendmany from.(%s) -> %s\n",addr,destaddr); if ( (retjson= get_komodocli(coinstr,&retstr,acname,"z_mergetoaddress",addr,destaddr,"","")) != 0 ) { @@ -980,7 +980,6 @@ int32_t main(int32_t argc,char **argv) //stdamount = 500 * SATOSHIDEN; txfee = 10000; again: - printf("start processing zmigrate\n"); if ( z_getnewaddress(zcaddr,coinstr,"","sprout") == 0 ) { z_exportkey(privkey,coinstr,"",zcaddr); @@ -988,6 +987,7 @@ again: while ( z_mergetoaddress(opidstr,coinstr,"",zcaddr) > 0 ) ; } + printf("start processing zmigrate\n"); lastopid = (uint32_t)time(NULL); finished = 0; while ( 1 ) From 45df5812401044b8422b5f72a52de9507a0533bf Mon Sep 17 00:00:00 2001 From: jl777 Date: Tue, 18 Dec 2018 04:36:36 -1100 Subject: [PATCH 4/5] Test --- src/cc/dapps/zmigrate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cc/dapps/zmigrate.c b/src/cc/dapps/zmigrate.c index c11e84e06..3b32cbdd4 100644 --- a/src/cc/dapps/zmigrate.c +++ b/src/cc/dapps/zmigrate.c @@ -790,7 +790,7 @@ int32_t z_sendmany(char *opidstr,char *coinstr,char *acname,char *srcaddr,char * int32_t z_mergetoaddress(char *opidstr,char *coinstr,char *acname,char *destaddr) { cJSON *retjson; char *retstr,addr[128],*opstr; int32_t retval = -1; - sprintf(addr,"[\"ANY_SPROUT\"]"); + sprintf(addr,"[\\""ANY_SPROUT\\""]"); //printf("z_sendmany from.(%s) -> %s\n",addr,destaddr); if ( (retjson= get_komodocli(coinstr,&retstr,acname,"z_mergetoaddress",addr,destaddr,"","")) != 0 ) { From 776e52508347cc14dfa1fc1d786d897fb975e8bb Mon Sep 17 00:00:00 2001 From: jl777 Date: Tue, 18 Dec 2018 04:38:02 -1100 Subject: [PATCH 5/5] \" --- src/cc/dapps/zmigrate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cc/dapps/zmigrate.c b/src/cc/dapps/zmigrate.c index 3b32cbdd4..2e3051902 100644 --- a/src/cc/dapps/zmigrate.c +++ b/src/cc/dapps/zmigrate.c @@ -790,7 +790,7 @@ int32_t z_sendmany(char *opidstr,char *coinstr,char *acname,char *srcaddr,char * int32_t z_mergetoaddress(char *opidstr,char *coinstr,char *acname,char *destaddr) { cJSON *retjson; char *retstr,addr[128],*opstr; int32_t retval = -1; - sprintf(addr,"[\\""ANY_SPROUT\\""]"); + sprintf(addr,"[\\\"ANY_SPROUT\\\"]"); //printf("z_sendmany from.(%s) -> %s\n",addr,destaddr); if ( (retjson= get_komodocli(coinstr,&retstr,acname,"z_mergetoaddress",addr,destaddr,"","")) != 0 ) {