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

Fix

Browse Source
This commit is contained in:
Mihailo Milenkovic
2018-10-31 16:54:18 +01:00
parent 725d549f6d
commit 127ee64e48
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/cc/channels.cpp
View File

@@ -692,7 +692,7 @@ std::string ChannelRefund(uint64_t txfee,uint256 opentxid,uint256 closetxid)
UniValue ChannelsInfo(uint256 channeltxid) UniValue ChannelsInfo(uint256 channeltxid)
{ {
UniValue result(UniValue::VOBJ); CTransaction tx,opentx; uint256 txid,tmp_txid,hashBlock,param3,opentxid,hashchain,prevtxid; UniValue result(UniValue::VOBJ); CTransaction tx,opentx; uint256 txid,tmp_txid,hashBlock,param3,opentxid,hashchain,prevtxid;
struct CCcontract_info *cp,C; char myCCaddr[65],addr[65],str1[256],str2[65]; int32_t vout,numvouts,param1,numpayments; struct CCcontract_info *cp,C; char myCCaddr[65],addr[65],str1[256],str2[256]; int32_t vout,numvouts,param1,numpayments;
int64_t nValue,param2,payment; CPubKey srcpub,destpub,mypk; int64_t nValue,param2,payment; CPubKey srcpub,destpub,mypk;
std::vector<std::pair<CAddressIndexKey, CAmount> > txids; std::vector<std::pair<CAddressIndexKey, CAmount> > txids;

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

@@ -360,7 +360,7 @@ bits256 komodobroadcast(char *refcoin,char *acname,cJSON *hexjson)
retstr[64] = 0; retstr[64] = 0;
decode_hex(txid.bytes,32,retstr); decode_hex(txid.bytes,32,retstr);
} }
fprintf(stderr,"broadcast %s txid.(%s)\n",acname,bits256_str(str,txid)); fprintf(stderr,"broadcast %s txid.(%s)\n",strlen(acname)>0?acname:refcoin,bits256_str(str,txid));
free(retstr); free(retstr);
} }
} }
@@ -637,14 +637,12 @@ char *createmultisig(char *refcoin,char *acname,char *depositaddr,char *signerad
change = (total - satoshis); change = (total - satoshis);
jaddnum(vouts,depositaddr,(double)change/SATOSHIDEN); jaddnum(vouts,depositaddr,(double)change/SATOSHIDEN);
} }
char *tmpA=jprint(vins,1); char *tmpA=jprint(vins,0);
char *tmpB=jprint(vouts,1); char *tmpB=jprint(vouts,0);
char *argA=malloc(sizeof(char) * (strlen(tmpA)+3)); char *argA=malloc(sizeof(char) * (strlen(tmpA)+3));
char *argB=malloc(sizeof(char) * (strlen(tmpB)+3)); char *argB=malloc(sizeof(char) * (strlen(tmpB)+3));
sprintf(argA,"\'%s\'",tmpA); sprintf(argA,"\'%s\'",tmpA);
sprintf(argB,"\'%s\'",tmpB); sprintf(argB,"\'%s\'",tmpB);
printf("%s\n",argA);
printf("%s\n",argB);
if ( (retjson2= get_komodocli(refcoin,&txstr,acname,"createrawtransaction",argA,argB,"","")) != 0 ) 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));
@@ -658,6 +656,7 @@ char *createmultisig(char *refcoin,char *acname,char *depositaddr,char *signerad
free(argB); free(argB);
} }
} }
free_json(retjson);
} }
else if ( retstr != 0 ) else if ( retstr != 0 )
{ {