From 274682d431773a969ce694020c8f05b04b5bac15 Mon Sep 17 00:00:00 2001
From: Daniel Larimer <dan@bitshares.org>
Date: Thu, 6 Aug 2015 14:46:56 -0400
Subject: [PATCH] fix egenesis build by removing it until theretical can fix it

---
 libraries/CMakeLists.txt                        | 2 +-
 programs/CMakeLists.txt                         | 1 -
 programs/cli_wallet/CMakeLists.txt              | 2 +-
 programs/cli_wallet/main.cpp                    | 5 ++++-
 programs/js_operation_serializer/CMakeLists.txt | 2 +-
 programs/size_checker/CMakeLists.txt            | 2 +-
 programs/witness_node/CMakeLists.txt            | 2 +-
 7 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/libraries/CMakeLists.txt b/libraries/CMakeLists.txt
index 6af806f9..76e5e7fb 100644
--- a/libraries/CMakeLists.txt
+++ b/libraries/CMakeLists.txt
@@ -2,7 +2,7 @@ add_subdirectory( fc )
 add_subdirectory( db )
 add_subdirectory( deterministic_openssl_rand )
 add_subdirectory( chain )
-add_subdirectory( egenesis )
+#add_subdirectory( egenesis )
 add_subdirectory( net )
 add_subdirectory( time )
 add_subdirectory( utilities )
diff --git a/programs/CMakeLists.txt b/programs/CMakeLists.txt
index 8e143dcc..32a80b91 100644
--- a/programs/CMakeLists.txt
+++ b/programs/CMakeLists.txt
@@ -1,5 +1,4 @@
 add_subdirectory( cli_wallet )
-add_subdirectory( cli_full_wallet )
 add_subdirectory( witness_node )
 add_subdirectory( js_operation_serializer )
 add_subdirectory( size_checker )
diff --git a/programs/cli_wallet/CMakeLists.txt b/programs/cli_wallet/CMakeLists.txt
index 140bdce3..0c5d580b 100644
--- a/programs/cli_wallet/CMakeLists.txt
+++ b/programs/cli_wallet/CMakeLists.txt
@@ -10,7 +10,7 @@ if( GPERFTOOLS_FOUND )
 endif()
 
 target_link_libraries( cli_wallet
-                       PRIVATE graphene_app graphene_net graphene_chain graphene_egenesis_brief graphene_utilities graphene_wallet fc ${CMAKE_DL_LIBS} ${PLATFORM_SPECIFIC_LIBS} )
+                       PRIVATE graphene_app graphene_net graphene_chain graphene_utilities graphene_wallet fc ${CMAKE_DL_LIBS} ${PLATFORM_SPECIFIC_LIBS} )
 
 if(MSVC)
   set_source_files_properties( main.cpp PROPERTIES COMPILE_FLAGS "/bigobj" )
diff --git a/programs/cli_wallet/main.cpp b/programs/cli_wallet/main.cpp
index 8ba9e548..46e5d491 100644
--- a/programs/cli_wallet/main.cpp
+++ b/programs/cli_wallet/main.cpp
@@ -32,7 +32,7 @@
 
 #include <graphene/app/api.hpp>
 #include <graphene/chain/protocol/protocol.hpp>
-#include <graphene/egenesis/egenesis.hpp>
+//#include <graphene/egenesis/egenesis.hpp>
 #include <graphene/utilities/key_conversion.hpp>
 #include <graphene/wallet/wallet.hpp>
 
@@ -146,8 +146,10 @@ int main( int argc, char** argv )
          }
          else
          {
+            /*
             wdata.chain_id = graphene::egenesis::get_egenesis_chain_id();
             std::cout << "Starting a new wallet with chain ID " << wdata.chain_id << " (from egenesis)\n";
+            */
          }
       }
 
@@ -169,6 +171,7 @@ int main( int argc, char** argv )
       // TODO:  Error message here
       FC_ASSERT( remote_api->login( wdata.ws_user, wdata.ws_password ) );
 
+      wdata.chain_id = remote_api->database()->get_chain_id();
       auto wapiptr = std::make_shared<wallet_api>( wdata.chain_id, remote_api );
       wapiptr->set_wallet_filename( wallet_file.generic_string() );
       wapiptr->load_wallet_file();
diff --git a/programs/js_operation_serializer/CMakeLists.txt b/programs/js_operation_serializer/CMakeLists.txt
index dad8ded2..40084608 100644
--- a/programs/js_operation_serializer/CMakeLists.txt
+++ b/programs/js_operation_serializer/CMakeLists.txt
@@ -4,7 +4,7 @@ if( UNIX AND NOT APPLE )
 endif()
 
 target_link_libraries( js_operation_serializer
-                       PRIVATE graphene_app graphene_net graphene_chain graphene_egenesis_none graphene_utilities graphene_wallet fc ${CMAKE_DL_LIBS} ${PLATFORM_SPECIFIC_LIBS} )
+                       PRIVATE graphene_app graphene_net graphene_chain graphene_utilities graphene_wallet fc ${CMAKE_DL_LIBS} ${PLATFORM_SPECIFIC_LIBS} )
 
 install( TARGETS
    js_operation_serializer
diff --git a/programs/size_checker/CMakeLists.txt b/programs/size_checker/CMakeLists.txt
index 5e0a167c..0025afc3 100644
--- a/programs/size_checker/CMakeLists.txt
+++ b/programs/size_checker/CMakeLists.txt
@@ -4,7 +4,7 @@ if( UNIX AND NOT APPLE )
 endif()
 
 target_link_libraries( size_checker
-                       PRIVATE graphene_chain graphene_egenesis_none fc ${CMAKE_DL_LIBS} ${PLATFORM_SPECIFIC_LIBS} )
+                       PRIVATE graphene_chain fc ${CMAKE_DL_LIBS} ${PLATFORM_SPECIFIC_LIBS} )
 
 install( TARGETS
    size_checker
diff --git a/programs/witness_node/CMakeLists.txt b/programs/witness_node/CMakeLists.txt
index 41bd784d..c0f6a7c1 100644
--- a/programs/witness_node/CMakeLists.txt
+++ b/programs/witness_node/CMakeLists.txt
@@ -10,7 +10,7 @@ if( GPERFTOOLS_FOUND )
 endif()
 
 target_link_libraries( witness_node
-                       PRIVATE graphene_app graphene_account_history graphene_market_history graphene_witness graphene_chain graphene_egenesis_full fc ${CMAKE_DL_LIBS} ${PLATFORM_SPECIFIC_LIBS} )
+                       PRIVATE graphene_app graphene_account_history graphene_market_history graphene_witness graphene_chain fc ${CMAKE_DL_LIBS} ${PLATFORM_SPECIFIC_LIBS} )
 
 install( TARGETS
    witness_node