Browse Source
Merge pull request #94 from jl777/dev
Update from upstream repo jl777/SuperNET@dev
pass-iguana-arg
Artem Pikulin
7 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with
6 additions and
5 deletions
-
iguana/exchanges/LP_nativeDEX.c
-
iguana/exchanges/LP_remember.c
-
iguana/exchanges/mshark
-
iguana/exchanges/prices/autoprice
|
|
|
@ -1129,6 +1129,7 @@ void LP_swapsloop(void *ctx) |
|
|
|
if ( (sp->finished= LP_swapwait(0,sp->requestid,sp->quoteid,-1,0)) != 0 ) |
|
|
|
{ |
|
|
|
} |
|
|
|
sleep(3); |
|
|
|
} |
|
|
|
} |
|
|
|
if ( nonz == 0 ) |
|
|
|
@ -1139,7 +1140,7 @@ void LP_swapsloop(void *ctx) |
|
|
|
LP_alice_eligible((uint32_t)time(NULL)); |
|
|
|
sleep(6); |
|
|
|
} |
|
|
|
} |
|
|
|
} else sleep(10); |
|
|
|
LP_gtc_iteration(ctx,LP_myipaddr,LP_mypubsock); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
@ -432,9 +432,9 @@ int32_t basilisk_isbobcoin(int32_t iambob,int32_t ind) |
|
|
|
case BASILISK_OTHERFEE: return(!iambob); break; |
|
|
|
case BASILISK_BOBSPEND: |
|
|
|
case BASILISK_ALICEPAYMENT: |
|
|
|
case BASILISK_ALICERECLAIM: |
|
|
|
case BASILISK_ALICECLAIM: return(0); |
|
|
|
case BASILISK_ALICERECLAIM: return(0); |
|
|
|
break; |
|
|
|
case BASILISK_ALICECLAIM: |
|
|
|
case BASILISK_BOBDEPOSIT: |
|
|
|
case BASILISK_ALICESPEND: |
|
|
|
case BASILISK_BOBPAYMENT: |
|
|
|
|
|
|
|
@ -1,4 +1,4 @@ |
|
|
|
#!/bin/bash |
|
|
|
source userpass |
|
|
|
# this will only work for watchonly addresses that have been rescanned and with active coins |
|
|
|
curl --url "http://127.0.0.1:7783" --data "{\"userpass\":\"$userpass\",\"method\":\"fundvalue\",\"address\":\"RTu3JZZKLJTcfNwBa19dWRagEfQq49STqC\",\"holdings\":[{\"coin\":\"iota\",\"balance\":1500000}, {\"coin\":\"bitcoin-cash\",\"balance\":1200}, {\"coin\":\"bitcoin\",\"balance\":100}, {\"coin\":\"komodo\",\"balance\":100000}, {\"coin\":\"chips\",\"balance\":100000}],\"divisor\":1400000}" |
|
|
|
curl --url "http://127.0.0.1:7783" --data "{\"userpass\":\"$userpass\",\"method\":\"fundvalue\",\"address\":\"RTu3JZZKLJTcfNwBa19dWRagEfQq49STqC\",\"holdings\":[{\"coin\":\"iota\",\"balance\":1500000}, {\"coin\":\"bitcoin-cash\",\"balance\":1200}, {\"coin\":\"bitcoin\",\"balance\":25}],\"divisor\":1400000}" |
|
|
|
|
|
|
|
@ -35,7 +35,7 @@ source trackbtc |
|
|
|
#source revs |
|
|
|
#source trackbtc |
|
|
|
|
|
|
|
sharkholdings="{\"coin\":\"iota\",\"balance\":1500000}, {\"coin\":\"komodo\",\"balance\":120000}, {\"coin\":\"bitcoin-cash\",\"balance\":1200}, {\"coin\":\"bitcoin\",\"balance\":100}" |
|
|
|
sharkholdings="{\"coin\":\"iota\",\"balance\":1500000}, {\"coin\":\"bitcoin-cash\",\"balance\":1200}, {\"coin\":\"bitcoin\",\"balance\":25}" |
|
|
|
curl --url "http://127.0.0.1:7783" --data "{\"base\":\"MSHARK\",\"rel\":\"KMD\",\"fundvalue_bid\":\"NAV_KMD\",\"fundvalue_ask\":\"assetNAV_KMD\",\"userpass\":\"$userpass\",\"method\":\"autoprice\",\"margin\":$margin,\"address\":\"RTu3JZZKLJTcfNwBa19dWRagEfQq49STqC\",\"holdings\":[$sharkholdings],\"divisor\":1400000}" |
|
|
|
|
|
|
|
|
|
|
|
|
