imp: removed ethereum-utils::base64

cosmos · Dec 11, 2024 · b1e90e2 · b1e90e2
1 parent 2b5eaa0
commit b1e90e2
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 23 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/packages/ethereum-light-client/Cargo.toml b/packages/ethereum-light-client/Cargo.toml
@@ -23,7 +23,7 @@ serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true }
 thiserror = { workspace = true }
 sha2 = { workspace = true }
-serde_with = { workspace = true }
+serde_with = { workspace = true, features = ["base64"] }
 
 # TODO: From union (might be removed if they are replaced by something more standard). #147
 typenum = { workspace = true, features = ["const-generics"] }

diff --git a/packages/ethereum-light-client/src/test/fixture_types.rs b/packages/ethereum-light-client/src/test/fixture_types.rs
@@ -1,4 +1,5 @@
 use serde::{Deserialize, Serialize};
+use serde_with::{base64::Base64, serde_as};
 
 use crate::{
     client_state::ClientState,
@@ -21,9 +22,10 @@ pub struct InitialState {
     pub consensus_state: ConsensusState,
 }
 
+#[serde_as]
 #[derive(Serialize, Deserialize, PartialEq, Eq, Clone, Debug)]
 pub struct CommitmentProof {
-    #[serde(with = "ethereum_utils::base64")]
+    #[serde_as(as = "Base64")]
     pub path: Vec<u8>,
     pub storage_proof: StorageProof,
     pub proof_height: Height,

diff --git a/packages/ethereum-light-client/src/types/sync_committee.rs b/packages/ethereum-light-client/src/types/sync_committee.rs
@@ -3,6 +3,7 @@
 use alloy_primitives::Bytes;
 use ethereum_utils::slot::compute_epoch_at_slot;
 use serde::{Deserialize, Serialize};
+use serde_with::{base64::Base64, serde_as};
 use tree_hash_derive::TreeHash;
 
 use super::{
@@ -70,10 +71,11 @@ impl TrustedSyncCommittee {
 }
 
 /// The sync committee aggregate
+#[serde_as]
 #[derive(Serialize, Deserialize, PartialEq, Eq, Clone, Debug, Default)]
 pub struct SyncAggregate {
     /// The bits representing the sync committee's participation.
-    #[serde(with = "ethereum_utils::base64")]
+    #[serde_as(as = "Base64")]
     pub sync_committee_bits: Bytes, // TODO: Consider changing this to a BitVector
     /// The aggregated signature of the sync committee.
     #[serde(with = "ethereum_utils::base64::fixed_size")]

diff --git a/packages/ethereum-light-client/src/types/wrappers.rs b/packages/ethereum-light-client/src/types/wrappers.rs
@@ -2,6 +2,7 @@
 
 use alloy_primitives::{aliases::B32, Bloom, Bytes, FixedBytes, B256};
 use serde::{Deserialize, Serialize};
+use serde_with::{base64::Base64, serde_as};
 use tree_hash::{MerkleHasher, TreeHash, BYTES_PER_CHUNK};
 
 use super::bls::BlsPublicKey;
@@ -30,8 +31,9 @@ impl TreeHash for WrappedVersion {
 }
 
 /// A wrapper around [`Bytes`] that implements [`TreeHash`] and uses a base64 encoding.
+#[serde_as]
 #[derive(Serialize, Deserialize, PartialEq, Eq, Clone, Debug, Default)]
-pub struct WrappedBytes(#[serde(with = "ethereum_utils::base64")] pub Bytes);
+pub struct WrappedBytes(#[serde_as(as = "Base64")] pub Bytes);
 
 impl TreeHash for WrappedBytes {
     fn tree_hash_type() -> tree_hash::TreeHashType {

diff --git a/packages/ethereum-utils/src/base64.rs b/packages/ethereum-utils/src/base64.rs
@@ -1,6 +1,5 @@
 use alloy_primitives::B256;
 use base64::{prelude::*, DecodeError};
-use serde::{de, Deserialize, Deserializer};
 
 pub trait FromBase64: Sized {
     fn from_base64(s: &str) -> Result<Self, DecodeError>;
@@ -17,23 +16,6 @@ impl FromBase64 for B256 {
     }
 }
 
-pub fn serialize<S, T: AsRef<[u8]>>(data: T, serializer: S) -> Result<S::Ok, S::Error>
-where
-    S: serde::Serializer,
-{
-    serializer.serialize_str(&BASE64_STANDARD.encode(data))
-}
-
-pub fn deserialize<'de, D, T>(deserializer: D) -> Result<T, D::Error>
-where
-    D: Deserializer<'de>,
-    T: TryFrom<Vec<u8>>,
-{
-    let s = String::deserialize(deserializer)?;
-    let decoded = from_base64(&s).map_err(de::Error::custom)?;
-    T::try_from(decoded).map_err(|_| de::Error::custom("Invalid base64 data"))
-}
-
 pub mod fixed_size {
     use base64::prelude::*;
     use serde::{de, Deserialize, Deserializer};

diff --git a/programs/cw-ics08-wasm-eth/Cargo.toml b/programs/cw-ics08-wasm-eth/Cargo.toml
@@ -20,6 +20,7 @@ cw-storage-plus = { workspace = true }
 prost = { workspace = true, features = ["std"] }
 serde = { workspace = true }
 serde_json = { workspace = true }
+serde_with = { workspace = true, features = ["base64"] }
 thiserror = { workspace = true }
 
 [dev-dependencies]

diff --git a/programs/cw-ics08-wasm-eth/src/test/fixture_types.rs b/programs/cw-ics08-wasm-eth/src/test/fixture_types.rs
@@ -4,6 +4,7 @@ use ethereum_light_client::{
     types::{height::Height, light_client::Header, storage_proof::StorageProof},
 };
 use serde::{Deserialize, Serialize};
+use serde_with::{base64::Base64, serde_as};
 
 // TODO: Remove this file once these types are in a separate package #143
 
@@ -20,9 +21,10 @@ pub struct InitialState {
     pub consensus_state: ConsensusState,
 }
 
+#[serde_as]
 #[derive(Serialize, Deserialize, PartialEq, Eq, Clone, Debug)]
 pub struct CommitmentProof {
-    #[serde(with = "ethereum_utils::base64")]
+    #[serde_as(as = "Base64")]
     pub path: Vec<u8>,
     pub storage_proof: StorageProof,
     pub proof_height: Height,