diff --git a/iguana/exchanges777.h b/iguana/exchanges777.h index 9cf4a588c..84b41cb3c 100755 --- a/iguana/exchanges777.h +++ b/iguana/exchanges777.h @@ -22,7 +22,7 @@ #define INSTANTDEX_OFFERDURATION 300 #define INSTANTDEX_LOCKTIME 3600 -#define EXCHANGES777_MINPOLLGAP 3 +#define EXCHANGES777_MINPOLLGAP 1 #define EXCHANGES777_MAXDEPTH 200 #define EXCHANGES777_DEFAULT_TIMEOUT 30 diff --git a/iguana/swaps/iguana_BTCswap.c b/iguana/swaps/iguana_BTCswap.c index f855796ef..9f3605a9f 100755 --- a/iguana/swaps/iguana_BTCswap.c +++ b/iguana/swaps/iguana_BTCswap.c @@ -411,7 +411,8 @@ char *instantdex_statemachine(struct supernet_info *myinfo,struct exchange_info { uint32_t reftime; cJSON *newjson; char *retstr = 0; reftime = (uint32_t)(A->offer.expiration - INSTANTDEX_LOCKTIME*2); - if ( strcmp(cmdstr,"step1") == 0 && strcmp(swap->nextstate,"cmdstr") == 0 ) // either + printf("cmd.(%s) vs next.(%s)\n",cmdstr,swap->nextstate); + if ( strcmp(cmdstr,"step1") == 0 && strcmp(swap->nextstate,cmdstr) == 0 ) // either { printf("got step1, should have other's choosei\n"); if ( (newjson= instantdex_newjson(myinfo,swap,argjson,swap->orderhash,A,0)) == 0 ) @@ -556,7 +557,7 @@ char *instantdex_statemachine(struct supernet_info *myinfo,struct exchange_info if ( retstr == 0 ) retstr = clonestr("{\"error\":\"BTC swap null retstr\"}"); if ( swap != 0 ) - printf("BTCSWAP.(%s) (%s) isbob.%d state.%d verified.(%d %d)\n",retstr,cmdstr,swap->isbob,swap->state,swap->cutverified,swap->otherverifiedcut); + printf("BTCSWAP next.(%s) (%s) isbob.%d state.%d verified.(%d %d)\n",swap->nextstate,cmdstr,swap->isbob,swap->state,swap->cutverified,swap->otherverifiedcut); else printf("BTCSWAP.(%s)\n",retstr); return(retstr); } @@ -632,7 +633,7 @@ char *instantdex_BTCswap(struct supernet_info *myinfo,struct exchange_info *exch if ( (minperc= jdouble(argjson,"p")) < INSTANTDEX_MINPERC ) minperc = INSTANTDEX_MINPERC; insurance = (satoshis[1] * INSTANTDEX_INSURANCERATE + coinbtc->chain->txfee); // txfee prevents papercut attack - printf("T.%d [%d] got offer.(%s/%s) %.8f vol %.8f %llu offerside.%d offerdir.%d swap.%p decksize.%ld %s\n",bits256_cmp(traderpub,myinfo->myaddr.persistent),swap!=0?swap->state:-1,A->offer.base,A->offer.rel,dstr(A->offer.price64),dstr(A->offer.basevolume64),(long long)A->orderid,A->offer.myside,A->offer.acceptdir,A->info,sizeof(swap->deck),jprint(argjson,0)); + printf("T.%d [%s] got %s.(%s/%s) %.8f vol %.8f %llu offerside.%d offerdir.%d swap.%p decksize.%ld\n",bits256_cmp(traderpub,myinfo->myaddr.persistent),swap!=0?swap->nextstate:"",cmdstr,A->offer.base,A->offer.rel,dstr(A->offer.price64),dstr(A->offer.basevolume64),(long long)A->orderid,A->offer.myside,A->offer.acceptdir,A->info,sizeof(swap->deck)); if ( strcmp(cmdstr,"offer") == 0 && A->info == 0 ) // receiver is networkwide { if ( A->offer.expiration < (time(NULL) + INSTANTDEX_DURATION) )