Merge pull request #62 from evoskuil/master

Use bc stdio and fstream i/o wrappers, missing nuget deps.

Author: evoskuil

builds/msvc/vs2013/bitcoin-server/bitcoin-server.props

@@ -15,8 +15,10 @@
       <DisableSpecificWarnings>4290;%(DisableSpecificWarnings)</DisableSpecificWarnings>
       <EnablePREfast>false</EnablePREfast>
       <PreprocessorDefinitions>_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(DebugOrRelease)' == 'Release'">BITCOIN_DISABLE_ASSERTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
+    <Link Condition="$(Configuration.IndexOf('Debug')) != -1">
+      <AdditionalOptions>/OPT:NOLBR /IGNORE:4099 %(AdditionalOptions)</AdditionalOptions>
+    </Link>    
   </ItemDefinitionGroup>
 
   <!-- Dependencies -->

builds/msvc/vs2013/bitcoin-server/bitcoin-server.vcxproj

@@ -116,6 +116,7 @@
     <Import Project="..\..\..\..\..\..\nuget\boost.1.56.0.0\build\native\boost.targets" Condition="Exists('..\..\..\..\..\..\nuget\boost.1.56.0.0\build\native\boost.targets')" />
     <Import Project="..\..\..\..\..\..\nuget\boost_date_time-vc120.1.56.0.0\build\native\boost_date_time-vc120.targets" Condition="Exists('..\..\..\..\..\..\nuget\boost_date_time-vc120.1.56.0.0\build\native\boost_date_time-vc120.targets')" />
     <Import Project="..\..\..\..\..\..\nuget\boost_filesystem-vc120.1.56.0.0\build\native\boost_filesystem-vc120.targets" Condition="Exists('..\..\..\..\..\..\nuget\boost_filesystem-vc120.1.56.0.0\build\native\boost_filesystem-vc120.targets')" />
+    <Import Project="..\..\..\..\..\..\nuget\boost_locale-vc120.1.56.0.0\build\native\boost_locale-vc120.targets" Condition="Exists('..\..\..\..\..\..\nuget\boost_locale-vc120.1.56.0.0\build\native\boost_locale-vc120.targets')" />
     <Import Project="..\..\..\..\..\..\nuget\boost_program_options-vc120.1.56.0.0\build\native\boost_program_options-vc120.targets" Condition="Exists('..\..\..\..\..\..\nuget\boost_program_options-vc120.1.56.0.0\build\native\boost_program_options-vc120.targets')" />
     <Import Project="..\..\..\..\..\..\nuget\boost_regex-vc120.1.56.0.0\build\native\boost_regex-vc120.targets" Condition="Exists('..\..\..\..\..\..\nuget\boost_regex-vc120.1.56.0.0\build\native\boost_regex-vc120.targets')" />
     <Import Project="..\..\..\..\..\..\nuget\boost_system-vc120.1.56.0.0\build\native\boost_system-vc120.targets" Condition="Exists('..\..\..\..\..\..\nuget\boost_system-vc120.1.56.0.0\build\native\boost_system-vc120.targets')" />
@@ -133,6 +134,7 @@
     <Error Condition="!Exists('..\..\..\..\..\..\nuget\boost.1.56.0.0\build\native\boost.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\nuget\boost.1.56.0.0\build\native\boost.targets'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\nuget\boost_date_time-vc120.1.56.0.0\build\native\boost_date_time-vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\nuget\boost_date_time-vc120.1.56.0.0\build\native\boost_date_time-vc120.targets'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\nuget\boost_filesystem-vc120.1.56.0.0\build\native\boost_filesystem-vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\nuget\boost_filesystem-vc120.1.56.0.0\build\native\boost_filesystem-vc120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\nuget\boost_locale-vc120.1.56.0.0\build\native\boost_locale-vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\nuget\boost_locale-vc120.1.56.0.0\build\native\boost_locale-vc120.targets'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\nuget\boost_program_options-vc120.1.56.0.0\build\native\boost_program_options-vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\nuget\boost_program_options-vc120.1.56.0.0\build\native\boost_program_options-vc120.targets'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\nuget\boost_regex-vc120.1.56.0.0\build\native\boost_regex-vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\nuget\boost_regex-vc120.1.56.0.0\build\native\boost_regex-vc120.targets'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\nuget\boost_system-vc120.1.56.0.0\build\native\boost_system-vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\nuget\boost_system-vc120.1.56.0.0\build\native\boost_system-vc120.targets'))" />

builds/msvc/vs2013/bitcoin-server/packages.config

