Merge pull request #1 from michaelsproul/attestation_rewards

Fix deserialization of ValidatorId
sigp · Feb 6, 2023 · 793ad55 · 793ad55
2 parents a32aa66 + 6c82ff7
commit 793ad55
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/common/eth2/src/types.rs b/common/eth2/src/types.rs
@@ -270,11 +270,20 @@ pub struct FinalityCheckpointsData {
 }
 
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
+#[serde(try_from = "&str")]
 pub enum ValidatorId {
     PublicKey(PublicKeyBytes),
     Index(u64),
 }
 
+impl TryFrom<&str> for ValidatorId {
+    type Error = String;
+
+    fn try_from(s: &str) -> Result<Self, Self::Error> {
+        Self::from_str(s)
+    }
+}
+
 impl FromStr for ValidatorId {
     type Err = String;