diff --git a/configure.ac b/configure.ac index c54341357..bf4050ca3 100644 --- a/configure.ac +++ b/configure.ac @@ -3,9 +3,9 @@ AC_PREREQ([2.60]) define(_CLIENT_VERSION_MAJOR, 0) define(_CLIENT_VERSION_MINOR, 15) define(_CLIENT_VERSION_REVISION, 2) -define(_CLIENT_VERSION_BUILD, 1) +define(_CLIENT_VERSION_BUILD, 2) define(_CLIENT_VERSION_IS_RELEASE, true) -define(_COPYRIGHT_YEAR, 2019) +define(_COPYRIGHT_YEAR, 2024) define(_COPYRIGHT_HOLDERS,[The %s developers]) define(_COPYRIGHT_HOLDERS_SUBSTITUTION,[[FLO Core]]) AC_INIT([FLO Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[https://github.com/floblockchain/flo/issues],[flo],[https://flo.cash/]) diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml index 07ee45750..5609ba843 100644 --- a/contrib/gitian-descriptors/gitian-linux.yml +++ b/contrib/gitian-descriptors/gitian-linux.yml @@ -1,5 +1,5 @@ --- -name: "flo-linux-0.15.2.1" +name: "flo-linux-0.15.2.2" enable_cache: true suites: - "trusty" diff --git a/contrib/gitian-descriptors/gitian-osx.yml b/contrib/gitian-descriptors/gitian-osx.yml index f89008089..90b948d39 100644 --- a/contrib/gitian-descriptors/gitian-osx.yml +++ b/contrib/gitian-descriptors/gitian-osx.yml @@ -1,5 +1,5 @@ --- -name: "flo-osx-0.15.2.1" +name: "flo-osx-0.15.2.2" enable_cache: true suites: - "trusty" diff --git a/contrib/gitian-descriptors/gitian-win.yml b/contrib/gitian-descriptors/gitian-win.yml index 3e80e49e4..2b27b6d02 100644 --- a/contrib/gitian-descriptors/gitian-win.yml +++ b/contrib/gitian-descriptors/gitian-win.yml @@ -1,5 +1,5 @@ --- -name: "flo-win-0.15.2.1" +name: "flo-win-0.15.2.2" enable_cache: true suites: - "trusty" diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 35139a011..525f9c2dc 100755 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -152,6 +152,9 @@ class CMainParams : public CChainParams { vSeeds.emplace_back("flodns.oip.li", false); vSeeds.emplace_back("flodns.oip.fun", false); vSeeds.emplace_back("flodns.seednode.net", false); + vSeeds.emplace_back("flodns.openindex.dev", false); + vSeeds.emplace_back("flodns.mediciland.com", false); + vSeeds.emplace_back("flod.invertedtech.org", false); base58Prefixes[PUBKEY_ADDRESS] = std::vector(1,35); //F base58Prefixes[SCRIPT_ADDRESS] = std::vector(1,8); //4 @@ -193,6 +196,15 @@ class CMainParams : public CChainParams { {2094558, uint256S("0x946616c88286f32bfac15868456d87a86f8611e1f9b56594b81e46831ce43f81")}, {2532181, uint256S("0xcacd5149aaed1088ae1db997a741210b0525e941356104120f182f3159931c79")}, {3000000, uint256S("0x5ad3a302e3b1c681f0177411384ea03ee595a80a530c23a61f22839fae948e7f")}, + {3500000, uint256S("0x25aa1145525023f7d81f662cb2edfcc6446ab05ec467522207f1203202674401")}, + {3550000, uint256S("0xe2a58b96cb04a34a29558242e4454d0abd6304d0da25879fb3081653b3967c24")}, // Segwit Activated + {4000000, uint256S("0xe9f3d33a303037a685b86e1d58a0b91dc45ac40b8fc624eaa8c6505a982243fb")}, + {4500000, uint256S("0x2dad34911d0343bea1047ecbfad3bfec5ff0311ca9839a4bbb801c5c666455cd")}, + {5000000, uint256S("0xa5298ea99c7722ae401b831d41b8ad00f29cd7b30b1136117fb9776a31e911d6")}, + {5500000, uint256S("0x046c0090407da5788a7dd32c07573e9b2c22582c4658043c958cb6d73366907b")}, + {6000000, uint256S("0x0d73d0ab9d4efdf21e902308212cc7fe6ec4bfa1ca60eca88ffc1c3742978789")}, + {6500000, uint256S("0x3b5651bdbb3ef5077bcecf0709d1212ad623166ea4dd320df0d7e1db906e21a1")}, + {6710144, uint256S("0x727b1c4aa00b7467fedc14a5b00a534c984562e9b0762dde30b795f51685ece3")}, // 17 April 2024 } }; @@ -288,6 +300,9 @@ class CTestNetParams : public CChainParams { // nodes with support for servicebits filtering should be at the top vSeeds.emplace_back("testnet.oip.fun", false); + vSeeds.emplace_back("flodns.testnet.oip.li", false); + vSeeds.emplace_back("flodns.testnet.openindex.dev", false); + vSeeds.emplace_back("flodns.testnet.mediciland.com", false); base58Prefixes[PUBKEY_ADDRESS] = std::vector(1,115); base58Prefixes[SCRIPT_ADDRESS] = std::vector(1,198);