@@ -3,6 +3,7 @@
   <package id="boost" version="1.56.0.0" targetFramework="Native" />
   <package id="boost_date_time-vc120" version="1.56.0.0" targetFramework="Native" />
   <package id="boost_filesystem-vc120" version="1.56.0.0" targetFramework="Native" />
+  <package id="boost_locale-vc120" version="1.56.0.0" targetFramework="Native" />
   <package id="boost_program_options-vc120" version="1.56.0.0" targetFramework="Native" />
   <package id="boost_regex-vc120" version="1.56.0.0" targetFramework="Native" />
   <package id="boost_system-vc120" version="1.56.0.0" targetFramework="Native" />

builds/msvc/vs2013/libbitcoin-blockchain.import.props

@@ -16,7 +16,6 @@
   <ItemDefinitionGroup>
     <ClCompile>
       <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\..\libbitcoin-blockchain\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="$(Configuration.IndexOf('Release')) != -1">BITCOIN_DISABLE_ASSERTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(Linkage-libbitcoin-blockchain)' == 'static' Or '$(Linkage-libbitcoin-blockchain)' == 'ltcg'">BCB_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>      
     </ClCompile>
     <Link>

builds/msvc/vs2013/libbitcoin-consensus.import.props

@@ -17,7 +17,7 @@
     <ClCompile>
       <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\..\libbitcoin-consensus\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Option-secp256k1)' == 'true'">USE_SECP256K1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Linkage-libbitcoin-consensus)' == 'static' Or '$(Linkage-libbitcoin-consensus)' == 'ltcg'">BCX_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Linkage-libbitcoin-consensus)' == 'static' Or '$(Linkage-libbitcoin-consensus)' == 'ltcg'">BCK_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <!-- $(PlatformToolset) is hard wired to v120 to allow for linkage by PlatformToolset=CTP_Nov2013 callers. -->

src/config.cpp

@@ -19,7 +19,6 @@
  */
 #include "config.hpp"
 
-#include <iostream>
 #include <string>
 #include <boost/filesystem.hpp>
 #include <boost/program_options.hpp>
