git.delta.rocks / unique-network / refs/commits / ee71bd998b3e

difftreelog

feat Add custum signature with unlimited nesting.

Trubnikov Sergey2022-10-19parent: #01896ba.patch.diff
in: master

17 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
@@ -21,7 +21,7 @@
 // https://doc.rust-lang.org/reference/procedural-macros.html
 
 use proc_macro2::{TokenStream, Group};
-use quote::{quote, ToTokens};
+use quote::{quote, ToTokens, format_ident};
 use inflector::cases;
 use std::fmt::Write;
 use syn::{
@@ -725,25 +725,20 @@
 		}
 	}
 
-	fn expand_selector(&self) -> proc_macro2::TokenStream {
-		let custom_signature = self.expand_custom_signature();
-		quote! {
-			 {
-				let a = ::evm_coder::sha3_const::Keccak256::new()
-					.update(#custom_signature.as_bytes())
-					.finalize();
-				[a[0], a[1], a[2], a[3]]
-			}
-		}
-	}
-
 	fn expand_const(&self) -> proc_macro2::TokenStream {
 		let screaming_name = &self.screaming_name;
+		let screaming_name_signature = format_ident!("{}_SIGNATURE", &self.screaming_name);
 		let selector_str = &self.selector_str;
-		let selector = &self.expand_selector();
+		let custom_signature = self.expand_custom_signature();
 		quote! {
+			const #screaming_name_signature: ::evm_coder::custom_signature::FunctionSignature = #custom_signature;
 			#[doc = #selector_str]
-			const #screaming_name: ::evm_coder::types::bytes4 = #selector;
+			const #screaming_name: ::evm_coder::types::bytes4 = {
+				let a = ::evm_coder::sha3_const::Keccak256::new()
+				.update_with_size(&Self::#screaming_name_signature.signature, Self::#screaming_name_signature.signature_len)
+				.finalize();
+				[a[0], a[1], a[2], a[3]]
+			};
 		}
 	}
 
@@ -847,9 +842,8 @@
 	}
 
 	fn expand_custom_signature(&self) -> proc_macro2::TokenStream {
-		let mut first_comma = true;
 		let mut custom_signature = TokenStream::new();
-		let mut template = self.camel_name.clone() + "(";
+
 		self.args
 			.iter()
 			.filter_map(|a| {
@@ -863,39 +857,18 @@
 				}
 			})
 			.for_each(|ident| {
-				if !first_comma {
-					custom_signature.extend(quote!(,));
-					template.push(',');
-				} else {
-					first_comma = false;
-				};
-				template.push_str("{}");
-				let ident_str = ident.to_string();
-				match ident_str.as_str() {
-					"address" | "uint8" | "uint16" | "uint32" | "uint64" | "uint128"
-					| "uint256" | "bytes4" | "topic" | "string" | "bytes" | "void" | "caller"
-					| "bool" | "" => {
-						custom_signature.extend(quote!(#ident_str));
-					}
-					_ => {
-						custom_signature.extend(quote! {
-							#ident::SIGNATURE_STRING
-						});
-					}
-				}
+				custom_signature.extend(quote! {
+					(<#ident>::SIGNATURE, <#ident>::SIGNATURE_LEN)
+				});
 			});
 
-		template.push(')');
-		let mut template = quote!(#template);
-		template.extend(quote!(,));
-		template.extend(custom_signature);
-		let custom_signature_group = Group::new(proc_macro2::Delimiter::Parenthesis, template);
-		let mut custom_signature = quote! {
-			::evm_coder::const_format::formatcp!
-		};
-		custom_signature.extend(custom_signature_group.to_token_stream());
+		let func_name = self.camel_name.clone();
+		let func_name = quote!(FunctionName::new(#func_name));
+		custom_signature =
+			quote!({ ::evm_coder::make_signature!(new fn(& #func_name),#custom_signature) });
+
+		// println!("!!!!! {}", custom_signature);
 
-		println!("!!!!! {}", custom_signature);
 		custom_signature
 	}
 
@@ -915,16 +888,23 @@
 			.map(MethodArg::expand_solidity_argument);
 		let docs = &self.docs;
 		let selector_str = &self.selector_str;
-		let selector = &self.expand_selector();
+		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
+			}
+		);
+		// println!("!!!!! {}", custom_signature);
 		let is_payable = self.has_value_args;
-		quote! {
+		let out = quote! {
 			SolidityFunction {
 				docs: &[#(#docs),*],
 				selector_str: #selector_str,
 				hide: #hide,
-				selector: u32::from_be_bytes(#selector),
+				selector: u32::from_be_bytes(Self::#screaming_name),
 				custom_signature: #custom_signature,
 				name: #camel_name,
 				mutability: #mutability,
@@ -936,7 +916,9 @@
 				),
 				result: <UnnamedArgument<#result>>::default(),
 			}
-		}
+		};
+		// println!("@@@ {}", out);
+		out
 	}
 }
addedcrates/evm-coder/src/custom_signature.rsdiffbeforeafterboth
--- /dev/null
+++ b/crates/evm-coder/src/custom_signature.rs
@@ -0,0 +1,336 @@
+use core::str::from_utf8;
+
+pub const SIGNATURE_SIZE_LIMIT: usize = 256;
+
+pub trait Name {
+	const SIGNATURE: [u8; SIGNATURE_SIZE_LIMIT];
+	const SIGNATURE_LEN: usize;
+
+	fn name() -> &'static str {
+		from_utf8(&Self::SIGNATURE[..Self::SIGNATURE_LEN]).expect("bad utf-8")
+	}
+}
+
+#[derive(Debug)]
+pub struct FunctionSignature {
+	pub signature: [u8; SIGNATURE_SIZE_LIMIT],
+	pub signature_len: usize,
+}
+
+impl FunctionSignature {
+	pub const fn new(name: &'static FunctionName) -> FunctionSignature {
+		let mut signature = [0_u8; SIGNATURE_SIZE_LIMIT];
+		let name_len = name.signature_len;
+		let name = name.signature;
+		let mut dst_offset = 0;
+		let bracket_open = {
+			let mut b = [0_u8; SIGNATURE_SIZE_LIMIT];
+			b[0] = b"("[0];
+			b
+		};
+		crate::make_signature!(@copy(name, signature, name_len, dst_offset));
+		crate::make_signature!(@copy(bracket_open, signature, 1, dst_offset));
+		FunctionSignature {
+			signature,
+			signature_len: dst_offset,
+		}
+	}
+
+	pub const fn add_param(
+		signature: FunctionSignature,
+		param: ([u8; SIGNATURE_SIZE_LIMIT], usize),
+	) -> FunctionSignature {
+		let mut dst = signature.signature;
+		let mut dst_offset = signature.signature_len;
+		let (param_name, param_len) = param;
+		let comma = {
+			let mut b = [0_u8; SIGNATURE_SIZE_LIMIT];
+			b[0] = b","[0];
+			b
+		};
+		FunctionSignature {
+			signature: {
+				crate::make_signature!(@copy(param_name, dst, param_len, dst_offset));
+				crate::make_signature!(@copy(comma, dst, 1, dst_offset));
+				dst
+			},
+			signature_len: dst_offset,
+		}
+	}
+
+	pub const fn done(signature: FunctionSignature, owerride: bool) -> FunctionSignature {
+		let mut dst = signature.signature;
+		let mut dst_offset = signature.signature_len - if owerride { 1 } else { 0 };
+		let bracket_close = {
+			let mut b = [0_u8; SIGNATURE_SIZE_LIMIT];
+			b[0] = b")"[0];
+			b
+		};
+		FunctionSignature {
+			signature: {
+				crate::make_signature!(@copy(bracket_close, dst, 1, dst_offset));
+				dst
+			},
+			signature_len: dst_offset,
+		}
+	}
+
+	// fn as_str(&self) -> &'static str {
+	// 	from_utf8(&self.signature[..self.signature_len]).expect("bad utf-8")
+	// }
+}
+
+#[derive(Debug)]
+pub struct FunctionName {
+	signature: [u8; SIGNATURE_SIZE_LIMIT],
+	signature_len: usize,
+}
+
+impl FunctionName {
+	pub const fn new(name: &'static str) -> FunctionName {
+		let mut signature = [0_u8; SIGNATURE_SIZE_LIMIT];
+		let name = name.as_bytes();
+		let name_len = name.len();
+		let mut dst_offset = 0;
+		crate::make_signature!(@copy(name, signature, name_len, dst_offset));
+		FunctionName {
+			signature,
+			signature_len: name_len,
+		}
+	}
+}
+
+#[macro_export]
+#[allow(missing_docs)]
+macro_rules! make_signature { // May be "define_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
+		}
+	};
+
+	(@param; $func:expr) => {
+		FunctionSignature::done($func, true)
+	};
+	(@param; $func:expr, $param:expr) => {
+		make_signature!(@param; FunctionSignature::add_param($func, $param))
+	};
+	(@param; $func:expr, $param:expr, $($tt:tt),*) => {
+		make_signature!(@param; FunctionSignature::add_param($func, $param), $($tt),*)
+	};
+
+    (new $($tt:tt)*) => {
+        const SIGNATURE: [u8; SIGNATURE_SIZE_LIMIT] = {
+            let mut out = [0u8; SIGNATURE_SIZE_LIMIT];
+            let mut dst_offset = 0;
+            make_signature!(@data(out, dst_offset); $($tt)*);
+            out
+        };
+        const SIGNATURE_LEN: usize = 0 + make_signature!(@size; $($tt)*);
+    };
+
+	// (@bytes)
+
+    (@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)*)
+    };
+
+    (@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)*) => {
+        {
+			let data = &<$expr>::SIGNATURE;
+			let data_len = <$expr>::SIGNATURE_LEN;
+            make_signature!(@copy(data, $dst, data_len, $dst_offset));
+        }
+        make_signature!(@data($dst, $dst_offset); $($tt)*)
+    };
+
+	(@copy($src:ident, $dst:ident, $src_len:expr, $dst_offset:ident)) => {
+		{
+			let mut src_offset = 0;
+			let src_len: usize = $src_len;
+			while src_offset < src_len {
+				$dst[$dst_offset] = $src[src_offset];
+				$dst_offset += 1;
+				src_offset += 1;
+			}
+		}
+	}
+}
+
+#[cfg(test)]
+mod test {
+	use core::str::from_utf8;
+
+	use frame_support::sp_runtime::app_crypto::sp_core::hexdisplay::AsBytesRef;
+
+	use super::{Name, SIGNATURE_SIZE_LIMIT, FunctionName, FunctionSignature};
+
+	impl Name for u8 {
+		make_signature!(new fixed("uint8"));
+	}
+	impl Name for u32 {
+		make_signature!(new fixed("uint32"));
+	}
+	impl<T: Name> Name for Vec<T> {
+		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(")"));
+	}
+
+	struct MaxSize();
+	impl Name for MaxSize {
+		const SIGNATURE: [u8; SIGNATURE_SIZE_LIMIT] = [b'!'; SIGNATURE_SIZE_LIMIT];
+		const SIGNATURE_LEN: usize = SIGNATURE_SIZE_LIMIT;
+	}
+
+	#[test]
+	fn simple() {
+		assert_eq!(u8::name(), "uint8");
+		assert_eq!(u32::name(), "uint32");
+	}
+
+	#[test]
+	fn vector_of_simple() {
+		assert_eq!(<Vec<u8>>::name(), "uint8[]");
+		assert_eq!(<Vec<u32>>::name(), "uint32[]");
+	}
+
+	#[test]
+	fn vector_of_vector() {
+		assert_eq!(<Vec<Vec<u8>>>::name(), "uint8[][]");
+	}
+
+	#[test]
+	fn tuple_of_simple() {
+		assert_eq!(<(u32, u8)>::name(), "(uint32,uint8)");
+	}
+
+	#[test]
+	fn tuple_of_tuple() {
+		assert_eq!(
+			<((u32, u8), (u8, u32))>::name(),
+			"((uint32,uint8),(uint8,uint32))"
+		);
+	}
+
+	#[test]
+	fn vector_of_tuple() {
+		assert_eq!(<Vec<(u32, u8)>>::name(), "(uint32,uint8)[]");
+	}
+
+	#[test]
+	fn tuple_of_vector() {
+		assert_eq!(<(Vec<u32>, u8)>::name(), "(uint32[],uint8)");
+	}
+
+	#[test]
+	fn complex() {
+		assert_eq!(
+			<(Vec<u32>, (u32, Vec<u8>))>::name(),
+			"(uint32[],(uint32,uint8[]))"
+		);
+	}
+
+	#[test]
+	fn max_size() {
+		assert_eq!(<MaxSize>::name(), "!".repeat(SIGNATURE_SIZE_LIMIT));
+	}
+
+	// This test must NOT compile!
+	// #[test]
+	// fn over_max_size() {
+	// 	assert_eq!(<Vec<MaxSize>>::name(), "!".repeat(SIZE_LIMIT) + "[]");
+	// }
+
+	#[test]
+	fn make_func_without_args() {
+		const SOME_FUNK_NAME: FunctionName = FunctionName::new("some_funk");
+		const SIG: FunctionSignature = make_signature!(
+			new fn(&SOME_FUNK_NAME),
+		);
+		let name = from_utf8(&SIG.signature[..SIG.signature_len]).unwrap();
+		assert_eq!(name, "some_funk()");
+	}
+
+	#[test]
+	fn make_func_with_1_args() {
+		const SOME_FUNK_NAME: FunctionName = FunctionName::new("some_funk");
+		const SIG: FunctionSignature = make_signature!(
+			new fn(&SOME_FUNK_NAME),
+			(u8::SIGNATURE, u8::SIGNATURE_LEN)
+		);
+		let name = from_utf8(&SIG.signature[..SIG.signature_len]).unwrap();
+		assert_eq!(name, "some_funk(uint8)");
+	}
+
+	#[test]
+	fn make_func_with_2_args() {
+		const SOME_FUNK_NAME: FunctionName = FunctionName::new("some_funk");
+		const SIG: FunctionSignature = make_signature!(
+			new fn(&SOME_FUNK_NAME),
+			(u8::SIGNATURE, u8::SIGNATURE_LEN)
+			(<Vec<u32>>::SIGNATURE, <Vec<u32>>::SIGNATURE_LEN)
+		);
+		let name = from_utf8(&SIG.signature[..SIG.signature_len]).unwrap();
+		assert_eq!(name, "some_funk(uint8,uint32[])");
+	}
+
+	#[test]
+	fn make_func_with_3_args() {
+		const SOME_FUNK_NAME: FunctionName = FunctionName::new("some_funk");
+		const SIG: FunctionSignature = make_signature!(
+			new fn(&SOME_FUNK_NAME),
+			(u8::SIGNATURE, u8::SIGNATURE_LEN)
+			(u32::SIGNATURE, u32::SIGNATURE_LEN)
+			(<Vec<u32>>::SIGNATURE, <Vec<u32>>::SIGNATURE_LEN)
+		);
+		let name = from_utf8(&SIG.signature[..SIG.signature_len]).unwrap();
+		assert_eq!(name, "some_funk(uint8,uint32,uint32[])");
+	}
+
+	#[test]
+	fn make_slice_from_signature() {
+		const SOME_FUNK_NAME: FunctionName = FunctionName::new("some_funk");
+		const SIG: FunctionSignature = make_signature!(
+			new fn(&SOME_FUNK_NAME),
+			(u8::SIGNATURE, u8::SIGNATURE_LEN)
+			(u32::SIGNATURE, u32::SIGNATURE_LEN)
+			(<Vec<u32>>::SIGNATURE, <Vec<u32>>::SIGNATURE_LEN)
+		);
+		const NAME: [u8; SIG.signature_len] = {
+			let mut name: [u8; SIG.signature_len] = [0; SIG.signature_len];
+			let mut i = 0;
+			while i < SIG.signature_len {
+				name[i] = SIG.signature[i];
+				i += 1;
+			}
+			name
+		};
+		assert_eq!(&NAME, b"some_funk(uint8,uint32,uint32[])");
+	}
+}
modifiedcrates/evm-coder/src/lib.rsdiffbeforeafterboth
--- a/crates/evm-coder/src/lib.rs
+++ b/crates/evm-coder/src/lib.rs
@@ -15,7 +15,9 @@
 // along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
 
 #![doc = include_str!("../README.md")]
