Merge remote-tracking branch 'origin/dev' into master

oxen-io · Sep 30, 2020 · 53481cd · 53481cd
2 parents b7a2adb + f37e619
commit 53481cd
Show file tree

Hide file tree

Showing 38 changed files with 3,223 additions and 1,108 deletions.
diff --git a/.drone.jsonnet b/.drone.jsonnet
@@ -0,0 +1,63 @@
+local debian_pipeline(name, image, arch='amd64', deps='g++ libsodium-dev libzmq3-dev', cmake_extra='', build_type='Release', extra_cmds=[], allow_fail=false) = {
+    kind: 'pipeline',
+    type: 'docker',
+    name: name,
+    platform: { arch: arch },
+    environment: { CLICOLOR_FORCE: '1' }, // Lets color through ninja (1.9+)
+    steps: [
+        {
+            name: 'build',
+            image: image,
+            [if allow_fail then "failure"]: "ignore",
+            commands: [
+                'apt-get update',
+                'apt-get install -y eatmydata',
+                'eatmydata apt-get dist-upgrade -y',
+                'eatmydata apt-get install -y cmake git ninja-build pkg-config ccache ' + deps,
+                'git submodule update --init --recursive',
+                'mkdir build',
+                'cd build',
+                'cmake .. -G Ninja -DCMAKE_CXX_FLAGS=-fdiagnostics-color=always -DCMAKE_BUILD_TYPE='+build_type+' -DCMAKE_CXX_COMPILER_LAUNCHER=ccache ' + cmake_extra,
+                'ninja -v',
+                './tests/tests --use-colour yes'
+            ] + extra_cmds,
+        }
+    ]
+};
+
+[
+    debian_pipeline("Ubuntu focal (amd64)", "ubuntu:focal"),
+    debian_pipeline("Ubuntu bionic (amd64)", "ubuntu:bionic", deps='libsodium-dev g++-8',
+                    cmake_extra='-DCMAKE_C_COMPILER=gcc-8 -DCMAKE_CXX_COMPILER=g++-8'),
+    debian_pipeline("Debian sid (amd64)", "debian:sid"),
+    debian_pipeline("Debian sid/Debug (amd64)", "debian:sid", build_type='Debug'),
+    debian_pipeline("Debian sid/clang-10 (amd64)", "debian:sid", deps='clang-10 lld-10 libsodium-dev libzmq3-dev',
+                    cmake_extra='-DCMAKE_C_COMPILER=clang-10 -DCMAKE_CXX_COMPILER=clang++-10 ' + std.join(' ', [
+                        '-DCMAKE_'+type+'_LINKER_FLAGS=-fuse-ld=lld-10' for type in ['EXE','MODULE','SHARED','STATIC']])),
+    debian_pipeline("Debian buster (amd64)", "debian:buster"),
+    debian_pipeline("Debian buster (i386)", "i386/debian:buster"),
+    debian_pipeline("Ubuntu bionic (ARM64)", "ubuntu:bionic", arch="arm64", deps='libsodium-dev g++-8',
+                    cmake_extra='-DCMAKE_C_COMPILER=gcc-8 -DCMAKE_CXX_COMPILER=g++-8'),
+    debian_pipeline("Debian sid (ARM64)", "debian:sid", arch="arm64"),
+    debian_pipeline("Debian buster (armhf)", "arm32v7/debian:buster", arch="arm64"),
+    {
+        kind: 'pipeline',
+        type: 'exec',
+        name: 'macOS (Catalina w/macports)',
+        platform: { os: 'darwin', arch: 'amd64' },
+        environment: { CLICOLOR_FORCE: '1' }, // Lets color through ninja (1.9+)
+        steps: [
+            {
+                name: 'build',
+                commands: [
+                    'git submodule update --init --recursive',
+                    'mkdir build',
+                    'cd build',
+                    'cmake .. -G Ninja -DCMAKE_CXX_FLAGS=-fcolor-diagnostics -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER_LAUNCHER=ccache',
+                    'ninja -v',
+                    './tests/tests --use-colour yes'
+                ],
+            }
+        ]
+    },
+]
diff --git a/.gitmodules b/.gitmodules
@@ -1,6 +1,3 @@
-[submodule "mapbox-variant"]
-	path = mapbox-variant
-	url = https://github.com/mapbox/variant.git
 [submodule "cppzmq"]
 	path = cppzmq
 	url = https://github.com/zeromq/cppzmq.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,12 +1,12 @@
 cmake_minimum_required(VERSION 3.7)
 
