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

Merge pull request #474 from jl777/dev

Browse Source 
Dev
This commit is contained in:
jl777
2017-09-25 12:13:09 +02:00
committed by GitHub
parent 5d7e988543 ad9a8c35d6
commit c6faffe4b6
6 changed files with 26 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/bitcoin-cli.cpp
View File

@@ -196,7 +196,7 @@ UniValue CallRPC(const string& strMethod, const UniValue& params)
{ {
std::string host = GetArg("-rpcconnect", "127.0.0.1"); std::string host = GetArg("-rpcconnect", "127.0.0.1");
int port = GetArg("-rpcport", BaseParams().RPCPort()); int port = GetArg("-rpcport", BaseParams().RPCPort());
BITCOIND_PORT = port;
// Obtain event base // Obtain event base
raii_event_base base = obtain_event_base(); raii_event_base base = obtain_event_base();

6
src/komodo_bitcoind.h
View File

@@ -353,7 +353,7 @@ int32_t notarizedtxid_height(char *dest,char *txidstr,int32_t *kmdnotarized_heig
*kmdnotarized_heightp = 0; *kmdnotarized_heightp = 0;
if ( strcmp(dest,"KMD") == 0 ) if ( strcmp(dest,"KMD") == 0 )
{ {
port = 7771; port = BITCOIND_PORT;
userpass = KMDUSERPASS; userpass = KMDUSERPASS;
} }
else if ( strcmp(dest,"BTC") == 0 ) else if ( strcmp(dest,"BTC") == 0 )
@@ -431,7 +431,7 @@ int32_t komodo_verifynotarization(char *symbol,char *dest,int32_t height,int32_t
if ( strcmp(dest,"KMD") == 0 ) if ( strcmp(dest,"KMD") == 0 )
{ {
if ( KMDUSERPASS[0] != 0 ) if ( KMDUSERPASS[0] != 0 )
jsonstr = komodo_issuemethod(KMDUSERPASS,(char *)"getrawtransaction",params,7771); jsonstr = komodo_issuemethod(KMDUSERPASS,(char *)"getrawtransaction",params,BITCOIND_PORT);
//else jsonstr = _dex_getrawtransaction(); //else jsonstr = _dex_getrawtransaction();
else return(0); // need universal way to issue DEX* API, since notaries mine most blocks, this ok else return(0); // need universal way to issue DEX* API, since notaries mine most blocks, this ok
} }
@@ -481,7 +481,7 @@ uint256 komodo_getblockhash(int32_t height)
uint256 hash; char params[128],*hexstr,*jsonstr; cJSON *result; int32_t i; uint8_t revbuf[32]; uint256 hash; char params[128],*hexstr,*jsonstr; cJSON *result; int32_t i; uint8_t revbuf[32];
memset(&hash,0,sizeof(hash)); memset(&hash,0,sizeof(hash));
sprintf(params,"[%d]",height); sprintf(params,"[%d]",height);
if ( (jsonstr= komodo_issuemethod(KMDUSERPASS,(char *)"getblockhash",params,7771)) != 0 ) if ( (jsonstr= komodo_issuemethod(KMDUSERPASS,(char *)"getblockhash",params,BITCOIND_PORT)) != 0 )
{ {
if ( (result= cJSON_Parse(jsonstr)) != 0 ) if ( (result= cJSON_Parse(jsonstr)) != 0 )
{ {

32
src/komodo_jumblr.h
View File

@@ -78,7 +78,7 @@ char *jumblr_importaddress(char *address)
{ {
char params[1024]; char params[1024];
sprintf(params,"[\"%s\", \"%s\", false]",address,address); sprintf(params,"[\"%s\", \"%s\", false]",address,address);
return(jumblr_issuemethod(KMDUSERPASS,(char *)"importaddress",params,7771)); return(jumblr_issuemethod(KMDUSERPASS,(char *)"importaddress",params,BITCOIND_PORT));
} }
char *jumblr_validateaddress(char *addr) char *jumblr_validateaddress(char *addr)
@@ -86,7 +86,7 @@ char *jumblr_validateaddress(char *addr)
char params[1024]; char params[1024];
sprintf(params,"[\"%s\"]",addr); sprintf(params,"[\"%s\"]",addr);
printf("validateaddress.%s\n",params); printf("validateaddress.%s\n",params);
return(jumblr_issuemethod(KMDUSERPASS,(char *)"validateaddress",params,7771)); return(jumblr_issuemethod(KMDUSERPASS,(char *)"validateaddress",params,BITCOIND_PORT));
} }
int32_t Jumblr_secretaddrfind(char *searchaddr) int32_t Jumblr_secretaddrfind(char *searchaddr)
@@ -207,28 +207,28 @@ char *jumblr_zgetnewaddress()
{ {
char params[1024]; char params[1024];
sprintf(params,"[]"); sprintf(params,"[]");
return(jumblr_issuemethod(KMDUSERPASS,(char *)"z_getnewaddress",params,7771)); return(jumblr_issuemethod(KMDUSERPASS,(char *)"z_getnewaddress",params,BITCOIND_PORT));
} }
char *jumblr_zlistoperationids() char *jumblr_zlistoperationids()
{ {
char params[1024]; char params[1024];
sprintf(params,"[]"); sprintf(params,"[]");
return(jumblr_issuemethod(KMDUSERPASS,(char *)"z_listoperationids",params,7771)); return(jumblr_issuemethod(KMDUSERPASS,(char *)"z_listoperationids",params,BITCOIND_PORT));
} }
char *jumblr_zgetoperationresult(char *opid) char *jumblr_zgetoperationresult(char *opid)
{ {
char params[1024]; char params[1024];
sprintf(params,"[[\"%s\"]]",opid); sprintf(params,"[[\"%s\"]]",opid);
return(jumblr_issuemethod(KMDUSERPASS,(char *)"z_getoperationresult",params,7771)); return(jumblr_issuemethod(KMDUSERPASS,(char *)"z_getoperationresult",params,BITCOIND_PORT));
} }
char *jumblr_zgetoperationstatus(char *opid) char *jumblr_zgetoperationstatus(char *opid)
{ {
char params[1024]; char params[1024];
sprintf(params,"[[\"%s\"]]",opid); sprintf(params,"[[\"%s\"]]",opid);
return(jumblr_issuemethod(KMDUSERPASS,(char *)"z_getoperationstatus",params,7771)); return(jumblr_issuemethod(KMDUSERPASS,(char *)"z_getoperationstatus",params,BITCOIND_PORT));
} }
char *jumblr_sendt_to_z(char *taddr,char *zaddr,double amount) char *jumblr_sendt_to_z(char *taddr,char *zaddr,double amount)
@@ -238,7 +238,7 @@ char *jumblr_sendt_to_z(char *taddr,char *zaddr,double amount)
return(clonestr((char *)"{\"error\":\"illegal address in t to z\"}")); return(clonestr((char *)"{\"error\":\"illegal address in t to z\"}"));
sprintf(params,"[\"%s\", [{\"address\":\"%s\",\"amount\":%.8f}, {\"address\":\"%s\",\"amount\":%.8f}], 1, %.8f]",taddr,zaddr,amount-fee-JUMBLR_TXFEE,JUMBLR_ADDR,fee,JUMBLR_TXFEE); sprintf(params,"[\"%s\", [{\"address\":\"%s\",\"amount\":%.8f}, {\"address\":\"%s\",\"amount\":%.8f}], 1, %.8f]",taddr,zaddr,amount-fee-JUMBLR_TXFEE,JUMBLR_ADDR,fee,JUMBLR_TXFEE);
printf("t -> z: %s\n",params); printf("t -> z: %s\n",params);
return(jumblr_issuemethod(KMDUSERPASS,(char *)"z_sendmany",params,7771)); return(jumblr_issuemethod(KMDUSERPASS,(char *)"z_sendmany",params,BITCOIND_PORT));
} }
char *jumblr_sendz_to_z(char *zaddrS,char *zaddrD,double amount) char *jumblr_sendz_to_z(char *zaddrS,char *zaddrD,double amount)
@@ -249,7 +249,7 @@ char *jumblr_sendz_to_z(char *zaddrS,char *zaddrD,double amount)
//sprintf(params,"[\"%s\", [{\"address\":\"%s\",\"amount\":%.8f}, {\"address\":\"%s\",\"amount\":%.8f}], 1, %.8f]",zaddrS,zaddrD,amount-fee-JUMBLR_TXFEE,JUMBLR_ADDR,fee,JUMBLR_TXFEE); //sprintf(params,"[\"%s\", [{\"address\":\"%s\",\"amount\":%.8f}, {\"address\":\"%s\",\"amount\":%.8f}], 1, %.8f]",zaddrS,zaddrD,amount-fee-JUMBLR_TXFEE,JUMBLR_ADDR,fee,JUMBLR_TXFEE);
sprintf(params,"[\"%s\", [{\"address\":\"%s\",\"amount\":%.8f}], 1, %.8f]",zaddrS,zaddrD,amount-fee-JUMBLR_TXFEE,JUMBLR_TXFEE); sprintf(params,"[\"%s\", [{\"address\":\"%s\",\"amount\":%.8f}], 1, %.8f]",zaddrS,zaddrD,amount-fee-JUMBLR_TXFEE,JUMBLR_TXFEE);
printf("z -> z: %s\n",params); printf("z -> z: %s\n",params);
return(jumblr_issuemethod(KMDUSERPASS,(char *)"z_sendmany",params,7771)); return(jumblr_issuemethod(KMDUSERPASS,(char *)"z_sendmany",params,BITCOIND_PORT));
} }
char *jumblr_sendz_to_t(char *zaddr,char *taddr,double amount) char *jumblr_sendz_to_t(char *zaddr,char *taddr,double amount)
@@ -259,56 +259,56 @@ char *jumblr_sendz_to_t(char *zaddr,char *taddr,double amount)
return(clonestr((char *)"{\"error\":\"illegal address in z to t\"}")); return(clonestr((char *)"{\"error\":\"illegal address in z to t\"}"));
sprintf(params,"[\"%s\", [{\"address\":\"%s\",\"amount\":%.8f}, {\"address\":\"%s\",\"amount\":%.8f}], 1, %.8f]",zaddr,taddr,amount-fee-JUMBLR_TXFEE,JUMBLR_ADDR,fee,JUMBLR_TXFEE); sprintf(params,"[\"%s\", [{\"address\":\"%s\",\"amount\":%.8f}, {\"address\":\"%s\",\"amount\":%.8f}], 1, %.8f]",zaddr,taddr,amount-fee-JUMBLR_TXFEE,JUMBLR_ADDR,fee,JUMBLR_TXFEE);
printf("z -> t: %s\n",params); printf("z -> t: %s\n",params);
return(jumblr_issuemethod(KMDUSERPASS,(char *)"z_sendmany",params,7771)); return(jumblr_issuemethod(KMDUSERPASS,(char *)"z_sendmany",params,BITCOIND_PORT));
} }
char *jumblr_zlistaddresses() char *jumblr_zlistaddresses()
{ {
char params[1024]; char params[1024];
sprintf(params,"[]"); sprintf(params,"[]");
return(jumblr_issuemethod(KMDUSERPASS,(char *)"z_listaddresses",params,7771)); return(jumblr_issuemethod(KMDUSERPASS,(char *)"z_listaddresses",params,BITCOIND_PORT));
} }
char *jumblr_zlistreceivedbyaddress(char *addr) char *jumblr_zlistreceivedbyaddress(char *addr)
{ {
char params[1024]; char params[1024];
sprintf(params,"[\"%s\", 1]",addr); sprintf(params,"[\"%s\", 1]",addr);
return(jumblr_issuemethod(KMDUSERPASS,(char *)"z_listreceivedbyaddress",params,7771)); return(jumblr_issuemethod(KMDUSERPASS,(char *)"z_listreceivedbyaddress",params,BITCOIND_PORT));
} }
char *jumblr_getreceivedbyaddress(char *addr) char *jumblr_getreceivedbyaddress(char *addr)
{ {
char params[1024]; char params[1024];
sprintf(params,"[\"%s\", 1]",addr); sprintf(params,"[\"%s\", 1]",addr);
return(jumblr_issuemethod(KMDUSERPASS,(char *)"getreceivedbyaddress",params,7771)); return(jumblr_issuemethod(KMDUSERPASS,(char *)"getreceivedbyaddress",params,BITCOIND_PORT));
} }
char *jumblr_importprivkey(char *wifstr) char *jumblr_importprivkey(char *wifstr)
{ {
char params[1024]; char params[1024];
sprintf(params,"[\"%s\", \"\", false]",wifstr); sprintf(params,"[\"%s\", \"\", false]",wifstr);
return(jumblr_issuemethod(KMDUSERPASS,(char *)"importprivkey",params,7771)); return(jumblr_issuemethod(KMDUSERPASS,(char *)"importprivkey",params,BITCOIND_PORT));
} }
char *jumblr_zgetbalance(char *addr) char *jumblr_zgetbalance(char *addr)
{ {
char params[1024]; char params[1024];
sprintf(params,"[\"%s\", 1]",addr); sprintf(params,"[\"%s\", 1]",addr);
return(jumblr_issuemethod(KMDUSERPASS,(char *)"z_getbalance",params,7771)); return(jumblr_issuemethod(KMDUSERPASS,(char *)"z_getbalance",params,BITCOIND_PORT));
} }
char *jumblr_listunspent(char *coinaddr) char *jumblr_listunspent(char *coinaddr)
{ {
char params[1024]; char params[1024];
sprintf(params,"[1, 99999999, [\"%s\"]]",coinaddr); sprintf(params,"[1, 99999999, [\"%s\"]]",coinaddr);
return(jumblr_issuemethod(KMDUSERPASS,(char *)"listunspent",params,7771)); return(jumblr_issuemethod(KMDUSERPASS,(char *)"listunspent",params,BITCOIND_PORT));
} }
char *jumblr_gettransaction(char *txidstr) char *jumblr_gettransaction(char *txidstr)
{ {
char params[1024]; char params[1024];
sprintf(params,"[\"%s\", 1]",txidstr); sprintf(params,"[\"%s\", 1]",txidstr);
return(jumblr_issuemethod(KMDUSERPASS,(char *)"getrawtransaction",params,7771)); return(jumblr_issuemethod(KMDUSERPASS,(char *)"getrawtransaction",params,BITCOIND_PORT));
} }
int32_t jumblr_numvins(bits256 txid) int32_t jumblr_numvins(bits256 txid)

