From 8e8021143664c1d7a60cd41a188e8599bcbafb90 Mon Sep 17 00:00:00 2001
From: Nikolaus Heger <nheger@gmail.com>
Date: Tue, 1 Sep 2026 00:04:06 +0800
Subject: [PATCH] Fix format check under current nightly rustfmt and pin the
 toolchain

Nightly rustfmt 2026-08-30 wraps two long trailing comments, breaking the
unpinned +nightly format check on main for every PR. Moves both comments
onto their own lines and pins rustfmt to nightly-2026-08-31 in the ubuntu/
macos setup actions, ci.yml and the release workflow, so formatting rules
only change when the pin is bumped.
---
 .github/actions/macos/action.yml                     | 2 +-
 .github/actions/ubuntu/action.yml                    | 2 +-
 .github/workflows/ci.yml                             | 2 +-
 .github/workflows/create-release-tag-and-publish.yml | 2 +-
 src/cli/cold_signing.rs                              | 5 +++--
 src/cli/wormhole.rs                                  | 5 +++--
 6 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/.github/actions/macos/action.yml b/.github/actions/macos/action.yml
index 1f2adb1..f1a37fa 100644
--- a/.github/actions/macos/action.yml
+++ b/.github/actions/macos/action.yml
@@ -28,7 +28,7 @@ runs:
         
         rustup toolchain install
         rustup target add wasm32-unknown-unknown
-        rustup component add rustfmt --toolchain nightly
+        rustup toolchain install nightly-2026-08-31 --profile minimal --component rustfmt
         rustup component add clippy rust-src
       shell: bash
     - name: Set LIBCLANG_PATH for clang-sys (bindgen/rocksdb etc.)
diff --git a/.github/actions/ubuntu/action.yml b/.github/actions/ubuntu/action.yml
index 563a72b..ae86a28 100644
--- a/.github/actions/ubuntu/action.yml
+++ b/.github/actions/ubuntu/action.yml
@@ -20,7 +20,7 @@ runs:
         # This installs the channel + every component/target listed in the file.
         rustup toolchain install
         rustup target add wasm32-unknown-unknown
-        rustup component add rustfmt --toolchain nightly
+        rustup toolchain install nightly-2026-08-31 --profile minimal --component rustfmt
         rustup component add clippy rust-src
       shell: bash
     - name: Set LIBCLANG_PATH for clang-sys (bindgen/rocksdb etc.)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f6c0e60..462c11d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -43,7 +43,7 @@ jobs:
       - name: Run format checks
         run: |
           taplo format --check --config taplo.toml
-          cargo +nightly fmt --all -- --check
+          cargo +nightly-2026-08-31 fmt --all -- --check
 
   build-and-test-matrix:
     name: 🛠️ Build & Test Matrix
diff --git a/.github/workflows/create-release-tag-and-publish.yml b/.github/workflows/create-release-tag-and-publish.yml
index 4358f21..fcc4663 100644
--- a/.github/workflows/create-release-tag-and-publish.yml
+++ b/.github/workflows/create-release-tag-and-publish.yml
@@ -77,7 +77,7 @@ jobs:
       - name: Run format checks
         run: |
           taplo format --check --config taplo.toml
-          cargo +nightly fmt --all -- --check
+          cargo +nightly-2026-08-31 fmt --all -- --check
 
   build-and-test:
     name: 🛠️ Build & Test Release
diff --git a/src/cli/cold_signing.rs b/src/cli/cold_signing.rs
index 4dd5619..461995a 100644
--- a/src/cli/cold_signing.rs
+++ b/src/cli/cold_signing.rs
@@ -606,8 +606,9 @@ mod tests {
 		expected_tail.extend(codec::Encode::encode(&codec::Compact(7u64)));
 		expected_tail.extend(codec::Encode::encode(&codec::Compact(0u128)));
 		expected_tail.push(0u8); // CheckMetadataHash mode = disabled
-						   // Implicit: specVersion, txVersion (LE u32), genesis, era anchor block hash,
-						   // metadataHash Option = None
+
+		// Implicit: specVersion, txVersion (LE u32), genesis, era anchor block hash,
+		// metadataHash Option = None
 		expected_tail.extend(136u32.to_le_bytes());
 		expected_tail.extend(3u32.to_le_bytes());
 		expected_tail.extend([0x49u8; 32]);
diff --git a/src/cli/wormhole.rs b/src/cli/wormhole.rs
index de4cae6..7e5a61b 100644
--- a/src/cli/wormhole.rs
+++ b/src/cli/wormhole.rs
@@ -4348,8 +4348,9 @@ async fn run_check_nullifier(
 	log_print!("  Subsquid URL: {}", subsquid_url);
 	log_print!("");
 
-	// Compute nullifiers for each transfer count
-	let mut nullifiers_to_check: Vec<(String, String, u64)> = Vec::new(); // (nullifier_hex, nullifier_hash, transfer_count)
+	// Compute nullifiers for each transfer count:
+	// (nullifier_hex, nullifier_hash, transfer_count)
+	let mut nullifiers_to_check: Vec<(String, String, u64)> = Vec::new();
 
 	for tc in &transfer_counts {
 		let nullifier = wormhole_lib::compute_nullifier(&secret, *tc).map_err(|e| {