diff --git a/COPYING b/COPYING index a957198..49fdc61 100644 --- a/COPYING +++ b/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 diff --git a/Makefile.am b/Makefile.am index 697c716..ca84f3f 100644 --- a/Makefile.am +++ b/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. diff --git a/autogen.sh b/autogen.sh index 377d0a9..f4a10c4 100755 --- a/autogen.sh +++ b/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. diff --git a/configure.ac b/configure.ac index e5e578e..f0f5db3 100644 --- a/configure.ac +++ b/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]) diff --git a/contrib/proton-qt.pro b/contrib/reden-qt.pro similarity index 100% rename from contrib/proton-qt.pro rename to contrib/reden-qt.pro diff --git a/contrib/protond.bash-completion b/contrib/redend.bash-completion similarity index 100% rename from contrib/protond.bash-completion rename to contrib/redend.bash-completion diff --git a/qa/rpc-tests/test_framework/util.py b/qa/rpc-tests/test_framework/util.py index 4e414c3..70669f9 100644 --- a/qa/rpc-tests/test_framework/util.py +++ b/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. diff --git a/proton-docs/protocol-documentation.md b/reden-docs/protocol-documentation.md similarity index 100% rename from proton-docs/protocol-documentation.md rename to reden-docs/protocol-documentation.md diff --git a/share/qt/Info.plist.in b/share/qt/Info.plist.in index 61c0d07..3c40d50 100644 --- a/share/qt/Info.plist.in +++ b/share/qt/Info.plist.in @@ -17,7 +17,7 @@ APPL CFBundleGetInfoString - @CLIENT_VERSION_MAJOR@.@CLIENT_VERSION_MINOR@.@CLIENT_VERSION_REVISION@, Copyright © 2009-@COPYRIGHT_YEAR@ The Bitcoin Core developers, 2014-@COPYRIGHT_YEAR@ The Reden Core developers + @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 CFBundleShortVersionString @CLIENT_VERSION_MAJOR@.@CLIENT_VERSION_MINOR@.@CLIENT_VERSION_REVISION@ diff --git a/share/setup.nsi.in b/share/setup.nsi.in index df64f65..08ef31b 100644 --- a/share/setup.nsi.in +++ b/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" diff --git a/src/activemasternode.cpp b/src/activemasternode.cpp index 680e93a..5c9382d 100644 --- a/src/activemasternode.cpp +++ b/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. diff --git a/src/activemasternode.h b/src/activemasternode.h index 827b527..37ba0aa 100644 --- a/src/activemasternode.h +++ b/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. diff --git a/src/cachemap.h b/src/cachemap.h index 4a381fc..8b83c4a 100644 --- a/src/cachemap.h +++ b/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. diff --git a/src/cachemultimap.h b/src/cachemultimap.h index 827c35e..7d7e298 100644 --- a/src/cachemultimap.h +++ b/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. diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 75bad98..c0bf8cb 100644 --- a/src/chainparams.cpp +++ b/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(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 >(); - vFixedSeeds = std::vector(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")), diff --git a/src/checkpoints.cpp b/src/checkpoints.cpp index fb02024..ed253dc 100644 --- a/src/checkpoints.cpp +++ b/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. diff --git a/src/clientversion.h b/src/clientversion.h index 0327a89..05b8ec3 100644 --- a/src/clientversion.h +++ b/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. diff --git a/src/config/reden-config.h b/src/config/reden-config.h index 6e2d266..e21a00e 100644 --- a/src/config/reden-config.h +++ b/src/config/reden-config.h @@ -8,6 +8,7 @@ /* Define if building universal (internal helper macro) */ /* #undef AC_APPLE_UNIVERSAL_BUILD */ + /* Version Build */ #define CLIENT_VERSION_BUILD 1 @@ -15,13 +16,13 @@ #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. */ diff --git a/src/crypto/aes.cpp b/src/crypto/aes.cpp index f311f26..d687dfa 100644 --- a/src/crypto/aes.cpp +++ b/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. diff --git a/src/crypto/aes.h b/src/crypto/aes.h index aa47728..0fde62b 100644 --- a/src/crypto/aes.h +++ b/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. // diff --git a/src/crypto/chacha20.cpp b/src/crypto/chacha20.cpp index c60656b..8729198 100644 --- a/src/crypto/chacha20.cpp +++ b/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. diff --git a/src/crypto/chacha20.h b/src/crypto/chacha20.h index 04dd824..b1a8066 100644 --- a/src/crypto/chacha20.h +++ b/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. diff --git a/src/crypto/sha256.cpp b/src/crypto/sha256.cpp index e644b45..0a985c5 100644 --- a/src/crypto/sha256.cpp +++ b/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. diff --git a/src/crypto/sha256_sse4.cpp b/src/crypto/sha256_sse4.cpp index f410508..891100c 100644 --- a/src/crypto/sha256_sse4.cpp +++ b/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. // diff --git a/src/darksend-relay.h b/src/darksend-relay.h index c94fc52..be05596 100644 --- a/src/darksend-relay.h +++ b/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. diff --git a/src/darksend.cpp b/src/darksend.cpp index aee1833..f7477a9 100644 --- a/src/darksend.cpp +++ b/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. diff --git a/src/darksend.h b/src/darksend.h index a1b1f0f..8baffa7 100644 --- a/src/darksend.h +++ b/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. diff --git a/src/drafted/governance-classes.h b/src/drafted/governance-classes.h index c88358d..5a67a62 100644 --- a/src/drafted/governance-classes.h +++ b/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 diff --git a/src/drafted/governance-keys.cpp b/src/drafted/governance-keys.cpp index 8b9d5c9..6ab5e0c 100644 --- a/src/drafted/governance-keys.cpp +++ b/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. diff --git a/src/dsnotificationinterface.cpp b/src/dsnotificationinterface.cpp index 4defa09..8f04624 100644 --- a/src/dsnotificationinterface.cpp +++ b/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. diff --git a/src/flat-database.h b/src/flat-database.h index e621ef3..506ff83 100644 --- a/src/flat-database.h +++ b/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. diff --git a/src/governance-classes.cpp b/src/governance-classes.cpp index 24a20a7..57ecd24 100644 --- a/src/governance-classes.cpp +++ b/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. diff --git a/src/governance-classes.h b/src/governance-classes.h index 9a77bd4..ca01759 100644 --- a/src/governance-classes.h +++ b/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 diff --git a/src/governance-exceptions.h b/src/governance-exceptions.h index 9b59bbc..83a80d1 100644 --- a/src/governance-exceptions.h +++ b/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. diff --git a/src/governance-misc.h b/src/governance-misc.h index 4fa9c77..b436a02 100644 --- a/src/governance-misc.h +++ b/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. diff --git a/src/governance-object.cpp b/src/governance-object.cpp index f3271e4..446c6f0 100644 --- a/src/governance-object.cpp +++ b/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. diff --git a/src/governance-object.h b/src/governance-object.h index 3793c76..f11db6d 100644 --- a/src/governance-object.h +++ b/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. diff --git a/src/governance-vote.cpp b/src/governance-vote.cpp index 91ca892..9868e89 100644 --- a/src/governance-vote.cpp +++ b/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. diff --git a/src/governance-vote.h b/src/governance-vote.h index 13a26d2..cf8ca2e 100644 --- a/src/governance-vote.h +++ b/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. diff --git a/src/governance-votedb.cpp b/src/governance-votedb.cpp index 759849e..aba973c 100644 --- a/src/governance-votedb.cpp +++ b/src/governance-votedb.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. diff --git a/src/governance-votedb.h b/src/governance-votedb.h index 186d810..7bafdf8 100644 --- a/src/governance-votedb.h +++ b/src/governance-votedb.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. diff --git a/src/governance.cpp b/src/governance.cpp index 6210f0e..de71775 100644 --- a/src/governance.cpp +++ b/src/governance.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. diff --git a/src/governance.h b/src/governance.h index 5968f92..96e8c74 100644 --- a/src/governance.h +++ b/src/governance.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. diff --git a/src/init.cpp b/src/init.cpp index 712a971..5662918 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -1,7 +1,8 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2015 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 // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -621,8 +622,10 @@ std::string LicenseInfo() // todo: remove urls from translations on next change return FormatParagraph(strprintf(_("Copyright (C) 2009-%i The Bitcoin Core Developers"), COPYRIGHT_YEAR)) + "\n" + "\n" + - FormatParagraph(strprintf(_("Copyright (C) 2014-%i The Reden Core Developers"), COPYRIGHT_YEAR)) + "\n" + + FormatParagraph(strprintf(_("Copyright (C) 2014-%i The Proton Core Developers"), COPYRIGHT_YEAR)) + "\n" + "\n" + + FormatParagraph(strprintf(_("Copyright (C) %i The Reden Core Developers"), COPYRIGHT_YEAR)) + "\n" + + "\n" + FormatParagraph(_("This is experimental software.")) + "\n" + "\n" + FormatParagraph(_("Distributed under the MIT software license, see the accompanying file COPYING or .")) + "\n" + diff --git a/src/instantx.cpp b/src/instantx.cpp index fecbe97..00646c1 100644 --- a/src/instantx.cpp +++ b/src/instantx.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. diff --git a/src/instantx.h b/src/instantx.h index b3c8849..5f8c4cc 100644 --- a/src/instantx.h +++ b/src/instantx.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 INSTANTX_H diff --git a/src/keepass.cpp b/src/keepass.cpp index 409ac9e..0a49d40 100644 --- a/src/keepass.cpp +++ b/src/keepass.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. diff --git a/src/keepass.h b/src/keepass.h index afbe275..cd4662a 100644 --- a/src/keepass.h +++ b/src/keepass.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. diff --git a/src/main.cpp b/src/main.cpp index ca76d73..f88fdc2 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -2,7 +2,8 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2015 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 // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/main.h b/src/main.h index 3d2f9f0..5a2391e 100644 --- a/src/main.h +++ b/src/main.h @@ -1,7 +1,8 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2015 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 // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/masternode-payments.cpp b/src/masternode-payments.cpp index 3daa793..7ac89be 100644 --- a/src/masternode-payments.cpp +++ b/src/masternode-payments.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. diff --git a/src/masternode-payments.h b/src/masternode-payments.h index 02c2595..20e1c22 100644 --- a/src/masternode-payments.h +++ b/src/masternode-payments.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. diff --git a/src/masternode-sync.cpp b/src/masternode-sync.cpp index ac855b5..c310772 100644 --- a/src/masternode-sync.cpp +++ b/src/masternode-sync.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. diff --git a/src/masternode-sync.h b/src/masternode-sync.h index b858bf9..ece6595 100644 --- a/src/masternode-sync.h +++ b/src/masternode-sync.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. #ifndef MASTERNODE_SYNC_H diff --git a/src/masternode.cpp b/src/masternode.cpp index 517b9d8..875349e 100644 --- a/src/masternode.cpp +++ b/src/masternode.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. diff --git a/src/masternode.h b/src/masternode.h index bd1eccb..c4b7054 100644 --- a/src/masternode.h +++ b/src/masternode.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. diff --git a/src/masternodeconfig.h b/src/masternodeconfig.h index 97ceafd..c79298f 100644 --- a/src/masternodeconfig.h +++ b/src/masternodeconfig.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. diff --git a/src/masternodeman.cpp b/src/masternodeman.cpp index 88cb99f..825074b 100644 --- a/src/masternodeman.cpp +++ b/src/masternodeman.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. diff --git a/src/masternodeman.h b/src/masternodeman.h index 8191291..c92c091 100644 --- a/src/masternodeman.h +++ b/src/masternodeman.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. diff --git a/src/miner.cpp b/src/miner.cpp index bafeec3..e3af8f5 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -1,7 +1,8 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2015 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 // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/net.cpp b/src/net.cpp index b5f3e21..b163384 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -1,7 +1,8 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2015 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 // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/netfulfilledman.cpp b/src/netfulfilledman.cpp index 8b829ec..87cc24b 100644 --- a/src/netfulfilledman.cpp +++ b/src/netfulfilledman.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. diff --git a/src/netfulfilledman.h b/src/netfulfilledman.h index be8aab7..52feb25 100644 --- a/src/netfulfilledman.h +++ b/src/netfulfilledman.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. diff --git a/src/noui.cpp b/src/noui.cpp index f98c3f9..98e606d 100644 --- a/src/noui.cpp +++ b/src/noui.cpp @@ -1,7 +1,8 @@ // Copyright (c) 2010 Satoshi Nakamoto // Copyright (c) 2009-2014 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 // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/primitives/block.cpp b/src/primitives/block.cpp index 357260a..88e56e1 100644 --- a/src/primitives/block.cpp +++ b/src/primitives/block.cpp @@ -1,6 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2015 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. diff --git a/src/qt/addressbookpage.cpp b/src/qt/addressbookpage.cpp index e2a6a99..89252f1 100644 --- a/src/qt/addressbookpage.cpp +++ b/src/qt/addressbookpage.cpp @@ -1,6 +1,7 @@ // Copyright (c) 2011-2015 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 // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/addresstablemodel.cpp b/src/qt/addresstablemodel.cpp index 105dec9..7888908 100644 --- a/src/qt/addresstablemodel.cpp +++ b/src/qt/addresstablemodel.cpp @@ -1,6 +1,7 @@ // Copyright (c) 2011-2015 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 // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/askpassphrasedialog.cpp b/src/qt/askpassphrasedialog.cpp index 36b2d0f..1a5aaba 100644 --- a/src/qt/askpassphrasedialog.cpp +++ b/src/qt/askpassphrasedialog.cpp @@ -1,6 +1,7 @@ // Copyright (c) 2011-2015 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 // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/bitcoinaddressvalidator.cpp b/src/qt/bitcoinaddressvalidator.cpp index cc91f60..0e4f67d 100644 --- a/src/qt/bitcoinaddressvalidator.cpp +++ b/src/qt/bitcoinaddressvalidator.cpp @@ -1,6 +1,7 @@ // Copyright (c) 2011-2014 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 // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp index c0c9457..fe9aa8e 100644 --- a/src/qt/bitcoingui.cpp +++ b/src/qt/bitcoingui.cpp @@ -1,6 +1,7 @@ // Copyright (c) 2011-2015 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 // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/bitcoinunits.cpp b/src/qt/bitcoinunits.cpp index b92f558..d9d5b15 100644 --- a/src/qt/bitcoinunits.cpp +++ b/src/qt/bitcoinunits.cpp @@ -1,6 +1,7 @@ // Copyright (c) 2011-2015 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 // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/bitcoinunits.h b/src/qt/bitcoinunits.h index 25ac1c1..0d43d61 100644 --- a/src/qt/bitcoinunits.h +++ b/src/qt/bitcoinunits.h @@ -1,6 +1,7 @@ // Copyright (c) 2011-2015 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 // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/clientmodel.cpp b/src/qt/clientmodel.cpp index 85810f6..51d366e 100644 --- a/src/qt/clientmodel.cpp +++ b/src/qt/clientmodel.cpp @@ -1,6 +1,7 @@ // Copyright (c) 2011-2015 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 // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/clientmodel.h b/src/qt/clientmodel.h index 412243c..650e2e9 100644 --- a/src/qt/clientmodel.h +++ b/src/qt/clientmodel.h @@ -1,6 +1,7 @@ // Copyright (c) 2011-2015 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 // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/coincontroldialog.cpp b/src/qt/coincontroldialog.cpp index d934471..8e22d51 100644 --- a/src/qt/coincontroldialog.cpp +++ b/src/qt/coincontroldialog.cpp @@ -1,6 +1,7 @@ // Copyright (c) 2011-2015 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 // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/editaddressdialog.cpp b/src/qt/editaddressdialog.cpp index 38a044f..6fd09c7 100644 --- a/src/qt/editaddressdialog.cpp +++ b/src/qt/editaddressdialog.cpp @@ -1,6 +1,7 @@ // Copyright (c) 2011-2013 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 // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/guiconstants.h b/src/qt/guiconstants.h index f1d5afd..d557be8 100644 --- a/src/qt/guiconstants.h +++ b/src/qt/guiconstants.h @@ -1,6 +1,7 @@ // Copyright (c) 2011-2015 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 // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp index 0df8039..c31242b 100644 --- a/src/qt/guiutil.cpp +++ b/src/qt/guiutil.cpp @@ -1,6 +1,7 @@ // Copyright (c) 2011-2015 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 // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/intro.cpp b/src/qt/intro.cpp index 867d97a..afb179c 100644 --- a/src/qt/intro.cpp +++ b/src/qt/intro.cpp @@ -1,6 +1,7 @@ // Copyright (c) 2011-2015 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 // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/locale/reden_bg.ts b/src/qt/locale/reden_bg.ts index d37b800..12d7c30 100644 --- a/src/qt/locale/reden_bg.ts +++ b/src/qt/locale/reden_bg.ts @@ -4006,8 +4006,12 @@ https://www.transifex.com/projects/p/reden/ Запазени права (C) 2009-%i Bitcoin Core разработчици - Copyright (C) 2014-%i The Reden Core Developers - Запазени права (C) 2014-%i Reden Core разработчиците + Copyright (C) 2014-%i The Proton Core Developers + Запазени права (C) 2014-%i Porton Core разработчиците + + + Copyright (C) %i The Reden Core Developers + Запазени права (C) %i Reden Core разработчиците Enable the client to act as a masternode (0-1, default: %u) diff --git a/src/qt/locale/reden_de.ts b/src/qt/locale/reden_de.ts index d01832b..e49babe 100644 --- a/src/qt/locale/reden_de.ts +++ b/src/qt/locale/reden_de.ts @@ -4009,8 +4009,12 @@ Dies kann passieren, wenn einige Reden aus ihrer Wallet bereits ausgegeben wurde Copyright (C) 2009-%i Die "Bitcoin Core"-Entwickler - Copyright (C) 2014-%i The Reden Core Developers - Copyright (C) 2014-%i Die "Reden Core"-Entwickler + Copyright (C) 2014-%i The Proton Core Developers + Copyright (C) 2014-%i Die "Proton Core"-Entwickler + + + Copyright (C) %i The Reden Core Developers + Copyright (C) %i Die "Reden Core"-Entwickler Enable the client to act as a masternode (0-1, default: %u) diff --git a/src/qt/locale/reden_en.ts b/src/qt/locale/reden_en.ts index 2862a5a..eb7aea5 100644 --- a/src/qt/locale/reden_en.ts +++ b/src/qt/locale/reden_en.ts @@ -5131,8 +5131,13 @@ https://www.transifex.com/projects/p/reden/ - Copyright (C) 2014-%i The Reden Core Developers - Copyright (C) 2014-%i The Reden Core Developers + Copyright (C) 2014-%i The Proton Core Developers + Copyright (C) 2014-%i The Proton Core Developers + + + + Copyright (C) %i The Reden Core Developers + Copyright (C) %i The Reden Core Developers diff --git a/src/qt/locale/reden_es.ts b/src/qt/locale/reden_es.ts index d058a47..cc59b28 100644 --- a/src/qt/locale/reden_es.ts +++ b/src/qt/locale/reden_es.ts @@ -3801,8 +3801,12 @@ por ejemplo: alertnotify=echo %%s | mail -s "Alerta de Reden" admin@foo.com Copyright (C) 2009-%i Los Desarrolladores de Bitcoin Core - Copyright (C) 2014-%i The Reden Core Developers - Copyright (C) 2014-%i Los Desarrolladores de Reden Core + Copyright (C) 2014-%i The Proton Core Developers + Copyright (C) 2014-%i Los Desarrolladores de Proton Core + + + Copyright (C) %i The Reden Core Developers + Copyright (C) %i Los Desarrolladores de Reden Core Could not parse -rpcbind value %s as network address diff --git a/src/qt/locale/reden_fi.ts b/src/qt/locale/reden_fi.ts index 1927249..02a2700 100644 --- a/src/qt/locale/reden_fi.ts +++ b/src/qt/locale/reden_fi.ts @@ -4015,8 +4015,12 @@ Käännös päivitetty: 11.3.2017 by AjM. Copyright (C) 2009-%i Bitcoin Core Kehittäjät - Copyright (C) 2014-%i The Reden Core Developers - Copyright (C) 2014-%i Reden Core Kehittäjät + Copyright (C) 2014-%i The Proton Core Developers + Copyright (C) 2014-%i Proton Core Kehittäjät + + + Copyright (C) %i The Reden Core Developers + Copyright (C) %i Reden Core Kehittäjät Enable the client to act as a masternode (0-1, default: %u) diff --git a/src/qt/locale/reden_fr.ts b/src/qt/locale/reden_fr.ts index b0568ea..3c3e159 100644 --- a/src/qt/locale/reden_fr.ts +++ b/src/qt/locale/reden_fr.ts @@ -4006,8 +4006,12 @@ https://www.transifex.com/projects/p/reden/ Copyright (C) 2009-%i The Bitcoin Core Developers - Copyright (C) 2014-%i The Reden Core Developers - Copyright (C) 2014-%i The Reden Core Developers + Copyright (C) 2014-%i The Proton Core Developers + Copyright (C) 2014-%i The Proton Core Developers + + + Copyright (C) %i The Reden Core Developers + Copyright (C) %i The Reden Core Developers Enable the client to act as a masternode (0-1, default: %u) diff --git a/src/qt/locale/reden_ja.ts b/src/qt/locale/reden_ja.ts index 423cc80..56cafc2 100644 --- a/src/qt/locale/reden_ja.ts +++ b/src/qt/locale/reden_ja.ts @@ -2778,6 +2778,14 @@ Copyright (C) 2009-%i The Bitcoin Core Developers Copyright (C) 2009-%i Bitcoin Core 開発者 + + + Copyright (C) 2014-%i The Proton Core Developers + Copyright (C) 2014-%i Proton Core 開発者 + + + Copyright (C) %i The Reden Core Developers + Copyright (C) %i Reden Core 開発者 Could not parse -rpcbind value %s as network address diff --git a/src/qt/locale/reden_pl.ts b/src/qt/locale/reden_pl.ts index 71cc757..1f2e5ab 100644 --- a/src/qt/locale/reden_pl.ts +++ b/src/qt/locale/reden_pl.ts @@ -3799,8 +3799,12 @@ Zaleca się również aby ustawić alarm powiadomień tzw. alertnotify, aby dać Prawo autorskie (c) 2009-%i deweloperzy Bitcoin - Copyright (C) 2014-%i The Reden Core Developers - Prawa autorskie (C) 2014-%i deweloperzy Reden + Copyright (C) 2014-%i The Proton Core Developers + Prawa autorskie (C) 2014-%i deweloperzy Proton + + + Copyright (C) %i The Reden Core Developers + Prawa autorskie (C) %i deweloperzy Reden Could not parse -rpcbind value %s as network address diff --git a/src/qt/locale/reden_pt.ts b/src/qt/locale/reden_pt.ts index 344090f..a68a9dc 100644 --- a/src/qt/locale/reden_pt.ts +++ b/src/qt/locale/reden_pt.ts @@ -3696,8 +3696,12 @@ https://www.transifex.com/projects/p/reden/ Copyright (C) 2009-%i The Bitcoin Core Developers - Copyright (C) 2014-%i The Reden Core Developers - Copyright (C) 2014-%i Reden Core Developers + Copyright (C) 2014-%i The Proton Core Developers + Copyright (C) 2014-%i Proton Core Developers + + + Copyright (C) %i The Reden Core Developers + Copyright (C) %i Reden Core Developers Could not parse -rpcbind value %s as network address diff --git a/src/qt/locale/reden_ru.ts b/src/qt/locale/reden_ru.ts index c0eb1ae..5a79532 100644 --- a/src/qt/locale/reden_ru.ts +++ b/src/qt/locale/reden_ru.ts @@ -4006,8 +4006,12 @@ https://www.transifex.com/projects/p/reden/ Copyright (C) 2009-%i The Bitcoin Core Developers - Copyright (C) 2014-%i The Reden Core Developers - Copyright (C) 2014-%i The Reden Core Developers + Copyright (C) 2014-%i The Proton Core Developers + Copyright (C) 2014-%i The Proton Core Developers + + + Copyright (C) %i The Reden Core Developers + Copyright (C) %i The Reden Core Developers Enable the client to act as a masternode (0-1, default: %u) diff --git a/src/qt/locale/reden_sk.ts b/src/qt/locale/reden_sk.ts index 6666d6b..051b70f 100644 --- a/src/qt/locale/reden_sk.ts +++ b/src/qt/locale/reden_sk.ts @@ -3631,8 +3631,12 @@ https://www.transifex.com/projects/p/reden/ Autorské práva (C) 2009-%i Vývojári Bitcoin Core - Copyright (C) 2014-%i The Reden Core Developers - Autorské práva (C) 2014-%i Vývojári jadra Reden + Copyright (C) 2014-%i The Proton Core Developers + Autorské práva (C) 2014-%i Vývojári jadra Proton + + + Copyright (C) %i The Reden Core Developers + Autorské práva (C) %i Vývojári jadra Reden Enable the client to act as a masternode (0-1, default: %u) diff --git a/src/qt/locale/reden_vi.ts b/src/qt/locale/reden_vi.ts index 49de683..a7603b1 100644 --- a/src/qt/locale/reden_vi.ts +++ b/src/qt/locale/reden_vi.ts @@ -4006,8 +4006,12 @@ https://www.transifex.com/projects/p/reden/ Bản quyền (C) 2009-%i bởi Nhóm phát triển Bitcoin Core - Copyright (C) 2014-%i The Reden Core Developers - Bản quyền (C) 2014-%i bởi Nhóm phát triển Reden Core + Copyright (C) 2014-%i The Proton Core Developers + Bản quyền (C) 2014-%i bởi Nhóm phát triển Proton Core + + + Copyright (C) %i The Reden Core Developers + Bản quyền (C) %i bởi Nhóm phát triển Reden Core Enable the client to act as a masternode (0-1, default: %u) diff --git a/src/qt/locale/reden_zh_CN.ts b/src/qt/locale/reden_zh_CN.ts index 01bb701..dc6ff6b 100644 --- a/src/qt/locale/reden_zh_CN.ts +++ b/src/qt/locale/reden_zh_CN.ts @@ -3653,8 +3653,12 @@ https://www.transifex.com/projects/p/reden/ 版权(C) 2009-%i The Bitcoin Core Developers - Copyright (C) 2014-%i The Reden Core Developers - 版权 (C) 2014-%i The Reden Core Developers + Copyright (C) 2014-%i The Proton Core Developers + 版权 (C) 2014-%i The Proton Core Developers + + + Copyright (C) %i The Reden Core Developers + 版权 (C) %i The Reden Core Developers Could not parse -rpcbind value %s as network address diff --git a/src/qt/locale/reden_zh_TW.ts b/src/qt/locale/reden_zh_TW.ts index 7afec9e..853503b 100644 --- a/src/qt/locale/reden_zh_TW.ts +++ b/src/qt/locale/reden_zh_TW.ts @@ -3778,9 +3778,13 @@ https://www.transifex.com/projects/p/reden/ 版權為位元幣核心開發人員自西元 2009 至 %i 年起所有 - Copyright (C) 2014-%i The Reden Core Developers + Copyright (C) 2014-%i The Proton Core Developers 版權為達世幣核心開發人員自西元 2014 至 %i 年起所有 + + Copyright (C) %i The Reden Core Developers + 版權為達世幣核心開發人員自西元 至 %i 年起所有 + Enable the client to act as a masternode (0-1, default: %u) 啟用客戶端作為一個主節點 (0-1, 預設值: %u) diff --git a/src/qt/networkstyle.cpp b/src/qt/networkstyle.cpp index 54dd3e9..5e016ec 100644 --- a/src/qt/networkstyle.cpp +++ b/src/qt/networkstyle.cpp @@ -1,6 +1,7 @@ // Copyright (c) 2014 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 // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/networkstyle.h b/src/qt/networkstyle.h index f465953..07e5da0 100644 --- a/src/qt/networkstyle.h +++ b/src/qt/networkstyle.h @@ -1,6 +1,7 @@ // Copyright (c) 2014 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 // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/openuridialog.cpp b/src/qt/openuridialog.cpp index 3b03b0f..7e70b55 100644 --- a/src/qt/openuridialog.cpp +++ b/src/qt/openuridialog.cpp @@ -1,6 +1,7 @@ // Copyright (c) 2011-2013 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 // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp index 3556c35..fd5df2f 100644 --- a/src/qt/optionsmodel.cpp +++ b/src/qt/optionsmodel.cpp @@ -1,6 +1,7 @@ // Copyright (c) 2011-2015 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 // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/overviewpage.cpp b/src/qt/overviewpage.cpp index dcaffed..ade48c2 100644 --- a/src/qt/overviewpage.cpp +++ b/src/qt/overviewpage.cpp @@ -1,6 +1,7 @@ // Copyright (c) 2011-2015 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 // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/paymentserver.cpp b/src/qt/paymentserver.cpp index 83ecfb8..248087f 100644 --- a/src/qt/paymentserver.cpp +++ b/src/qt/paymentserver.cpp @@ -1,6 +1,7 @@ // Copyright (c) 2011-2015 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 // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/reden.cpp b/src/qt/reden.cpp index cec814d..2d84c98 100644 --- a/src/qt/reden.cpp +++ b/src/qt/reden.cpp @@ -1,6 +1,7 @@ // Copyright (c) 2011-2015 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 // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/redenstrings.cpp b/src/qt/redenstrings.cpp index e9ddf60..aeeffb0 100644 --- a/src/qt/redenstrings.cpp +++ b/src/qt/redenstrings.cpp @@ -313,7 +313,8 @@ QT_TRANSLATE_NOOP("reden-core", "Connect to KeePassHttp on port (default: QT_TRANSLATE_NOOP("reden-core", "Connect to a node to retrieve peer addresses, and disconnect"), QT_TRANSLATE_NOOP("reden-core", "Connection options:"), QT_TRANSLATE_NOOP("reden-core", "Copyright (C) 2009-%i The Bitcoin Core Developers"), -QT_TRANSLATE_NOOP("reden-core", "Copyright (C) 2014-%i The Reden Core Developers"), +QT_TRANSLATE_NOOP("reden-core", "Copyright (C) 2014-%i The Proton Core Developers"), +QT_TRANSLATE_NOOP("reden-core", "Copyright (C) %i The Reden Core Developers"), QT_TRANSLATE_NOOP("reden-core", "Corrupted block database detected"), QT_TRANSLATE_NOOP("reden-core", "Could not parse masternode.conf"), QT_TRANSLATE_NOOP("reden-core", "Debugging/Testing options:"), diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp index a9553e4..c77d72a 100644 --- a/src/qt/rpcconsole.cpp +++ b/src/qt/rpcconsole.cpp @@ -1,6 +1,7 @@ // Copyright (c) 2011-2015 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 // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp index 66c1a49..160b8d2 100644 --- a/src/qt/sendcoinsdialog.cpp +++ b/src/qt/sendcoinsdialog.cpp @@ -1,6 +1,7 @@ // Copyright (c) 2011-2015 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 // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/sendcoinsentry.cpp b/src/qt/sendcoinsentry.cpp index 5d45024..ba8de6d 100644 --- a/src/qt/sendcoinsentry.cpp +++ b/src/qt/sendcoinsentry.cpp @@ -1,6 +1,7 @@ // Copyright (c) 2011-2015 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 // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/signverifymessagedialog.cpp b/src/qt/signverifymessagedialog.cpp index 7f4b79c..25b84a1 100644 --- a/src/qt/signverifymessagedialog.cpp +++ b/src/qt/signverifymessagedialog.cpp @@ -1,6 +1,7 @@ // Copyright (c) 2011-2015 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 // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/splashscreen.cpp b/src/qt/splashscreen.cpp index 354d814..f78900a 100644 --- a/src/qt/splashscreen.cpp +++ b/src/qt/splashscreen.cpp @@ -1,6 +1,7 @@ // Copyright (c) 2011-2015 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 // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -46,7 +47,8 @@ SplashScreen::SplashScreen(Qt::WindowFlags f, const NetworkStyle *networkStyle) QString titleText = tr("Reden Core"); QString versionText = QString(tr("Version %1")).arg(QString::fromStdString(FormatFullVersion())); QString copyrightTextBtc = QChar(0xA9)+QString(" 2009-%1 ").arg(COPYRIGHT_YEAR) + QString(tr("The Bitcoin Core developers")); - QString copyrightTextReden = QChar(0xA9)+QString(" 2014-%1 ").arg(COPYRIGHT_YEAR) + QString(tr("The Reden Core developers")); + QString copyrightTextProton = QChar(0xA9)+QString(" 2014-%1 ").arg(COPYRIGHT_YEAR) + QString(tr("The Proton Core developers")); + QString copyrightTextReden = QChar(0xA9)+QString(" %1 ").arg(COPYRIGHT_YEAR) + QString(tr("The Reden Core developers")); QString titleAddText = networkStyle->getTitleAddText(); // networkstyle.cpp can't (yet) read themes, so we do it here to get the correct Splash-screen QString splashScreenPath = ":/images/" + GUIUtil::getThemeName() + "/splash"; diff --git a/src/qt/test/test_main.cpp b/src/qt/test/test_main.cpp index a6571d2..220253d 100644 --- a/src/qt/test/test_main.cpp +++ b/src/qt/test/test_main.cpp @@ -1,5 +1,6 @@ // Copyright (c) 2009-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 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/transactiondesc.cpp b/src/qt/transactiondesc.cpp index ab1aed3..77276a4 100644 --- a/src/qt/transactiondesc.cpp +++ b/src/qt/transactiondesc.cpp @@ -1,6 +1,7 @@ // Copyright (c) 2011-2015 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 // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/transactionrecord.cpp b/src/qt/transactionrecord.cpp index bfe3a50..2d8090c 100644 --- a/src/qt/transactionrecord.cpp +++ b/src/qt/transactionrecord.cpp @@ -1,6 +1,7 @@ // Copyright (c) 2011-2015 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 // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/utilitydialog.cpp b/src/qt/utilitydialog.cpp index 17420e8..537118e 100644 --- a/src/qt/utilitydialog.cpp +++ b/src/qt/utilitydialog.cpp @@ -1,6 +1,7 @@ // Copyright (c) 2011-2015 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 // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp index cb466d9..adb7b8d 100644 --- a/src/qt/walletmodel.cpp +++ b/src/qt/walletmodel.cpp @@ -1,6 +1,7 @@ // Copyright (c) 2011-2015 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 // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/reden-cli.cpp b/src/reden-cli.cpp index 2b7233b..a20c72d 100644 --- a/src/reden-cli.cpp +++ b/src/reden-cli.cpp @@ -1,7 +1,8 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2015 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 // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/redend.cpp b/src/redend.cpp index 0476226..2c67532 100644 --- a/src/redend.cpp +++ b/src/redend.cpp @@ -1,7 +1,8 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2015 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 // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/rpcblockchain.cpp b/src/rpcblockchain.cpp index bb60c15..348463a 100644 --- a/src/rpcblockchain.cpp +++ b/src/rpcblockchain.cpp @@ -1,7 +1,8 @@ // Copyright (c) 2010 Satoshi Nakamoto // Copyright (c) 2009-2015 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 // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/rpcclient.cpp b/src/rpcclient.cpp index d8bbd99..7618b64 100644 --- a/src/rpcclient.cpp +++ b/src/rpcclient.cpp @@ -1,7 +1,8 @@ // Copyright (c) 2010 Satoshi Nakamoto // Copyright (c) 2009-2015 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 // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/rpcgovernance.cpp b/src/rpcgovernance.cpp index 1534aea..8192744 100644 --- a/src/rpcgovernance.cpp +++ b/src/rpcgovernance.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. diff --git a/src/rpcmasternode.cpp b/src/rpcmasternode.cpp index 3a5a7c9..5d9dcbd 100644 --- a/src/rpcmasternode.cpp +++ b/src/rpcmasternode.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. diff --git a/src/rpcmining.cpp b/src/rpcmining.cpp index a710f9e..07354a7 100644 --- a/src/rpcmining.cpp +++ b/src/rpcmining.cpp @@ -1,7 +1,8 @@ // Copyright (c) 2010 Satoshi Nakamoto // Copyright (c) 2009-2015 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 // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/rpcmisc.cpp b/src/rpcmisc.cpp index 1b97ebc..b4a6746 100644 --- a/src/rpcmisc.cpp +++ b/src/rpcmisc.cpp @@ -1,7 +1,8 @@ // Copyright (c) 2010 Satoshi Nakamoto // Copyright (c) 2009-2015 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 // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/rpcnet.cpp b/src/rpcnet.cpp index fd24abe..8803b6b 100644 --- a/src/rpcnet.cpp +++ b/src/rpcnet.cpp @@ -1,6 +1,7 @@ // Copyright (c) 2009-2015 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 // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/rpcprotocol.cpp b/src/rpcprotocol.cpp index c63a9b6..7ddb980 100644 --- a/src/rpcprotocol.cpp +++ b/src/rpcprotocol.cpp @@ -1,7 +1,8 @@ // Copyright (c) 2010 Satoshi Nakamoto // Copyright (c) 2009-2015 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 // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/rpcrawtransaction.cpp b/src/rpcrawtransaction.cpp index 9a4a301..d52960b 100644 --- a/src/rpcrawtransaction.cpp +++ b/src/rpcrawtransaction.cpp @@ -1,7 +1,8 @@ // Copyright (c) 2010 Satoshi Nakamoto // Copyright (c) 2009-2015 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 // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/rpcserver.cpp b/src/rpcserver.cpp index dca8ede..31cfb0a 100644 --- a/src/rpcserver.cpp +++ b/src/rpcserver.cpp @@ -1,7 +1,8 @@ // Copyright (c) 2010 Satoshi Nakamoto // Copyright (c) 2009-2015 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 // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/spork.cpp b/src/spork.cpp index f53f818..6a4afcb 100644 --- a/src/spork.cpp +++ b/src/spork.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 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/spork.h b/src/spork.h index 561a2e8..ecfc3af 100644 --- a/src/spork.h +++ b/src/spork.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. diff --git a/src/test/cachemap_tests.cpp b/src/test/cachemap_tests.cpp index c0fe217..25b836c 100644 --- a/src/test/cachemap_tests.cpp +++ b/src/test/cachemap_tests.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 #include "cachemap.h" diff --git a/src/test/cachemultimap_tests.cpp b/src/test/cachemultimap_tests.cpp index aa8fa2b..0dd490d 100644 --- a/src/test/cachemultimap_tests.cpp +++ b/src/test/cachemultimap_tests.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 #include "cachemultimap.h" diff --git a/src/test/main_tests.cpp b/src/test/main_tests.cpp index 7f921a4..a29c462 100644 --- a/src/test/main_tests.cpp +++ b/src/test/main_tests.cpp @@ -1,6 +1,7 @@ // Copyright (c) 2014-2015 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying -// Copyright (c) 2014-2018 The Reden Core developers +// Copyright (c) 2014-2018 The Proton Core developers +// Copyright (c) 2018 The Reden Core developers // file COPYING or http://www.opensource.org/licenses/mit-license.php. #include "chainparams.h" diff --git a/src/test/netbase_tests.cpp b/src/test/netbase_tests.cpp index 900b464..9a7c810 100644 --- a/src/test/netbase_tests.cpp +++ b/src/test/netbase_tests.cpp @@ -1,5 +1,6 @@ // Copyright (c) 2012-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 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/ratecheck_tests.cpp b/src/test/ratecheck_tests.cpp index 37f37b4..714af5b 100644 --- a/src/test/ratecheck_tests.cpp +++ b/src/test/ratecheck_tests.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 #include "governance.h" diff --git a/src/uint256.h b/src/uint256.h index 70e113c..213043a 100644 --- a/src/uint256.h +++ b/src/uint256.h @@ -1,7 +1,8 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2015 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 // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/util.cpp b/src/util.cpp index 4d266d1..74d7b9c 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -1,7 +1,8 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2015 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 // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -630,9 +631,14 @@ void ReadConfigFile(map& mapSettingsRet, if (!streamConfig.good()){ // Create empty reden.conf if it does not excist FILE* configFile = fopen(GetConfigFile().string().c_str(), "a"); - if (configFile != NULL) - fclose(configFile); - return; // Nothing to read, so just return + if (configFile != NULL) { + AddSeedsToConfigFile(configFile); + fclose(configFile); + ReadConfigFile(mapSettingsRet, mapMultiSettingsRet); + } else { + LogPrintf("reden.conf file not found or can't be created\n"); + return; // Nothing to read, so just return + } } set setOptions; @@ -652,6 +658,26 @@ void ReadConfigFile(map& mapSettingsRet, ClearDatadirCache(); } +void AddSeedsToConfigFile(FILE* configFile) { + fprintf(configFile,"onlynet=ipv4\r\n"); + fprintf(configFile,"addnode=144.202.109.173:13058\r\n"); + fprintf(configFile,"addnode=140.143.129.82:13058\r\n"); + fprintf(configFile,"addnode=113.243.73.116:13058\r\n"); + fprintf(configFile,"addnode=45.32.226.148:13058\r\n"); + fprintf(configFile,"addnode=141.101.14.64:13058\r\n"); + fprintf(configFile,"addnode=84.55.19.210:13058\r\n"); + fprintf(configFile,"addnode=108.61.142.63:13058\r\n"); + fprintf(configFile,"addnode=8.12.22.78:13058\r\n"); + fprintf(configFile,"addnode=108.160.138.215:13058\r\n"); + fprintf(configFile,"addnode=167.99.206.101\r\n"); + fprintf(configFile,"addnode=159.65.152.125\r\n"); + fprintf(configFile,"addnode=104.236.81.19\r\n"); + fprintf(configFile,"addnode=167.88.163.202:13058\r\n"); + fprintf(configFile,"addnode=167.88.163.204:13058\r\n"); + fprintf(configFile,"addnode=35.178.15.243:13058\r\n"); + fprintf(configFile,"addnode=155.94.174.81:13058\r\n"); +} + #ifndef WIN32 boost::filesystem::path GetPidFile() { diff --git a/src/util.h b/src/util.h index 8d19560..2c0da77 100644 --- a/src/util.h +++ b/src/util.h @@ -1,7 +1,8 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2015 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 // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -154,6 +155,7 @@ boost::filesystem::path GetPidFile(); void CreatePidFile(const boost::filesystem::path &path, pid_t pid); #endif void ReadConfigFile(std::map& mapSettingsRet, std::map >& mapMultiSettingsRet); +void AddSeedsToConfigFile(FILE* configFile); #ifdef WIN32 boost::filesystem::path GetSpecialFolderPath(int nFolder, bool fCreate = true); #endif diff --git a/src/version.h b/src/version.h index a4e6ffe..21a5763 100644 --- a/src/version.h +++ b/src/version.h @@ -1,6 +1,7 @@ // Copyright (c) 2012-2014 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 // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/wallet/rpcdump.cpp b/src/wallet/rpcdump.cpp index 8e17d33..ee64662 100644 --- a/src/wallet/rpcdump.cpp +++ b/src/wallet/rpcdump.cpp @@ -1,6 +1,7 @@ // Copyright (c) 2009-2015 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 // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index b6445ed..829547c 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -1,7 +1,8 @@ // Copyright (c) 2010 Satoshi Nakamoto // Copyright (c) 2009-2015 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 // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index 4876e39..ff40cc9 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -1,7 +1,8 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2015 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 // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h index 2c3f55c..f628a09 100644 --- a/src/wallet/wallet.h +++ b/src/wallet/wallet.h @@ -1,7 +1,8 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2015 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 // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/wallet/walletdb.cpp b/src/wallet/walletdb.cpp index 782c633..cfbe6b8 100644 --- a/src/wallet/walletdb.cpp +++ b/src/wallet/walletdb.cpp @@ -1,7 +1,8 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2015 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 // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php.