From 4d8033443c6b17d085a995b6db97aeb2652ff191 Mon Sep 17 00:00:00 2001
From: theoreticalbts <theoreticalbts@users.noreply.github.com>
Date: Fri, 7 Aug 2015 12:46:30 -0400
Subject: [PATCH] application.cpp:  Use egenesis instead of
 create_example_genesis()

---
 libraries/app/CMakeLists.txt      |  6 +++++-
 libraries/app/application.cpp     | 10 +++++++++-
 libraries/egenesis/CMakeLists.txt |  2 +-
 programs/witness_node/main.cpp    |  1 +
 4 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/libraries/app/CMakeLists.txt b/libraries/app/CMakeLists.txt
index 3af4054c..6a2531a1 100644
--- a/libraries/app/CMakeLists.txt
+++ b/libraries/app/CMakeLists.txt
@@ -1,15 +1,19 @@
 file(GLOB HEADERS "include/graphene/app/*.hpp")
+file(GLOB EGENESIS_HEADERS "../egenesis/include/graphene/app/*.hpp")
 
 add_library( graphene_app 
              api.cpp
              application.cpp
              impacted.cpp
              plugin.cpp
+             ${HEADERS}
+             ${EGENESIS_HEADERS}
            )
 
 target_link_libraries( graphene_app graphene_market_history graphene_chain fc graphene_db graphene_net graphene_time graphene_utilities )
 target_include_directories( graphene_app
-                            PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include" )
+                            PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include"
+                            "${CMAKE_CURRENT_SOURCE_DIR}/../egenesis/include" )
 
 if(MSVC)
   set_source_files_properties( application.cpp api.cpp PROPERTIES COMPILE_FLAGS "/bigobj" )
diff --git a/libraries/app/application.cpp b/libraries/app/application.cpp
index 4d627a93..3bb8ad68 100644
--- a/libraries/app/application.cpp
+++ b/libraries/app/application.cpp
@@ -23,6 +23,8 @@
 #include <graphene/chain/protocol/fee_schedule.hpp>
 #include <graphene/chain/protocol/types.hpp>
 
+#include <graphene/egenesis/egenesis.hpp>
+
 #include <graphene/net/core_messages.hpp>
 
 #include <graphene/time/time.hpp>
@@ -226,7 +228,13 @@ namespace detail {
                return fc::json::from_file(_options->at("genesis-json").as<boost::filesystem::path>())
                      .as<genesis_state_type>();
             else
-               return create_example_genesis();
+            {
+               std::string egenesis_json;
+               graphene::egenesis::compute_egenesis_json( egenesis_json );
+               FC_ASSERT( egenesis_json != "" );
+               FC_ASSERT( graphene::egenesis::get_egenesis_json_hash() == fc::sha256::hash( egenesis_json ) );
+               return fc::json::from_string( egenesis_json ).as<genesis_state_type>();
+            }
          };
 
          if( _options->count("resync-blockchain") )
diff --git a/libraries/egenesis/CMakeLists.txt b/libraries/egenesis/CMakeLists.txt
index 357d3599..99b1f1d6 100644
--- a/libraries/egenesis/CMakeLists.txt
+++ b/libraries/egenesis/CMakeLists.txt
@@ -12,7 +12,7 @@ add_executable( embed_genesis
    embed_genesis.cpp
    )
 
-target_link_libraries( embed_genesis graphene_chain graphene_egenesis_none graphene_app fc )
+target_link_libraries( embed_genesis graphene_chain graphene_app graphene_egenesis_none fc )
 
 set( embed_genesis_args
    -t "${CMAKE_CURRENT_SOURCE_DIR}/egenesis_brief.cpp.tmpl---${CMAKE_CURRENT_BINARY_DIR}/egenesis_brief.cpp"
diff --git a/programs/witness_node/main.cpp b/programs/witness_node/main.cpp
index 65bba032..d3dc7455 100644
--- a/programs/witness_node/main.cpp
+++ b/programs/witness_node/main.cpp
@@ -163,6 +163,7 @@ int main(int argc, char** argv) {
 #endif
 
       ilog("Started witness node on a chain with ${h} blocks.", ("h", node.chain_database()->head_block_num()));
+      ilog("Chain ID is ${id}", ("id", node.chain_database()->get_chain_id()) );
 
       int signal = exit_promise->wait();
       ilog("Exiting from signal ${n}", ("n", signal));