diff --git a/SConstruct b/SConstruct index b6e2809475..820d9e2328 100644 --- a/SConstruct +++ b/SConstruct @@ -88,3 +88,4 @@ newcoind = env.Program('newcoind', NEWCOIN_OBJS) tags = env.CTags('obj/tags', NEWCOIN_SRCS) Default(newcoind, tags) + diff --git a/newcoin.vcxproj b/newcoin.vcxproj index 0a9fc472d8..830dc5098c 100644 --- a/newcoin.vcxproj +++ b/newcoin.vcxproj @@ -85,8 +85,6 @@ - - @@ -158,17 +156,6 @@ - - - - - - - - - - - @@ -264,6 +251,7 @@ + diff --git a/newcoin.vcxproj.filters b/newcoin.vcxproj.filters index 52f5a164b1..41af172d3c 100644 --- a/newcoin.vcxproj.filters +++ b/newcoin.vcxproj.filters @@ -25,9 +25,6 @@ {77d2a621-b503-4ce4-aee8-ef0b337c4ee2} - - {c3412b4c-4150-48d7-a5f2-24bdb1a39c5b} - {209ce0bd-b197-4cb2-ad50-f8f43bcd1e03} @@ -42,12 +39,6 @@ - - Source Files\cryptopp - - - Source Files\cryptopp - Header Files\util @@ -266,39 +257,6 @@ Header Files - - Source Files\cryptopp - - - Source Files\cryptopp - - - Source Files\cryptopp - - - Source Files\cryptopp - - - Source Files\cryptopp - - - Source Files\cryptopp - - - Source Files\cryptopp - - - Source Files\cryptopp - - - Source Files\cryptopp - - - Source Files\cryptopp - - - Source Files\cryptopp - Header Files @@ -527,6 +485,7 @@ + diff --git a/src/Log.cpp b/src/Log.cpp index 243e9ee592..ded888a6d6 100644 --- a/src/Log.cpp +++ b/src/Log.cpp @@ -27,7 +27,7 @@ Log::~Log() boost::recursive_mutex::scoped_lock sl(sLock); if (mSeverity >= sMinSeverity) { - // TEMP std::cerr << logMsg << std::endl; + std::cerr << logMsg << std::endl; } } diff --git a/src/RPCServer.cpp b/src/RPCServer.cpp index c2ded709b4..7bdc257c9d 100644 --- a/src/RPCServer.cpp +++ b/src/RPCServer.cpp @@ -92,7 +92,9 @@ Json::Value RPCServer::RPCError(int iError) void RPCServer::connected() { - std::cout << "RPC request" << std::endl; + + //BOOST_LOG_TRIVIAL(info) << "RPC request"; + //std::cout << "RPC request" << std::endl; mSocket.async_read_some(boost::asio::buffer(mReadBuffer), boost::bind(&RPCServer::handle_read, shared_from_this(), diff --git a/validators.txt b/validators.txt index 45fc882be9..728f72bacc 100644 --- a/validators.txt +++ b/validators.txt @@ -6,7 +6,7 @@ # # This file is UTF-8 with Dos, UNIX, or Mac style end of lines. # Blank lines and lines starting with a '#' are ignored. -# All other lines should be domain names. +# All other lines should be hankos or domain names. # # [validators]: # List of nodes to accept as validators speficied by public key or domain. @@ -20,9 +20,6 @@ # [validators] -redstem.com -alpha.redstem.com -bravo.redstem.com -charlie.redstem.com -delta.redstem.com -echo.redstem.com +n9LQC4xFSWXNv1SU1sKtjrW6TZpBZSwp1nRWej8saGs155x42YFZ first +n9LFzWuhKNvXStHAuemfRKFVECLApowncMAM5chSCL9R5ECHGN4V second +n9KXAZxiHkWuVGxDEE8boW7WmcycpZNmWei4vxVaywLZ391Nbuqx third