feat(gprimitives): serialize actor id as hex

gear-tech · Jan 17, 2025 · 0214707 · 0214707
1 parent 6ce236b
commit 0214707
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/ethexe/rpc/Cargo.toml b/ethexe/rpc/Cargo.toml
@@ -13,7 +13,7 @@ repository.workspace = true
 tokio = { workspace = true }
 anyhow.workspace = true
 futures.workspace = true
-gprimitives = { workspace = true, features = ["serde"] }
+gprimitives = { workspace = true, features = ["serde", "ethexe"] }
 ethexe-db.workspace = true
 ethexe-processor.workspace = true
 tower = { workspace = true, features = ["util"] }

diff --git a/gprimitives/Cargo.toml b/gprimitives/Cargo.toml
@@ -13,7 +13,9 @@ rust-version.workspace = true
 [dependencies]
 derive_more.workspace = true
 primitive-types = { workspace = true, features = ["scale-info", "rustc-hex"] }
-parity-scale-codec = { workspace = true, features = ["derive"], optional = true }
+parity-scale-codec = { workspace = true, features = [
+    "derive",
+], optional = true }
 scale-info = { workspace = true, features = ["derive"], optional = true }
 serde = { workspace = true, features = ["derive"], optional = true }
 hex.workspace = true
@@ -22,3 +24,4 @@ gear-ss58.workspace = true
 [features]
 codec = ["parity-scale-codec", "scale-info"]
 serde = ["dep:serde", "primitive-types/serde_no_std"]
+ethexe = []
diff --git a/gprimitives/src/lib.rs b/gprimitives/src/lib.rs
@@ -226,7 +226,7 @@ impl FromStr for ActorId {
     }
 }
 
-#[cfg(feature = "serde")]
+#[cfg(all(feature = "serde", not(feature = "ethexe")))]
 impl Serialize for ActorId {
     fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
     where
@@ -239,6 +239,17 @@ impl Serialize for ActorId {
     }
 }
 
+#[cfg(all(feature = "serde", feature = "ethexe"))]
+impl Serialize for ActorId {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: Serializer,
+    {
+        let id: H160 = self.to_address_lossy();
+        id.serialize(serializer)
+    }
+}
+
 #[cfg(feature = "serde")]
 impl<'de> Deserialize<'de> for ActorId {
     fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>