From c17f4182d6d78aef1f11c87bdbf463cd060f0990 Mon Sep 17 00:00:00 2001 From: BlackcoinDev Date: Mon, 3 Jul 2023 14:08:26 +0200 Subject: [PATCH] build: bump version to v13.2.1 --- COPYING | 2 +- configure.ac | 4 +-- contrib/seeds/nodes_main.txt | 49 ++++++++++++++++++------------------ src/chainparams.cpp | 15 +++++------ src/chainparamsseeds.h | 43 ++++++++++++++++--------------- src/clientversion.h | 4 +-- 6 files changed, 58 insertions(+), 59 deletions(-) diff --git a/COPYING b/COPYING index 8c163889ed..77edf9e1c1 100644 --- a/COPYING +++ b/COPYING @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2018-2022 The Blackcoin More developers +Copyright (c) 2018-2023 The Blackcoin More developers Copyright (c) 2014-2018 The BlackCoin Developers Copyright (c) 2013-2014 The NovaCoin Developers Copyright (c) 2011-2013 The PPCoin Developers diff --git a/configure.ac b/configure.ac index baa905cffb..0ced046c02 100644 --- a/configure.ac +++ b/configure.ac @@ -1,9 +1,9 @@ AC_PREREQ([2.69]) define(_CLIENT_VERSION_MAJOR, 13) define(_CLIENT_VERSION_MINOR, 2) -define(_CLIENT_VERSION_BUILD, 0) +define(_CLIENT_VERSION_BUILD, 1) define(_CLIENT_VERSION_IS_RELEASE, true) -define(_COPYRIGHT_YEAR, 2022) +define(_COPYRIGHT_YEAR, 2023) define(_COPYRIGHT_HOLDERS,[The %s developers]) define(_COPYRIGHT_HOLDERS_SUBSTITUTION,[[Blackcoin More]]) AC_INIT([Blackcoin More],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_BUILD],[https://gitlab.com/blackcoin/blackcoin-more],[blackcoin-more]) diff --git a/contrib/seeds/nodes_main.txt b/contrib/seeds/nodes_main.txt index f6cb7e3223..817dd6ced4 100644 --- a/contrib/seeds/nodes_main.txt +++ b/contrib/seeds/nodes_main.txt @@ -5,38 +5,37 @@ 167.86.117.103 167.86.117.144 167.86.117.143 -157.90.223.151:9015 -162.55.92.62:9015 +81.0.246.79 92.60.44.21 -50.35.92.251 -199.241.187.130 -152.228.187.235 -207.242.216.3 94.130.176.201 -161.97.80.103 -95.217.78.81 -81.69.250.50 119.45.242.241 +70.59.61.107 116.203.82.109 -188.126.6.32 -69.173.197.127 -213.114.228.96 -71.214.132.6 -98.110.219.103 -92.60.44.21 -72.39.89.111 -89.142.65.211 -81.162.114.25 -173.249.22.241 -99.254.91.2 -124.170.37.74 +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 +118.195.208.33 +194.193.140.45 +192.230.223.13 +98.250.168.70 58.104.47.195 -124.170.37.74 +68.224.52.56 +71.184.152.225 +109.88.22.67 # IPv6 nodes -2a02:c207:2056:6532::1 -2a02:c207:2056:6534::1 -2a02:c207:2056:6533::1 +[2a02:c207:2056:6532::1] +[2a02:c207:2056:6534::1] +[2a02:c207:2056:6533::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] # Onion nodes vtrlmv3zqqqnfwfy.onion diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 277af87933..fe427d05da 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("0x00000000000000000000000000000000000000000000038844f1764349c166d5"); + consensus.nMinimumChainWork = uint256S("0x0000000000000000000000000000000000000000000003d0c8be7da303f59236"); /** * The message start string is designed to be unlikely to occur in normal data. @@ -138,7 +138,7 @@ class CMainParams : public CChainParams { vSeeds.push_back(CDNSSeedData("dnsseed.blackcoin.nl", "dnsseed.blackcoin.nl")); //hosted at dns.blackcoin.nl vSeeds.push_back(CDNSSeedData("dnsseed2.blackcoin.nl", "dnsseed2.blackcoin.nl")); //hosted at vps.blackcoin.nl - vSeeds.push_back(CDNSSeedData("ghost.blackcoin.nl", "ghost.blackcoin.nl")); // Michel van Kessel static node + vSeeds.push_back(CDNSSeedData("swap.blackcoin.nl", "swap.blackcoin.nl")); // swapservice static node vSeeds.push_back(CDNSSeedData("node.blackcoin.nl ", "node.blackcoin.nl")); // payBLK static node base58Prefixes[PUBKEY_ADDRESS] = std::vector(1,25); @@ -164,7 +164,7 @@ class CMainParams : public CChainParams { (254348, uint256S("0x9bf8d9bd757d3ef23d5906d70567e5f0da93f1e0376588c8d421a95e2421838b")) // minor network split (319002, uint256S("0x0011494d03b2cdf1ecfc8b0818f1e0ef7ee1d9e9b3d1279c10d35456bc3899ef")) // hardfork (872456, uint256S("0xe4fd321ced1de06213d2e246b150b4bfd8c4aa0989965dce88f2a58668c64860")) // hardfork - (4232630, uint256S("0xae0c2a9bd13746e2887ca57bf1046b3c787a5ed1068fd1633a3575f08ee291fc")), + (4232630, uint256S("0xae0c2a9bd13746e2887ca57bf1046b3c787a5ed1068fd1633a3575f08ee291fc")), // start devfund 1668631296, // * UNIX timestamp of last checkpoint block 13562393, // * total number of transactions between genesis and last checkpoint // (the tx=... number in the SetBestChain debug.log lines) @@ -220,7 +220,7 @@ class CTestNetParams : public CChainParams { nDefaultPort = 25714; // The best chain should have at least this much work. - consensus.nMinimumChainWork = uint256S("0x0000000000000000000000000000000000000000000000302f630a91c2ec0230"); + consensus.nMinimumChainWork = uint256S("0x00000000000000000000000000000000000000000000003aaf405e01eda716e7"); nPruneAfterHeight = 1000; @@ -249,9 +249,10 @@ class CTestNetParams : public CChainParams { checkpointData = (CCheckpointData) { boost::assign::map_list_of - ( 90235, uint256S("0x567898e79184dc2f7dc3a661f794f28566e4b856d70180914f7371b1b3cc82d8")), - 1549558800, - 179080, + ( 90235, uint256S("0x567898e79184dc2f7dc3a661f794f28566e4b856d70180914f7371b1b3cc82d8")) //initial snapshot + (1415393, uint256S("0x9583676625157dc0405bbd48b9220157eeabb7d9460fa234d31b49ea7014de2f")), //start devfund + 1685643568, + 70100, 2.0 }; diff --git a/src/chainparamsseeds.h b/src/chainparamsseeds.h index 92206966af..292bd49bfb 100644 --- a/src/chainparamsseeds.h +++ b/src/chainparamsseeds.h @@ -12,36 +12,35 @@ static SeedSpec6 pnSeed6_main[] = { {{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,0x9d,0x5a,0xdf,0x97}, 9015}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xa2,0x37,0x5c,0x3e}, 9015}, + {{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,0x32,0x23,0x5c,0xfb}, 15714}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc7,0xf1,0xbb,0x82}, 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,0xcf,0xf2,0xd8,0x03}, 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,0xa1,0x61,0x50,0x67}, 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,0x51,0x45,0xfa,0x32}, 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,0xbc,0x7e,0x06,0x20}, 15714}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x45,0xad,0xc5,0x7f}, 15714}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd5,0x72,0xe4,0x60}, 15714}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x47,0xd6,0x84,0x06}, 15714}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x62,0x6e,0xdb,0x67}, 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,0x48,0x27,0x59,0x6f}, 15714}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x59,0x8e,0x41,0xd3}, 15714}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x51,0xa2,0x72,0x19}, 15714}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xad,0xf9,0x16,0xf1}, 15714}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x63,0xfe,0x5b,0x02}, 15714}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x7c,0xaa,0x25,0x4a}, 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,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,0x7c,0xaa,0x25,0x4a}, 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}, {{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,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}, {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xac,0xe2,0xb6,0x57,0x79,0x84,0x20,0xd2,0xd8,0xb8}, 15714} }; diff --git a/src/clientversion.h b/src/clientversion.h index ebefdf9fa7..73fb246e91 100644 --- a/src/clientversion.h +++ b/src/clientversion.h @@ -16,7 +16,7 @@ //! These need to be macros, as clientversion.cpp's and bitcoin*-res.rc's voodoo requires it #define CLIENT_VERSION_MAJOR 13 #define CLIENT_VERSION_MINOR 2 -#define CLIENT_VERSION_BUILD 0 +#define CLIENT_VERSION_BUILD 1 //! Set to true for release, false for prerelease or test build #define CLIENT_VERSION_IS_RELEASE true @@ -25,7 +25,7 @@ * Copyright year (2009-this) * Todo: update this when changing our copyright comments in the source */ -#define COPYRIGHT_YEAR 2022 +#define COPYRIGHT_YEAR 2023 #endif //HAVE_CONFIG_H