feat(state-lens-light-client-types): introduce generic client state type

Author: benluelo

Cargo.lock

@@ -11,8 +11,8 @@ use syn::{
     punctuated::Punctuated,
     spanned::Spanned,
     Attribute, Data, DeriveInput, Expr, ExprPath, Field, Fields, GenericParam, Generics, Ident,
-    Item, ItemEnum, ItemStruct, LitStr, MacroDelimiter, Meta, MetaList, Path, Token, Type, Variant,
-    WhereClause, WherePredicate,
+    Index, Item, ItemEnum, ItemStruct, LitStr, MacroDelimiter, Meta, MetaList, Path, Token, Type,
+    Variant, WhereClause, WherePredicate,
 };
 
 #[proc_macro_attribute]
@@ -1107,3 +1107,77 @@ fn parse_ibc_path(path: LitStr) -> Vec<Segment> {
         })
         .collect()
 }
+
+#[proc_macro_derive(AsTuple)]
+pub fn as_tuple(ts: TokenStream) -> TokenStream {
+    derive_as_tuple(parse_macro_input!(ts as DeriveInput))
+        // .inspect(|x| println!("{x}"))
+        .map_err(|e| e.into_compile_error())
+        .unwrap_or_else(convert::identity)
+        .into()
+}
+
+fn derive_as_tuple(
+    DeriveInput {
+        ident,
+        generics,
+        data,
+        ..
+    }: DeriveInput,
+) -> Result<proc_macro2::TokenStream, syn::Error> {
+    let (impl_generics, ty_generics, where_clause) = generics.split_for_impl();
+
+    let Data::Struct(data_struct) = data else {
+        return Err(syn::Error::new(
+            Span::call_site(),
+            "only structs are supported",
+        ));
+    };
+
+    let (into_tuple_fields, as_tuple_fields, from_tuple_fields) = (
+        data_struct.fields.members(),
+        data_struct.fields.members(),
+        data_struct.fields.members(),
+    );
+
+    let field_types = data_struct.fields.iter().map(|f| &f.ty);
+
+    let from_tuple_tuple_idxs = data_struct
+        .fields
+        .members()
+        .enumerate()
+        .map(|(idx, _)| Index::from(idx));
+
+    Ok(quote! {
+        const _: () = {
+            #[automatically_derived]
+            impl #impl_generics ::unionlabs::tuple::AsTuple for #ident #ty_generics #where_clause {
+                type Tuple = (#(#field_types,)*);
+
+                fn as_tuple(&self) -> <Self::Tuple as Tuple>::Ref<'_> {
+                    (
+                        #(
+                            &self.#as_tuple_fields,
+                        )*
+                    )
+                }
+
+                fn into_tuple(self) -> Self::Tuple {
+                    (
+                        #(
+                            self.#into_tuple_fields,
+                        )*
+                    )
+                }
+
+                fn from_tuple(tuple: Self::Tuple) -> Self {
+                    Self {
+                        #(
+                            #from_tuple_fields: tuple.#from_tuple_tuple_idxs,
+                        )*
+                    }
+                }
+            }
+        };
+    })
+}

lib/macros/src/lib.rs

@@ -6,20 +6,25 @@ repository.workspace   = true
 version                = "0.1.0"
 
 [dependencies]
-alloy     = { workspace = true, features = ["sol-types"], optional = true }
-bincode   = { workspace = true, features = ["alloc", "derive"], optional = true }
-protos    = { workspace = true, optional = true, features = ["proto_full", "serde"] }
-serde     = { workspace = true, optional = true, features = ["derive"] }
-thiserror = { workspace = true }
-unionlabs = { workspace = true, features = ["ethabi", "proto"] }
+alloy      = { workspace = true, optional = true, features = ["sol-types", "dyn-abi"] }
+bincode    = { workspace = true, optional = true, features = ["alloc", "derive"] }
+protos     = { workspace = true, optional = true, features = ["proto_full", "serde"] }
+serde      = { workspace = true, optional = true, features = ["derive"] }
+thiserror  = { workspace = true }
+tuple_join = { version = "0.1.0", optional = true }
+unionlabs  = { workspace = true, features = ["ethabi", "proto"] }
 
 [dev-dependencies]
-hex-literal = { workspace = true }
+hex-literal                   = { workspace = true }
+serde_json                    = { workspace = true }
+state-lens-light-client-types = { workspace = true, features = ["bincode", "ethabi", "serde"] }
+unionlabs                     = { workspace = true, features = ["test-utils"] }
 
 [features]
-bincode = ["dep:bincode", "unionlabs/bincode"]
 default = []
-ethabi  = ["unionlabs/ethabi", "dep:alloy", "dep:protos"]
+
+bincode = ["dep:bincode", "unionlabs/bincode"]
+ethabi  = ["unionlabs/ethabi", "dep:alloy", "dep:protos", "dep:tuple_join"]
 serde   = ["dep:serde"]
 
 [lints]