From 8eb5d4f04782ae6d22bc242fc0ec7db63115b315 Mon Sep 17 00:00:00 2001
From: "0xriazaka.eth" <168359025+0xriazaka@users.noreply.github.com>
Date: Thu, 17 Oct 2024 21:28:13 +0100
Subject: [PATCH] Remove unsafe from impl Compact for ClientVersion (#11318)

Co-authored-by: Emilia Hane <elsaemiliaevahane@gmail.com>
Co-authored-by: DaniPopes <57450786+DaniPopes@users.noreply.github.com>
---
 crates/storage/codecs/src/lib.rs               | 15 +++++++++++++++
 crates/storage/db-models/src/client_version.rs | 18 +++++++-----------
 2 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/crates/storage/codecs/src/lib.rs b/crates/storage/codecs/src/lib.rs
index 8608c5eb8c..54ca046cb7 100644
--- a/crates/storage/codecs/src/lib.rs
+++ b/crates/storage/codecs/src/lib.rs
@@ -78,6 +78,21 @@ pub trait Compact: Sized {
     }
 }
 
+impl Compact for alloc::string::String {
+    fn to_compact<B>(&self, buf: &mut B) -> usize
+    where
+        B: bytes::BufMut + AsMut<[u8]>,
+    {
+        self.as_bytes().to_compact(buf)
+    }
+
+    fn from_compact(buf: &[u8], len: usize) -> (Self, &[u8]) {
+        let (vec, buf) = Vec::<u8>::from_compact(buf, len);
+        let string = Self::from_utf8(vec).unwrap(); // Safe conversion
+        (string, buf)
+    }
+}
+
 impl<T: Compact> Compact for &T {
     fn to_compact<B>(&self, buf: &mut B) -> usize
     where
diff --git a/crates/storage/db-models/src/client_version.rs b/crates/storage/db-models/src/client_version.rs
index de074ac88c..a28e7385f6 100644
--- a/crates/storage/db-models/src/client_version.rs
+++ b/crates/storage/db-models/src/client_version.rs
@@ -28,20 +28,16 @@ impl Compact for ClientVersion {
     where
         B: bytes::BufMut + AsMut<[u8]>,
     {
-        self.version.as_bytes().to_compact(buf);
-        self.git_sha.as_bytes().to_compact(buf);
-        self.build_timestamp.as_bytes().to_compact(buf)
+        self.version.to_compact(buf);
+        self.git_sha.to_compact(buf);
+        self.build_timestamp.to_compact(buf)
     }
 
     fn from_compact(buf: &[u8], len: usize) -> (Self, &[u8]) {
-        let (version, buf) = Vec::<u8>::from_compact(buf, len);
-        let (git_sha, buf) = Vec::<u8>::from_compact(buf, len);
-        let (build_timestamp, buf) = Vec::<u8>::from_compact(buf, len);
-        let client_version = Self {
-            version: unsafe { String::from_utf8_unchecked(version) },
-            git_sha: unsafe { String::from_utf8_unchecked(git_sha) },
-            build_timestamp: unsafe { String::from_utf8_unchecked(build_timestamp) },
-        };
+        let (version, buf) = String::from_compact(buf, len);
+        let (git_sha, buf) = String::from_compact(buf, len);
+        let (build_timestamp, buf) = String::from_compact(buf, len);
+        let client_version = Self { version, git_sha, build_timestamp };
         (client_version, buf)
     }
 }