0.12.3.7-2ndLayer forks auto-heal (#40)

* forkautoheal1 * missing loop ++itPendingMNV * 0.12.3.7 version,seeds,checkpointData
zocteam · Oct 20, 2019 · 1b7499c · 1b7499c
1 parent b9db0d2
commit 1b7499c
Show file tree

Hide file tree

Showing 15 changed files with 452 additions and 384 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 ![ZeroOne](doc/splash.png)
 
-01coin Community v0.12.3.6
+01coin Community v0.12.3.7
 ==================================
 
 [Bitcointalk ANN thread](https://bitcointalk.org/index.php?topic=3457534.0)

diff --git a/configure.ac b/configure.ac
@@ -3,7 +3,7 @@ AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 0)
 define(_CLIENT_VERSION_MINOR, 12)
 define(_CLIENT_VERSION_REVISION, 3)
-define(_CLIENT_VERSION_BUILD, 6)
+define(_CLIENT_VERSION_BUILD, 7)
 define(_CLIENT_VERSION_IS_RELEASE, true)
 define(_COPYRIGHT_YEAR, 2019)
 define(_COPYRIGHT_HOLDERS,[The %s developers])

diff --git a/contrib/seeds/nodes_main.txt b/contrib/seeds/nodes_main.txt
@@ -1,100 +1,181 @@
-151.80.184.105:10000
-51.38.78.23:10000
-[2607:5300:0061:09bb:0000:0000:0d03:4039]:10000
-[2001:41d0:0800:1a45:0000:0000:10ac:b922]:10000
-151.80.3.237:10000
-[2001:41d0:1000:2995:0000:0000:0163:1c0d]:10000
-[2001:41d0:1000:2995:0000:0000:0925:4971]:10000
-[2001:41d0:1000:2995:0000:0000:0936:8ece]:10000
-[2001:41d0:1000:2995:0000:0000:09c5:aa05]:10000
-1.241.249.166:10000
-1.241.249.167:10000
-5.189.148.226:10000
-31.148.99.77:10000
-34.73.224.132:10000
-34.74.44.51:10000
-35.227.37.99:10000
-35.245.126.174:10000
-37.115.232.149:10000
-45.32.219.208:10000
-45.33.27.146:10000
-46.82.127.229:10000
-46.101.223.184:10000
-46.107.171.74:10000
-46.173.218.178:10000
-46.249.199.183:10000
-51.38.78.63:10000
-51.38.105.226:10000
-62.77.155.184:10000
-62.113.241.51:10000
+5.135.208.61:10000
+24.105.253.87:10000
+37.201.93.105:10000
+40.118.18.34:10000
+45.67.231.57:10000
+45.86.70.87:10000
+46.173.214.181:10000
+46.173.218.162:10000
+46.173.218.170:10000
+46.173.218.214:10000
+51.68.182.179:10000
+51.158.177.136:10000
+52.142.192.122:10000
+52.142.193.21:10000
+52.142.193.53:10000
+61.8.0.3:10000
+61.8.0.5:10000
+61.8.0.7:10000
+61.8.0.9:10000
 62.210.24.202:10000
-62.210.31.67:10000
+66.42.32.195:10000
 66.206.29.152:10000
+72.68.67.27:10000
+77.55.194.54:10000
+77.55.216.163:10000
 79.111.14.146:10000
 80.87.200.12:10000
-80.211.70.241:10000
-80.211.152.210:10000
-80.211.214.110:10000
+80.211.138.176:10000
+80.211.176.18:10000
+80.211.184.20:10000
+80.211.208.135:10000
+80.211.216.188:10000
 80.211.243.204:10000
-81.2.250.190:10000
+80.241.217.60:10000
 81.169.152.212:10000
-81.169.203.151:10000
-81.169.211.191:10000
-85.121.196.185:10000
-85.121.196.196:10000
-85.121.196.201:10000
-85.121.196.204:10000
-85.214.245.251:10000
-85.255.9.189:10000
+84.0.197.129:10000
+84.107.217.29:10000
+85.98.104.32:10000
+85.121.196.181:10000
+85.121.196.200:10000
+85.121.197.27:10000
+85.121.197.30:10000
+86.75.101.30:10000
+87.205.11.28:10000
+89.36.219.165:10000
+89.40.113.238:10000
 89.40.126.103:10000
-90.255.225.179:10000
-94.177.163.99:10000
-94.177.254.48:10000
+89.248.245.83:10000
+93.108.190.44:10000
+94.177.237.91:10000
+94.177.237.168:10000
+94.177.252.211:10000
 94.250.252.212:10000
 95.165.145.111:10000
-107.173.6.236:10000
-112.165.165.68:10000
-134.209.16.65:10000
-134.209.103.219:10000
-134.255.89.220:10000
-139.180.134.180:10000
-139.180.215.51:10000
-142.234.157.243:10000
-144.76.203.73:10000
-144.217.112.138:10000
-144.217.112.139:10000
+95.216.48.42:10000
+95.216.48.45:10000
+95.216.232.28:10000
+103.215.55.24:10000
+107.173.102.155:10000
+108.197.158.221:10000
+113.28.67.38:10000
+113.28.67.40:10000
+119.120.137.15:10000
+119.210.122.13:10000
+128.199.96.161:10000
+132.117.15.5:10000
+134.238.151.11:10000
 146.66.179.123:10000
-149.90.59.247:10000
+148.251.72.114:10000
+150.143.97.137:10000
+151.80.184.104:10000
+153.121.57.163:10000
 163.172.200.2:10000
-165.227.1.164:10000
-167.86.71.164:10000
-178.239.225.246:10000
-178.239.225.249:10000
-178.239.238.6:10000
-178.239.238.7:10000
-178.249.242.40:10000
-185.33.145.239:10000
-185.63.191.241:10000
-185.203.117.193:10000
-185.221.152.178:10000
-185.230.162.126:10000
-185.240.242.137:10000
+165.22.48.27:10000
+165.227.17.14:10000
+167.86.72.143:10000
+172.110.10.239:10000
+173.100.23.99:10000
+173.103.23.99:10000
+173.106.23.99:10000
+173.107.23.99:10000
+173.117.23.99:10000
+173.131.23.99:10000
+173.136.23.99:10000
+173.137.23.99:10000
+173.208.77.8:10000
+173.208.77.30:10000
+173.208.77.113:10000
+173.208.77.132:10000
+173.212.240.91:10000
+176.223.141.0:10000
+178.238.237.124:10000
+185.122.223.200:10000
+185.240.242.142:10000
+185.240.242.157:10000
+185.240.243.178:10000
+185.240.243.179:10000
+187.237.215.22:10000
+188.122.212.138:10000
+188.122.213.61:10000
+188.122.213.135:10000
 188.134.9.88:10000
+188.165.48.84:10000
 188.191.232.44:10000
-193.187.172.242:10000
-193.187.174.91:10000
-207.180.217.58:10000
-207.180.217.59:10000
-207.246.114.161:10000
-212.8.247.220:10000
-212.83.165.229:10000
-212.237.12.49:10000
+188.214.93.150:10000
+192.3.21.15:10000
+194.182.72.87:10000
+194.182.73.25:10000
+195.154.52.150:10000
+198.13.42.183:10000
+199.247.8.112:10000
+206.189.68.47:10000
+212.123.50.214:10000
+212.237.0.17:10000
 212.237.211.92:10000
-213.141.134.205:10000
-216.189.145.192:10000
-216.189.145.194:10000
-216.189.145.221:10000
-216.189.145.222:10000
-223.171.32.155:10000
-223.171.45.227:10000
-223.171.46.67:10000
+212.237.211.107:10000
+217.61.2.117:10000
+217.61.18.108:10000
+217.61.21.6:10000
+217.61.97.172:10000
+217.61.106.94:10000
+217.69.8.5:10000
+218.163.62.9:10000
+220.241.87.4:10000
+220.241.87.5:10000
+[2001:15e8:110:61b7::1]:10000
+[2001:19f0:7001:4182::101]:10000
+[2001:19f0:7001:4182::112]:10000
+[2001:19f0:7001:4182::113]:10000
+[2001:19f0:7001:4182::122]:10000
+[2001:41d0:1000:2995:457:32e:dc0e:4]:10000
+[2001:41d0:1000:2995:457:32e:dc0e:5]:10000
+[2001:41d0:1000:2995:457:32e:dc0e:6]:10000
+[2001:41d0:1000:2995:457:32e:dc0e:9]:10000
+[2001:41d0:1000:2995:457:32e:dc0e:c]:10000
+[2001:41d0:1000:2995:457:32e:dc0e:d]:10000
+[2001:41d0:1000:2995:457:32e:dc0e:e]:10000
+[2001:41d0:1000:2995::242:2076]:10000
+[2001:41d0:602:24b8::36e:7739]:10000
+[2001:41d0:602:24b8::38c:b83c]:10000
+[2001:41d0:602:24b8::3f9:2f8e]:10000
+[2001:41d0:700:227f:118:d7c2:9e7c:1]:10000
+[2001:41d0:700:227f:1cf:d93:e72:1]:10000
+[2001:41d0:700:227f::1306:52b6]:10000
+[2001:41d0:700:227f::1479:d7f8]:10000
+[2001:41d0:700:227f::1481:a3d7]:10000
+[2001:41d0:700:227f::c6b:437c]:10000
+[2001:41d0:700:227f::f8d:30e8]:10000
+[2001:41d0:700:227f::f9d:fa65]:10000
+[2001:41d0:800:1a45::10ef:ac57]:10000
+[2001:41d0:800:1a45::e48:be7c]:10000
+[2607:5300:61:9bb::d03:4039]:10000
+[2a00:6d40:72:9ae2::1]:10000
+[2a02:7b40:b0df:8d00::1]:10000
+[2a02:c207:2021:1075::1]:10000
+[2a02:c207:2021:1075::10]:10000
+[2a02:c207:2021:1075::11]:10000
+[2a02:c207:2021:1075::12]:10000
+[2a02:c207:2021:1075::13]:10000
+[2a02:c207:2021:1075::14]:10000
+[2a02:c207:2021:1075::17]:10000
+[2a02:c207:2021:1075::18]:10000
+[2a02:c207:2021:1075::19]:10000
+[2a02:c207:2021:1075::2]:10000
+[2a02:c207:2021:1075::21]:10000
+[2a02:c207:2021:1075::3]:10000
+[2a02:c207:2021:1075::4]:10000
+[2a02:c207:2021:1075::5]:10000
+[2a02:c207:2021:1075::6]:10000
+[2a02:c207:2021:1075::7]:10000
+[2a02:c207:2021:1075::9]:10000
+[2a02:c207:2024:605::1]:10000
+[2a02:c207:2027:1865::1]:10000
+[2a02:c207:2027:1865::2]:10000
+[2a02:c207:2027:1865::3]:10000
+[2a02:c207:2027:1865::4]:10000
+[2a02:c207:2027:1865::5]:10000
+[2a02:c207:2027:8303::1]:10000
+[2a02:c207:2027:8303::2]:10000
+[2a02:c207:2027:8303::3]:10000
+[2a0c:b9c0:f:42b1::1]:10000
diff --git a/doc/Doxyfile b/doc/Doxyfile
@@ -41,7 +41,7 @@ PROJECT_NAME           = "ZeroOne Core"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 0.12.3.6
+PROJECT_NUMBER         = 0.12.3.7
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

diff --git a/doc/release-notes.md b/doc/release-notes.md
@@ -1,4 +1,4 @@
-# 01coin version 0.12.3.6
+# 01coin version 0.12.3.7
 
 Release is now available from:
 
@@ -19,23 +19,21 @@ If you are running an older version, shut it down. Wait until it has completely
 
 ### Downgrade warning
 
-Downgrade to a version < 0.12.3.6
+Downgrade to a version < 0.12.3.7
 
-Because release 0.12.3.6 is a mandatory upgrade release, downgrading to an earlier version is not supported.
+Because release 0.12.3.7 is a mandatory upgrade release, downgrading to an earlier version is not supported.
 
 
 ## Notable changes
 
-- Node sw supports only protocol 70211
-- ZOC SLIP44 CoinType 399, HD(m/44'/399'/0'/0/0)
-- Sharky-miner-blocks are burnt, block reward not shared w/MN and w/no tx processed will become unmatured/unpsent/burned
-- Several cleanups and optimizations to speedup and unfreeze mnsync asset stages
+- Node 2nd layer fork-auto-heal from verified mn broadcasts
+- Delayed daily unstuck fork-auto-healing attempt 
 - All users, exchanges, masternode owners and miners should upgrade as soon as possible
 
 
-### 0.12.3.6 Change log
+### 0.12.3.7 Change log
 
-See detailed [set of changes](https://github.com/zocteam/zeroonecoin/compare/v0.12.3.5...zocteam:v0.12.3.6).
+See detailed [set of changes](https://github.com/zocteam/zeroonecoin/compare/v0.12.3.6...zocteam:v0.12.3.7).
 
 
 ## Credits

diff --git a/share/rpcuser/rpcuser.py b/share/rpcuser/rpcuser.py
@@ -36,6 +36,6 @@
 m = hmac.new(bytearray(salt, 'utf-8'), bytearray(password, 'utf-8'), digestmod)
 result = m.hexdigest()
 
-print("String to be appended to bitcoin.conf:")
+print("String to be appended to zeroone.conf:")
 print("rpcauth="+username+":"+salt+"$"+result)
 print("Your password:\n"+password)
diff --git a/src/chainparams.cpp b/src/chainparams.cpp
@@ -120,11 +120,11 @@ class CMainParams : public CChainParams {
         consensus.vDeployments[Consensus::DEPLOYMENT_BIP147].nWindowSize = 4032;
         consensus.vDeployments[Consensus::DEPLOYMENT_BIP147].nThreshold = 3226; // 80% of 4032
 
-        // The best chain should have at least this much work.
-        consensus.nMinimumChainWork = uint256S("0x0000000000000000000000000000000000000000000000000026d386e4a143b1"); // 303181
+        // The best chain should have at least this much work (getblockchaininfo)
+        consensus.nMinimumChainWork = uint256S("0x00000000000000000000000000000000000000000000000000278109cc4d4f00"); // 327856
 
         // By default assume that the signatures in ancestors of this block are valid.
-        consensus.defaultAssumeValid = uint256S("0x00000000270c57081c1a6c1c0e1c08eaf892577325e73a6921e6ef96fe027897"); // 303181
+        consensus.defaultAssumeValid = uint256S("0x000000002fdb5872e1c42d949dab224cb1d41a79520a1c605f737236a2e55ecf"); // 327856
 
 
         /**
@@ -191,13 +191,16 @@ class CMainParams : public CChainParams {
             ( 101101, uint256S("0x000000001136784bed466075637c1885dc415c3bd65d7989bd159e7d851bc9f2"))
             ( 202202, uint256S("0x000000002ab69b401bac78c200a92bb1c8c2273ba2217f07cf8f8d935f252e9f"))
             ( 303202, uint256S("0x0000000095e87ff2246bc208bab6beaf4884dc18ef02bce5d672fd5cc91898fc"))
+            ( 309607, uint256S("0x0000000095eb0ecc0fd54f5714d2c0bf089fdc9386ce79911219e4141dbca6d8"))
+            ( 321143, uint256S("0x000000003cd8528639e51ed1541de721d8dd32c5c53a8c2ecdd5bebfaa059940"))
+            ( 327856, uint256S("0x000000002fdb5872e1c42d949dab224cb1d41a79520a1c605f737236a2e55ecf"))
         };
 
         chainTxData = ChainTxData{
-            1567534245,// * UNIX timestamp of last known number of transactions
-            109482,    // * total number of transactions between genesis and that timestamp  (transactions from gettxoutsetinfo)
+            1571439186,// * UNIX timestamp of last known number of transactions
+            123333,    // * total number of transactions between genesis and that timestamp  (transactions from gettxoutsetinfo)
                        //   (the tx=... number in the SetBestChain debug.log lines)
-            0.002      // * estimated number of transactions per second after that timestamp (109482/(1567534245-1517407200)=0.002)
+            0.002      // * estimated number of transactions per second after that timestamp (123333/(1571439186-1517407200)=0.002)
         };
     }
 };