@@ -79,11 +78,10 @@ static bool load_configuration_variables(variables_map& variables,
     error_code code;
     if (!config_path.empty() && exists(config_path, code))
     {
-        const auto& path = config_path.generic_string();
-        std::ifstream file(path);
+        bc::ifstream file(config_path.string());
         if (!file.good())
         {
-            BOOST_THROW_EXCEPTION(reading_file(path.c_str()));
+            BOOST_THROW_EXCEPTION(reading_file(config_path.string().c_str()));
         }
 
         const auto config = parse_config_file(file, config_settings);

src/echo.cpp

@@ -17,9 +17,11 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-#include <iostream>
 #include "echo.hpp"
 
+#include <iostream>
+#include <bitcoin/bitcoin.hpp>
+
 namespace libbitcoin {
 namespace server {
 
@@ -32,7 +34,7 @@ stdout_wrapper::stdout_wrapper(stdout_wrapper&& other)
 }
 stdout_wrapper::~stdout_wrapper()
 {
-    std::cout << stream_.str() << std::endl;
+    bc::cout << stream_.str() << std::endl;
 }
 
 stdout_wrapper echo()

src/main.cpp

@@ -1,4 +1,4 @@
-/*
+/**
  * Copyright (c) 2011-2015 libbitcoin developers (see AUTHORS)
  *
  * This file is part of libbitcoin-server.
@@ -17,16 +17,20 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-#include <iostream>
 #include <bitcoin/bitcoin.hpp>
 #include "server.hpp"
 
+BC_USE_LIBBITCOIN_MAIN
+
 /**
- * Server entry point.
+ * Invoke this program with the raw arguments provided on the command line.
+ * All console input and output streams for the application originate here.
+ * @param argc  The number of elements in the argv array.
+ * @param argv  The array of arguments, including the process.
+ * @return      The numeric result to return via console exit.
  */
-int main(int argc, char* argv[])
+int bc::main(int argc, char* argv[])
 {
-    // I/O injection.
     return bc::server::dispatch(argc, const_cast<const char**>(argv),
-        std::cin, std::cout, std::cerr);
+        bc::cin, bc::cout, bc::cerr);
 }

src/node_impl.cpp

@@ -39,6 +39,9 @@ using std::placeholders::_4;
 
 const time_duration retry_start_duration = seconds(30);
 
+constexpr std::ofstream::openmode log_open_mode = 
+    std::ofstream::out | std::ofstream::app;
+
 static std::string make_log_string(log_level level,
     const std::string& domain, const std::string& body, bool log_requests)
 {
@@ -71,16 +74,18 @@ void log_to_both(std::ostream& device, std::ofstream& file, log_level level,
 }
 
 node_impl::node_impl(settings_type& config)
+  : outfile_(config.debug_file.string(), log_open_mode), 
+    errfile_(config.error_file.string(), log_open_mode),
     // Threadpools and the number of threads they spawn.
     // 6 threads spawned in total.
-  : network_pool_(1), disk_pool_(6), mem_pool_(1),
+    network_pool_(1), disk_pool_(6), mem_pool_(1),
     // Networking related services.
     hosts_(network_pool_),
     handshake_(network_pool_),
     network_(network_pool_),
     protocol_(network_pool_, hosts_, handshake_, network_),
     // Blockchain database service.
-    chain_(disk_pool_, config.blockchain_path.generic_string(),
+    chain_(disk_pool_, config.blockchain_path.string(),
         {config.history_height}),
     // Poll new blocks, tx memory pool and tx indexer.
     poller_(mem_pool_, chain_),
@@ -95,27 +100,26 @@ node_impl::node_impl(settings_type& config)
 
 bool node_impl::start(settings_type& config)
 {
-    auto file_mode = std::ofstream::out | std::ofstream::app;
-    outfile_.open(config.debug_file.generic_string(), file_mode);
-    errfile_.open(config.error_file.generic_string(), file_mode);
     log_debug().set_output_function(
         std::bind(log_to_file, std::ref(outfile_),
             _1, _2, _3, config.log_requests));
     log_info().set_output_function(
-        std::bind(log_to_both, std::ref(std::cout), std::ref(outfile_),
+        std::bind(log_to_both, std::ref(bc::cout), std::ref(outfile_),
             _1, _2, _3, config.log_requests));
     log_warning().set_output_function(
         std::bind(log_to_file, std::ref(errfile_),
             _1, _2, _3, config.log_requests));
     log_error().set_output_function(
-        std::bind(log_to_both, std::ref(std::cerr), std::ref(errfile_),
+        std::bind(log_to_both, std::ref(bc::cerr), std::ref(errfile_),
             _1, _2, _3, config.log_requests));
     log_fatal().set_output_function(
-        std::bind(log_to_both, std::ref(std::cerr), std::ref(errfile_),
+        std::bind(log_to_both, std::ref(bc::cerr), std::ref(errfile_),
             _1, _2, _3, config.log_requests));
+
     // Subscribe to new connections.
     protocol_.subscribe_channel(
         std::bind(&node_impl::monitor_tx, this, _1, _2));
+
     // Start blockchain.
     if (!chain_.start())
     {
@@ -124,24 +128,28 @@ bool node_impl::start(settings_type& config)
     }
     chain_.subscribe_reorganize(
         std::bind(&node_impl::reorganize, this, _1, _2, _3, _4));
+
     // Start transaction pool
     txpool_.set_capacity(config.tx_pool_capacity);
     txpool_.start();
+
     // Outgoing connections setting in config file before we
     // start p2p network subsystem.
     int outgoing_connections = boost::lexical_cast<int>(
         config.out_connections);
     protocol_.set_max_outbound(outgoing_connections);
-    protocol_.set_hosts_filename(config.hosts_file.generic_string());
+    protocol_.set_hosts_filename(config.hosts_file.string());
     if (!config.listener_enabled)
         protocol_.disable_listener();
+
     for (const auto& endpoint: config.peers)
     {
         log_info(LOG_NODE) << "Adding node: " 
             << endpoint.get_host() << " " << endpoint.get_port();
         protocol_.maintain_connection(endpoint.get_host(),
             endpoint.get_port());
     }
+
     start_session();
     return true;
 }

src/node_impl.hpp

@@ -20,6 +20,7 @@
 #ifndef LIBBITCOIN_SERVER_NODE_IMPL_HPP
 #define LIBBITCOIN_SERVER_NODE_IMPL_HPP
 
+#include <bitcoin/bitcoin.hpp>
 #include <bitcoin/node.hpp>
 #include "settings.hpp"
 
@@ -76,7 +77,7 @@ class node_impl
         const bc::chain::blockchain::block_list& new_blocks,
         const bc::chain::blockchain::block_list& replaced_blocks);
 
-    std::ofstream outfile_, errfile_;
+    bc::ofstream outfile_, errfile_;
     // Threadpools
     bc::threadpool network_pool_, disk_pool_, mem_pool_;
     // Services