Put network id in database and abort if verification fails

nanocurrency · Aug 30, 2018 · 7fc2e4a · 7fc2e4a
1 parent 3385473
commit 7fc2e4a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/rai/lib/utility.cpp b/rai/lib/utility.cpp
@@ -9,5 +9,5 @@ void release_assert_internal (bool check, const char * check_expr, const char *
 	}
 
 	std::cerr << "Assertion (" << check_expr << ") failed " << file << ":" << line << std::endl;
-	abort();
+	abort ();
 }
diff --git a/rai/node/node.cpp b/rai/node/node.cpp
@@ -1855,13 +1855,19 @@ stats (config.stat_config)
 		{
 			BOOST_LOG (log) << "Constructing node";
 		}
+		rai::genesis genesis;
 		rai::transaction transaction (store.environment, true);
 		if (store.latest_begin (transaction) == store.latest_end ())
 		{
 			// Store was empty meaning we just created it, add the genesis block
-			rai::genesis genesis;
 			store.initialize (transaction, genesis);
 		}
+		if (!store.block_exists (transaction, genesis.hash ()))
+		{
+			BOOST_LOG (log) << "Genesis block not found. Make sure the node network ID is correct.";
+			std::exit (1);
+		}
+
 		node_id = rai::keypair (store.get_node_id (transaction));
 		BOOST_LOG (log) << "Node ID: " << node_id.pub.to_account ();
 	}