diff --git a/configure.ac b/configure.ac index 2a0425dce0..a40c4a6870 100644 --- a/configure.ac +++ b/configure.ac @@ -140,7 +140,7 @@ AC_ARG_ENABLE([upnp-default], AC_ARG_ENABLE(tests, AS_HELP_STRING([--disable-tests],[do not compile tests (default is to compile)]), [use_tests=$enableval], - [use_tests=no]) + [use_tests=yes]) AC_ARG_ENABLE(gui-tests, AS_HELP_STRING([--disable-gui-tests],[do not compile GUI tests (default is to compile if GUI and tests enabled)]), @@ -150,7 +150,7 @@ AC_ARG_ENABLE(gui-tests, AC_ARG_ENABLE(bench, AS_HELP_STRING([--disable-bench],[do not compile benchmarks (default is to compile)]), [use_bench=$enableval], - [use_bench=no]) + [use_bench=yes]) AC_ARG_WITH([comparison-tool], AS_HELP_STRING([--with-comparison-tool],[path to java comparison tool (requires --enable-tests)]), diff --git a/contrib/seeds/nodes_main.txt b/contrib/seeds/nodes_main.txt index 817dd6ced4..ad46cd07a4 100644 --- a/contrib/seeds/nodes_main.txt +++ b/contrib/seeds/nodes_main.txt @@ -1,41 +1,50 @@ # List of fixed seed nodes for main network # IPv4 nodes -45.137.91.173 167.86.117.103 167.86.117.144 167.86.117.143 +45.137.91.173 +5.189.160.139 81.0.246.79 -92.60.44.21 -94.130.176.201 -119.45.242.241 -70.59.61.107 -116.203.82.109 -84.249.4.71 -125.228.69.196 -193.164.140.87 -113.118.18.149 -152.228.187.235 -94.231.253.146 -95.217.78.81 +5.189.159.220 +161.97.80.103 +45.138.55.128 +45.138.55.129 +45.138.55.130 +45.138.55.131 +45.138.55.132 +45.138.55.133 +45.138.55.134 +45.138.55.135 +116.86.146.44 118.195.208.33 -194.193.140.45 -192.230.223.13 -98.250.168.70 -58.104.47.195 -68.224.52.56 -71.184.152.225 -109.88.22.67 +119.45.242.241 +91.121.217.71 +216.39.250.91 +172.99.189.198 +50.47.255.100 + # IPv6 nodes +[2a02:c207:2041:3853::1] [2a02:c207:2056:6532::1] [2a02:c207:2056:6534::1] [2a02:c207:2056:6533::1] +[2a02:c207:2110:9257::1] [2a02:c204:2110:9258::1] -[2a10:3781:525::1] -[2a10:3781:525:1::1] -[2001:41d0:a:1ad2::5:1] -[2001:b011:7005:ab05:987e:30b4:53c:21b] +[2a02:c207:2110:9259::1] +[2a10:3781:525:1::210] +[2a10:3781:525:1::201] +[2a10:3781:525:6::10] +[2a10:3781:525:6::11] +[2602:fec3:2:10::9:91] +[2001:41d0:303:6855::501] +[2604:86c0:f201:6::10:91] +[2a01:5a8:302:f394:5870:53f7:cb1f:9cfb] +[2a01:5a8:302:f394:8cd0:93fc:9953:3223] +[2a01:5a8:302:f394:5d2:e182:3f6:b054] + # Onion nodes vtrlmv3zqqqnfwfy.onion diff --git a/contrib/seeds/nodes_test.txt b/contrib/seeds/nodes_test.txt index f55a82f4ef..8772f2a792 100644 --- a/contrib/seeds/nodes_test.txt +++ b/contrib/seeds/nodes_test.txt @@ -4,8 +4,33 @@ 167.86.117.103 167.86.117.144 167.86.117.143 +45.137.91.173 +45.137.91.173 +5.189.160.139 +81.0.246.79 +5.189.159.220 +161.97.80.103 +45.138.55.128 +45.138.55.129 +45.138.55.130 +45.138.55.131 +45.138.55.132 +45.138.55.133 +45.138.55.134 +45.138.55.135 # IPv6 nodes -2a02:c207:2056:6532::1 -2a02:c207:2056:6534::1 -2a02:c207:2056:6533::1 +[2a02:c207:2041:3853::1] +[2a02:c207:2056:6532::1] +[2a02:c207:2056:6534::1] +[2a02:c207:2056:6533::1] +[2a02:c207:2110:9257::1] +[2a02:c204:2110:9258::1] +[2a02:c207:2110:9259::1] +[2a10:3781:525:1::210] +[2a10:3781:525:1::201] +[2a10:3781:525:6::10] +[2a10:3781:525:6::11] + +# Onion nodes +vtrlmv3zqqqnfwfy.onion \ No newline at end of file diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 39fd015bbb..30df2166f6 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -117,7 +117,7 @@ class CMainParams : public CChainParams { consensus.nCoinbaseMaturity = 500; // The best chain should have at least this much work. - consensus.nMinimumChainWork = uint256S("0x0000000000000000000000000000000000000000000003d0c8be7da303f59236"); + consensus.nMinimumChainWork = uint256S("0x000000000000000000000000000000000000000000000416ebe78f593ec11fb2"); // block 4791500 /** * The message start string is designed to be unlikely to occur in normal data. @@ -220,7 +220,7 @@ class CTestNetParams : public CChainParams { nDefaultPort = 25714; // The best chain should have at least this much work. - consensus.nMinimumChainWork = uint256S("0x00000000000000000000000000000000000000000000003aaf405e01eda716e7"); + consensus.nMinimumChainWork = uint256S("0x0000000000000000000000000000000000000000000000478d1e3e759bd0f7e2"); // block 1720482 nPruneAfterHeight = 1000; @@ -229,7 +229,6 @@ class CTestNetParams : public CChainParams { assert(consensus.hashGenesisBlock == uint256S("0x0000724595fb3b9609d441cbfb9577615c292abf07d996d3edabc48de843642d")); assert(genesis.hashMerkleRoot == uint256S("0x12630d16a97f24b287c8c2594dda5fb98c9e6c70fc61d44191931ea2aa08dc90")); - vFixedSeeds.clear(); vSeeds.clear(); base58Prefixes[PUBKEY_ADDRESS] = std::vector(1,111); @@ -297,7 +296,7 @@ class CRegTestParams : public CChainParams { consensus.nProtocolV1RetargetingFixedTime = 1395631999; consensus.nProtocolV2Time = 1407053625; consensus.nProtocolV3Time = 1444028400; - consensus.nProtocolV3_1Time = 4102437600; + consensus.nProtocolV3_1Time = 1713938400; consensus.nLastPOWBlock = 1000; consensus.nStakeTimestampMask = 0xf; consensus.nCoinbaseMaturity = 10; diff --git a/src/chainparamsseeds.h b/src/chainparamsseeds.h index 292bd49bfb..48f0bba5e6 100644 --- a/src/chainparamsseeds.h +++ b/src/chainparamsseeds.h @@ -8,39 +8,46 @@ * IPv4 as well as onion addresses are wrapped inside a IPv6 address accordingly. */ static SeedSpec6 pnSeed6_main[] = { - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x89,0x5b,0xad}, 15714}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xa7,0x56,0x75,0x67}, 15714}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xa7,0x56,0x75,0x90}, 15714}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xa7,0x56,0x75,0x8f}, 15714}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x89,0x5b,0xad}, 15714}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x05,0xbd,0xa0,0x8b}, 15714}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x51,0x00,0xf6,0x4f}, 15714}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5c,0x3c,0x2c,0x15}, 15714}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5e,0x82,0xb0,0xc9}, 15714}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x77,0x2d,0xf2,0xf1}, 15714}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x46,0x3b,0x3d,0x6b}, 15714}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x74,0xcb,0x52,0x6d}, 15714}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x54,0xf9,0x04,0x47}, 15714}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x7d,0xe4,0x45,0xc4}, 15714}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc1,0xa4,0x8c,0x57}, 15714}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x71,0x76,0x12,0x95}, 15714}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x98,0xe4,0xbb,0xeb}, 15714}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5e,0xe7,0xfd,0x92}, 15714}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5f,0xd9,0x4e,0x51}, 15714}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x05,0xbd,0x9f,0xdc}, 15714}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xa1,0x61,0x50,0x67}, 15714}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x8a,0x37,0x80}, 15714}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x8a,0x37,0x81}, 15714}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x8a,0x37,0x82}, 15714}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x8a,0x37,0x83}, 15714}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x8a,0x37,0x84}, 15714}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x8a,0x37,0x85}, 15714}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x8a,0x37,0x86}, 15714}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x8a,0x37,0x87}, 15714}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x74,0x56,0x92,0x2c}, 15714}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x76,0xc3,0xd0,0x21}, 15714}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc2,0xc1,0x8c,0x2d}, 15714}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc0,0xe6,0xdf,0x0d}, 15714}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x62,0xfa,0xa8,0x46}, 15714}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x3a,0x68,0x2f,0xc3}, 15714}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x44,0xe0,0x34,0x38}, 15714}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x47,0xb8,0x98,0xe1}, 15714}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6d,0x58,0x16,0x43}, 15714}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x77,0x2d,0xf2,0xf1}, 15714}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5b,0x79,0xd9,0x47}, 15714}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd8,0x27,0xfa,0x5b}, 15714}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xac,0x63,0xbd,0xc6}, 15714}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x32,0x2f,0xff,0x64}, 15714}, + {{0x2a,0x02,0xc2,0x07,0x20,0x41,0x38,0x53,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 15714}, {{0x2a,0x02,0xc2,0x07,0x20,0x56,0x65,0x32,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 15714}, {{0x2a,0x02,0xc2,0x07,0x20,0x56,0x65,0x34,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 15714}, {{0x2a,0x02,0xc2,0x07,0x20,0x56,0x65,0x33,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 15714}, + {{0x2a,0x02,0xc2,0x07,0x21,0x10,0x92,0x57,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 15714}, {{0x2a,0x02,0xc2,0x04,0x21,0x10,0x92,0x58,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 15714}, - {{0x2a,0x10,0x37,0x81,0x05,0x25,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 15714}, - {{0x2a,0x10,0x37,0x81,0x05,0x25,0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 15714}, - {{0x20,0x01,0x41,0xd0,0x00,0x0a,0x1a,0xd2,0x00,0x00,0x00,0x00,0x00,0x05,0x00,0x01}, 15714}, - {{0x20,0x01,0xb0,0x11,0x70,0x05,0xab,0x05,0x98,0x7e,0x30,0xb4,0x05,0x3c,0x02,0x1b}, 15714}, + {{0x2a,0x02,0xc2,0x07,0x21,0x10,0x92,0x59,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 15714}, + {{0x2a,0x10,0x37,0x81,0x05,0x25,0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x10}, 15714}, + {{0x2a,0x10,0x37,0x81,0x05,0x25,0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x01}, 15714}, + {{0x2a,0x10,0x37,0x81,0x05,0x25,0x00,0x06,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x10}, 15714}, + {{0x2a,0x10,0x37,0x81,0x05,0x25,0x00,0x06,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x11}, 15714}, + {{0x26,0x02,0xfe,0xc3,0x00,0x02,0x00,0x10,0x00,0x00,0x00,0x00,0x00,0x09,0x00,0x91}, 15714}, + {{0x20,0x01,0x41,0xd0,0x03,0x03,0x68,0x55,0x00,0x00,0x00,0x00,0x00,0x00,0x05,0x01}, 15714}, + {{0x26,0x04,0x86,0xc0,0xf2,0x01,0x00,0x06,0x00,0x00,0x00,0x00,0x00,0x10,0x00,0x91}, 15714}, + {{0x2a,0x01,0x05,0xa8,0x03,0x02,0xf3,0x94,0x58,0x70,0x53,0xf7,0xcb,0x1f,0x9c,0xfb}, 15714}, + {{0x2a,0x01,0x05,0xa8,0x03,0x02,0xf3,0x94,0x8c,0xd0,0x93,0xfc,0x99,0x53,0x32,0x23}, 15714}, + {{0x2a,0x01,0x05,0xa8,0x03,0x02,0xf3,0x94,0x05,0xd2,0xe1,0x82,0x03,0xf6,0xb0,0x54}, 15714}, {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xac,0xe2,0xb6,0x57,0x79,0x84,0x20,0xd2,0xd8,0xb8}, 15714} }; @@ -48,8 +55,31 @@ static SeedSpec6 pnSeed6_test[] = { {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xa7,0x56,0x75,0x67}, 25714}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xa7,0x56,0x75,0x90}, 25714}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xa7,0x56,0x75,0x8f}, 25714}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x89,0x5b,0xad}, 25714}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x89,0x5b,0xad}, 25714}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x05,0xbd,0xa0,0x8b}, 25714}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x51,0x00,0xf6,0x4f}, 25714}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x05,0xbd,0x9f,0xdc}, 25714}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xa1,0x61,0x50,0x67}, 25714}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x8a,0x37,0x80}, 25714}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x8a,0x37,0x81}, 25714}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x8a,0x37,0x82}, 25714}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x8a,0x37,0x83}, 25714}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x8a,0x37,0x84}, 25714}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x8a,0x37,0x85}, 25714}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x8a,0x37,0x86}, 25714}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x8a,0x37,0x87}, 25714}, + {{0x2a,0x02,0xc2,0x07,0x20,0x41,0x38,0x53,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 25714}, {{0x2a,0x02,0xc2,0x07,0x20,0x56,0x65,0x32,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 25714}, {{0x2a,0x02,0xc2,0x07,0x20,0x56,0x65,0x34,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 25714}, - {{0x2a,0x02,0xc2,0x07,0x20,0x56,0x65,0x33,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 25714} + {{0x2a,0x02,0xc2,0x07,0x20,0x56,0x65,0x33,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 25714}, + {{0x2a,0x02,0xc2,0x07,0x21,0x10,0x92,0x57,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 25714}, + {{0x2a,0x02,0xc2,0x04,0x21,0x10,0x92,0x58,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 25714}, + {{0x2a,0x02,0xc2,0x07,0x21,0x10,0x92,0x59,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 25714}, + {{0x2a,0x10,0x37,0x81,0x05,0x25,0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x10}, 25714}, + {{0x2a,0x10,0x37,0x81,0x05,0x25,0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x01}, 25714}, + {{0x2a,0x10,0x37,0x81,0x05,0x25,0x00,0x06,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x10}, 25714}, + {{0x2a,0x10,0x37,0x81,0x05,0x25,0x00,0x06,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x11}, 25714}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xac,0xe2,0xb6,0x57,0x79,0x84,0x20,0xd2,0xd8,0xb8}, 25714} }; #endif // BITCOIN_CHAINPARAMSSEEDS_H \ No newline at end of file