Merge pull request #107 from cita-cloud/upgrade_deps

upgrade deps

Author: rink1969

Cargo.toml

@@ -8,7 +8,7 @@ edition = "2021"
 clap = { version = "4.5", features = ["cargo"] }
 clap_complete = "4.5"
 hex = "0.4"
-tokio = { version = "1.38", features = ["full"] }
+tokio = { version = "1.41", features = ["full"] }
 rand = "0.8"
 tonic = "0.12"
 prost = "0.13"
@@ -17,7 +17,7 @@ serde = "1.0"
 serde_derive = "1.0"
 serde_json = "1.0"
 lazy_static = "1.5"
-thiserror = "1.0"
+thiserror = "2.0"
 anyhow = "1.0"
 home = "0.5"
 indicatif = "0.17"
@@ -28,7 +28,7 @@ rustyline = "14.0"
 shell-words = "1.1"
 parking_lot = "0.12"
 crossbeam = "0.8"
-tempfile = "3.10"
+tempfile = "3.14"
 # crypto SM
 libsm = "0.6"
 efficient-sm2 = "0.2"
@@ -37,7 +37,7 @@ aes = "0.8"
 ctr = "0.9"
 # ethabi cli
 ethabi = "18.0"
-itertools = "0.12"
+itertools = "0.13"
 rlp = "0.5"
 static_merkle_tree = "1.1"
 ethereum-types = "0.14"
@@ -47,12 +47,12 @@ ophelia-blst = "0.3"
 cita-crypto = "0.1"
 sha3 = "0.10"
 tiny-keccak = { version = "2.0", features = ["keccak"] }
-secp256k1 = { version = "0.29", features = ["rand-std", "recovery"] }
+secp256k1 = { version = "0.30", features = ["rand", "recovery"] }
 hashable = { package = "cita-hashable", version = "0.1" }
 # legacy
 rustbreak = { version = "2.0", features = ["ron_enc"] }
 cita-merklehash = { version = "0.1", features = ["sm3hash"] }
-bytes = { version = "1.6", features = ["serde"] }
+bytes = { version = "1.8", features = ["serde"] }
 bloomchain = "0.2"
 eth-jsonrpc-lib = "0.4"
 
@@ -63,7 +63,7 @@ libproto = { git = "https://github.com/cita-cloud/libproto", rev = "9388049a964b
 openssl = { version = "0.10", features = ["vendored"] }
 
 [dev-dependencies]
-mockall = "0.12"
+mockall = "0.13"
 
 [profile.release]
 lto = true

src/crypto/eth.rs

@@ -88,16 +88,16 @@ fn secp256k1_sign(msg: &[u8], sk: &SecretKey) -> Signature {
     // [<sig><recovery_id>]
     let mut output = [0u8; SIGNATURE_BYTES_LEN];
     output[..SIGNATURE_BYTES_LEN - 1].copy_from_slice(&sig);
-    output[SIGNATURE_BYTES_LEN - 1] = recovery_id.to_i32() as u8;
+    output[SIGNATURE_BYTES_LEN - 1] = recovery_id as u8;
 
     output
 }
 
 #[allow(unused)]
 pub fn secp256k1_recover(message: &[u8], signature: &Signature) -> Option<PublicKey> {
     let context = &SECP256K1;
-    let rid = secp256k1::ecdsa::RecoveryId::from_i32(i32::from(signature[SIGNATURE_BYTES_LEN - 1]))
-        .ok()?;
+    let rid =
+        secp256k1::ecdsa::RecoveryId::try_from(signature[SIGNATURE_BYTES_LEN - 1] as i32).ok()?;
     let rsig = secp256k1::ecdsa::RecoverableSignature::from_compact(
         &signature[0..SIGNATURE_BYTES_LEN - 1],
         rid,

src/main.rs

@@ -105,11 +105,10 @@ fn main() -> Result<()> {
     let cldi = cmd::cldi_cmd();
     let m = cldi.get_matches();
 
-    cldi.exec_with(&m, &mut ctx).map_err(|e| {
+    cldi.exec_with(&m, &mut ctx).inspect_err(|e| {
         if let Some(e) = e.downcast_ref::<clap::Error>() {
             e.exit();
         }
-        e
     })?;
 
     // Enter interactive mode if no subcommand provided