Merge pull request #240 from bitfinity-network/alloy_update

Upgrade to alloy 0.15

Author: ufoscout

Cargo.toml

@@ -22,7 +22,7 @@ homepage = "https://github.com/bitfinity-network/bitfinity-evm-sdk"
 include = ["src/**/*", "LICENSE", "README.md"]
 license = "MIT"
 repository = "https://github.com/bitfinity-network/bitfinity-evm-sdk"
-version = "0.49.0"
+version = "0.50.0"
 
 [workspace.dependencies]
 did = { path = "src/did" }
@@ -34,7 +34,7 @@ evm-canister-client = { path = "src/evm-canister-client" }
 evm-log-extractor = { path = "src/evm-log-extractor" }
 signature-verification-canister-client = { path = "src/signature-verification-canister-client" }
 
-alloy = { version = "0.13", default-features = false, features = [
+alloy = { version = "0.15", default-features = false, features = [
     "consensus",
     "k256",
     "eips",
@@ -58,8 +58,8 @@ ic-exports = { git = "https://github.com/bitfinity-network/canister-sdk", packag
 ic-log = { git = "https://github.com/bitfinity-network/canister-sdk", package = "ic-log", tag = "v0.24.x" }
 ic-stable-structures = { git = "https://github.com/bitfinity-network/canister-sdk", package = "ic-stable-structures", tag = "v0.24.x" }
 itertools = "0.14"
-jsonrpsee = { version = "0.24", features = ["server", "macros"] }
-lightspeed_scheduler = "0.60"
+jsonrpsee = { version = "0.25", features = ["server", "macros"] }
+lightspeed_scheduler = "0.63"
 log = "0.4"
 num = "0.4"
 port_check = "0.2"

src/did/src/transaction.rs

@@ -228,7 +228,7 @@ impl Signature {
     /// Recovers an [`Address`] from this signature and the given prehashed message.
     /// e.g.: signature.recover_from(&tx.signature_hash())
     pub fn recover_from(&self, signature_hash: &H256) -> Result<H160, EvmError> {
-        let primitive_signature = alloy::primitives::PrimitiveSignature::from(self);
+        let primitive_signature = alloy::primitives::Signature::from(self);
         let recovered_from = primitive_signature
             .recover_address_from_prehash(&signature_hash.0)
             .map_err(|err| EvmError::SignatureError(format!("{err:?}")))?;
@@ -249,20 +249,20 @@ impl Signature {
     }
 }
 
-impl From<Signature> for alloy::primitives::PrimitiveSignature {
+impl From<Signature> for alloy::primitives::Signature {
     fn from(value: Signature) -> Self {
-        alloy::primitives::PrimitiveSignature::new(value.r.0, value.s.0, value.y_parity.as_bool())
+        alloy::primitives::Signature::new(value.r.0, value.s.0, value.y_parity.as_bool())
     }
 }
 
-impl From<&Signature> for alloy::primitives::PrimitiveSignature {
+impl From<&Signature> for alloy::primitives::Signature {
     fn from(value: &Signature) -> Self {
-        alloy::primitives::PrimitiveSignature::new(value.r.0, value.s.0, value.y_parity.as_bool())
+        alloy::primitives::Signature::new(value.r.0, value.s.0, value.y_parity.as_bool())
     }
 }
 
-impl From<alloy::primitives::PrimitiveSignature> for Signature {
-    fn from(value: alloy::primitives::PrimitiveSignature) -> Self {
+impl From<alloy::primitives::Signature> for Signature {
+    fn from(value: alloy::primitives::Signature) -> Self {
         Self {
             r: U256(value.r()),
             s: U256(value.s()),
@@ -514,7 +514,7 @@ impl TryFrom<Transaction> for alloy::rpc::types::Transaction {
     fn try_from(tx: Transaction) -> Result<Self, EvmError> {
         let signature = Signature::new_from_rsv(tx.r, tx.s, tx.v.as_u64())?;
 
-        let signature = alloy::primitives::PrimitiveSignature::from(signature);
+        let signature = alloy::primitives::Signature::from(signature);
 
         let tx_type = tx.transaction_type.unwrap_or_default().0.to::<u64>();
         match tx_type {
@@ -1604,7 +1604,7 @@ mod test {
 
     #[test]
     fn primitive_signature_roundtrip() {
-        let signature = alloy::primitives::PrimitiveSignature::new(
+        let signature = alloy::primitives::Signature::new(
             alloy::primitives::U256::from(random::<u64>()),
             alloy::primitives::U256::from(random::<u64>()),
             random(),
@@ -1613,7 +1613,7 @@ mod test {
         let roundtrip_signature = Signature::from(signature);
         assert_eq!(
             signature,
-            alloy::primitives::PrimitiveSignature::from(roundtrip_signature)
+            alloy::primitives::Signature::from(roundtrip_signature)
         );
     }
 

src/eth-signer/src/ic_sign.rs

@@ -1,7 +1,7 @@
 use std::fmt;
 
 use alloy::consensus::SignableTransaction;
-use alloy::primitives::{Address, PrimitiveSignature, SignatureError, U256};
+use alloy::primitives::{Address, Signature as PrimitiveSignature, SignatureError, U256};
 use alloy::signers::k256::ecdsa::{RecoveryId, Signature as EcsaSignature, VerifyingKey};
 use alloy::signers::utils::public_key_to_address;
 use candid::{CandidType, Principal};
@@ -281,7 +281,7 @@ mod tests {
             .await
             .unwrap();
 
-        let primitive_signature = alloy::primitives::PrimitiveSignature::from(signature);
+        let primitive_signature = alloy::primitives::Signature::from(signature);
 
         let recovered_from = primitive_signature
             .recover_address_from_prehash(&tx.signature_hash())

src/eth-signer/src/sign_strategy.rs

@@ -2,7 +2,7 @@ use std::borrow::Cow;
 
 use alloy::consensus::SignableTransaction;
 use alloy::network::TxSigner as NetworkTxSigner;
-use alloy::primitives::PrimitiveSignature;
+use alloy::primitives::Signature as PrimitiveSignature;
 use alloy::signers::Signer;
 use alloy::signers::k256::ecdsa::{self, SigningKey};
 use alloy::signers::utils::secret_key_to_address;
@@ -339,7 +339,7 @@ mod test {
         let digest = [42u8; 32];
         let signature = signer.sign_digest(digest).await.unwrap();
 
-        let recovered = alloy::primitives::PrimitiveSignature::from(signature)
+        let recovered = alloy::primitives::Signature::from(signature)
             .recover_address_from_prehash(&alloy::primitives::B256::from_slice(&digest))
             .unwrap();
 

src/ethereum-json-rpc-client/tests/reqwest/mod.rs

@@ -107,10 +107,7 @@ async fn should_perform_eth_call() {
         .unwrap();
 
     let result_address = func
-        .abi_decode_output(
-            &alloy::hex::decode(result.trim_start_matches("0x")).unwrap(),
-            false,
-        )
+        .abi_decode_output(&alloy::hex::decode(result.trim_start_matches("0x")).unwrap())
         .unwrap()
         .first()
         .cloned()