Merge master into m1-builds-github branch

Resolved conflicts in CI workflow:
- Used CACHE_VERSION v9 from master
- Kept ARM64 macOS support variables (EXTRA_INCLUDE_MAC_AARCH64, EXTRA_LIB_MAC_AARCH64)
- Used updated Windows cache path from master (D:\a\_temp\msys64)
- Added runner.arch to cache key for architecture-specific caching

Author: dguido

.codeclimate.yml

@@ -1,56 +1,13 @@
-FROM alpine:3.18.4
-# Based on https://github.com/fpco/alpine-haskell-stack/blob/9.2.8v2/ghc-Dockerfile
+FROM docker.io/benz0li/ghc-musl:9.8.4
+# https://gitlab.com/benz0li/ghc-musl
 
 RUN apk upgrade --no-cache &&\
     apk add --no-cache \
-        curl \
-        gcc \
-        git \
-        libc-dev \
-        xz \
-        gmp-dev \
         autoconf \
         automake \
-        binutils \
-        build-base \
-        coreutils \
-        cpio \
-        linux-headers \
-        libffi-dev \
-        musl-dev \
-        zlib-dev \
-        zlib-static \
-        ncurses-dev \
-        ncurses-libs \
-        ncurses-static \
-        bash \
-        lld \
-        shadow # for stack --docker, provides groupadd
-
-RUN curl -sSLo /usr/local/bin/stack https://github.com/commercialhaskell/stack/releases/download/v2.13.1/stack-2.13.1-linux-x86_64-bin && \
-    chmod +x /usr/local/bin/stack
-
-# https://stackoverflow.com/a/41517423
-RUN ln -s /usr/lib/libncurses.a /usr/lib/libtinfo.a
-
-COPY stack-config.yaml /root/.stack/config.yaml
-
-RUN cd /tmp && \
-    curl -sSLo /tmp/ghc.tar.xz https://downloads.haskell.org/~ghc/9.4.7/ghc-9.4.7-x86_64-alpine3_12-linux.tar.xz && \
-    tar xf ghc.tar.xz && \
-    cd ghc-9.4.7-x86_64-unknown-linux && \
-    ./configure --prefix=/usr/local && \
-    make install && \
-    rm -rf /tmp/ghc.tar.xz /tmp/ghc-9.4.7-x86_64-unknown-linux
-
-RUN apk upgrade --no-cache &&\
-    apk add --no-cache \
+        binutils-gold \
         cmake \
-        libtool \
-        openssl-dev \
-        tar \
-        zlib-dev \
-        zlib-static
+        libtool
 
 RUN addgroup \
         --gid 115 \
@@ -65,8 +22,7 @@ RUN addgroup \
         runneruser
 
 RUN mkdir -p /etc/stack &&\
