Merge rm_minisketch-29+syslibs

Author: luke-jr

contrib/guix/libexec/build.sh

@@ -196,7 +196,8 @@ GIT_ARCHIVE="${DIST_ARCHIVE_BASE}/${DISTNAME}.tar.gz"
 # Create the source tarball if not already there
 if [ ! -e "$GIT_ARCHIVE" ]; then
     mkdir -p "$(dirname "$GIT_ARCHIVE")"
-    git archive --prefix="${DISTNAME}/" --output="$GIT_ARCHIVE" HEAD
+    REFERENCE_DATETIME="@${SOURCE_DATE_EPOCH}" \
+    contrib/guix/libexec/make_release_tarball.sh "${GIT_ARCHIVE}" "${DISTNAME}"
 fi
 
 mkdir -p "$OUTDIR"

contrib/guix/libexec/make_release_tarball.sh

@@ -0,0 +1,30 @@
+#!/bin/sh
+# Copyright (c) 2020 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+#
+# A helper script to generate source release tarball
+
+export LC_ALL=C
+set -ex
+
+[ "$#" -ge 2 ]
+[ -n "${REFERENCE_DATETIME}" ]
+
+GIT_ARCHIVE="$1"
+DISTNAME="$2"
+
+git archive --prefix="${DISTNAME}/" HEAD |
+ tar -xp \
+  --exclude '*minisketch*' \
+ # end of tar options
+tar \
+  --format=ustar \
+  --sort=name \
+  --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 \
+  --mtime="${REFERENCE_DATETIME}" \
+  -c "${DISTNAME}" | \
+  gzip -9n \
+  >"${GIT_ARCHIVE}"
+
+rm -rf "${DISTNAME}"

src/CMakeLists.txt

@@ -20,7 +20,6 @@ include(../cmake/crc32c.cmake)
 include(../cmake/leveldb.cmake)
 endif()  # WITH_SYSTEM_LEVELDB
 
-include(../cmake/minisketch.cmake)
 add_subdirectory(univalue)
 
 if(NOT WITH_SYSTEM_LIBSECP256K1)
@@ -272,7 +271,6 @@ add_library(bitcoin_node STATIC EXCLUDE_FROM_ALL
   node/mempool_persist_args.cpp
   node/miner.cpp
   node/mini_miner.cpp
-  node/minisketchwrapper.cpp
   node/peerman_args.cpp
   node/psbt.cpp
   node/timeoffsets.cpp
@@ -323,7 +321,6 @@ target_link_libraries(bitcoin_node
     bitcoin_util
     $<TARGET_NAME_IF_EXISTS:bitcoin_zmq>
     leveldb
-    minisketch
     univalue
     Boost::headers
     $<TARGET_NAME_IF_EXISTS:libevent::core>

src/test/CMakeLists.txt

@@ -57,7 +57,6 @@ add_executable(test_bitcoin
   miner_tests.cpp
   miniminer_tests.cpp
   miniscript_tests.cpp
-  minisketch_tests.cpp
   multisig_tests.cpp
   net_peer_connection_tests.cpp
   net_peer_eviction_tests.cpp
@@ -146,7 +145,6 @@ target_link_libraries(test_bitcoin
   bitcoin_cli
   bitcoin_node
   bitcoin_consensus
-  minisketch
   secp256k1
   Boost::headers
   libevent::extra

src/test/fuzz/CMakeLists.txt

@@ -62,7 +62,6 @@ add_executable(fuzz
   merkleblock.cpp
   message.cpp
   miniscript.cpp
-  minisketch.cpp
   mini_miner.cpp
   muhash.cpp
   multiplication_overflow.cpp
@@ -141,7 +140,6 @@ target_link_libraries(fuzz
   bitcoin_cli
   bitcoin_common
   bitcoin_util
-  minisketch
   leveldb
   univalue
   secp256k1