chore: bump rust toolchain and deps (#36)

* chore: bump rust toolchain and deps

* run CI jobs on ubuntu-latest-arm

* bump CI actions

* fix arm runner name

* fix codecov upload step

* fix build errors

* fix Makefile

* fix CI deps

* fix

* typo

Author: hanabi1224

.github/workflows/ci.yml

@@ -21,9 +21,9 @@ env:
 jobs:
   test:
     name: build-and-test
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04-arm
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Setup sccache
         uses: mozilla-actions/sccache-action@v0.0.9
         timeout-minutes: 5
@@ -35,17 +35,24 @@ jobs:
 
   lint:
     name: All lint checks
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04-arm
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Setup sccache
         uses: mozilla-actions/sccache-action@v0.0.9
         timeout-minutes: 5
         continue-on-error: true
+      - name: Apt Dependencies
+        uses: nick-fields/retry@v3
+        with:
+          timeout_minutes: 5
+          max_attempts: 3
+          command: |
+            sudo apt-get install -y build-essential # required dep for cargo-spellcheck
       - name: Install LLVM and Clang
         uses: KyleMayes/install-llvm-action@v2
         with:
-          version: "14"
+          version: "18"
       - name: Install Lint tools
         run: make install-lint-tools-ci
         env:
@@ -55,9 +62,9 @@ jobs:
 
   dependencies-check:
     name: Check cargo dependencies
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04-arm
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
@@ -66,10 +73,10 @@ jobs:
         run: |
           gem install toml-rb --no-document
           ruby scripts/linters/find_unused_deps.rb
-  codedov:
-    runs-on: ubuntu-latest
+  codecov:
+    runs-on: ubuntu-24.04-arm
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - uses: taiki-e/install-action@cargo-llvm-cov
       - name: Setup sccache
         uses: mozilla-actions/sccache-action@v0.0.9
@@ -78,15 +85,14 @@ jobs:
       - run: cargo llvm-cov --all-features --lcov --output-path lcov.info
         env:
           RUSTC_WRAPPER:
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v6
         with:
           name: lcov.info
           path: lcov.info
           if-no-files-found: error
-      - name: Upload to codecov
-        env:
-          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
-        run: |
-          curl -Os https://uploader.codecov.io/latest/linux/codecov
-          chmod +x codecov
-          ./codecov -f lcov.info -Z
+      - name: Upload CodeCov
+        uses: codecov/codecov-action@v5
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+          files: lcov.info
+          fail_ci_if_error: true

.github/workflows/release-plz.yml

@@ -9,11 +9,11 @@ jobs:
   # Release unpublished packages.
   release-plz-release:
     name: Release-plz release
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04-arm
     permissions:
       contents: write
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 0
           persist-credentials: false
@@ -28,15 +28,15 @@ jobs:
   # Create a PR with the new versions and changelog, preparing the next release.
   release-plz-pr:
     name: Release-plz PR
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04-arm
     permissions:
       contents: write
       pull-requests: write
     concurrency:
       group: release-plz-${{ github.ref }}
       cancel-in-progress: false
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 0
           persist-credentials: false

Cargo.toml

@@ -12,25 +12,26 @@ rust-version = "1.85.0"
 [workspace.dependencies]
 ahash = "0.8"
 anyhow = "1"
-base32 = "0.5.1"
+base32 = "0.5"
 base64 = "0.22"
 bls-signatures = { version = "0.15" }
 bls12_381 = "0.8"
-cid = { version = "0.10.1", features = ["std"] }
-fvm_ipld_bitfield = "0.7.1"
+cid = { version = "0.11", features = ["std"] }
+fvm_ipld_bitfield = "0.7"
 fvm_ipld_encoding = "0.5"
-hashlink = "0.10.0"
+hashlink = "0.11"
 hex = "0.4"
 jsonrpsee = { version = "0.26", features = ["ws-client", "http-client"] }
-keccak-hash = "0.11"
-num-bigint = { version = "0.4.6", features = ["serde"] }
-num-traits = "0.2.19"
+keccak-hash = "0.12"
+multihash-codetable = { version = "0.1" }
+num-bigint = { version = "0.4", features = ["serde"] }
+num-traits = "0.2"
 parking_lot = "0.12"
 rand = "0.8"
 serde = { version = "1", features = ["derive"] }
-serde_cbor = "0.11.2"
+serde_cbor = { package = "serde_cbor_2", version = "0.13" }
 serde_json = { version = "1", features = ["raw_value"] }
-sha3 = "0.10.8"
+sha3 = "0.10"
 strum = { version = "0.27.1", features = ["derive"] }
 strum_macros = "0.27.1"
 thiserror = "2"

Makefile

@@ -50,9 +50,20 @@ install-lint-tools:
 	cargo install --locked cargo-deny
 	cargo install --locked cargo-spellcheck
 
-install-lint-tools-ci:
-	wget https://github.com/cargo-bins/cargo-binstall/releases/latest/download/cargo-binstall-x86_64-unknown-linux-musl.tgz
-	tar xzf cargo-binstall-x86_64-unknown-linux-musl.tgz
+# Denotes the architecture of the machine. This is required for direct binary downloads.
+# Note that some repositories might use different names for the same architecture.
+CPU_ARCH := $(shell \
+  ARCH=$$(uname -m); \
+  if [ "$$ARCH" = "arm64" ]; then \
+    ARCH="aarch64"; \
+  fi; \
+  echo "$$ARCH" \
+)
+
+install-cargo-binstall:
+	wget https://github.com/cargo-bins/cargo-binstall/releases/latest/download/cargo-binstall-$(CPU_ARCH)-unknown-linux-musl.tgz
+	tar xzf cargo-binstall-$(CPU_ARCH)-unknown-linux-musl.tgz
 	cp cargo-binstall ~/.cargo/bin/cargo-binstall
 
+install-lint-tools-ci: install-cargo-binstall
 	cargo binstall --no-confirm taplo-cli cargo-spellcheck cargo-deny

gpbft/Cargo.toml

@@ -18,6 +18,7 @@ filecoin-f3-merkle = { path = "../merkle", version = "0.1.0" }
 fvm_ipld_bitfield = { workspace = true }
 fvm_ipld_encoding = { workspace = true }
 keccak-hash = { workspace = true }
+multihash-codetable = { workspace = true, features = ["blake2b"] }
 num-bigint = { workspace = true }
 num-traits = { workspace = true }
 serde = { workspace = true }
@@ -31,7 +32,8 @@ base64 = { workspace = true }
 serde_json = { workspace = true }
 
 [target.'cfg(target_family="wasm")'.dependencies]
-getrandom = { version = "0.3", features = ["wasm_js"] }
+getrandom_0_2 = { package = "getrandom", version = "0.2", features = ["js"] }
+getrandom_0_3 = { package = "getrandom", version = "0.3", features = ["wasm_js"] }
 
 [features]
 test-utils = []

gpbft/src/chain.rs

@@ -3,9 +3,8 @@
 
 use crate::GPBFTError;
 pub use cid::Cid;
-use cid::multihash::Code::Blake2b256;
-use cid::multihash::MultihashDigest;
 use fvm_ipld_encoding::DAG_CBOR;
+use multihash_codetable::{Code::Blake2b256, MultihashDigest as _};
 use std::fmt::Display;
 use std::{cmp, fmt};
 

rust-toolchain.toml

@@ -1,4 +1,4 @@
 [toolchain]
-channel = "1.85.0"
+channel = "1.92.0"
 components = ["clippy", "llvm-tools-preview", "rustfmt"]
 targets = ["wasm32-unknown-unknown"]