Upgrade misc dependencies (#2340)

* Bump dep versions

* Update `Cargo.lock`

* Add `#[allow(static_mut_refs)]`

* Add ellided lifetime name

* Migrate `secp256k1` code to new version

* Remove empty lines

* Convert spaces to tabs

Author: cmichi

Cargo.lock

@@ -44,9 +44,9 @@ derive_more = { version = "1.0.0", default-features = false }
 either = { version = "1.13", default-features = false }
 funty = { version = "2.0.0" }
 heck = { version = "0.5.0" }
-impl-serde = { version = "0.4.0", default-features = false }
-itertools = { version = "0.12", default-features = false }
-jsonrpsee = { version = "0.22.5" }
+impl-serde = { version = "0.5.0", default-features = false }
+itertools = { version = "0.13.0", default-features = false }
+jsonrpsee = { version = "0.24.7" }
 linkme = { version = "0.3.30" }
 num-traits = { version = "0.2", default-features = false }
 paste = { version = "1.0" }
@@ -61,7 +61,7 @@ scale-decode = { version = "0.14.0", default-features = false }
 scale-encode = { version = "0.8.0", default-features = false }
 scale-info = { version = "2.11", default-features = false }
 schemars = { version = "0.8" }
-secp256k1 = { version = "0.28.2" }
+secp256k1 = { version = "0.30.0" }
 serde = { version = "1.0.215", default-features = false }
 serde_json = { version = "1.0.133" }
 sha2 = { version = "0.10" }
@@ -72,7 +72,7 @@ subxt-metadata = { version = "0.38.0" }
 subxt-signer = { version = "0.38.0" }
 syn = { version = "2" }
 synstructure = { version = "0.13.1" }
-thiserror = { version = "1.0.69" }
+thiserror = { version = "2.0.4" }
 tokio = { version = "1.41.1" }
 tracing = { version = "0.1.41" }
 tracing-subscriber = { version = "0.3.19" }

Cargo.toml

@@ -33,6 +33,7 @@ pub struct BumpAllocator;
 
 unsafe impl GlobalAlloc for BumpAllocator {
     #[inline]
+    #[allow(static_mut_refs)]
     unsafe fn alloc(&self, layout: Layout) -> *mut u8 {
         if INNER.is_none() {
             INNER = Some(InnerAlloc::new());

crates/allocator/src/bump.rs

@@ -153,7 +153,7 @@ pub trait ContractsBackend<E: Environment> {
         &'a mut self,
         contract_name: &'a str,
         caller: &'a Keypair,
-    ) -> UploadBuilder<E, Self>
+    ) -> UploadBuilder<'a, E, Self>
     where
         Self: Sized + BuilderClient<E>,
     {
@@ -176,7 +176,7 @@ pub trait ContractsBackend<E: Environment> {
         &'a mut self,
         caller: &'a Keypair,
         code_hash: E::Hash,
-    ) -> RemoveCodeBuilder<E, Self>
+    ) -> RemoveCodeBuilder<'a, E, Self>
     where
         Self: Sized + BuilderClient<E>,
     {

crates/e2e/src/backend.rs

@@ -411,7 +411,7 @@ impl Engine {
             signature[64]
         };
 
-        let recovery_id = RecoveryId::from_i32(recovery_byte as i32)
+        let recovery_id = RecoveryId::try_from(recovery_byte as i32)
             .unwrap_or_else(|error| panic!("Unable to parse the recovery id: {error}"));
 
         let message = Message::from_digest_slice(message_hash).unwrap_or_else(|error| {

crates/engine/src/ext.rs

@@ -235,7 +235,8 @@ fn ecdsa_recovery_with_secp256k1_crate() {
     let recoverable_signature: RecoverableSignature =
         SECP256K1.sign_ecdsa_recoverable(&msg, &seckey);
 
-    let recovery_id = recoverable_signature.serialize_compact().0.to_i32() as u8;
+    let recovery_id: i32 = recoverable_signature.serialize_compact().0.into();
+    let recovery_id = recovery_id as u8;
     let mut signature = recoverable_signature.serialize_compact().1.to_vec();
     signature.push(recovery_id);
     let signature_with_recovery_id: [u8; 65] = signature

crates/engine/src/tests.rs

@@ -75,7 +75,7 @@ std = [
 	"secp256k1",
 	"schnorrkel",
 	"num-traits/std",
-    # Enables hashing crates for off-chain environment.
+	# Enables hashing crates for off-chain environment.
 	"sha2",
 	"sha3",
 	"scale-decode?/std",

crates/env/Cargo.toml

@@ -284,7 +284,7 @@ impl EnvBackend for EnvInstance {
         } else {
             signature[64]
         };
-        let recovery_id = RecoveryId::from_i32(recovery_byte as i32)
+        let recovery_id = RecoveryId::try_from(recovery_byte as i32)
             .unwrap_or_else(|error| panic!("Unable to parse the recovery id: {error}"));
         let message = Message::from_digest_slice(message_hash).unwrap_or_else(|error| {
             panic!("Unable to create the message from hash: {error}")

crates/env/src/engine/off_chain/impls.rs

@@ -33,7 +33,6 @@ ink_ir = { workspace = true, default-features = true }
 ink_metadata = { workspace = true }
 trybuild = { workspace = true, features = ["diff"] }
 
-
 [features]
 default = [ "std" ]
 std = [

crates/ink/Cargo.toml

@@ -15,7 +15,6 @@
 #[test]
 fn ui_tests_blake2b_pass() {
     let t = trybuild::TestCases::new();
-
     t.pass("tests/ui/blake2b/pass/*.rs");
 }
 
@@ -40,7 +39,6 @@ fn ui_tests_selector_id_fail() {
 #[test]
 fn ui_tests_selector_bytes_pass() {
     let t = trybuild::TestCases::new();
-
     t.pass("tests/ui/selector_bytes/pass/*.rs");
 }