git.delta.rocks / unique-network / refs/commits / 5a3fe2c70832

difftreelog

refactor unify function and type signature handling

Yaroslav Bolyukin2022-11-02parent: #4c1a924.patch.diff
in: master

12 files changed

modifiedcrates/evm-coder/procedural/src/solidity_interface.rsdiffbeforeafterboth
--- a/crates/evm-coder/procedural/src/solidity_interface.rs
+++ b/crates/evm-coder/procedural/src/solidity_interface.rs
@@ -24,8 +24,8 @@
 use quote::{quote, format_ident};
 use inflector::cases;
 use syn::{
-	Expr, FnArg, GenericArgument, Generics, Ident, ImplItem, ImplItemMethod, ItemImpl, Lit, Meta,
-	MetaNameValue, PatType, PathArguments, ReturnType, Type,
+	Expr, FnArg, Generics, Ident, ImplItem, ImplItemMethod, ItemImpl, Lit, Meta, MetaNameValue,
+	PatType, ReturnType, Type,
 	spanned::Spanned,
 	parse::{Parse, ParseStream},
 	parenthesized, Token, LitInt, LitStr,
@@ -601,12 +601,12 @@
 		let screaming_name_signature = format_ident!("{}_SIGNATURE", &self.screaming_name);
 		let custom_signature = self.expand_custom_signature();
 		quote! {
-			const #screaming_name_signature: ::evm_coder::custom_signature::FunctionSignature = #custom_signature;
+			const #screaming_name_signature: ::evm_coder::custom_signature::SignatureUnit = #custom_signature;
 			const #screaming_name: ::evm_coder::types::bytes4 = {
 				let mut sum = ::evm_coder::sha3_const::Keccak256::new();
 				let mut pos = 0;
-				while pos < Self::#screaming_name_signature.unit.len {
-					sum = sum.update(&[Self::#screaming_name_signature.unit.data[pos]; 1]);
+				while pos < Self::#screaming_name_signature.len {
+					sum = sum.update(&[Self::#screaming_name_signature.data[pos]; 1]);
 					pos += 1;
 				}
 				let a = sum.finalize();
@@ -710,192 +710,28 @@
 			};
 			quote! {
 				Self::#pascal_name #matcher => ().into()
-			}
-		}
-	}
-
-	fn expand_type(ty: &Type, token_stream: &mut proc_macro2::TokenStream, read_signature: bool) {
-		match ty {
-			Type::Path(tp) => {
-				if let Some(qself) = &tp.qself {
-					panic!("no receiver expected {:?}", qself.ty.span());
-				}
-				let path = &tp.path;
-				if path.segments.len() != 1 {
-					panic!("expected path to have only one segment {:?}", path.span());
-				}
-				let last_segment = path.segments.last().unwrap();
-
-				if last_segment.ident == "Vec" {
-					let args = match &last_segment.arguments {
-						PathArguments::AngleBracketed(e) => e,
-						_ => {
-							panic!("missing Vec generic {:?}", last_segment.arguments.span());
-						}
-					};
-					let args = &args.args;
-					if args.len() != 1 {
-						panic!("expected only one generic for vec {:?}", args.span());
-					}
-					let arg = args.first().expect("first arg");
-
-					let ty = match arg {
-						GenericArgument::Type(ty) => ty,
-						_ => {
-							panic!("expected first generic to be type {:?}", arg.span());
-						}
-					};
-
-					let mut vec_token = proc_macro2::TokenStream::new();
-					Self::expand_type(ty, &mut vec_token, false);
-					vec_token = if read_signature {
-						quote! { (<Vec<#vec_token>>::SIGNATURE) }
-					} else {
-						quote! { <Vec<#vec_token>> }
-					};
-					token_stream.extend(vec_token);
-				} else {
-					if !last_segment.arguments.is_empty() {
-						panic!(
-							"unexpected generic arguments for non-vec type {:?}",
-							last_segment.arguments.span()
-						);
-					}
-
-					let ident = &last_segment.ident;
-					let plain_token = if read_signature {
-						quote! {
-							(<#ident>::SIGNATURE)
-						}
-					} else {
-						quote! {
-							#ident
-						}
-					};
-
-					token_stream.extend(plain_token);
-				}
-			}
-
-			Type::Tuple(tt) => {
-				// for ty in tt.elems.iter() {
-				// 	out.push(AbiType::try_from(ty)?)
-				// }
-
-				let mut tuple_types = proc_macro2::TokenStream::new();
-				let mut is_first = true;
-
-				for ty in tt.elems.iter() {
-					if is_first {
-						is_first = false
-					} else {
-						tuple_types.extend(quote!(,));
-					}
-					Self::expand_type(ty, &mut tuple_types, false);
-				}
-				tuple_types = if read_signature {
-					quote! { (<(#tuple_types)>::SIGNATURE) }
-				} else {
-					quote! { (#tuple_types) }
-				};
-				token_stream.extend(tuple_types);
 			}
-
-			// Type::Array(arr) => {
-			// 	let wrapped = AbiType::try_from(&arr.elem)?;
-			// 	match &arr.len {
-			// 		Expr::Lit(l) => match &l.lit {
-			// 			Lit::Int(i) => {
-			// 				let num = i.base10_parse::<usize>()?;
-			// 				Ok(AbiType::Array(Box::new(wrapped), num as usize))
-			// 			}
-			// 			_ => Err(syn::Error::new(arr.len.span(), "should be int literal")),
-			// 		},
-			// 		_ => Err(syn::Error::new(arr.len.span(), "should be literal")),
-			// 	}
-			// }
-			_ => panic!("Unexpected type {ty:?}"),
 		}
-		// match ty {
-		// 	AbiType::Plain(ref ident) => {
-		// 		let plain_token = if read_signature {
-		// 			quote! {
-		// 				(<#ident>::SIGNATURE)
-		// 			}
-		// 		} else {
-		// 			quote! {
-		// 				#ident
-		// 			}
-		// 		};
-
-		// 		token_stream.extend(plain_token);
-		// 	}
-
-		// 	AbiType::Tuple(ref tuple_type) => {
-		// 		let mut tuple_types = proc_macro2::TokenStream::new();
-		// 		let mut is_first = true;
-
-		// 		for ty in tuple_type {
-		// 			if is_first {
-		// 				is_first = false
-		// 			} else {
-		// 				tuple_types.extend(quote!(,));
-		// 			}
-		// 			Self::expand_type(ty, &mut tuple_types, false);
-		// 		}
-		// 		tuple_types = if read_signature {
-		// 			quote! { (<(#tuple_types)>::SIGNATURE) }
-		// 		} else {
-		// 			quote! { (#tuple_types) }
-		// 		};
-		// 		token_stream.extend(tuple_types);
-		// 	}
-
-		// 	AbiType::Vec(ref vec_type) => {
-		// 		let mut vec_token = proc_macro2::TokenStream::new();
-		// 		Self::expand_type(vec_type.as_ref(), &mut vec_token, false);
-		// 		vec_token = if read_signature {
-		// 			quote! { (<Vec<#vec_token>>::SIGNATURE) }
-		// 		} else {
-		// 			quote! { <Vec<#vec_token>> }
-		// 		};
-		// 		token_stream.extend(vec_token);
-		// 	}
-
-		// 	AbiType::Array(_, _) => todo!("Array eth signature"),
-		// };
 	}
 
 	fn expand_custom_signature(&self) -> proc_macro2::TokenStream {
-		let mut token_stream = TokenStream::new();
+		let mut args = TokenStream::new();
 
 		let mut is_first = true;
-		for arg in &self.args {
-			if arg.is_special() {
-				continue;
-			}
-
-			if is_first {
-				is_first = false;
-			} else {
-				token_stream.extend(quote!(,));
-			}
-			Self::expand_type(&arg.ty, &mut token_stream, true);
+		for arg in self.args.iter().filter(|a| !a.is_special()) {
+			is_first = false;
+			let ty = &arg.ty;
+			args.extend(quote! {nameof(#ty)});
+			args.extend(quote! {fixed(",")})
 		}
 
+		// Remove trailing comma
 		if !is_first {
-			token_stream.extend(quote!(,));
+			args.extend(quote! {shift_left(1)})
 		}
 
 		let func_name = self.camel_name.clone();
-		let func_name = quote!(SignaturePreferences {
-			open_name: Some(SignatureUnit::new(#func_name)),
-			open_delimiter: Some(SignatureUnit::new("(")),
-			param_delimiter: Some(SignatureUnit::new(",")),
-			close_delimiter: Some(SignatureUnit::new(")")),
-			close_name: None,
-		});
-		quote!({ ::evm_coder::make_signature!(new fn(#func_name), #token_stream) })
+		quote! { ::evm_coder::make_signature!(new fixed(#func_name) fixed("(") #args fixed(")")) }
 	}
 
 	fn expand_solidity_function(&self) -> proc_macro2::TokenStream {
@@ -916,12 +752,6 @@
 		let screaming_name = &self.screaming_name;
 		let hide = self.hide;
 		let custom_signature = self.expand_custom_signature();
-		let custom_signature = quote!(
-			{
-				const cs: FunctionSignature = #custom_signature;
-				cs
-			}
-		);
 		let is_payable = self.has_value_args;
 
 		quote! {
modifiedcrates/evm-coder/src/abi.rsdiffbeforeafterboth
--- a/crates/evm-coder/src/abi.rs
+++ b/crates/evm-coder/src/abi.rs
@@ -27,7 +27,7 @@
 	execution::{Error, ResultWithPostInfo, WithPostDispatchInfo},
 	types::*,
 	make_signature,
-	custom_signature::{SignatureUnit, SIGNATURE_SIZE_LIMIT},
+	custom_signature::{SignatureUnit},
 };
 use crate::execution::Result;
 
@@ -428,7 +428,7 @@
 }
 
 impl<R: Signature> Signature for Vec<R> {
-	make_signature!(new nameof(R) fixed("[]"));
+	const SIGNATURE: SignatureUnit = make_signature!(new nameof(R) fixed("[]"));
 }
 
 impl sealed::CanBePlacedInVec for EthCrossAccount {}
@@ -522,7 +522,7 @@
 		where
 		$($ident: Signature,)+
 		{
-			make_signature!(
+			const SIGNATURE: SignatureUnit = make_signature!(
 				new fixed("(")
 				$(nameof($ident) fixed(","))+
 				shift_left(1)
@@ -758,13 +758,13 @@
 				1ACF2D55
 				0000000000000000000000000000000000000000000000000000000000000020 // offset of (address, uint256)[]
 				0000000000000000000000000000000000000000000000000000000000000003 // length of (address, uint256)[]
-	
+
 				0000000000000000000000002D2FF76104B7BACB2E8F6731D5BFC184EBECDDBC // address
 				000000000000000000000000000000000000000000000000000000000000000A // uint256
-	
+
 				000000000000000000000000AB8E3D9134955566483B11E6825C9223B6737B10 // address
 				0000000000000000000000000000000000000000000000000000000000000014 // uint256
-	
+
 				0000000000000000000000008C582BDF2953046705FC56F189385255EFC1BE18 // address
 				000000000000000000000000000000000000000000000000000000000000001E // uint256
 			"
modifiedcrates/evm-coder/src/custom_signature.rsdiffbeforeafterboth
--- a/crates/evm-coder/src/custom_signature.rs
+++ b/crates/evm-coder/src/custom_signature.rs
@@ -74,132 +74,11 @@
 //!	impl<T: SoliditySignature> SoliditySignature for Vec<T> {
 //!		make_signature!(new nameof(T) fixed("[]"));
 //!	}
-//!
-//! // Function signature settings
-//! const SIGNATURE_PREFERENCES: SignaturePreferences = SignaturePreferences {
-//!		open_name: Some(SignatureUnit::new("some_funk")),
-//!		open_delimiter: Some(SignatureUnit::new("(")),
-//!		param_delimiter: Some(SignatureUnit::new(",")),
-//!		close_delimiter: Some(SignatureUnit::new(")")),
-//!		close_name: None,
-//!	};
-//!
-//! // Create functions signatures
-//! fn make_func_without_args() {
-//!		const SIG: FunctionSignature = make_signature!(
-//!			new fn(SIGNATURE_PREFERENCES),
-//!		);
-//!		let name = SIG.as_str();
-//!		similar_asserts::assert_eq!(name, "some_funk()");
-//!	}
-//!
-//! fn make_func_with_3_args() {
-//!		const SIG: FunctionSignature = make_signature!(
-//!			new fn(SIGNATURE_PREFERENCES),
-//!			(<u8>::SIGNATURE),
-//!			(<u8>::SIGNATURE),
-//!			(<Vec<u8>>::SIGNATURE),
-//!		);
-//!		let name = SIG.as_str();
-//!		similar_asserts::assert_eq!(name, "some_funk(uint8,uint8,uint8[])");
-//!	}
 //! ```
-use core::str::from_utf8;
 
 /// The maximum length of the signature.
 pub const SIGNATURE_SIZE_LIMIT: usize = 256;
-
-/// Function signature formatting preferences.
-#[derive(Debug)]
-pub struct SignaturePreferences {
-	/// The name of the function before the list of parameters: `*some*(param1,param2)func`
-	pub open_name: Option<SignatureUnit>,
-	/// Opening separator: `some*(*param1,param2)func`
-	pub open_delimiter: Option<SignatureUnit>,
-	/// Parameters separator: `some(param1*,*param2)func`
-	pub param_delimiter: Option<SignatureUnit>,
-	/// Closinging separator: `some(param1,param2*)*func`
-	pub close_delimiter: Option<SignatureUnit>,
-	/// The name of the function after the list of parameters: `some(param1,param2)*func*`
-	pub close_name: Option<SignatureUnit>,
-}
-
-/// Constructs and stores the signature of the function.
-#[derive(Debug)]
-pub struct FunctionSignature {
-	/// Storage for function signature.
-	pub unit: SignatureUnit,
-	preferences: SignaturePreferences,
-}
 
-impl FunctionSignature {
-	/// Start constructing the signature. It is written to the storage
-	/// [`SignaturePreferences::open_name`] and [`SignaturePreferences::open_delimiter`].
-	pub const fn new(preferences: SignaturePreferences) -> FunctionSignature {
-		let mut dst = [0_u8; SIGNATURE_SIZE_LIMIT];
-		let mut dst_offset = 0;
-		if let Some(ref name) = preferences.open_name {
-			crate::make_signature!(@copy(name.data, dst, name.len, dst_offset));
-		}
-		if let Some(ref delimiter) = preferences.open_delimiter {
-			crate::make_signature!(@copy(delimiter.data, dst, delimiter.len, dst_offset));
-		}
-		FunctionSignature {
-			unit: SignatureUnit {
-				data: dst,
-				len: dst_offset,
-			},
-			preferences,
-		}
-	}
-
-	/// Add a function parameter to the signature. It is written to the storage
-	/// `param` [`SignatureUnit`] and [`SignaturePreferences::param_delimiter`].
-	pub const fn add_param(
-		signature: FunctionSignature,
-		param: SignatureUnit,
-	) -> FunctionSignature {
-		let mut dst = signature.unit.data;
-		let mut dst_offset = signature.unit.len;
-		crate::make_signature!(@copy(param.data, dst, param.len, dst_offset));
-		if let Some(ref delimiter) = signature.preferences.param_delimiter {
-			crate::make_signature!(@copy(delimiter.data, dst, delimiter.len, dst_offset));
-		}
-		FunctionSignature {
-			unit: SignatureUnit {
-				data: dst,
-				len: dst_offset,
-			},
-			..signature
-		}
-	}
-
-	/// Complete signature construction. It is written to the storage
-	/// [`SignaturePreferences::close_delimiter`] and [`SignaturePreferences::close_name`].
-	pub const fn done(signature: FunctionSignature, owerride: bool) -> FunctionSignature {
-		let mut dst = signature.unit.data;
-		let mut dst_offset = signature.unit.len - if owerride { 1 } else { 0 };
-		if let Some(ref delimiter) = signature.preferences.close_delimiter {
-			crate::make_signature!(@copy(delimiter.data, dst, delimiter.len, dst_offset));
-		}
-		if let Some(ref name) = signature.preferences.close_name {
-			crate::make_signature!(@copy(name.data, dst, name.len, dst_offset));
-		}
-		FunctionSignature {
-			unit: SignatureUnit {
-				data: dst,
-				len: dst_offset,
-			},
-			..signature
-		}
-	}
-
-	/// Represent the signature as `&str'.
-	pub fn as_str(&self) -> &str {
-		from_utf8(&self.unit.data[..self.unit.len]).expect("bad utf-8")
-	}
-}
-
 /// Storage for the signature or its elements.
 #[derive(Debug)]
 pub struct SignatureUnit {
@@ -222,6 +101,10 @@
 			len: name_len,
 		}
 	}
+	/// String conversion
+	pub fn as_str(&self) -> Option<&str> {
+		core::str::from_utf8(&self.data[0..self.len]).ok()
+	}
 }
 
 /// ### Macro to create signatures of types and functions.
@@ -231,85 +114,52 @@
 /// make_signature!(new fixed("uint8")); // Simple type
 /// make_signature!(new fixed("(") nameof(u8) fixed(",") nameof(u8) fixed(")")); // Composite type
 /// ```
-/// Format for creating a function of the function:
-/// ```ignore
-/// const SIG: FunctionSignature = make_signature!(
-///		new fn(SIGNATURE_PREFERENCES),
-///		(u8::SIGNATURE),
-///		(<(u8,u8)>::SIGNATURE),
-///	);
-/// ```
 #[macro_export]
 macro_rules! make_signature {
-	(new fn($func:expr)$(,)*) => {
-		{
-			let fs = FunctionSignature::new($func);
-			let fs = FunctionSignature::done(fs, false);
-			fs
-		}
-	};
-	(new fn($func:expr), $($tt:tt,)*) => {
-		{
-			let fs = FunctionSignature::new($func);
-			let fs = make_signature!(@param; fs, $($tt),*);
-			fs
-		}
+	(new $($tt:tt)*) => {
+		($crate::custom_signature::SignatureUnit {
+			data: {
+				let mut out = [0u8; $crate::custom_signature::SIGNATURE_SIZE_LIMIT];
+				let mut dst_offset = 0;
+				$crate::make_signature!(@data(out, dst_offset); $($tt)*);
+				out
+			},
+			len: {0 + $crate::make_signature!(@size; $($tt)*)},
+		})
 	};
 
-	(@param; $func:expr) => {
-		FunctionSignature::done($func, true)
+	(@size;) => {
+		0
 	};
-	(@param; $func:expr, $param:expr) => {
-		make_signature!(@param; FunctionSignature::add_param($func, $param))
+	(@size; fixed($expr:expr) $($tt:tt)*) => {
+		$expr.len() + $crate::make_signature!(@size; $($tt)*)
 	};
-	(@param; $func:expr, $param:expr, $($tt:tt),*) => {
-		make_signature!(@param; FunctionSignature::add_param($func, $param), $($tt),*)
+	(@size; nameof($expr:ty) $($tt:tt)*) => {
+		<$expr>::SIGNATURE.len + $crate::make_signature!(@size; $($tt)*)
 	};
-
-    (new $($tt:tt)*) => {
-        const SIGNATURE: SignatureUnit = SignatureUnit {
-			data: {
-				let mut out = [0u8; SIGNATURE_SIZE_LIMIT];
-				let mut dst_offset = 0;
-				make_signature!(@data(out, dst_offset); $($tt)*);
-				out
-			},
-			len: {0 + make_signature!(@size; $($tt)*)},
-        };
-    };
-
-    (@size;) => {
-        0
-    };
-    (@size; fixed($expr:expr) $($tt:tt)*) => {
-        $expr.len() + make_signature!(@size; $($tt)*)
-    };
-    (@size; nameof($expr:ty) $($tt:tt)*) => {
-		<$expr>::SIGNATURE.len + make_signature!(@size; $($tt)*)
-    };
 	(@size; shift_left($expr:expr) $($tt:tt)*) => {
-		make_signature!(@size; $($tt)*) - $expr
+		$crate::make_signature!(@size; $($tt)*) - $expr
 	};
 
-    (@data($dst:ident, $dst_offset:ident);) => {};
-    (@data($dst:ident, $dst_offset:ident); fixed($expr:expr) $($tt:tt)*) => {
-        {
-            let data = $expr.as_bytes();
+	(@data($dst:ident, $dst_offset:ident);) => {};
+	(@data($dst:ident, $dst_offset:ident); fixed($expr:expr) $($tt:tt)*) => {
+		{
+			let data = $expr.as_bytes();
 			let data_len = data.len();
-			make_signature!(@copy(data, $dst, data_len, $dst_offset));
-        }
-        make_signature!(@data($dst, $dst_offset); $($tt)*)
-    };
-    (@data($dst:ident, $dst_offset:ident); nameof($expr:ty) $($tt:tt)*) => {
-        {
-            make_signature!(@copy(&<$expr>::SIGNATURE.data, $dst, <$expr>::SIGNATURE.len, $dst_offset));
-        }
-        make_signature!(@data($dst, $dst_offset); $($tt)*)
-    };
+			$crate::make_signature!(@copy(data, $dst, data_len, $dst_offset));
+		}
+		$crate::make_signature!(@data($dst, $dst_offset); $($tt)*)
+	};
+	(@data($dst:ident, $dst_offset:ident); nameof($expr:ty) $($tt:tt)*) => {
+		{
+			$crate::make_signature!(@copy(&<$expr>::SIGNATURE.data, $dst, <$expr>::SIGNATURE.len, $dst_offset));
+		}
+		$crate::make_signature!(@data($dst, $dst_offset); $($tt)*)
+	};
 	(@data($dst:ident, $dst_offset:ident); shift_left($expr:expr) $($tt:tt)*) => {
-        $dst_offset -= $expr;
-        make_signature!(@data($dst, $dst_offset); $($tt)*)
-    };
+		$dst_offset -= $expr;
+		$crate::make_signature!(@data($dst, $dst_offset); $($tt)*)
+	};
 
 	(@copy($src:expr, $dst:expr, $src_len:expr, $dst_offset:ident)) => {
 		{
@@ -328,7 +178,7 @@
 mod test {
 	use core::str::from_utf8;
 
-	use super::{SIGNATURE_SIZE_LIMIT, SignatureUnit, FunctionSignature, SignaturePreferences};
+	use super::{SIGNATURE_SIZE_LIMIT, SignatureUnit};
 
 	trait Name {
 		const SIGNATURE: SignatureUnit;
@@ -339,19 +189,21 @@
 	}
 
 	impl Name for u8 {
-		make_signature!(new fixed("uint8"));
+		const SIGNATURE: SignatureUnit = make_signature!(new fixed("uint8"));
 	}
 	impl Name for u32 {
-		make_signature!(new fixed("uint32"));
+		const SIGNATURE: SignatureUnit = make_signature!(new fixed("uint32"));
 	}
 	impl<T: Name> Name for Vec<T> {
-		make_signature!(new nameof(T) fixed("[]"));
+		const SIGNATURE: SignatureUnit = make_signature!(new nameof(T) fixed("[]"));
 	}
 	impl<A: Name, B: Name> Name for (A, B) {
-		make_signature!(new fixed("(") nameof(A) fixed(",") nameof(B) fixed(")"));
+		const SIGNATURE: SignatureUnit =
+			make_signature!(new fixed("(") nameof(A) fixed(",") nameof(B) fixed(")"));
 	}
 	impl<A: Name> Name for (A,) {
-		make_signature!(new fixed("(") nameof(A) fixed(",") shift_left(1) fixed(")"));
+		const SIGNATURE: SignatureUnit =
+			make_signature!(new fixed("(") nameof(A) fixed(",") shift_left(1) fixed(")"));
 	}
 
 	struct MaxSize();
@@ -361,14 +213,6 @@
 			len: SIGNATURE_SIZE_LIMIT,
 		};
 	}
-
-	const SIGNATURE_PREFERENCES: SignaturePreferences = SignaturePreferences {
-		open_name: Some(SignatureUnit::new("some_funk")),
-		open_delimiter: Some(SignatureUnit::new("(")),
-		param_delimiter: Some(SignatureUnit::new(",")),
-		close_delimiter: Some(SignatureUnit::new(")")),
-		close_name: None,
-	};
 
 	#[test]
 	fn simple() {
@@ -421,68 +265,6 @@
 	#[test]
 	fn max_size() {
 		assert_eq!(<MaxSize>::name(), "!".repeat(SIGNATURE_SIZE_LIMIT));
-	}
-
-	#[test]
-	fn make_func_without_args() {
-		const SIG: FunctionSignature = make_signature!(
-			new fn(SIGNATURE_PREFERENCES)
-		);
-		let name = SIG.as_str();
-		similar_asserts::assert_eq!(name, "some_funk()");
-	}
-
-	#[test]
-	fn make_func_with_1_args() {
-		const SIG: FunctionSignature = make_signature!(
-			new fn(SIGNATURE_PREFERENCES),
-			(<u8>::SIGNATURE),
-		);
-		let name = SIG.as_str();
-		similar_asserts::assert_eq!(name, "some_funk(uint8)");
-	}
-
-	#[test]
-	fn make_func_with_2_args() {
-		const SIG: FunctionSignature = make_signature!(
-			new fn(SIGNATURE_PREFERENCES),
-			(u8::SIGNATURE),
-			(<Vec<u32>>::SIGNATURE),
-		);
-		let name = SIG.as_str();
-		similar_asserts::assert_eq!(name, "some_funk(uint8,uint32[])");
-	}
-
-	#[test]
-	fn make_func_with_3_args() {
-		const SIG: FunctionSignature = make_signature!(
-			new fn(SIGNATURE_PREFERENCES),
-			(<u8>::SIGNATURE),
-			(<u32>::SIGNATURE),
-			(<Vec<u32>>::SIGNATURE),
-		);
-		let name = SIG.as_str();
-		similar_asserts::assert_eq!(name, "some_funk(uint8,uint32,uint32[])");
-	}
-
-	#[test]
-	fn make_slice_from_signature() {
-		const SIG: FunctionSignature = make_signature!(
-			new fn(SIGNATURE_PREFERENCES),
-			(<u8>::SIGNATURE),
-			(<u32>::SIGNATURE),
-			(<Vec<u32>>::SIGNATURE),
-		);
-		const NAME: [u8; SIG.unit.len] = {
-			let mut name: [u8; SIG.unit.len] = [0; SIG.unit.len];
-			let mut i = 0;
-			while i < SIG.unit.len {
-				name[i] = SIG.unit.data[i];
-				i += 1;
-			}
-			name
-		};
-		similar_asserts::assert_eq!(&NAME, b"some_funk(uint8,uint32,uint32[])");
 	}
 
 	#[test]
modifiedcrates/evm-coder/src/lib.rsdiffbeforeafterboth
--- a/crates/evm-coder/src/lib.rs
+++ b/crates/evm-coder/src/lib.rs
@@ -122,7 +122,7 @@
 	use primitive_types::{U256, H160, H256};
 	use core::str::from_utf8;
 
-	use crate::custom_signature::{SignatureUnit, SIGNATURE_SIZE_LIMIT};
+	use crate::custom_signature::SignatureUnit;
 
 	pub trait Signature {
 		const SIGNATURE: SignatureUnit;
@@ -133,14 +133,14 @@
 	}
 
 	impl Signature for bool {
-		make_signature!(new fixed("bool"));
+		const SIGNATURE: SignatureUnit = make_signature!(new fixed("bool"));
 	}
 
 	macro_rules! define_simple_type {
 		(type $ident:ident = $ty:ty) => {
 			pub type $ident = $ty;
 			impl Signature for $ty {
-				make_signature!(new fixed(stringify!($ident)));
+				const SIGNATURE: SignatureUnit = make_signature!(new fixed(stringify!($ident)));
 			}
 		};
 	}
@@ -165,7 +165,7 @@
 	#[derive(Default, Debug)]
 	pub struct bytes(pub Vec<u8>);
 	impl Signature for bytes {
-		make_signature!(new fixed("bytes"));
+		const SIGNATURE: SignatureUnit = make_signature!(new fixed("bytes"));
 	}
 
 	/// Solidity doesn't have `void` type, however we have special implementation
@@ -259,7 +259,7 @@
 	}
 
 	impl Signature for EthCrossAccount {
-		make_signature!(new fixed("(address,uint256)"));
+		const SIGNATURE: SignatureUnit = make_signature!(new fixed("(address,uint256)"));
 	}
 
 	/// Convert `CrossAccountId` to `uint256`.
modifiedcrates/evm-coder/src/solidity.rsdiffbeforeafterboth
--- a/crates/evm-coder/src/solidity.rs
+++ b/crates/evm-coder/src/solidity.rs
@@ -32,7 +32,7 @@
 	cmp::Reverse,
 };
 use impl_trait_for_tuples::impl_for_tuples;
-use crate::{types::*, custom_signature::FunctionSignature};
+use crate::{types::*, custom_signature::SignatureUnit};
 
 #[derive(Default)]
 pub struct TypeCollector {
@@ -486,7 +486,7 @@
 	pub docs: &'static [&'static str],
 	pub selector: u32,
 	pub hide: bool,
-	pub custom_signature: FunctionSignature,
+	pub custom_signature: SignatureUnit,
 	pub name: &'static str,
 	pub args: A,
 	pub result: R,
@@ -512,7 +512,7 @@
 		writeln!(
 			writer,
 			"\t{hide_comment}///  or in textual repr: {}",
-			self.custom_signature.as_str()
+			self.custom_signature.as_str().expect("bad utf-8")
 		)?;
 		write!(writer, "\t{hide_comment}function {}(", self.name)?;
 		self.args.solidity_name(writer, tc)?;
modifiedpallets/common/src/erc.rsdiffbeforeafterboth
--- a/pallets/common/src/erc.rs
+++ b/pallets/common/src/erc.rs
@@ -21,8 +21,6 @@
 	types::*,
 	execution::{Result, Error},
 	weight,
-	custom_signature::{SignatureUnit, FunctionSignature, SignaturePreferences},
-	make_signature,
 };
 pub use pallet_evm::{PrecompileOutput, PrecompileResult, PrecompileHandle, account::CrossAccountId};
 use pallet_evm_coder_substrate::dispatch_to_evm;
modifiedpallets/evm-contract-helpers/src/eth.rsdiffbeforeafterboth
--- a/pallets/evm-contract-helpers/src/eth.rs
+++ b/pallets/evm-contract-helpers/src/eth.rs
@@ -19,13 +19,7 @@
 extern crate alloc;
 use core::marker::PhantomData;
 use evm_coder::{
-	abi::AbiWriter,
-	execution::Result,
-	generate_stubgen, solidity_interface,
-	types::*,
-	ToLog,
-	custom_signature::{SignatureUnit, FunctionSignature, SignaturePreferences},
-	make_signature,
+	abi::AbiWriter, execution::Result, generate_stubgen, solidity_interface, types::*, ToLog,
 };
 use pallet_evm::{
 	ExitRevert, OnCreate, OnMethodCall, PrecompileResult, PrecompileFailure, PrecompileHandle,
modifiedpallets/fungible/src/erc.rsdiffbeforeafterboth
--- a/pallets/fungible/src/erc.rs
+++ b/pallets/fungible/src/erc.rs
@@ -19,15 +19,7 @@
 extern crate alloc;
 use core::char::{REPLACEMENT_CHARACTER, decode_utf16};
 use core::convert::TryInto;
-use evm_coder::{
-	ToLog,
-	execution::*,
-	generate_stubgen, solidity_interface,
-	types::*,
-	weight,
-	custom_signature::{SignatureUnit, FunctionSignature, SignaturePreferences},
-	make_signature,
-};
+use evm_coder::{ToLog, execution::*, generate_stubgen, solidity_interface, types::*, weight};
 use up_data_structs::CollectionMode;
 use pallet_common::erc::{CommonEvmHandler, PrecompileResult};
 use sp_std::vec::Vec;
modifiedpallets/nonfungible/src/erc.rsdiffbeforeafterboth
after · pallets/nonfungible/src/erc.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//! # Nonfungible Pallet EVM API18//!19//! Provides ERC-721 standart support implementation and EVM API for unique extensions for Nonfungible Pallet.20//! Method implementations are mostly doing parameter conversion and calling Nonfungible Pallet methods.2122extern crate alloc;23use core::{24	char::{REPLACEMENT_CHARACTER, decode_utf16},25	convert::TryInto,26};27use evm_coder::{ToLog, execution::*, generate_stubgen, solidity, solidity_interface, types::*, weight};28use frame_support::BoundedVec;29use up_data_structs::{30	TokenId, PropertyPermission, PropertyKeyPermission, Property, CollectionId, PropertyKey,31	CollectionPropertiesVec,32};33use pallet_evm_coder_substrate::dispatch_to_evm;34use sp_std::vec::Vec;35use pallet_common::{36	erc::{CommonEvmHandler, PrecompileResult, CollectionCall, static_property::key},37	CollectionHandle, CollectionPropertyPermissions,38};39use pallet_evm::{account::CrossAccountId, PrecompileHandle};40use pallet_evm_coder_substrate::call;41use pallet_structure::{SelfWeightOf as StructureWeight, weights::WeightInfo as _};4243use crate::{44	AccountBalance, Config, CreateItemData, NonfungibleHandle, Pallet, TokenData, TokensMinted,45	SelfWeightOf, weights::WeightInfo, TokenProperties,46};4748/// @title A contract that allows to set and delete token properties and change token property permissions.49#[solidity_interface(name = TokenProperties)]50impl<T: Config> NonfungibleHandle<T> {51	/// @notice Set permissions for token property.52	/// @dev Throws error if `msg.sender` is not admin or owner of the collection.53	/// @param key Property key.54	/// @param isMutable Permission to mutate property.55	/// @param collectionAdmin Permission to mutate property by collection admin if property is mutable.56	/// @param tokenOwner Permission to mutate property by token owner if property is mutable.57	fn set_token_property_permission(58		&mut self,59		caller: caller,60		key: string,61		is_mutable: bool,62		collection_admin: bool,63		token_owner: bool,64	) -> Result<()> {65		let caller = T::CrossAccountId::from_eth(caller);66		<Pallet<T>>::set_property_permission(67			self,68			&caller,69			PropertyKeyPermission {70				key: <Vec<u8>>::from(key)71					.try_into()72					.map_err(|_| "too long key")?,73				permission: PropertyPermission {74					mutable: is_mutable,75					collection_admin,76					token_owner,77				},78			},79		)80		.map_err(dispatch_to_evm::<T>)81	}8283	/// @notice Set token property value.84	/// @dev Throws error if `msg.sender` has no permission to edit the property.85	/// @param tokenId ID of the token.86	/// @param key Property key.87	/// @param value Property value.88	fn set_property(89		&mut self,90		caller: caller,91		token_id: uint256,92		key: string,93		value: bytes,94	) -> Result<()> {95		let caller = T::CrossAccountId::from_eth(caller);96		let token_id: u32 = token_id.try_into().map_err(|_| "token id overflow")?;97		let key = <Vec<u8>>::from(key)98			.try_into()99			.map_err(|_| "key too long")?;100		let value = value.0.try_into().map_err(|_| "value too long")?;101102		let nesting_budget = self103			.recorder104			.weight_calls_budget(<StructureWeight<T>>::find_parent());105106		<Pallet<T>>::set_token_property(107			self,108			&caller,109			TokenId(token_id),110			Property { key, value },111			&nesting_budget,112		)113		.map_err(dispatch_to_evm::<T>)114	}115116	/// @notice Set token properties value.117	/// @dev Throws error if `msg.sender` has no permission to edit the property.118	/// @param tokenId ID of the token.119	/// @param properties settable properties120	#[weight(<SelfWeightOf<T>>::set_token_properties(properties.len() as u32))]121	fn set_properties(122		&mut self,123		caller: caller,124		token_id: uint256,125		properties: Vec<(string, bytes)>,126	) -> Result<()> {127		let caller = T::CrossAccountId::from_eth(caller);128		let token_id: u32 = token_id.try_into().map_err(|_| "token id overflow")?;129130		let nesting_budget = self131			.recorder132			.weight_calls_budget(<StructureWeight<T>>::find_parent());133134		let properties = properties135			.into_iter()136			.map(|(key, value)| {137				let key = <Vec<u8>>::from(key)138					.try_into()139					.map_err(|_| "key too large")?;140141				let value = value.0.try_into().map_err(|_| "value too large")?;142143				Ok(Property { key, value })144			})145			.collect::<Result<Vec<_>>>()?;146147		<Pallet<T>>::set_token_properties(148			self,149			&caller,150			TokenId(token_id),151			properties.into_iter(),152			<Pallet<T>>::token_exists(&self, TokenId(token_id)),153			&nesting_budget,154		)155		.map_err(dispatch_to_evm::<T>)156	}157158	/// @notice Delete token property value.159	/// @dev Throws error if `msg.sender` has no permission to edit the property.160	/// @param tokenId ID of the token.161	/// @param key Property key.162	fn delete_property(&mut self, token_id: uint256, caller: caller, key: string) -> Result<()> {163		let caller = T::CrossAccountId::from_eth(caller);164		let token_id: u32 = token_id.try_into().map_err(|_| "token id overflow")?;165		let key = <Vec<u8>>::from(key)166			.try_into()167			.map_err(|_| "key too long")?;168169		let nesting_budget = self170			.recorder171			.weight_calls_budget(<StructureWeight<T>>::find_parent());172173		<Pallet<T>>::delete_token_property(self, &caller, TokenId(token_id), key, &nesting_budget)174			.map_err(dispatch_to_evm::<T>)175	}176177	/// @notice Get token property value.178	/// @dev Throws error if key not found179	/// @param tokenId ID of the token.180	/// @param key Property key.181	/// @return Property value bytes182	fn property(&self, token_id: uint256, key: string) -> Result<bytes> {183		let token_id: u32 = token_id.try_into().map_err(|_| "token id overflow")?;184		let key = <Vec<u8>>::from(key)185			.try_into()186			.map_err(|_| "key too long")?;187188		let props = <TokenProperties<T>>::get((self.id, token_id));189		let prop = props.get(&key).ok_or("key not found")?;190191		Ok(prop.to_vec().into())192	}193}194195#[derive(ToLog)]196pub enum ERC721Events {197	/// @dev This emits when ownership of any NFT changes by any mechanism.198	///  This event emits when NFTs are created (`from` == 0) and destroyed199	///  (`to` == 0). Exception: during contract creation, any number of NFTs200	///  may be created and assigned without emitting Transfer. At the time of201	///  any transfer, the approved address for that NFT (if any) is reset to none.202	Transfer {203		#[indexed]204		from: address,205		#[indexed]206		to: address,207		#[indexed]208		token_id: uint256,209	},210	/// @dev This emits when the approved address for an NFT is changed or211	///  reaffirmed. The zero address indicates there is no approved address.212	///  When a Transfer event emits, this also indicates that the approved213	///  address for that NFT (if any) is reset to none.214	Approval {215		#[indexed]216		owner: address,217		#[indexed]218		approved: address,219		#[indexed]220		token_id: uint256,221	},222	/// @dev This emits when an operator is enabled or disabled for an owner.223	///  The operator can manage all NFTs of the owner.224	#[allow(dead_code)]225	ApprovalForAll {226		#[indexed]227		owner: address,228		#[indexed]229		operator: address,230		approved: bool,231	},232}233234#[derive(ToLog)]235pub enum ERC721UniqueMintableEvents {236	#[allow(dead_code)]237	MintingFinished {},238}239240/// @title ERC-721 Non-Fungible Token Standard, optional metadata extension241/// @dev See https://eips.ethereum.org/EIPS/eip-721242#[solidity_interface(name = ERC721Metadata, expect_selector = 0x5b5e139f)]243impl<T: Config> NonfungibleHandle<T>244where245	T::AccountId: From<[u8; 32]>,246{247	/// @notice A descriptive name for a collection of NFTs in this contract248	/// @dev real implementation of this function lies in `ERC721UniqueExtensions`249	#[solidity(hide, rename_selector = "name")]250	fn name_proxy(&self) -> Result<string> {251		self.name()252	}253254	/// @notice An abbreviated name for NFTs in this contract255	/// @dev real implementation of this function lies in `ERC721UniqueExtensions`256	#[solidity(hide, rename_selector = "symbol")]257	fn symbol_proxy(&self) -> Result<string> {258		self.symbol()259	}260261	/// @notice A distinct Uniform Resource Identifier (URI) for a given asset.262	///263	/// @dev If the token has a `url` property and it is not empty, it is returned.264	///  Else If the collection does not have a property with key `schemaName` or its value is not equal to `ERC721Metadata`, it return an error `tokenURI not set`.265	///  If the collection property `baseURI` is empty or absent, return "" (empty string)266	///  otherwise, if token property `suffix` present and is non-empty, return concatenation of baseURI and suffix267	///  otherwise, return concatenation of `baseURI` and stringified token id (decimal stringifying, without paddings).268	///269	/// @return token's const_metadata270	#[solidity(rename_selector = "tokenURI")]271	fn token_uri(&self, token_id: uint256) -> Result<string> {272		let token_id_u32: u32 = token_id.try_into().map_err(|_| "token id overflow")?;273274		match get_token_property(self, token_id_u32, &key::url()).as_deref() {275			Err(_) | Ok("") => (),276			Ok(url) => {277				return Ok(url.into());278			}279		};280281		let base_uri =282			pallet_common::Pallet::<T>::get_collection_property(self.id, &key::base_uri())283				.map(BoundedVec::into_inner)284				.map(string::from_utf8)285				.transpose()286				.map_err(|e| {287					Error::Revert(alloc::format!(288						"Can not convert value \"baseURI\" to string with error \"{}\"",289						e290					))291				})?;292293		let base_uri = match base_uri.as_deref() {294			None | Some("") => {295				return Ok("".into());296			}297			Some(base_uri) => base_uri.into(),298		};299300		Ok(301			match get_token_property(self, token_id_u32, &key::suffix()).as_deref() {302				Err(_) | Ok("") => base_uri,303				Ok(suffix) => base_uri + suffix,304			},305		)306	}307}308309/// @title ERC-721 Non-Fungible Token Standard, optional enumeration extension310/// @dev See https://eips.ethereum.org/EIPS/eip-721311#[solidity_interface(name = ERC721Enumerable, expect_selector = 0x780e9d63)]312impl<T: Config> NonfungibleHandle<T> {313	/// @notice Enumerate valid NFTs314	/// @param index A counter less than `totalSupply()`315	/// @return The token identifier for the `index`th NFT,316	///  (sort order not specified)317	fn token_by_index(&self, index: uint256) -> Result<uint256> {318		Ok(index)319	}320321	/// @dev Not implemented322	fn token_of_owner_by_index(&self, _owner: address, _index: uint256) -> Result<uint256> {323		// TODO: Not implemetable324		Err("not implemented".into())325	}326327	/// @notice Count NFTs tracked by this contract328	/// @return A count of valid NFTs tracked by this contract, where each one of329	///  them has an assigned and queryable owner not equal to the zero address330	fn total_supply(&self) -> Result<uint256> {331		self.consume_store_reads(1)?;332		Ok(<Pallet<T>>::total_supply(self).into())333	}334}335336/// @title ERC-721 Non-Fungible Token Standard337/// @dev See https://github.com/ethereum/EIPs/blob/master/EIPS/eip-721.md338#[solidity_interface(name = ERC721, events(ERC721Events), expect_selector = 0x80ac58cd)]339impl<T: Config> NonfungibleHandle<T> {340	/// @notice Count all NFTs assigned to an owner341	/// @dev NFTs assigned to the zero address are considered invalid, and this342	///  function throws for queries about the zero address.343	/// @param owner An address for whom to query the balance344	/// @return The number of NFTs owned by `owner`, possibly zero345	fn balance_of(&self, owner: address) -> Result<uint256> {346		self.consume_store_reads(1)?;347		let owner = T::CrossAccountId::from_eth(owner);348		let balance = <AccountBalance<T>>::get((self.id, owner));349		Ok(balance.into())350	}351	/// @notice Find the owner of an NFT352	/// @dev NFTs assigned to zero address are considered invalid, and queries353	///  about them do throw.354	/// @param tokenId The identifier for an NFT355	/// @return The address of the owner of the NFT356	fn owner_of(&self, token_id: uint256) -> Result<address> {357		self.consume_store_reads(1)?;358		let token: TokenId = token_id.try_into()?;359		Ok(*<TokenData<T>>::get((self.id, token))360			.ok_or("token not found")?361			.owner362			.as_eth())363	}364	/// @dev Not implemented365	#[solidity(rename_selector = "safeTransferFrom")]366	fn safe_transfer_from_with_data(367		&mut self,368		_from: address,369		_to: address,370		_token_id: uint256,371		_data: bytes,372	) -> Result<void> {373		// TODO: Not implemetable374		Err("not implemented".into())375	}376	/// @dev Not implemented377	fn safe_transfer_from(378		&mut self,379		_from: address,380		_to: address,381		_token_id: uint256,382	) -> Result<void> {383		// TODO: Not implemetable384		Err("not implemented".into())385	}386387	/// @notice Transfer ownership of an NFT -- THE CALLER IS RESPONSIBLE388	///  TO CONFIRM THAT `to` IS CAPABLE OF RECEIVING NFTS OR ELSE389	///  THEY MAY BE PERMANENTLY LOST390	/// @dev Throws unless `msg.sender` is the current owner or an authorized391	///  operator for this NFT. Throws if `from` is not the current owner. Throws392	///  if `to` is the zero address. Throws if `tokenId` is not a valid NFT.393	/// @param from The current owner of the NFT394	/// @param to The new owner395	/// @param tokenId The NFT to transfer396	#[weight(<SelfWeightOf<T>>::transfer_from())]397	fn transfer_from(398		&mut self,399		caller: caller,400		from: address,401		to: address,402		token_id: uint256,403	) -> Result<void> {404		let caller = T::CrossAccountId::from_eth(caller);405		let from = T::CrossAccountId::from_eth(from);406		let to = T::CrossAccountId::from_eth(to);407		let token = token_id.try_into()?;408		let budget = self409			.recorder410			.weight_calls_budget(<StructureWeight<T>>::find_parent());411412		<Pallet<T>>::transfer_from(self, &caller, &from, &to, token, &budget)413			.map_err(dispatch_to_evm::<T>)?;414		Ok(())415	}416417	/// @notice Set or reaffirm the approved address for an NFT418	/// @dev The zero address indicates there is no approved address.419	/// @dev Throws unless `msg.sender` is the current NFT owner, or an authorized420	///  operator of the current owner.421	/// @param approved The new approved NFT controller422	/// @param tokenId The NFT to approve423	#[weight(<SelfWeightOf<T>>::approve())]424	fn approve(&mut self, caller: caller, approved: address, token_id: uint256) -> Result<void> {425		let caller = T::CrossAccountId::from_eth(caller);426		let approved = T::CrossAccountId::from_eth(approved);427		let token = token_id.try_into()?;428429		<Pallet<T>>::set_allowance(self, &caller, token, Some(&approved))430			.map_err(dispatch_to_evm::<T>)?;431		Ok(())432	}433434	/// @dev Not implemented435	fn set_approval_for_all(436		&mut self,437		_caller: caller,438		_operator: address,439		_approved: bool,440	) -> Result<void> {441		// TODO: Not implemetable442		Err("not implemented".into())443	}444445	/// @dev Not implemented446	fn get_approved(&self, _token_id: uint256) -> Result<address> {447		// TODO: Not implemetable448		Err("not implemented".into())449	}450451	/// @dev Not implemented452	fn is_approved_for_all(&self, _owner: address, _operator: address) -> Result<address> {453		// TODO: Not implemetable454		Err("not implemented".into())455	}456}457458/// @title ERC721 Token that can be irreversibly burned (destroyed).459#[solidity_interface(name = ERC721Burnable)]460impl<T: Config> NonfungibleHandle<T> {461	/// @notice Burns a specific ERC721 token.462	/// @dev Throws unless `msg.sender` is the current NFT owner, or an authorized463	///  operator of the current owner.464	/// @param tokenId The NFT to approve465	#[weight(<SelfWeightOf<T>>::burn_item())]466	fn burn(&mut self, caller: caller, token_id: uint256) -> Result<void> {467		let caller = T::CrossAccountId::from_eth(caller);468		let token = token_id.try_into()?;469470		<Pallet<T>>::burn(self, &caller, token).map_err(dispatch_to_evm::<T>)?;471		Ok(())472	}473}474475/// @title ERC721 minting logic.476#[solidity_interface(name = ERC721UniqueMintable, events(ERC721UniqueMintableEvents))]477impl<T: Config> NonfungibleHandle<T> {478	fn minting_finished(&self) -> Result<bool> {479		Ok(false)480	}481482	/// @notice Function to mint token.483	/// @param to The new owner484	/// @return uint256 The id of the newly minted token485	#[weight(<SelfWeightOf<T>>::create_item())]486	fn mint(&mut self, caller: caller, to: address) -> Result<uint256> {487		let token_id: uint256 = <TokensMinted<T>>::get(self.id)488			.checked_add(1)489			.ok_or("item id overflow")?490			.into();491		self.mint_check_id(caller, to, token_id)?;492		Ok(token_id)493	}494495	/// @notice Function to mint token.496	/// @dev `tokenId` should be obtained with `nextTokenId` method,497	///  unlike standard, you can't specify it manually498	/// @param to The new owner499	/// @param tokenId ID of the minted NFT500	#[solidity(hide, rename_selector = "mint")]501	#[weight(<SelfWeightOf<T>>::create_item())]502	fn mint_check_id(&mut self, caller: caller, to: address, token_id: uint256) -> Result<bool> {503		let caller = T::CrossAccountId::from_eth(caller);504		let to = T::CrossAccountId::from_eth(to);505		let token_id: u32 = token_id.try_into()?;506		let budget = self507			.recorder508			.weight_calls_budget(<StructureWeight<T>>::find_parent());509510		if <TokensMinted<T>>::get(self.id)511			.checked_add(1)512			.ok_or("item id overflow")?513			!= token_id514		{515			return Err("item id should be next".into());516		}517518		<Pallet<T>>::create_item(519			self,520			&caller,521			CreateItemData::<T> {522				properties: BoundedVec::default(),523				owner: to,524			},525			&budget,526		)527		.map_err(dispatch_to_evm::<T>)?;528529		Ok(true)530	}531532	/// @notice Function to mint token with the given tokenUri.533	/// @param to The new owner534	/// @param tokenUri Token URI that would be stored in the NFT properties535	/// @return uint256 The id of the newly minted token536	#[solidity(rename_selector = "mintWithTokenURI")]537	#[weight(<SelfWeightOf<T>>::create_item())]538	fn mint_with_token_uri(539		&mut self,540		caller: caller,541		to: address,542		token_uri: string,543	) -> Result<uint256> {544		let token_id: uint256 = <TokensMinted<T>>::get(self.id)545			.checked_add(1)546			.ok_or("item id overflow")?547			.into();548		self.mint_with_token_uri_check_id(caller, to, token_id, token_uri)?;549		Ok(token_id)550	}551552	/// @notice Function to mint token with the given tokenUri.553	/// @dev `tokenId` should be obtained with `nextTokenId` method,554	///  unlike standard, you can't specify it manually555	/// @param to The new owner556	/// @param tokenId ID of the minted NFT557	/// @param tokenUri Token URI that would be stored in the NFT properties558	#[solidity(hide, rename_selector = "mintWithTokenURI")]559	#[weight(<SelfWeightOf<T>>::create_item())]560	fn mint_with_token_uri_check_id(561		&mut self,562		caller: caller,563		to: address,564		token_id: uint256,565		token_uri: string,566	) -> Result<bool> {567		let key = key::url();568		let permission = get_token_permission::<T>(self.id, &key)?;569		if !permission.collection_admin {570			return Err("Operation is not allowed".into());571		}572573		let caller = T::CrossAccountId::from_eth(caller);574		let to = T::CrossAccountId::from_eth(to);575		let token_id: u32 = token_id.try_into().map_err(|_| "amount overflow")?;576		let budget = self577			.recorder578			.weight_calls_budget(<StructureWeight<T>>::find_parent());579580		if <TokensMinted<T>>::get(self.id)581			.checked_add(1)582			.ok_or("item id overflow")?583			!= token_id584		{585			return Err("item id should be next".into());586		}587588		let mut properties = CollectionPropertiesVec::default();589		properties590			.try_push(Property {591				key,592				value: token_uri593					.into_bytes()594					.try_into()595					.map_err(|_| "token uri is too long")?,596			})597			.map_err(|e| Error::Revert(alloc::format!("Can't add property: {:?}", e)))?;598599		<Pallet<T>>::create_item(600			self,601			&caller,602			CreateItemData::<T> {603				properties,604				owner: to,605			},606			&budget,607		)608		.map_err(dispatch_to_evm::<T>)?;609		Ok(true)610	}611612	/// @dev Not implemented613	fn finish_minting(&mut self, _caller: caller) -> Result<bool> {614		Err("not implementable".into())615	}616}617618fn get_token_property<T: Config>(619	collection: &CollectionHandle<T>,620	token_id: u32,621	key: &up_data_structs::PropertyKey,622) -> Result<string> {623	collection.consume_store_reads(1)?;624	let properties = <TokenProperties<T>>::try_get((collection.id, token_id))625		.map_err(|_| Error::Revert("Token properties not found".into()))?;626	if let Some(property) = properties.get(key) {627		return Ok(string::from_utf8_lossy(property).into());628	}629630	Err("Property tokenURI not found".into())631}632633fn get_token_permission<T: Config>(634	collection_id: CollectionId,635	key: &PropertyKey,636) -> Result<PropertyPermission> {637	let token_property_permissions = CollectionPropertyPermissions::<T>::try_get(collection_id)638		.map_err(|_| Error::Revert("No permissions for collection".into()))?;639	let a = token_property_permissions640		.get(key)641		.map(Clone::clone)642		.ok_or_else(|| {643			let key = string::from_utf8(key.clone().into_inner()).unwrap_or_default();644			Error::Revert(alloc::format!("No permission for key {}", key))645		})?;646	Ok(a)647}648649/// @title Unique extensions for ERC721.650#[solidity_interface(name = ERC721UniqueExtensions)]651impl<T: Config> NonfungibleHandle<T>652where653	T::AccountId: From<[u8; 32]>,654{655	/// @notice A descriptive name for a collection of NFTs in this contract656	fn name(&self) -> Result<string> {657		Ok(decode_utf16(self.name.iter().copied())658			.map(|r| r.unwrap_or(REPLACEMENT_CHARACTER))659			.collect::<string>())660	}661662	/// @notice An abbreviated name for NFTs in this contract663	fn symbol(&self) -> Result<string> {664		Ok(string::from_utf8_lossy(&self.token_prefix).into())665	}666667	/// @notice Set or reaffirm the approved address for an NFT668	/// @dev The zero address indicates there is no approved address.669	/// @dev Throws unless `msg.sender` is the current NFT owner, or an authorized670	///  operator of the current owner.671	/// @param approved The new substrate address approved NFT controller672	/// @param tokenId The NFT to approve673	#[weight(<SelfWeightOf<T>>::approve())]674	fn approve_cross(675		&mut self,676		caller: caller,677		approved: EthCrossAccount,678		token_id: uint256,679	) -> Result<void> {680		let caller = T::CrossAccountId::from_eth(caller);681		let approved = approved.into_sub_cross_account::<T>()?;682		let token = token_id.try_into()?;683684		<Pallet<T>>::set_allowance(self, &caller, token, Some(&approved))685			.map_err(dispatch_to_evm::<T>)?;686		Ok(())687	}688689	/// @notice Transfer ownership of an NFT690	/// @dev Throws unless `msg.sender` is the current owner. Throws if `to`691	///  is the zero address. Throws if `tokenId` is not a valid NFT.692	/// @param to The new owner693	/// @param tokenId The NFT to transfer694	#[weight(<SelfWeightOf<T>>::transfer())]695	fn transfer(&mut self, caller: caller, to: address, token_id: uint256) -> Result<void> {696		let caller = T::CrossAccountId::from_eth(caller);697		let to = T::CrossAccountId::from_eth(to);698		let token = token_id.try_into()?;699		let budget = self700			.recorder701			.weight_calls_budget(<StructureWeight<T>>::find_parent());702703		<Pallet<T>>::transfer(self, &caller, &to, token, &budget).map_err(dispatch_to_evm::<T>)?;704		Ok(())705	}706707	/// @notice Transfer ownership of an NFT from cross account address to cross account address708	/// @dev Throws unless `msg.sender` is the current owner. Throws if `to`709	///  is the zero address. Throws if `tokenId` is not a valid NFT.710	/// @param from Cross acccount address of current owner711	/// @param to Cross acccount address of new owner712	/// @param tokenId The NFT to transfer713	#[weight(<SelfWeightOf<T>>::transfer())]714	fn transfer_from_cross(715		&mut self,716		caller: caller,717		from: EthCrossAccount,718		to: EthCrossAccount,719		token_id: uint256,720	) -> Result<void> {721		let caller = T::CrossAccountId::from_eth(caller);722		let from = from.into_sub_cross_account::<T>()?;723		let to = to.into_sub_cross_account::<T>()?;724		let token_id = token_id.try_into()?;725		let budget = self726			.recorder727			.weight_calls_budget(<StructureWeight<T>>::find_parent());728		Pallet::<T>::transfer_from(self, &caller, &from, &to, token_id, &budget)729			.map_err(dispatch_to_evm::<T>)?;730		Ok(())731	}732733	/// @notice Burns a specific ERC721 token.734	/// @dev Throws unless `msg.sender` is the current owner or an authorized735	///  operator for this NFT. Throws if `from` is not the current owner. Throws736	///  if `to` is the zero address. Throws if `tokenId` is not a valid NFT.737	/// @param from The current owner of the NFT738	/// @param tokenId The NFT to transfer739	#[weight(<SelfWeightOf<T>>::burn_from())]740	fn burn_from(&mut self, caller: caller, from: address, token_id: uint256) -> Result<void> {741		let caller = T::CrossAccountId::from_eth(caller);742		let from = T::CrossAccountId::from_eth(from);743		let token = token_id.try_into()?;744		let budget = self745			.recorder746			.weight_calls_budget(<StructureWeight<T>>::find_parent());747748		<Pallet<T>>::burn_from(self, &caller, &from, token, &budget)749			.map_err(dispatch_to_evm::<T>)?;750		Ok(())751	}752753	/// @notice Burns a specific ERC721 token.754	/// @dev Throws unless `msg.sender` is the current owner or an authorized755	///  operator for this NFT. Throws if `from` is not the current owner. Throws756	///  if `to` is the zero address. Throws if `tokenId` is not a valid NFT.757	/// @param from The current owner of the NFT758	/// @param tokenId The NFT to transfer759	#[weight(<SelfWeightOf<T>>::burn_from())]760	fn burn_from_cross(761		&mut self,762		caller: caller,763		from: EthCrossAccount,764		token_id: uint256,765	) -> Result<void> {766		let caller = T::CrossAccountId::from_eth(caller);767		let from = from.into_sub_cross_account::<T>()?;768		let token = token_id.try_into()?;769		let budget = self770			.recorder771			.weight_calls_budget(<StructureWeight<T>>::find_parent());772773		<Pallet<T>>::burn_from(self, &caller, &from, token, &budget)774			.map_err(dispatch_to_evm::<T>)?;775		Ok(())776	}777778	/// @notice Returns next free NFT ID.779	fn next_token_id(&self) -> Result<uint256> {780		self.consume_store_reads(1)?;781		Ok(<TokensMinted<T>>::get(self.id)782			.checked_add(1)783			.ok_or("item id overflow")?784			.into())785	}786787	/// @notice Function to mint multiple tokens.788	/// @dev `tokenIds` should be an array of consecutive numbers and first number789	///  should be obtained with `nextTokenId` method790	/// @param to The new owner791	/// @param tokenIds IDs of the minted NFTs792	#[solidity(hide)]793	#[weight(<SelfWeightOf<T>>::create_multiple_items(token_ids.len() as u32))]794	fn mint_bulk(&mut self, caller: caller, to: address, token_ids: Vec<uint256>) -> Result<bool> {795		let caller = T::CrossAccountId::from_eth(caller);796		let to = T::CrossAccountId::from_eth(to);797		let mut expected_index = <TokensMinted<T>>::get(self.id)798			.checked_add(1)799			.ok_or("item id overflow")?;800		let budget = self801			.recorder802			.weight_calls_budget(<StructureWeight<T>>::find_parent());803804		let total_tokens = token_ids.len();805		for id in token_ids.into_iter() {806			let id: u32 = id.try_into().map_err(|_| "token id overflow")?;807			if id != expected_index {808				return Err("item id should be next".into());809			}810			expected_index = expected_index.checked_add(1).ok_or("item id overflow")?;811		}812		let data = (0..total_tokens)813			.map(|_| CreateItemData::<T> {814				properties: BoundedVec::default(),815				owner: to.clone(),816			})817			.collect();818819		<Pallet<T>>::create_multiple_items(self, &caller, data, &budget)820			.map_err(dispatch_to_evm::<T>)?;821		Ok(true)822	}823824	/// @notice Function to mint multiple tokens with the given tokenUris.825	/// @dev `tokenIds` is array of pairs of token ID and token URI. Token IDs should be consecutive826	///  numbers and first number should be obtained with `nextTokenId` method827	/// @param to The new owner828	/// @param tokens array of pairs of token ID and token URI for minted tokens829	#[solidity(hide, rename_selector = "mintBulkWithTokenURI")]830	#[weight(<SelfWeightOf<T>>::create_multiple_items(tokens.len() as u32))]831	fn mint_bulk_with_token_uri(832		&mut self,833		caller: caller,834		to: address,835		tokens: Vec<(uint256, string)>,836	) -> Result<bool> {837		let key = key::url();838		let caller = T::CrossAccountId::from_eth(caller);839		let to = T::CrossAccountId::from_eth(to);840		let mut expected_index = <TokensMinted<T>>::get(self.id)841			.checked_add(1)842			.ok_or("item id overflow")?;843		let budget = self844			.recorder845			.weight_calls_budget(<StructureWeight<T>>::find_parent());846847		let mut data = Vec::with_capacity(tokens.len());848		for (id, token_uri) in tokens {849			let id: u32 = id.try_into().map_err(|_| "token id overflow")?;850			if id != expected_index {851				return Err("item id should be next".into());852			}853			expected_index = expected_index.checked_add(1).ok_or("item id overflow")?;854855			let mut properties = CollectionPropertiesVec::default();856			properties857				.try_push(Property {858					key: key.clone(),859					value: token_uri860						.into_bytes()861						.try_into()862						.map_err(|_| "token uri is too long")?,863				})864				.map_err(|e| Error::Revert(alloc::format!("Can't add property: {:?}", e)))?;865866			data.push(CreateItemData::<T> {867				properties,868				owner: to.clone(),869			});870		}871872		<Pallet<T>>::create_multiple_items(self, &caller, data, &budget)873			.map_err(dispatch_to_evm::<T>)?;874		Ok(true)875	}876}877878#[solidity_interface(879	name = UniqueNFT,880	is(881		ERC721,882		ERC721Enumerable,883		ERC721UniqueExtensions,884		ERC721UniqueMintable,885		ERC721Burnable,886		ERC721Metadata(if(this.flags.erc721metadata)),887		Collection(via(common_mut returns CollectionHandle<T>)),888		TokenProperties,889	)890)]891impl<T: Config> NonfungibleHandle<T> where T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]> {}892893// Not a tests, but code generators894generate_stubgen!(gen_impl, UniqueNFTCall<()>, true);895generate_stubgen!(gen_iface, UniqueNFTCall<()>, false);896897impl<T: Config> CommonEvmHandler for NonfungibleHandle<T>898where899	T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]>,900{901	const CODE: &'static [u8] = include_bytes!("./stubs/UniqueNFT.raw");902903	fn call(self, handle: &mut impl PrecompileHandle) -> Option<PrecompileResult> {904		call::<T, UniqueNFTCall<T>, _, _>(handle, self)905	}906}
modifiedpallets/refungible/src/erc.rsdiffbeforeafterboth
--- a/pallets/refungible/src/erc.rs
+++ b/pallets/refungible/src/erc.rs
@@ -25,15 +25,7 @@
 	char::{REPLACEMENT_CHARACTER, decode_utf16},
 	convert::TryInto,
 };
-use evm_coder::{
-	ToLog,
-	execution::*,
-	generate_stubgen, solidity, solidity_interface,
-	types::*,
-	weight,
-	custom_signature::{SignatureUnit, FunctionSignature, SignaturePreferences},
-	make_signature,
-};
+use evm_coder::{ToLog, execution::*, generate_stubgen, solidity, solidity_interface, types::*, weight};
 use frame_support::{BoundedBTreeMap, BoundedVec};
 use pallet_common::{
 	CollectionHandle, CollectionPropertyPermissions,
modifiedpallets/refungible/src/erc_token.rsdiffbeforeafterboth
--- a/pallets/refungible/src/erc_token.rs
+++ b/pallets/refungible/src/erc_token.rs
@@ -29,15 +29,7 @@
 	convert::TryInto,
 	ops::Deref,
 };
-use evm_coder::{
-	ToLog,
-	execution::*,
-	generate_stubgen, solidity_interface,
-	types::*,
-	weight,
-	custom_signature::{SignatureUnit, FunctionSignature, SignaturePreferences},
-	make_signature,
-};
+use evm_coder::{ToLog, execution::*, generate_stubgen, solidity_interface, types::*, weight};
 use pallet_common::{
 	CommonWeightInfo,
 	erc::{CommonEvmHandler, PrecompileResult},
modifiedpallets/unique/src/eth/mod.rsdiffbeforeafterboth
--- a/pallets/unique/src/eth/mod.rs
+++ b/pallets/unique/src/eth/mod.rs
@@ -18,13 +18,7 @@
 
 use core::marker::PhantomData;
 use ethereum as _;
-use evm_coder::{
-	execution::*,
-	generate_stubgen, solidity, solidity_interface,
-	types::*,
-	custom_signature::{SignatureUnit, FunctionSignature, SignaturePreferences},
-	make_signature, weight,
-};
+use evm_coder::{execution::*, generate_stubgen, solidity, solidity_interface, types::*, weight};
 use frame_support::traits::Get;
 use crate::Pallet;