feat(gprimitives): serialize actor id as hex (#4446)

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"] }

ethexe/runtime/common/src/state.rs

@@ -425,8 +425,8 @@ pub struct ActiveProgram {
 #[cfg_attr(feature = "std", derive(serde::Serialize, serde::Deserialize))]
 pub enum Program {
     Active(ActiveProgram),
-    Exited(ProgramId),
-    Terminated(ProgramId),
+    Exited(ActorId),
+    Terminated(ActorId),
 }
 
 impl Program {

gprimitives/Cargo.toml

@@ -22,3 +22,4 @@ gear-ss58.workspace = true
 [features]
 codec = ["parity-scale-codec", "scale-info"]
 serde = ["dep:serde", "primitive-types/serde_no_std"]
+ethexe = []

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>

pallets/gear-builtin/src/lib.rs

@@ -437,8 +437,8 @@ impl<T: Config> BuiltinDispatcher for BuiltinRegistry<T> {
             }
             Err(BuiltinActorError::GasAllowanceExceeded) => {
                 // Ideally, this should never happen, as we should have checked the gas allowance
-                // before even entring the `handle` method. However, if this error does occur,
-                // we should handle it by discarding the gas burned and requeueing the message.
+                // before even entering the `handle` method. However, if this error does occur,
+                // we should handle it by discarding the gas burned and requeuing the message.
                 // N.B.: if `gas_amount.burned` is not zero, the cost is borne by the validator.
                 process_allowance_exceed(dispatch, actor_id, 0)
             }