-#![deny(missing_docs)]
+// #![deny(missing_docs)]
+#![warn(missing_docs)]
+#![macro_use]
 #![cfg_attr(not(feature = "std"), no_std)]
 #[cfg(not(feature = "std"))]
 extern crate alloc;
@@ -26,6 +28,8 @@
 pub use events::{ToLog, ToTopic};
 use execution::DispatchInfo;
 pub mod execution;
+#[macro_use]
+pub mod custom_signature;
 
 /// Derives call enum implementing [`crate::Callable`], [`crate::Weighted`]
 /// and [`crate::Call`] from impl block.
@@ -118,27 +122,54 @@
 	use alloc::{vec::Vec};
 	use pallet_evm::account::CrossAccountId;
 	use primitive_types::{U256, H160, H256};
+	use core::str::from_utf8;
 
-	pub type address = H160;
+	use crate::custom_signature::SIGNATURE_SIZE_LIMIT;
 
-	pub type uint8 = u8;
-	pub type uint16 = u16;
-	pub type uint32 = u32;
-	pub type uint64 = u64;
-	pub type uint128 = u128;
-	pub type uint256 = U256;
+	pub trait Signature {
+		const SIGNATURE: [u8; SIGNATURE_SIZE_LIMIT];
+		const SIGNATURE_LEN: usize;
 
-	pub type bytes4 = [u8; 4];
+		fn as_str() -> &'static str {
+			from_utf8(&Self::SIGNATURE[..Self::SIGNATURE_LEN]).expect("bad utf-8")
+		}
+	}
 
-	pub type topic = H256;
+	impl Signature for bool {
+		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)));
+			}
+		};
+	}
+
+	define_simple_type!(type address = H160);
+
+	define_simple_type!(type uint8 = u8);
+	define_simple_type!(type uint16 = u16);
+	define_simple_type!(type uint32 = u32);
+	define_simple_type!(type uint64 = u64);
+	define_simple_type!(type uint128 = u128);
+	define_simple_type!(type uint256 = U256);
+	define_simple_type!(type bytes4 = [u8; 4]);
+
+	define_simple_type!(type topic = H256);
+
 	#[cfg(not(feature = "std"))]
