Merge pull request #48 from blockscout/ll/add-alloy

sevenzing · web-flow · commit bda0daa4d66c · 2025-12-11T14:03:36.000+03:00
feat: add alloy types
diff --git a/Cargo.toml b/Cargo.toml
@@ -9,23 +9,24 @@ members = [
 ]
 
 [workspace.package]
-version = "0.3.0"
+version = "0.3.1"
 edition = "2021"
 license = "MIT"
 repository = "https://github.com/blockscout/actix-prost"
 exclude = ["tests"]
 
 [workspace.dependencies]
-actix-prost = { version = "0.3.0", path = "actix-prost" }
-actix-prost-build = { version = "0.3.0", path = "actix-prost-build" }
-actix-prost-macros = { version = "0.3.0", path = "actix-prost-macros" }
-convert-trait = { version = "0.3.0", path = "actix-prost-convert-trait", package = "actix-prost-convert-trait" }
+actix-prost = { version = "0.3.1", path = "actix-prost" }
+actix-prost-build = { version = "0.3.1", path = "actix-prost-build" }
+actix-prost-macros = { version = "0.3.1", path = "actix-prost-macros" }
+convert-trait = { version = "0.3.1", path = "actix-prost-convert-trait", package = "actix-prost-convert-trait" }
 
 actix-http = { version = "3" }
 actix-web = { version = "4" }
 async-trait = { version = "0.1" }
 bytes = { version = "1.9" }
 ethers = { version = "2.0.14" }
+alloy = { version = "1.1.3" }
 ethers-core = { version = "2.0.14" }
 hex = { version = "0.4" }
 http = { version = "1.2" }
diff --git a/actix-prost-convert-trait/Cargo.toml b/actix-prost-convert-trait/Cargo.toml
@@ -17,6 +17,7 @@ url = { workspace = true, optional = true }
 chrono = { version = "0.4", features = ["serde"], optional = true }
 uuid = { version = "1.0", features = ["serde"], optional = true }
 rust_decimal = { version = "1.32", features = ["serde"], optional = true }
+alloy = { version = "1.1.3", features = [], optional = true, default-features = false}
 
 [dev-dependencies]
 pretty_assertions = { workspace = true }
@@ -26,6 +27,7 @@ default = [ "conv-full" ]
 conv-full = [ 
     "conv-bytes", 
     "conv-address", 
+    "conv-hash",
     "conv-url", 
     "conv-datetime", 
     "conv-uuid", 
@@ -35,7 +37,8 @@ conv-full = [
     "conv-decimal" 
 ]
 conv-bytes = [ "dep:bytes", "dep:hex" ]
-conv-address = [ "dep:ethers-core" ]
+conv-address = [ "dep:ethers-core", "dep:alloy" ]
+conv-hash = [ "dep:alloy" ]
 conv-url = [ "dep:url" ]
 conv-datetime = [ "dep:chrono" ]
 conv-uuid = [ "dep:uuid" ]
diff --git a/actix-prost-convert-trait/src/address.rs b/actix-prost-convert-trait/src/address.rs
@@ -1,4 +1,5 @@
 use crate::{impl_try_convert_from_string, TryConvert};
+use alloy::primitives::Address as AlloyAddress;
 use ethers_core::{types::Address, utils::to_checksum};
 
 impl_try_convert_from_string!(Address);
@@ -9,6 +10,14 @@ impl TryConvert<Address> for String {
     }
 }
 
