difftreelog
feat add derive macro AbiCoder for unnamed struct to implement AbiType
in: master
3 files changed
crates/evm-coder/procedural/src/abi_derive.rsdiffbeforeafterboth1use quote::quote;23pub(crate) fn impl_abi_macro(ast: &syn::DeriveInput) -> proc_macro2::TokenStream {4 // dbg!(ast);5 let name = &ast.ident;6 let can_be_plcaed_in_vec = impl_can_be_placed_in_vec(name);7 let abi_type = impl_abi_type(ast);8 println!("{}", abi_type);9 quote! {10 #can_be_plcaed_in_vec11 #abi_type12 }13}1415fn impl_can_be_placed_in_vec(ident: &syn::Ident) -> proc_macro2::TokenStream {16 quote! {17 impl ::evm_coder::abi::sealed::CanBePlacedInVec for #ident {}18 }19}2021fn impl_abi_type(ast: &syn::DeriveInput) -> proc_macro2::TokenStream {22 let name = &ast.ident;23 let (fields, params_count) = match &ast.data {24 syn::Data::Struct(ds) => match ds.fields {25 syn::Fields::Named(ref fields) => (26 fields.named.iter().map(|field| &field.ty),27 fields.named.len(),28 ),29 syn::Fields::Unnamed(_) => todo!(),30 syn::Fields::Unit => unimplemented!("Unit structs not supported"),31 },32 syn::Data::Enum(_) => unimplemented!("Enums not supported"),33 syn::Data::Union(_) => unimplemented!("Unions not supported"),34 };3536 let mut params_signature = {37 let fields = fields.clone();38 quote!(39 #(nameof(<#fields as ::evm_coder::abi::AbiType>::SIGNATURE) fixed(","))*40 )41 };42 if params_count > 0 {43 params_signature.extend(quote!(shift_left(1)))44 };4546 let fields_for_dynamic = fields.clone();4748 quote! {49 impl ::evm_coder::abi::AbiType for #name {50 const SIGNATURE: ::evm_coder::custom_signature::SignatureUnit = ::evm_coder::make_signature!(51 new fixed("(")52 #params_signature53 fixed(")")54 );55 fn is_dynamic() -> bool {56 false57 #(58 || <#fields_for_dynamic as ::evm_coder::abi::AbiType>::is_dynamic()59 )*60 }61 fn size() -> usize {62 0 #(+ <#fields as ::evm_coder::abi::AbiType>::size())*63 }64 }65 }66}crates/evm-coder/procedural/src/lib.rsdiffbeforeafterboth--- a/crates/evm-coder/procedural/src/lib.rs
+++ b/crates/evm-coder/procedural/src/lib.rs
@@ -248,6 +248,6 @@
pub fn abi_derive(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
let ast = syn::parse(input).unwrap();
let ts = abi_derive::impl_abi_macro(&ast);
- println!("{}", &ts);
+ // println!("{}", &ts);
ts.into()
}
crates/evm-coder/tests/abi_derive_generation.rsdiffbeforeafterboth--- a/crates/evm-coder/tests/abi_derive_generation.rs
+++ b/crates/evm-coder/tests/abi_derive_generation.rs
@@ -65,6 +65,9 @@
}
#[test]
+fn empty() {}
+
+#[test]
fn impl_abi_type_signature() {
assert_eq!(
<TypeStructUnit as AbiType>::SIGNATURE.as_str().unwrap(),
@@ -201,3 +204,209 @@
ABI_ALIGNMENT * 5
);
}
+
+#[derive(AbiCoder)]
+struct TupleStruct1SimpleParam(u8);
+
+#[derive(AbiCoder)]
+struct TupleStruct1DynamicParam(String);
+
+#[derive(AbiCoder)]
+struct TupleStruct2SimpleParam(u8, u32);
+
+#[derive(AbiCoder)]
+struct TupleStruct2DynamicParam(String, bytes);
+
+#[derive(AbiCoder)]
+struct TupleStruct2MixedParam(u8, bytes);
+
+#[derive(AbiCoder)]
+struct TupleStruct1DerivedSimpleParam(TupleStruct1SimpleParam);
+
+#[derive(AbiCoder)]
+struct TupleStruct2DerivedSimpleParam(TupleStruct1SimpleParam, TupleStruct2SimpleParam);
+
+#[derive(AbiCoder)]
+struct TupleStruct1DerivedDynamicParam(TupleStruct1DynamicParam);
+
+#[derive(AbiCoder)]
+struct TupleStruct2DerivedDynamicParam(TupleStruct1DynamicParam, TupleStruct2DynamicParam);
+
+#[derive(AbiCoder)]
+struct TupleStruct3DerivedMixedParam(
+ TupleStruct1SimpleParam,
+ TupleStruct2DynamicParam,
+ TupleStruct2MixedParam,
+);
+
+#[test]
+fn impl_abi_type_signature_same_for_structs() {
+ assert_eq!(
+ <TypeStruct1SimpleParam as AbiType>::SIGNATURE
+ .as_str()
+ .unwrap(),
+ <TupleStruct1SimpleParam as AbiType>::SIGNATURE
+ .as_str()
+ .unwrap()
+ );
+ assert_eq!(
+ <TypeStruct1DynamicParam as AbiType>::SIGNATURE
+ .as_str()
+ .unwrap(),
+ <TupleStruct1DynamicParam as AbiType>::SIGNATURE
+ .as_str()
+ .unwrap()
+ );
+ assert_eq!(
+ <TypeStruct2SimpleParam as AbiType>::SIGNATURE
+ .as_str()
+ .unwrap(),
+ <TupleStruct2SimpleParam as AbiType>::SIGNATURE
+ .as_str()
+ .unwrap()
+ );
+ assert_eq!(
+ <TypeStruct2DynamicParam as AbiType>::SIGNATURE
+ .as_str()
+ .unwrap(),
+ <TupleStruct2DynamicParam as AbiType>::SIGNATURE
+ .as_str()
+ .unwrap()
+ );
+ assert_eq!(
+ <TypeStruct2MixedParam as AbiType>::SIGNATURE
+ .as_str()
+ .unwrap(),
+ <TupleStruct2MixedParam as AbiType>::SIGNATURE
+ .as_str()
+ .unwrap(),
+ );
+ assert_eq!(
+ <TypeStruct1DerivedSimpleParam as AbiType>::SIGNATURE
+ .as_str()
+ .unwrap(),
+ <TupleStruct1DerivedSimpleParam as AbiType>::SIGNATURE
+ .as_str()
+ .unwrap(),
+ );
+ assert_eq!(
+ <TypeStruct2DerivedSimpleParam as AbiType>::SIGNATURE
+ .as_str()
+ .unwrap(),
+ <TupleStruct2DerivedSimpleParam as AbiType>::SIGNATURE
+ .as_str()
+ .unwrap(),
+ );
+ assert_eq!(
+ <TypeStruct1DerivedDynamicParam as AbiType>::SIGNATURE
+ .as_str()
+ .unwrap(),
+ <TupleStruct1DerivedDynamicParam as AbiType>::SIGNATURE
+ .as_str()
+ .unwrap(),
+ );
+ assert_eq!(
+ <TypeStruct2DerivedDynamicParam as AbiType>::SIGNATURE
+ .as_str()
+ .unwrap(),
+ <TupleStruct2DerivedDynamicParam as AbiType>::SIGNATURE
+ .as_str()
+ .unwrap(),
+ );
+ assert_eq!(
+ <TypeStruct3DerivedMixedParam as AbiType>::SIGNATURE
+ .as_str()
+ .unwrap(),
+ <TupleStruct3DerivedMixedParam as AbiType>::SIGNATURE
+ .as_str()
+ .unwrap(),
+ );
+}
+
+#[test]
+fn impl_abi_type_is_dynamic_same_for_structs() {
+ assert_eq!(
+ <TypeStruct1SimpleParam as AbiType>::is_dynamic(),
+ <TupleStruct1SimpleParam as AbiType>::is_dynamic()
+ );
+ assert_eq!(
+ <TypeStruct1DynamicParam as AbiType>::is_dynamic(),
+ <TupleStruct1DynamicParam as AbiType>::is_dynamic()
+ );
+ assert_eq!(
+ <TypeStruct2SimpleParam as AbiType>::is_dynamic(),
+ <TupleStruct2SimpleParam as AbiType>::is_dynamic()
+ );
+ assert_eq!(
+ <TypeStruct2DynamicParam as AbiType>::is_dynamic(),
+ <TupleStruct2DynamicParam as AbiType>::is_dynamic()
+ );
+ assert_eq!(
+ <TypeStruct2MixedParam as AbiType>::is_dynamic(),
+ <TupleStruct2MixedParam as AbiType>::is_dynamic()
+ );
+ assert_eq!(
+ <TypeStruct1DerivedSimpleParam as AbiType>::is_dynamic(),
+ <TupleStruct1DerivedSimpleParam as AbiType>::is_dynamic()
+ );
+ assert_eq!(
+ <TypeStruct2DerivedSimpleParam as AbiType>::is_dynamic(),
+ <TupleStruct2DerivedSimpleParam as AbiType>::is_dynamic()
+ );
+ assert_eq!(
+ <TypeStruct1DerivedDynamicParam as AbiType>::is_dynamic(),
+ <TupleStruct1DerivedDynamicParam as AbiType>::is_dynamic()
+ );
+ assert_eq!(
+ <TypeStruct2DerivedDynamicParam as AbiType>::is_dynamic(),
+ <TupleStruct2DerivedDynamicParam as AbiType>::is_dynamic()
+ );
+ assert_eq!(
+ <TypeStruct3DerivedMixedParam as AbiType>::is_dynamic(),
+ <TupleStruct3DerivedMixedParam as AbiType>::is_dynamic()
+ );
+}
+
+#[test]
+fn impl_abi_type_size_same_for_structs() {
+ assert_eq!(
+ <TypeStruct1SimpleParam as AbiType>::size(),
+ <TupleStruct1SimpleParam as AbiType>::size()
+ );
+ assert_eq!(
+ <TypeStruct1DynamicParam as AbiType>::size(),
+ <TupleStruct1DynamicParam as AbiType>::size()
+ );
+ assert_eq!(
+ <TypeStruct2SimpleParam as AbiType>::size(),
+ <TupleStruct2SimpleParam as AbiType>::size()
+ );
+ assert_eq!(
+ <TypeStruct2DynamicParam as AbiType>::size(),
+ <TupleStruct2DynamicParam as AbiType>::size()
+ );
+ assert_eq!(
+ <TypeStruct2MixedParam as AbiType>::size(),
+ <TupleStruct2MixedParam as AbiType>::size()
+ );
+ assert_eq!(
+ <TypeStruct1DerivedSimpleParam as AbiType>::size(),
+ <TupleStruct1DerivedSimpleParam as AbiType>::size()
+ );
+ assert_eq!(
+ <TypeStruct2DerivedSimpleParam as AbiType>::size(),
+ <TupleStruct2DerivedSimpleParam as AbiType>::size()
+ );
+ assert_eq!(
+ <TypeStruct1DerivedDynamicParam as AbiType>::size(),
+ <TupleStruct1DerivedDynamicParam as AbiType>::size()
+ );
+ assert_eq!(
+ <TypeStruct2DerivedDynamicParam as AbiType>::size(),
+ <TupleStruct2DerivedDynamicParam as AbiType>::size()
+ );
+ assert_eq!(
+ <TypeStruct3DerivedMixedParam as AbiType>::size(),
+ <TupleStruct3DerivedMixedParam as AbiType>::size()
+ );
+}