Revert malachite upgrade (#201)

Consensus is breaking after the malachite upgrade. Try reverting to see
if the cause is related to the upgrade.

.github/workflows/verify.yml

@@ -14,6 +14,9 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 
+env:
+  MALACHITE_GIT_REF: "8a9f3702eb41199bc8a7f45139adba233a04744a"
+
 jobs:
   build:
     timeout-minutes: 20
@@ -35,15 +38,26 @@ jobs:
         uses: arduino/setup-protoc@v3
 
       - uses: actions/checkout@v4
+        with:
+          repository: informalsystems/malachite
+          ref: ${{ env.MALACHITE_GIT_REF }}
+          path: ./malachite
+
+      - uses: actions/checkout@v4
+        with:
+          path: ./snapchain
 
-      - env:
+      - working-directory: ./snapchain
+        env:
           RUSTFLAGS: "-Dwarnings"
         run: cargo test
 
-      - env:
+      - working-directory: ./snapchain
+        env:
           RUSTFLAGS: "-Dwarnings"
         run: cargo build --bins
 
-      - env:
+      - working-directory: ./snapchain
+        env:
           RUSTFLAGS: "-Dwarnings"
         run: cargo fmt --all --check

Cargo.toml

@@ -25,10 +25,11 @@ async-trait = "0.1.68"
 tracing-subscriber = { version = "0.3.18", features = ["env-filter", "fmt", "json"] }
 hex = "0.4.3"
 ractor = "0.11.2"
-informalsystems-malachitebft-core-consensus = { version = "0.0.1" }
-informalsystems-malachitebft-core-types = { version = "0.0.1"}
-informalsystems-malachitebft-config = { version = "0.0.1"}
-informalsystems-malachitebft-metrics = { version = "0.0.1" }
+malachite-consensus = { path = "../malachite/code/crates/consensus" }
+malachite-common = { path = "../malachite/code/crates/common" }
+malachite-config = { path = "../malachite/code/crates/config" }
+malachite-node = { path = "../malachite/code/crates/node" }
+malachite-metrics = { path = "../malachite/code/crates/metrics" }
 blake3 = "1.4.1"
 tracing = "0.1.40"
 thiserror = "1.0.66"

Dockerfile

@@ -2,11 +2,25 @@ FROM rust:1.83 AS builder
 
 WORKDIR /usr/src/app
 
-RUN apt-get update && apt-get install -y libclang-dev libjemalloc-dev llvm-dev make protobuf-compiler cmake
+# Build Malachite first
+ARG MALACHITE_GIT_REPO_URL=https://github.com/informalsystems/malachite.git
+ENV MALACHITE_GIT_REPO_URL=$MALACHITE_GIT_REPO_URL
+ARG MALACHITE_GIT_REF=8a9f3702eb41199bc8a7f45139adba233a04744a
+ENV RUST_BACKTRACE=1
+RUN <<EOF
+set -eu
+apt-get update && apt-get install -y libclang-dev git libjemalloc-dev llvm-dev make protobuf-compiler libssl-dev openssh-client cmake
+cd ..
+git clone $MALACHITE_GIT_REPO_URL
+cd malachite
+git checkout $MALACHITE_GIT_REF
+cd code
+cargo build
+EOF
 
 # Unfortunately, we can't prefetch creates without including the source code,
 # since the Cargo configuration references files in src.
-# This means we'll re-fetch all crates every time the source code changes,
+# This means we'll re-fetch all creates every time the source code changes,
 # which isn't ideal.
 COPY Cargo.toml build.rs ./
 COPY src ./src

Makefile

@@ -1,6 +1,6 @@
 .PHONY: build
 build:
-	docker compose build
+	docker compose build --ssh default
 
 .PHONY: dev
 dev: build