-	pub type string = ::alloc::string::String;
+	define_simple_type!(type string = ::alloc::string::String);
 	#[cfg(feature = "std")]
-	pub type string = ::std::string::String;
+	define_simple_type!(type string = ::std::string::String);
 
 	#[derive(Default, Debug)]
 	pub struct bytes(pub Vec<u8>);
+	impl Signature for bytes {
+		make_signature!(new fixed("bytes"));
+	}
 
 	/// Solidity doesn't have `void` type, however we have special implementation
 	/// for empty tuple return type
@@ -230,12 +261,8 @@
 		}
 	}
 
-	impl SignatureString for EthCrossAccount {
-		const SIGNATURE_STRING: &'static str = "(address,uint256)";
-	}
-
-	pub trait SignatureString {
-		const SIGNATURE_STRING: &'static str;
+	impl Signature for EthCrossAccount {
+		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
@@ -30,9 +30,10 @@
 	marker::PhantomData,
 	cell::{Cell, RefCell},
 	cmp::Reverse,
+	str::from_utf8,
 };
 use impl_trait_for_tuples::impl_for_tuples;
-use crate::types::*;
+use crate::{types::*, custom_signature::FunctionSignature};
 
 #[derive(Default)]
 pub struct TypeCollector {
@@ -487,7 +488,7 @@
 	pub selector_str: &'static str,
 	pub selector: u32,
 	pub hide: bool,
-	pub custom_signature: &'static str,
+	pub custom_signature: FunctionSignature,
 	pub name: &'static str,
 	pub args: A,
 	pub result: R,
@@ -513,7 +514,8 @@
 		writeln!(
 			writer,
 			"\t{hide_comment}///  or in textual repr: {}",
-			self.custom_signature
+			// from_utf8(self.custom_signature.as_str()).expect("bad utf8")
+			self.selector_str
 		)?;
 		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,6 +21,8 @@
 	types::*,
 	execution::{Result, Error},
 	weight,
+	custom_signature::{FunctionName, FunctionSignature},
+	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
@@ -20,7 +20,13 @@
 use alloc::{format, string::ToString};
 use core::marker::PhantomData;
 use evm_coder::{
-	abi::AbiWriter, execution::Result, generate_stubgen, solidity_interface, types::*, ToLog,
+	abi::AbiWriter,
+	execution::Result,
+	generate_stubgen, solidity_interface,
+	types::*,
+	ToLog,
+	custom_signature::{FunctionName, FunctionSignature},
+	make_signature,
 };
 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
@@ -20,7 +20,15 @@
 use alloc::{format, string::ToString};
 use core::char::{REPLACEMENT_CHARACTER, decode_utf16};
 use core::convert::TryInto;
-use evm_coder::{ToLog, execution::*, generate_stubgen, solidity_interface, types::*, weight};
+use evm_coder::{
+	ToLog,
+	execution::*,
+	generate_stubgen, solidity_interface,
+	types::*,
+	weight,
+	custom_signature::{FunctionName, FunctionSignature},
+	make_signature,
+};
 use pallet_common::eth::convert_tuple_to_cross_account;
 use up_data_structs::CollectionMode;
 use pallet_common::erc::{CommonEvmHandler, PrecompileResult};
modifiedpallets/nonfungible/src/erc.rsdiffbeforeafterboth
--- a/pallets/nonfungible/src/erc.rs
+++ b/pallets/nonfungible/src/erc.rs
@@ -25,7 +25,15 @@
 	char::{REPLACEMENT_CHARACTER, decode_utf16},
 	convert::TryInto,
 };
-use evm_coder::{ToLog, execution::*, generate_stubgen, solidity, solidity_interface, types::*, weight};
+use evm_coder::{
+	ToLog,
+	execution::*,
+	generate_stubgen, solidity, solidity_interface,
+	types::*,
+	weight,
+	custom_signature::{FunctionName, FunctionSignature},
+	make_signature,
+};
 use frame_support::BoundedVec;
 use up_data_structs::{
 	TokenId, PropertyPermission, PropertyKeyPermission, Property, CollectionId, PropertyKey,
modifiedpallets/nonfungible/src/stubs/UniqueNFT.soldiffbeforeafterboth
--- a/pallets/nonfungible/src/stubs/UniqueNFT.sol
+++ b/pallets/nonfungible/src/stubs/UniqueNFT.sol
@@ -104,7 +104,11 @@
 }
 
 /// @title A contract that allows you to work with collections.
+<<<<<<< HEAD
 /// @dev the ERC-165 identifier for this interface is 0xb3152af3
+=======
+/// @dev the ERC-165 identifier for this interface is 0x674be726
+>>>>>>> feat: Add custum signature with unlimited nesting.
 contract Collection is Dummy, ERC165 {
 	/// Set collection property.
 	///
@@ -198,7 +202,7 @@
 	/// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.
 	///
 	/// @param sponsor Cross account address of the sponsor from whose account funds will be debited for operations with the contract.
-	/// @dev EVM selector for this function is: 0x84a1d5a8,
+	/// @dev EVM selector for this function is: 0x403e96a7,
 	///  or in textual repr: setCollectionSponsorCross((address,uint256))
 	function setCollectionSponsorCross(Tuple6 memory sponsor) public {
 		require(false, stub_error);
@@ -239,6 +243,7 @@
 	/// @dev EVM selector for this function is: 0x6ec0a9f1,
 	///  or in textual repr: collectionSponsor()
 <<<<<<< HEAD
+<<<<<<< HEAD
 	function collectionSponsor() public view returns (Tuple6 memory) {
 		require(false, stub_error);
 		dummy;
@@ -249,6 +254,12 @@
 		dummy;
 		return Tuple19(0x0000000000000000000000000000000000000000, 0);
 >>>>>>> feat: add `EthCrossAccount` type
+=======
+	function collectionSponsor() public view returns (Tuple8 memory) {
+		require(false, stub_error);
+		dummy;
+		return Tuple8(0x0000000000000000000000000000000000000000, 0);
+>>>>>>> feat: Add custum signature with unlimited nesting.
 	}
 
 	/// Set limits for the collection.
@@ -297,7 +308,7 @@
 
 	/// Add collection admin.
 	/// @param newAdmin Cross account administrator address.
-	/// @dev EVM selector for this function is: 0x859aa7d6,
+	/// @dev EVM selector for this function is: 0x62e3c7c2,
 	///  or in textual repr: addCollectionAdminCross((address,uint256))
 	function addCollectionAdminCross(Tuple6 memory newAdmin) public {
 		require(false, stub_error);
@@ -307,7 +318,7 @@
 
 	/// Remove collection admin.
 	/// @param admin Cross account administrator address.
-	/// @dev EVM selector for this function is: 0x6c0cd173,
+	/// @dev EVM selector for this function is: 0x810d1503,
 	///  or in textual repr: removeCollectionAdminCross((address,uint256))
 	function removeCollectionAdminCross(Tuple6 memory admin) public {
 		require(false, stub_error);
@@ -351,7 +362,7 @@
 	///
 	/// @param enable If "true" degenerates to nesting: {OwnerRestricted: [1, 2, 3]} else to nesting: 'Disabled'
 	/// @param collections Addresses of collections that will be available for nesting.
-	/// @dev EVM selector for this function is: 0x64872396,
+	/// @dev EVM selector for this function is: 0x112d4586,
 	///  or in textual repr: setCollectionNesting(bool,address[])
 	function setCollectionNesting(bool enable, address[] memory collections) public {
 		require(false, stub_error);
@@ -398,7 +409,7 @@
 	/// Add user to allowed list.
 	///
 	/// @param user User cross account address.
-	/// @dev EVM selector for this function is: 0xa0184a3a,
+	/// @dev EVM selector for this function is: 0xf074da88,
 	///  or in textual repr: addToCollectionAllowListCross((address,uint256))
 	function addToCollectionAllowListCross(Tuple6 memory user) public {
 		require(false, stub_error);
@@ -420,7 +431,7 @@
 	/// Remove user from allowed list.
 	///
 	/// @param user User cross account address.
-	/// @dev EVM selector for this function is: 0x09ba452a,
+	/// @dev EVM selector for this function is: 0xc00df45c,
 	///  or in textual repr: removeFromCollectionAllowListCross((address,uint256))
 	function removeFromCollectionAllowListCross(Tuple6 memory user) public {
 		require(false, stub_error);
@@ -456,7 +467,7 @@
 	///
 	/// @param user User cross account to verify
 	/// @return "true" if account is the owner or admin
-	/// @dev EVM selector for this function is: 0x3e75a905,
+	/// @dev EVM selector for this function is: 0x5aba3351,
 	///  or in textual repr: isOwnerOrAdminCross((address,uint256))
 	function isOwnerOrAdminCross(Tuple6 memory user) public view returns (bool) {
 		require(false, stub_error);
@@ -483,6 +494,7 @@
 	/// @dev EVM selector for this function is: 0xdf727d3b,
 	///  or in textual repr: collectionOwner()
 <<<<<<< HEAD
+<<<<<<< HEAD
 	function collectionOwner() public view returns (Tuple6 memory) {
 		require(false, stub_error);
 		dummy;
@@ -493,6 +505,12 @@
 		dummy;
 		return Tuple19(0x0000000000000000000000000000000000000000, 0);
 >>>>>>> feat: add `EthCrossAccount` type
+=======
+	function collectionOwner() public view returns (Tuple8 memory) {
+		require(false, stub_error);
+		dummy;
+		return Tuple8(0x0000000000000000000000000000000000000000, 0);
+>>>>>>> feat: Add custum signature with unlimited nesting.
 	}
 
 	/// Changes collection owner to another account
@@ -523,7 +541,7 @@
 	///
 	/// @dev Owner can be changed only by current owner
 	/// @param newOwner new owner cross account
-	/// @dev EVM selector for this function is: 0xe5c9913f,
+	/// @dev EVM selector for this function is: 0xbdff793d,
 	///  or in textual repr: setOwnerCross((address,uint256))
 	function setOwnerCross(Tuple6 memory newOwner) public {
 		require(false, stub_error);
@@ -532,6 +550,7 @@
 	}
 }
 
+<<<<<<< HEAD
 /// @dev anonymous struct
 struct Tuple19 {
 	address field_0;
@@ -581,6 +600,8 @@
 	}
 }
 
+=======
+>>>>>>> feat: Add custum signature with unlimited nesting.
 /// @title ERC721 Token that can be irreversibly burned (destroyed).
 /// @dev the ERC-165 identifier for this interface is 0x42966c68
 contract ERC721Burnable is Dummy, ERC165 {
@@ -682,7 +703,11 @@
 }
 
 /// @title Unique extensions for ERC721.
+<<<<<<< HEAD
 /// @dev the ERC-165 identifier for this interface is 0x244543ee
+=======
+/// @dev the ERC-165 identifier for this interface is 0xcc97cb35
+>>>>>>> feat: Add custum signature with unlimited nesting.
 contract ERC721UniqueExtensions is Dummy, ERC165 {
 	/// @notice A descriptive name for a collection of NFTs in this contract
 	/// @dev EVM selector for this function is: 0x06fdde03,
@@ -708,7 +733,7 @@
 	///  operator of the current owner.
 	/// @param approved The new substrate address approved NFT controller
 	/// @param tokenId The NFT to approve
-	/// @dev EVM selector for this function is: 0x0ecd0ab0,
+	/// @dev EVM selector for this function is: 0x106fdb59,
 	///  or in textual repr: approveCross((address,uint256),uint256)
 	function approveCross(Tuple6 memory approved, uint256 tokenId) public {
 		require(false, stub_error);
@@ -738,10 +763,15 @@
 	/// @param to Cross acccount address of new owner
 	/// @param tokenId The NFT to transfer
 	/// @dev EVM selector for this function is: 0xd5cf430b,
-	///  or in textual repr: transferFromCross((address,uint256),(address,uint256),uint256)
+	///  or in textual repr: transferFromCross(EthCrossAccount,EthCrossAccount,uint256)
 	function transferFromCross(
+<<<<<<< HEAD
 		Tuple6 memory from,
 		Tuple6 memory to,
+=======
+		EthCrossAccount memory from,
+		EthCrossAccount memory to,
+>>>>>>> feat: Add custum signature with unlimited nesting.
 		uint256 tokenId
 	) public {
 		require(false, stub_error);
@@ -772,7 +802,7 @@
 	///  if `to` is the zero address. Throws if `tokenId` is not a valid NFT.
 	/// @param from The current owner of the NFT
 	/// @param tokenId The NFT to transfer
-	/// @dev EVM selector for this function is: 0xbb2f5a58,
+	/// @dev EVM selector for this function is: 0xa8106d4a,
 	///  or in textual repr: burnFromCross((address,uint256),uint256)
 	function burnFromCross(Tuple6 memory from, uint256 tokenId) public {
 		require(false, stub_error);
@@ -819,10 +849,46 @@
 	// 	return false;
 	// }
 
+<<<<<<< HEAD
 }
 
 /// @dev anonymous struct
 struct Tuple8 {
+=======
+	/// @notice Function to mint multiple tokens.
+	/// @dev `tokenIds` should be an array of consecutive numbers and first number
+	///  should be obtained with `nextTokenId` method
+	/// @param to The new owner
+	/// @param tokenIds IDs of the minted NFTs
+	/// @dev EVM selector for this function is: 0xf9d9a5a3,
+	///  or in textual repr: mintBulk(address,uint256[])
+	function mintBulk(address to, uint256[] memory tokenIds) public returns (bool) {
+		require(false, stub_error);
+		to;
+		tokenIds;
+		dummy = 0;
+		return false;
+	}
+
+	/// @notice Function to mint multiple tokens with the given tokenUris.
+	/// @dev `tokenIds` is array of pairs of token ID and token URI. Token IDs should be consecutive
+	///  numbers and first number should be obtained with `nextTokenId` method
+	/// @param to The new owner
+	/// @param tokens array of pairs of token ID and token URI for minted tokens
+	/// @dev EVM selector for this function is: 0xfd4e2a99,
+	///  or in textual repr: mintBulkWithTokenURI(address,(uint256,string)[])
+	function mintBulkWithTokenURI(address to, Tuple12[] memory tokens) public returns (bool) {
+		require(false, stub_error);
+		to;
+		tokens;
+		dummy = 0;
+		return false;
+	}
+}
+
+/// @dev anonymous struct
+struct Tuple12 {
+>>>>>>> feat: Add custum signature with unlimited nesting.
 	uint256 field_0;
 	string field_1;
 }
@@ -840,6 +906,12 @@
 >>>>>>> feat: add `EthCrossAccount` type
 }
 
+/// @dev anonymous struct
+struct Tuple8 {
+	address field_0;
+	uint256 field_1;
+}
+
 /// @title ERC-721 Non-Fungible Token Standard, optional enumeration extension
 /// @dev See https://eips.ethereum.org/EIPS/eip-721
 /// @dev the ERC-165 identifier for this interface is 0x780e9d63
modifiedpallets/refungible/src/erc.rsdiffbeforeafterboth
--- a/pallets/refungible/src/erc.rs
+++ b/pallets/refungible/src/erc.rs
@@ -26,7 +26,15 @@
 	char::{REPLACEMENT_CHARACTER, decode_utf16},
 	convert::TryInto,
 };
-use evm_coder::{ToLog, execution::*, generate_stubgen, solidity, solidity_interface, types::*, weight};
+use evm_coder::{
+	ToLog,
+	execution::*,
+	generate_stubgen, solidity, solidity_interface,
+	types::*,
+	weight,
+	custom_signature::{FunctionName, FunctionSignature},
+	make_signature,
+};
 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,7 +29,15 @@
 	convert::TryInto,
 	ops::Deref,
 };
-use evm_coder::{ToLog, execution::*, generate_stubgen, solidity_interface, types::*, weight};
+use evm_coder::{
+	ToLog,
+	execution::*,
+	generate_stubgen, solidity_interface,
+	types::*,
+	weight,
+	custom_signature::{FunctionName, FunctionSignature},
+	make_signature,
+};
 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,7 +18,13 @@
 
 use core::marker::PhantomData;
 use ethereum as _;
-use evm_coder::{execution::*, generate_stubgen, solidity, solidity_interface, types::*, weight};
+use evm_coder::{
+	execution::*,
+	generate_stubgen, solidity, solidity_interface,
+	types::*,
+	custom_signature::{FunctionName, FunctionSignature},
+	make_signature,
+, weight};
 use frame_support::{traits::Get, storage::StorageNMap};
 use crate::sp_api_hidden_includes_decl_storage::hidden_include::StorageDoubleMap;
 use crate::Pallet;
modifiedtests/src/eth/api/UniqueNFT.soldiffbeforeafterboth
before · tests/src/eth/api/UniqueNFT.sol
1// SPDX-License-Identifier: OTHER2// This code is automatically generated34pragma solidity >=0.8.0 <0.9.0;56/// @dev common stubs holder7interface Dummy {89}1011interface ERC165 is Dummy {12	function supportsInterface(bytes4 interfaceID) external view returns (bool);13}1415/// @title A contract that allows to set and delete token properties and change token property permissions.16/// @dev the ERC-165 identifier for this interface is 0x55dba91917interface TokenProperties is Dummy, ERC165 {18	/// @notice Set permissions for token property.19	/// @dev Throws error if `msg.sender` is not admin or owner of the collection.20	/// @param key Property key.21	/// @param isMutable Permission to mutate property.22	/// @param collectionAdmin Permission to mutate property by collection admin if property is mutable.23	/// @param tokenOwner Permission to mutate property by token owner if property is mutable.24	/// @dev EVM selector for this function is: 0x222d97fa,25	///  or in textual repr: setTokenPropertyPermission(string,bool,bool,bool)26	function setTokenPropertyPermission(27		string memory key,28		bool isMutable,29		bool collectionAdmin,30		bool tokenOwner31	) external;3233	/// @notice Set token property value.34	/// @dev Throws error if `msg.sender` has no permission to edit the property.35	/// @param tokenId ID of the token.36	/// @param key Property key.37	/// @param value Property value.38	/// @dev EVM selector for this function is: 0x1752d67b,39	///  or in textual repr: setProperty(uint256,string,bytes)40	function setProperty(41		uint256 tokenId,42		string memory key,43		bytes memory value44	) external;4546	/// @notice Set token properties value.47	/// @dev Throws error if `msg.sender` has no permission to edit the property.48	/// @param tokenId ID of the token.49	/// @param properties settable properties50	/// @dev EVM selector for this function is: 0x14ed3a6e,51	///  or in textual repr: setProperties(uint256,(string,bytes)[])52	function setProperties(uint256 tokenId, Tuple19[] memory properties) external;5354	/// @notice Delete token property value.55	/// @dev Throws error if `msg.sender` has no permission to edit the property.56	/// @param tokenId ID of the token.57	/// @param key Property key.58	/// @dev EVM selector for this function is: 0x066111d1,59	///  or in textual repr: deleteProperty(uint256,string)60	function deleteProperty(uint256 tokenId, string memory key) external;6162	/// @notice Get token property value.63	/// @dev Throws error if key not found64	/// @param tokenId ID of the token.65	/// @param key Property key.66	/// @return Property value bytes67	/// @dev EVM selector for this function is: 0x7228c327,68	///  or in textual repr: property(uint256,string)69	function property(uint256 tokenId, string memory key) external view returns (bytes memory);70}7172/// @title A contract that allows you to work with collections.73/// @dev the ERC-165 identifier for this interface is 0xb3152af374interface Collection is Dummy, ERC165 {75	/// Set collection property.76	///77	/// @param key Property key.78	/// @param value Propery value.79	/// @dev EVM selector for this function is: 0x2f073f66,80	///  or in textual repr: setCollectionProperty(string,bytes)81	function setCollectionProperty(string memory key, bytes memory value) external;8283	/// Set collection properties.84	///85	/// @param properties Vector of properties key/value pair.86	/// @dev EVM selector for this function is: 0x50b26b2a,87	///  or in textual repr: setCollectionProperties((string,bytes)[])88	function setCollectionProperties(Tuple19[] memory properties) external;8990	/// Delete collection property.91	///92	/// @param key Property key.93	/// @dev EVM selector for this function is: 0x7b7debce,94	///  or in textual repr: deleteCollectionProperty(string)95	function deleteCollectionProperty(string memory key) external;9697	/// Delete collection properties.98	///99	/// @param keys Properties keys.100	/// @dev EVM selector for this function is: 0xee206ee3,101	///  or in textual repr: deleteCollectionProperties(string[])102	function deleteCollectionProperties(string[] memory keys) external;103104	/// Get collection property.105	///106	/// @dev Throws error if key not found.107	///108	/// @param key Property key.109	/// @return bytes The property corresponding to the key.110	/// @dev EVM selector for this function is: 0xcf24fd6d,111	///  or in textual repr: collectionProperty(string)112	function collectionProperty(string memory key) external view returns (bytes memory);113114	/// Get collection properties.115	///116	/// @param keys Properties keys. Empty keys for all propertyes.117	/// @return Vector of properties key/value pairs.118	/// @dev EVM selector for this function is: 0x285fb8e6,119	///  or in textual repr: collectionProperties(string[])120	function collectionProperties(string[] memory keys) external view returns (Tuple19[] memory);121122	/// Set the sponsor of the collection.123	///124	/// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.125	///126	/// @param sponsor Address of the sponsor from whose account funds will be debited for operations with the contract.127	/// @dev EVM selector for this function is: 0x7623402e,128	///  or in textual repr: setCollectionSponsor(address)129	function setCollectionSponsor(address sponsor) external;130131	/// Set the sponsor of the collection.132	///133	/// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.134	///135	/// @param sponsor Cross account address of the sponsor from whose account funds will be debited for operations with the contract.136	/// @dev EVM selector for this function is: 0x84a1d5a8,137	///  or in textual repr: setCollectionSponsorCross((address,uint256))138	function setCollectionSponsorCross(Tuple6 memory sponsor) external;139140	/// Whether there is a pending sponsor.141	/// @dev EVM selector for this function is: 0x058ac185,142	///  or in textual repr: hasCollectionPendingSponsor()143	function hasCollectionPendingSponsor() external view returns (bool);144145	/// Collection sponsorship confirmation.146	///147	/// @dev After setting the sponsor for the collection, it must be confirmed with this function.148	/// @dev EVM selector for this function is: 0x3c50e97a,149	///  or in textual repr: confirmCollectionSponsorship()150	function confirmCollectionSponsorship() external;151152	/// Remove collection sponsor.153	/// @dev EVM selector for this function is: 0x6e0326a3,154	///  or in textual repr: removeCollectionSponsor()155	function removeCollectionSponsor() external;156157	/// Get current sponsor.158	///159	/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.160	/// @dev EVM selector for this function is: 0x6ec0a9f1,161	///  or in textual repr: collectionSponsor()162	function collectionSponsor() external view returns (Tuple8 memory);163164	/// Set limits for the collection.165	/// @dev Throws error if limit not found.166	/// @param limit Name of the limit. Valid names:167	/// 	"accountTokenOwnershipLimit",168	/// 	"sponsoredDataSize",169	/// 	"sponsoredDataRateLimit",170	/// 	"tokenLimit",171	/// 	"sponsorTransferTimeout",172	/// 	"sponsorApproveTimeout"173	/// @param value Value of the limit.174	/// @dev EVM selector for this function is: 0x6a3841db,175	///  or in textual repr: setCollectionLimit(string,uint32)176	function setCollectionLimit(string memory limit, uint32 value) external;177178	/// Set limits for the collection.179	/// @dev Throws error if limit not found.180	/// @param limit Name of the limit. Valid names:181	/// 	"ownerCanTransfer",182	/// 	"ownerCanDestroy",183	/// 	"transfersEnabled"184	/// @param value Value of the limit.185	/// @dev EVM selector for this function is: 0x993b7fba,186	///  or in textual repr: setCollectionLimit(string,bool)187	function setCollectionLimit(string memory limit, bool value) external;188189	/// Get contract address.190	/// @dev EVM selector for this function is: 0xf6b4dfb4,191	///  or in textual repr: contractAddress()192	function contractAddress() external view returns (address);193194	/// Add collection admin.195	/// @param newAdmin Cross account administrator address.196	/// @dev EVM selector for this function is: 0x859aa7d6,197	///  or in textual repr: addCollectionAdminCross((address,uint256))198	function addCollectionAdminCross(Tuple6 memory newAdmin) external;199200	/// Remove collection admin.201	/// @param admin Cross account administrator address.202	/// @dev EVM selector for this function is: 0x6c0cd173,203	///  or in textual repr: removeCollectionAdminCross((address,uint256))204	function removeCollectionAdminCross(Tuple6 memory admin) external;205206	/// Add collection admin.207	/// @param newAdmin Address of the added administrator.208	/// @dev EVM selector for this function is: 0x92e462c7,209	///  or in textual repr: addCollectionAdmin(address)210	function addCollectionAdmin(address newAdmin) external;211212	/// Remove collection admin.213	///214	/// @param admin Address of the removed administrator.215	/// @dev EVM selector for this function is: 0xfafd7b42,216	///  or in textual repr: removeCollectionAdmin(address)217	function removeCollectionAdmin(address admin) external;218219	/// Toggle accessibility of collection nesting.220	///221	/// @param enable If "true" degenerates to nesting: 'Owner' else to nesting: 'Disabled'222	/// @dev EVM selector for this function is: 0x112d4586,223	///  or in textual repr: setCollectionNesting(bool)224	function setCollectionNesting(bool enable) external;225226	/// Toggle accessibility of collection nesting.227	///228	/// @param enable If "true" degenerates to nesting: {OwnerRestricted: [1, 2, 3]} else to nesting: 'Disabled'229	/// @param collections Addresses of collections that will be available for nesting.230	/// @dev EVM selector for this function is: 0x64872396,231	///  or in textual repr: setCollectionNesting(bool,address[])232	function setCollectionNesting(bool enable, address[] memory collections) external;233234	/// Set the collection access method.235	/// @param mode Access mode236	/// 	0 for Normal237	/// 	1 for AllowList238	/// @dev EVM selector for this function is: 0x41835d4c,239	///  or in textual repr: setCollectionAccess(uint8)240	function setCollectionAccess(uint8 mode) external;241242	/// Checks that user allowed to operate with collection.243	///244	/// @param user User address to check.245	/// @dev EVM selector for this function is: 0xd63a8e11,246	///  or in textual repr: allowed(address)247	function allowed(address user) external view returns (bool);248249	/// Add the user to the allowed list.250	///251	/// @param user Address of a trusted user.252	/// @dev EVM selector for this function is: 0x67844fe6,253	///  or in textual repr: addToCollectionAllowList(address)254	function addToCollectionAllowList(address user) external;255256	/// Add user to allowed list.257	///258	/// @param user User cross account address.259	/// @dev EVM selector for this function is: 0xa0184a3a,260	///  or in textual repr: addToCollectionAllowListCross((address,uint256))261	function addToCollectionAllowListCross(Tuple6 memory user) external;262263	/// Remove the user from the allowed list.264	///265	/// @param user Address of a removed user.266	/// @dev EVM selector for this function is: 0x85c51acb,267	///  or in textual repr: removeFromCollectionAllowList(address)268	function removeFromCollectionAllowList(address user) external;269270	/// Remove user from allowed list.271	///272	/// @param user User cross account address.273	/// @dev EVM selector for this function is: 0x09ba452a,274	///  or in textual repr: removeFromCollectionAllowListCross((address,uint256))275	function removeFromCollectionAllowListCross(Tuple6 memory user) external;276277	/// Switch permission for minting.278	///279	/// @param mode Enable if "true".280	/// @dev EVM selector for this function is: 0x00018e84,281	///  or in textual repr: setCollectionMintMode(bool)282	function setCollectionMintMode(bool mode) external;283284	/// Check that account is the owner or admin of the collection285	///286	/// @param user account to verify287	/// @return "true" if account is the owner or admin288	/// @dev EVM selector for this function is: 0x9811b0c7,289	///  or in textual repr: isOwnerOrAdmin(address)290	function isOwnerOrAdmin(address user) external view returns (bool);291292	/// Check that account is the owner or admin of the collection293	///294	/// @param user User cross account to verify295	/// @return "true" if account is the owner or admin296	/// @dev EVM selector for this function is: 0x3e75a905,297	///  or in textual repr: isOwnerOrAdminCross((address,uint256))298	function isOwnerOrAdminCross(Tuple6 memory user) external view returns (bool);299300	/// Returns collection type301	///302	/// @return `Fungible` or `NFT` or `ReFungible`303	/// @dev EVM selector for this function is: 0xd34b55b8,304	///  or in textual repr: uniqueCollectionType()305	function uniqueCollectionType() external view returns (string memory);306307	/// Get collection owner.308	///309	/// @return Tuble with sponsor address and his substrate mirror.310	/// If address is canonical then substrate mirror is zero and vice versa.311	/// @dev EVM selector for this function is: 0xdf727d3b,312	///  or in textual repr: collectionOwner()313	function collectionOwner() external view returns (Tuple8 memory);314315	/// Changes collection owner to another account316	///317	/// @dev Owner can be changed only by current owner318	/// @param newOwner new owner account319	/// @dev EVM selector for this function is: 0x4f53e226,320	///  or in textual repr: changeCollectionOwner(address)321	function changeCollectionOwner(address newOwner) external;322323	/// Get collection administrators324	///325	/// @return Vector of tuples with admins address and his substrate mirror.326	/// If address is canonical then substrate mirror is zero and vice versa.327	/// @dev EVM selector for this function is: 0x5813216b,328	///  or in textual repr: collectionAdmins()329	function collectionAdmins() external view returns (Tuple6[] memory);330331	/// Changes collection owner to another account332	///333	/// @dev Owner can be changed only by current owner334	/// @param newOwner new owner cross account335	/// @dev EVM selector for this function is: 0xe5c9913f,336	///  or in textual repr: setOwnerCross((address,uint256))337	function setOwnerCross(Tuple6 memory newOwner) external;338}339340/// @dev anonymous struct341struct Tuple19 {342	address field_0;343	uint256 field_1;344}345346/// @title ERC-721 Non-Fungible Token Standard, optional metadata extension347/// @dev See https://eips.ethereum.org/EIPS/eip-721348/// @dev the ERC-165 identifier for this interface is 0x5b5e139f349interface ERC721Metadata is Dummy, ERC165 {350	// /// @notice A descriptive name for a collection of NFTs in this contract351	// /// @dev real implementation of this function lies in `ERC721UniqueExtensions`352	// /// @dev EVM selector for this function is: 0x06fdde03,353	// ///  or in textual repr: name()354	// function name() external view returns (string memory);355356	// /// @notice An abbreviated name for NFTs in this contract357	// /// @dev real implementation of this function lies in `ERC721UniqueExtensions`358	// /// @dev EVM selector for this function is: 0x95d89b41,359	// ///  or in textual repr: symbol()360	// function symbol() external view returns (string memory);361362	/// @notice A distinct Uniform Resource Identifier (URI) for a given asset.363	///364	/// @dev If the token has a `url` property and it is not empty, it is returned.365	///  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`.366	///  If the collection property `baseURI` is empty or absent, return "" (empty string)367	///  otherwise, if token property `suffix` present and is non-empty, return concatenation of baseURI and suffix368	///  otherwise, return concatenation of `baseURI` and stringified token id (decimal stringifying, without paddings).369	///370	/// @return token's const_metadata371	/// @dev EVM selector for this function is: 0xc87b56dd,372	///  or in textual repr: tokenURI(uint256)373	function tokenURI(uint256 tokenId) external view returns (string memory);374}375376/// @title ERC721 Token that can be irreversibly burned (destroyed).377/// @dev the ERC-165 identifier for this interface is 0x42966c68378interface ERC721Burnable is Dummy, ERC165 {379	/// @notice Burns a specific ERC721 token.380	/// @dev Throws unless `msg.sender` is the current NFT owner, or an authorized381	///  operator of the current owner.382	/// @param tokenId The NFT to approve383	/// @dev EVM selector for this function is: 0x42966c68,384	///  or in textual repr: burn(uint256)385	function burn(uint256 tokenId) external;386}387388/// @dev inlined interface389interface ERC721UniqueMintableEvents {390	event MintingFinished();391}392393/// @title ERC721 minting logic.394/// @dev the ERC-165 identifier for this interface is 0x476ff149395interface ERC721UniqueMintable is Dummy, ERC165, ERC721UniqueMintableEvents {396	/// @dev EVM selector for this function is: 0x05d2035b,397	///  or in textual repr: mintingFinished()398	function mintingFinished() external view returns (bool);399400	/// @notice Function to mint token.401	/// @param to The new owner402	/// @return uint256 The id of the newly minted token403	/// @dev EVM selector for this function is: 0x6a627842,404	///  or in textual repr: mint(address)405	function mint(address to) external returns (uint256);406407	// /// @notice Function to mint token.408	// /// @dev `tokenId` should be obtained with `nextTokenId` method,409	// ///  unlike standard, you can't specify it manually410	// /// @param to The new owner411	// /// @param tokenId ID of the minted NFT412	// /// @dev EVM selector for this function is: 0x40c10f19,413	// ///  or in textual repr: mint(address,uint256)414	// function mint(address to, uint256 tokenId) external returns (bool);415416	/// @notice Function to mint token with the given tokenUri.417	/// @param to The new owner418	/// @param tokenUri Token URI that would be stored in the NFT properties419	/// @return uint256 The id of the newly minted token420	/// @dev EVM selector for this function is: 0x45c17782,421	///  or in textual repr: mintWithTokenURI(address,string)422	function mintWithTokenURI(address to, string memory tokenUri) external returns (uint256);423424	// /// @notice Function to mint token with the given tokenUri.425	// /// @dev `tokenId` should be obtained with `nextTokenId` method,426	// ///  unlike standard, you can't specify it manually427	// /// @param to The new owner428	// /// @param tokenId ID of the minted NFT429	// /// @param tokenUri Token URI that would be stored in the NFT properties430	// /// @dev EVM selector for this function is: 0x50bb4e7f,431	// ///  or in textual repr: mintWithTokenURI(address,uint256,string)432	// function mintWithTokenURI(address to, uint256 tokenId, string memory tokenUri) external returns (bool);433434	/// @dev Not implemented435	/// @dev EVM selector for this function is: 0x7d64bcb4,436	///  or in textual repr: finishMinting()437	function finishMinting() external returns (bool);438}439440/// @title Unique extensions for ERC721.441/// @dev the ERC-165 identifier for this interface is 0x244543ee442interface ERC721UniqueExtensions is Dummy, ERC165 {443	/// @notice A descriptive name for a collection of NFTs in this contract444	/// @dev EVM selector for this function is: 0x06fdde03,445	///  or in textual repr: name()446	function name() external view returns (string memory);447448	/// @notice An abbreviated name for NFTs in this contract449	/// @dev EVM selector for this function is: 0x95d89b41,450	///  or in textual repr: symbol()451	function symbol() external view returns (string memory);452453	/// @notice Set or reaffirm the approved address for an NFT454	/// @dev The zero address indicates there is no approved address.455	/// @dev Throws unless `msg.sender` is the current NFT owner, or an authorized456	///  operator of the current owner.457	/// @param approved The new substrate address approved NFT controller458	/// @param tokenId The NFT to approve459	/// @dev EVM selector for this function is: 0x0ecd0ab0,460	///  or in textual repr: approveCross((address,uint256),uint256)461	function approveCross(Tuple6 memory approved, uint256 tokenId) external;462463	/// @notice Transfer ownership of an NFT464	/// @dev Throws unless `msg.sender` is the current owner. Throws if `to`465	///  is the zero address. Throws if `tokenId` is not a valid NFT.466	/// @param to The new owner467	/// @param tokenId The NFT to transfer468	/// @dev EVM selector for this function is: 0xa9059cbb,469	///  or in textual repr: transfer(address,uint256)470	function transfer(address to, uint256 tokenId) external;471472	/// @notice Transfer ownership of an NFT from cross account address to cross account address473	/// @dev Throws unless `msg.sender` is the current owner. Throws if `to`474	///  is the zero address. Throws if `tokenId` is not a valid NFT.475	/// @param from Cross acccount address of current owner476	/// @param to Cross acccount address of new owner477	/// @param tokenId The NFT to transfer478	/// @dev EVM selector for this function is: 0xd5cf430b,479	///  or in textual repr: transferFromCross((address,uint256),(address,uint256),uint256)480	function transferFromCross(481		Tuple6 memory from,482		Tuple6 memory to,483		uint256 tokenId484	) external;485486	/// @notice Burns a specific ERC721 token.487	/// @dev Throws unless `msg.sender` is the current owner or an authorized488	///  operator for this NFT. Throws if `from` is not the current owner. Throws489	///  if `to` is the zero address. Throws if `tokenId` is not a valid NFT.490	/// @param from The current owner of the NFT491	/// @param tokenId The NFT to transfer492	/// @dev EVM selector for this function is: 0x79cc6790,493	///  or in textual repr: burnFrom(address,uint256)494	function burnFrom(address from, uint256 tokenId) external;495496	/// @notice Burns a specific ERC721 token.497	/// @dev Throws unless `msg.sender` is the current owner or an authorized498	///  operator for this NFT. Throws if `from` is not the current owner. Throws499	///  if `to` is the zero address. Throws if `tokenId` is not a valid NFT.500	/// @param from The current owner of the NFT501	/// @param tokenId The NFT to transfer502	/// @dev EVM selector for this function is: 0xbb2f5a58,503	///  or in textual repr: burnFromCross((address,uint256),uint256)504	function burnFromCross(Tuple6 memory from, uint256 tokenId) external;505506	/// @notice Returns next free NFT ID.507	/// @dev EVM selector for this function is: 0x75794a3c,508	///  or in textual repr: nextTokenId()509	function nextTokenId() external view returns (uint256);510	// /// @notice Function to mint multiple tokens.511	// /// @dev `tokenIds` should be an array of consecutive numbers and first number512	// ///  should be obtained with `nextTokenId` method513	// /// @param to The new owner514	// /// @param tokenIds IDs of the minted NFTs515	// /// @dev EVM selector for this function is: 0x44a9945e,516	// ///  or in textual repr: mintBulk(address,uint256[])517	// function mintBulk(address to, uint256[] memory tokenIds) external returns (bool);518519	// /// @notice Function to mint multiple tokens with the given tokenUris.520	// /// @dev `tokenIds` is array of pairs of token ID and token URI. Token IDs should be consecutive521	// ///  numbers and first number should be obtained with `nextTokenId` method522	// /// @param to The new owner523	// /// @param tokens array of pairs of token ID and token URI for minted tokens524	// /// @dev EVM selector for this function is: 0x36543006,525	// ///  or in textual repr: mintBulkWithTokenURI(address,(uint256,string)[])526	// function mintBulkWithTokenURI(address to, Tuple8[] memory tokens) external returns (bool);527}528529/// @dev anonymous struct530struct Tuple8 {531	uint256 field_0;532	string field_1;533}534535/// @dev anonymous struct536struct Tuple8 {537	address field_0;538	uint256 field_1;539}540541/// @title ERC-721 Non-Fungible Token Standard, optional enumeration extension542/// @dev See https://eips.ethereum.org/EIPS/eip-721543/// @dev the ERC-165 identifier for this interface is 0x780e9d63544interface ERC721Enumerable is Dummy, ERC165 {545	/// @notice Enumerate valid NFTs546	/// @param index A counter less than `totalSupply()`547	/// @return The token identifier for the `index`th NFT,548	///  (sort order not specified)549	/// @dev EVM selector for this function is: 0x4f6ccce7,550	///  or in textual repr: tokenByIndex(uint256)551	function tokenByIndex(uint256 index) external view returns (uint256);552553	/// @dev Not implemented554	/// @dev EVM selector for this function is: 0x2f745c59,555	///  or in textual repr: tokenOfOwnerByIndex(address,uint256)556	function tokenOfOwnerByIndex(address owner, uint256 index) external view returns (uint256);557558	/// @notice Count NFTs tracked by this contract559	/// @return A count of valid NFTs tracked by this contract, where each one of560	///  them has an assigned and queryable owner not equal to the zero address561	/// @dev EVM selector for this function is: 0x18160ddd,562	///  or in textual repr: totalSupply()563	function totalSupply() external view returns (uint256);564}565566/// @dev inlined interface567interface ERC721Events {568	event Transfer(address indexed from, address indexed to, uint256 indexed tokenId);569	event Approval(address indexed owner, address indexed approved, uint256 indexed tokenId);570	event ApprovalForAll(address indexed owner, address indexed operator, bool approved);571}572573/// @title ERC-721 Non-Fungible Token Standard574/// @dev See https://github.com/ethereum/EIPs/blob/master/EIPS/eip-721.md575/// @dev the ERC-165 identifier for this interface is 0x80ac58cd576interface ERC721 is Dummy, ERC165, ERC721Events {577	/// @notice Count all NFTs assigned to an owner578	/// @dev NFTs assigned to the zero address are considered invalid, and this579	///  function throws for queries about the zero address.580	/// @param owner An address for whom to query the balance581	/// @return The number of NFTs owned by `owner`, possibly zero582	/// @dev EVM selector for this function is: 0x70a08231,583	///  or in textual repr: balanceOf(address)584	function balanceOf(address owner) external view returns (uint256);585586	/// @notice Find the owner of an NFT587	/// @dev NFTs assigned to zero address are considered invalid, and queries588	///  about them do throw.589	/// @param tokenId The identifier for an NFT590	/// @return The address of the owner of the NFT591	/// @dev EVM selector for this function is: 0x6352211e,592	///  or in textual repr: ownerOf(uint256)593	function ownerOf(uint256 tokenId) external view returns (address);594595	/// @dev Not implemented596	/// @dev EVM selector for this function is: 0xb88d4fde,597	///  or in textual repr: safeTransferFrom(address,address,uint256,bytes)598	function safeTransferFrom(599		address from,600		address to,601		uint256 tokenId,602		bytes memory data603	) external;604605	/// @dev Not implemented606	/// @dev EVM selector for this function is: 0x42842e0e,607	///  or in textual repr: safeTransferFrom(address,address,uint256)608	function safeTransferFrom(609		address from,610		address to,611		uint256 tokenId612	) external;613614	/// @notice Transfer ownership of an NFT -- THE CALLER IS RESPONSIBLE615	///  TO CONFIRM THAT `to` IS CAPABLE OF RECEIVING NFTS OR ELSE616	///  THEY MAY BE PERMANENTLY LOST617	/// @dev Throws unless `msg.sender` is the current owner or an authorized618	///  operator for this NFT. Throws if `from` is not the current owner. Throws619	///  if `to` is the zero address. Throws if `tokenId` is not a valid NFT.620	/// @param from The current owner of the NFT621	/// @param to The new owner622	/// @param tokenId The NFT to transfer623	/// @dev EVM selector for this function is: 0x23b872dd,624	///  or in textual repr: transferFrom(address,address,uint256)625	function transferFrom(626		address from,627		address to,628		uint256 tokenId629	) external;630631	/// @notice Set or reaffirm the approved address for an NFT632	/// @dev The zero address indicates there is no approved address.633	/// @dev Throws unless `msg.sender` is the current NFT owner, or an authorized634	///  operator of the current owner.635	/// @param approved The new approved NFT controller636	/// @param tokenId The NFT to approve637	/// @dev EVM selector for this function is: 0x095ea7b3,638	///  or in textual repr: approve(address,uint256)639	function approve(address approved, uint256 tokenId) external;640641	/// @dev Not implemented642	/// @dev EVM selector for this function is: 0xa22cb465,643	///  or in textual repr: setApprovalForAll(address,bool)644	function setApprovalForAll(address operator, bool approved) external;645646	/// @dev Not implemented647	/// @dev EVM selector for this function is: 0x081812fc,648	///  or in textual repr: getApproved(uint256)649	function getApproved(uint256 tokenId) external view returns (address);650651	/// @dev Not implemented652	/// @dev EVM selector for this function is: 0xe985e9c5,653	///  or in textual repr: isApprovedForAll(address,address)654	function isApprovedForAll(address owner, address operator) external view returns (address);655}656657interface UniqueNFT is658	Dummy,659	ERC165,660	ERC721,661	ERC721Enumerable,662	ERC721UniqueExtensions,663	ERC721UniqueMintable,664	ERC721Burnable,665	ERC721Metadata,666	Collection,667	TokenProperties668{}
modifiedtests/src/eth/nonFungible.test.tsdiffbeforeafterboth
--- a/tests/src/eth/nonFungible.test.ts
+++ b/tests/src/eth/nonFungible.test.ts
@@ -409,7 +409,7 @@
     expect(cost < BigInt(0.2 * Number(helper.balance.getOneTokenNominal())));
   });
 
-  itEth('Can perform transferFromCross()', async ({helper, privateKey}) => {
+  itEth.only('Can perform transferFromCross()', async ({helper, privateKey}) => {
     const alice = privateKey('//Alice');
     const collection = await helper.nft.mintCollection(alice, {name: 'A', description: 'B', tokenPrefix: 'C'});
modifiedtests/src/eth/nonFungibleAbi.jsondiffbeforeafterboth
--- a/tests/src/eth/nonFungibleAbi.json
+++ b/tests/src/eth/nonFungibleAbi.json
@@ -251,10 +251,14 @@
           { "internalType": "uint256", "name": "field_1", "type": "uint256" }
         ],
 <<<<<<< HEAD
+<<<<<<< HEAD
         "internalType": "struct Tuple6",
 =======
         "internalType": "struct Tuple19",
 >>>>>>> feat: add `EthCrossAccount` type
+=======
+        "internalType": "struct Tuple8",
+>>>>>>> feat: Add custum signature with unlimited nesting.
         "name": "",
         "type": "tuple"
       }
@@ -263,6 +267,7 @@
     "type": "function"
   },
   {
+<<<<<<< HEAD
     "inputs": [
       { "internalType": "string[]", "name": "keys", "type": "string[]" }
     ],
@@ -278,6 +283,11 @@
         "type": "tuple[]"
       }
     ],
+=======
+    "inputs": [{ "internalType": "string", "name": "key", "type": "string" }],
+    "name": "collectionProperty",
+    "outputs": [{ "internalType": "bytes", "name": "", "type": "bytes" }],
+>>>>>>> feat: Add custum signature with unlimited nesting.
     "stateMutability": "view",
     "type": "function"
   },
@@ -298,10 +308,14 @@
           { "internalType": "uint256", "name": "field_1", "type": "uint256" }
         ],
 <<<<<<< HEAD
+<<<<<<< HEAD
         "internalType": "struct Tuple6",
 =======
         "internalType": "struct Tuple19",
 >>>>>>> feat: add `EthCrossAccount` type
+=======
+        "internalType": "struct Tuple8",
+>>>>>>> feat: Add custum signature with unlimited nesting.
         "name": "",
         "type": "tuple"
       }
@@ -324,6 +338,7 @@
     "type": "function"
   },
   {
+<<<<<<< HEAD
     "inputs": [
       { "internalType": "string[]", "name": "keys", "type": "string[]" }
     ],
@@ -333,6 +348,8 @@
     "type": "function"
   },
   {
+=======
+>>>>>>> feat: Add custum signature with unlimited nesting.
     "inputs": [{ "internalType": "string", "name": "key", "type": "string" }],
     "name": "deleteCollectionProperty",
     "outputs": [],
@@ -409,19 +426,64 @@
     "type": "function"
   },
   {
+<<<<<<< HEAD
     "inputs": [{ "internalType": "address", "name": "to", "type": "address" }],
     "name": "mint",
     "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
+=======
+    "inputs": [
+      { "internalType": "address", "name": "to", "type": "address" },
+      { "internalType": "uint256", "name": "tokenId", "type": "uint256" }
+    ],
+    "name": "mint",
+    "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
+>>>>>>> feat: Add custum signature with unlimited nesting.
     "stateMutability": "nonpayable",
     "type": "function"
   },
   {
     "inputs": [
       { "internalType": "address", "name": "to", "type": "address" },
+<<<<<<< HEAD
       { "internalType": "string", "name": "tokenUri", "type": "string" }
     ],
     "name": "mintWithTokenURI",
     "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
+=======
+      { "internalType": "uint256[]", "name": "tokenIds", "type": "uint256[]" }
+    ],
+    "name": "mintBulk",
+    "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      { "internalType": "address", "name": "to", "type": "address" },
+      {
+        "components": [
+          { "internalType": "uint256", "name": "field_0", "type": "uint256" },
+          { "internalType": "string", "name": "field_1", "type": "string" }
+        ],
+        "internalType": "struct Tuple12[]",
+        "name": "tokens",
+        "type": "tuple[]"
+      }
+    ],
+    "name": "mintBulkWithTokenURI",
+    "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      { "internalType": "address", "name": "to", "type": "address" },
+      { "internalType": "uint256", "name": "tokenId", "type": "uint256" },
+      { "internalType": "string", "name": "tokenUri", "type": "string" }
+    ],
+    "name": "mintWithTokenURI",
+    "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
+>>>>>>> feat: Add custum signature with unlimited nesting.
     "stateMutability": "nonpayable",
     "type": "function"
   },