3
src/komodo_utils.h
View File

@@ -1562,7 +1562,8 @@ void komodo_args()
break; break;
} }
} }
//fprintf(stderr,"%s chain params initialized\n",ASSETCHAINS_SYMBOL); BITCOIND_PORT = GetArg("-rpcport", BaseParams().RPCPort());
fprintf(stderr,"%s RPC %u\n",ASSETCHAINS_SYMBOL,BITCOIND_PORT);
} }
void komodo_nameset(char *symbol,char *dest,char *source) void komodo_nameset(char *symbol,char *dest,char *source)

3
src/util.cpp
View File

@@ -643,6 +643,9 @@ void ReadConfigFile(map<string, string>& mapSettingsRet,
} }
// If datadir is changed in .conf file: // If datadir is changed in .conf file:
ClearDatadirCache(); ClearDatadirCache();
extern uint16_t BITCOIND_PORT;
BITCOIND_PORT = GetArg("-rpcport",BaseParams().RPCPort());
fprintf(stderr,"from conf file %s RPC %u, used to be %u\n",ASSETCHAINS_SYMBOL,BITCOIND_PORT,BITCOIND_PORT);
} }
#ifndef WIN32 #ifndef WIN32

1
src/zcash/CreateJoinSplit.cpp
View File

@@ -8,6 +8,7 @@
#include "libsnark/common/profiling.hpp" #include "libsnark/common/profiling.hpp"
char ASSETCHAINS_SYMBOL[16]; char ASSETCHAINS_SYMBOL[16];
int64_t MAX_MONEY = 200000000 * 100000000LL; int64_t MAX_MONEY = 200000000 * 100000000LL;
uint16_t BITCOIND_PORT = 7771;
using namespace libzcash; using namespace libzcash;