Merge pull request #19 from NicholasAdmin/tri_1.0_seeds

Tri 1.0 seeds

COPYING

@@ -2,7 +2,8 @@ The MIT License (MIT)
 
 Copyright (c) 2009-2016 The Bitcoin Core developers
 Copyright (c) 2014-2017 The Dash Core developers
-Copyright (c) 2017-2018 The Reden Core developers
+Copyright (c) 2017-2018 The Proton Core developers
+Copyright (c) 2018 The Reden Core developers
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

Makefile.am

@@ -1,5 +1,6 @@
 # Copyright (c) 2013-2016 The Bitcoin Core developers
-# Copyright (c) 2017-2018 The Reden Core developers
+# Copyright (c) 2017-2018 The Proton Core developers
+# Copyright (c) 2018 The Reden Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 

autogen.sh

@@ -1,6 +1,7 @@
 #!/bin/sh
 # Copyright (c) 2013-2016 The Bitcoin Core developers
-# Copyright (c) 2017-2018 The Reden Core developers
+# Copyright (c) 2017-2018 The Proton Core developers
+# Copyright (c) 2018 The Reden Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 

configure.ac

@@ -1,14 +1,14 @@
 dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
 AC_PREREQ([2.60])
-define(_CLIENT_VERSION_MAJOR, 2)
+define(_CLIENT_VERSION_MAJOR, 1)
 define(_CLIENT_VERSION_MINOR, 0)
-define(_CLIENT_VERSION_REVISION, 0)
+define(_CLIENT_VERSION_REVISION, 2)
 define(_CLIENT_VERSION_BUILD, 1)
 define(_CLIENT_VERSION_IS_RELEASE, true)
 define(_COPYRIGHT_YEAR, 2018)
 define(_COPYRIGHT_HOLDERS,[The %s developers])
 define(_COPYRIGHT_HOLDERS_SUBSTITUTION,[[Reden Core]])