+impl_try_convert_from_string!(AlloyAddress);
+
+impl TryConvert<AlloyAddress> for String {
+    fn try_convert(input: AlloyAddress) -> Result<Self, String> {
+        Ok(input.to_checksum(None))
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
diff --git a/actix-prost-convert-trait/src/hash.rs b/actix-prost-convert-trait/src/hash.rs
@@ -0,0 +1,5 @@
+use crate::{impl_try_convert_from_string, impl_try_convert_to_string};
+use alloy::primitives::B256;
+
+impl_try_convert_from_string!(B256);
+impl_try_convert_to_string!(B256);
diff --git a/actix-prost-convert-trait/src/impls.rs b/actix-prost-convert-trait/src/impls.rs
@@ -43,10 +43,10 @@ impl<K: std::cmp::Ord, T, R: TryConvert<T>> TryConvert<BTreeMap<K, T>> for BTree
 #[macro_export]
 macro_rules! impl_try_convert_from_string {
     ($type:ty) => {
-        impl_try_convert_from_string!($type, stringify!($type));
+        $crate::impl_try_convert_from_string!($type, stringify!($type));
     };
     ($type:ty, $type_name:expr) => {
-        impl TryConvert<String> for $type {
+        impl $crate::TryConvert<String> for $type {
             fn try_convert(value: String) -> Result<Self, String> {
                 value.parse().map_err(|e| {
                     $crate::failed_to_parse_error_message_with_description(&value, $type_name, e)
@@ -59,7 +59,7 @@ macro_rules! impl_try_convert_from_string {
 #[macro_export]
 macro_rules! impl_try_convert_to_string {
     ($type:ty) => {
-        impl TryConvert<$type> for String {
+        impl $crate::TryConvert<$type> for String {
             fn try_convert(value: $type) -> Result<Self, String> {
                 Ok(value.to_string())
             }
diff --git a/actix-prost-convert-trait/src/ip.rs b/actix-prost-convert-trait/src/ip.rs
@@ -1,4 +1,4 @@
-use crate::{impl_try_convert_from_string, impl_try_convert_to_string, TryConvert};
+use crate::{impl_try_convert_from_string, impl_try_convert_to_string};
 use std::net::{IpAddr, Ipv4Addr, Ipv6Addr};
 
 impl_try_convert_from_string!(IpAddr);
@@ -13,6 +13,7 @@ impl_try_convert_to_string!(Ipv6Addr);
 #[cfg(test)]
 mod tests {
     use super::*;
+    use crate::TryConvert;
 
     #[test]
     fn test_conversion_ip() {
diff --git a/actix-prost-convert-trait/src/lib.rs b/actix-prost-convert-trait/src/lib.rs
@@ -5,6 +5,9 @@ mod impls;
 #[cfg(feature = "conv-address")]
 mod address;
 
+#[cfg(feature = "conv-hash")]
+mod hash;
+
 #[cfg(feature = "conv-bytes")]
 mod bytes;
 
diff --git a/actix-prost-convert-trait/src/url.rs b/actix-prost-convert-trait/src/url.rs
@@ -1,4 +1,4 @@
-use crate::{impl_try_convert_from_string, impl_try_convert_to_string, TryConvert};
+use crate::{impl_try_convert_from_string, impl_try_convert_to_string};
 use url::Url;
 
 impl_try_convert_from_string!(Url);
@@ -7,6 +7,7 @@ impl_try_convert_to_string!(Url);
 #[cfg(test)]
 mod tests {
     use super::*;
+    use crate::TryConvert;
 
     #[test]
     fn test_conversion_url() {
diff --git a/actix-prost-convert-trait/src/uuid.rs b/actix-prost-convert-trait/src/uuid.rs
@@ -1,4 +1,4 @@
-use crate::{impl_try_convert_from_string, impl_try_convert_to_string, TryConvert};
+use crate::{impl_try_convert_from_string, impl_try_convert_to_string};
 use uuid::Uuid;
 
 impl_try_convert_from_string!(Uuid);
@@ -7,6 +7,7 @@ impl_try_convert_to_string!(Uuid);
 #[cfg(test)]
 mod tests {
     use super::*;
+    use crate::TryConvert;
 
     #[test]
     fn test_conversion_uuid() {
diff --git a/tests/Cargo.toml b/tests/Cargo.toml
@@ -16,6 +16,7 @@ async-trait = { workspace = true }
 actix-web = { workspace = true }
 convert-trait = { workspace = true }
 ethers = { workspace = true }
+alloy = { workspace = true, default-features = false }
 prost = { workspace = true }
 serde = { workspace = true, features = [ "derive" ] }
 serde_json = { workspace = true }
diff --git a/tests/proto/conversions.proto b/tests/proto/conversions.proto
@@ -50,6 +50,9 @@ message ConversionsRequest {
   repeated string addresses = 3 [ (convert_options.convert) = {
     type : "std::collections::HashSet<ethers::types::Address>"
   } ];
+  repeated string alloy_addresses = 17 [ (convert_options.convert) = {
+    type : "std::collections::HashSet<alloy::primitives::Address>"
+  } ];
 
   enum NestedEnum {
     NESTED_OK = 0;
@@ -81,10 +84,14 @@ message ConversionsRequest {
   string decimal_field = 15 [ (convert_options.convert) = { type : "rust_decimal::Decimal" } ];
 
   repeated RepeatedValue repeated = 16;
+
+  string block_hash = 18 [ (convert_options.convert) = { type : "alloy::primitives::BlockHash" } ];
+  string tx_hash = 19 [ (convert_options.convert) = { type : "alloy::primitives::TxHash" } ];
 }
 
 message ConversionsResponse {
   string address = 1 [ (convert_options.convert) = { type : "ethers::types::Address" } ];
+  string alloy_address = 11 [ (convert_options.convert) = { type : "alloy::primitives::Address" } ];
   Nested nested = 2;
   map<string, MapValue> map_field = 3;
   Config config = 4;
diff --git a/tests/src/conversions.rs b/tests/src/conversions.rs
@@ -1,6 +1,3 @@
-use reqwest::StatusCode;
-use std::{collections::HashMap, net::SocketAddr, sync::Arc, time::Duration};
-
 use crate::{
     proto::conversions::{
         conversions_request::NestedEnum, conversions_rpc_actix::route_conversions_rpc,
@@ -14,7 +11,9 @@ use actix_web::{App, HttpServer};
 use convert_trait::TryConvert;
 use ethers::types::Address;
 use pretty_assertions::assert_eq;
+use reqwest::StatusCode;
 use serde_json::{json, Value};
+use std::{collections::HashMap, net::SocketAddr, sync::Arc, time::Duration};
 use tonic::{Request, Response, Status};
 
 #[derive(Default)]
@@ -31,6 +30,9 @@ impl ConversionsRpc for ConversionsServer {
 
         let internal_response = ConversionsResponseInternal {
             address: Address::from_low_u64_be(0),
+            alloy_address: "0x1234567890123456789012345678901234567890"
+                .parse()
+                .unwrap(),
             nested: Some(internal_request.nested),
             map_field: internal_request.map_field,
             config: None,
@@ -83,6 +85,7 @@ async fn conversions() {
         )]),
         query: "some_string".to_string(),
         addresses: vec!["".to_string()],
+        alloy_addresses: vec!["".to_string()],
         nested_enum: 1,
         nested: Some(Nested {
             address: "".to_string(),
@@ -100,6 +103,8 @@ async fn conversions() {
         repeated: vec![RepeatedValue {
             address: "".to_string(),
         }],
+        block_hash: "".to_string(),
+        tx_hash: "".to_string(),
     };
 
     let (status, res) = send_post(&addr, "/conversions", serde_json::to_value(req).unwrap()).await;
@@ -124,6 +129,8 @@ async fn conversions() {
     let test_path_buf = "/tmp/test";
     let test_duration_seconds = "60m";
     let test_decimal_field = "123.45";
+    let test_block_hash = "0x0000000000000000000000000000000000000000000000000000000000000001";
+    let test_tx_hash = "0x0000000000000000000000000000000000000000000000000000000000000002";
 
     let internal_expected = ConversionsRequestInternal {
         map_field: HashMap::from([(
@@ -135,6 +142,7 @@ async fn conversions() {
         // query is overidded to Default::default() in conversions.proto
         query: Default::default(),
         addresses: vec![test_address.parse().unwrap()].into_iter().collect(),
+        alloy_addresses: vec![test_address.parse().unwrap()].into_iter().collect(),
         nested_enum: NestedEnum::NestedOk,
         nested: NestedInternal {
             address: test_address.parse().unwrap(),
@@ -154,6 +162,8 @@ async fn conversions() {
         repeated: vec![RepeatedValueInternal {
             address: test_address.parse().unwrap(),
         }],
+        block_hash: test_block_hash.parse().unwrap(),
+        tx_hash: test_tx_hash.parse().unwrap(),
     };
 
     let req = ConversionsRequest {
@@ -165,6 +175,7 @@ async fn conversions() {
         )]),
         query: test_query.to_string(),
         addresses: vec![test_address.to_string()],
+        alloy_addresses: vec![test_address.to_string()],
         nested_enum: NestedEnum::NestedOk as i32,
         nested: Some(Nested {
             address: test_address.to_string(),
@@ -182,6 +193,8 @@ async fn conversions() {
         repeated: vec![RepeatedValue {
             address: test_address.to_string(),
         }],
+        block_hash: test_block_hash.to_string(),
+        tx_hash: test_tx_hash.to_string(),
     };
 
     let req_internal = ConversionsRequestInternal::try_convert(req.clone()).unwrap();
diff --git a/tests/src/proto/conversions.rs b/tests/src/proto/conversions.rs
@@ -26,6 +26,8 @@ pub struct ConversionsRequest {
     pub query: ::prost::alloc::string::String,
     #[prost(string, repeated, tag = "3")]
     pub addresses: ::prost::alloc::vec::Vec<::prost::alloc::string::String>,
+    #[prost(string, repeated, tag = "17")]
+    pub alloy_addresses: ::prost::alloc::vec::Vec<::prost::alloc::string::String>,
     #[prost(enumeration = "conversions_request::NestedEnum", tag = "4")]
     pub nested_enum: i32,
     #[prost(message, optional, tag = "5")]
@@ -58,6 +60,10 @@ pub struct ConversionsRequest {
     pub decimal_field: ::prost::alloc::string::String,
     #[prost(message, repeated, tag = "16")]
     pub repeated: ::prost::alloc::vec::Vec<RepeatedValue>,
+    #[prost(string, tag = "18")]
+    pub block_hash: ::prost::alloc::string::String,
+    #[prost(string, tag = "19")]
+    pub tx_hash: ::prost::alloc::string::String,
 }
 /// Nested message and enum types in `ConversionsRequest`.
 pub mod conversions_request {
@@ -104,6 +110,8 @@ pub mod conversions_request {
 pub struct ConversionsResponse {
     #[prost(string, tag = "1")]
     pub address: ::prost::alloc::string::String,
+    #[prost(string, tag = "11")]
+    pub alloy_address: ::prost::alloc::string::String,
     #[prost(message, optional, tag = "2")]
     pub nested: ::core::option::Option<Nested>,
     #[prost(map = "string, message", tag = "3")]
@@ -475,6 +483,8 @@ pub mod conversions_rpc_actix {
         pub query: ::prost::alloc::string::String,
         #[prost(string, repeated, tag = "3")]
         pub addresses: ::prost::alloc::vec::Vec<::prost::alloc::string::String>,
+        #[prost(string, repeated, tag = "17")]
+        pub alloy_addresses: ::prost::alloc::vec::Vec<::prost::alloc::string::String>,
         #[prost(enumeration = "conversions_request::NestedEnum", tag = "4")]
         pub nested_enum: i32,
         #[prost(message, optional, tag = "5")]
@@ -507,6 +517,10 @@ pub mod conversions_rpc_actix {
         pub decimal_field: ::prost::alloc::string::String,
         #[prost(message, repeated, tag = "16")]
         pub repeated: ::prost::alloc::vec::Vec<RepeatedValue>,
+        #[prost(string, tag = "18")]
+        pub block_hash: ::prost::alloc::string::String,
+        #[prost(string, tag = "19")]
+        pub tx_hash: ::prost::alloc::string::String,
     }
     async fn call_convert_rpc(
         service: ::actix_web::web::Data<dyn ConversionsRpc + Sync + Send + 'static>,
@@ -527,6 +541,7 @@ pub mod conversions_rpc_actix {
             map_field: json.map_field,
             query: json.query,
             addresses: json.addresses,
+            alloy_addresses: json.alloy_addresses,
             nested_enum: json.nested_enum,
             nested: json.nested,
             utc_datetime: json.utc_datetime,
@@ -540,6 +555,8 @@ pub mod conversions_rpc_actix {
             duration_seconds: json.duration_seconds,
             decimal_field: json.decimal_field,
             repeated: json.repeated,
+            block_hash: json.block_hash,
+            tx_hash: json.tx_hash,
         };
         let request = ::actix_prost::new_request(request, &http_request);
         let response = service.convert_rpc(request).await?;
@@ -617,6 +634,7 @@ pub struct ConversionsRequestInternal {
     >,
     pub query: ::prost::alloc::string::String,
     pub addresses: std::collections::HashSet<ethers::types::Address>,
+    pub alloy_addresses: std::collections::HashSet<alloy::primitives::Address>,
     pub nested_enum: conversions_request::NestedEnum,
     pub nested: NestedInternal,
     pub utc_datetime: chrono::DateTime<chrono::Utc>,
@@ -630,6 +648,8 @@ pub struct ConversionsRequestInternal {
     pub duration_seconds: std::time::Duration,
     pub decimal_field: rust_decimal::Decimal,
     pub repeated: ::prost::alloc::vec::Vec<RepeatedValueInternal>,
+    pub block_hash: alloy::primitives::BlockHash,
+    pub tx_hash: alloy::primitives::TxHash,
     pub field1: Option<String>,
     pub field2: Option<i32>,
 }
@@ -639,6 +659,9 @@ impl convert_trait::TryConvert<ConversionsRequest> for ConversionsRequestInterna
             map_field: convert_trait::TryConvert::try_convert(from.map_field)?,
             query: Default::default(),
             addresses: convert_trait::TryConvert::try_convert(from.addresses)?,
+            alloy_addresses: convert_trait::TryConvert::try_convert(
+                from.alloy_addresses,
+            )?,
             nested_enum: conversions_request::NestedEnum::try_from(from.nested_enum)
                 .map_err(|e| e.to_string())?,
             nested: convert_trait::TryConvert::try_convert(
@@ -659,6 +682,8 @@ impl convert_trait::TryConvert<ConversionsRequest> for ConversionsRequestInterna
             )?,
             decimal_field: convert_trait::TryConvert::try_convert(from.decimal_field)?,
             repeated: convert_trait::TryConvert::try_convert(from.repeated)?,
+            block_hash: convert_trait::TryConvert::try_convert(from.block_hash)?,
+            tx_hash: convert_trait::TryConvert::try_convert(from.tx_hash)?,
             field1: None,
             field2: None,
         })
@@ -697,6 +722,7 @@ impl convert_trait::TryConvert<ConfigInternal> for Config {
 #[derive(Clone, Debug)]
 pub struct ConversionsResponseInternal {
     pub address: ethers::types::Address,
+    pub alloy_address: alloy::primitives::Address,
     pub nested: ::core::option::Option<NestedInternal>,
     pub map_field: ::std::collections::HashMap<
         ::prost::alloc::string::String,
@@ -713,6 +739,7 @@ impl convert_trait::TryConvert<ConversionsResponseInternal> for ConversionsRespo
     fn try_convert(from: ConversionsResponseInternal) -> Result<Self, String> {
         Ok(Self {
             address: convert_trait::TryConvert::try_convert(from.address)?,
+            alloy_address: convert_trait::TryConvert::try_convert(from.alloy_address)?,
             nested: convert_trait::TryConvert::try_convert(from.nested)?,
             map_field: convert_trait::TryConvert::try_convert(from.map_field)?,
             config: convert_trait::TryConvert::try_convert(from.config)?,
