From 8169383164149b15bd8bf69ae3cd596aab1cdb68 Mon Sep 17 00:00:00 2001 From: jl777 Date: Tue, 9 Aug 2016 08:53:05 -0300 Subject: [PATCH] test --- basilisk/basilisk.h | 2 +- crypto777/bitcoind_RPC.c | 2 +- iguana/iguana_payments.c | 2 +- iguana/iguana_sign.c | 55 +- iguana/iguana_wallet.c | 2 + iguana/main.c | 2 +- iguana/tests/decoderawtransaction | 2 +- iguana/tests/listunspent | 2 +- iguana/tests/peers.txt | 974 ++++++++++++++++++++++++++++++ includes/iguana_defines.h | 2 +- includes/iguana_types.h | 2 +- 11 files changed, 1009 insertions(+), 38 deletions(-) create mode 100644 iguana/tests/peers.txt diff --git a/basilisk/basilisk.h b/basilisk/basilisk.h index 86837e342..b73631e50 100755 --- a/basilisk/basilisk.h +++ b/basilisk/basilisk.h @@ -16,7 +16,7 @@ #ifndef H_BASILISK_H #define H_BASILISK_H -//#define BASILISK_DISABLETX +#define BASILISK_DISABLETX #include "../iguana/iguana777.h" diff --git a/crypto777/bitcoind_RPC.c b/crypto777/bitcoind_RPC.c index 55d850d90..856edfd6d 100755 --- a/crypto777/bitcoind_RPC.c +++ b/crypto777/bitcoind_RPC.c @@ -16,7 +16,7 @@ #include "OS_portable.h" #ifdef __APPLE__ -#define LIQUIDITY_PROVIDER +#define LIQUIDITY_PROVIDER 1 #endif #ifdef LIQUIDITY_PROVIDER diff --git a/iguana/iguana_payments.c b/iguana/iguana_payments.c index 94da6b5c9..7638d0eb6 100755 --- a/iguana/iguana_payments.c +++ b/iguana/iguana_payments.c @@ -444,7 +444,7 @@ char *sendtoaddress(struct supernet_info *myinfo,struct iguana_info *coin,char * if ( coin->changeaddr[0] == 0 ) { if ( (waddr= iguana_getaccountaddress(myinfo,coin,0,0,coin->changeaddr,"change")) == 0 ) - return(clonestr("{\"error\":\"not enough funds\"}")); + return(clonestr("{\"error\":\"no change address specified\"}")); strcpy(coin->changeaddr,waddr->coinaddr); } if ( coinaddr != 0 && coinaddr[0] != 0 && satoshis != 0 ) diff --git a/iguana/iguana_sign.c b/iguana/iguana_sign.c index aa4050a6e..f9125abe1 100755 --- a/iguana/iguana_sign.c +++ b/iguana/iguana_sign.c @@ -149,7 +149,7 @@ int32_t iguana_parsehexstr(uint8_t **destp,uint16_t *lenp,uint8_t *dest2,int32_t int32_t iguana_parsevinobj(struct supernet_info *myinfo,struct iguana_info *coin,uint8_t *serialized,int32_t maxsize,struct iguana_msgvin *vin,cJSON *vinobj,struct vin_info *V) { - struct iguana_waddress *waddr; struct iguana_waccount *wacct; uint32_t tmp=0; int32_t i,n,suppress_pubkeys,siglen,plen,rwflag=1,len = 0; char *userdata,*pubkeystr,*hexstr = 0,*redeemstr = 0,*spendstr = 0; cJSON *scriptjson = 0,*obj,*pubkeysjson = 0; + struct iguana_waddress *waddr; struct iguana_waccount *wacct; uint32_t tmp=0; int32_t i,n,suppress_pubkeys,siglen,plen,m,rwflag=1,need_op0=0,len = 0; char *userdata,*pubkeystr,*hexstr = 0,*redeemstr = 0,*spendstr = 0; cJSON *scriptjson = 0,*obj,*pubkeysjson = 0; //printf("PARSEVIN.(%s) vin.%p\n",jprint(vinobj,0),vin); if ( V == 0 ) memset(vin,0,sizeof(*vin)); @@ -196,6 +196,7 @@ int32_t iguana_parsevinobj(struct supernet_info *myinfo,struct iguana_info *coin } } } + tmp = need_op0; // for backward compatibility bitcoin multisig script bug if ( hexstr != 0 ) tmp += (int32_t)strlen(hexstr) >> 1; if ( suppress_pubkeys == 0 && (pubkeysjson= jarray(&n,vinobj,"pubkeys")) != 0 ) @@ -219,30 +220,29 @@ int32_t iguana_parsevinobj(struct supernet_info *myinfo,struct iguana_info *coin else tmp += 3; } len += iguana_rwvarint32(rwflag,&serialized[len],&tmp); - serialized += len; + if ( need_op0 != 0 ) + serialized[len++] = 0; // hack for bug for bug backward compatibility if ( hexstr != 0 ) { n = (int32_t)strlen(hexstr) >> 1; //printf("add.(%s) offset.%d\n",hexstr,len); - decode_hex(serialized,n,hexstr); - vin->vinscript = serialized; + vin->vinscript = &serialized[len]; + decode_hex(&serialized[len],n,hexstr), len += n; vin->scriptlen = n; if ( V != 0 ) { - i = 0; - while ( len < n ) + i = m = 0; + while ( m < n ) { - siglen = serialized[len++]; - memcpy(V->signers[i].sig,&serialized[len],siglen); - len += siglen; - vin->scriptlen += (siglen + 1); + siglen = serialized[len + m++]; + memcpy(V->signers[i].sig,&serialized[len + m],siglen); + m += siglen; i++; } - if ( len != n ) + if ( m != n ) printf("ERROR: "); - printf("len.%d n.%d i.%d\n",len,n,i); + printf("len.%d n.%d i.%d\n",m,n,i); } - serialized += len; } //else printf("iguana_parsevinobj: hex script missing (%s)\n",jprint(vinobj,0)); if ( (pubkeysjson= jarray(&n,vinobj,"pubkeys")) != 0 ) { @@ -265,10 +265,8 @@ int32_t iguana_parsevinobj(struct supernet_info *myinfo,struct iguana_info *coin vin->vinscript[vin->scriptlen++] = plen; decode_hex(&vin->vinscript[vin->scriptlen],plen,pubkeystr); vin->scriptlen += plen; - *serialized++ = plen; - memcpy(serialized,&vin->vinscript[vin->scriptlen],plen); - serialized += plen; - len += (1 + plen); + serialized[len++] = plen; + memcpy(&serialized[len],&vin->vinscript[vin->scriptlen],plen), len += plen; } } } @@ -276,32 +274,29 @@ int32_t iguana_parsevinobj(struct supernet_info *myinfo,struct iguana_info *coin //printf("len.%d: ",len); if ( userdata != 0 ) { - n = iguana_parsehexstr(&vin->userdata,&vin->userdatalen,V!=0?V->userdata:0,V!=0?&V->userdatalen:0,serialized,userdata); + n = iguana_parsehexstr(&vin->userdata,&vin->userdatalen,V!=0?V->userdata:0,V!=0?&V->userdatalen:0,&serialized[len],userdata); printf("parsed userdata.%d\n",n); - len += n, serialized += n; + len += n; } //printf("len.%d: ",len); if ( redeemstr != 0 ) { n = (int32_t)strlen(redeemstr) >> 1; - len++; if ( n < 76 ) - *serialized++ = n; + serialized[len++] = n; else if ( n <= 0xff ) { - *serialized++ = 0x4c; - *serialized++ = n; - len++; + serialized[len++] = 0x4c; + serialized[len++] = n; } else { - *serialized++ = 0x4d; - *serialized++ = n & 0xff; - *serialized++ = (n >> 8) & 0xff; - len += 2; + serialized[len++] = 0x4d; + serialized[len++] = n & 0xff; + serialized[len++] = (n >> 8) & 0xff; } - n = iguana_parsehexstr(&vin->redeemscript,&vin->p2shlen,V!=0?V->p2shscript:0,V!=0?&V->p2shlen:0,serialized,redeemstr); - len += n, serialized += n; + n = iguana_parsehexstr(&vin->redeemscript,&vin->p2shlen,V!=0?V->p2shscript:0,V!=0?&V->p2shlen:0,&serialized[len],redeemstr); + len += n; } //printf("len.%d: ",len); if ( spendstr != 0 ) diff --git a/iguana/iguana_wallet.c b/iguana/iguana_wallet.c index 64f02c945..19d092e43 100755 --- a/iguana/iguana_wallet.c +++ b/iguana/iguana_wallet.c @@ -859,6 +859,8 @@ void iguana_walletinitcheck(struct supernet_info *myinfo,struct iguana_info *coi void iguana_walletlock(struct supernet_info *myinfo,struct iguana_info *coin) { + if ( coin != 0 ) + memset(coin->changeaddr,0,sizeof(coin->changeaddr)); memset(&myinfo->persistent_priv,0,sizeof(myinfo->persistent_priv)); memset(&myinfo->persistent_pubkey33,0,sizeof(myinfo->persistent_pubkey33)); memset(myinfo->secret,0,sizeof(myinfo->secret)); diff --git a/iguana/main.c b/iguana/main.c index 28328067a..af4b267a9 100755 --- a/iguana/main.c +++ b/iguana/main.c @@ -551,7 +551,7 @@ void iguana_appletests(struct supernet_info *myinfo) bitcoin_sharedsecret(myinfo->ctx,hash2,pubkey,33); printf("secp256k1 elapsed %.3f for %d iterations\n",OS_milliseconds() - startmillis,i); getchar();**/ - if ( 1 && (str= SuperNET_JSON(myinfo,cJSON_Parse("{\"protover\":70002,\"RELAY\":1,\"VALIDATE\":0,\"portp2p\":14631,\"rpc\":14632,\"agent\":\"iguana\",\"method\":\"addcoin\",\"startpend\":64,\"endpend\":64,\"services\":129,\"maxpeers\":8,\"newcoin\":\"BTCD\",\"active\":1,\"numhelpers\":1,\"poll\":1}"),0,myinfo->rpcport)) != 0 ) + if ( 1 && (str= SuperNET_JSON(myinfo,cJSON_Parse("{\"protover\":70002,\"RELAY\":1,\"VALIDATE\":0,\"portp2p\":14631,\"rpc\":14632,\"agent\":\"iguana\",\"method\":\"addcoin\",\"startpend\":1,\"endpend\":1,\"services\":129,\"maxpeers\":16,\"newcoin\":\"BTCD\",\"active\":1,\"numhelpers\":1,\"poll\":1}"),0,myinfo->rpcport)) != 0 ) { free(str); if ( 1 && (str= SuperNET_JSON(myinfo,cJSON_Parse("{\"portp2p\":8333,\"RELAY\":0,\"VALIDATE\":0,\"agent\":\"iguana\",\"method\":\"addcoin\",\"startpend\":1,\"endpend\":1,\"services\":128,\"maxpeers\":8,\"newcoin\":\"BTC\",\"active\":0,\"numhelpers\":1,\"poll\":100}"),0,myinfo->rpcport)) != 0 ) diff --git a/iguana/tests/decoderawtransaction b/iguana/tests/decoderawtransaction index f64398428..443c3e3f4 100755 --- a/iguana/tests/decoderawtransaction +++ b/iguana/tests/decoderawtransaction @@ -1 +1 @@ -curl --url "http://127.0.0.1:7778" --data "{\"coin\":\"BTCD\",\"method\":\"decoderawtransaction\",\"params\":[\"010000000f0ea95701466304197095eeceb34a9b8cc57b34a9d069f37cb3c0aedcb71c5f3c0858afd500000000904730440220626010de8205712edb16560410fb2e99c1c602aa25d77575471321c62c1b33e30220684ab1e4037e1b38c25fb1f175e07a54621ffca4e37659019dcfa1d7ac463b0e0147304402205f907d97d9b229ce660f4bf13382e04132e042d49d1ea043a3043ea76e4c6f710220177f69d1be52744c0f55b2be106575159efffd5c8d84ca85b2cb0741d022fbaa01ffffffff01706f9800000000001976a91454a752f0d71b89d7c014ed0be29ca231c9546f9f88ac00000000\", 1]}" +curl --url "http://127.0.0.1:7778" --data "{\"coin\":\"BTCD\",\"method\":\"decoderawtransaction\",\"params\":[\"01000000a6c1a95701999a0b4ed513b0bdf60107ea2694abe7c151394abfebffe754552d612b4ea360010000006b483045022100a35f12a433b80eab144ac775bbe84b72adfe8448f4199c4f9f71e31e3515abd202203729e302cb1a97ae55534594a833cb2e2b0f75e7b92c5bc4fd79eae6575f370e012103403fcaccb4a9fa16819b6d45752bb1c5c51b5436c73f7f4280bd89769506a4a6ffffffff03a0860100000000001976a9143eb8de53fa6c334f59acafcab24b85468f848a3588ac102700000000000025512102eaa4ee1ddfb771007a1bb1df6e0000000008d0a10601000000b02109d3d87f0051ae004ebc1d000000001976a914696e69358e39824ccbefec25513b994735437a1f88ac00000000\", 0]}" diff --git a/iguana/tests/listunspent b/iguana/tests/listunspent index 67c36bdba..c2af7cd91 100755 --- a/iguana/tests/listunspent +++ b/iguana/tests/listunspent @@ -1 +1 @@ -curl --url "http://127.0.0.1:7778" --data "{\"coin\":\"BTC\",\"method\":\"listunspent\",\"params\":[1, 9999999, [\"REzqSJ7qonDbMVWfPEJKfRPduvfPyumkPR\"]]}" +curl --url "http://127.0.0.1:7778" --data "{\"coin\":\"BTC\",\"method\":\"listunspent\",\"params\":[1, 9999999, []]}" diff --git a/iguana/tests/peers.txt b/iguana/tests/peers.txt new file mode 100644 index 000000000..76848e4b4 --- /dev/null +++ b/iguana/tests/peers.txt @@ -0,0 +1,974 @@ +[ + { + "addr" : "85.25.217.233:14631", + "services" : "00000001", + "lastsend" : 1470702663, + "lastrecv" : 1470702649, + "conntime" : 1467588887, + "version" : 60013, + "subver" : "/Satoshi:1.0.0/", + "inbound" : false, + "startingheight" : 1175995, + "banscore" : 0 + }, + { + "addr" : "65.15.37.140:57568", + "services" : "00000001", + "lastsend" : 1470702664, + "lastrecv" : 1470702647, + "conntime" : 1468327042, + "version" : 60013, + "subver" : "/Satoshi:1.0.0/", + "inbound" : true, + "startingheight" : 1188921, + "banscore" : 0 + }, + { + "addr" : "62.75.145.171:14631", + "services" : "00000001", + "lastsend" : 1470702664, + "lastrecv" : 1470702658, + "conntime" : 1469977194, + "version" : 60013, + "subver" : "/Satoshi:1.0.0/", + "inbound" : false, + "startingheight" : 1219477, + "banscore" : 0 + }, + { + "addr" : "176.9.13.13:14631", + "services" : "00000001", + "lastsend" : 1470702646, + "lastrecv" : 1470702647, + "conntime" : 1469977357, + "version" : 60013, + "subver" : "/Satoshi:1.0.0/", + "inbound" : false, + "startingheight" : 1219481, + "banscore" : 0 + }, + { + "addr" : "88.198.15.19:14631", + "services" : "00000001", + "lastsend" : 1470702648, + "lastrecv" : 1470702647, + "conntime" : 1469977602, + "version" : 60013, + "subver" : "/Satoshi:1.0.0/", + "inbound" : false, + "startingheight" : 1219485, + "banscore" : 0 + }, + { + "addr" : "51.255.38.28:34066", + "services" : "00000001", + "lastsend" : 1470702648, + "lastrecv" : 1470702647, + "conntime" : 1469978213, + "version" : 60013, + "subver" : "/Satoshi:1.0.0/", + "inbound" : true, + "startingheight" : 1219498, + "banscore" : 0 + }, + { + "addr" : "121.108.241.247:14631", + "services" : "00000001", + "lastsend" : 1470702648, + "lastrecv" : 1470702652, + "conntime" : 1469978358, + "version" : 60013, + "subver" : "/Satoshi:1.0.0/", + "inbound" : false, + "startingheight" : 1219503, + "banscore" : 0 + }, + { + "addr" : "82.229.201.131:49263", + "services" : "00000001", + "lastsend" : 1470702648, + "lastrecv" : 1470702653, + "conntime" : 1469978392, + "version" : 60013, + "subver" : "/Satoshi:1.0.0/", + "inbound" : true, + "startingheight" : 1219504, + "banscore" : 0 + }, + { + "addr" : "162.13.4.69:14631", + "services" : "00000001", + "lastsend" : 1470702648, + "lastrecv" : 1470702650, + "conntime" : 1469978896, + "version" : 60013, + "subver" : "/Satoshi:1.0.0/", + "inbound" : false, + "startingheight" : 1219517, + "banscore" : 0 + }, + { + "addr" : "78.226.160.96:45153", + "services" : "00000001", + "lastsend" : 1470702648, + "lastrecv" : 1470702649, + "conntime" : 1469980802, + "version" : 60013, + "subver" : "/Satoshi:1.0.0/", + "inbound" : true, + "startingheight" : 1219549, + "banscore" : 0 + }, + { + "addr" : "115.28.42.60:36021", + "services" : "00000001", + "lastsend" : 1470702648, + "lastrecv" : 1470702647, + "conntime" : 1469987166, + "version" : 60013, + "subver" : "/Satoshi:1.0.0/", + "inbound" : true, + "startingheight" : 1219681, + "banscore" : 0 + }, + { + "addr" : "178.62.185.131:43074", + "services" : "00000001", + "lastsend" : 1470702648, + "lastrecv" : 1470702648, + "conntime" : 1469993286, + "version" : 60013, + "subver" : "/Satoshi:1.0.0/", + "inbound" : true, + "startingheight" : 1219793, + "banscore" : 0 + }, + { + "addr" : "167.114.249.196:56817", + "services" : "00000001", + "lastsend" : 1470702648, + "lastrecv" : 1470702661, + "conntime" : 1469995061, + "version" : 60013, + "subver" : "/Satoshi:1.0.0/", + "inbound" : true, + "startingheight" : 1219831, + "banscore" : 0 + }, + { + "addr" : "81.181.155.53:52714", + "services" : "00000001", + "lastsend" : 1470702648, + "lastrecv" : 1470702649, + "conntime" : 1469997941, + "version" : 60013, + "subver" : "/Satoshi:1.0.0/", + "inbound" : true, + "startingheight" : 1219894, + "banscore" : 0 + }, + { + "addr" : "76.169.236.235:43778", + "services" : "00000001", + "lastsend" : 1470702649, + "lastrecv" : 1470702648, + "conntime" : 1470018321, + "version" : 60013, + "subver" : "/Satoshi:1.0.0/", + "inbound" : true, + "startingheight" : 1220359, + "banscore" : 0 + }, + { + "addr" : "67.165.77.192:51216", + "services" : "00000001", + "lastsend" : 1470702649, + "lastrecv" : 1470702650, + "conntime" : 1470035323, + "version" : 60013, + "subver" : "/Satoshi:1.0.0/", + "inbound" : true, + "startingheight" : 1220254, + "banscore" : 0 + }, + { + "addr" : "75.130.163.51:57566", + "services" : "00000001", + "lastsend" : 1470702649, + "lastrecv" : 1470702647, + "conntime" : 1470051591, + "version" : 60013, + "subver" : "/Satoshi:1.0.0/", + "inbound" : true, + "startingheight" : 1221047, + "banscore" : 0 + }, + { + "addr" : "72.55.148.203:54752", + "services" : "00000001", + "lastsend" : 1470702649, + "lastrecv" : 1470702647, + "conntime" : 1470107466, + "version" : 60013, + "subver" : "/Satoshi:1.0.0/", + "inbound" : true, + "startingheight" : 1222176, + "banscore" : 0 + }, + { + "addr" : "96.127.136.18:38601", + "services" : "00000001", + "lastsend" : 1470702649, + "lastrecv" : 1470702653, + "conntime" : 1470115380, + "version" : 60013, + "subver" : "/Satoshi:1.0.0/", + "inbound" : true, + "startingheight" : 1222317, + "banscore" : 0 + }, + { + "addr" : "88.198.53.194:55692", + "services" : "00000001", + "lastsend" : 1470702649, + "lastrecv" : 1470702647, + "conntime" : 1470126103, + "version" : 60013, + "subver" : "/Satoshi:1.0.0/", + "inbound" : true, + "startingheight" : 1222512, + "banscore" : 0 + }, + { + "addr" : "63.247.147.166:50823", + "services" : "00000001", + "lastsend" : 1470702650, + "lastrecv" : 1470702649, + "conntime" : 1470126764, + "version" : 60013, + "subver" : "/Satoshi:1.0.0/", + "inbound" : true, + "startingheight" : 1222528, + "banscore" : 0 + }, + { + "addr" : "88.206.186.58:37299", + "services" : "00000001", + "lastsend" : 1470702650, + "lastrecv" : 1470702648, + "conntime" : 1470146882, + "version" : 60013, + "subver" : "/Satoshi:1.0.0/", + "inbound" : true, + "startingheight" : 1222884, + "banscore" : 0 + }, + { + "addr" : "217.8.62.188:48160", + "services" : "00000001", + "lastsend" : 1470702650, + "lastrecv" : 1470702647, + "conntime" : 1470161200, + "version" : 60013, + "subver" : "/Satoshi:1.0.0/", + "inbound" : true, + "startingheight" : 1223123, + "banscore" : 0 + }, + { + "addr" : "46.231.137.186:62276", + "services" : "00000001", + "lastsend" : 1470702650, + "lastrecv" : 1470702647, + "conntime" : 1470164568, + "version" : 60013, + "subver" : "/Satoshi:1.0.0/", + "inbound" : true, + "startingheight" : 1223173, + "banscore" : 0 + }, + { + "addr" : "217.215.190.134:52487", + "services" : "00000001", + "lastsend" : 1470702651, + "lastrecv" : 1470702647, + "conntime" : 1470188460, + "version" : 60013, + "subver" : "/Satoshi:1.0.0/", + "inbound" : true, + "startingheight" : 1223624, + "banscore" : 0 + }, + { + "addr" : "2.86.63.69:50332", + "services" : "00000001", + "lastsend" : 1470702651, + "lastrecv" : 1470702117, + "conntime" : 1470190048, + "version" : 60013, + "subver" : "/Satoshi:1.0.0/", + "inbound" : true, + "startingheight" : 1221833, + "banscore" : 0 + }, + { + "addr" : "59.147.43.232:51236", + "services" : "00000001", + "lastsend" : 1470702651, + "lastrecv" : 1470702649, + "conntime" : 1470212486, + "version" : 60013, + "subver" : "/Satoshi:1.0.0/", + "inbound" : true, + "startingheight" : 1224028, + "banscore" : 0 + }, + { + "addr" : "104.42.224.48:1336", + "services" : "00000001", + "lastsend" : 1470702651, + "lastrecv" : 1470702650, + "conntime" : 1470248520, + "version" : 60013, + "subver" : "/Satoshi:1.0.0/", + "inbound" : true, + "startingheight" : 1224679, + "banscore" : 0 + }, + { + "addr" : "24.168.17.50:49185", + "services" : "00000001", + "lastsend" : 1470702651, + "lastrecv" : 1470702653, + "conntime" : 1470250619, + "version" : 60013, + "subver" : "/Satoshi:1.0.0/", + "inbound" : true, + "startingheight" : 1216084, + "banscore" : 0 + }, + { + "addr" : "173.65.129.85:54180", + "services" : "00000001", + "lastsend" : 1470702651, + "lastrecv" : 1470702647, + "conntime" : 1470261818, + "version" : 60013, + "subver" : "/Satoshi:1.0.0/", + "inbound" : true, + "startingheight" : 1224924, + "banscore" : 0 + }, + { + "addr" : "84.119.62.223:14631", + "services" : "00000001", + "lastsend" : 1470702652, + "lastrecv" : 1470702647, + "conntime" : 1470308221, + "version" : 60013, + "subver" : "/Satoshi:1.0.0/", + "inbound" : false, + "startingheight" : 1225817, + "banscore" : 0 + }, + { + "addr" : "59.147.43.232:51139", + "services" : "00000001", + "lastsend" : 1470702652, + "lastrecv" : 1470702649, + "conntime" : 1470349631, + "version" : 60013, + "subver" : "/Satoshi:1.0.0/", + "inbound" : true, + "startingheight" : 1226425, + "banscore" : 0 + }, + { + "addr" : "2.239.61.146:14631", + "services" : "00000001", + "lastsend" : 1470702652, + "lastrecv" : 1470702653, + "conntime" : 1470349644, + "version" : 60013, + "subver" : "/Satoshi:1.0.0/", + "inbound" : false, + "startingheight" : 1226609, + "banscore" : 0 + }, + { + "addr" : "176.28.45.179:63639", + "services" : "00000001", + "lastsend" : 1470702652, + "lastrecv" : 1470702647, + "conntime" : 1470370607, + "version" : 60013, + "subver" : "/Satoshi:1.0.0/", + "inbound" : true, + "startingheight" : 1227008, + "banscore" : 0 + }, + { + "addr" : "73.211.90.130:41871", + "services" : "00000001", + "lastsend" : 1470702653, + "lastrecv" : 1470702647, + "conntime" : 1470390498, + "version" : 60013, + "subver" : "/Satoshi:1.0.0/", + "inbound" : true, + "startingheight" : 1227384, + "banscore" : 0 + }, + { + "addr" : "185.48.78.78:49690", + "services" : "00000001", + "lastsend" : 1470702653, + "lastrecv" : 1470702648, + "conntime" : 1470396672, + "version" : 60013, + "subver" : "/Satoshi:1.0.0/", + "inbound" : true, + "startingheight" : 1227500, + "banscore" : 0 + }, + { + "addr" : "77.21.104.176:56725", + "services" : "00000001", + "lastsend" : 1470702653, + "lastrecv" : 1470702647, + "conntime" : 1470409137, + "version" : 60013, + "subver" : "/Satoshi:1.0.0/", + "inbound" : true, + "startingheight" : 167660, + "banscore" : 0 + }, + { + "addr" : "46.253.169.134:57623", + "services" : "00000001", + "lastsend" : 1470702653, + "lastrecv" : 1470702649, + "conntime" : 1470425052, + "version" : 60013, + "subver" : "/Satoshi:1.0.0/", + "inbound" : true, + "startingheight" : 1118641, + "banscore" : 0 + }, + { + "addr" : "163.172.156.107:14631", + "services" : "00000001", + "lastsend" : 1470702654, + "lastrecv" : 1470702648, + "conntime" : 1470431176, + "version" : 60013, + "subver" : "/Satoshi:1.0.0/", + "inbound" : false, + "startingheight" : 1228162, + "banscore" : 0 + }, + { + "addr" : "74.120.222.234:63181", + "services" : "00000001", + "lastsend" : 1470702654, + "lastrecv" : 1470702647, + "conntime" : 1470432991, + "version" : 60013, + "subver" : "/Satoshi:1.0.0/", + "inbound" : true, + "startingheight" : 1228200, + "banscore" : 0 + }, + { + "addr" : "192.99.233.217:15888", + "services" : "00000001", + "lastsend" : 1470702654, + "lastrecv" : 1470702647, + "conntime" : 1470455175, + "version" : 60013, + "subver" : "/Satoshi:1.0.0/", + "inbound" : true, + "startingheight" : 1228648, + "banscore" : 0 + }, + { + "addr" : "162.255.117.105:62461", + "services" : "00000001", + "lastsend" : 1470702654, + "lastrecv" : 1470702647, + "conntime" : 1470459314, + "version" : 60013, + "subver" : "/Satoshi:1.0.0/", + "inbound" : true, + "startingheight" : 1228733, + "banscore" : 0 + }, + { + "addr" : "188.166.91.37:39774", + "services" : "00000001", + "lastsend" : 1470702654, + "lastrecv" : 1470702610, + "conntime" : 1470461455, + "version" : 60013, + "subver" : "/Satoshi:1.0.0/", + "inbound" : true, + "startingheight" : 1228775, + "banscore" : 0 + }, + { + "addr" : "149.56.122.72:14631", + "services" : "00000001", + "lastsend" : 1470702655, + "lastrecv" : 1470702647, + "conntime" : 1470461716, + "version" : 60013, + "subver" : "/Satoshi:1.0.0/", + "inbound" : false, + "startingheight" : 1228778, + "banscore" : 0 + }, + { + "addr" : "71.1.13.122:62242", + "services" : "00000001", + "lastsend" : 1470702655, + "lastrecv" : 1470702650, + "conntime" : 1470462024, + "version" : 60013, + "subver" : "/Satoshi:1.0.0/", + "inbound" : true, + "startingheight" : 1228786, + "banscore" : 0 + }, + { + "addr" : "88.113.76.138:60913", + "services" : "00000001", + "lastsend" : 1470702655, + "lastrecv" : 1470702649, + "conntime" : 1470484989, + "version" : 60013, + "subver" : "/Satoshi:1.0.0/", + "inbound" : true, + "startingheight" : 1229269, + "banscore" : 0 + }, + { + "addr" : "81.205.30.207:50538", + "services" : "00000001", + "lastsend" : 1470702656, + "lastrecv" : 1470702647, + "conntime" : 1470519933, + "version" : 60013, + "subver" : "/Satoshi:1.0.0/", + "inbound" : true, + "startingheight" : 1229188, + "banscore" : 0 + }, + { + "addr" : "203.189.127.54:49495", + "services" : "00000001", + "lastsend" : 1470702656, + "lastrecv" : 1470702653, + "conntime" : 1470557228, + "version" : 60013, + "subver" : "/Satoshi:1.0.0/", + "inbound" : true, + "startingheight" : 1230826, + "banscore" : 0 + }, + { + "addr" : "68.190.213.46:50643", + "services" : "00000001", + "lastsend" : 1470702656, + "lastrecv" : 1470702647, + "conntime" : 1470568861, + "version" : 60013, + "subver" : "/Satoshi:1.0.0/", + "inbound" : true, + "startingheight" : 1231075, + "banscore" : 0 + }, + { + "addr" : "98.202.147.55:50064", + "services" : "00000001", + "lastsend" : 1470702656, + "lastrecv" : 1470702647, + "conntime" : 1470579239, + "version" : 60013, + "subver" : "/Satoshi:1.0.0/", + "inbound" : true, + "startingheight" : 1231295, + "banscore" : 0 + }, + { + "addr" : "89.212.19.49:58924", + "services" : "00000001", + "lastsend" : 1470702656, + "lastrecv" : 1470702664, + "conntime" : 1470595350, + "version" : 60013, + "subver" : "/Satoshi:1.0.0/", + "inbound" : true, + "startingheight" : 1231645, + "banscore" : 0 + }, + { + "addr" : "162.210.92.46:37304", + "services" : "00000001", + "lastsend" : 1470702657, + "lastrecv" : 1470702650, + "conntime" : 1470601796, + "version" : 60013, + "subver" : "/Satoshi:1.0.0/", + "inbound" : true, + "startingheight" : 1231787, + "banscore" : 0 + }, + { + "addr" : "115.70.19.28:50995", + "services" : "00000001", + "lastsend" : 1470702613, + "lastrecv" : 1470702646, + "conntime" : 1470602815, + "version" : 60013, + "subver" : "/Satoshi:1.0.0/", + "inbound" : true, + "startingheight" : 1231811, + "banscore" : 0 + }, + { + "addr" : "68.43.220.127:3385", + "services" : "00000001", + "lastsend" : 1470702657, + "lastrecv" : 1470702649, + "conntime" : 1470605657, + "version" : 60013, + "subver" : "/Satoshi:1.0.0/", + "inbound" : true, + "startingheight" : 1231872, + "banscore" : 0 + }, + { + "addr" : "79.227.171.148:60444", + "services" : "00000001", + "lastsend" : 1470702657, + "lastrecv" : 1470702649, + "conntime" : 1470624294, + "version" : 60013, + "subver" : "/Satoshi:1.0.0/", + "inbound" : true, + "startingheight" : 1232290, + "banscore" : 0 + }, + { + "addr" : "68.46.103.181:51126", + "services" : "00000001", + "lastsend" : 1470702658, + "lastrecv" : 1470702647, + "conntime" : 1470629436, + "version" : 60013, + "subver" : "/Satoshi:1.0.0/", + "inbound" : true, + "startingheight" : 1232408, + "banscore" : 0 + }, + { + "addr" : "98.207.117.83:51529", + "services" : "00000001", + "lastsend" : 1470702658, + "lastrecv" : 1470702647, + "conntime" : 1470644791, + "version" : 60013, + "subver" : "/Satoshi:1.0.0/", + "inbound" : true, + "startingheight" : 1232745, + "banscore" : 0 + }, + { + "addr" : "79.200.255.204:4619", + "services" : "00000001", + "lastsend" : 1470702658, + "lastrecv" : 1470702647, + "conntime" : 1470648995, + "version" : 60013, + "subver" : "/Satoshi:1.0.0/", + "inbound" : true, + "startingheight" : 953802, + "banscore" : 0 + }, + { + "addr" : "82.8.59.60:60459", + "services" : "00000001", + "lastsend" : 1470702658, + "lastrecv" : 1470702648, + "conntime" : 1470650104, + "version" : 60013, + "subver" : "/Satoshi:1.0.0/", + "inbound" : true, + "startingheight" : 1232858, + "banscore" : 0 + }, + { + "addr" : "71.241.204.215:50697", + "services" : "00000001", + "lastsend" : 1470702658, + "lastrecv" : 1470702216, + "conntime" : 1470652320, + "version" : 60013, + "subver" : "/Satoshi:1.0.0/", + "inbound" : true, + "startingheight" : 1058787, + "banscore" : 0 + }, + { + "addr" : "108.247.198.39:61254", + "services" : "00000001", + "lastsend" : 1470702659, + "lastrecv" : 1470702647, + "conntime" : 1470659265, + "version" : 60013, + "subver" : "/Satoshi:1.0.0/", + "inbound" : true, + "startingheight" : 1233061, + "banscore" : 0 + }, + { + "addr" : "156.57.141.221:51476", + "services" : "00000001", + "lastsend" : 1470702659, + "lastrecv" : 1470702648, + "conntime" : 1470661208, + "version" : 60013, + "subver" : "/Satoshi:1.0.0/", + "inbound" : true, + "startingheight" : 1233102, + "banscore" : 0 + }, + { + "addr" : "92.26.168.113:14631", + "services" : "00000001", + "lastsend" : 1470702659, + "lastrecv" : 1470702650, + "conntime" : 1470661239, + "version" : 60013, + "subver" : "/Satoshi:1.0.0/", + "inbound" : false, + "startingheight" : 1233104, + "banscore" : 0 + }, + { + "addr" : "71.53.157.49:14631", + "services" : "00000001", + "lastsend" : 1470702659, + "lastrecv" : 1470702649, + "conntime" : 1470664598, + "version" : 60013, + "subver" : "/Satoshi:1.0.0/", + "inbound" : false, + "startingheight" : 1233179, + "banscore" : 0 + }, + { + "addr" : "68.45.147.145:14631", + "services" : "00000001", + "lastsend" : 1470702660, + "lastrecv" : 1470702649, + "conntime" : 1470670535, + "version" : 60013, + "subver" : "/Satoshi:1.0.0/", + "inbound" : false, + "startingheight" : 1233309, + "banscore" : 0 + }, + { + "addr" : "79.54.185.53:59661", + "services" : "00000001", + "lastsend" : 1470702660, + "lastrecv" : 1470702647, + "conntime" : 1470674560, + "version" : 60013, + "subver" : "/Satoshi:1.0.0/", + "inbound" : true, + "startingheight" : 1233387, + "banscore" : 0 + }, + { + "addr" : "110.202.11.148:63824", + "services" : "00000001", + "lastsend" : 1470702660, + "lastrecv" : 1470702659, + "conntime" : 1470678623, + "version" : 60013, + "subver" : "/Satoshi:1.0.0/", + "inbound" : true, + "startingheight" : 1233468, + "banscore" : 0 + }, + { + "addr" : "91.82.171.9:62108", + "services" : "00000001", + "lastsend" : 1470702661, + "lastrecv" : 1470702648, + "conntime" : 1470679101, + "version" : 60013, + "subver" : "/Satoshi:1.0.0/", + "inbound" : true, + "startingheight" : 1233476, + "banscore" : 0 + }, + { + "addr" : "74.14.104.167:18505", + "services" : "00000001", + "lastsend" : 1470702661, + "lastrecv" : 1470702649, + "conntime" : 1470691153, + "version" : 60013, + "subver" : "/Satoshi:1.0.0/", + "inbound" : true, + "startingheight" : 1233750, + "banscore" : 0 + }, + { + "addr" : "95.116.195.148:43580", + "services" : "00000001", + "lastsend" : 1470702661, + "lastrecv" : 1470702648, + "conntime" : 1470692017, + "version" : 60013, + "subver" : "/Satoshi:1.0.0/", + "inbound" : true, + "startingheight" : 1233773, + "banscore" : 0 + }, + { + "addr" : "90.113.82.59:14631", + "services" : "00000001", + "lastsend" : 1470702661, + "lastrecv" : 1470702647, + "conntime" : 1470697248, + "version" : 60013, + "subver" : "/Satoshi:1.0.0/", + "inbound" : false, + "startingheight" : 1233892, + "banscore" : 0 + }, + { + "addr" : "98.118.105.12:53622", + "services" : "00000001", + "lastsend" : 1470702662, + "lastrecv" : 1470702647, + "conntime" : 1470699762, + "version" : 60013, + "subver" : "/Satoshi:1.0.0/", + "inbound" : true, + "startingheight" : 1233953, + "banscore" : 0 + }, + { + "addr" : "82.241.71.230:50613", + "services" : "00000001", + "lastsend" : 1470702662, + "lastrecv" : 1470702648, + "conntime" : 1470699801, + "version" : 60013, + "subver" : "/Satoshi:1.0.0/", + "inbound" : true, + "startingheight" : 1233955, + "banscore" : 0 + }, + { + "addr" : "98.161.16.55:14631", + "services" : "00000001", + "lastsend" : 1470702662, + "lastrecv" : 1470702652, + "conntime" : 1470700341, + "version" : 60013, + "subver" : "/Satoshi:1.0.0/", + "inbound" : false, + "startingheight" : 1233968, + "banscore" : 0 + }, + { + "addr" : "89.248.160.237:41523", + "services" : "00000001", + "lastsend" : 1470702662, + "lastrecv" : 1470702488, + "conntime" : 1470701204, + "version" : 60013, + "subver" : "/Satoshi:1.0.0/", + "inbound" : true, + "startingheight" : 1098838, + "banscore" : 0 + }, + { + "addr" : "93.211.231.89:49167", + "services" : "00000001", + "lastsend" : 1470702663, + "lastrecv" : 1470702649, + "conntime" : 1470701417, + "version" : 60013, + "subver" : "/Satoshi:1.0.0/", + "inbound" : true, + "startingheight" : 1233992, + "banscore" : 0 + }, + { + "addr" : "2.26.181.156:14631", + "services" : "00000001", + "lastsend" : 1470702663, + "lastrecv" : 1470702647, + "conntime" : 1470701448, + "version" : 60013, + "subver" : "/Satoshi:1.0.0/", + "inbound" : false, + "startingheight" : 1233993, + "banscore" : 0 + }, + { + "addr" : "89.248.160.244:46492", + "services" : "00000001", + "lastsend" : 1470702697, + "lastrecv" : 1470702696, + "conntime" : 1470701862, + "version" : 60013, + "subver" : "/Satoshi:1.0.0/", + "inbound" : true, + "startingheight" : 0, + "banscore" : 0 + }, + { + "addr" : "89.248.160.243:51068", + "services" : "00000001", + "lastsend" : 1470702696, + "lastrecv" : 1470702695, + "conntime" : 1470701914, + "version" : 60013, + "subver" : "/Satoshi:1.0.0/", + "inbound" : true, + "startingheight" : 0, + "banscore" : 0 + }, + { + "addr" : "89.248.160.242:33106", + "services" : "00000001", + "lastsend" : 1470702681, + "lastrecv" : 1470702680, + "conntime" : 1470701958, + "version" : 60013, + "subver" : "/Satoshi:1.0.0/", + "inbound" : true, + "startingheight" : 0, + "banscore" : 0 + }, + { + "addr" : "89.248.160.241:57001", + "services" : "00000001", + "lastsend" : 1470702663, + "lastrecv" : 1470702117, + "conntime" : 1470702002, + "version" : 60013, + "subver" : "/Satoshi:1.0.0/", + "inbound" : true, + "startingheight" : 0, + "banscore" : 0 + } +] diff --git a/includes/iguana_defines.h b/includes/iguana_defines.h index 279e379c3..0ef4c2677 100755 --- a/includes/iguana_defines.h +++ b/includes/iguana_defines.h @@ -60,7 +60,7 @@ #define IGUANA_MAXRECVCACHE ((int64_t)1024L * 1024 * 1024L) #define IGUANA_MAXBUNDLES (50000000 / 500) -#define IGUANA_MINPEERS 24 +#define IGUANA_MINPEERS 64 #define IGUANA_LOG2MAXPEERS 10 #define IGUANA_LOG2PACKETSIZE 21 #define IGUANA_LOG2PEERFILESIZE 23 diff --git a/includes/iguana_types.h b/includes/iguana_types.h index 52fbc6f52..7b953cea1 100755 --- a/includes/iguana_types.h +++ b/includes/iguana_types.h @@ -21,7 +21,7 @@ typedef void (*iguana_func)(void *); typedef int32_t (*blockhashfunc)(uint8_t *blockhashp,uint8_t *serialized,int32_t len); //typedef void *(*basilisk_func)(struct basilisk_item *Lptr,struct supernet_info *myinfo,struct iguana_info *coin,char *remoteaddr,uint32_t basilisktag,int32_t timeoutmillis,cJSON *vals); //typedef double (*basilisk_metricfunc)(struct supernet_info *myinfo,struct basilisk_item *ptr,char *result); -typedef struct _gfshare_ctx gfshare_ctx; +//typedef struct _gfshare_ctx gfshare_ctx; #endif