Browse Source

Merge pull request #495 from jl777/spvdex

Spvdex
etomic
jl777 7 years ago
committed by GitHub
parent
commit
de8acb5cfc
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      iguana/exchanges/LP_include.h
  2. 2
      iguana/exchanges/LP_nativeDEX.c
  3. 2
      iguana/exchanges/LP_remember.c
  4. 2
      iguana/exchanges/LP_swap.c

4
iguana/exchanges/LP_include.h

@ -23,9 +23,9 @@
#define LP_MAJOR_VERSION "0" #define LP_MAJOR_VERSION "0"
#define LP_MINOR_VERSION "1" #define LP_MINOR_VERSION "1"
#define LP_BUILD_NUMBER "15377" #define LP_BUILD_NUMBER "15477"
#define LP_BARTERDEX_VERSION 1 #define LP_BARTERDEX_VERSION 1
#define LP_MAGICBITS 8 #define LP_MAGICBITS 1
#ifdef FROM_JS #ifdef FROM_JS
#include <emscripten.h> #include <emscripten.h>

2
iguana/exchanges/LP_nativeDEX.c

@ -24,7 +24,7 @@
// electrum dynamic trust over 1000 // electrum dynamic trust over 1000
// https://github.com/bitcoin/bips/blob/master/bip-0143.mediawiki for signing BCH/BTG // https://github.com/bitcoin/bips/blob/master/bip-0143.mediawiki for signing BCH/BTG
// //
// bob latency to respond // delay swap credit back until notarization
// bugs, validations: // bugs, validations:
// remove LP_utxo_bestfit from portfolio // remove LP_utxo_bestfit from portfolio
// portfolio value based on ask? // portfolio value based on ask?

2
iguana/exchanges/LP_remember.c

@ -1126,7 +1126,7 @@ cJSON *basilisk_remember(int64_t *KMDtotals,int64_t *BTCtotals,uint32_t requesti
} }
LP_txbytes_update("bobrefund",rswap.bobcoin,rswap.txbytes[BASILISK_BOBREFUND],&rswap.txids[BASILISK_BOBREFUND],&rswap.depositspent,&rswap.sentflags[BASILISK_BOBREFUND]); LP_txbytes_update("bobrefund",rswap.bobcoin,rswap.txbytes[BASILISK_BOBREFUND],&rswap.txids[BASILISK_BOBREFUND],&rswap.depositspent,&rswap.sentflags[BASILISK_BOBREFUND]);
} }
else if ( flag == 0 ) else if ( 0 && flag == 0 )
printf("bobrefund's time %u vs expiration %u\n",(uint32_t)time(NULL),rswap.expiration); printf("bobrefund's time %u vs expiration %u\n",(uint32_t)time(NULL),rswap.expiration);
} }
} }

2
iguana/exchanges/LP_swap.c

@ -754,7 +754,7 @@ int32_t LP_swapwait(uint32_t requestid,uint32_t quoteid,int32_t duration,int32_t
{ {
if ( jstr(retjson,"status") != 0 && strcmp(jstr(retjson,"status"),"finished") == 0 ) if ( jstr(retjson,"status") != 0 && strcmp(jstr(retjson,"status"),"finished") == 0 )
break; break;
else printf("NOT FINISHED.(%s)\n",jprint(retjson,0)); //else printf("NOT FINISHED.(%s)\n",jprint(retjson,0));
free_json(retjson); free_json(retjson);
retjson = 0; retjson = 0;
} }

Loading…
Cancel
Save