Merge pull request #1776 from oxen-io/dev

v0.9.7

.gitattributes

@@ -2,3 +2,4 @@ external/date/test export-ignore
 external/nlohmann/doc export-ignore
 external/nlohmann/test export-ignore
 external/nlohmann/benchmarks/data export-ignore
+*.signed binary

.gitignore

@@ -26,6 +26,8 @@ callgrind.*
 
 *.sig
 *.signed
+!/contrib/bootstrap/mainnet.signed
+!/contrib/bootstrap/testnet.signed
 *.key
 
 shadow.data

CMakeLists.txt

@@ -22,7 +22,7 @@ endif()
 
 
 project(lokinet
-    VERSION 0.9.6
+    VERSION 0.9.7
     DESCRIPTION "lokinet - IP packet onion router"
     LANGUAGES ${LANGS})
 
@@ -51,7 +51,7 @@ option(EMBEDDED_CFG "optimise for older hardware or embedded systems" OFF)
 option(BUILD_LIBLOKINET "build liblokinet.so" ON)
 option(SHADOW "use shadow testing framework. linux only" OFF)
 option(XSAN "use sanitiser, if your system has it (requires -DCMAKE_BUILD_TYPE=Debug)" OFF)
-option(WITH_JEMALLOC "use jemalloc as allocator" OFF)
+option(USE_JEMALLOC "Link to jemalloc for memory allocations, if found" ON)
 option(TESTNET "testnet build" OFF)
 option(WITH_COVERAGE "generate coverage data" OFF)
 option(USE_SHELLHOOKS "enable shell hooks on compile time (dangerous)" OFF)
@@ -299,7 +299,6 @@ endif()
 add_subdirectory(external)
 include_directories(SYSTEM external/sqlite_orm/include)
 
-option(USE_JEMALLOC "Link to jemalloc for memory allocations, if found" ON)
 if(USE_JEMALLOC AND NOT STATIC_LINK)
   pkg_check_modules(JEMALLOC jemalloc IMPORTED_TARGET)
   if(JEMALLOC_FOUND)

cmake/StaticBuild.cmake

@@ -388,6 +388,7 @@ foreach(curl_arch ${curl_arches})
     --disable-progress-meter --without-brotli --with-zlib=${DEPS_DESTDIR} ${curl_ssl_opts}
     --without-libmetalink --without-librtmp --disable-versioned-symbols --enable-hidden-symbols
     --without-zsh-functions-dir --without-fish-functions-dir
+    --without-nghttp3 --without-zstd
     "CC=${deps_cc}" "CFLAGS=${deps_noarch_CFLAGS}${cflags_extra}" ${curl_extra}
     BUILD_COMMAND true
     INSTALL_COMMAND ${_make} -C lib install && ${_make} -C include install

cmake/add_log_tag.cmake

@@ -2,7 +2,6 @@ function(add_log_tag target)
   get_target_property(TARGET_SRCS ${target} SOURCES)
   foreach(F ${TARGET_SRCS})
     get_filename_component(fpath "${F}" ABSOLUTE)
