|
|
@ -700,23 +700,6 @@ int32_t z_getnewaddress(char *coinaddr,char *refcoin,char *acname,char *typestr) |
|
|
|
return(retval); |
|
|
|
} |
|
|
|
|
|
|
|
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",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); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
int64_t find_onetime_amount(char *coinstr,char *coinaddr) |
|
|
|
{ |
|
|
|
cJSON *array,*item; int32_t i,n; char *addr; int64_t amount = 0; |
|
|
@ -812,53 +795,8 @@ 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 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"); |
|
|
|