git.delta.rocks / unique-network / refs/commits / 0a8a6b00d989

difftreelog

fix AbiCoder macro

Trubnikov Sergey2022-11-17parent: #7eec33a.patch.diff
in: master

3 files changed

modifiedcrates/evm-coder/procedural/src/abi_derive.rsdiffbeforeafterboth
before · crates/evm-coder/procedural/src/abi_derive.rs
1use quote::quote;23pub(crate) fn impl_abi_macro(ast: &syn::DeriveInput) -> syn::Result<proc_macro2::TokenStream> {4	let name = &ast.ident;5	let (is_named_fields, field_names, field_types, params_count) = match &ast.data {6		syn::Data::Struct(ds) => match ds.fields {7			syn::Fields::Named(ref fields) => Ok((8				true,9				fields.named.iter().enumerate().map(map_field_to_name),10				fields.named.iter().map(map_field_to_type),11				fields.named.len(),12			)),13			syn::Fields::Unnamed(ref fields) => Ok((14				false,15				fields.unnamed.iter().enumerate().map(map_field_to_name),16				fields.unnamed.iter().map(map_field_to_type),17				fields.unnamed.len(),18			)),19			syn::Fields::Unit => Err(syn::Error::new(name.span(), "Unit structs not supported")),20		},21		syn::Data::Enum(_) => Err(syn::Error::new(name.span(), "Enums not supported")),22		syn::Data::Union(_) => Err(syn::Error::new(name.span(), "Unions not supported")),23	}?;2425	if params_count == 0 {26		return Err(syn::Error::new(name.span(), "Empty structs not supported"));27	};2829	let can_be_plcaed_in_vec = impl_can_be_placed_in_vec(name);30	let abi_type = impl_abi_type(name, field_types.clone());31	let abi_read = impl_abi_read(name, is_named_fields, field_names.clone(), field_types);32	let abi_write = impl_abi_write(name, is_named_fields, params_count, field_names);3334	Ok(quote! {35		#can_be_plcaed_in_vec36		#abi_type37		#abi_read38		#abi_write39	})40}4142fn impl_can_be_placed_in_vec(ident: &syn::Ident) -> proc_macro2::TokenStream {43	quote! {44		impl ::evm_coder::abi::sealed::CanBePlacedInVec for #ident {}45	}46}4748fn map_field_to_name(field: (usize, &syn::Field)) -> syn::Ident {49	match field.1.ident.as_ref() {50		Some(name) => name.clone(),51		None => {52			let mut name = "field".to_string();53			name.push_str(field.0.to_string().as_str());54			syn::Ident::new(name.as_str(), proc_macro2::Span::call_site())55		}56	}57}5859fn map_field_to_type<'a>(field: &'a syn::Field) -> &'a syn::Type {60	&field.ty61}6263fn impl_abi_type<'a>(64	name: &syn::Ident,65	field_types: impl Iterator<Item = &'a syn::Type> + Clone,66) -> proc_macro2::TokenStream {67	let mut params_signature = {68		let types = field_types.clone();69		quote!(70			#(nameof(<#types as ::evm_coder::abi::AbiType>::SIGNATURE) fixed(","))*71		)72	};7374	params_signature.extend(quote!(shift_left(1)));7576	let fields_for_dynamic = field_types.clone();7778	quote! {79		impl ::evm_coder::abi::AbiType for #name {80			const SIGNATURE: ::evm_coder::custom_signature::SignatureUnit = ::evm_coder::make_signature!(81				new fixed("(")82				#params_signature83				fixed(")")84			);85			fn is_dynamic() -> bool {86				false87				#(88					|| <#fields_for_dynamic as ::evm_coder::abi::AbiType>::is_dynamic()89				)*90			}91			fn size() -> usize {92				0 #(+ <#field_types as ::evm_coder::abi::AbiType>::size())*93			}94		}95	}96}9798fn impl_abi_read<'a>(99	name: &syn::Ident,100	is_named_fields: bool,101	field_names: impl Iterator<Item = proc_macro2::Ident> + Clone,102	field_types: impl Iterator<Item = &'a syn::Type> + Clone,103) -> proc_macro2::TokenStream {104	let field_names1 = field_names.clone();105106	let struct_constructor = if is_named_fields {107		quote!(Ok(Self { #(#field_names1),* }))108	} else {109		quote!(Ok(Self ( #(#field_names1),* )))110	};111	quote!(112		impl ::evm_coder::abi::AbiRead for #name {113			fn abi_read(reader: &mut ::evm_coder::abi::AbiReader) -> ::evm_coder::execution::Result<Self> {114				let is_dynamic = <Self as ::evm_coder::abi::AbiType>::is_dynamic();115				let size = if !is_dynamic {116					Some(<Self as ::evm_coder::abi::AbiType>::size())117				} else {118					None119				};120				let mut subresult = reader.subresult(size)?;121				#(122					let #field_names = {123						let value = <#field_types as ::evm_coder::abi::AbiRead>::abi_read(&mut subresult)?;124						if !is_dynamic {subresult.seek(<#field_types as ::evm_coder::abi::AbiType>::size())};125						value126					};127				)*128129				#struct_constructor130			}131		}132	)133}134135fn impl_abi_write<'a>(136	name: &syn::Ident,137	is_named_fields: bool,138	params_count: usize,139	field_names: impl Iterator<Item = proc_macro2::Ident> + Clone,140) -> proc_macro2::TokenStream {141	let abi_write = if is_named_fields {142		quote!(143			#(144				self.#field_names.abi_write(sub);145			)*146		)147	} else {148		let field_names = (0..params_count)149			.into_iter()150			.map(proc_macro2::Literal::usize_unsuffixed);151		quote!(152			#(153				self.#field_names.abi_write(sub);154			)*155		)156	};157	quote!(158		impl ::evm_coder::abi::AbiWrite for #name {159			fn abi_write(&self, writer: &mut ::evm_coder::abi::AbiWriter) {160				if <Self as ::evm_coder::abi::AbiType>::is_dynamic() {161					let mut sub = ::evm_coder::abi::AbiWriter::new();162					{163						let sub = &mut sub;164						#abi_write165					}166					writer.write_subresult(sub);167				} else {168					let sub = writer;169					#abi_write170				}171			}172		}173	)174}
after · crates/evm-coder/procedural/src/abi_derive.rs
1use quote::quote;23pub(crate) fn impl_abi_macro(ast: &syn::DeriveInput) -> syn::Result<proc_macro2::TokenStream> {4	let name = &ast.ident;5	let (is_named_fields, field_names, field_types, params_count) = match &ast.data {6		syn::Data::Struct(ds) => match ds.fields {7			syn::Fields::Named(ref fields) => Ok((8				true,9				fields.named.iter().enumerate().map(map_field_to_name),10				fields.named.iter().map(map_field_to_type),11				fields.named.len(),12			)),13			syn::Fields::Unnamed(ref fields) => Ok((14				false,15				fields.unnamed.iter().enumerate().map(map_field_to_name),16				fields.unnamed.iter().map(map_field_to_type),17				fields.unnamed.len(),18			)),19			syn::Fields::Unit => Err(syn::Error::new(name.span(), "Unit structs not supported")),20		},21		syn::Data::Enum(_) => Err(syn::Error::new(name.span(), "Enums not supported")),22		syn::Data::Union(_) => Err(syn::Error::new(name.span(), "Unions not supported")),23	}?;2425	if params_count == 0 {26		return Err(syn::Error::new(name.span(), "Empty structs not supported"));27	};2829	let can_be_plcaed_in_vec = impl_can_be_placed_in_vec(name);30	let abi_type = impl_abi_type(name, field_types.clone());31	let abi_read = impl_abi_read(name, is_named_fields, field_names.clone(), field_types);32	let abi_write = impl_abi_write(name, is_named_fields, params_count, field_names);3334	Ok(quote! {35		#can_be_plcaed_in_vec36		#abi_type37		#abi_read38		#abi_write39	})40}4142fn impl_can_be_placed_in_vec(ident: &syn::Ident) -> proc_macro2::TokenStream {43	quote! {44		impl ::evm_coder::abi::sealed::CanBePlacedInVec for #ident {}45	}46}4748fn map_field_to_name(field: (usize, &syn::Field)) -> syn::Ident {49	match field.1.ident.as_ref() {50		Some(name) => name.clone(),51		None => {52			let mut name = "field".to_string();53			name.push_str(field.0.to_string().as_str());54			syn::Ident::new(name.as_str(), proc_macro2::Span::call_site())55		}56	}57}5859fn map_field_to_type<'a>(field: &'a syn::Field) -> &'a syn::Type {60	&field.ty61}6263fn impl_abi_type<'a>(64	name: &syn::Ident,65	field_types: impl Iterator<Item = &'a syn::Type> + Clone,66) -> proc_macro2::TokenStream {67	let mut params_signature = {68		let types = field_types.clone();69		quote!(70			#(nameof(<#types as ::evm_coder::abi::AbiType>::SIGNATURE) fixed(","))*71		)72	};7374	params_signature.extend(quote!(shift_left(1)));7576	let fields_for_dynamic = field_types.clone();7778	quote! {79		impl ::evm_coder::abi::AbiType for #name {80			const SIGNATURE: ::evm_coder::custom_signature::SignatureUnit = ::evm_coder::make_signature!(81				new fixed("(")82				#params_signature83				fixed(")")84			);85			fn is_dynamic() -> bool {86				false87				#(88					|| <#fields_for_dynamic as ::evm_coder::abi::AbiType>::is_dynamic()89				)*90			}91			fn size() -> usize {92				0 #(+ <#field_types as ::evm_coder::abi::AbiType>::size())*93			}94		}95	}96}9798fn impl_abi_read<'a>(99	name: &syn::Ident,100	is_named_fields: bool,101	field_names: impl Iterator<Item = proc_macro2::Ident> + Clone,102	field_types: impl Iterator<Item = &'a syn::Type> + Clone,103) -> proc_macro2::TokenStream {104	let field_names1 = field_names.clone();105106	let struct_constructor = if is_named_fields {107		quote!(Ok(Self { #(#field_names1),* }))108	} else {109		quote!(Ok(Self ( #(#field_names1),* )))110	};111	quote!(112		impl ::evm_coder::abi::AbiRead for #name {113			fn abi_read(reader: &mut ::evm_coder::abi::AbiReader) -> ::evm_coder::execution::Result<Self> {114				let is_dynamic = <Self as ::evm_coder::abi::AbiType>::is_dynamic();115				let size = if !is_dynamic {116					Some(<Self as ::evm_coder::abi::AbiType>::size())117				} else {118					None119				};120				let mut subresult = reader.subresult(size)?;121				#(122					let #field_names = {123						let value = <#field_types as ::evm_coder::abi::AbiRead>::abi_read(&mut subresult)?;124						if !is_dynamic {subresult.seek(<#field_types as ::evm_coder::abi::AbiType>::size())};125						value126					};127				)*128129				#struct_constructor130			}131		}132	)133}134135fn impl_abi_write<'a>(136	name: &syn::Ident,137	is_named_fields: bool,138	params_count: usize,139	field_names: impl Iterator<Item = proc_macro2::Ident> + Clone,140) -> proc_macro2::TokenStream {141	let abi_write = if is_named_fields {142		quote!(143			#(144				::evm_coder::abi::AbiWrite::abi_write(&self.#field_names, sub);145			)*146		)147	} else {148		let field_names = (0..params_count)149			.into_iter()150			.map(proc_macro2::Literal::usize_unsuffixed);151		quote!(152			#(153				::evm_coder::abi::AbiWrite::abi_write(&self.#field_names, sub);154			)*155		)156	};157	quote!(158		impl ::evm_coder::abi::AbiWrite for #name {159			fn abi_write(&self, writer: &mut ::evm_coder::abi::AbiWriter) {160				if <Self as ::evm_coder::abi::AbiType>::is_dynamic() {161					let mut sub = ::evm_coder::abi::AbiWriter::new();162					{163						let sub = &mut sub;164						#abi_write165					}166					writer.write_subresult(sub);167				} else {168					let sub = writer;169					#abi_write170				}171			}172		}173	)174}
modifiedcrates/evm-coder/procedural/src/lib.rsdiffbeforeafterboth
--- a/crates/evm-coder/procedural/src/lib.rs
+++ b/crates/evm-coder/procedural/src/lib.rs
@@ -251,6 +251,5 @@
 		Ok(e) => e,
 		Err(e) => e.to_compile_error(),
 	};
-	// println!("{}", &ts);
 	ts.into()
 }
modifiedcrates/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
@@ -1,8 +1,5 @@
 use evm_coder_procedural::AbiCoder;
-use evm_coder::{
-	types::*,
-	abi::{AbiType, AbiRead, AbiWrite, AbiReader, AbiWriter},
-};
+use evm_coder::types::bytes;
 
 // TODO: move to build_failed tests
 // #[derive(AbiCoder, PartialEq, Debug)]
@@ -71,61 +68,61 @@
 #[test]
 fn impl_abi_type_signature() {
 	assert_eq!(
-		<TypeStruct1SimpleParam as AbiType>::SIGNATURE
+		<TypeStruct1SimpleParam as evm_coder::abi::AbiType>::SIGNATURE
 			.as_str()
 			.unwrap(),
 		"(uint8)"
 	);
 	assert_eq!(
-		<TypeStruct1DynamicParam as AbiType>::SIGNATURE
+		<TypeStruct1DynamicParam as evm_coder::abi::AbiType>::SIGNATURE
 			.as_str()
 			.unwrap(),
 		"(string)"
 	);
 	assert_eq!(
-		<TypeStruct2SimpleParam as AbiType>::SIGNATURE
+		<TypeStruct2SimpleParam as evm_coder::abi::AbiType>::SIGNATURE
 			.as_str()
 			.unwrap(),
 		"(uint8,uint32)"
 	);
 	assert_eq!(
-		<TypeStruct2DynamicParam as AbiType>::SIGNATURE
+		<TypeStruct2DynamicParam as evm_coder::abi::AbiType>::SIGNATURE
 			.as_str()
 			.unwrap(),
 		"(string,bytes)"
 	);
 	assert_eq!(
-		<TypeStruct2MixedParam as AbiType>::SIGNATURE
+		<TypeStruct2MixedParam as evm_coder::abi::AbiType>::SIGNATURE
 			.as_str()
 			.unwrap(),
 		"(uint8,bytes)"
 	);
 	assert_eq!(
-		<TypeStruct1DerivedSimpleParam as AbiType>::SIGNATURE
+		<TypeStruct1DerivedSimpleParam as evm_coder::abi::AbiType>::SIGNATURE
 			.as_str()
 			.unwrap(),
 		"((uint8))"
 	);
 	assert_eq!(
-		<TypeStruct2DerivedSimpleParam as AbiType>::SIGNATURE
+		<TypeStruct2DerivedSimpleParam as evm_coder::abi::AbiType>::SIGNATURE
 			.as_str()
 			.unwrap(),
 		"((uint8),(uint8,uint32))"
 	);
 	assert_eq!(
-		<TypeStruct1DerivedDynamicParam as AbiType>::SIGNATURE
+		<TypeStruct1DerivedDynamicParam as evm_coder::abi::AbiType>::SIGNATURE
 			.as_str()
 			.unwrap(),
 		"((string))"
 	);
 	assert_eq!(
-		<TypeStruct2DerivedDynamicParam as AbiType>::SIGNATURE
+		<TypeStruct2DerivedDynamicParam as evm_coder::abi::AbiType>::SIGNATURE
 			.as_str()
 			.unwrap(),
 		"((string),(string,bytes))"
 	);
 	assert_eq!(
-		<TypeStruct3DerivedMixedParam as AbiType>::SIGNATURE
+		<TypeStruct3DerivedMixedParam as evm_coder::abi::AbiType>::SIGNATURE
 			.as_str()
 			.unwrap(),
 		"((uint8),(string,bytes),(uint8,bytes))"
@@ -134,68 +131,89 @@
 
 #[test]
 fn impl_abi_type_is_dynamic() {
-	assert_eq!(<TypeStruct1SimpleParam as AbiType>::is_dynamic(), false);
-	assert_eq!(<TypeStruct1DynamicParam as AbiType>::is_dynamic(), true);
-	assert_eq!(<TypeStruct2SimpleParam as AbiType>::is_dynamic(), false);
-	assert_eq!(<TypeStruct2DynamicParam as AbiType>::is_dynamic(), true);
-	assert_eq!(<TypeStruct2MixedParam as AbiType>::is_dynamic(), true);
 	assert_eq!(
-		<TypeStruct1DerivedSimpleParam as AbiType>::is_dynamic(),
+		<TypeStruct1SimpleParam as evm_coder::abi::AbiType>::is_dynamic(),
 		false
 	);
 	assert_eq!(
-		<TypeStruct2DerivedSimpleParam as AbiType>::is_dynamic(),
+		<TypeStruct1DynamicParam as evm_coder::abi::AbiType>::is_dynamic(),
+		true
+	);
+	assert_eq!(
+		<TypeStruct2SimpleParam as evm_coder::abi::AbiType>::is_dynamic(),
 		false
 	);
 	assert_eq!(
-		<TypeStruct1DerivedDynamicParam as AbiType>::is_dynamic(),
+		<TypeStruct2DynamicParam as evm_coder::abi::AbiType>::is_dynamic(),
 		true
 	);
 	assert_eq!(
-		<TypeStruct2DerivedDynamicParam as AbiType>::is_dynamic(),
+		<TypeStruct2MixedParam as evm_coder::abi::AbiType>::is_dynamic(),
 		true
 	);
 	assert_eq!(
-		<TypeStruct3DerivedMixedParam as AbiType>::is_dynamic(),
+		<TypeStruct1DerivedSimpleParam as evm_coder::abi::AbiType>::is_dynamic(),
+		false
+	);
+	assert_eq!(
+		<TypeStruct2DerivedSimpleParam as evm_coder::abi::AbiType>::is_dynamic(),
+		false
+	);
+	assert_eq!(
+		<TypeStruct1DerivedDynamicParam as evm_coder::abi::AbiType>::is_dynamic(),
 		true
 	);
+	assert_eq!(
+		<TypeStruct2DerivedDynamicParam as evm_coder::abi::AbiType>::is_dynamic(),
+		true
+	);
+	assert_eq!(
+		<TypeStruct3DerivedMixedParam as evm_coder::abi::AbiType>::is_dynamic(),
+		true
+	);
 }
 
 #[test]
 fn impl_abi_type_size() {
 	const ABI_ALIGNMENT: usize = 32;
-	assert_eq!(<TypeStruct1SimpleParam as AbiType>::size(), ABI_ALIGNMENT);
-	assert_eq!(<TypeStruct1DynamicParam as AbiType>::size(), ABI_ALIGNMENT);
 	assert_eq!(
-		<TypeStruct2SimpleParam as AbiType>::size(),
+		<TypeStruct1SimpleParam as evm_coder::abi::AbiType>::size(),
+		ABI_ALIGNMENT
+	);
+	assert_eq!(
+		<TypeStruct1DynamicParam as evm_coder::abi::AbiType>::size(),
+		ABI_ALIGNMENT
+	);
+	assert_eq!(
+		<TypeStruct2SimpleParam as evm_coder::abi::AbiType>::size(),
 		ABI_ALIGNMENT * 2
 	);
 	assert_eq!(
-		<TypeStruct2DynamicParam as AbiType>::size(),
+		<TypeStruct2DynamicParam as evm_coder::abi::AbiType>::size(),
 		ABI_ALIGNMENT * 2
 	);
 	assert_eq!(
-		<TypeStruct2MixedParam as AbiType>::size(),
+		<TypeStruct2MixedParam as evm_coder::abi::AbiType>::size(),
 		ABI_ALIGNMENT * 2
 	);
 	assert_eq!(
-		<TypeStruct1DerivedSimpleParam as AbiType>::size(),
+		<TypeStruct1DerivedSimpleParam as evm_coder::abi::AbiType>::size(),
 		ABI_ALIGNMENT
 	);
 	assert_eq!(
-		<TypeStruct2DerivedSimpleParam as AbiType>::size(),
+		<TypeStruct2DerivedSimpleParam as evm_coder::abi::AbiType>::size(),
 		ABI_ALIGNMENT * 3
 	);
 	assert_eq!(
-		<TypeStruct1DerivedDynamicParam as AbiType>::size(),
+		<TypeStruct1DerivedDynamicParam as evm_coder::abi::AbiType>::size(),
 		ABI_ALIGNMENT
 	);
 	assert_eq!(
-		<TypeStruct2DerivedDynamicParam as AbiType>::size(),
+		<TypeStruct2DerivedDynamicParam as evm_coder::abi::AbiType>::size(),
 		ABI_ALIGNMENT * 3
 	);
 	assert_eq!(
-		<TypeStruct3DerivedMixedParam as AbiType>::size(),
+		<TypeStruct3DerivedMixedParam as evm_coder::abi::AbiType>::size(),
 		ABI_ALIGNMENT * 5
 	);
 }
@@ -237,82 +255,82 @@
 #[test]
 fn impl_abi_type_signature_same_for_structs() {
 	assert_eq!(
-		<TypeStruct1SimpleParam as AbiType>::SIGNATURE
+		<TypeStruct1SimpleParam as evm_coder::abi::AbiType>::SIGNATURE
 			.as_str()
 			.unwrap(),
-		<TupleStruct1SimpleParam as AbiType>::SIGNATURE
+		<TupleStruct1SimpleParam as evm_coder::abi::AbiType>::SIGNATURE
 			.as_str()
 			.unwrap()
 	);
 	assert_eq!(
-		<TypeStruct1DynamicParam as AbiType>::SIGNATURE
+		<TypeStruct1DynamicParam as evm_coder::abi::AbiType>::SIGNATURE
 			.as_str()
 			.unwrap(),
-		<TupleStruct1DynamicParam as AbiType>::SIGNATURE
+		<TupleStruct1DynamicParam as evm_coder::abi::AbiType>::SIGNATURE
 			.as_str()
 			.unwrap()
 	);
 	assert_eq!(
-		<TypeStruct2SimpleParam as AbiType>::SIGNATURE
+		<TypeStruct2SimpleParam as evm_coder::abi::AbiType>::SIGNATURE
 			.as_str()
 			.unwrap(),
-		<TupleStruct2SimpleParam as AbiType>::SIGNATURE
+		<TupleStruct2SimpleParam as evm_coder::abi::AbiType>::SIGNATURE
 			.as_str()
 			.unwrap()
 	);
 	assert_eq!(
-		<TypeStruct2DynamicParam as AbiType>::SIGNATURE
+		<TypeStruct2DynamicParam as evm_coder::abi::AbiType>::SIGNATURE
 			.as_str()
 			.unwrap(),
-		<TupleStruct2DynamicParam as AbiType>::SIGNATURE
+		<TupleStruct2DynamicParam as evm_coder::abi::AbiType>::SIGNATURE
 			.as_str()
 			.unwrap()
 	);
 	assert_eq!(
-		<TypeStruct2MixedParam as AbiType>::SIGNATURE
+		<TypeStruct2MixedParam as evm_coder::abi::AbiType>::SIGNATURE
 			.as_str()
 			.unwrap(),
-		<TupleStruct2MixedParam as AbiType>::SIGNATURE
+		<TupleStruct2MixedParam as evm_coder::abi::AbiType>::SIGNATURE
 			.as_str()
 			.unwrap(),
 	);
 	assert_eq!(
-		<TypeStruct1DerivedSimpleParam as AbiType>::SIGNATURE
+		<TypeStruct1DerivedSimpleParam as evm_coder::abi::AbiType>::SIGNATURE
 			.as_str()
 			.unwrap(),
-		<TupleStruct1DerivedSimpleParam as AbiType>::SIGNATURE
+		<TupleStruct1DerivedSimpleParam as evm_coder::abi::AbiType>::SIGNATURE
 			.as_str()
 			.unwrap(),
 	);
 	assert_eq!(
-		<TypeStruct2DerivedSimpleParam as AbiType>::SIGNATURE
+		<TypeStruct2DerivedSimpleParam as evm_coder::abi::AbiType>::SIGNATURE
 			.as_str()
 			.unwrap(),
-		<TupleStruct2DerivedSimpleParam as AbiType>::SIGNATURE
+		<TupleStruct2DerivedSimpleParam as evm_coder::abi::AbiType>::SIGNATURE
 			.as_str()
 			.unwrap(),
 	);
 	assert_eq!(
-		<TypeStruct1DerivedDynamicParam as AbiType>::SIGNATURE
+		<TypeStruct1DerivedDynamicParam as evm_coder::abi::AbiType>::SIGNATURE
 			.as_str()
 			.unwrap(),
-		<TupleStruct1DerivedDynamicParam as AbiType>::SIGNATURE
+		<TupleStruct1DerivedDynamicParam as evm_coder::abi::AbiType>::SIGNATURE
 			.as_str()
 			.unwrap(),
 	);
 	assert_eq!(
-		<TypeStruct2DerivedDynamicParam as AbiType>::SIGNATURE
+		<TypeStruct2DerivedDynamicParam as evm_coder::abi::AbiType>::SIGNATURE
 			.as_str()
 			.unwrap(),
-		<TupleStruct2DerivedDynamicParam as AbiType>::SIGNATURE
+		<TupleStruct2DerivedDynamicParam as evm_coder::abi::AbiType>::SIGNATURE
 			.as_str()
 			.unwrap(),
 	);
 	assert_eq!(
-		<TypeStruct3DerivedMixedParam as AbiType>::SIGNATURE
+		<TypeStruct3DerivedMixedParam as evm_coder::abi::AbiType>::SIGNATURE
 			.as_str()
 			.unwrap(),
-		<TupleStruct3DerivedMixedParam as AbiType>::SIGNATURE
+		<TupleStruct3DerivedMixedParam as evm_coder::abi::AbiType>::SIGNATURE
 			.as_str()
 			.unwrap(),
 	);
@@ -321,88 +339,88 @@
 #[test]
 fn impl_abi_type_is_dynamic_same_for_structs() {
 	assert_eq!(
-		<TypeStruct1SimpleParam as AbiType>::is_dynamic(),
-		<TupleStruct1SimpleParam as AbiType>::is_dynamic()
+		<TypeStruct1SimpleParam as evm_coder::abi::AbiType>::is_dynamic(),
+		<TupleStruct1SimpleParam as evm_coder::abi::AbiType>::is_dynamic()
 	);
 	assert_eq!(
-		<TypeStruct1DynamicParam as AbiType>::is_dynamic(),
-		<TupleStruct1DynamicParam as AbiType>::is_dynamic()
+		<TypeStruct1DynamicParam as evm_coder::abi::AbiType>::is_dynamic(),
+		<TupleStruct1DynamicParam as evm_coder::abi::AbiType>::is_dynamic()
 	);
 	assert_eq!(
-		<TypeStruct2SimpleParam as AbiType>::is_dynamic(),
-		<TupleStruct2SimpleParam as AbiType>::is_dynamic()
+		<TypeStruct2SimpleParam as evm_coder::abi::AbiType>::is_dynamic(),
+		<TupleStruct2SimpleParam as evm_coder::abi::AbiType>::is_dynamic()
 	);
 	assert_eq!(
-		<TypeStruct2DynamicParam as AbiType>::is_dynamic(),
-		<TupleStruct2DynamicParam as AbiType>::is_dynamic()
+		<TypeStruct2DynamicParam as evm_coder::abi::AbiType>::is_dynamic(),
+		<TupleStruct2DynamicParam as evm_coder::abi::AbiType>::is_dynamic()
 	);
 	assert_eq!(
-		<TypeStruct2MixedParam as AbiType>::is_dynamic(),
-		<TupleStruct2MixedParam as AbiType>::is_dynamic()
+		<TypeStruct2MixedParam as evm_coder::abi::AbiType>::is_dynamic(),
+		<TupleStruct2MixedParam as evm_coder::abi::AbiType>::is_dynamic()
 	);
 	assert_eq!(
-		<TypeStruct1DerivedSimpleParam as AbiType>::is_dynamic(),
-		<TupleStruct1DerivedSimpleParam as AbiType>::is_dynamic()
+		<TypeStruct1DerivedSimpleParam as evm_coder::abi::AbiType>::is_dynamic(),
+		<TupleStruct1DerivedSimpleParam as evm_coder::abi::AbiType>::is_dynamic()
 	);
 	assert_eq!(
-		<TypeStruct2DerivedSimpleParam as AbiType>::is_dynamic(),
-		<TupleStruct2DerivedSimpleParam as AbiType>::is_dynamic()
+		<TypeStruct2DerivedSimpleParam as evm_coder::abi::AbiType>::is_dynamic(),
+		<TupleStruct2DerivedSimpleParam as evm_coder::abi::AbiType>::is_dynamic()
 	);
 	assert_eq!(
-		<TypeStruct1DerivedDynamicParam as AbiType>::is_dynamic(),
-		<TupleStruct1DerivedDynamicParam as AbiType>::is_dynamic()
+		<TypeStruct1DerivedDynamicParam as evm_coder::abi::AbiType>::is_dynamic(),
+		<TupleStruct1DerivedDynamicParam as evm_coder::abi::AbiType>::is_dynamic()
 	);
 	assert_eq!(
-		<TypeStruct2DerivedDynamicParam as AbiType>::is_dynamic(),
-		<TupleStruct2DerivedDynamicParam as AbiType>::is_dynamic()
+		<TypeStruct2DerivedDynamicParam as evm_coder::abi::AbiType>::is_dynamic(),
+		<TupleStruct2DerivedDynamicParam as evm_coder::abi::AbiType>::is_dynamic()
 	);
 	assert_eq!(
-		<TypeStruct3DerivedMixedParam as AbiType>::is_dynamic(),
-		<TupleStruct3DerivedMixedParam as AbiType>::is_dynamic()
+		<TypeStruct3DerivedMixedParam as evm_coder::abi::AbiType>::is_dynamic(),
+		<TupleStruct3DerivedMixedParam as evm_coder::abi::AbiType>::is_dynamic()
 	);
 }
 
 #[test]
 fn impl_abi_type_size_same_for_structs() {
 	assert_eq!(
-		<TypeStruct1SimpleParam as AbiType>::size(),
-		<TupleStruct1SimpleParam as AbiType>::size()
+		<TypeStruct1SimpleParam as evm_coder::abi::AbiType>::size(),
+		<TupleStruct1SimpleParam as evm_coder::abi::AbiType>::size()
 	);
 	assert_eq!(
-		<TypeStruct1DynamicParam as AbiType>::size(),
-		<TupleStruct1DynamicParam as AbiType>::size()
+		<TypeStruct1DynamicParam as evm_coder::abi::AbiType>::size(),
+		<TupleStruct1DynamicParam as evm_coder::abi::AbiType>::size()
 	);
 	assert_eq!(
-		<TypeStruct2SimpleParam as AbiType>::size(),
-		<TupleStruct2SimpleParam as AbiType>::size()
+		<TypeStruct2SimpleParam as evm_coder::abi::AbiType>::size(),
+		<TupleStruct2SimpleParam as evm_coder::abi::AbiType>::size()
 	);
 	assert_eq!(
-		<TypeStruct2DynamicParam as AbiType>::size(),
-		<TupleStruct2DynamicParam as AbiType>::size()
+		<TypeStruct2DynamicParam as evm_coder::abi::AbiType>::size(),
+		<TupleStruct2DynamicParam as evm_coder::abi::AbiType>::size()
 	);
 	assert_eq!(
-		<TypeStruct2MixedParam as AbiType>::size(),
-		<TupleStruct2MixedParam as AbiType>::size()
+		<TypeStruct2MixedParam as evm_coder::abi::AbiType>::size(),
+		<TupleStruct2MixedParam as evm_coder::abi::AbiType>::size()
 	);
 	assert_eq!(
-		<TypeStruct1DerivedSimpleParam as AbiType>::size(),
-		<TupleStruct1DerivedSimpleParam as AbiType>::size()
+		<TypeStruct1DerivedSimpleParam as evm_coder::abi::AbiType>::size(),
+		<TupleStruct1DerivedSimpleParam as evm_coder::abi::AbiType>::size()
 	);
 	assert_eq!(
-		<TypeStruct2DerivedSimpleParam as AbiType>::size(),
-		<TupleStruct2DerivedSimpleParam as AbiType>::size()
+		<TypeStruct2DerivedSimpleParam as evm_coder::abi::AbiType>::size(),
+		<TupleStruct2DerivedSimpleParam as evm_coder::abi::AbiType>::size()
 	);
 	assert_eq!(
-		<TypeStruct1DerivedDynamicParam as AbiType>::size(),
-		<TupleStruct1DerivedDynamicParam as AbiType>::size()
+		<TypeStruct1DerivedDynamicParam as evm_coder::abi::AbiType>::size(),
+		<TupleStruct1DerivedDynamicParam as evm_coder::abi::AbiType>::size()
 	);
 	assert_eq!(
-		<TypeStruct2DerivedDynamicParam as AbiType>::size(),
-		<TupleStruct2DerivedDynamicParam as AbiType>::size()
+		<TypeStruct2DerivedDynamicParam as evm_coder::abi::AbiType>::size(),
+		<TupleStruct2DerivedDynamicParam as evm_coder::abi::AbiType>::size()
 	);
 	assert_eq!(
-		<TypeStruct3DerivedMixedParam as AbiType>::size(),
-		<TupleStruct3DerivedMixedParam as AbiType>::size()
+		<TypeStruct3DerivedMixedParam as evm_coder::abi::AbiType>::size(),
+		<TupleStruct3DerivedMixedParam as evm_coder::abi::AbiType>::size()
 	);
 }
 
@@ -413,9 +431,12 @@
 	tuple_struct_data: TupleStruct,
 	type_struct_data: TypeStruct,
 ) where
-	TypeStruct: AbiWrite + AbiRead + std::cmp::PartialEq + std::fmt::Debug,
-	TupleStruct: AbiWrite + AbiRead + std::cmp::PartialEq + std::fmt::Debug,
-	Tuple: AbiWrite + AbiRead + std::cmp::PartialEq + std::fmt::Debug,
+	TypeStruct:
+		evm_coder::abi::AbiWrite + evm_coder::abi::AbiRead + std::cmp::PartialEq + std::fmt::Debug,
+	TupleStruct:
+		evm_coder::abi::AbiWrite + evm_coder::abi::AbiRead + std::cmp::PartialEq + std::fmt::Debug,
+	Tuple:
+		evm_coder::abi::AbiWrite + evm_coder::abi::AbiRead + std::cmp::PartialEq + std::fmt::Debug,
 {
 	let encoded_type_struct = test_abi_write_impl(&type_struct_data);
 	let encoded_tuple_struct = test_abi_write_impl(&tuple_struct_data);
@@ -423,29 +444,25 @@
 
 	similar_asserts::assert_eq!(encoded_tuple, encoded_type_struct);
 	similar_asserts::assert_eq!(encoded_tuple, encoded_tuple_struct);
-
-	// dbg!(&encoded_tuple);
-	// dbg!(&encoded_tuple_struct);
-	// dbg!(&encoded_type_struct);
 
 	{
-		let (_, mut decoder) = AbiReader::new_call(&encoded_tuple).unwrap();
+		let (_, mut decoder) = evm_coder::abi::AbiReader::new_call(&encoded_tuple).unwrap();
 		let restored_struct_data = <TypeStruct>::abi_read(&mut decoder).unwrap();
 		assert_eq!(restored_struct_data, type_struct_data);
 	}
 	{
-		let (_, mut decoder) = AbiReader::new_call(&encoded_tuple).unwrap();
+		let (_, mut decoder) = evm_coder::abi::AbiReader::new_call(&encoded_tuple).unwrap();
 		let restored_struct_data = <TupleStruct>::abi_read(&mut decoder).unwrap();
 		assert_eq!(restored_struct_data, tuple_struct_data);
 	}
 
 	{
-		let (_, mut decoder) = AbiReader::new_call(&encoded_type_struct).unwrap();
+		let (_, mut decoder) = evm_coder::abi::AbiReader::new_call(&encoded_type_struct).unwrap();
 		let restored_tuple_data = <Tuple>::abi_read(&mut decoder).unwrap();
 		assert_eq!(restored_tuple_data, tuple_data);
 	}
 	{
-		let (_, mut decoder) = AbiReader::new_call(&encoded_tuple_struct).unwrap();
+		let (_, mut decoder) = evm_coder::abi::AbiReader::new_call(&encoded_tuple_struct).unwrap();
 		let restored_tuple_data = <Tuple>::abi_read(&mut decoder).unwrap();
 		assert_eq!(restored_tuple_data, tuple_data);
 	}
@@ -453,9 +470,9 @@
 
 fn test_abi_write_impl<A>(data: &A) -> Vec<u8>
 where
-	A: AbiWrite + AbiRead + std::cmp::PartialEq + std::fmt::Debug,
+	A: evm_coder::abi::AbiWrite + evm_coder::abi::AbiRead + std::cmp::PartialEq + std::fmt::Debug,
 {
-	let mut writer = AbiWriter::new_call(FUNCTION_IDENTIFIER);
+	let mut writer = evm_coder::abi::AbiWriter::new_call(FUNCTION_IDENTIFIER);
 	data.abi_write(&mut writer);
 	let encoded_tuple = writer.finish();
 	encoded_tuple
@@ -464,7 +481,7 @@
 #[test]
 fn codec_struct_1_simple() {
 	let _a = 0xff;
-	test_impl::<(uint8,), TupleStruct1SimpleParam, TypeStruct1SimpleParam>(
+	test_impl::<(u8,), TupleStruct1SimpleParam, TypeStruct1SimpleParam>(
 		(_a,),
 		TupleStruct1SimpleParam(_a),
 		TypeStruct1SimpleParam { _a },