chore: update rust and dependencies versions (#7)

XuJiandong · web-flow · commit 7e7a437c17e1 · 2025-09-30T16:03:42.000+08:00
* chore: update rust and dependencies versions

* chore: remove llvm dependency

* chore: clippy
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -8,7 +8,7 @@ overflow-checks = true
 opt-level = 3
 panic = 'abort'
 strip = true
-lto = true
+codegen-units = 1
 
 [profile.dev]
 strip = true
diff --git a/Makefile b/Makefile
@@ -6,7 +6,7 @@ TOP := $(cur_dir)
 # RUSTFLAGS that are likely to be tweaked by developers. For example,
 # while we enable debug logs by default here, some might want to strip them
 # for minimal code size / consumed cycles.
-CUSTOM_RUSTFLAGS := --cfg debug_assertions
+CUSTOM_RUSTFLAGS := -C debug-assertions
 # Additional cargo args to append here. For example, one can use
 # make test CARGO_ARGS="-- --nocapture" so as to inspect data emitted to
 # stdout in unit tests
@@ -71,7 +71,7 @@ check:
 	cargo check $(CARGO_ARGS)
 
 clippy:
-	cargo clippy $(CARGO_ARGS)
+	cargo clippy $(CARGO_ARGS) --target=riscv64imac-unknown-none-elf
 
 fmt:
 	cargo fmt $(CARGO_ARGS)
@@ -121,8 +121,9 @@ generate:
 
 prepare:
 	rustup target add riscv64imac-unknown-none-elf
-	cargo install --git https://github.com/nervosnetwork/ckb-standalone-debugger ckb-debugger --tag v0.118.0
-	wget https://apt.llvm.org/llvm.sh && chmod +x llvm.sh && sudo ./llvm.sh 18 && rm llvm.sh
+	wget 'https://github.com/nervosnetwork/ckb-standalone-debugger/releases/download/v0.200.2/ckb-debugger_v0.200.2_x86_64-unknown-linux-gnu.tar.gz'
+	tar xzvf ckb-debugger_v0.200.2_x86_64-unknown-linux-gnu.tar.gz
+	mv ckb-debugger ~/.cargo/bin
 
 ci: build
 	ls -alht build/release
diff --git a/README.md b/README.md
@@ -22,15 +22,13 @@ make ci
 ```
 
 ## Benchmark Matrix
-Test with [ckb-debugger 0.118](https://github.com/nervosnetwork/ckb-standalone-debugger)
+Test with [ckb-debugger 0.200.2](https://github.com/nervosnetwork/ckb-standalone-debugger)
 
 | Curve | Cycles | Binary Size | Additional Information  |
 |----------|----------|----------|-----------------------|
-| p256     |  3.8M Cycles  | 75K Bytes   | N/A      |
-| k256     |  3.7M Cycles  | 107K Bytes  | No precomputed table    |
-| RSA-2048 |  5.4M Cycles  | 113K Bytes   | N/A      |
-| ed25519  |  2.0M Cycles  | 55K Bytes   | N/A      |
-| schnorr  |  3.8M Cycles  | 84K Bytes  | N/A      |
-| k256     |  7.8M Cycles  | 122K Bytes  | Recovery |
-
-The k256 recovery can be boosted with this [PR](https://github.com/RustCrypto/signatures/pull/831).
+| p256     |  4.8M Cycles  | 73K Bytes   | N/A      |
+| k256     |  3.6M Cycles  | 94K Bytes  | No precomputed table    |
+| RSA-2048 |  5.7M Cycles  | 135K Bytes   | N/A      |
+| ed25519  |  2.0M Cycles  | 63K Bytes   | N/A      |
+| schnorr  |  3.5M Cycles  | 80K Bytes  | N/A      |
+| k256     |  3.8M Cycles  | 97K Bytes  | Recovery |
diff --git a/contracts/ed25519-test/Cargo.toml b/contracts/ed25519-test/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-ckb-std = { version = "0.15.3", features = ["build-with-clang"] }
+ckb-std = { version = "0.18.0", default-features = false, features = ["allocator", "dummy-atomic"]} 
 ed25519-dalek = { version = "2.1.1", default-features = false, features = ["digest"] }
 curve25519-dalek = { version = "4.1.2", default-features = false, features = ["digest"] }
 hex-literal = "0.3"
diff --git a/contracts/ed25519-test/Makefile b/contracts/ed25519-test/Makefile
@@ -6,7 +6,7 @@ TOP := $(cur_dir)
 # RUSTFLAGS that are likely to be tweaked by developers. For example,
 # while we enable debug logs by default here, some might want to strip them
 # for minimal code size / consumed cycles.
-CUSTOM_RUSTFLAGS := --cfg debug_assertions
+CUSTOM_RUSTFLAGS := -C debug-assertions
 # RUSTFLAGS that are less likely to be tweaked by developers. Most likely
 # one would want to keep the default values here.
 FULL_RUSTFLAGS := -C target-feature=+zba,+zbb,+zbc,+zbs,-a $(CUSTOM_RUSTFLAGS)
diff --git a/contracts/ed25519-test/src/error.rs b/contracts/ed25519-test/src/error.rs
@@ -18,6 +18,7 @@ impl From<SysError> for Error {
             LengthNotEnough(_) => Self::LengthNotEnough,
             Encoding => Self::Encoding,
             Unknown(err_code) => panic!("unexpected sys error {}", err_code),
+            _ => panic!("unknown error"),
         }
     }
 }
diff --git a/contracts/k256-recovery-test/Cargo.toml b/contracts/k256-recovery-test/Cargo.toml
@@ -6,8 +6,8 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-ckb-std = { version = "0.15.3", features = ["build-with-clang"] }
-k256 = { version = "=0.13.1", default-features = false, features = ["arithmetic", "ecdsa", "alloc"] }
+ckb-std = { version = "0.18.0", default-features = false, features = ["allocator", "dummy-atomic"]} 
+k256 = { version = "0.14.0-pre.11", default-features = false, features = ["arithmetic", "ecdsa", "alloc"] }
 hex = { version = "0.4", default-features = false, features = ["alloc"] }
 
 [features]
diff --git a/contracts/k256-recovery-test/Makefile b/contracts/k256-recovery-test/Makefile
@@ -6,7 +6,7 @@ TOP := $(cur_dir)
 # RUSTFLAGS that are likely to be tweaked by developers. For example,
 # while we enable debug logs by default here, some might want to strip them
 # for minimal code size / consumed cycles.
-CUSTOM_RUSTFLAGS := --cfg debug_assertions
+CUSTOM_RUSTFLAGS := -C debug-assertions
 # RUSTFLAGS that are less likely to be tweaked by developers. Most likely
 # one would want to keep the default values here.
 FULL_RUSTFLAGS := -C target-feature=+zba,+zbb,+zbc,+zbs,-a $(CUSTOM_RUSTFLAGS)
diff --git a/contracts/k256-recovery-test/src/entry.rs b/contracts/k256-recovery-test/src/entry.rs
@@ -36,7 +36,8 @@ fn gen() -> (Vec<u8>, Vec<u8>, Vec<u8>, u8) {
     let sk = SigningKey::from_slice(&SECRET_KEY).unwrap();
     let pk = sk.verifying_key();
     let msg_bytes = generate_msg();
-    let (signature, rec_id) = sk.sign_recoverable(&msg_bytes).unwrap();
+
+    let (signature, rec_id) = sk.sign_prehash_recoverable(&msg_bytes).unwrap();
 
     debug(format!("msg_bytes = {}", hex::encode(&msg_bytes)));
 
@@ -63,7 +64,7 @@ fn gen() -> (Vec<u8>, Vec<u8>, Vec<u8>, u8) {
         hex::decode("68656c6c6f2c20776f726c640000000000000000000000000000000000000000").unwrap();
     let pub_bytes =
         hex::decode("030cec028ee08d09e02672a68310814354f9eabfff0de6dacc1cd3a774496076ae").unwrap();
-    let sig_bytes = hex::decode("0370aa07db8be44caed0f4c77aa6a644fa97228feeb7082ae66f640fe0d7d728610c2a4e1655183d134e191c8a4a06d970bc7a94a25420f5026a0288ff47ad42").unwrap();
+    let sig_bytes = hex::decode("bb54baa41daefb2b6931ddbbbb636054b9027e966a61c3bf5fb75e26b2f2a78f1c65827dba40d81242ae3362e3a936e18092f21d5be8a1ff1b7693cc85068d3a").unwrap();
     let rec_id = 1u8;
     (msg_bytes, pub_bytes, sig_bytes, rec_id)
 }
@@ -75,7 +76,8 @@ pub fn main() -> Result<(), Error> {
     let rec_id = RecoveryId::try_from(rec_id).unwrap();
 
     let last = current_cycles();
-    let recovered_key = VerifyingKey::recover_from_msg(&msg_bytes, &signature, rec_id).unwrap();
+    let recovered_key =
+        VerifyingKey::recover_from_prehash_noverify(&msg_bytes, &signature, rec_id).unwrap();
     assert_eq!(recovered_key, pk);
     let _recovered_key_bytes = recovered_key.to_sec1_bytes();
     let cycles = current_cycles() - last;
diff --git a/contracts/k256-recovery-test/src/error.rs b/contracts/k256-recovery-test/src/error.rs
@@ -18,6 +18,7 @@ impl From<SysError> for Error {
             LengthNotEnough(_) => Self::LengthNotEnough,
             Encoding => Self::Encoding,
             Unknown(err_code) => panic!("unexpected sys error {}", err_code),
+            _ => panic!("unknown error"),
         }
     }
 }
diff --git a/contracts/k256-test/Cargo.toml b/contracts/k256-test/Cargo.toml
@@ -6,8 +6,8 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-ckb-std = { version = "0.15.3", features = ["build-with-clang"] }
-k256 = { version = "=0.13.1", default-features = false, features = ["arithmetic", "ecdsa", "alloc"] }
+ckb-std = { version = "0.18.0", default-features = false, features = ["allocator", "dummy-atomic"]} 
+k256 = { version = "0.14.0-pre.11", default-features = false, features = ["arithmetic", "ecdsa", "alloc"] }
 hex = { version = "0.4", default-features = false, features = ["alloc"] }
 
 [features]
diff --git a/contracts/k256-test/Makefile b/contracts/k256-test/Makefile
@@ -6,7 +6,7 @@ TOP := $(cur_dir)
 # RUSTFLAGS that are likely to be tweaked by developers. For example,
 # while we enable debug logs by default here, some might want to strip them
 # for minimal code size / consumed cycles.
-CUSTOM_RUSTFLAGS := --cfg debug_assertions
+CUSTOM_RUSTFLAGS := -C debug-assertions
 # RUSTFLAGS that are less likely to be tweaked by developers. Most likely
 # one would want to keep the default values here.
 FULL_RUSTFLAGS := -C target-feature=+zba,+zbb,+zbc,+zbs,-a $(CUSTOM_RUSTFLAGS)
diff --git a/contracts/k256-test/src/error.rs b/contracts/k256-test/src/error.rs
@@ -18,6 +18,7 @@ impl From<SysError> for Error {
             LengthNotEnough(_) => Self::LengthNotEnough,
             Encoding => Self::Encoding,
             Unknown(err_code) => panic!("unexpected sys error {}", err_code),
+            _ => panic!("unknown error"),
         }
     }
 }
diff --git a/contracts/p256-test/Cargo.toml b/contracts/p256-test/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-ckb-std = { version = "0.15.3", features = ["build-with-clang"] }
+ckb-std = { version = "0.18.0", default-features = false, features = ["allocator", "dummy-atomic"]} 
 p256 = { version = "0.13.2", default-features = false, features = ["arithmetic", "ecdsa", "alloc"] }
 hex = { version = "0.4", default-features = false, features = ["alloc"] }
 
diff --git a/contracts/p256-test/Makefile b/contracts/p256-test/Makefile
@@ -6,7 +6,7 @@ TOP := $(cur_dir)
 # RUSTFLAGS that are likely to be tweaked by developers. For example,
 # while we enable debug logs by default here, some might want to strip them
 # for minimal code size / consumed cycles.
-CUSTOM_RUSTFLAGS := --cfg debug_assertions
+CUSTOM_RUSTFLAGS := -C debug-assertions
 # RUSTFLAGS that are less likely to be tweaked by developers. Most likely
 # one would want to keep the default values here.
 FULL_RUSTFLAGS := -C target-feature=+zba,+zbb,+zbc,+zbs,-a $(CUSTOM_RUSTFLAGS)
diff --git a/contracts/p256-test/src/entry.rs b/contracts/p256-test/src/entry.rs
@@ -13,7 +13,6 @@ use ckb_std::syscalls::debug;
 // https://docs.rs/ckb-std/
 use crate::error::Error;
 use ckb_std::syscalls::current_cycles;
-use hex;
 use p256::ecdsa::{
     signature::{Signer, Verifier},
     Signature, SigningKey, VerifyingKey,
diff --git a/contracts/p256-test/src/error.rs b/contracts/p256-test/src/error.rs
@@ -18,6 +18,7 @@ impl From<SysError> for Error {
             LengthNotEnough(_) => Self::LengthNotEnough,
             Encoding => Self::Encoding,
             Unknown(err_code) => panic!("unexpected sys error {}", err_code),
+            _ => panic!("Unknown error"),
         }
     }
 }
diff --git a/contracts/rsa-test/Cargo.toml b/contracts/rsa-test/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-ckb-std = { version = "0.15.3", features = ["build-with-clang"] }
-rsa = { version = "0.9.2", default-features = false, features = ["u64_digit", "sha2"]}
+ckb-std = { version = "0.18.0", default-features = false, features = ["allocator", "dummy-atomic"]} 
+rsa = { version = "0.9.8", default-features = false, features = ["u64_digit", "sha2"]}
 num-traits = { version= "0.2.9", default-features = false, features = ["libm"] }
 signature = { version = "2.0.0", default-features = false , features = ["alloc", "digest", "rand_core"] }
diff --git a/contracts/rsa-test/Makefile b/contracts/rsa-test/Makefile
@@ -6,7 +6,7 @@ TOP := $(cur_dir)
 # RUSTFLAGS that are likely to be tweaked by developers. For example,
 # while we enable debug logs by default here, some might want to strip them
 # for minimal code size / consumed cycles.
-CUSTOM_RUSTFLAGS := --cfg debug_assertions
+CUSTOM_RUSTFLAGS := -C debug-assertions
 # RUSTFLAGS that are less likely to be tweaked by developers. Most likely
 # one would want to keep the default values here.
 FULL_RUSTFLAGS := -C target-feature=+zba,+zbb,+zbc,+zbs,-a $(CUSTOM_RUSTFLAGS)
diff --git a/contracts/rsa-test/src/entry.rs b/contracts/rsa-test/src/entry.rs
@@ -76,7 +76,7 @@ pub fn test_rsa_2048(msg: &[u8]) {
     let signature = pkcs1v15::Signature::try_from(&signature_bytes[..]).unwrap();
 
     let last = current_cycles();
-    verifying_key.verify(&msg, &signature).unwrap();
+    verifying_key.verify(msg, &signature).unwrap();
     let cycles = current_cycles() - last;
     debug(format!(
         "cost of rsa-2048 verifying cycles: {} K",
diff --git a/contracts/rsa-test/src/error.rs b/contracts/rsa-test/src/error.rs
@@ -18,6 +18,7 @@ impl From<SysError> for Error {
             LengthNotEnough(_) => Self::LengthNotEnough,
             Encoding => Self::Encoding,
             Unknown(err_code) => panic!("unexpected sys error {}", err_code),
+            _ => panic!("unknown error"),
         }
     }
 }
diff --git a/contracts/schnorr-test/Cargo.toml b/contracts/schnorr-test/Cargo.toml
@@ -6,8 +6,8 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-ckb-std = { version = "0.15.3", features = ["build-with-clang"] }
-k256 = { version = "=0.13.1", default-features = false, features = ["arithmetic", "schnorr", "alloc"] }
+ckb-std = { version = "0.18.0", default-features = false, features = ["allocator", "dummy-atomic"]} 
+k256 = { version = "0.14.0-pre.11", default-features = false, features = ["arithmetic", "ecdsa", "alloc", "schnorr"] }
 hex = { version = "0.4", default-features = false, features = ["alloc"] }
 
 [features]
diff --git a/contracts/schnorr-test/Makefile b/contracts/schnorr-test/Makefile
@@ -6,7 +6,7 @@ TOP := $(cur_dir)
 # RUSTFLAGS that are likely to be tweaked by developers. For example,
 # while we enable debug logs by default here, some might want to strip them
 # for minimal code size / consumed cycles.
-CUSTOM_RUSTFLAGS := --cfg debug_assertions
+CUSTOM_RUSTFLAGS := -C debug-assertions
 # RUSTFLAGS that are less likely to be tweaked by developers. Most likely
 # one would want to keep the default values here.
 FULL_RUSTFLAGS := -C target-feature=+zba,+zbb,+zbc,+zbs,-a $(CUSTOM_RUSTFLAGS)
diff --git a/contracts/schnorr-test/src/entry.rs b/contracts/schnorr-test/src/entry.rs
@@ -56,7 +56,7 @@ fn gen() -> (Vec<u8>, Vec<u8>, Vec<u8>) {
 pub fn main() -> Result<(), Error> {
     let (msg_bytes, pub_bytes, sig_bytes) = gen();
     let signature = Signature::try_from(sig_bytes.as_slice()).unwrap();
-    let pk = VerifyingKey::from_bytes(&pub_bytes).unwrap();
+    let pk = VerifyingKey::from_bytes(pub_bytes.as_slice().try_into().unwrap()).unwrap();
 
     let last = current_cycles();
     pk.verify(&msg_bytes, &signature).unwrap();
diff --git a/contracts/schnorr-test/src/error.rs b/contracts/schnorr-test/src/error.rs
@@ -18,6 +18,7 @@ impl From<SysError> for Error {
             LengthNotEnough(_) => Self::LengthNotEnough,
             Encoding => Self::Encoding,
             Unknown(err_code) => panic!("unexpected sys error {}", err_code),
+            _ => panic!("unknown error"),
         }
     }
 }
diff --git a/rust-toolchain b/rust-toolchain
@@ -1 +1 @@
-1.75.0
+1.85.1
diff --git a/scripts/find_clang b/scripts/find_clang
@@ -2,31 +2,4 @@
 #
 # An utility script used to find a binary of clang 16+
 
-if [[ -n "${CLANG}" ]]; then
-  echo "${CLANG}"
-  exit 0
-fi
-
-CANDIDATES=("clang" "clang-16" "clang-17" "clang-18")
-
-BREW_PREFIX=$(brew --prefix 2> /dev/null)
-if [[ -n "${BREW_PREFIX}" ]]; then
-  CANDIDATES+=(
-    "${BREW_PREFIX}/opt/llvm/bin/clang"
-    "${BREW_PREFIX}/opt/llvm@16/bin/clang"
-    "${BREW_PREFIX}/opt/llvm@17/bin/clang"
-    "${BREW_PREFIX}/opt/llvm@18/bin/clang"
-  )
-fi
-
-for candidate in ${CANDIDATES[@]}; do
-  OUTPUT=$($candidate -dumpversion 2> /dev/null | cut -d'.' -f 1)
-
-  if [[ $((OUTPUT)) -ge 16 ]]; then
-    echo "$candidate"
-    exit 0
-  fi
-done
-
->&2 echo "Cannot find clang of version 16+!"
-exit 1
+echo "clang"

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@ impl From<SysError> for Error {`
`18`	`18`	`LengthNotEnough(_) => Self::LengthNotEnough,`
`19`	`19`	`Encoding => Self::Encoding,`
`20`	`20`	`Unknown(err_code) => panic!("unexpected sys error {}", err_code),`
	`21`	`+ _ => panic!("unknown error"),`
`21`	`22`	`}`
`22`	`23`	`}`
`23`	`24`	`}`