Merge pull request #249 from graft-project/fix/mainnet-network-id

fixed mainnet network id

README.md

@@ -1,6 +1,6 @@
 # Graft Network
 
-Copyright (c) 2018, The Graft Project
+Copyright (c) 2019, The Graft Project
 
 ## Monero Fork (Monero version 0.11.1.0)
 
@@ -73,7 +73,7 @@ Dates are provided in the format YYYY-MM-DD.
 | 2018-09-17        | v10               | 1.4.4                | 1.4.5                    | Block reward halved       |
 | 2018-10-31        | v11               | 1.5.0                | 1.5.1                    | PoW algorithm from Monero v8 (CN v2), enabled checkpoints for mainnet  |
 | 2019-03-07        | v12               | 1.6.0                | 1.6.0                    | Own PoW algorithm - CryptoNight V8 ReverseWaltz - tweaked from CryptoNight Monero v8 (CN v2)  |
-| 2019-03-18        | v13               | 1.7.0                | 1.7.0                    | RTA Mining  |
+| 2019-03-18        | v13               | 1.7.1                | 1.7.1                    | RTA Mining  |
 
 ## Installing Graft Network from a Package
 

src/cryptonote_config.h

@@ -158,7 +158,7 @@ namespace config
   uint16_t const P2P_DEFAULT_PORT = 18980;
   uint16_t const RPC_DEFAULT_PORT = 18981;
   boost::uuids::uuid const NETWORK_ID = { {
-        0x54 ,0x68, 0x65, 0x20, 0x41, 0x72 , 0x74, 0x20, 0x6F, 0x76, 0x20, 0x57, 0x61, 0x72, 0x20, 0x35
+        0x54 ,0x68, 0x65, 0x20, 0x41, 0x72 , 0x74, 0x20, 0x6F, 0x66, 0x20, 0x57, 0x61, 0x72, 0x20, 0x35
     } }; // Bender's nightmare
   //std::string const GENESIS_TX = "013c01ff0001ffffffffffff03029b2e4c0281c0b02e7c53291a94d1d0cbff8883f8024f5142ee494ffbbd08807121017767aafcde9be00dcfd098715ebcf7f410daebc582fda69d24a28e9d0bc890d1";
   // https://monero.stackexchange.com/questions/2886/how-can-i-create-a-new-monero-genesis-block?rq=1

src/cryptonote_core/blockchain.cpp

@@ -117,8 +117,8 @@ static const struct {
   { 11, 207700, 0, 1541005200 },
   // hf 12 - Graft CryptoNight Reverse Waltz PoW, ~2019-03-07T05:00:00+00
   { 12, 299200, 0, 1551934800 },
-  // hf 13 - RTA transactions, RTA mining, ~2019-03-18T16:00:00+00
-  { 13, 307080, 0, 1552924800 }
+  // hf 13 - RTA transactions, RTA mining, ~2019-03-20T14:00:00+00
+  { 13, 308460, 0, 1553090400 }
 };
 // static const uint64_t mainnet_hard_fork_version_1_till = 1009826;
 static const uint64_t mainnet_hard_fork_version_1_till = 1;

src/daemon/main.cpp

@@ -173,8 +173,6 @@ int main(int argc, char const * argv[])
     bf::path relative_path_base = data_dir;
 
     const std::string config = command_line::get_arg(vm, daemon_args::arg_config_file);
-    if(!config.empty())
-      MDEBUG("Config file: '" << config << "'" << std::endl);
 
     boost::filesystem::path data_dir_path(data_dir);
     boost::filesystem::path config_path(config);
@@ -234,6 +232,10 @@ int main(int argc, char const * argv[])
       mlog_set_log(command_line::get_arg(vm, daemon_args::arg_log_level).c_str());
     }
 
+    if(!config.empty())
+      MTRACE("Config file: '" << config << "'" << std::endl);
+
+
     // after logs initialized
     tools::create_directories_if_necessary(data_dir.string());
 

src/version.h.in

@@ -1,4 +1,4 @@
 #define GRAFT_VERSION_TAG "@VERSIONTAG@"
-#define GRAFT_VERSION "1.7.0"
+#define GRAFT_VERSION "1.7.1"
 #define GRAFT_RELEASE_NAME "Delta Velorum"
 #define GRAFT_VERSION_FULL GRAFT_VERSION "-" GRAFT_VERSION_TAG