json serialization for rpc-relevant monero types

Structured {de-,}serialization methods for (many new) types
which are used for requests or responses in the RPC.

New types include RPC requests and responses, and structs which compose
types within those.

# Conflicts:
#	src/cryptonote_core/blockchain.cpp

1 files changed, 67 insertions, 1 deletions

diff --git a/src/rpc/CMakeLists.txt b/src/rpc/CMakeLists.txt
index f6037d7e3..717e3e627 100644
--- a/src/rpc/CMakeLists.txt
+++ b/src/rpc/CMakeLists.txt
@@ -30,20 +30,61 @@ set(rpc_sources
   core_rpc_server.cpp
   rpc_args.cpp)
 
+set(daemon_messages_sources
+  message.cpp
+  daemon_messages.cpp)
+
+set(daemon_rpc_server_sources
+  daemon_handler.cpp
+  zmq_server.cpp)
+
+
 set(rpc_headers
   rpc_args.h)
 
-set(rpc_private_headers
+set(daemon_rpc_server_headers)
+
+
+set(rpc_daemon_private_headers
   core_rpc_server.h
   core_rpc_server_commands_defs.h
   core_rpc_server_error_codes.h)
 
+set(daemon_messages_private_headers
+  message.h
+  daemon_messages.h)
+
+set(daemon_rpc_server_private_headers
+  message.h
+  daemon_messages.h
+  daemon_handler.h
+  rpc_handler.h
+  zmq_server.h)
+
+
 monero_private_headers(rpc
   ${rpc_private_headers})
+
+monero_private_headers(daemon_rpc_server
+  ${daemon_rpc_server_private_headers})
+
+
 monero_add_library(rpc
   ${rpc_sources}
   ${rpc_headers}
   ${rpc_private_headers})
+
+monero_add_library(daemon_messages
+  ${daemon_messages_sources}
+  ${daemon_messages_headers}
+  ${daemon_messages_private_headers})
+
+monero_add_library(daemon_rpc_server
+  ${daemon_rpc_server_sources}
+  ${daemon_rpc_server_headers}
+  ${daemon_rpc_server_private_headers})
+
+
 target_link_libraries(rpc
   PUBLIC
     common
@@ -54,5 +95,30 @@ target_link_libraries(rpc
     ${Boost_THREAD_LIBRARY}
   PRIVATE
     ${EXTRA_LIBRARIES})
+
+target_link_libraries(daemon_messages
+  LINK_PRIVATE
+    cryptonote_core
+    cryptonote_protocol
+    serialization
+    ${EXTRA_LIBRARIES})
+
+target_link_libraries(daemon_rpc_server
+  LINK_PRIVATE
+    cryptonote_core
+    cryptonote_protocol
+    daemon_messages
+    serialization
+    ${Boost_CHRONO_LIBRARY}
+    ${Boost_REGEX_LIBRARY}
+    ${Boost_SYSTEM_LIBRARY}
+    ${Boost_THREAD_LIBRARY}
+    ${ZMQ_LIB}
+    ${EXTRA_LIBRARIES})
+
+
 add_dependencies(rpc
   version)
+
+add_dependencies(daemon_rpc_server
+  version)