From cc07d483710798da652ee059a8ed5e6f55b8276b Mon Sep 17 00:00:00 2001 From: jl777 Date: Thu, 7 Apr 2016 20:49:52 -0500 Subject: [PATCH] test --- iguana/confs/BTC_peers.txt | 669 ++++++++++++++++++++++--------------- iguana/iguana_unspents.c | 19 +- 2 files changed, 418 insertions(+), 270 deletions(-) diff --git a/iguana/confs/BTC_peers.txt b/iguana/confs/BTC_peers.txt index 3dfaf9bac..99fc65790 100644 --- a/iguana/confs/BTC_peers.txt +++ b/iguana/confs/BTC_peers.txt @@ -1,301 +1,444 @@ 5.9.102.210 -108.58.252.82 -74.207.233.193 -130.211.146.81 -148.251.151.48 -176.9.29.76 -130.83.160.187 -136.243.17.66 -136.243.139.96 -176.9.103.226 -78.46.238.87 -128.199.50.89 -85.25.196.59 -217.79.191.72 -95.128.48.209 +144.76.136.19 +148.251.240.254 +148.251.6.18 136.243.23.208 +136.243.17.66 5.9.28.10 -148.251.122.162 -5.189.181.97 -151.80.21.57 -62.210.82.206 -188.40.93.205 -5.9.85.14 -109.169.68.140 -159.8.161.37 +78.47.121.249 +178.162.211.12 188.40.61.208 -176.9.45.239 -136.243.13.76 -195.154.134.78 -89.36.212.55 -178.162.215.231 -85.25.194.28 -195.154.164.243 +148.251.151.48 +5.196.65.56 +176.9.29.76 +37.58.60.177 +83.81.138.160 +188.40.93.205 104.155.53.130 -178.162.211.12 -62.210.86.42 -37.187.111.147 -5.196.65.205 -5.79.72.76 -137.226.109.169 -130.185.144.213 +178.162.215.231 +148.251.221.163 +62.210.253.10 +195.154.164.46 +185.82.23.218 +94.23.252.166 +195.154.163.75 +62.210.204.29 +136.243.13.76 +82.165.16.114 +80.86.92.70 +88.198.44.145 +213.5.36.58 91.121.70.66 -176.31.216.47 -93.190.138.234 +136.243.61.143 +5.9.140.149 +62.107.200.30 +95.128.48.209 +185.38.184.62 82.95.204.10 -5.9.145.8 -178.79.179.49 -149.210.169.223 -213.5.36.58 -95.211.104.246 -52.48.21.145 -185.121.170.160 +96.240.33.91 159.122.150.208 -88.198.44.145 -80.86.92.70 -45.32.236.136 +46.28.205.67 +95.211.197.74 +136.243.139.96 +192.243.215.4 +37.187.247.50 +52.29.99.196 80.57.227.14 -178.22.68.156 +83.249.63.93 +188.165.210.62 +148.251.181.82 +90.104.150.191 +91.205.173.237 144.76.70.163 -188.138.88.42 -212.83.138.114 -82.73.154.77 -86.86.139.48 +159.122.37.122 +141.0.158.41 +62.210.74.110 +78.46.193.75 149.210.205.174 +5.9.145.8 +95.211.104.246 +139.162.196.240 +108.185.114.134 +89.36.212.55 +159.8.161.37 +5.196.65.205 +173.56.108.53 +176.31.216.47 +61.35.225.19 +185.101.107.142 +40.117.227.228 +62.210.82.206 +104.155.82.34 +70.35.98.39 +73.221.182.127 +84.200.2.6 +96.126.123.143 +82.73.154.77 +212.112.159.64 +217.79.191.72 +85.93.203.192 +107.6.174.152 +93.190.138.234 +188.166.19.37 +37.97.141.116 +213.47.171.165 145.129.31.147 -37.187.247.50 +46.229.165.154 +178.79.179.49 +5.79.72.76 +78.193.96.155 +52.30.166.153 +5.196.69.107 +148.251.122.162 +85.25.196.59 +5.39.75.32 +169.57.140.252 +85.214.204.55 +5.39.174.119 93.186.197.146 +52.28.19.80 +52.72.156.74 +89.46.74.126 +188.138.88.42 +80.229.151.187 81.136.30.26 -212.186.244.2 -80.218.130.117 -107.6.174.152 -188.40.136.205 -45.32.235.62 82.217.214.215 -62.107.200.30 -62.210.204.29 -5.39.174.119 -88.97.72.134 +195.154.173.26 +98.208.76.134 +149.210.169.223 +81.138.88.97 +79.127.240.99 +52.7.106.177 +94.7.221.2 +73.25.181.210 +195.154.164.243 +46.183.216.215 +80.218.130.117 +98.125.79.158 +130.185.144.213 +46.50.234.179 +50.206.138.176 +76.120.20.22 +54.201.80.160 +163.172.7.30 +52.11.33.24 +112.118.13.88 +128.199.174.62 +46.101.29.96 +95.211.168.221 +169.54.98.38 +51.255.42.173 +109.236.91.86 +24.96.241.48 +206.221.184.235 +5.149.251.67 +92.222.180.14 +50.35.14.160 +101.200.72.211 +176.36.68.69 +173.252.46.16 +128.199.50.89 +173.62.215.217 +185.81.164.187 +71.245.189.11 +52.90.128.203 62.238.34.125 -80.241.219.44 -85.214.234.254 -185.38.184.62 -185.112.157.157 -78.46.193.75 -82.165.16.114 -91.121.123.107 -80.229.151.187 -148.251.240.254 -194.237.158.153 -185.35.67.75 +36.2.119.80 +96.234.214.85 +74.122.237.124 +52.49.168.48 +104.196.57.143 +193.10.64.85 +188.165.246.217 +86.86.139.48 5.249.159.58 -185.7.32.111 -185.81.164.187 -109.251.161.121 -173.56.108.53 -176.223.201.198 -83.249.79.101 -81.138.88.97 -52.28.19.80 -85.95.228.141 -71.252.137.242 -82.44.82.112 -54.165.213.225 +123.56.91.81 +141.134.69.253 +75.109.245.15 +198.204.224.106 +71.202.149.229 +67.167.76.248 +169.54.79.200 +161.202.233.171 +159.203.110.178 +78.46.238.87 +50.116.59.236 +54.172.84.78 +144.76.43.181 +212.186.244.2 +95.174.83.89 +213.107.69.133 +192.81.249.110 +153.120.156.83 +176.9.103.226 +98.250.82.63 +68.197.233.152 +99.231.225.222 +82.221.108.21 +70.75.20.127 +212.83.138.114 138.201.27.171 -108.36.98.135 -2.227.253.109 -208.114.84.77 -163.172.7.30 -92.27.7.209 -85.172.79.190 -37.143.243.63 +151.80.21.57 +94.100.208.234 +198.178.123.147 +204.152.207.114 +207.226.141.253 +52.26.127.162 +198.27.81.24 +192.52.167.188 +122.58.50.139 +54.200.14.112 +195.239.1.66 +64.121.3.163 +52.192.211.14 +108.58.252.82 +85.95.228.141 +85.25.194.28 +77.57.59.174 +5.9.85.14 +73.254.38.48 +68.228.159.39 +95.241.163.69 +37.187.111.147 +86.15.59.160 +24.220.159.80 +52.48.21.145 +54.173.214.35 +62.138.0.233 +130.83.160.187 +23.236.144.69 +209.73.158.58 +83.183.17.191 +86.246.166.172 +213.136.75.205 +109.169.68.140 +45.32.235.62 +72.177.4.164 +103.60.126.81 +45.32.240.41 +98.127.84.204 +137.226.109.169 +91.121.123.107 +52.10.170.186 +188.212.43.10 +5.61.40.21 96.127.202.148 -173.74.40.32 -107.191.39.221 -90.104.150.191 +74.207.233.193 +73.28.33.209 +5.189.181.97 +162.245.217.133 +79.165.235.119 +173.79.124.213 +176.36.37.62 +54.232.98.22 +52.48.23.201 +108.61.188.168 +83.227.173.83 +159.122.150.194 +37.187.4.9 +185.121.170.160 +104.58.20.16 +63.142.255.160 +147.83.72.91 +185.122.56.247 94.214.2.74 -54.172.84.78 -52.90.57.21 +52.37.69.165 +100.2.192.110 +104.168.248.132 +50.206.138.178 +5.249.151.47 +46.166.164.223 +78.245.193.210 +71.192.10.200 +83.249.79.101 +176.223.201.198 +88.115.28.12 +81.169.244.142 +85.3.93.45 +109.235.69.142 +185.58.193.97 +74.83.140.242 +46.229.238.187 +92.221.127.99 +89.46.70.209 +82.78.191.165 +85.166.189.122 +185.65.132.119 +178.199.96.108 +109.251.161.121 +5.189.162.70 +123.2.57.36 +92.63.110.16 +142.4.213.204 108.59.9.167 -70.35.98.39 -192.99.12.223 -52.68.68.148 -122.58.50.139 +73.191.226.169 +104.168.62.209 +85.172.79.190 +82.118.233.111 +173.12.181.181 +104.234.246.67 +23.89.201.181 +73.5.77.186 +80.241.219.44 54.172.84.89 -185.82.23.218 -52.29.99.196 -206.221.184.235 -67.183.245.116 -52.72.156.74 -70.88.53.161 -24.44.55.98 -64.57.133.236 -108.49.39.239 -52.192.211.14 -72.181.158.116 -24.182.133.130 -108.61.157.125 -46.50.234.179 -174.57.190.26 -45.79.78.56 -73.74.104.224 -54.232.98.22 +194.237.158.153 +2.227.253.109 +192.95.56.199 54.86.114.40 -79.182.69.37 +198.100.144.182 +107.191.39.221 +69.30.244.210 +104.196.22.0 +114.215.192.186 +52.62.33.159 +91.152.150.35 +169.54.79.201 +73.150.59.209 +52.91.222.10 +52.23.159.174 +71.184.65.44 +195.154.134.78 +85.214.234.254 +185.7.32.111 +52.90.57.21 199.233.246.220 -50.206.138.176 -24.186.112.24 +119.9.119.139 +149.3.91.183 +104.236.91.250 +108.61.157.125 +108.49.39.239 +46.101.103.235 +86.106.93.109 +54.172.114.28 +213.174.156.65 +54.169.131.166 +52.90.9.14 +198.58.125.193 +62.194.9.18 +52.70.112.111 +81.132.41.243 +216.189.153.172 +52.68.68.148 +107.191.33.83 +78.130.213.74 +5.196.46.249 +64.189.174.5 +78.121.69.23 +4.15.180.30 +73.158.217.222 108.173.69.240 -62.138.0.233 -173.31.158.113 -52.7.106.177 -98.250.82.63 +66.128.118.35 +174.27.72.80 211.103.126.194 -54.200.14.112 -108.185.114.134 -8.39.253.56 +99.55.142.44 +125.21.163.79 +203.29.87.136 +199.66.175.101 +107.191.41.89 +67.183.245.116 50.126.86.251 -24.112.97.250 -128.199.174.62 -192.95.56.199 -114.215.192.186 -192.243.215.4 -98.127.84.204 -99.231.225.222 -70.75.20.127 -52.8.99.184 -73.191.226.169 -75.74.28.26 -158.69.149.39 -71.245.189.11 -98.208.76.134 -23.253.148.208 -69.30.244.210 -149.3.91.183 -184.70.15.166 -107.191.99.205 -104.168.158.185 -81.162.231.211 -79.165.235.119 -50.206.138.178 -24.28.81.162 -52.26.127.162 -54.223.72.115 169.38.69.194 -67.205.59.222 -24.253.96.23 -217.145.94.94 -80.94.55.83 -46.229.165.140 -119.240.36.151 -76.103.154.41 -96.240.33.91 -161.202.233.171 -63.142.255.160 -65.49.51.61 -208.90.218.102 -168.235.85.242 -119.9.119.139 -204.152.207.114 -108.49.55.35 -207.226.141.253 -104.196.22.0 -173.12.181.181 -71.192.10.200 +72.181.158.116 +173.74.40.32 +121.99.178.161 +174.57.190.26 +24.182.133.130 192.169.6.102 -119.246.245.241 -78.245.193.210 -157.13.61.6 +24.44.55.98 +185.35.67.75 216.189.149.50 -89.46.74.126 -74.122.237.124 -123.56.91.81 +168.235.85.242 +75.109.245.28 +210.84.33.37 +54.223.72.115 +69.50.171.205 +95.213.187.218 +95.165.168.168 +194.87.1.232 +119.81.11.73 +192.187.114.190 +204.28.124.82 +82.3.187.22 +169.57.28.116 +70.183.119.69 +198.50.138.53 +67.221.193.55 +162.243.132.6 +218.161.44.5 +104.168.248.130 +100.36.105.243 +50.30.46.177 +104.237.138.120 +24.253.96.23 +71.252.137.242 +192.99.12.223 +24.28.81.162 198.84.253.45 +52.8.99.184 +173.31.158.113 +98.219.248.107 139.196.241.246 -92.63.110.16 -72.179.10.209 -217.209.183.164 -107.191.41.89 +65.49.51.61 +173.179.37.8 +73.74.104.224 38.124.124.141 -101.201.196.158 -103.60.126.81 -109.74.8.161 -82.118.233.111 -72.239.249.224 -190.153.217.238 -79.166.9.201 -70.33.217.30 +104.168.158.185 +75.74.28.26 173.224.246.184 -203.206.223.144 -198.178.123.147 -62.210.253.10 -109.235.68.80 -112.118.13.88 -74.83.140.242 -75.109.245.28 -109.145.194.92 -216.240.130.109 -142.4.213.204 -72.177.4.164 -31.41.247.133 -45.32.46.198 -95.241.163.69 -14.155.20.180 -104.237.138.120 -83.183.17.191 -174.27.72.80 -71.202.149.229 -104.197.104.142 -109.255.166.235 -153.225.179.146 -79.127.240.99 -96.234.214.85 -52.62.33.159 -82.194.167.68 -210.84.33.37 -104.236.15.195 -174.23.142.201 +190.153.217.238 96.37.9.173 -101.200.72.211 -104.236.91.250 -121.99.178.161 -92.233.128.123 -83.226.6.158 -98.125.79.158 -52.37.69.165 -104.168.62.209 -85.214.204.55 -109.236.91.86 -74.103.127.251 -52.30.166.153 -50.53.92.79 +23.245.116.86 +192.203.228.71 +91.177.60.251 +208.111.48.132 +207.255.42.202 +24.69.65.191 +69.30.214.34 +23.239.22.219 +52.10.150.72 +50.82.159.245 +54.175.75.186 +158.69.226.147 +50.30.37.103 +98.7.26.60 +175.126.148.99 +52.36.208.42 +71.199.193.202 +192.169.7.83 +1.234.70.35 +173.192.31.142 +76.175.8.222 +52.8.184.157 +65.182.236.136 +119.240.36.151 31.170.178.235 -73.183.71.105 -94.23.252.166 -98.219.248.107 -195.239.1.66 -153.120.156.83 -87.139.154.234 -206.47.13.115 -68.133.37.148 -162.245.217.133 -54.223.121.186 -68.69.222.111 -198.100.144.182 -76.120.20.22 -78.121.69.23 -108.12.19.128 -5.196.69.107 +185.112.157.157 +45.79.78.56 +104.236.15.195 +23.253.148.208 +54.165.213.225 +104.197.104.142 +46.229.165.140 +158.69.149.39 +70.33.217.30 +31.41.247.133 104.205.18.189 -52.36.208.42 -46.183.216.215 -62.141.45.85 -61.35.225.19 -173.179.37.8 +184.70.15.166 +70.88.53.161 85.70.234.114 -104.196.57.143 -91.155.184.127 -66.43.209.193 -46.238.42.250 -73.5.77.186 -54.223.244.46 +67.205.112.207 +91.193.121.154 +96.56.145.250 +96.44.156.201 +184.58.162.35 +69.94.30.177 +110.10.130.17 +81.175.241.116 +23.252.120.136 +68.145.236.222 +142.227.120.102 +89.157.100.135 +138.201.30.201 +109.72.32.30 +76.102.14.28 +52.26.124.186 diff --git a/iguana/iguana_unspents.c b/iguana/iguana_unspents.c index 4afa7d88a..180cd226c 100755 --- a/iguana/iguana_unspents.c +++ b/iguana/iguana_unspents.c @@ -493,7 +493,7 @@ struct iguana_bundle *iguana_externalspent(struct iguana_info *coin,bits256 *pre //printf("%s height.%d firstvout.%d prev.%d ->U%d\n",bits256_str(str,prev_hash),height,TX.firstvout,prev_vout,unspentind); now = (uint32_t)time(NULL); duration = (OS_milliseconds() - startmillis); - if ( ((uint64_t)coin->txidfind_num % 100000) == 0 ) + if ( ((uint64_t)coin->txidfind_num % 5000000) == 2000000 ) printf("%p iguana_txidfind.[%.0f] ave %.2f micros, total %.2f seconds | duration %.3f millis\n",spentbp->ramchain.txbits,coin->txidfind_num,(coin->txidfind_totalmillis*1000.)/coin->txidfind_num,coin->txidfind_totalmillis/1000.,duration); coin->txidfind_totalmillis += duration; coin->txidfind_num += 1.; @@ -512,22 +512,27 @@ struct iguana_bundle *iguana_externalspent(struct iguana_info *coin,bits256 *pre spentbp->lastprefetch = now; } } - } else printf("illegal hdrsi.%d prev_hash.(%s) for bp.[%d]\n",hdrsi,bits256_str(str,prev_hash),spent_hdrsi); + } + else + { + printf("illegal hdrsi.%d prev_hash.(%s) for bp.[%d]\n",hdrsi,bits256_str(str,prev_hash),spent_hdrsi); + exit(-1); + } } else { printf("cant find prev_hash.(%s) for bp.[%d]\n",bits256_str(str,prev_hash),spent_hdrsi); + exit(-1); return(0); } } else printf("external spent unexpected nonz unspentind [%d]\n",spent_hdrsi); } if ( (spentbp= coin->bundles[hdrsi]) == 0 || hdrsi > spent_hdrsi ) - printf("illegal hdrsi.%d when [%d] spentbp.%p\n",hdrsi,spent_hdrsi,spentbp);//, getchar(); + printf("illegal hdrsi.%d when [%d] spentbp.%p\n",hdrsi,spent_hdrsi,spentbp); else if ( unspentind == 0 || unspentind >= spentbp->ramchain.H.data->numunspents ) - { printf("illegal unspentind.%d vs max.%d spentbp.%p[%d]\n",unspentind,spentbp->ramchain.H.data->numunspents,spentbp,hdrsi); - exit(-1); - } else return(spentbp); + else return(spentbp); + exit(-1); return(0); } @@ -863,7 +868,7 @@ int32_t iguana_spendvectors(struct iguana_info *coin,struct iguana_bundle *bp,st } for (k=0; khdrsi,i,(uint32_t)time(NULL)-starttime,spendind); u = 0; s = &S[spendind];