-    string(REPLACE "${PROJECT_SOURCE_DIR}/" "" logtag "${fpath}")
-    set_property(SOURCE ${F} APPEND PROPERTY COMPILE_DEFINITIONS LOG_TAG=\"${logtag}\")
+    set_property(SOURCE ${F} APPEND PROPERTY COMPILE_DEFINITIONS SOURCE_ROOT=\"${PROJECT_SOURCE_DIR}\")
   endforeach()
 endfunction()

cmake/libatomic.cmake

@@ -1,49 +1,49 @@
-function(check_working_cxx_atomics64 varname)
-  set(OLD_CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS})
-  if (EMBEDDED_CFG)
-    set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -m32 -march=i486")
-  elseif(MSVC OR MSVC_VERSION)
-    set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -arch:IA32 -std:c++14")
-  else()
-  # CMAKE_CXX_STANDARD does not propagate to cmake compile tests
-    set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -std=c++14")
-  endif()
-  check_cxx_source_compiles("
-#include <atomic>
-#include <cstdint>
-std::atomic<uint64_t> x (0);
-int main() {
-  uint64_t i = x.load(std::memory_order_relaxed);
-  return 0;
-}
-" ${varname})
-  set(CMAKE_REQUIRED_FLAGS ${OLD_CMAKE_REQUIRED_FLAGS})
-endfunction()
-
-function(link_libatomic)
-  check_working_cxx_atomics64(HAVE_CXX_ATOMICS64_WITHOUT_LIB)
-
-  if(HAVE_CXX_ATOMICS64_WITHOUT_LIB)
-    message(STATUS "Have working 64bit atomics")
-    return()
-  endif()
-
-  if (NOT MSVC AND NOT MSVC_VERSION)
-    check_library_exists(atomic __atomic_load_8 "" HAVE_CXX_LIBATOMICS64)
-    if (HAVE_CXX_LIBATOMICS64)
-      message(STATUS "Have 64bit atomics via library")
-      list(APPEND CMAKE_REQUIRED_LIBRARIES "atomic")
-      check_working_cxx_atomics64(HAVE_CXX_ATOMICS64_WITH_LIB)
-      if (HAVE_CXX_ATOMICS64_WITH_LIB)
-        message(STATUS "Can link with libatomic")
-        link_libraries(-latomic)
-        return()
-      endif()
-    endif()
-  endif()
-  if (MSVC OR MSVC_VERSION)
-    message(FATAL_ERROR "Host compiler must support 64-bit std::atomic! (What does MSVC do to inline atomics?)")
-  else()
-    message(FATAL_ERROR "Host compiler must support 64-bit std::atomic!")
-  endif()
-endfunction()
+function(check_working_cxx_atomics64 varname)
+  set(OLD_CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS})
+  if (EMBEDDED_CFG)
+    set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -m32 -march=i486")
+  elseif(MSVC OR MSVC_VERSION)
+    set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -arch:IA32 -std:c++14")
+  else()
+  # CMAKE_CXX_STANDARD does not propagate to cmake compile tests
+    set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -std=c++14")
+  endif()
+  check_cxx_source_compiles("
+#include <atomic>
+#include <cstdint>
+std::atomic<uint64_t> x (0);
+int main() {
+  uint64_t i = x.load(std::memory_order_relaxed);
+  return 0;
+}
+" ${varname})
+  set(CMAKE_REQUIRED_FLAGS ${OLD_CMAKE_REQUIRED_FLAGS})
+endfunction()
+
+function(link_libatomic)
+  check_working_cxx_atomics64(HAVE_CXX_ATOMICS64_WITHOUT_LIB)
+
+  if(HAVE_CXX_ATOMICS64_WITHOUT_LIB)
+    message(STATUS "Have working 64bit atomics")
+    return()
+  endif()
+
+  if (NOT MSVC AND NOT MSVC_VERSION)
+    check_library_exists(atomic __atomic_load_8 "" HAVE_CXX_LIBATOMICS64)
+    if (HAVE_CXX_LIBATOMICS64)
+      message(STATUS "Have 64bit atomics via library")
+      list(APPEND CMAKE_REQUIRED_LIBRARIES "atomic")
+      check_working_cxx_atomics64(HAVE_CXX_ATOMICS64_WITH_LIB)
+      if (HAVE_CXX_ATOMICS64_WITH_LIB)
+        message(STATUS "Can link with libatomic")
+        link_libraries(-latomic)
+        return()
+      endif()
+    endif()
+  endif()
+  if (MSVC OR MSVC_VERSION)
+    message(FATAL_ERROR "Host compiler must support 64-bit std::atomic! (What does MSVC do to inline atomics?)")
+  else()
+    message(FATAL_ERROR "Host compiler must support 64-bit std::atomic!")
+  endif()
+endfunction()

cmake/ngtcp2_lib.cmake

@@ -0,0 +1,52 @@
+# ngtcp2's top-level CMakeLists.txt loads a bunch of crap we don't want (examples, a conflicting
+# 'check' target, etc.); instead we directly include it's lib subdirectory to build just the
+# library, but we have to set up a couple things to make that work:
+function(add_ngtcp2_lib)
+  file(STRINGS ngtcp2/CMakeLists.txt ngtcp2_project_line REGEX "^project\\(ngtcp2 ")
+  if(NOT ngtcp2_project_line MATCHES "^project\\(ngtcp2 VERSION ([0-9]+)\\.([0-9]+)\\.([0-9]+)\\)$")
+    message(FATAL_ERROR "Unable to extract ngtcp2 version from ngtcp2/CMakeLists.txt (found '${ngtcp2_project_line}')")
+  endif()
+
+  set(PACKAGE_VERSION "${CMAKE_MATCH_1}.${CMAKE_MATCH_2}.${CMAKE_MATCH_3}")
+  include(ngtcp2/cmake/Version.cmake)
+  HexVersion(PACKAGE_VERSION_NUM ${CMAKE_MATCH_1} ${CMAKE_MATCH_2} ${CMAKE_MATCH_3})
+  configure_file("ngtcp2/lib/includes/ngtcp2/version.h.in" "ngtcp2/lib/includes/ngtcp2/version.h" @ONLY)
+
+  set(BUILD_SHARED_LIBS OFF)
+
+  # Checks for header files.
+  include(CheckIncludeFile)
+  check_include_file("arpa/inet.h"   HAVE_ARPA_INET_H)
+  check_include_file("netinet/in.h"  HAVE_NETINET_IN_H)
+  check_include_file("stddef.h"      HAVE_STDDEF_H)
+  check_include_file("stdint.h"      HAVE_STDINT_H)
+  check_include_file("stdlib.h"      HAVE_STDLIB_H)
+  check_include_file("string.h"      HAVE_STRING_H)
+  check_include_file("unistd.h"      HAVE_UNISTD_H)
+  check_include_file("sys/endian.h"  HAVE_SYS_ENDIAN_H)
+  check_include_file("endian.h"      HAVE_ENDIAN_H)
+  check_include_file("byteswap.h"    HAVE_BYTESWAP_H)
+
+  include(CheckTypeSize)
+  check_type_size("ssize_t" SIZEOF_SSIZE_T)
+  if(SIZEOF_SSIZE_T STREQUAL "")
+    set(ssize_t ptrdiff_t)
+  endif()
+
+  include(CheckSymbolExists)
+  if(HAVE_ENDIAN_H)
+    check_symbol_exists(be64toh "endian.h" HAVE_BE64TOH)
+  endif()
+  if(NOT HAVE_BE64TO AND HAVE_SYS_ENDIAN_H)
+    check_symbol_exists(be64toh "sys/endian.h" HAVE_BE64TOH)
+  endif()
+
+  check_symbol_exists(bswap_64 "byteswap.h" HAVE_BSWAP_64)
+
+  configure_file(ngtcp2/cmakeconfig.h.in ngtcp2/config.h)
+  include_directories("${CMAKE_CURRENT_BINARY_DIR}/ngtcp2") # for config.h
+
+  add_subdirectory(ngtcp2/lib EXCLUDE_FROM_ALL)
+
+  target_compile_definitions(ngtcp2 PRIVATE -DHAVE_CONFIG_H -D_GNU_SOURCE)
+endfunction()

cmake/unix.cmake

@@ -7,15 +7,6 @@ endif()
 include(CheckCXXSourceCompiles)
 include(CheckLibraryExists)
 
-if(WITH_JEMALLOC)
-  find_package(Jemalloc REQUIRED)
-  if(NOT JEMALLOC_FOUND)
-    message(FATAL_ERROR "did not find jemalloc")
-  endif()
-  add_definitions(-DUSE_JEMALLOC)
-  message(STATUS "using jemalloc")
-endif()
-
 add_definitions(-DUNIX)
 add_definitions(-DPOSIX)
 

cmake/win32_installer_deps.cmake

@@ -5,17 +5,12 @@ endif()
 
 set(TUNTAP_URL "https://build.openvpn.net/downloads/releases/latest/tap-windows-latest-stable.exe")
 set(TUNTAP_EXE "${CMAKE_BINARY_DIR}/tuntap-install.exe")
-set(BOOTSTRAP_URL "https://seed.lokinet.org/lokinet.signed")
-set(BOOTSTRAP_FILE "${CMAKE_BINARY_DIR}/bootstrap.signed")
+set(BOOTSTRAP_FILE "${PROJECT_SOURCE_DIR}/contrib/bootstrap/mainnet.signed")
 
 file(DOWNLOAD
     ${TUNTAP_URL}
     ${TUNTAP_EXE})
 
-file(DOWNLOAD
-    ${BOOTSTRAP_URL}
-    ${BOOTSTRAP_FILE})
-
 file(DOWNLOAD
     ${GUI_ZIP_URL}
     ${CMAKE_BINARY_DIR}/lokinet-gui.zip
@@ -26,7 +21,7 @@ execute_process(COMMAND ${CMAKE_COMMAND} -E tar xf ${CMAKE_BINARY_DIR}/lokinet-g
 
 install(DIRECTORY ${CMAKE_BINARY_DIR}/gui DESTINATION share COMPONENT gui)
 install(PROGRAMS ${TUNTAP_EXE} DESTINATION bin COMPONENT tuntap)
-install(FILES ${BOOTSTRAP_FILE} DESTINATION share COMPONENT lokinet)
+install(FILES ${BOOTSTRAP_FILE} DESTINATION share COMPONENT lokinet RENAME bootstrap.signed)
 
 set(CPACK_PACKAGE_INSTALL_DIRECTORY "Lokinet")
 set(CPACK_NSIS_MUI_ICON "${CMAKE_SOURCE_DIR}/win32-setup/lokinet.ico")

contrib/bootstrap/testnet.signed

@@ -0,0 +1 @@
+d1:ald1:ci2e1:d3:iwp1:e32:9�x�sX�l%����<,s؛������_1:i21:::ffff:144.76.164.2021:pi1666e1:vi0eee1:i5:gamma1:k32:����m=o��Z�1��mc�%������SĹ1:p32:!E
���z��:�����/0�ڄ�ݪ��N�B1:rli0ei0ei8ei3ee1:ui1614788310454e1:vi0e1:xle1:z64:��u�G��D�=�x��{��51�`�߀�E�wm)q2�g����� ��)�T�P������1e

contrib/ci/docker/00-debian-bullseye-base.dockerfile

@@ -0,0 +1,6 @@
+ARG ARCH=amd64
+FROM ${ARCH}/debian:bullseye
+RUN /bin/bash -c 'echo "man-db man-db/auto-update boolean false" | debconf-set-selections'
+RUN apt-get -o=Dpkg::Use-Pty=0 -q update \
+    && apt-get -o=Dpkg::Use-Pty=0 -q dist-upgrade -y \
+    && apt-get -o=Dpkg::Use-Pty=0 -q autoremove -y

contrib/ci/docker/00-debian-buster-base.dockerfile

@@ -0,0 +1,6 @@
+ARG ARCH=amd64
+FROM ${ARCH}/debian:buster
+RUN /bin/bash -c 'echo "man-db man-db/auto-update boolean false" | debconf-set-selections'
+RUN apt-get -o=Dpkg::Use-Pty=0 -q update \
+    && apt-get -o=Dpkg::Use-Pty=0 -q dist-upgrade -y \
+    && apt-get -o=Dpkg::Use-Pty=0 -q autoremove -y

contrib/ci/docker/00-debian-sid-base.dockerfile

@@ -0,0 +1,6 @@
+ARG ARCH=amd64
+FROM ${ARCH}/debian:sid
+RUN /bin/bash -c 'echo "man-db man-db/auto-update boolean false" | debconf-set-selections'
+RUN apt-get -o=Dpkg::Use-Pty=0 -q update \
+    && apt-get -o=Dpkg::Use-Pty=0 -q dist-upgrade -y \
+    && apt-get -o=Dpkg::Use-Pty=0 -q autoremove -y

contrib/ci/docker/00-debian-stable-base.dockerfile

@@ -0,0 +1,6 @@
+ARG ARCH=amd64
+FROM ${ARCH}/debian:stable
+RUN /bin/bash -c 'echo "man-db man-db/auto-update boolean false" | debconf-set-selections'
+RUN apt-get -o=Dpkg::Use-Pty=0 -q update \
+    && apt-get -o=Dpkg::Use-Pty=0 -q dist-upgrade -y \
+    && apt-get -o=Dpkg::Use-Pty=0 -q autoremove -y

contrib/ci/docker/00-debian-testing-base.dockerfile

@@ -0,0 +1,6 @@
+ARG ARCH=amd64
+FROM ${ARCH}/debian:testing
+RUN /bin/bash -c 'echo "man-db man-db/auto-update boolean false" | debconf-set-selections'
+RUN apt-get -o=Dpkg::Use-Pty=0 -q update \
+    && apt-get -o=Dpkg::Use-Pty=0 -q dist-upgrade -y \
+    && apt-get -o=Dpkg::Use-Pty=0 -q autoremove -y

contrib/ci/docker/10-debian-bullseye.dockerfile

@@ -0,0 +1,39 @@
+ARG ARCH=amd64
+FROM registry.oxen.rocks/lokinet-ci-debian-bullseye-base/${ARCH}
+RUN apt-get -o=Dpkg::Use-Pty=0 -q install --no-install-recommends -y \
+        automake \
+        ccache \
+        cmake \
+        eatmydata \
+        g++ \
+        gdb \
+        git \
+        libboost-program-options-dev \
+        libboost-serialization-dev \
+        libboost-thread-dev \
+        libcurl4-openssl-dev \
+        libevent-dev \
+        libgtest-dev \
+        libhidapi-dev \
+        libjemalloc-dev \
+        libminiupnpc-dev \
+        libreadline-dev \
+        libsodium-dev \
+        libsqlite3-dev \
+        libssl-dev \
+        libsystemd-dev \
+        libtool \
+        libunbound-dev \
+        libunwind8-dev \
+        libusb-1.0.0-dev \
+        libuv1-dev \
+        libzmq3-dev \
+        lsb-release \
+        make \
+        nettle-dev \
+        ninja-build \
+        openssh-client \
+        patch \
+        pkg-config \
+        python3-dev \
+        qttools5-dev

contrib/ci/docker/10-debian-buster.dockerfile

@@ -0,0 +1,40 @@
+ARG ARCH=amd64
+FROM registry.oxen.rocks/lokinet-ci-debian-buster-base/${ARCH}
+RUN apt-get -o=Dpkg::Use-Pty=0 -q install --no-install-recommends -y \
+        automake \
+        ccache \
+        cmake \
+        eatmydata \
+        g++ \
+        gdb \
+        git \
+        libboost-program-options-dev \
+        libboost-serialization-dev \
+        libboost-thread-dev \
+        libcurl4-openssl-dev \
+        libevent-dev \
+        libgtest-dev \
+        libhidapi-dev \
+        libjemalloc-dev \
+        libminiupnpc-dev \
+        libreadline-dev \
+        libsodium-dev \
+        libsqlite3-dev \
+        libssl-dev \
+        libsystemd-dev \
+        libtool \
+        libunbound-dev \
+        libunwind8-dev \
+        libusb-1.0.0-dev \
+        libuv1-dev \
+        libzmq3-dev \
+        lsb-release \
+        make \
+        nettle-dev \
+        ninja-build \
+        openssh-client \
+        patch \
+        pkg-config \
+        python3-dev \
+        qttools5-dev \
+        xz-utils