DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

syntax

Browse Source
This commit is contained in:
jl777
2018-09-22 03:09:55 -11:00
parent cd40321aaf
commit b07000b7fd
2 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/cc/dapps/oraclefeed.c
View File

@@ -543,7 +543,6 @@ void importaddress(char *refcoin,char *acname,char *depositaddr)
fprintf(stderr,"importaddress.(%s) %s error.(%s)\n",refcoin,acname,retstr); fprintf(stderr,"importaddress.(%s) %s error.(%s)\n",refcoin,acname,retstr);
free(retstr); free(retstr);
} }
return(0);
} }
cJSON *getinputarray(int64_t *totalp,cJSON *unspents,int64_t required) cJSON *getinputarray(int64_t *totalp,cJSON *unspents,int64_t required)
@@ -563,7 +562,7 @@ cJSON *getinputarray(int64_t *totalp,cJSON *unspents,int64_t required)
vin = cJSON_CreateObject(); vin = cJSON_CreateObject();
jaddbits256(vin,"txid",txid); jaddbits256(vin,"txid",txid);
jaddnum(vin,"vout",v); jaddnum(vin,"vout",v);
jadd(vins,vin); jaddi(vins,vin);
*totalp += satoshis; *totalp += satoshis;
if ( (*totalp) >= required ) if ( (*totalp) >= required )
break; break;
@@ -581,34 +580,37 @@ char *createmultisig(char *refcoin,char *acname,char *depositaddr,char *signerad
else txfee = 10000; else txfee = 10000;
if ( satoshis < txfee ) if ( satoshis < txfee )
{ {
printf("createmultisig satoshis %.8f < txfee %.8f\n",(double)satoshis/SATOSHIDEN,(double)txfee/SATOSHIS); printf("createmultisig satoshis %.8f < txfee %.8f\n",(double)satoshis/SATOSHIDEN,(double)txfee/SATOSHIDEN);
return(0); return(0);
} }
satoshis -= txfee; satoshis -= txfee;
sprintf(array,"[\"%s\"]",depositaddr); sprintf(array,"[\"%s\"]",depositaddr);
if ( (retjson= get_komodocli(refcoin,&retstr,acname,"listunspent",1,99999999,array,"")) != 0 ) if ( (retjson= get_komodocli(refcoin,&retstr,acname,"listunspent","1","99999999",array,"")) != 0 )
{ {
//createrawtransaction [{"txid":"id","vout":n},...] {"address":amount,...} //createrawtransaction [{"txid":"id","vout":n},...] {"address":amount,...}
if ( (vins= getinputarray(&total,retjson,satoshis)) != 0 ) if ( (vins= getinputarray(&total,retjson,satoshis)) != 0 )
{ {
if ( total >= satoshis ) if ( total >= satoshis )
{ {
vouts = cJSON_CreatObject(); vouts = cJSON_CreateObject();
jaddstr(vouts,withdrawaddr,(double)satoshis/SATOSHIDEN); jaddnum(vouts,withdrawaddr,(double)satoshis/SATOSHIDEN);
if ( total > satoshis+txfee ) if ( total > satoshis+txfee )
{ {
change = (total - satoshis); change = (total - satoshis);
jaddstr(vouts,depositaddr,(double)change/SATOSHIDEN); jaddnum(vouts,depositaddr,(double)change/SATOSHIDEN);
} }
if ( (retjson2= get_komodocli(refcoin,&txstr,acname,"createrawtransaction",jprint(vins,0),jprint(vouts,0),"","")) != 0 ) char *argA,*argB;
argA = jprint(vins,1);
argB = jprint(vouts,1);
if ( (retjson2= get_komodocli(refcoin,&txstr,acname,"createrawtransaction",argA,argB,"","")) != 0 )
{ {
printf("createmultisig: unexpected JSON2.(%s)\n",jprint(retjson2,0)); printf("createmultisig: unexpected JSON2.(%s)\n",jprint(retjson2,0));
free_json(retjson2); free_json(retjson2);
} }
else if ( txstr == 0 ) else if ( txstr == 0 )
printf("createmultisig: null txstr and JSON2\n"); printf("createmultisig: null txstr and JSON2\n");
free_json(vins); free(argA);
free_json(vouts); free(argB);
} }
} }
} }

2
src/cc/gateways.cpp
View File

@@ -136,7 +136,7 @@
Care must be taken so that tokens are not lost and can be converted back. Care must be taken so that tokens are not lost and can be converted back.
This changes the usage to require tokenconvert before doing the bind and also tokenconvert before doing a withdraw. EVAL_GATEWAYS has evalcode of 251 This changes the usage to require tokenconvert before doing the bind and also tokenconvert before doing a withdraw. EVAL_GATEWAYS has evalcode of 241
The gatewaysclaim automatically converts the deposit amount of tokens back to EVAL_ASSETS. The gatewaysclaim automatically converts the deposit amount of tokens back to EVAL_ASSETS.