jl777 7 years ago
parent
commit
fbf0efda9a
  1. 4
      iguana/exchanges/LP_remember.c
  2. 3
      iguana/exchanges/LP_swap.c

4
iguana/exchanges/LP_remember.c

@ -709,9 +709,9 @@ int32_t LP_rswap_init(struct LP_swap_remember *rswap,uint32_t requestid,uint32_t
rswap->txids[BASILISK_MYFEE] = jbits256(item,"myfee"); rswap->txids[BASILISK_MYFEE] = jbits256(item,"myfee");
rswap->txids[BASILISK_OTHERFEE] = jbits256(item,"otherfee"); rswap->txids[BASILISK_OTHERFEE] = jbits256(item,"otherfee");
free_json(item); free_json(item);
} } else printf("couldnt parse.(%s)\n",fstr);
free(fstr); free(fstr);
} } else printf("cant open.(%s)\n",fname);
sprintf(fname,"%s/SWAPS/%u-%u.finished",GLOBAL_DBDIR,requestid,quoteid), OS_compatible_path(fname); sprintf(fname,"%s/SWAPS/%u-%u.finished",GLOBAL_DBDIR,requestid,quoteid), OS_compatible_path(fname);
if ( (fstr= OS_filestr(&fsize,fname)) != 0 ) if ( (fstr= OS_filestr(&fsize,fname)) != 0 )
{ {

3
iguana/exchanges/LP_swap.c

@ -43,8 +43,7 @@
Bob deposit: Bob deposit:
OP_IF OP_IF
//<now + INSTANTDEX_LOCKTIME*2> OP_CLTV OP_DROP <alice_pubA0> OP_CHECKSIG <now + INSTANTDEX_LOCKTIME*2> OP_CLTV OP_DROP <alice_pubA0> OP_CHECKSIG
<now + INSTANTDEX_LOCKTIME*2> OP_CLTV OP_DROP OP_HASH160 <hash(alice_privM)> OP_EQUALVERIFY <alice_pubA0> OP_CHECKSIG
OP_ELSE OP_ELSE
OP_HASH160 <hash(bob_privN)> OP_EQUALVERIFY <bob_pubB0> OP_CHECKSIG OP_HASH160 <hash(bob_privN)> OP_EQUALVERIFY <bob_pubB0> OP_CHECKSIG
OP_ENDIF OP_ENDIF

Loading…
Cancel
Save