-AC_INIT([Reden Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[https://github.com/redencoin/redencoin/issues],[redencore])
+AC_INIT([Reden Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[https://github.com/NicholasAdmin/Reden/issues],[redencore])
 AC_CONFIG_SRCDIR([src/main.cpp])
 AC_CONFIG_HEADERS([src/config/reden-config.h])
 AC_CONFIG_AUX_DIR([build-aux])

qa/rpc-tests/test_framework/util.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2014-2015 The Bitcoin Core developers
-# Copyright (c) 2014-2018 The Reden Core developers
+# Copyright (c) 2014-2018 The Proton Core developers
+# Copyright (c) 2018 The Reden Core developers
 # Distributed under the MIT/X11 software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 

share/qt/Info.plist.in

@@ -17,7 +17,7 @@
   <string>APPL</string>
 
   <key>CFBundleGetInfoString</key>
-  <string>@CLIENT_VERSION_MAJOR@.@CLIENT_VERSION_MINOR@.@CLIENT_VERSION_REVISION@, Copyright © 2009-@COPYRIGHT_YEAR@ The Bitcoin Core developers, 2014-@COPYRIGHT_YEAR@ The Reden Core developers</string>
+  <string>@CLIENT_VERSION_MAJOR@.@CLIENT_VERSION_MINOR@.@CLIENT_VERSION_REVISION@, Copyright © 2009-@COPYRIGHT_YEAR@ The Bitcoin Core developers, 2014-@COPYRIGHT_YEAR@ The Proton Core developers, @COPYRIGHT_YEAR@ The Reden Core developers</string>
 
   <key>CFBundleShortVersionString</key>
   <string>@CLIENT_VERSION_MAJOR@.@CLIENT_VERSION_MINOR@.@CLIENT_VERSION_REVISION@</string>

share/setup.nsi.in

@@ -7,7 +7,7 @@ SetCompressor /SOLID lzma
 !define REGKEY "SOFTWARE\$(^Name)"
 !define VERSION @CLIENT_VERSION_MAJOR@.@CLIENT_VERSION_MINOR@.@CLIENT_VERSION_REVISION@
 !define COMPANY "Reden Core project"
-!define URL https://redencoin.io/
+!define URL https://reden.io/
 
 # MUI Symbol Definitions
 !define MUI_ICON "@abs_top_srcdir@/share/pixmaps/bitcoin.ico"

src/activemasternode.cpp

@@ -1,4 +1,5 @@
-// Copyright (c) 2014-2018 The Reden Core developers
+// Copyright (c) 2014-2018 The Proton Core developers
+// Copyright (c) 2018 The Reden Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 

src/activemasternode.h

@@ -1,4 +1,5 @@
-// Copyright (c) 2014-2018 The Reden Core developers
+// Copyright (c) 2014-2018 The Proton Core developers
+// Copyright (c) 2018 The Reden Core developers
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 

src/cachemap.h

@@ -1,4 +1,5 @@
-// Copyright (c) 2014-2018 The Reden Core developers
+// Copyright (c) 2014-2018 The Proton Core developers
+// Copyright (c) 2018 The Reden Core developers
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 

src/cachemultimap.h

@@ -1,4 +1,5 @@
-// Copyright (c) 2014-2018 The Reden Core developers
+// Copyright (c) 2014-2018 The Proton Core developers
+// Copyright (c) 2018 The Reden Core developers
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 

src/chainparams.cpp

@@ -162,24 +162,10 @@ class CMainParams : public CChainParams {
                 }
                 std::cout << std::string("Finished calculating Mainnet Genesis Block:\n");
      */   
-	assert(consensus.hashGenesisBlock == uint256S("00000a8144601b679fc258d5aba342076e89e81573676eda958f75ff0a0a8561"));
+        assert(consensus.hashGenesisBlock == uint256S("00000a8144601b679fc258d5aba342076e89e81573676eda958f75ff0a0a8561"));
         assert(genesis.hashMerkleRoot == uint256S("b45ba0de34d2c0f9440de4f7bbbda79989a0d41757f5e145aab55cf386d15e80"));
-
-	//genesis = CreateGenesisBlock(1504653953, 0, 0x1d00ffff, 1, 50 * COIN);
-	//genesis = CreateGenesisBlock(1523513141, 25449000, 0x1e00ffff, 4, 50 * COIN);
-	//consensus.hashGenesisBlock = genesis.GetHash();
-        //printf("%s\n", consensus.hashGenesisBlock.ToString().c_str());
-        //printf("%s\n", genesis.hashMerkleRoot.ToString().c_str());
-        //assert(consensus.hashGenesisBlock == uint256S("a51381143c954ecdd9584989a01b37e673867a11309f592dbe6fc2ab92a160f2"));
-        //assert(genesis.hashMerkleRoot == uint256S("a71192f5fff635cd240db0f34a5662de6ba73787f96d6bf29e527b2f79272737"));
-        //vSeeds.push_back(CDNSSeedData("redencoin1", "seed1.redencoin.info"));
-        //vSeeds.push_back(CDNSSeedData("redencoin2", "seed2.redencoin.info"));
-        //vSeeds.push_back(CDNSSeedData("redencoin3", "seed3.redencoin.info"));
-        vSeeds.push_back(CDNSSeedData("beardseed2", "redenseed2.bunkens.be"));
-        vSeeds.push_back(CDNSSeedData("beardseed1", "redenseed1.bunkens.be"));
-
-	//vSeeds.clear();
-	//vFixedSeeds.clear();
+        vSeeds.push_back(CDNSSeedData("beardseed2", "dnsseeder1.bunkens.be"));
+        vSeeds.push_back(CDNSSeedData("beardseed1", "dnsseeder2.bunkens.be"));
         // Reden addresses start with 'R'
         base58Prefixes[PUBKEY_ADDRESS] = std::vector<unsigned char>(1,60);
         // Reden script addresses start with '7'
@@ -193,9 +179,7 @@ class CMainParams : public CChainParams {
         // Reden BIP44 coin type is '5'
         base58Prefixes[EXT_COIN_TYPE]  = boost::assign::list_of(0x80)(0x00)(0x00)(0x05).convert_to_container<std::vector<unsigned char> >();
 
-        vFixedSeeds = std::vector<SeedSpec6>(pnSeed6_main, pnSeed6_main + ARRAYLEN(pnSeed6_main));
-
-        fMiningRequiresPeers = false;
+        fMiningRequiresPeers = true;
         fDefaultConsistencyChecks = false;
         fRequireStandard = true;
         fMineBlocksOnDemand = false;
@@ -206,20 +190,6 @@ class CMainParams : public CChainParams {
         strSporkPubKey = "04d9491a6cf40a2afaf51de3939eadca259a95843b637f82c772a5719bc64051409031803a1c33f1f9b14c24a2d6937fe5b76ffa99a9730aa27726f9934cabf7f4";
         strMasternodePaymentsPubKey = "041fda8a1eff0a55d4d5c2d10f426e9c204d8faa228e3bbbaccd716a0db59bbfbe15dc17975f41e554ad551316b97586ddf5bec909a9fc3fc36c17a9611294fcf8";
 
-        /*checkpointData = (CCheckpointData) {
-            boost::assign::map_list_of
-            (    0, uint256S("0x00000e1728b630fd83aecbc51546c7915fffb7d3c897b5fd8c4b14043070b7f0"))
-            ( 1000, uint256S("0x00000040520462647ef6997ab360d95af29e5288d8bc393643357f8ff433c366"))
-            ( 1900, uint256S("0x000000000071b6d0803cd72115d51445bc1703ed5b4cfcd18e6c7bc3fa72c167"))
-            ( 1938, uint256S("0x0000000009cc1f28c974798e6222442be48a61a8f23a1497d4cdada1c38a76c4"))
-            ( 2261, uint256S("0x00000000016d36f27c5a082407e5fbbf27760f769202165fc9ca2303db8f8da3"))
-            ( 2500, uint256S("0x000000001d9c136b34055b16c604e81cc516cedcf0d6e02358178c1096f71271"))
-            ( 8800, uint256S("0x0000000002241f4c3a10353ec625b642490dfff01734fcebbdeb733778e58635")),
-            1521392251, // * UNIX timestamp of last checkpoint block
-            10020,      // * total number of transactions between genesis and last checkpoint
-                        //   (the tx=... number in the SetBestChain debug.log lines)
-            2800        // * estimated number of transactions per day after checkpoint
-        };*/
         checkpointData = (CCheckpointData) {
             boost::assign::map_list_of
             ( 0, uint256S("00000a8144601b679fc258d5aba342076e89e81573676eda958f75ff0a0a8561")),

src/checkpoints.cpp

@@ -1,5 +1,6 @@
 // Copyright (c) 2009-2014 The Bitcoin developers
-// Copyright (c) 2014-2018 The Reden Core developers
+// Copyright (c) 2014-2018 The Proton Core developers
+// Copyright (c) 2018 The Reden Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 

src/clientversion.h

@@ -14,9 +14,9 @@
  */
 
 //! These need to be macros, as clientversion.cpp's and reden*-res.rc's voodoo requires it
-#define CLIENT_VERSION_MAJOR 2
+#define CLIENT_VERSION_MAJOR 1
 #define CLIENT_VERSION_MINOR 0
-#define CLIENT_VERSION_REVISION 0
+#define CLIENT_VERSION_REVISION 2
 #define CLIENT_VERSION_BUILD 1
 
 //! Set to true for release, false for prerelease or test build
@@ -38,7 +38,7 @@
 #define DO_STRINGIZE(X) #X
 
 //! Copyright string used in Windows .rc files
-#define COPYRIGHT_STR "2009-" STRINGIZE(COPYRIGHT_YEAR) " The Bitcoin Core Developers, 2017-" STRINGIZE(COPYRIGHT_YEAR) " The Reden Core Developers"
+#define COPYRIGHT_STR "2009-" STRINGIZE(COPYRIGHT_YEAR) " The Bitcoin Core Developers, 2017-" STRINGIZE(COPYRIGHT_YEAR) " The Proton Core Developers, " STRINGIZE(COPYRIGHT_YEAR) " The Reden Core Developers"
 
 /**
  * redend-res.rc includes this file, but it cannot cope with real c++ code.

src/config/reden-config.h

@@ -8,20 +8,21 @@
 /* Define if building universal (internal helper macro) */
 /* #undef AC_APPLE_UNIVERSAL_BUILD */
 
+
 /* Version Build */
 #define CLIENT_VERSION_BUILD 1
 
 /* Version is release */
 #define CLIENT_VERSION_IS_RELEASE true
 
 /* Major version */
-#define CLIENT_VERSION_MAJOR 2
+#define CLIENT_VERSION_MAJOR 1
 
 /* Minor version */
 #define CLIENT_VERSION_MINOR 0
 
 /* Build revision */
-#define CLIENT_VERSION_REVISION 0
+#define CLIENT_VERSION_REVISION 2
 
 /* Copyright holder(s) before %s replacement */
 #define COPYRIGHT_HOLDERS "The %s developers"
@@ -350,13 +351,13 @@
 #define LT_OBJDIR ".libs/"
 
 /* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "https://github.com/redencoin/redencoin/issues"
+#define PACKAGE_BUGREPORT "https://github.com/NicholasAdmin/Reden/issues"
 
 /* Define to the full name of this package. */
 #define PACKAGE_NAME "Reden Core"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "Reden Core 2.0.0"
+#define PACKAGE_STRING "Reden Core 1.0.2"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "redencore"
@@ -365,7 +366,7 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "2.0.0"
+#define PACKAGE_VERSION "1.0.2"
 
 /* Define to necessary symbol if this constant uses a non-standard name on
    your system. */

src/crypto/aes.cpp

@@ -1,5 +1,6 @@
 // Copyright (c) 2016 The Bitcoin Core developers
-// Copyright (c) 2017-2018 The Reden Core developers
+// Copyright (c) 2017-2018 The Proton Core developers
+// Copyright (c) 2018 The Reden Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 

src/crypto/aes.h

@@ -1,5 +1,6 @@
 // Copyright (c) 2015-2016 The Bitcoin Core developers
-// Copyright (c) 2017-2018 The Reden Core developers
+// Copyright (c) 2017-2018 The Proton Core developers
+// Copyright (c) 2018 The Reden Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 //

src/crypto/chacha20.cpp

@@ -1,5 +1,6 @@
 // Copyright (c) 2017 The Bitcoin Core developers
-// Copyright (c) 2017-2018 The Reden Core developers
+// Copyright (c) 2017-2018 The Proton Core developers
+// Copyright (c) 2018 The Reden Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 

src/crypto/chacha20.h

@@ -1,5 +1,6 @@
 // Copyright (c) 2017 The Bitcoin Core developers
-// Copyright (c) 2017-2018 The Reden Core developers
+// Copyright (c) 2017-2018 The Proton Core developers
+// Copyright (c) 2018 The Reden Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 

src/crypto/sha256.cpp

@@ -1,5 +1,6 @@
 // Copyright (c) 2014 The Bitcoin Core developers
-// Copyright (c) 2017-2018 The Reden Core developers
+// Copyright (c) 2017-2018 The Proton Core developers
+// Copyright (c) 2018 The Reden Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 

src/crypto/sha256_sse4.cpp

@@ -1,5 +1,6 @@
 // Copyright (c) 2017 The Bitcoin Core developers
-// Copyright (c) 2017-2018 The Reden Core developers
+// Copyright (c) 2017-2018 The Proton Core developers
+// Copyright (c) 2018 The Reden Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 //

src/darksend-relay.h

@@ -1,5 +1,6 @@
 
-// Copyright (c) 2014-2018 The Reden Core developers
+// Copyright (c) 2014-2018 The Proton Core developers
+// Copyright (c) 2018 The Reden Core developers
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 

src/darksend.cpp

@@ -1,4 +1,5 @@
-// Copyright (c) 2014-2018 The Reden Core developers
+// Copyright (c) 2014-2018 The Proton Core developers
+// Copyright (c) 2018 The Reden Core developers
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 

src/darksend.h

@@ -1,4 +1,5 @@
-// Copyright (c) 2014-2018 The Reden Core developers
+// Copyright (c) 2014-2018 The Proton Core developers
+// Copyright (c) 2018 The Reden Core developers
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 

src/drafted/governance-classes.h

@@ -1,4 +1,5 @@
-// Copyright (c) 2014-2018 The Reden Core developers
+// Copyright (c) 2014-2018 The Proton Core developers
+// Copyright (c) 2018 The Reden Core developers
 
 /*
  * FIELDS AND CLASSIFICATION

src/drafted/governance-keys.cpp

@@ -1,5 +1,6 @@
 
-// // Copyright (c) 2014-2018 The Reden Core developers
+// // Copyright (c) 2014-2018 The Proton Core developers
+// Copyright (c) 2018 The Reden Core developers
 // // Distributed under the MIT/X11 software license, see the accompanying
 // // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 

src/dsnotificationinterface.cpp

@@ -1,4 +1,5 @@
-// Copyright (c) 2014-2018 The Reden Core developers
+// Copyright (c) 2014-2018 The Proton Core developers
+// Copyright (c) 2018 The Reden Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 

src/flat-database.h

@@ -1,4 +1,5 @@
-// Copyright (c) 2014-2018 The Reden Core developers
+// Copyright (c) 2014-2018 The Proton Core developers
+// Copyright (c) 2018 The Reden Core developers
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 

src/governance-classes.cpp

@@ -1,5 +1,6 @@
 // Copyright (c) 2014-2017 The Dash Core developers
-// Copyright (c) 2017-2018 The Reden Core developers
+// Copyright (c) 2017-2018 The Proton Core developers
+// Copyright (c) 2018 The Reden Core developers
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 

src/governance-classes.h

@@ -1,4 +1,5 @@
-// Copyright (c) 2014-2018 The Reden Core developers
+// Copyright (c) 2014-2018 The Proton Core developers
+// Copyright (c) 2018 The Reden Core developers
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 #ifndef GOVERNANCE_CLASSES_H

src/governance-exceptions.h

@@ -1,5 +1,6 @@
 // Copyright (c) 2014-2017 The Dash Core developers
-// Copyright (c) 2017-2018 The Reden Core developers
+// Copyright (c) 2017-2018 The Proton Core developers
+// Copyright (c) 2018 The Reden Core developers
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 

src/governance-misc.h

@@ -1,4 +1,5 @@
-// Copyright (c) 2014-2018 The Reden Core developers
+// Copyright (c) 2014-2018 The Proton Core developers
+// Copyright (c) 2018 The Reden Core developers
 
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.

src/governance-object.cpp

@@ -1,5 +1,6 @@
 // Copyright (c) 2014-2017 The Dash Core developers
-// Copyright (c) 2017-2018 The Reden Core developers
+// Copyright (c) 2017-2018 The Proton Core developers
+// Copyright (c) 2018 The Reden Core developers
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 

src/governance-object.h

@@ -1,4 +1,5 @@
-// Copyright (c) 2014-2018 The Reden Core developers
+// Copyright (c) 2014-2018 The Proton Core developers
+// Copyright (c) 2018 The Reden Core developers
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 

src/governance-vote.cpp

@@ -1,5 +1,6 @@
 // Copyright (c) 2014-2017 The Dash Core developers
-// Copyright (c) 2017-2018 The Reden Core developers
+// Copyright (c) 2017-2018 The Proton Core developers
+// Copyright (c) 2018 The Reden Core developers
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 

src/governance-vote.h

@@ -1,4 +1,5 @@
-// Copyright (c) 2014-2018 The Reden Core developers
+// Copyright (c) 2014-2018 The Proton Core developers
+// Copyright (c) 2018 The Reden Core developers
 
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.