math: in-repo Lehmer 3072-bit modular inverse + std ceil_log_2

.github/workflows/ci.yaml

@@ -181,7 +181,7 @@ jobs:
       - name: Install stable toolchain
         uses: dtolnay/rust-toolchain@stable
         with:
-          toolchain: 1.93.0
+          toolchain: 1.95.0
           components: rustfmt, clippy
 
       - name: Set up cache

Cargo.toml

@@ -70,7 +70,7 @@ members = [
 ]
 
 [workspace.package]
-rust-version = "1.91.0"
+rust-version = "1.95.0"
 version = "2.0.0"
 authors = ["Kaspa developers"]
 license = "ISC"

consensus/src/processes/sync/mod.rs

@@ -4,7 +4,6 @@ use itertools::Itertools;
 use kaspa_consensus_core::errors::sync::{SyncManagerError, SyncManagerResult};
 use kaspa_database::prelude::StoreResultExt;
 use kaspa_hashes::Hash;
-use kaspa_math::uint::malachite_base::num::arithmetic::traits::CeilingLogBase2;
 use parking_lot::RwLock;
 
 use crate::model::{
@@ -141,7 +140,7 @@ impl<
             return Err(SyncManagerError::LowHashHigherThanHighHash(low, high));
         }
 
-        let mut locator = Vec::with_capacity((high_index - low_index).ceiling_log_base_2() as usize);
+        let mut locator = Vec::with_capacity(kaspa_math::ceil_log_2(high_index - low_index) as usize);
         let mut step = 1;
         let mut current_index = high_index;
         while current_index > low_index {

crypto/muhash/src/u3072.rs

@@ -163,7 +163,12 @@ impl U3072 {
         if a == Self::zero() {
             return a;
         }
-        let inv = Self { limbs: Uint3072(a.limbs).mod_inverse(Self::UINT_PRIME).expect("Cannot fail, 0 < a < prime").0 };
+        let inv = {
+            let mut out = [0u64; LIMBS];
+            let invertible = kaspa_math::lehmer::invert(a.limbs, Self::UINT_PRIME.0, &mut out);
+            assert!(invertible, "Cannot fail, 0 < a < prime");
+            Self { limbs: out }
+        };
         if cfg!(debug_assertions) {
             let mut one = inv;
             one *= a;

docker/Dockerfile.kaspa-wallet

@@ -1,5 +1,5 @@
 # ---------------------------------------- Chef image -------------------------------------------
-FROM rust:1.91-alpine3.23 AS chef
+FROM rust:1.95-alpine3.23 AS chef
 RUN apk --no-cache add \
   musl-dev \
   protobuf-dev \

docker/Dockerfile.kaspad

@@ -1,5 +1,5 @@
 # ---------------------------------------- Chef image -------------------------------------------
-FROM rust:1.91-alpine3.23 AS chef
+FROM rust:1.95-alpine3.23 AS chef
 RUN apk --no-cache add \
   musl-dev \
   protobuf-dev \

docker/Dockerfile.rothschild

@@ -1,5 +1,5 @@
 # ---------------------------------------- Chef image -------------------------------------------
-FROM rust:1.91-alpine3.23 AS chef
+FROM rust:1.95-alpine3.23 AS chef
 RUN apk --no-cache add \
   musl-dev \
   protobuf-dev \

docker/Dockerfile.simpa

@@ -1,5 +1,5 @@
 # ---------------------------------------- Chef image -------------------------------------------
-FROM rust:1.91-alpine3.23 AS chef
+FROM rust:1.95-alpine3.23 AS chef
 RUN apk --no-cache add \
   musl-dev \
   protobuf-dev \

docker/Dockerfile.stratum-bridge

@@ -1,5 +1,5 @@
 # ---------------------------------------- Chef image -------------------------------------------
-FROM rust:1.91-alpine3.23 AS chef
+FROM rust:1.95-alpine3.23 AS chef
 RUN apk --no-cache add \
   musl-dev \
   protobuf-dev \

math/Cargo.toml

@@ -14,8 +14,6 @@ borsh.workspace = true
 faster-hex.workspace = true
 js-sys.workspace = true
 kaspa-utils = { workspace = true, features = ["mem_size"] }
-malachite-base.workspace = true
-malachite-nz.workspace = true
 serde-wasm-bindgen.workspace = true
 serde.workspace = true
 thiserror.workspace = true
@@ -27,10 +25,34 @@ workflow-wasm.workspace = true
 [dev-dependencies]
 rand_chacha.workspace = true
 criterion.workspace = true
+# malachite (LGPL) is no longer a production dependency: it backed only `mod_inverse` (now the
+# in-repo MIT `lehmer::invert`) and `CeilingLogBase2` (now std). It remains a dev-dependency purely
+# as the cross-check oracle for `lehmer.rs` / `lib.rs` tests and the `candidates` bench baseline.
+malachite-base.workspace = true
+malachite-nz.workspace = true
+# The modinv-candidate comparison is settled (Lehmer ext-gcd won), so the third-party candidate
+# deps are removed. Their bench arms in benches/candidates.rs are commented out and can be revived
+# by re-adding the deps:
+#   dashu-int = "0.4"      # gcd_ext modinv (~23us) + the Uint192/256/320 production-pattern comparator.
+#                          # the mul tuning from https://github.com/cmpute/dashu/pull/74 was also
+#                          # benched (local clone; broken gitlink) and showed no effect at 48 limbs.
+#   crypto-bigint = "0.7"  # safegcd vartime/const-time modinv (~114/126us, 7-8x slower)
+#   num-bigint = "0.4"     # ~513us, ruled out
+#   ruint = "1"            # ~72us, ruled out
+
+[features]
+# Bench/diagnostics only: accumulate per-inverse operation counts in `lehmer`
+# (matrices, divides, apply-limb iterations) into atomics. Off by default; has
+# zero effect on the production path.
+lehmer-instrument = []
 
 [[bench]]
 name = "bench"
 harness = false
 
+[[bench]]
+name = "candidates"
+harness = false
+
 [lints]
 workspace = true

math/benches/bench.rs

@@ -130,7 +130,9 @@ fn bench_uint3072(c: &mut Criterion) {
     uint3072_c.bench_function("mod_inv Muhash prime", |b| {
         b.iter(|| {
             for &a in &uint3072_one[..uint3072_one.len() / 4] {
-                black_box(a.mod_inverse(PRIME));
+                // generic mod_inverse was removed; inverse the reduced value via lehmer::invert
+                let mut out = [0u64; 48];
+                black_box(kaspa_math::lehmer::invert((a % PRIME).0, PRIME.0, &mut out));
             }
         });
     });