@@ -614,6 +676,7 @@
   },
   {
     "inputs": [
+<<<<<<< HEAD
       {
         "components": [
           { "internalType": "string", "name": "field_0", "type": "string" },
@@ -623,6 +686,10 @@
         "name": "properties",
         "type": "tuple[]"
       }
+=======
+      { "internalType": "string", "name": "key", "type": "string" },
+      { "internalType": "bytes", "name": "value", "type": "bytes" }
+>>>>>>> feat: Add custum signature with unlimited nesting.
     ],
     "name": "setCollectionProperties",
     "outputs": [],
@@ -667,6 +734,7 @@
   },
   {
     "inputs": [
+<<<<<<< HEAD
       {
         "components": [
           { "internalType": "address", "name": "field_0", "type": "address" },
@@ -676,6 +744,9 @@
         "name": "newOwner",
         "type": "tuple"
       }
+=======
+      { "internalType": "address", "name": "newOwner", "type": "address" }
+>>>>>>> feat: Add custum signature with unlimited nesting.
     ],
     "name": "setOwnerCross",
     "outputs": [],
@@ -687,8 +758,13 @@
       { "internalType": "uint256", "name": "tokenId", "type": "uint256" },
       {
         "components": [
+<<<<<<< HEAD
           { "internalType": "string", "name": "field_0", "type": "string" },
           { "internalType": "bytes", "name": "field_1", "type": "bytes" }
+=======
+          { "internalType": "address", "name": "field_0", "type": "address" },
+          { "internalType": "uint256", "name": "field_1", "type": "uint256" }
+>>>>>>> feat: Add custum signature with unlimited nesting.
         ],
         "internalType": "struct Tuple19[]",
         "name": "properties",
@@ -799,8 +875,13 @@
     "inputs": [
       {
         "components": [
+<<<<<<< HEAD
           { "internalType": "address", "name": "field_0", "type": "address" },
           { "internalType": "uint256", "name": "field_1", "type": "uint256" }
+=======
+          { "internalType": "address", "name": "eth", "type": "address" },
+          { "internalType": "uint256", "name": "sub", "type": "uint256" }
+>>>>>>> feat: Add custum signature with unlimited nesting.
         ],
 <<<<<<< HEAD
         "internalType": "struct Tuple6",
@@ -812,8 +893,13 @@
       },
       {
         "components": [
+<<<<<<< HEAD
           { "internalType": "address", "name": "field_0", "type": "address" },
           { "internalType": "uint256", "name": "field_1", "type": "uint256" }
+=======
+          { "internalType": "address", "name": "eth", "type": "address" },
+          { "internalType": "uint256", "name": "sub", "type": "uint256" }
+>>>>>>> feat: Add custum signature with unlimited nesting.
         ],
 <<<<<<< HEAD
         "internalType": "struct Tuple6",
modifiedtests/src/eth/util/playgrounds/types.tsdiffbeforeafterboth
--- a/tests/src/eth/util/playgrounds/types.ts
+++ b/tests/src/eth/util/playgrounds/types.ts
@@ -14,10 +14,8 @@
   args: { [key: string]: string }
 };
 export interface TEthCrossAccount {
-  readonly 0: string,
-  readonly 1: string | Uint8Array,
-  readonly field_0: string,
-  readonly field_1: string | Uint8Array,
+  readonly eth: string,
+  readonly sub: string | Uint8Array,
 }
 
 export type EthProperty = string[];
modifiedtests/src/eth/util/playgrounds/unique.dev.tsdiffbeforeafterboth
--- a/tests/src/eth/util/playgrounds/unique.dev.ts
+++ b/tests/src/eth/util/playgrounds/unique.dev.ts
@@ -364,19 +364,15 @@
 export class EthCrossAccountGroup extends EthGroupBase {
   fromAddress(address: TEthereumAccount): TEthCrossAccount {
     return {
-      0: address,
-      1: '0',
-      field_0: address,
-      field_1: '0',
+      eth: address,
+      sub: '0',
     };
   }
 
   fromKeyringPair(keyring: IKeyringPair): TEthCrossAccount {
     return {
-      0: '0x0000000000000000000000000000000000000000',
-      1: keyring.addressRaw,
-      field_0: '0x0000000000000000000000000000000000000000',
-      field_1: keyring.addressRaw,
+      eth: '0x0000000000000000000000000000000000000000',
+      sub: keyring.addressRaw,
     };
   }
 }
@@ -429,7 +425,6 @@
   ethAddress: EthAddressGroup;
   ethNativeContract: NativeContractGroup;
   ethContract: ContractGroup;
-  ethCrossAccount: EthCrossAccountGroup;
   ethProperty: EthPropertyGroup;
 
   constructor(logger: { log: (msg: any, level: any) => void, level: any }, options: {[key: string]: any} = {}) {