From 0a316c1379ca44ea8b014142ef34ee86f111a5f3 Mon Sep 17 00:00:00 2001 From: jl777 Date: Fri, 7 Jul 2017 07:45:41 +0300 Subject: [PATCH] test --- iguana/exchanges/LP_nativeDEX.c | 5 ++-- iguana/exchanges/LP_rpc.c | 42 +++++++++++++-------------------- iguana/iguana_sign.c | 2 +- 3 files changed, 20 insertions(+), 29 deletions(-) diff --git a/iguana/exchanges/LP_nativeDEX.c b/iguana/exchanges/LP_nativeDEX.c index 5bdbab8d3..fd0e2c581 100644 --- a/iguana/exchanges/LP_nativeDEX.c +++ b/iguana/exchanges/LP_nativeDEX.c @@ -18,12 +18,13 @@ // marketmaker // // swap cancel should cleanly cancel -// stronger anti rejected utxo pair into swap statemachine // as much as possible on a unidirectional basis -// verify bid volumes +// queuing // debounce comms // stats // auto-utxo creation +// multiple smartaddresses? enable/disable causes? 250 KMD bounty +// verify bid volumes #include #include "LP_include.h" diff --git a/iguana/exchanges/LP_rpc.c b/iguana/exchanges/LP_rpc.c index bcb72608f..0387c161a 100644 --- a/iguana/exchanges/LP_rpc.c +++ b/iguana/exchanges/LP_rpc.c @@ -111,15 +111,23 @@ char *issue_LP_notifyutxo(char *destip,uint16_t destport,struct LP_utxoinfo *utx } } -/*char *issue_LP_register(char *destip,uint16_t destport,bits256 pubkey,char *ipaddr,uint16_t pushport) +char *issue_LP_lookup(char *destip,uint16_t destport,bits256 pubkey) { - char url[512],str[65],*retstr; - sprintf(url,"http://%s:%u/api/stats/register?client=%s&pushaddr=%s&pushport=%u",destip,destport,bits256_str(str,pubkey),ipaddr,pushport); - //return(LP_issue_curl("register",destip,destport,url)); - retstr = issue_curlt(url,LP_HTTP_TIMEOUT); - //printf("register.(%s) -> (%s)\n",url,retstr!=0?retstr:""); - return(retstr); -}*/ + char url[512],str[65]; + sprintf(url,"http://%s:%u/api/stats/lookup?client=%s",destip,destport,bits256_str(str,pubkey)); + //printf("getutxo.(%s)\n",url); + return(LP_issue_curl("lookup",destip,destport,url)); + //return(issue_curlt(url,LP_HTTP_TIMEOUT)); +} + +char *issue_LP_getprices(char *destip,uint16_t destport) +{ + char url[512]; + sprintf(url,"http://%s:%u/api/stats/getprices",destip,destport); + //printf("getutxo.(%s)\n",url); + return(LP_issue_curl("getprices",destip,destport,url)); + //return(issue_curlt(url,LP_HTTP_TIMEOUT)); +} char *issue_LP_psock(char *destip,uint16_t destport,int32_t ispaired) { @@ -159,24 +167,6 @@ uint16_t LP_psock_get(char *connectaddr,char *publicaddr,int32_t ispaired) return(publicport); } -char *issue_LP_lookup(char *destip,uint16_t destport,bits256 pubkey) -{ - char url[512],str[65]; - sprintf(url,"http://%s:%u/api/stats/lookup?client=%s",destip,destport,bits256_str(str,pubkey)); - //printf("getutxo.(%s)\n",url); - return(LP_issue_curl("lookup",destip,destport,url)); - //return(issue_curlt(url,LP_HTTP_TIMEOUT)); -} - -char *issue_LP_getprices(char *destip,uint16_t destport) -{ - char url[512]; - sprintf(url,"http://%s:%u/api/stats/getprices",destip,destport); - //printf("getutxo.(%s)\n",url); - return(LP_issue_curl("getprices",destip,destport,url)); - //return(issue_curlt(url,LP_HTTP_TIMEOUT)); -} - cJSON *bitcoin_json(struct iguana_info *coin,char *method,char *params) { char *retstr; cJSON *retjson = 0; diff --git a/iguana/iguana_sign.c b/iguana/iguana_sign.c index 3e96145c2..b1fee7f0e 100755 --- a/iguana/iguana_sign.c +++ b/iguana/iguana_sign.c @@ -1276,7 +1276,7 @@ cJSON *bitcoin_txcreate(char *symbol,int32_t isPoS,int64_t locktime,uint32_t txv cJSON *json = cJSON_CreateObject(); jaddnum(json,"version",txversion); if ( locktime == 0 && strcmp(symbol,"KMD") == 0 ) - locktime = (uint32_t)time(NULL); + locktime = (uint32_t)time(NULL) - 55; jaddnum(json,"locktime",locktime); if ( isPoS != 0 ) jaddnum(json,"timestamp",timestamp == 0 ? time(NULL) : timestamp);