diff --git a/iguana/coins/chips_7776 b/iguana/coins/chips_7776 new file mode 100755 index 000000000..e09f9c87c --- /dev/null +++ b/iguana/coins/chips_7776 @@ -0,0 +1,2 @@ +#!/bin/bash +curl --url "http://127.0.0.1:7776" --data "{\"conf\":\"chips.conf\",\"path\":\"${HOME#"/"}/.chips\",\"prefetchlag\":-1,\"poll\":1,\"active\":1,\"agent\":\"iguana\",\"method\":\"addcoin\",\"newcoin\":\"CHIPS\",\"startpend\":64,\"endpend\":64,\"services\":0,\"maxpeers\":512,\"RELAY\":-1,\"VALIDATE\":0,\"portp2p\":57777,\"minconfirms\":1}" diff --git a/iguana/exchanges/LP_commands.c b/iguana/exchanges/LP_commands.c index a9b217906..63b8ce736 100644 --- a/iguana/exchanges/LP_commands.c +++ b/iguana/exchanges/LP_commands.c @@ -509,7 +509,7 @@ stop()\n\ if ( bits256_cmp(pub,G.LP_mypub25519) == 0 && time(NULL) > lastnotify+30 ) { lastnotify = (uint32_t)time(NULL); - printf("wantnotify for me!\n"); + //printf("wantnotify for me!\n"); LP_notify_pubkeys(ctx,LP_mypubsock); } retstr = clonestr("{\"result\":\"success\"}"); diff --git a/iguana/exchanges/LP_remember.c b/iguana/exchanges/LP_remember.c index 10ab1c787..8f5272f20 100644 --- a/iguana/exchanges/LP_remember.c +++ b/iguana/exchanges/LP_remember.c @@ -1327,10 +1327,10 @@ uint64_t basilisk_swap_addarray(cJSON *item,char *refbase,char *refrel) rel = jstr(item,"alice"); if ( refrel == 0 || refrel[0] == 0 ) { - if ( strcmp(base,refbase) == 0 || strcmp(rel,refbase) == 0 ) + if ( (base != 0 && strcmp(base,refbase) == 0) || (rel != 0 && strcmp(rel,refbase) == 0) ) ridqid = 1; } - else if ( strcmp(base,refbase) == 0 && strcmp(rel,refrel) == 0 ) + else if ( (base != 0 && strcmp(base,refbase) == 0) && (rel != 0 && strcmp(rel,refrel) == 0) ) ridqid = 1; if ( ridqid != 0 ) { diff --git a/iguana/exchanges/LP_signatures.c b/iguana/exchanges/LP_signatures.c index 35ade4e60..be24aae78 100644 --- a/iguana/exchanges/LP_signatures.c +++ b/iguana/exchanges/LP_signatures.c @@ -284,7 +284,7 @@ int32_t LP_utxos_sigcheck(uint32_t timestamp,char *sigstr,char *pubsecpstr,bits2 if ( memcmp(pub33,pubsecp,33) != 0 || retval != 0 ) { static uint32_t counter; - if ( counter++ < 100 ) + if ( counter++ < 10 ) { if ( pubp != 0 ) pubp->numerrors++; diff --git a/iguana/exchanges/LP_transaction.c b/iguana/exchanges/LP_transaction.c index 66a24ee0f..7d0f963a3 100644 --- a/iguana/exchanges/LP_transaction.c +++ b/iguana/exchanges/LP_transaction.c @@ -879,7 +879,7 @@ int32_t LP_vins_select(void *ctx,struct iguana_info *coin,int64_t *totalp,int64_ utxos[numunspents] = 0; total += up->U.value; remains -= up->U.value; - //if ( coin->electrum == 0 && strcmp(coin->symbol,"KMD") == 0 ) + if ( up->U.height < 7777777 && strcmp(coin->symbol,"KMD") == 0 ) { if ( (interest= LP_komodo_interest(up->U.txid,up->U.value)) > 0 ) { diff --git a/iguana/iguana_notary.c b/iguana/iguana_notary.c index c3c7a415c..65d42428e 100755 --- a/iguana/iguana_notary.c +++ b/iguana/iguana_notary.c @@ -556,7 +556,7 @@ STRING_ARG(iguana,addnotary,ipaddr) char NOTARY_CURRENCIES[][16] = { "USD", "EUR", "JPY", "GBP", "AUD", "CAD", "CHF", "NZD", "CNY", "RUB", "MXN", "BRL", "INR", "HKD", "TRY", "ZAR", "PLN", "NOK", "SEK", "DKK", "CZK", "HUF", "ILS", "KRW", "MYR", "PHP", "RON", "SGD", "THB", "BGN", "IDR", "HRK", - "REVS", "SUPERNET", "DEX", "PANGEA", "JUMBLR", "BET", "CRYPTO", "HODL", "SHARK", "BOTS", "MGW", "COQUI", "WLC", "KV", "CEAL", "MESH", "MNZ" }; // "LTC", + "REVS", "SUPERNET", "DEX", "PANGEA", "JUMBLR", "BET", "CRYPTO", "HODL", "SHARK", "BOTS", "MGW", "COQUI", "WLC", "KV", "CEAL", "MESH", "MNZ", "CHIPS" }; // "LTC", ZERO_ARGS(dpow,notarychains) { diff --git a/iguana/iguana_payments.c b/iguana/iguana_payments.c index a5b2876cf..cbc23aa6c 100755 --- a/iguana/iguana_payments.c +++ b/iguana/iguana_payments.c @@ -344,7 +344,8 @@ bits256 iguana_sendrawtransaction(struct supernet_info *myinfo,struct iguana_inf uint64_t _iguana_interest(uint32_t now,int32_t txheight,uint32_t txlocktime,uint64_t value) { int32_t minutes; uint64_t numerator=0,denominator=0,interest=0; uint32_t activation = 1491350400; - + if ( txheight >= 7777777 ) + return(0); if ( (minutes= ((uint32_t)time(NULL) - 60 - txlocktime) / 60) >= 60 ) { if ( minutes > 365 * 24 * 60 ) diff --git a/iguana/m_notary b/iguana/m_notary index d514d2680..9a4fbb305 100755 --- a/iguana/m_notary +++ b/iguana/m_notary @@ -22,6 +22,7 @@ tests/addnotarys_7776 coins/btc_7776 coins/ltc_7776 coins/kmd_7776 +coins/chips_7776 ./wp_7776 coins/revs_7776