-project(liblokimq CXX)
+project(liblokimq CXX C)
 
 include(GNUInstallDirs)
 
 set(LOKIMQ_VERSION_MAJOR 1)
-set(LOKIMQ_VERSION_MINOR 1)
-set(LOKIMQ_VERSION_PATCH 4)
+set(LOKIMQ_VERSION_MINOR 2)
+set(LOKIMQ_VERSION_PATCH 0)
 set(LOKIMQ_VERSION "${LOKIMQ_VERSION_MAJOR}.${LOKIMQ_VERSION_MINOR}.${LOKIMQ_VERSION_PATCH}")
 message(STATUS "lokimq v${LOKIMQ_VERSION}")
 
@@ -22,6 +22,7 @@ configure_file(lokimq/version.h.in lokimq/version.h @ONLY)
 configure_file(liblokimq.pc.in liblokimq.pc @ONLY)
 
 add_library(lokimq
+    lokimq/address.cpp
     lokimq/auth.cpp
     lokimq/bt_serialize.cpp
     lokimq/connections.cpp
@@ -46,17 +47,18 @@ if(TARGET libzmq)
 elseif(BUILD_SHARED_LIBS)
     include(FindPkgConfig)
     pkg_check_modules(libzmq libzmq>=4.3 IMPORTED_TARGET)
-    # Debian sid includes a -isystem in the mit-krb package that, starting with pkg-config 0.29.2,
-    # breaks cmake's pkgconfig module because it stupidly thinks "-isystem" is a path, so if we find
-    # -isystem in the include dirs then hack it out.
-    get_property(zmq_inc TARGET PkgConfig::libzmq PROPERTY INTERFACE_INCLUDE_DIRECTORIES)
-    list(FIND zmq_inc "-isystem" broken_isystem)
-    if(NOT broken_isystem EQUAL -1)
-      list(REMOVE_AT zmq_inc ${broken_isystem})
-      set_property(TARGET PkgConfig::libzmq PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${zmq_inc})
-    endif()
 
     if(libzmq_FOUND)
+        # Debian sid includes a -isystem in the mit-krb package that, starting with pkg-config 0.29.2,
+        # breaks cmake's pkgconfig module because it stupidly thinks "-isystem" is a path, so if we find
+        # -isystem in the include dirs then hack it out.
+        get_property(zmq_inc TARGET PkgConfig::libzmq PROPERTY INTERFACE_INCLUDE_DIRECTORIES)
+        list(FIND zmq_inc "-isystem" broken_isystem)
+        if(NOT broken_isystem EQUAL -1)
+          list(REMOVE_AT zmq_inc ${broken_isystem})
+          set_property(TARGET PkgConfig::libzmq PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${zmq_inc})
+        endif()
+
         target_link_libraries(lokimq PUBLIC PkgConfig::libzmq)
     else()
         set(lokimq_build_static_libzmq ON)
@@ -66,7 +68,7 @@ else()
 endif()
 
 if(lokimq_build_static_libzmq)
-    message(STATUS "libzmq >= 4.3 not found or static build requested, building bundled 4.3.2")
+    message(STATUS "libzmq >= 4.3 not found or static build requested, building bundled version")
     list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/local-libzmq")
     include(LocalLibzmq)
     target_link_libraries(lokimq PUBLIC libzmq_vendor)
@@ -77,12 +79,11 @@ target_include_directories(lokimq
         $<INSTALL_INTERFACE:>
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/cppzmq>
-        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/mapbox-variant/include>
 )
 
 target_compile_options(lokimq PRIVATE -Wall -Wextra -Werror)
 set_target_properties(lokimq PROPERTIES
-    CXX_STANDARD 14
+    CXX_STANDARD 17
     CXX_STANDARD_REQUIRED ON
     CXX_EXTENSIONS OFF
     POSITION_INDEPENDENT_CODE ON
@@ -101,21 +102,21 @@ endfunction()
 # If the caller has already set up a sodium target then we will just link to it, otherwise we go
 # looking for it.
 if(TARGET sodium)
-    target_link_libraries(lokimq PRIVATE sodium)
+    target_link_libraries(lokimq PUBLIC sodium)
     if(lokimq_build_static_libzmq)
         target_link_libraries(libzmq_vendor INTERFACE sodium)
     endif()
 else()
     pkg_check_modules(sodium REQUIRED libsodium IMPORTED_TARGET)
 
     if(BUILD_SHARED_LIBS)
-        target_link_libraries(lokimq PRIVATE PkgConfig::sodium)
+        target_link_libraries(lokimq PUBLIC PkgConfig::sodium)
         if(lokimq_build_static_libzmq)
             target_link_libraries(libzmq_vendor INTERFACE PkgConfig::sodium)
         endif()
     else()
-        link_dep_libs(lokimq PRIVATE "${sodium_STATIC_LIBRARY_DIRS}" ${sodium_STATIC_LIBRARIES})
-        target_include_directories(lokimq PRIVATE ${sodium_STATIC_INCLUDE_DIRS})
+        link_dep_libs(lokimq PUBLIC "${sodium_STATIC_LIBRARY_DIRS}" ${sodium_STATIC_LIBRARIES})
+        target_include_directories(lokimq PUBLIC ${sodium_STATIC_INCLUDE_DIRS})
         if(lokimq_build_static_libzmq)
             link_dep_libs(libzmq_vendor INTERFACE "${sodium_STATIC_LIBRARY_DIRS}" ${sodium_STATIC_LIBRARIES})
             target_link_libraries(libzmq_vendor INTERFACE ${sodium_STATIC_INCLUDE_DIRS})
@@ -137,9 +138,13 @@ install(
 )
 
 install(
-    FILES lokimq/auth.h
+    FILES lokimq/address.h
+          lokimq/auth.h
+          lokimq/base32z.h
+          lokimq/base64.h
           lokimq/batch.h
           lokimq/bt_serialize.h
+          lokimq/bt_value.h
           lokimq/connections.h
           lokimq/hex.h
           lokimq/lokimq.h
@@ -148,17 +153,6 @@ install(
           ${CMAKE_CURRENT_BINARY_DIR}/lokimq/version.h
     DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/lokimq
 )
-option(LOKIMQ_INSTALL_MAPBOX_VARIANT "Install mapbox-variant headers with lokimq/ headers" ON)
-if(LOKIMQ_INSTALL_MAPBOX_VARIANT)
-  install(
-    FILES mapbox-variant/include/mapbox/variant.hpp
-          mapbox-variant/include/mapbox/variant_cast.hpp
-          mapbox-variant/include/mapbox/variant_io.hpp
-          mapbox-variant/include/mapbox/variant_visitor.hpp
-          mapbox-variant/include/mapbox/recursive_wrapper.hpp
-    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/lokimq/mapbox
-  )
-endif()
 
 option(LOKIMQ_INSTALL_CPPZMQ "Install cppzmq header with lokimq/ headers" ON)
 if(LOKIMQ_INSTALL_CPPZMQ)

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # LokiMQ - zeromq-based message passing for Loki projects
 
-This C++14 library contains an abstraction layer around ZeroMQ to support integration with Loki
+This C++17 library contains an abstraction layer around ZeroMQ to support integration with Loki
 authentication, RPC, and message passing.  It is designed to be usable as the underlying
 communication mechanism of SN-to-SN communication ("quorumnet"), the RPC interface used by wallets
 and local daemon commands, communication channels between lokid and auxiliary services (storage
@@ -123,6 +123,7 @@ The connection ID generally has two possible values:
   places to get one, such as from the `Message` object passed to a command: see the following
   section).
 
+    ```C++
     // Send to a service node, establishing a connection if necessary:
     std::string my_sn = ...; // 32-byte pubkey of a known SN
     lmq.send(my_sn, "sn.explode", "{ \"seconds\": 30 }");
@@ -137,6 +138,7 @@ The connection ID generally has two possible values:
         else
             std::cout << "Timeout fetching height!";
     });
+    ```
 
 ## Command invocation
 

diff --git a/cmake/local-libzmq/LocalLibzmq.cmake b/cmake/local-libzmq/LocalLibzmq.cmake
@@ -1,7 +1,7 @@
 set(LIBZMQ_PREFIX ${CMAKE_BINARY_DIR}/libzmq)
-set(ZeroMQ_VERSION 4.3.2)
+set(ZeroMQ_VERSION 4.3.3)
 set(LIBZMQ_URL https://github.com/zeromq/libzmq/releases/download/v${ZeroMQ_VERSION}/zeromq-${ZeroMQ_VERSION}.tar.gz)
-set(LIBZMQ_HASH SHA512=b6251641e884181db9e6b0b705cced7ea4038d404bdae812ff47bdd0eed12510b6af6846b85cb96898e253ccbac71eca7fe588673300ddb9c3109c973250c8e4)
+set(LIBZMQ_HASH SHA512=4c18d784085179c5b1fcb753a93813095a12c8d34970f2e1bfca6499be6c9d67769c71c68b7ca54ff181b20390043170e89733c22f76ff1ea46494814f7095b1)
 
 message(${LIBZMQ_URL})