Merge pull request #69 from ConcealNetwork/dev

Dev

.gitignore

@@ -21,3 +21,4 @@ miniupnpcstrings.h
 compile_commands.json
 *.ipch
 *.bin
+*.json

src/CryptoNoteCore/Blockchain.cpp

@@ -686,7 +686,7 @@ bool Blockchain::getBlockByHash(const Crypto::Hash& blockHash, Block& b) {
     return true;
   }
 
-  logger(WARNING) << "<< Blockchain.cpp << " << blockHash;
+  logger(DEBUGGING) << "<< Blockchain.cpp << " << blockHash;
 
   auto blockByHashIterator = m_alternative_chains.find(blockHash);
   if (blockByHashIterator != m_alternative_chains.end()) {

src/Daemon/Daemon.cpp

@@ -336,7 +336,7 @@ int main(int argc, char* argv[])
 
     logger(INFO) << "<< Daemon.cpp << " << "Starting core rpc server on address " << rpcConfig.getBindAddress();
 
-    /* set address for remote node fee */
+    /* Set address for remote node fee */
   	if (command_line::has_arg(vm, arg_set_fee_address)) {
 	  std::string addr_str = command_line::get_arg(vm, arg_set_fee_address);
 	  if (!addr_str.empty()) {
@@ -351,7 +351,8 @@ int main(int argc, char* argv[])
       }
 	  }
 
-    /* set secret view-key to confirm remote node fee */
+    /* This sets the view-key so we can confirm that
+       the fee is part of the transaction blob */       
     if (command_line::has_arg(vm, arg_set_view_key)) {
       std::string vk_str = command_line::get_arg(vm, arg_set_view_key);
 	    if (!vk_str.empty()) {
@@ -360,7 +361,6 @@ int main(int argc, char* argv[])
       }
     }
 
-
     rpcServer.start(rpcConfig.bindIp, rpcConfig.bindPort);
     logger(INFO) << "<< Daemon.cpp << " "Core rpc server started ok";
 

src/P2p/NetNode.cpp

@@ -567,7 +567,7 @@ namespace CryptoNote
     m_payload_handler.get_payload_sync_data(arg.payload_data);
 
     if (!proto.invoke(COMMAND_HANDSHAKE::ID, arg, rsp)) {
-      logger(Logging::ERROR) << context << "Failed to invoke COMMAND_HANDSHAKE, closing connection.";
+      logger(Logging::DEBUGGING) << context << "Failed to invoke COMMAND_HANDSHAKE, closing connection.";
       return false;
     }
 
@@ -635,7 +635,7 @@ namespace CryptoNote
     }
 
     if (!handle_remote_peerlist(rsp.local_peerlist, rsp.local_time, context)) {
-      logger(Logging::ERROR) << context << "COMMAND_TIMED_SYNC: failed to handle_remote_peerlist(...), closing connection.";
+      logger(Logging::DEBUGGING) << context << "COMMAND_TIMED_SYNC: failed to handle_remote_peerlist(...), closing connection.";
       return false;
     }