git.delta.rocks / unique-network / refs/commits / 4c9523749b30

--- a/crates/evm-coder/procedural/src/abi_derive.rs
+++ b/crates/evm-coder/procedural/src/abi_derive.rs
@@ -5,7 +5,7 @@
 	let name = &ast.ident;
 	let can_be_plcaed_in_vec = impl_can_be_placed_in_vec(name);
 	let abi_type = impl_abi_type(ast);
-	println!("{}", abi_type);
+	// println!("{}", abi_type);
 	quote! {
 		#can_be_plcaed_in_vec
 		#abi_type
@@ -18,15 +18,22 @@
 	}
 }
 
+fn map_field_to_type<'a>(field: &'a syn::Field) -> &'a syn::Type {
+	&field.ty
+}
+
 fn impl_abi_type(ast: &syn::DeriveInput) -> proc_macro2::TokenStream {
 	let name = &ast.ident;
 	let (fields, params_count) = match &ast.data {
 		syn::Data::Struct(ds) => match ds.fields {
 			syn::Fields::Named(ref fields) => (
-				fields.named.iter().map(|field| &field.ty),
+				fields.named.iter().map(map_field_to_type),
 				fields.named.len(),
 			),
-			syn::Fields::Unnamed(_) => todo!(),
+			syn::Fields::Unnamed(ref fields) => (
+				fields.unnamed.iter().map(map_field_to_type),
+				fields.unnamed.len(),
+			),
 			syn::Fields::Unit => unimplemented!("Unit structs not supported"),
 		},
 		syn::Data::Enum(_) => unimplemented!("Enums not supported"),

248pub fn abi_derive(input: proc_macro::TokenStream) -> proc_macro::TokenStream {248pub fn abi_derive(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
249	let ast = syn::parse(input).unwrap();249	let ast = syn::parse(input).unwrap();
250	let ts = abi_derive::impl_abi_macro(&ast);250	let ts = abi_derive::impl_abi_macro(&ast);
251	println!("{}", &ts);251	// println!("{}", &ts);
252	ts.into()252	ts.into()
253}253}
254254

--- 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()
+	);
+}