-    { cat /root/.stack/config.yaml ;\
-      echo "system-ghc: true" ;\
+    { echo "system-ghc: true" ;\
       echo "install-ghc: false" ;\
       echo "skip-ghc-check: true" ;\
     } >> /etc/stack/config.yaml &&\

.github/container-linux-static/Dockerfile

@@ -2,7 +2,7 @@
 
 This container is used as part of `.github/workflows/ci.yml` to produce
 statically-linked amd64 linux builds of Echidna. It is based on the following
-container produced by FP Complete and maintained in the
-[`fpco/alpine-haskell-stack`](https://github.com/fpco/alpine-haskell-stack/tree/ghc927)
-repository, and contains a few extra dependencies and configuration to make it
+container produced by Olivier Benz and maintained in the
+[`benz0li/ghc-musl`](https://gitlab.com/benz0li/ghc-musl)
+repository, and contains a few extra dependencies and configurations to make it
 suitable for the GitHub Actions environment.

.github/container-linux-static/README.md

@@ -0,0 +1,23 @@
+#!/bin/bash
+set -eux -o pipefail
+
+VERSION=0.8.2
+
+mkdir -p "$HOME/.local/bin/"
+
+if [ "$HOST_OS" = "Linux" ]; then
+  if [ $(uname -m) = "aarch64" ]; then
+    curl -fsSL -o bitwuzla.zip https://github.com/bitwuzla/bitwuzla/releases/download/0.8.2/Bitwuzla-Linux-arm64-static.zip
+  elif [ $(uname -m) = "x86_64" ]; then
+    curl -fsSL -o bitwuzla.zip https://github.com/bitwuzla/bitwuzla/releases/download/0.8.2/Bitwuzla-Linux-x86_64-static.zip
+  fi
+  unzip bitwuzla.zip
+  cp Bitwuzla*/bin/bitwuzla "$HOME/.local/bin/"
+fi
+if [ "$HOST_OS" = "Windows" ]; then
+  curl -fsSL "https://github.com/bitwuzla/bitwuzla/releases/download/$VERSION/Bitwuzla-Win64-x86_64-static.zip" -o bitwuzla.zip
+  unzip bitwuzla.zip
+  cp Bitwuzla*/bin/bitwuzla.exe "$HOME/.local/bin/"
+fi
+
+rm -rf bitwuzla.zip Bitwuzla*/

.github/scripts/install-bitwuzla.sh

@@ -18,7 +18,7 @@ cd libff
 git checkout v0.2.1
 git submodule init && git submodule update
 
-ARGS=("-DCMAKE_INSTALL_PREFIX=$PREFIX" "-DWITH_PROCPS=OFF")
+ARGS=("-DCMAKE_INSTALL_PREFIX=$PREFIX" "-DWITH_PROCPS=OFF" "-DCMAKE_POLICY_VERSION_MINIMUM=3.5")
 CXXFLAGS=""
 if [ "$HOST_OS" = "macOS" ]; then
   OPENSSL_PREFIX=$(brew --prefix openssl)
@@ -35,8 +35,16 @@ if [ "$HOST_OS" = "Linux" ] && [ "$(uname -m)" = "aarch64" ]; then
 fi
 
 if [ "$HOST_OS" = "Windows" ]; then
-  ARGS+=("-G" "Ninja")
+  ARGS+=("-G" "Ninja" "-DCMAKE_TOOLCHAIN_FILE=$PWD/../.github/scripts/windows-ghc-toolchain.cmake")
   sed -i 's/find_library(GMP_LIBRARY gmp)/find_library(GMP_LIBRARY NAMES libgmp.a)/' CMakeLists.txt
+
+  # This ends up causing the system headers to be included with -I and
+  # thus they override the GHC mingw compiler ones. So this removes it
+  # and re-adds the include with idirafter via the toolchain file
+  sed -i '/INCLUDE_DIRECTORIES.*OPENSSL_INCLUDE_DIR/d' CMakeLists.txt
+
+  # Apply windows-specific libff patch carried by hevm
+  curl -fsSL https://raw.githubusercontent.com/ethereum/hevm/1abe4c79eeada928acc279b631c48eeb2a1376c2/.github/scripts/libff.patch | patch -p1
 fi
 
 mkdir -p build

.github/scripts/install-libff.sh

@@ -9,11 +9,11 @@ if [ -f $HOME/.local/lib/libsecp256k1.a ]; then
   exit 0
 fi
 
-gitRef="21ffe4b22a9683cf24ae0763359e401d1284cc7a"
-curl -LO "https://github.com/bitcoin-core/secp256k1/archive/$gitRef.zip"
+INSTALL_VERSION=0.6.0
+curl -LO "https://github.com/bitcoin-core/secp256k1/archive/v$INSTALL_VERSION.zip"
 
-unzip "$gitRef.zip"
-cd "secp256k1-$gitRef"
+unzip "v$INSTALL_VERSION.zip" && rm "v$INSTALL_VERSION.zip"
+cd "secp256k1-$INSTALL_VERSION"
 
 ./autogen.sh
 # hevm needs reecovery module

.github/scripts/install-libsecp256k1.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+set -eux -o pipefail
+
+if [ "$HOST_OS" = "Linux" ]; then
+  if [ $(uname -m) = "aarch64" ]; then
+    curl -fsSL -o z3.zip https://github.com/Z3Prover/z3/releases/download/z3-4.15.2/z3-4.15.2-arm64-glibc-2.34.zip
+  elif [ $(uname -m) = "x86_64" ]; then
+    curl -fsSL -o z3.zip https://github.com/Z3Prover/z3/releases/download/z3-4.15.2/z3-4.15.2-x64-glibc-2.39.zip
+  fi
+  unzip z3.zip
+  cp -a z3-*/bin/z3 "$HOME/.local/bin/"
+  rm -rf z3-*/ z3.zip
+fi
+if [ "$HOST_OS" = "Windows" ]; then
+  choco install z3
+fi

.github/scripts/install-z3.sh

@@ -0,0 +1,12 @@
+set(CMAKE_SYSTEM_NAME Windows)
+
+set(CMAKE_C_COMPILER "$ENV{HASKELL_MINGW_PATH}/bin/cc.exe")
+set(CMAKE_CXX_COMPILER "$ENV{HASKELL_MINGW_PATH}/bin/c++.exe")
+
+set(CMAKE_C_FLAGS "-idirafter $ENV{SYSTEM_MINGW_PATH}/include")
+set(CMAKE_CXX_FLAGS "-idirafter $ENV{SYSTEM_MINGW_PATH}/include")
+
+set(CMAKE_FIND_ROOT_PATH "$ENV{HASKELL_MINGW_PATH}")
+set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM BOTH)
+set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY BOTH)
+set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE BOTH)

.github/scripts/windows-ghc-toolchain.cmake

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Assert test
         uses: crytic/echidna-action@v2