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
--- a/crates/evm-coder/procedural/src/abi_derive.rs
+++ b/crates/evm-coder/procedural/src/abi_derive.rs
@@ -141,7 +141,7 @@
 	let abi_write = if is_named_fields {
 		quote!(
 			#(
-				self.#field_names.abi_write(sub);
+				::evm_coder::abi::AbiWrite::abi_write(&self.#field_names, sub);
 			)*
 		)
 	} else {
@@ -150,7 +150,7 @@
 			.map(proc_macro2::Literal::usize_unsuffixed);
 		quote!(
 			#(
-				self.#field_names.abi_write(sub);
+				::evm_coder::abi::AbiWrite::abi_write(&self.#field_names, sub);
 			)*
 		)
 	};
modifiedcrates/evm-coder/procedural/src/lib.rsdiffbeforeafterboth
before · crates/evm-coder/procedural/src/lib.rs
1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617#![allow(dead_code)]1819use inflector::cases;20use proc_macro::TokenStream;21use quote::quote;22use sha3::{Digest, Keccak256};23use syn::{24	DeriveInput, GenericArgument, Ident, ItemImpl, Pat, Path, PathArguments, PathSegment, Type,25	parse_macro_input, spanned::Spanned,26};2728mod abi_derive;29mod solidity_interface;30mod to_log;3132fn fn_selector_str(input: &str) -> u32 {33	let mut hasher = Keccak256::new();34	hasher.update(input.as_bytes());35	let result = hasher.finalize();3637	let mut selector_bytes = [0; 4];38	selector_bytes.copy_from_slice(&result[0..4]);3940	u32::from_be_bytes(selector_bytes)41}4243/// Returns solidity function selector (first 4 bytes of hash) by its44/// textual representation45///46/// ```ignore47/// use evm_coder_macros::fn_selector;48///49/// assert_eq!(fn_selector!(transfer(address, uint256)), 0xa9059cbb);50/// ```51#[proc_macro]52pub fn fn_selector(input: TokenStream) -> TokenStream {53	let input = input.to_string().replace(' ', "");54	let selector = fn_selector_str(&input);5556	(quote! {57		#selector58	})59	.into()60}6162fn event_selector_str(input: &str) -> [u8; 32] {63	let mut hasher = Keccak256::new();64	hasher.update(input.as_bytes());65	let result = hasher.finalize();6667	let mut selector_bytes = [0; 32];68	selector_bytes.copy_from_slice(&result[0..32]);69	selector_bytes70}7172/// Returns solidity topic (hash) by its textual representation73///74/// ```ignore75/// use evm_coder_macros::event_topic;76///77/// assert_eq!(78///     format!("{:x}", event_topic!(Transfer(address, address, uint256))),79///     "ddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef",80/// );81/// ```82#[proc_macro]83pub fn event_topic(stream: TokenStream) -> TokenStream {84	let input = stream.to_string().replace(' ', "");85	let selector_bytes = event_selector_str(&input);8687	(quote! {88		::primitive_types::H256([#(89			#selector_bytes,90		)*])91	})92	.into()93}9495fn parse_path(ty: &Type) -> syn::Result<&Path> {96	match &ty {97		syn::Type::Path(pat) => {98			if let Some(qself) = &pat.qself {99				return Err(syn::Error::new(qself.ty.span(), "no receiver expected"));100			}101			Ok(&pat.path)102		}103		_ => Err(syn::Error::new(ty.span(), "expected ty to be path")),104	}105}106107fn parse_path_segment(path: &Path) -> syn::Result<&PathSegment> {108	if path.segments.len() != 1 {109		return Err(syn::Error::new(110			path.span(),111			"expected path to have only one segment",112		));113	}114	let last_segment = &path.segments.last().unwrap();115	Ok(last_segment)116}117118fn parse_ident_from_pat(pat: &Pat) -> syn::Result<&Ident> {119	match pat {120		Pat::Ident(i) => Ok(&i.ident),121		_ => Err(syn::Error::new(pat.span(), "expected pat ident")),122	}123}124125fn parse_ident_from_segment(segment: &PathSegment, allow_generics: bool) -> syn::Result<&Ident> {126	if segment.arguments != PathArguments::None && !allow_generics {127		return Err(syn::Error::new(128			segment.arguments.span(),129			"unexpected generic type",130		));131	}132	Ok(&segment.ident)133}134135fn parse_ident_from_path(path: &Path, allow_generics: bool) -> syn::Result<&Ident> {136	let segment = parse_path_segment(path)?;137	parse_ident_from_segment(segment, allow_generics)138}139140fn parse_ident_from_type(ty: &Type, allow_generics: bool) -> syn::Result<&Ident> {141	let path = parse_path(ty)?;142	parse_ident_from_path(path, allow_generics)143}144145// Gets T out of Result<T>146fn parse_result_ok(ty: &Type) -> syn::Result<&Type> {147	let path = parse_path(ty)?;148	let segment = parse_path_segment(path)?;149150	if segment.ident != "Result" {151		return Err(syn::Error::new(152			ty.span(),153			"expected Result as return type (no renamed aliases allowed)",154		));155	}156	let args = match &segment.arguments {157		PathArguments::AngleBracketed(e) => e,158		_ => {159			return Err(syn::Error::new(160				segment.arguments.span(),161				"missing Result generics",162			))163		}164	};165166	let args = &args.args;167	let arg = args.first().unwrap();168169	let ty = match arg {170		GenericArgument::Type(ty) => ty,171		_ => {172			return Err(syn::Error::new(173				arg.span(),174				"expected first generic to be type",175			))176		}177	};178179	Ok(ty)180}181182fn pascal_ident_to_call(ident: &Ident) -> Ident {183	let name = format!("{}Call", ident);184	Ident::new(&name, ident.span())185}186fn snake_ident_to_pascal(ident: &Ident) -> Ident {187	let name = ident.to_string();188	let name = cases::pascalcase::to_pascal_case(&name);189	Ident::new(&name, ident.span())190}191fn snake_ident_to_screaming(ident: &Ident) -> Ident {192	let name = ident.to_string();193	let name = cases::screamingsnakecase::to_screaming_snake_case(&name);194	Ident::new(&name, ident.span())195}196fn pascal_ident_to_snake_call(ident: &Ident) -> Ident {197	let name = ident.to_string();198	let name = cases::snakecase::to_snake_case(&name);199	let name = format!("call_{}", name);200	Ident::new(&name, ident.span())201}202203/// See documentation for this proc-macro reexported in `evm-coder` crate204#[proc_macro_attribute]205pub fn solidity_interface(args: TokenStream, stream: TokenStream) -> TokenStream {206	let args = parse_macro_input!(args as solidity_interface::InterfaceInfo);207208	let input: ItemImpl = match syn::parse(stream) {209		Ok(t) => t,210		Err(e) => return e.to_compile_error().into(),211	};212213	let expanded = match solidity_interface::SolidityInterface::try_from(args, &input) {214		Ok(v) => v.expand(),215		Err(e) => e.to_compile_error(),216	};217218	(quote! {219		#input220221		#expanded222	})223	.into()224}225226#[proc_macro_attribute]227pub fn solidity(_args: TokenStream, stream: TokenStream) -> TokenStream {228	stream229}230#[proc_macro_attribute]231pub fn weight(_args: TokenStream, stream: TokenStream) -> TokenStream {232	stream233}234235/// See documentation for this proc-macro reexported in `evm-coder` crate236#[proc_macro_derive(ToLog, attributes(indexed))]237pub fn to_log(value: TokenStream) -> TokenStream {238	let input = parse_macro_input!(value as DeriveInput);239240	match to_log::Events::try_from(&input) {241		Ok(e) => e.expand(),242		Err(e) => e.to_compile_error(),243	}244	.into()245}246247#[proc_macro_derive(AbiCoder)]248pub fn abi_derive(input: proc_macro::TokenStream) -> proc_macro::TokenStream {249	let ast = syn::parse(input).unwrap();250	let ts = match abi_derive::impl_abi_macro(&ast) {251		Ok(e) => e,252		Err(e) => e.to_compile_error(),253	};254	// println!("{}", &ts);255	ts.into()256}
after · crates/evm-coder/procedural/src/lib.rs
1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617#![allow(dead_code)]1819use inflector::cases;20use proc_macro::TokenStream;21use quote::quote;22use sha3::{Digest, Keccak256};23use syn::{24	DeriveInput, GenericArgument, Ident, ItemImpl, Pat, Path, PathArguments, PathSegment, Type,25	parse_macro_input, spanned::Spanned,26};2728mod abi_derive;29mod solidity_interface;30mod to_log;3132fn fn_selector_str(input: &str) -> u32 {33	let mut hasher = Keccak256::new();34	hasher.update(input.as_bytes());35	let result = hasher.finalize();3637	let mut selector_bytes = [0; 4];38	selector_bytes.copy_from_slice(&result[0..4]);3940	u32::from_be_bytes(selector_bytes)41}4243/// Returns solidity function selector (first 4 bytes of hash) by its44/// textual representation45///46/// ```ignore47/// use evm_coder_macros::fn_selector;48///49/// assert_eq!(fn_selector!(transfer(address, uint256)), 0xa9059cbb);50/// ```51#[proc_macro]52pub fn fn_selector(input: TokenStream) -> TokenStream {53	let input = input.to_string().replace(' ', "");54	let selector = fn_selector_str(&input);5556	(quote! {57		#selector58	})59	.into()60}6162fn event_selector_str(input: &str) -> [u8; 32] {63	let mut hasher = Keccak256::new();64	hasher.update(input.as_bytes());65	let result = hasher.finalize();6667	let mut selector_bytes = [0; 32];68	selector_bytes.copy_from_slice(&result[0..32]);69	selector_bytes70}7172/// Returns solidity topic (hash) by its textual representation73///74/// ```ignore75/// use evm_coder_macros::event_topic;76///77/// assert_eq!(78///     format!("{:x}", event_topic!(Transfer(address, address, uint256))),79///     "ddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef",80/// );81/// ```82#[proc_macro]83pub fn event_topic(stream: TokenStream) -> TokenStream {84	let input = stream.to_string().replace(' ', "");85	let selector_bytes = event_selector_str(&input);8687	(quote! {88		::primitive_types::H256([#(89			#selector_bytes,90		)*])91	})92	.into()93}9495fn parse_path(ty: &Type) -> syn::Result<&Path> {96	match &ty {97		syn::Type::Path(pat) => {98			if let Some(qself) = &pat.qself {99				return Err(syn::Error::new(qself.ty.span(), "no receiver expected"));100			}101			Ok(&pat.path)102		}103		_ => Err(syn::Error::new(ty.span(), "expected ty to be path")),104	}105}106107fn parse_path_segment(path: &Path) -> syn::Result<&PathSegment> {108	if path.segments.len() != 1 {109		return Err(syn::Error::new(110			path.span(),111			"expected path to have only one segment",112		));113	}114	let last_segment = &path.segments.last().unwrap();115	Ok(last_segment)116}117118fn parse_ident_from_pat(pat: &Pat) -> syn::Result<&Ident> {119	match pat {120		Pat::Ident(i) => Ok(&i.ident),121		_ => Err(syn::Error::new(pat.span(), "expected pat ident")),122	}123}124125fn parse_ident_from_segment(segment: &PathSegment, allow_generics: bool) -> syn::Result<&Ident> {126	if segment.arguments != PathArguments::None && !allow_generics {127		return Err(syn::Error::new(128			segment.arguments.span(),129			"unexpected generic type",130		));131	}132	Ok(&segment.ident)133}134135fn parse_ident_from_path(path: &Path, allow_generics: bool) -> syn::Result<&Ident> {136	let segment = parse_path_segment(path)?;137	parse_ident_from_segment(segment, allow_generics)138}139140fn parse_ident_from_type(ty: &Type, allow_generics: bool) -> syn::Result<&Ident> {141	let path = parse_path(ty)?;142	parse_ident_from_path(path, allow_generics)143}144145// Gets T out of Result<T>146fn parse_result_ok(ty: &Type) -> syn::Result<&Type> {147	let path = parse_path(ty)?;148	let segment = parse_path_segment(path)?;149150	if segment.ident != "Result" {151		return Err(syn::Error::new(152			ty.span(),153			"expected Result as return type (no renamed aliases allowed)",154		));155	}156	let args = match &segment.arguments {157		PathArguments::AngleBracketed(e) => e,158		_ => {159			return Err(syn::Error::new(160				segment.arguments.span(),161				"missing Result generics",162			))163		}164	};165166	let args = &args.args;167	let arg = args.first().unwrap();168169	let ty = match arg {170		GenericArgument::Type(ty) => ty,171		_ => {172			return Err(syn::Error::new(173				arg.span(),174				"expected first generic to be type",175			))176		}177	};178179	Ok(ty)180}181182fn pascal_ident_to_call(ident: &Ident) -> Ident {183	let name = format!("{}Call", ident);184	Ident::new(&name, ident.span())185}186fn snake_ident_to_pascal(ident: &Ident) -> Ident {187	let name = ident.to_string();188	let name = cases::pascalcase::to_pascal_case(&name);189	Ident::new(&name, ident.span())190}191fn snake_ident_to_screaming(ident: &Ident) -> Ident {192	let name = ident.to_string();193	let name = cases::screamingsnakecase::to_screaming_snake_case(&name);194	Ident::new(&name, ident.span())195}196fn pascal_ident_to_snake_call(ident: &Ident) -> Ident {197	let name = ident.to_string();198	let name = cases::snakecase::to_snake_case(&name);199	let name = format!("call_{}", name);200	Ident::new(&name, ident.span())201}202203/// See documentation for this proc-macro reexported in `evm-coder` crate204#[proc_macro_attribute]205pub fn solidity_interface(args: TokenStream, stream: TokenStream) -> TokenStream {206	let args = parse_macro_input!(args as solidity_interface::InterfaceInfo);207208	let input: ItemImpl = match syn::parse(stream) {209		Ok(t) => t,210		Err(e) => return e.to_compile_error().into(),211	};212213	let expanded = match solidity_interface::SolidityInterface::try_from(args, &input) {214		Ok(v) => v.expand(),215		Err(e) => e.to_compile_error(),216	};217218	(quote! {219		#input220221		#expanded222	})223	.into()224}225226#[proc_macro_attribute]227pub fn solidity(_args: TokenStream, stream: TokenStream) -> TokenStream {228	stream229}230#[proc_macro_attribute]231pub fn weight(_args: TokenStream, stream: TokenStream) -> TokenStream {232	stream233}234235/// See documentation for this proc-macro reexported in `evm-coder` crate236#[proc_macro_derive(ToLog, attributes(indexed))]237pub fn to_log(value: TokenStream) -> TokenStream {238	let input = parse_macro_input!(value as DeriveInput);239240	match to_log::Events::try_from(&input) {241		Ok(e) => e.expand(),242		Err(e) => e.to_compile_error(),243	}244	.into()245}246247#[proc_macro_derive(AbiCoder)]248pub fn abi_derive(input: proc_macro::TokenStream) -> proc_macro::TokenStream {249	let ast = syn::parse(input).unwrap();250	let ts = match abi_derive::impl_abi_macro(&ast) {251		Ok(e) => e,252		Err(e) => e.to_compile_error(),253	};254	ts.into()255}
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 },