--- a/crates/evm-coder/procedural/src/abi_derive/derive_enum.rs +++ b/crates/evm-coder/procedural/src/abi_derive/derive_enum.rs @@ -47,10 +47,11 @@ ) } -pub fn impl_enum_abi_type(name: &syn::Ident) -> proc_macro2::TokenStream { +pub fn impl_enum_abi_type(name: &syn::Ident, option_count: usize) -> proc_macro2::TokenStream { quote! { impl ::evm_coder::abi::AbiType for #name { const SIGNATURE: ::evm_coder::custom_signature::SignatureUnit = ::SIGNATURE; + const FIELDS_COUNT: usize = #option_count; fn is_dynamic() -> bool { ::is_dynamic() --- a/crates/evm-coder/procedural/src/abi_derive/derive_struct.rs +++ b/crates/evm-coder/procedural/src/abi_derive/derive_struct.rs @@ -100,10 +100,12 @@ pub fn impl_struct_abi_type( name: &syn::Ident, tuple_type: proc_macro2::TokenStream, + fields_count: usize, ) -> proc_macro2::TokenStream { quote! { impl ::evm_coder::abi::AbiType for #name { const SIGNATURE: ::evm_coder::custom_signature::SignatureUnit = <#tuple_type as ::evm_coder::abi::AbiType>::SIGNATURE; + const FIELDS_COUNT: usize = #fields_count; fn is_dynamic() -> bool { <#tuple_type as ::evm_coder::abi::AbiType>::is_dynamic() } --- a/crates/evm-coder/procedural/src/abi_derive/mod.rs +++ b/crates/evm-coder/procedural/src/abi_derive/mod.rs @@ -49,7 +49,7 @@ let struct_from_tuple = struct_from_tuple(name, is_named_fields, field_names.clone()); let can_be_plcaed_in_vec = impl_can_be_placed_in_vec(name); - let abi_type = impl_struct_abi_type(name, tuple_type.clone()); + let abi_type = impl_struct_abi_type(name, tuple_type.clone(), params_count); let abi_read = impl_struct_abi_read(name, tuple_type, tuple_names, struct_from_tuple); let abi_write = impl_struct_abi_write(name, is_named_fields, tuple_ref_type, tuple_data); let solidity_type = impl_struct_solidity_type(name, field_types.clone(), params_count); @@ -83,7 +83,7 @@ let from = impl_enum_from_u8(name, enum_options.clone()); let solidity_option = impl_solidity_option(name, enum_options.clone()); let can_be_plcaed_in_vec = impl_can_be_placed_in_vec(name); - let abi_type = impl_enum_abi_type(name); + let abi_type = impl_enum_abi_type(name, option_count); let abi_read = impl_enum_abi_read(name); let abi_write = impl_enum_abi_write(name); let solidity_type_name = impl_enum_solidity_type_name(name); --- a/crates/evm-coder/src/abi/impls.rs +++ b/crates/evm-coder/src/abi/impls.rs @@ -16,6 +16,7 @@ impl AbiType for $ty { const SIGNATURE: SignatureUnit = make_signature!(new fixed(stringify!($name))); + const FIELDS_COUNT: usize = 1; fn is_dynamic() -> bool { $dynamic @@ -96,6 +97,7 @@ impl AbiType for &T { const SIGNATURE: SignatureUnit = T::SIGNATURE; + const FIELDS_COUNT: usize = T::FIELDS_COUNT; fn is_dynamic() -> bool { T::is_dynamic() @@ -125,6 +127,7 @@ impl AbiType for Vec { const SIGNATURE: SignatureUnit = make_signature!(new nameof(T::SIGNATURE) fixed("[]")); + const FIELDS_COUNT: usize = 1; fn is_dynamic() -> bool { true @@ -139,6 +142,7 @@ impl AbiType for Property { const SIGNATURE: SignatureUnit = make_signature!(new fixed("(string,bytes)")); + const FIELDS_COUNT: usize = 2; fn is_dynamic() -> bool { string::is_dynamic() || bytes::is_dynamic() @@ -230,6 +234,7 @@ shift_left(1) fixed(")") ); + const FIELDS_COUNT: usize = 0 $(+ {let _ = <$ident as AbiType>::FIELDS_COUNT; 1})+; fn is_dynamic() -> bool { false --- a/crates/evm-coder/src/abi/traits.rs +++ b/crates/evm-coder/src/abi/traits.rs @@ -10,6 +10,9 @@ /// Signature for Etherium ABI. const SIGNATURE: SignatureUnit; + /// Count of enum variants or struct fields. + const FIELDS_COUNT: usize; + /// Signature as str. fn as_str() -> &'static str { from_utf8(&Self::SIGNATURE.data[..Self::SIGNATURE.len]).expect("bad utf-8") --- a/crates/evm-coder/tests/abi_derive_generation.rs +++ b/crates/evm-coder/tests/abi_derive_generation.rs @@ -164,6 +164,50 @@ } #[test] + fn impl_abi_type_fields_count() { + assert_eq!( + ::FIELDS_COUNT, + 1 + ); + assert_eq!( + ::FIELDS_COUNT, + 1 + ); + assert_eq!( + ::FIELDS_COUNT, + 2 + ); + assert_eq!( + ::FIELDS_COUNT, + 2 + ); + assert_eq!( + ::FIELDS_COUNT, + 2 + ); + assert_eq!( + ::FIELDS_COUNT, + 1 + ); + assert_eq!( + ::FIELDS_COUNT, + 2 + ); + assert_eq!( + ::FIELDS_COUNT, + 2 + ); + assert_eq!( + ::FIELDS_COUNT, + 2 + ); + assert_eq!( + ::FIELDS_COUNT, + 3 + ); + } + + #[test] fn impl_abi_type_is_dynamic() { assert_eq!( ::is_dynamic(),