Merge pull request #18 from LIMXTEC/DEV_1

Dev 1

Author: limxdev

configure.ac

@@ -3,7 +3,7 @@ AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 1)
 define(_CLIENT_VERSION_MINOR, 9)
 define(_CLIENT_VERSION_REVISION, 9)
-define(_CLIENT_VERSION_BUILD, 1)
+define(_CLIENT_VERSION_BUILD, 2)
 define(_CLIENT_VERSION_IS_RELEASE, true)
 define(_COPYRIGHT_YEAR, 2020)
 define(_COPYRIGHT_HOLDERS,[The %s developers])

src/crypto/mega-mec.h

@@ -33,7 +33,7 @@ extern "C" {
 #include <crypto/sph_sha2.h>
 //#include <crypto/sph_tiger.h>
 }
-#include <crypto/lyra2.h>
+//#include <crypto/lyra2.h>
 
 #define HASH_FUNC_BASE_TIMESTAMP_1 1370079299 // Megacoin Block 1
 #define HASH_FUNC_COUNT_1 8
@@ -346,4 +346,4 @@ inline uint256 Mega_Mec(const T1 pbegin, const T1 pend,uint32_t timestamp)
 return ArithToUint256(hash[22].trim256());
 }
 
-#endif // MEGACOIN_CRYPTO_MEGA_MEC_H
+#endif // MEGACOIN_CRYPTO_MEGA_MEC_H

src/governance-object.h

@@ -25,8 +25,8 @@ class CGovernanceObject;
 class CGovernanceVote;
 
 static const int MAX_GOVERNANCE_OBJECT_DATA_SIZE = 16 * 1024;
-static const int MIN_GOVERNANCE_PEER_PROTO_VERSION = 70206;
-static const int GOVERNANCE_FILTER_PROTO_VERSION = 70206;
+static const int MIN_GOVERNANCE_PEER_PROTO_VERSION = 70006;
+static const int GOVERNANCE_FILTER_PROTO_VERSION = 70006;
 
 static const double GOVERNANCE_FILTER_FP_RATE = 0.001;
 

src/masternodeconfig.cpp

@@ -29,12 +29,19 @@ bool CMasternodeConfig::read(std::string& strErr) {
     if (!streamConfig2.good()) {
         FILE* configFile = fopen(pathConfigFile.string().c_str(), "a");
         if (configFile != NULL) {
-                        std::string strHeader = "# Megacoin config file v 1.0\n"
+                        std::string strHeader = "# Megacoin config file v 1.1\n"
                         "# Network Nodes\n"
                         "addnode=37.120.186.85\n"
                         "addnode=37.120.190.76\n"
                         "addnode=185.194.140.60\n"
                         "addnode=185.194.142.125\n"
+                        "addnode=115.159.124.86\n"
+                        "addnode=120.243.237.236\n"
+                        "addnode=120.79.91.232\n"
+                        "addnode=125.94.91.54\n"
+                        "addnode=178.200.230.252\n"
+                        "addnode=185.194.142.125\n"
+                        "addnode=188.42.33.124\n"
                         "# Masternode preparation (optional) - Note - You have to remove #\n"
                         "#masternodeaddr=1.2.3.4:7951\n"
                         "#externalip=1.2.3.4:7951\n"
@@ -45,7 +52,7 @@ bool CMasternodeConfig::read(std::string& strErr) {
                         "#rpcpassword=mystrongpassword\n"
                         "#rpcport=7952\n"
                         "# Miscellaneous #\n"
-                        "nodebuglogfile=0\n"
+                        "#nodebuglogfile=1\n"
                         "daemon=1\n"
                         "listen=1\n"
                         "logtimestamps=1\n"

src/rpc/mining.cpp

@@ -566,13 +566,13 @@ static UniValue getblocktemplate(const JSONRPCRequest& request)
     if (sporkManager.IsSporkActive(SPORK_8_MASTERNODE_PAYMENT_ENFORCEMENT)
         && !masternodeSync.IsWinnersListSynced()
         && !mnpayments.GetBlockPayee(chainActive.Height() + 1, payee))
-            throw JSONRPCError(RPC_CLIENT_IN_INITIAL_DOWNLOAD, "Dash Core is downloading masternode winners...");
+            throw JSONRPCError(RPC_CLIENT_IN_INITIAL_DOWNLOAD, "Megacoin Core is downloading masternode winners...");
 
     // next bock is a superblock and we need governance info to correctly construct it
     if (sporkManager.IsSporkActive(SPORK_9_SUPERBLOCKS_ENABLED)
         && !masternodeSync.IsSynced()
         && CSuperblock::IsValidBlockHeight(chainActive.Height() + 1))
-            throw JSONRPCError(RPC_CLIENT_IN_INITIAL_DOWNLOAD, "Dash Core is syncing with network...");
+            throw JSONRPCError(RPC_CLIENT_IN_INITIAL_DOWNLOAD, "Megacoin Core is syncing with network...");
     //
 
     static unsigned int nTransactionsUpdatedLast;

src/wallet/wallet.h

@@ -152,11 +152,13 @@ struct CompactTallyItem
 };
 //
 
-//! Default for -addresstype
-constexpr OutputType DEFAULT_ADDRESS_TYPE{OutputType::P2SH_SEGWIT};
+//! Default for -addresstype legacy
+//constexpr OutputType DEFAULT_ADDRESS_TYPE{OutputType::P2SH_SEGWIT};
+constexpr OutputType DEFAULT_ADDRESS_TYPE{OutputType::LEGACY};
 
 //! Default for -changetype
-constexpr OutputType DEFAULT_CHANGE_TYPE{OutputType::CHANGE_AUTO};
+//constexpr OutputType DEFAULT_CHANGE_TYPE{OutputType::CHANGE_AUTO};
+constexpr OutputType DEFAULT_CHANGE_TYPE{OutputType::LEGACY};
 
 enum WalletFlags : uint64_t {
     // wallet flags in the upper section (> 1 << 31) will lead to not opening the wallet if flag is unknown