git.delta.rocks / unique-network / refs/commits / 2ca9f675f8fe

difftreelog

refactor abi module

Trubnikov Sergey2022-11-03parent: #20c9944.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
@@ -328,14 +328,14 @@
 	}
 }
 
-trait AbiType {
+trait AbiTypeHelper {
 	fn plain(&self) -> syn::Result<&Ident>;
 	fn is_value(&self) -> bool;
 	fn is_caller(&self) -> bool;
 	fn is_special(&self) -> bool;
 }
 
-impl AbiType for Type {
+impl AbiTypeHelper for Type {
 	fn plain(&self) -> syn::Result<&Ident> {
 		let path = parse_path(self)?;
 		let segment = parse_path_segment(path)?;
deletedcrates/evm-coder/src/abi.rsdiffbeforeafterboth
--- a/crates/evm-coder/src/abi.rs
+++ /dev/null
@@ -1,968 +0,0 @@
-// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.
-// This file is part of Unique Network.
-
-// Unique Network is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Unique Network is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
-
-//! Implementation of EVM RLP reader/writer
-
-#![allow(dead_code)]
-
-#[cfg(not(feature = "std"))]
-use alloc::vec::Vec;
-use evm_core::ExitError;
-use primitive_types::{H160, U256};
-
-use crate::{
-	execution::{Error, ResultWithPostInfo, WithPostDispatchInfo},
-	types::*,
-	make_signature,
-	custom_signature::{SignatureUnit},
-};
-use crate::execution::Result;
-
-const ABI_ALIGNMENT: usize = 32;
-
-trait TypeHelper {
-	/// Is type dynamic sized.
-	fn is_dynamic() -> bool;
-
-	/// Size for type aligned to [`ABI_ALIGNMENT`].
-	fn size() -> usize;
-}
-
-/// View into RLP data, which provides method to read typed items from it
-#[derive(Clone)]
-pub struct AbiReader<'i> {
-	buf: &'i [u8],
-	subresult_offset: usize,
-	offset: usize,
-}
-impl<'i> AbiReader<'i> {
-	/// Start reading RLP buffer, assuming there is no padding bytes
-	pub fn new(buf: &'i [u8]) -> Self {
-		Self {
-			buf,
-			subresult_offset: 0,
-			offset: 0,
-		}
-	}
-	/// Start reading RLP buffer, parsing first 4 bytes as selector
-	pub fn new_call(buf: &'i [u8]) -> Result<(bytes4, Self)> {
-		if buf.len() < 4 {
-			return Err(Error::Error(ExitError::OutOfOffset));
-		}
-		let mut method_id = [0; 4];
-		method_id.copy_from_slice(&buf[0..4]);
-
-		Ok((
-			method_id,
-			Self {
-				buf,
-				subresult_offset: 4,
-				offset: 4,
-			},
-		))
-	}
-
-	fn read_pad<const S: usize>(
-		buf: &[u8],
-		offset: usize,
-		pad_start: usize,
-		pad_size: usize,
-		block_start: usize,
-		block_size: usize,
-	) -> Result<[u8; S]> {
-		if buf.len() - offset < ABI_ALIGNMENT {
-			return Err(Error::Error(ExitError::OutOfOffset));
-		}
-		let mut block = [0; S];
-		let is_pad_zeroed = buf[pad_start..pad_size].iter().all(|&v| v == 0);
-		if !is_pad_zeroed {
-			return Err(Error::Error(ExitError::InvalidRange));
-		}
-		block.copy_from_slice(&buf[block_start..block_size]);
-		Ok(block)
-	}
-
-	fn read_padleft<const S: usize>(&mut self) -> Result<[u8; S]> {
-		let offset = self.offset;
-		self.offset += ABI_ALIGNMENT;
-		Self::read_pad(
-			self.buf,
-			offset,
-			offset,
-			offset + ABI_ALIGNMENT - S,
-			offset + ABI_ALIGNMENT - S,
-			offset + ABI_ALIGNMENT,
-		)
-	}
-
-	fn read_padright<const S: usize>(&mut self) -> Result<[u8; S]> {
-		let offset = self.offset;
-		self.offset += ABI_ALIGNMENT;
-		Self::read_pad(
-			self.buf,
-			offset,
-			offset + S,
-			offset + ABI_ALIGNMENT,
-			offset,
-			offset + S,
-		)
-	}
-
-	/// Read [`H160`] at current position, then advance
-	pub fn address(&mut self) -> Result<H160> {
-		Ok(H160(self.read_padleft()?))
-	}
-
-	/// Read [`bool`] at current position, then advance
-	pub fn bool(&mut self) -> Result<bool> {
-		let data: [u8; 1] = self.read_padleft()?;
-		match data[0] {
-			0 => Ok(false),
-			1 => Ok(true),
-			_ => Err(Error::Error(ExitError::InvalidRange)),
-		}
-	}
-
-	/// Read [`[u8; 4]`] at current position, then advance
-	pub fn bytes4(&mut self) -> Result<[u8; 4]> {
-		self.read_padright()
-	}
-
-	/// Read [`Vec<u8>`] at current position, then advance
-	pub fn bytes(&mut self) -> Result<Vec<u8>> {
-		let mut subresult = self.subresult(None)?;
-		let length = subresult.uint32()? as usize;
-		if subresult.buf.len() < subresult.offset + length {
-			return Err(Error::Error(ExitError::OutOfOffset));
-		}
-		Ok(subresult.buf[subresult.offset..subresult.offset + length].into())
-	}
-
-	/// Read [`string`] at current position, then advance
-	pub fn string(&mut self) -> Result<string> {
-		string::from_utf8(self.bytes()?).map_err(|_| Error::Error(ExitError::InvalidRange))
-	}
-
-	/// Read [`u8`] at current position, then advance
-	pub fn uint8(&mut self) -> Result<u8> {
-		Ok(self.read_padleft::<1>()?[0])
-	}
-
-	/// Read [`u32`] at current position, then advance
-	pub fn uint32(&mut self) -> Result<u32> {
-		Ok(u32::from_be_bytes(self.read_padleft()?))
-	}
-
-	/// Read [`u128`] at current position, then advance
-	pub fn uint128(&mut self) -> Result<u128> {
-		Ok(u128::from_be_bytes(self.read_padleft()?))
-	}
-
-	/// Read [`U256`] at current position, then advance
-	pub fn uint256(&mut self) -> Result<U256> {
-		let buf: [u8; 32] = self.read_padleft()?;
-		Ok(U256::from_big_endian(&buf))
-	}
-
-	/// Read [`u64`] at current position, then advance
-	pub fn uint64(&mut self) -> Result<u64> {
-		Ok(u64::from_be_bytes(self.read_padleft()?))
-	}
-
-	/// Read [`usize`] at current position, then advance
-	#[deprecated = "dangerous, as usize may have different width in wasm and native execution"]
-	pub fn read_usize(&mut self) -> Result<usize> {
-		Ok(usize::from_be_bytes(self.read_padleft()?))
-	}
-
-	/// Slice recursive buffer, advance one word for buffer offset
-	/// If `size` is [`None`] then [`Self::offset`] and [`Self::subresult_offset`] evals from [`Self::buf`].
-	fn subresult(&mut self, size: Option<usize>) -> Result<AbiReader<'i>> {
-		let subresult_offset = self.subresult_offset;
-		let offset = if let Some(size) = size {
-			self.offset += size;
-			self.subresult_offset += size;
-			0
-		} else {
-			self.uint32()? as usize
-		};
-
-		if offset + self.subresult_offset > self.buf.len() {
-			return Err(Error::Error(ExitError::InvalidRange));
-		}
-
-		let new_offset = offset + subresult_offset;
-		Ok(AbiReader {
-			buf: self.buf,
-			subresult_offset: new_offset,
-			offset: new_offset,
-		})
-	}
-
-	/// Is this parser reached end of buffer?
-	pub fn is_finished(&self) -> bool {
-		self.buf.len() == self.offset
-	}
-}
-
-/// Writer for RLP encoded data
-#[derive(Default)]
-pub struct AbiWriter {
-	static_part: Vec<u8>,
-	dynamic_part: Vec<(usize, AbiWriter)>,
-	had_call: bool,
-	is_dynamic: bool,
-}
-impl AbiWriter {
-	/// Initialize internal buffers for output data, assuming no padding required
-	pub fn new() -> Self {
-		Self::default()
-	}
-
-	/// Initialize internal buffers with data size
-	pub fn new_dynamic(is_dynamic: bool) -> Self {
-		Self {
-			is_dynamic,
-			..Default::default()
-		}
-	}
-	/// Initialize internal buffers, inserting method selector at beginning
-	pub fn new_call(method_id: u32) -> Self {
-		let mut val = Self::new();
-		val.static_part.extend(&method_id.to_be_bytes());
-		val.had_call = true;
-		val
-	}
-
-	fn write_padleft(&mut self, block: &[u8]) {
-		assert!(block.len() <= ABI_ALIGNMENT);
-		self.static_part
-			.extend(&[0; ABI_ALIGNMENT][0..ABI_ALIGNMENT - block.len()]);
-		self.static_part.extend(block);
-	}
-
-	fn write_padright(&mut self, block: &[u8]) {
-		assert!(block.len() <= ABI_ALIGNMENT);
-		self.static_part.extend(block);
-		self.static_part
-			.extend(&[0; ABI_ALIGNMENT][0..ABI_ALIGNMENT - block.len()]);
-	}
-
-	/// Write [`H160`] to end of buffer
-	pub fn address(&mut self, address: &H160) {
-		self.write_padleft(&address.0)
-	}
-
-	/// Write [`bool`] to end of buffer
-	pub fn bool(&mut self, value: &bool) {
-		self.write_padleft(&[if *value { 1 } else { 0 }])
-	}
-
-	/// Write [`u8`] to end of buffer
-	pub fn uint8(&mut self, value: &u8) {
-		self.write_padleft(&[*value])
-	}
-
-	/// Write [`u32`] to end of buffer
-	pub fn uint32(&mut self, value: &u32) {
-		self.write_padleft(&u32::to_be_bytes(*value))
-	}
-
-	/// Write [`u128`] to end of buffer
-	pub fn uint128(&mut self, value: &u128) {
-		self.write_padleft(&u128::to_be_bytes(*value))
-	}
-
-	/// Write [`U256`] to end of buffer
-	pub fn uint256(&mut self, value: &U256) {
-		let mut out = [0; 32];
-		value.to_big_endian(&mut out);
-		self.write_padleft(&out)
-	}
-
-	/// Write [`usize`] to end of buffer
-	#[deprecated = "dangerous, as usize may have different width in wasm and native execution"]
-	pub fn write_usize(&mut self, value: &usize) {
-		self.write_padleft(&usize::to_be_bytes(*value))
-	}
-
-	/// Append recursive data, writing pending offset at end of buffer
-	pub fn write_subresult(&mut self, result: Self) {
-		self.dynamic_part.push((self.static_part.len(), result));
-		// Empty block, to be filled later
-		self.write_padleft(&[]);
-	}
-
-	fn memory(&mut self, value: &[u8]) {
-		let mut sub = Self::new();
-		sub.uint32(&(value.len() as u32));
-		for chunk in value.chunks(ABI_ALIGNMENT) {
-			sub.write_padright(chunk);
-		}
-		self.write_subresult(sub);
-	}
-
-	/// Append recursive [`str`] at end of buffer
-	pub fn string(&mut self, value: &str) {
-		self.memory(value.as_bytes())
-	}
-
-	/// Append recursive [`[u8]`] at end of buffer
-	pub fn bytes(&mut self, value: &[u8]) {
-		self.memory(value)
-	}
-
-	/// Finish writer, concatenating all internal buffers
-	pub fn finish(mut self) -> Vec<u8> {
-		for (static_offset, part) in self.dynamic_part {
-			let part_offset = self.static_part.len()
-				- if self.had_call { 4 } else { 0 }
-				- if self.is_dynamic { ABI_ALIGNMENT } else { 0 };
-
-			let encoded_dynamic_offset = usize::to_be_bytes(part_offset);
-			let start = static_offset + ABI_ALIGNMENT - encoded_dynamic_offset.len();
-			let stop = static_offset + ABI_ALIGNMENT;
-			self.static_part[start..stop].copy_from_slice(&encoded_dynamic_offset);
-			self.static_part.extend(part.finish())
-		}
-		self.static_part
-	}
-}
-
-/// [`AbiReader`] implements reading of many types.
-pub trait AbiRead {
-	/// Read item from current position, advanding decoder
-	fn abi_read(reader: &mut AbiReader) -> Result<Self>
-	where
-		Self: Sized;
-}
-
-macro_rules! impl_abi_readable {
-	($ty:ty, $method:ident, $dynamic:literal) => {
-		impl sealed::CanBePlacedInVec for $ty {}
-
-		impl TypeHelper for $ty {
-			fn is_dynamic() -> bool {
-				$dynamic
-			}
-
-			fn size() -> usize {
-				ABI_ALIGNMENT
-			}
-		}
-
-		impl AbiRead for $ty {
-			fn abi_read(reader: &mut AbiReader) -> Result<$ty> {
-				reader.$method()
-			}
-		}
-	};
-}
-
-impl_abi_readable!(bool, bool, false);
-impl_abi_readable!(uint32, uint32, false);
-impl_abi_readable!(uint64, uint64, false);
-impl_abi_readable!(uint128, uint128, false);
-impl_abi_readable!(uint256, uint256, false);
-impl_abi_readable!(bytes4, bytes4, false);
-impl_abi_readable!(address, address, false);
-impl_abi_readable!(string, string, true);
-
-impl TypeHelper for uint8 {
-	fn is_dynamic() -> bool {
-		false
-	}
-	fn size() -> usize {
-		ABI_ALIGNMENT
-	}
-}
-impl AbiRead for uint8 {
-	fn abi_read(reader: &mut AbiReader) -> Result<uint8> {
-		reader.uint8()
-	}
-}
-
-impl TypeHelper for bytes {
-	fn is_dynamic() -> bool {
-		true
-	}
-	fn size() -> usize {
-		ABI_ALIGNMENT
-	}
-}
-impl AbiRead for bytes {
-	fn abi_read(reader: &mut AbiReader) -> Result<bytes> {
-		Ok(bytes(reader.bytes()?))
-	}
-}
-
-mod sealed {
-	/// Not all types can be placed in vec, i.e `Vec<u8>` is restricted, `bytes` should be used instead
-	pub trait CanBePlacedInVec {}
-}
-
-impl<R: AbiRead + sealed::CanBePlacedInVec> AbiRead for Vec<R> {
-	fn abi_read(reader: &mut AbiReader) -> Result<Vec<R>> {
-		let mut sub = reader.subresult(None)?;
-		let size = sub.uint32()? as usize;
-		sub.subresult_offset = sub.offset;
-		let mut out = Vec::with_capacity(size);
-		for _ in 0..size {
-			out.push(<R>::abi_read(&mut sub)?);
-		}
-		Ok(out)
-	}
-}
-
-impl<R: Signature> Signature for Vec<R> {
-	const SIGNATURE: SignatureUnit = make_signature!(new nameof(R::SIGNATURE) fixed("[]"));
-}
-
-impl sealed::CanBePlacedInVec for EthCrossAccount {}
-
-impl TypeHelper for EthCrossAccount {
-	fn is_dynamic() -> bool {
-		address::is_dynamic() || uint256::is_dynamic()
-	}
-
-	fn size() -> usize {
-		<address as TypeHelper>::size() + <uint256 as TypeHelper>::size()
-	}
-}
-
-impl AbiRead for EthCrossAccount {
-	fn abi_read(reader: &mut AbiReader) -> Result<EthCrossAccount> {
-		let size = if !EthCrossAccount::is_dynamic() {
-			Some(<EthCrossAccount as TypeHelper>::size())
-		} else {
-			None
-		};
-		let mut subresult = reader.subresult(size)?;
-		let eth = <address>::abi_read(&mut subresult)?;
-		let sub = <uint256>::abi_read(&mut subresult)?;
-
-		Ok(EthCrossAccount { eth, sub })
-	}
-}
-
-impl AbiWrite for EthCrossAccount {
-	fn abi_write(&self, writer: &mut AbiWriter) {
-		self.eth.abi_write(writer);
-		self.sub.abi_write(writer);
-	}
-}
-
-macro_rules! impl_tuples {
-	($($ident:ident)+) => {
-		impl<$($ident: TypeHelper,)+> TypeHelper for ($($ident,)+)
-		where
-			$(
-				$ident: TypeHelper,
-			)+
-		{
-			fn is_dynamic() -> bool {
-				false
-				$(
-					|| <$ident>::is_dynamic()
-				)*
-			}
-
-			fn size() -> usize {
-				0 $(+ <$ident>::size())+
-			}
-		}
-
-		impl<$($ident),+> sealed::CanBePlacedInVec for ($($ident,)+) {}
-
-		impl<$($ident),+> AbiRead for ($($ident,)+)
-		where
-			$($ident: AbiRead,)+
-			($($ident,)+): TypeHelper,
-		{
-			fn abi_read(reader: &mut AbiReader) -> Result<($($ident,)+)> {
-				let size = if !<($($ident,)+)>::is_dynamic() { Some(<($($ident,)+)>::size()) } else { None };
-				let mut subresult = reader.subresult(size)?;
-				Ok((
-					$(<$ident>::abi_read(&mut subresult)?,)+
-				))
-			}
-		}
-
-		#[allow(non_snake_case)]
-		impl<$($ident),+> AbiWrite for ($($ident,)+)
-		where
-			$($ident: AbiWrite,)+
-		{
-			fn abi_write(&self, writer: &mut AbiWriter) {
-				let ($($ident,)+) = self;
-				if writer.is_dynamic {
-					let mut sub = AbiWriter::new();
-					$($ident.abi_write(&mut sub);)+
-					writer.write_subresult(sub);
-				} else {
-					$($ident.abi_write(writer);)+
-				}
-			}
-		}
-
-		impl<$($ident),+> Signature for ($($ident,)+)
-		where
-		$($ident: Signature,)+
-		{
-			const SIGNATURE: SignatureUnit = make_signature!(
-				new fixed("(")
-				$(nameof(<$ident>::SIGNATURE) fixed(","))+
-				shift_left(1)
-				fixed(")")
-			);
-		}
-	};
-}
-
-impl_tuples! {A}
-impl_tuples! {A B}
-impl_tuples! {A B C}
-impl_tuples! {A B C D}
-impl_tuples! {A B C D E}
-impl_tuples! {A B C D E F}
-impl_tuples! {A B C D E F G}
-impl_tuples! {A B C D E F G H}
-impl_tuples! {A B C D E F G H I}
-impl_tuples! {A B C D E F G H I J}
-
-/// For questions about inability to provide custom implementations,
-/// see [`AbiRead`]
-pub trait AbiWrite {
-	/// Write value to end of specified encoder
-	fn abi_write(&self, writer: &mut AbiWriter);
-	/// Specialization for [`crate::solidity_interface`] implementation,
-	/// see comment in `impl AbiWrite for ResultWithPostInfo`
-	fn to_result(&self) -> ResultWithPostInfo<AbiWriter> {
-		let mut writer = AbiWriter::new();
-		self.abi_write(&mut writer);
-		Ok(writer.into())
-	}
-}
-
-/// This particular AbiWrite implementation should be split to another trait,
-/// which only implements `to_result`, but due to lack of specialization feature
-/// in stable Rust, we can't have blanket impl of this trait `for T where T: AbiWrite`,
-/// so here we abusing default trait methods for it
-impl<T: AbiWrite> AbiWrite for ResultWithPostInfo<T> {
-	fn abi_write(&self, _writer: &mut AbiWriter) {
-		debug_assert!(false, "shouldn't be called, see comment")
-	}
-	fn to_result(&self) -> ResultWithPostInfo<AbiWriter> {
-		match self {
-			Ok(v) => Ok(WithPostDispatchInfo {
-				post_info: v.post_info.clone(),
-				data: {
-					let mut out = AbiWriter::new();
-					v.data.abi_write(&mut out);
-					out
-				},
-			}),
-			Err(e) => Err(e.clone()),
-		}
-	}
-}
-
-macro_rules! impl_abi_writeable {
-	($ty:ty, $method:ident) => {
-		impl AbiWrite for $ty {
-			fn abi_write(&self, writer: &mut AbiWriter) {
-				writer.$method(&self)
-			}
-		}
-	};
-}
-
-impl_abi_writeable!(u8, uint8);
-impl_abi_writeable!(u32, uint32);
-impl_abi_writeable!(u128, uint128);
-impl_abi_writeable!(U256, uint256);
-impl_abi_writeable!(H160, address);
-impl_abi_writeable!(bool, bool);
-impl_abi_writeable!(&str, string);
-
-impl AbiWrite for string {
-	fn abi_write(&self, writer: &mut AbiWriter) {
-		writer.string(self)
-	}
-}
-
-impl AbiWrite for bytes {
-	fn abi_write(&self, writer: &mut AbiWriter) {
-		writer.bytes(self.0.as_slice())
-	}
-}
-
-impl<T: AbiWrite + TypeHelper> AbiWrite for Vec<T> {
-	fn abi_write(&self, writer: &mut AbiWriter) {
-		let is_dynamic = T::is_dynamic();
-		let mut sub = if is_dynamic {
-			AbiWriter::new_dynamic(is_dynamic)
-		} else {
-			AbiWriter::new()
-		};
-
-		// Write items count
-		(self.len() as u32).abi_write(&mut sub);
-
-		for item in self {
-			item.abi_write(&mut sub);
-		}
-		writer.write_subresult(sub);
-	}
-}
-
-impl AbiWrite for () {
-	fn abi_write(&self, _writer: &mut AbiWriter) {}
-}
-
-/// Helper macros to parse reader into variables
-#[deprecated]
-#[macro_export]
-macro_rules! abi_decode {
-	($reader:expr, $($name:ident: $typ:ident),+ $(,)?) => {
-		$(
-			let $name = $reader.$typ()?;
-		)+
-	}
-}
-
-/// Helper macros to construct RLP-encoded buffer
-#[deprecated]
-#[macro_export]
-macro_rules! abi_encode {
-	($($typ:ident($value:expr)),* $(,)?) => {{
-		#[allow(unused_mut)]
-		let mut writer = ::evm_coder::abi::AbiWriter::new();
-		$(
-			writer.$typ($value);
-		)*
-		writer
-	}};
-	(call $val:expr; $($typ:ident($value:expr)),* $(,)?) => {{
-		#[allow(unused_mut)]
-		let mut writer = ::evm_coder::abi::AbiWriter::new_call($val);
-		$(
-			writer.$typ($value);
-		)*
-		writer
-	}}
-}
-
-#[cfg(test)]
-pub mod test {
-	use crate::{
-		abi::{AbiRead, AbiWrite},
-		types::*,
-	};
-
-	use super::{AbiReader, AbiWriter};
-	use hex_literal::hex;
-	use primitive_types::{H160, U256};
-	use concat_idents::concat_idents;
-
-	macro_rules! test_impl {
-		($name:ident, $type:ty, $function_identifier:expr, $decoded_data:expr, $encoded_data:expr) => {
-			concat_idents!(test_name = encode_decode_, $name {
-				#[test]
-				fn test_name() {
-					let function_identifier: u32 = $function_identifier;
-					let decoded_data = $decoded_data;
-					let encoded_data = $encoded_data;
-
-					let (call, mut decoder) = AbiReader::new_call(encoded_data).unwrap();
-					assert_eq!(call, u32::to_be_bytes(function_identifier));
-					let data = <$type>::abi_read(&mut decoder).unwrap();
-					assert_eq!(data, decoded_data);
-
-					let mut writer = AbiWriter::new_call(function_identifier);
-					decoded_data.abi_write(&mut writer);
-					let ed = writer.finish();
-					similar_asserts::assert_eq!(encoded_data, ed.as_slice());
-				}
-			});
-		};
-	}
-
-	macro_rules! test_impl_uint {
-		($type:ident) => {
-			test_impl!(
-				$type,
-				$type,
-				0xdeadbeef,
-				255 as $type,
-				&hex!(
-					"
-						deadbeef
-						00000000000000000000000000000000000000000000000000000000000000ff
-					"
-				)
-			);
-		};
-	}
-
-	test_impl_uint!(uint8);
-	test_impl_uint!(uint32);
-	test_impl_uint!(uint128);
-
-	test_impl!(
-		uint256,
-		uint256,
-		0xdeadbeef,
-		U256([255, 0, 0, 0]),
-		&hex!(
-			"
-				deadbeef
-				00000000000000000000000000000000000000000000000000000000000000ff
-			"
-		)
-	);
-
-	test_impl!(
-		vec_tuple_address_uint256,
-		Vec<(address, uint256)>,
-		0x1ACF2D55,
-		vec![
-			(
-				H160(hex!("2D2FF76104B7BACB2E8F6731D5BFC184EBECDDBC")),
-				U256([10, 0, 0, 0]),
-			),
-			(
-				H160(hex!("AB8E3D9134955566483B11E6825C9223B6737B10")),
-				U256([20, 0, 0, 0]),
-			),
-			(
-				H160(hex!("8C582BDF2953046705FC56F189385255EFC1BE18")),
-				U256([30, 0, 0, 0]),
-			),
-		],
-		&hex!(
-			"
-				1ACF2D55
-				0000000000000000000000000000000000000000000000000000000000000020 // offset of (address, uint256)[]
-				0000000000000000000000000000000000000000000000000000000000000003 // length of (address, uint256)[]
-
-				0000000000000000000000002D2FF76104B7BACB2E8F6731D5BFC184EBECDDBC // address
-				000000000000000000000000000000000000000000000000000000000000000A // uint256
-
-				000000000000000000000000AB8E3D9134955566483B11E6825C9223B6737B10 // address
-				0000000000000000000000000000000000000000000000000000000000000014 // uint256
-
-				0000000000000000000000008C582BDF2953046705FC56F189385255EFC1BE18 // address
-				000000000000000000000000000000000000000000000000000000000000001E // uint256
-			"
-		)
-	);
-
-	test_impl!(
-		vec_tuple_uint256_string,
-		Vec<(uint256, string)>,
-		0xdeadbeef,
-		vec![
-			(1.into(), "Test URI 0".to_string()),
-			(11.into(), "Test URI 1".to_string()),
-			(12.into(), "Test URI 2".to_string()),
-		],
-		&hex!(
-			"
-				deadbeef
-				0000000000000000000000000000000000000000000000000000000000000020 // offset of (uint256, string)[]
-				0000000000000000000000000000000000000000000000000000000000000003 // length of (uint256, string)[]
-
-				0000000000000000000000000000000000000000000000000000000000000060 // offset of first elem
-				00000000000000000000000000000000000000000000000000000000000000e0 // offset of second elem
-				0000000000000000000000000000000000000000000000000000000000000160 // offset of third elem
-
-				0000000000000000000000000000000000000000000000000000000000000001 // first token id?   					#60
-				0000000000000000000000000000000000000000000000000000000000000040 // offset of string
-				000000000000000000000000000000000000000000000000000000000000000a // size of string
-				5465737420555249203000000000000000000000000000000000000000000000 // string
-
-				000000000000000000000000000000000000000000000000000000000000000b // second token id? Why ==11?			#e0
-				0000000000000000000000000000000000000000000000000000000000000040 // offset of string
-				000000000000000000000000000000000000000000000000000000000000000a // size of string
-				5465737420555249203100000000000000000000000000000000000000000000 // string
-
-				000000000000000000000000000000000000000000000000000000000000000c // third token id?  Why ==12?			#160
-				0000000000000000000000000000000000000000000000000000000000000040 // offset of string
-				000000000000000000000000000000000000000000000000000000000000000a // size of string
-				5465737420555249203200000000000000000000000000000000000000000000 // string
-			"
-		)
-	);
-
-	test_impl!(
-		vec_tuple_string_bytes,
-		Vec<(string, bytes)>,
-		0xdeadbeef,
-		vec![
-			(
-				"Test URI 0".to_string(),
-				bytes(vec![
-					0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11,
-					0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11,
-					0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11,
-					0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11
-				])
-			),
-			(
-				"Test URI 1".to_string(),
-				bytes(vec![
-					0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22,
-					0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22,
-					0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22,
-					0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22
-				])
-			),
-			("Test URI 2".to_string(), bytes(vec![0x33, 0x33])),
-		],
-		&hex!(
-			"
-				deadbeef
-				0000000000000000000000000000000000000000000000000000000000000020
-				0000000000000000000000000000000000000000000000000000000000000003
-				
-				0000000000000000000000000000000000000000000000000000000000000060
-				0000000000000000000000000000000000000000000000000000000000000140
-				0000000000000000000000000000000000000000000000000000000000000220
-
-				0000000000000000000000000000000000000000000000000000000000000040
-				0000000000000000000000000000000000000000000000000000000000000080
-				000000000000000000000000000000000000000000000000000000000000000a
-				5465737420555249203000000000000000000000000000000000000000000000
-				0000000000000000000000000000000000000000000000000000000000000030
-				1111111111111111111111111111111111111111111111111111111111111111
-				1111111111111111111111111111111100000000000000000000000000000000
-
-				0000000000000000000000000000000000000000000000000000000000000040
-				0000000000000000000000000000000000000000000000000000000000000080
-				000000000000000000000000000000000000000000000000000000000000000a
-				5465737420555249203100000000000000000000000000000000000000000000
-				000000000000000000000000000000000000000000000000000000000000002f
-				2222222222222222222222222222222222222222222222222222222222222222
-				2222222222222222222222222222220000000000000000000000000000000000
-
-				0000000000000000000000000000000000000000000000000000000000000040
-				0000000000000000000000000000000000000000000000000000000000000080
-				000000000000000000000000000000000000000000000000000000000000000a
-				5465737420555249203200000000000000000000000000000000000000000000
-				0000000000000000000000000000000000000000000000000000000000000002
-				3333000000000000000000000000000000000000000000000000000000000000
-			"
-		)
-	);
-
-	#[test]
-	fn dynamic_after_static() {
-		let mut encoder = AbiWriter::new();
-		encoder.bool(&true);
-		encoder.string("test");
-		let encoded = encoder.finish();
-
-		let mut encoder = AbiWriter::new();
-		encoder.bool(&true);
-		// Offset to subresult
-		encoder.uint32(&(32 * 2));
-		// Len of "test"
-		encoder.uint32(&4);
-		encoder.write_padright(&[b't', b'e', b's', b't']);
-		let alternative_encoded = encoder.finish();
-
-		assert_eq!(encoded, alternative_encoded);
-
-		let mut decoder = AbiReader::new(&encoded);
-		assert!(decoder.bool().unwrap());
-		assert_eq!(decoder.string().unwrap(), "test");
-	}
-
-	#[test]
-	fn mint_sample() {
-		let (call, mut decoder) = AbiReader::new_call(&hex!(
-			"
-				50bb4e7f
-				000000000000000000000000ad2c0954693c2b5404b7e50967d3481bea432374
-				0000000000000000000000000000000000000000000000000000000000000001
-				0000000000000000000000000000000000000000000000000000000000000060
-				0000000000000000000000000000000000000000000000000000000000000008
-				5465737420555249000000000000000000000000000000000000000000000000
-			"
-		))
-		.unwrap();
-		assert_eq!(call, u32::to_be_bytes(0x50bb4e7f));
-		assert_eq!(
-			format!("{:?}", decoder.address().unwrap()),
-			"0xad2c0954693c2b5404b7e50967d3481bea432374"
-		);
-		assert_eq!(decoder.uint32().unwrap(), 1);
-		assert_eq!(decoder.string().unwrap(), "Test URI");
-	}
-
-	#[test]
-	fn parse_vec_with_dynamic_type() {
-		let decoded_data = (
-			0x36543006,
-			vec![
-				(1.into(), "Test URI 0".to_string()),
-				(11.into(), "Test URI 1".to_string()),
-				(12.into(), "Test URI 2".to_string()),
-			],
-		);
-
-		let encoded_data = &hex!(
-			"
-				36543006
-				00000000000000000000000053744e6da587ba10b32a2554d2efdcd985bc27a3 // address
-				0000000000000000000000000000000000000000000000000000000000000040 // offset of (uint256, string)[]
-				0000000000000000000000000000000000000000000000000000000000000003 // length of (uint256, string)[]
-
-				0000000000000000000000000000000000000000000000000000000000000060 // offset of first elem
-				00000000000000000000000000000000000000000000000000000000000000e0 // offset of second elem
-				0000000000000000000000000000000000000000000000000000000000000160 // offset of third elem
-
-				0000000000000000000000000000000000000000000000000000000000000001 // first token id?   					#60
-				0000000000000000000000000000000000000000000000000000000000000040 // offset of string
-				000000000000000000000000000000000000000000000000000000000000000a // size of string
-				5465737420555249203000000000000000000000000000000000000000000000 // string
-
-				000000000000000000000000000000000000000000000000000000000000000b // second token id? Why ==11?			#e0
-				0000000000000000000000000000000000000000000000000000000000000040 // offset of string
-				000000000000000000000000000000000000000000000000000000000000000a // size of string
-				5465737420555249203100000000000000000000000000000000000000000000 // string
-
-				000000000000000000000000000000000000000000000000000000000000000c // third token id?  Why ==12?			#160
-				0000000000000000000000000000000000000000000000000000000000000040 // offset of string
-				000000000000000000000000000000000000000000000000000000000000000a // size of string
-				5465737420555249203200000000000000000000000000000000000000000000 // string
-			"
-		);
-
-		let (call, mut decoder) = AbiReader::new_call(encoded_data).unwrap();
-		assert_eq!(call, u32::to_be_bytes(decoded_data.0));
-		let address = decoder.address().unwrap();
-		let data = <Vec<(uint256, string)>>::abi_read(&mut decoder).unwrap();
-		assert_eq!(data, decoded_data.1);
-
-		let mut writer = AbiWriter::new_call(decoded_data.0);
-		address.abi_write(&mut writer);
-		decoded_data.1.abi_write(&mut writer);
-		let ed = writer.finish();
-		similar_asserts::assert_eq!(encoded_data, ed.as_slice());
-	}
-}
addedcrates/evm-coder/src/abi/impls.rsdiffbeforeafterboth
--- /dev/null
+++ b/crates/evm-coder/src/abi/impls.rs
@@ -0,0 +1,303 @@
+use crate::{
+	execution::{Result, ResultWithPostInfo, WithPostDispatchInfo},
+	types::*,
+	make_signature,
+	custom_signature::SignatureUnit,
+};
+use super::{traits::*, ABI_ALIGNMENT, AbiReader, AbiWriter};
+use primitive_types::{U256, H160};
+
+#[cfg(not(feature = "std"))]
+use alloc::vec::Vec;
+
+macro_rules! impl_abi_readable {
+	($ty:ty, $method:ident, $dynamic:literal) => {
+		impl sealed::CanBePlacedInVec for $ty {}
+
+		impl AbiType for $ty {
+			const SIGNATURE: SignatureUnit = make_signature!(new fixed(stringify!($ty)));
+
+			fn is_dynamic() -> bool {
+				$dynamic
+			}
+
+			fn size() -> usize {
+				ABI_ALIGNMENT
+			}
+		}
+
+		impl AbiRead for $ty {
+			fn abi_read(reader: &mut AbiReader) -> Result<$ty> {
+				reader.$method()
+			}
+		}
+	};
+}
+
+impl_abi_readable!(uint32, uint32, false);
+impl_abi_readable!(uint64, uint64, false);
+impl_abi_readable!(uint128, uint128, false);
+impl_abi_readable!(uint256, uint256, false);
+impl_abi_readable!(bytes4, bytes4, false);
+impl_abi_readable!(address, address, false);
+impl_abi_readable!(string, string, true);
+
+impl sealed::CanBePlacedInVec for bool {}
+
+impl AbiType for bool {
+	const SIGNATURE: SignatureUnit = make_signature!(new fixed("bool"));
+
+	fn is_dynamic() -> bool {
+		false
+	}
+	fn size() -> usize {
+		ABI_ALIGNMENT
+	}
+}
+impl AbiRead for bool {
+	fn abi_read(reader: &mut AbiReader) -> Result<bool> {
+		reader.bool()
+	}
+}
+
+impl AbiType for uint8 {
+	const SIGNATURE: SignatureUnit = make_signature!(new fixed("uint8"));
+
+	fn is_dynamic() -> bool {
+		false
+	}
+	fn size() -> usize {
+		ABI_ALIGNMENT
+	}
+}
+impl AbiRead for uint8 {
+	fn abi_read(reader: &mut AbiReader) -> Result<uint8> {
+		reader.uint8()
+	}
+}
+
+impl AbiType for bytes {
+	const SIGNATURE: SignatureUnit = make_signature!(new fixed("bytes"));
+
+	fn is_dynamic() -> bool {
+		true
+	}
+	fn size() -> usize {
+		ABI_ALIGNMENT
+	}
+}
+impl AbiRead for bytes {
+	fn abi_read(reader: &mut AbiReader) -> Result<bytes> {
+		Ok(bytes(reader.bytes()?))
+	}
+}
+
+impl<R: AbiRead + sealed::CanBePlacedInVec> AbiRead for Vec<R> {
+	fn abi_read(reader: &mut AbiReader) -> Result<Vec<R>> {
+		let mut sub = reader.subresult(None)?;
+		let size = sub.uint32()? as usize;
+		sub.subresult_offset = sub.offset;
+		let mut out = Vec::with_capacity(size);
+		for _ in 0..size {
+			out.push(<R>::abi_read(&mut sub)?);
+		}
+		Ok(out)
+	}
+}
+
+impl<R: AbiType> AbiType for Vec<R> {
+	const SIGNATURE: SignatureUnit = make_signature!(new nameof(R::SIGNATURE) fixed("[]"));
+
+	fn is_dynamic() -> bool {
+		true
+	}
+
+	fn size() -> usize {
+		ABI_ALIGNMENT
+	}
+}
+
+impl sealed::CanBePlacedInVec for EthCrossAccount {}
+
+impl AbiType for EthCrossAccount {
+	const SIGNATURE: SignatureUnit = make_signature!(new fixed("(address,uint256)"));
+
+	fn is_dynamic() -> bool {
+		address::is_dynamic() || uint256::is_dynamic()
+	}
+
+	fn size() -> usize {
+		<address as AbiType>::size() + <uint256 as AbiType>::size()
+	}
+}
+
+impl AbiRead for EthCrossAccount {
+	fn abi_read(reader: &mut AbiReader) -> Result<EthCrossAccount> {
+		let size = if !EthCrossAccount::is_dynamic() {
+			Some(<EthCrossAccount as AbiType>::size())
+		} else {
+			None
+		};
+		let mut subresult = reader.subresult(size)?;
+		let eth = <address>::abi_read(&mut subresult)?;
+		let sub = <uint256>::abi_read(&mut subresult)?;
+
+		Ok(EthCrossAccount { eth, sub })
+	}
+}
+
+impl AbiWrite for EthCrossAccount {
+	fn abi_write(&self, writer: &mut AbiWriter) {
+		self.eth.abi_write(writer);
+		self.sub.abi_write(writer);
+	}
+}
+
+macro_rules! impl_abi_writeable {
+	($ty:ty, $method:ident) => {
+		impl AbiWrite for $ty {
+			fn abi_write(&self, writer: &mut AbiWriter) {
+				writer.$method(&self)
+			}
+		}
+	};
+}
+
+impl_abi_writeable!(u8, uint8);
+impl_abi_writeable!(u32, uint32);
+impl_abi_writeable!(u128, uint128);
+impl_abi_writeable!(U256, uint256);
+impl_abi_writeable!(H160, address);
+impl_abi_writeable!(bool, bool);
+impl_abi_writeable!(&str, string);
+
+impl AbiWrite for string {
+	fn abi_write(&self, writer: &mut AbiWriter) {
+		writer.string(self)
+	}
+}
+
+impl AbiWrite for bytes {
+	fn abi_write(&self, writer: &mut AbiWriter) {
+		writer.bytes(self.0.as_slice())
+	}
+}
+
+impl<T: AbiWrite + AbiType> AbiWrite for Vec<T> {
+	fn abi_write(&self, writer: &mut AbiWriter) {
+		let is_dynamic = T::is_dynamic();
+		let mut sub = if is_dynamic {
+			AbiWriter::new_dynamic(is_dynamic)
+		} else {
+			AbiWriter::new()
+		};
+
+		// Write items count
+		(self.len() as u32).abi_write(&mut sub);
+
+		for item in self {
+			item.abi_write(&mut sub);
+		}
+		writer.write_subresult(sub);
+	}
+}
+
+impl AbiWrite for () {
+	fn abi_write(&self, _writer: &mut AbiWriter) {}
+}
+
+/// This particular AbiWrite implementation should be split to another trait,
+/// which only implements `to_result`, but due to lack of specialization feature
+/// in stable Rust, we can't have blanket impl of this trait `for T where T: AbiWrite`,
+/// so here we abusing default trait methods for it
+impl<T: AbiWrite> AbiWrite for ResultWithPostInfo<T> {
+	fn abi_write(&self, _writer: &mut AbiWriter) {
+		debug_assert!(false, "shouldn't be called, see comment")
+	}
+	fn to_result(&self) -> ResultWithPostInfo<AbiWriter> {
+		match self {
+			Ok(v) => Ok(WithPostDispatchInfo {
+				post_info: v.post_info.clone(),
+				data: {
+					let mut out = AbiWriter::new();
+					v.data.abi_write(&mut out);
+					out
+				},
+			}),
+			Err(e) => Err(e.clone()),
+		}
+	}
+}
+
+macro_rules! impl_tuples {
+	($($ident:ident)+) => {
+		impl<$($ident: AbiType,)+> AbiType for ($($ident,)+)
+		where
+        $(
+            $ident: AbiType,
+        )+
+		{
+            const SIGNATURE: SignatureUnit = make_signature!(
+                new fixed("(")
+                $(nameof(<$ident>::SIGNATURE) fixed(","))+
+                shift_left(1)
+                fixed(")")
+            );
+
+			fn is_dynamic() -> bool {
+				false
+				$(
+					|| <$ident>::is_dynamic()
+				)*
+			}
+
+			fn size() -> usize {
+				0 $(+ <$ident>::size())+
+			}
+		}
+
+		impl<$($ident),+> sealed::CanBePlacedInVec for ($($ident,)+) {}
+
+		impl<$($ident),+> AbiRead for ($($ident,)+)
+		where
+			$($ident: AbiRead,)+
+			($($ident,)+): AbiType,
+		{
+			fn abi_read(reader: &mut AbiReader) -> Result<($($ident,)+)> {
+				let size = if !<($($ident,)+)>::is_dynamic() { Some(<($($ident,)+)>::size()) } else { None };
+				let mut subresult = reader.subresult(size)?;
+				Ok((
+					$(<$ident>::abi_read(&mut subresult)?,)+
+				))
+			}
+		}
+
+		#[allow(non_snake_case)]
+		impl<$($ident),+> AbiWrite for ($($ident,)+)
+		where
+			$($ident: AbiWrite,)+
+		{
+			fn abi_write(&self, writer: &mut AbiWriter) {
+				let ($($ident,)+) = self;
+				if writer.is_dynamic {
+					let mut sub = AbiWriter::new();
+					$($ident.abi_write(&mut sub);)+
+					writer.write_subresult(sub);
+				} else {
+					$($ident.abi_write(writer);)+
+				}
+			}
+		}
+	};
+}
+
+impl_tuples! {A}
+impl_tuples! {A B}
+impl_tuples! {A B C}
+impl_tuples! {A B C D}
+impl_tuples! {A B C D E}
+impl_tuples! {A B C D E F}
+impl_tuples! {A B C D E F G}
+impl_tuples! {A B C D E F G H}
+impl_tuples! {A B C D E F G H I}
+impl_tuples! {A B C D E F G H I J}
addedcrates/evm-coder/src/abi/mod.rsdiffbeforeafterboth
--- /dev/null
+++ b/crates/evm-coder/src/abi/mod.rs
@@ -0,0 +1,339 @@
+// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.
+// This file is part of Unique Network.
+
+// Unique Network is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Unique Network is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
+
+//! Implementation of EVM RLP reader/writer
+
+#![allow(dead_code)]
+
+mod traits;
+pub use traits::*;
+mod impls;
+
+#[cfg(test)]
+mod test;
+
+#[cfg(not(feature = "std"))]
+use alloc::vec::Vec;
+use evm_core::ExitError;
+use primitive_types::{H160, U256};
+
+use crate::{
+	execution::{Result, Error},
+	types::*,
+};
+
+const ABI_ALIGNMENT: usize = 32;
+
+/// View into RLP data, which provides method to read typed items from it
+#[derive(Clone)]
+pub struct AbiReader<'i> {
+	buf: &'i [u8],
+	subresult_offset: usize,
+	offset: usize,
+}
+impl<'i> AbiReader<'i> {
+	/// Start reading RLP buffer, assuming there is no padding bytes
+	pub fn new(buf: &'i [u8]) -> Self {
+		Self {
+			buf,
+			subresult_offset: 0,
+			offset: 0,
+		}
+	}
+	/// Start reading RLP buffer, parsing first 4 bytes as selector
+	pub fn new_call(buf: &'i [u8]) -> Result<(bytes4, Self)> {
+		if buf.len() < 4 {
+			return Err(Error::Error(ExitError::OutOfOffset));
+		}
+		let mut method_id = [0; 4];
+		method_id.copy_from_slice(&buf[0..4]);
+
+		Ok((
+			method_id,
+			Self {
+				buf,
+				subresult_offset: 4,
+				offset: 4,
+			},
+		))
+	}
+
+	fn read_pad<const S: usize>(
+		buf: &[u8],
+		offset: usize,
+		pad_start: usize,
+		pad_size: usize,
+		block_start: usize,
+		block_size: usize,
+	) -> Result<[u8; S]> {
+		if buf.len() - offset < ABI_ALIGNMENT {
+			return Err(Error::Error(ExitError::OutOfOffset));
+		}
+		let mut block = [0; S];
+		let is_pad_zeroed = buf[pad_start..pad_size].iter().all(|&v| v == 0);
+		if !is_pad_zeroed {
+			return Err(Error::Error(ExitError::InvalidRange));
+		}
+		block.copy_from_slice(&buf[block_start..block_size]);
+		Ok(block)
+	}
+
+	fn read_padleft<const S: usize>(&mut self) -> Result<[u8; S]> {
+		let offset = self.offset;
+		self.offset += ABI_ALIGNMENT;
+		Self::read_pad(
+			self.buf,
+			offset,
+			offset,
+			offset + ABI_ALIGNMENT - S,
+			offset + ABI_ALIGNMENT - S,
+			offset + ABI_ALIGNMENT,
+		)
+	}
+
+	fn read_padright<const S: usize>(&mut self) -> Result<[u8; S]> {
+		let offset = self.offset;
+		self.offset += ABI_ALIGNMENT;
+		Self::read_pad(
+			self.buf,
+			offset,
+			offset + S,
+			offset + ABI_ALIGNMENT,
+			offset,
+			offset + S,
+		)
+	}
+
+	/// Read [`H160`] at current position, then advance
+	pub fn address(&mut self) -> Result<H160> {
+		Ok(H160(self.read_padleft()?))
+	}
+
+	/// Read [`bool`] at current position, then advance
+	pub fn bool(&mut self) -> Result<bool> {
+		let data: [u8; 1] = self.read_padleft()?;
+		match data[0] {
+			0 => Ok(false),
+			1 => Ok(true),
+			_ => Err(Error::Error(ExitError::InvalidRange)),
+		}
+	}
+
+	/// Read [`[u8; 4]`] at current position, then advance
+	pub fn bytes4(&mut self) -> Result<[u8; 4]> {
+		self.read_padright()
+	}
+
+	/// Read [`Vec<u8>`] at current position, then advance
+	pub fn bytes(&mut self) -> Result<Vec<u8>> {
+		let mut subresult = self.subresult(None)?;
+		let length = subresult.uint32()? as usize;
+		if subresult.buf.len() < subresult.offset + length {
+			return Err(Error::Error(ExitError::OutOfOffset));
+		}
+		Ok(subresult.buf[subresult.offset..subresult.offset + length].into())
+	}
+
+	/// Read [`string`] at current position, then advance
+	pub fn string(&mut self) -> Result<string> {
+		string::from_utf8(self.bytes()?).map_err(|_| Error::Error(ExitError::InvalidRange))
+	}
+
+	/// Read [`u8`] at current position, then advance
+	pub fn uint8(&mut self) -> Result<u8> {
+		Ok(self.read_padleft::<1>()?[0])
+	}
+
+	/// Read [`u32`] at current position, then advance
+	pub fn uint32(&mut self) -> Result<u32> {
+		Ok(u32::from_be_bytes(self.read_padleft()?))
+	}
+
+	/// Read [`u128`] at current position, then advance
+	pub fn uint128(&mut self) -> Result<u128> {
+		Ok(u128::from_be_bytes(self.read_padleft()?))
+	}
+
+	/// Read [`U256`] at current position, then advance
+	pub fn uint256(&mut self) -> Result<U256> {
+		let buf: [u8; 32] = self.read_padleft()?;
+		Ok(U256::from_big_endian(&buf))
+	}
+
+	/// Read [`u64`] at current position, then advance
+	pub fn uint64(&mut self) -> Result<u64> {
+		Ok(u64::from_be_bytes(self.read_padleft()?))
+	}
+
+	/// Read [`usize`] at current position, then advance
+	#[deprecated = "dangerous, as usize may have different width in wasm and native execution"]
+	pub fn read_usize(&mut self) -> Result<usize> {
+		Ok(usize::from_be_bytes(self.read_padleft()?))
+	}
+
+	/// Slice recursive buffer, advance one word for buffer offset
+	/// If `size` is [`None`] then [`Self::offset`] and [`Self::subresult_offset`] evals from [`Self::buf`].
+	fn subresult(&mut self, size: Option<usize>) -> Result<AbiReader<'i>> {
+		let subresult_offset = self.subresult_offset;
+		let offset = if let Some(size) = size {
+			self.offset += size;
+			self.subresult_offset += size;
+			0
+		} else {
+			self.uint32()? as usize
+		};
+
+		if offset + self.subresult_offset > self.buf.len() {
+			return Err(Error::Error(ExitError::InvalidRange));
+		}
+
+		let new_offset = offset + subresult_offset;
+		Ok(AbiReader {
+			buf: self.buf,
+			subresult_offset: new_offset,
+			offset: new_offset,
+		})
+	}
+
+	/// Is this parser reached end of buffer?
+	pub fn is_finished(&self) -> bool {
+		self.buf.len() == self.offset
+	}
+}
+
+/// Writer for RLP encoded data
+#[derive(Default)]
+pub struct AbiWriter {
+	static_part: Vec<u8>,
+	dynamic_part: Vec<(usize, AbiWriter)>,
+	had_call: bool,
+	is_dynamic: bool,
+}
+impl AbiWriter {
+	/// Initialize internal buffers for output data, assuming no padding required
+	pub fn new() -> Self {
+		Self::default()
+	}
+
+	/// Initialize internal buffers with data size
+	pub fn new_dynamic(is_dynamic: bool) -> Self {
+		Self {
+			is_dynamic,
+			..Default::default()
+		}
+	}
+	/// Initialize internal buffers, inserting method selector at beginning
+	pub fn new_call(method_id: u32) -> Self {
+		let mut val = Self::new();
+		val.static_part.extend(&method_id.to_be_bytes());
+		val.had_call = true;
+		val
+	}
+
+	fn write_padleft(&mut self, block: &[u8]) {
+		assert!(block.len() <= ABI_ALIGNMENT);
+		self.static_part
+			.extend(&[0; ABI_ALIGNMENT][0..ABI_ALIGNMENT - block.len()]);
+		self.static_part.extend(block);
+	}
+
+	fn write_padright(&mut self, block: &[u8]) {
+		assert!(block.len() <= ABI_ALIGNMENT);
+		self.static_part.extend(block);
+		self.static_part
+			.extend(&[0; ABI_ALIGNMENT][0..ABI_ALIGNMENT - block.len()]);
+	}
+
+	/// Write [`H160`] to end of buffer
+	pub fn address(&mut self, address: &H160) {
+		self.write_padleft(&address.0)
+	}
+
+	/// Write [`bool`] to end of buffer
+	pub fn bool(&mut self, value: &bool) {
+		self.write_padleft(&[if *value { 1 } else { 0 }])
+	}
+
+	/// Write [`u8`] to end of buffer
+	pub fn uint8(&mut self, value: &u8) {
+		self.write_padleft(&[*value])
+	}
+
+	/// Write [`u32`] to end of buffer
+	pub fn uint32(&mut self, value: &u32) {
+		self.write_padleft(&u32::to_be_bytes(*value))
+	}
+
+	/// Write [`u128`] to end of buffer
+	pub fn uint128(&mut self, value: &u128) {
+		self.write_padleft(&u128::to_be_bytes(*value))
+	}
+
+	/// Write [`U256`] to end of buffer
+	pub fn uint256(&mut self, value: &U256) {
+		let mut out = [0; 32];
+		value.to_big_endian(&mut out);
+		self.write_padleft(&out)
+	}
+
+	/// Write [`usize`] to end of buffer
+	#[deprecated = "dangerous, as usize may have different width in wasm and native execution"]
+	pub fn write_usize(&mut self, value: &usize) {
+		self.write_padleft(&usize::to_be_bytes(*value))
+	}
+
+	/// Append recursive data, writing pending offset at end of buffer
+	pub fn write_subresult(&mut self, result: Self) {
+		self.dynamic_part.push((self.static_part.len(), result));
+		// Empty block, to be filled later
+		self.write_padleft(&[]);
+	}
+
+	fn memory(&mut self, value: &[u8]) {
+		let mut sub = Self::new();
+		sub.uint32(&(value.len() as u32));
+		for chunk in value.chunks(ABI_ALIGNMENT) {
+			sub.write_padright(chunk);
+		}
+		self.write_subresult(sub);
+	}
+
+	/// Append recursive [`str`] at end of buffer
+	pub fn string(&mut self, value: &str) {
+		self.memory(value.as_bytes())
+	}
+
+	/// Append recursive [`[u8]`] at end of buffer
+	pub fn bytes(&mut self, value: &[u8]) {
+		self.memory(value)
+	}
+
+	/// Finish writer, concatenating all internal buffers
+	pub fn finish(mut self) -> Vec<u8> {
+		for (static_offset, part) in self.dynamic_part {
+			let part_offset = self.static_part.len()
+				- if self.had_call { 4 } else { 0 }
+				- if self.is_dynamic { ABI_ALIGNMENT } else { 0 };
+
+			let encoded_dynamic_offset = usize::to_be_bytes(part_offset);
+			let start = static_offset + ABI_ALIGNMENT - encoded_dynamic_offset.len();
+			let stop = static_offset + ABI_ALIGNMENT;
+			self.static_part[start..stop].copy_from_slice(&encoded_dynamic_offset);
+			self.static_part.extend(part.finish())
+		}
+		self.static_part
+	}
+}
addedcrates/evm-coder/src/abi/test.rsdiffbeforeafterboth
--- /dev/null
+++ b/crates/evm-coder/src/abi/test.rs
@@ -0,0 +1,297 @@
+use crate::{
+	abi::{AbiRead, AbiWrite},
+	types::*,
+};
+
+use super::{AbiReader, AbiWriter};
+use hex_literal::hex;
+use primitive_types::{H160, U256};
+use concat_idents::concat_idents;
+
+macro_rules! test_impl {
+    ($name:ident, $type:ty, $function_identifier:expr, $decoded_data:expr, $encoded_data:expr) => {
+        concat_idents!(test_name = encode_decode_, $name {
+            #[test]
+            fn test_name() {
+                let function_identifier: u32 = $function_identifier;
+                let decoded_data = $decoded_data;
+                let encoded_data = $encoded_data;
+
+                let (call, mut decoder) = AbiReader::new_call(encoded_data).unwrap();
+                assert_eq!(call, u32::to_be_bytes(function_identifier));
+                let data = <$type>::abi_read(&mut decoder).unwrap();
+                assert_eq!(data, decoded_data);
+
+                let mut writer = AbiWriter::new_call(function_identifier);
+                decoded_data.abi_write(&mut writer);
+                let ed = writer.finish();
+                similar_asserts::assert_eq!(encoded_data, ed.as_slice());
+            }
+        });
+    };
+}
+
+macro_rules! test_impl_uint {
+	($type:ident) => {
+		test_impl!(
+			$type,
+			$type,
+			0xdeadbeef,
+			255 as $type,
+			&hex!(
+				"
+                    deadbeef
+                    00000000000000000000000000000000000000000000000000000000000000ff
+                "
+			)
+		);
+	};
+}
+
+test_impl_uint!(uint8);
+test_impl_uint!(uint32);
+test_impl_uint!(uint128);
+
+test_impl!(
+	uint256,
+	uint256,
+	0xdeadbeef,
+	U256([255, 0, 0, 0]),
+	&hex!(
+		"
+            deadbeef
+            00000000000000000000000000000000000000000000000000000000000000ff
+        "
+	)
+);
+
+test_impl!(
+    vec_tuple_address_uint256,
+    Vec<(address, uint256)>,
+    0x1ACF2D55,
+    vec![
+        (
+            H160(hex!("2D2FF76104B7BACB2E8F6731D5BFC184EBECDDBC")),
+            U256([10, 0, 0, 0]),
+        ),
+        (
+            H160(hex!("AB8E3D9134955566483B11E6825C9223B6737B10")),
+            U256([20, 0, 0, 0]),
+        ),
+        (
+            H160(hex!("8C582BDF2953046705FC56F189385255EFC1BE18")),
+            U256([30, 0, 0, 0]),
+        ),
+    ],
+    &hex!(
+        "
+            1ACF2D55
+            0000000000000000000000000000000000000000000000000000000000000020 // offset of (address, uint256)[]
+            0000000000000000000000000000000000000000000000000000000000000003 // length of (address, uint256)[]
+
+            0000000000000000000000002D2FF76104B7BACB2E8F6731D5BFC184EBECDDBC // address
+            000000000000000000000000000000000000000000000000000000000000000A // uint256
+
+            000000000000000000000000AB8E3D9134955566483B11E6825C9223B6737B10 // address
+            0000000000000000000000000000000000000000000000000000000000000014 // uint256
+
+            0000000000000000000000008C582BDF2953046705FC56F189385255EFC1BE18 // address
+            000000000000000000000000000000000000000000000000000000000000001E // uint256
+        "
+    )
+);
+
+test_impl!(
+    vec_tuple_uint256_string,
+    Vec<(uint256, string)>,
+    0xdeadbeef,
+    vec![
+        (1.into(), "Test URI 0".to_string()),
+        (11.into(), "Test URI 1".to_string()),
+        (12.into(), "Test URI 2".to_string()),
+    ],
+    &hex!(
+        "
+            deadbeef
+            0000000000000000000000000000000000000000000000000000000000000020 // offset of (uint256, string)[]
+            0000000000000000000000000000000000000000000000000000000000000003 // length of (uint256, string)[]
+
+            0000000000000000000000000000000000000000000000000000000000000060 // offset of first elem
+            00000000000000000000000000000000000000000000000000000000000000e0 // offset of second elem
+            0000000000000000000000000000000000000000000000000000000000000160 // offset of third elem
+
+            0000000000000000000000000000000000000000000000000000000000000001 // first token id?   					#60
+            0000000000000000000000000000000000000000000000000000000000000040 // offset of string
+            000000000000000000000000000000000000000000000000000000000000000a // size of string
+            5465737420555249203000000000000000000000000000000000000000000000 // string
+
+            000000000000000000000000000000000000000000000000000000000000000b // second token id? Why ==11?			#e0
+            0000000000000000000000000000000000000000000000000000000000000040 // offset of string
+            000000000000000000000000000000000000000000000000000000000000000a // size of string
+            5465737420555249203100000000000000000000000000000000000000000000 // string
+
+            000000000000000000000000000000000000000000000000000000000000000c // third token id?  Why ==12?			#160
+            0000000000000000000000000000000000000000000000000000000000000040 // offset of string
+            000000000000000000000000000000000000000000000000000000000000000a // size of string
+            5465737420555249203200000000000000000000000000000000000000000000 // string
+        "
+    )
+);
+
+#[test]
+fn dynamic_after_static() {
+	let mut encoder = AbiWriter::new();
+	encoder.bool(&true);
+	encoder.string("test");
+	let encoded = encoder.finish();
+
+	let mut encoder = AbiWriter::new();
+	encoder.bool(&true);
+	// Offset to subresult
+	encoder.uint32(&(32 * 2));
+	// Len of "test"
+	encoder.uint32(&4);
+	encoder.write_padright(&[b't', b'e', b's', b't']);
+	let alternative_encoded = encoder.finish();
+
+	assert_eq!(encoded, alternative_encoded);
+
+	let mut decoder = AbiReader::new(&encoded);
+	assert!(decoder.bool().unwrap());
+	assert_eq!(decoder.string().unwrap(), "test");
+}
+
+#[test]
+fn mint_sample() {
+	let (call, mut decoder) = AbiReader::new_call(&hex!(
+		"
+            50bb4e7f
+            000000000000000000000000ad2c0954693c2b5404b7e50967d3481bea432374
+            0000000000000000000000000000000000000000000000000000000000000001
+            0000000000000000000000000000000000000000000000000000000000000060
+            0000000000000000000000000000000000000000000000000000000000000008
+            5465737420555249000000000000000000000000000000000000000000000000
+        "
+	))
+	.unwrap();
+	assert_eq!(call, u32::to_be_bytes(0x50bb4e7f));
+	assert_eq!(
+		format!("{:?}", decoder.address().unwrap()),
+		"0xad2c0954693c2b5404b7e50967d3481bea432374"
+	);
+	assert_eq!(decoder.uint32().unwrap(), 1);
+	assert_eq!(decoder.string().unwrap(), "Test URI");
+}
+
+#[test]
+fn parse_vec_with_dynamic_type() {
+	let decoded_data = (
+		0x36543006,
+		vec![
+			(1.into(), "Test URI 0".to_string()),
+			(11.into(), "Test URI 1".to_string()),
+			(12.into(), "Test URI 2".to_string()),
+		],
+	);
+
+	let encoded_data = &hex!(
+        "
+            36543006
+            00000000000000000000000053744e6da587ba10b32a2554d2efdcd985bc27a3 // address
+            0000000000000000000000000000000000000000000000000000000000000040 // offset of (uint256, string)[]
+            0000000000000000000000000000000000000000000000000000000000000003 // length of (uint256, string)[]
+
+            0000000000000000000000000000000000000000000000000000000000000060 // offset of first elem
+            00000000000000000000000000000000000000000000000000000000000000e0 // offset of second elem
+            0000000000000000000000000000000000000000000000000000000000000160 // offset of third elem
+
+            0000000000000000000000000000000000000000000000000000000000000001 // first token id?   					#60
+            0000000000000000000000000000000000000000000000000000000000000040 // offset of string
+            000000000000000000000000000000000000000000000000000000000000000a // size of string
+            5465737420555249203000000000000000000000000000000000000000000000 // string
+
+            000000000000000000000000000000000000000000000000000000000000000b // second token id? Why ==11?			#e0
+            0000000000000000000000000000000000000000000000000000000000000040 // offset of string
+            000000000000000000000000000000000000000000000000000000000000000a // size of string
+            5465737420555249203100000000000000000000000000000000000000000000 // string
+
+            000000000000000000000000000000000000000000000000000000000000000c // third token id?  Why ==12?			#160
+            0000000000000000000000000000000000000000000000000000000000000040 // offset of string
+            000000000000000000000000000000000000000000000000000000000000000a // size of string
+            5465737420555249203200000000000000000000000000000000000000000000 // string
+        "
+    );
+
+	let (call, mut decoder) = AbiReader::new_call(encoded_data).unwrap();
+	assert_eq!(call, u32::to_be_bytes(decoded_data.0));
+	let address = decoder.address().unwrap();
+	let data = <Vec<(uint256, string)>>::abi_read(&mut decoder).unwrap();
+	assert_eq!(data, decoded_data.1);
+
+	let mut writer = AbiWriter::new_call(decoded_data.0);
+	address.abi_write(&mut writer);
+	decoded_data.1.abi_write(&mut writer);
+	let ed = writer.finish();
+	similar_asserts::assert_eq!(encoded_data, ed.as_slice());
+}
+
+test_impl!(
+	vec_tuple_string_bytes,
+	Vec<(string, bytes)>,
+	0xdeadbeef,
+	vec![
+		(
+			"Test URI 0".to_string(),
+			bytes(vec![
+				0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11,
+				0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11,
+				0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11,
+				0x11, 0x11, 0x11, 0x11, 0x11, 0x11
+			])
+		),
+		(
+			"Test URI 1".to_string(),
+			bytes(vec![
+				0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22,
+				0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22,
+				0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22,
+				0x22, 0x22, 0x22, 0x22, 0x22
+			])
+		),
+		("Test URI 2".to_string(), bytes(vec![0x33, 0x33])),
+	],
+	&hex!(
+		"
+            deadbeef
+            0000000000000000000000000000000000000000000000000000000000000020
+            0000000000000000000000000000000000000000000000000000000000000003
+            
+            0000000000000000000000000000000000000000000000000000000000000060
+            0000000000000000000000000000000000000000000000000000000000000140
+            0000000000000000000000000000000000000000000000000000000000000220
+
+            0000000000000000000000000000000000000000000000000000000000000040
+            0000000000000000000000000000000000000000000000000000000000000080
+            000000000000000000000000000000000000000000000000000000000000000a
+            5465737420555249203000000000000000000000000000000000000000000000
+            0000000000000000000000000000000000000000000000000000000000000030
+            1111111111111111111111111111111111111111111111111111111111111111
+            1111111111111111111111111111111100000000000000000000000000000000
+
+            0000000000000000000000000000000000000000000000000000000000000040
+            0000000000000000000000000000000000000000000000000000000000000080
+            000000000000000000000000000000000000000000000000000000000000000a
+            5465737420555249203100000000000000000000000000000000000000000000
+            000000000000000000000000000000000000000000000000000000000000002f
+            2222222222222222222222222222222222222222222222222222222222222222
+            2222222222222222222222222222220000000000000000000000000000000000
+
+            0000000000000000000000000000000000000000000000000000000000000040
+            0000000000000000000000000000000000000000000000000000000000000080
+            000000000000000000000000000000000000000000000000000000000000000a
+            5465737420555249203200000000000000000000000000000000000000000000
+            0000000000000000000000000000000000000000000000000000000000000002
+            3333000000000000000000000000000000000000000000000000000000000000
+        "
+	)
+);
addedcrates/evm-coder/src/abi/traits.rsdiffbeforeafterboth
--- /dev/null
+++ b/crates/evm-coder/src/abi/traits.rs
@@ -0,0 +1,51 @@
+use super::{AbiReader, AbiWriter};
+use crate::{
+	custom_signature::*,
+	execution::{Result, ResultWithPostInfo},
+};
+use core::str::from_utf8;
+
+/// Helper for type.
+pub trait AbiType {
+	/// Signature for Etherium ABI.
+	const SIGNATURE: SignatureUnit;
+
+	/// Signature as str.
+	fn as_str() -> &'static str {
+		from_utf8(&Self::SIGNATURE.data[..Self::SIGNATURE.len]).expect("bad utf-8")
+	}
+
+	/// Is type dynamic sized.
+	fn is_dynamic() -> bool;
+
+	/// Size for type aligned to [`ABI_ALIGNMENT`].
+	fn size() -> usize;
+}
+
+/// Sealed traits.
+pub mod sealed {
+	/// Not all types can be placed in vec, i.e `Vec<u8>` is restricted, `bytes` should be used instead
+	pub trait CanBePlacedInVec {}
+}
+
+/// [`AbiReader`] implements reading of many types.
+pub trait AbiRead {
+	/// Read item from current position, advanding decoder
+	fn abi_read(reader: &mut AbiReader) -> Result<Self>
+	where
+		Self: Sized;
+}
+
+/// For questions about inability to provide custom implementations,
+/// see [`AbiRead`]
+pub trait AbiWrite {
+	/// Write value to end of specified encoder
+	fn abi_write(&self, writer: &mut AbiWriter);
+	/// Specialization for [`crate::solidity_interface`] implementation,
+	/// see comment in `impl AbiWrite for ResultWithPostInfo`
+	fn to_result(&self) -> ResultWithPostInfo<AbiWriter> {
+		let mut writer = AbiWriter::new();
+		self.abi_write(&mut writer);
+		Ok(writer.into())
+	}
+}
modifiedcrates/evm-coder/src/lib.rsdiffbeforeafterboth
--- a/crates/evm-coder/src/lib.rs
+++ b/crates/evm-coder/src/lib.rs
@@ -121,53 +121,24 @@
 	use alloc::{vec::Vec};
 	use pallet_evm::account::CrossAccountId;
 	use primitive_types::{U256, H160, H256};
-	use core::str::from_utf8;
-
-	use crate::custom_signature::SignatureUnit;
-
-	pub trait Signature {
-		const SIGNATURE: SignatureUnit;
-
-		fn as_str() -> &'static str {
-			from_utf8(&Self::SIGNATURE.data[..Self::SIGNATURE.len]).expect("bad utf-8")
-		}
-	}
-
-	impl Signature for 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 {
-				const SIGNATURE: SignatureUnit = 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);
+	pub type address = H160;
+	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 type bytes4 = [u8; 4];
+	pub type topic = H256;
 
 	#[cfg(not(feature = "std"))]
-	define_simple_type!(type string = ::alloc::string::String);
+	pub type string = ::alloc::string::String;
 	#[cfg(feature = "std")]
-	define_simple_type!(type string = ::std::string::String);
+	pub type string = ::std::string::String;
 
 	#[derive(Default, Debug, PartialEq)]
 	pub struct bytes(pub Vec<u8>);
-	impl Signature for bytes {
-		const SIGNATURE: SignatureUnit = make_signature!(new fixed("bytes"));
-	}
 
 	/// Solidity doesn't have `void` type, however we have special implementation
 	/// for empty tuple return type
@@ -257,10 +228,6 @@
 				Err("All fields of cross account is non zeroed".into())
 			}
 		}
-	}
-
-	impl Signature for EthCrossAccount {
-		const SIGNATURE: SignatureUnit = make_signature!(new fixed("(address,uint256)"));
 	}
 
 	/// Convert `CrossAccountId` to `uint256`.
modifiedcrates/evm-coder/tests/random.rsdiffbeforeafterboth
--- a/crates/evm-coder/tests/random.rs
+++ b/crates/evm-coder/tests/random.rs
@@ -16,8 +16,9 @@
 
 #![allow(dead_code)] // This test only checks that macros is not panicking
 
-use evm_coder::{ToLog, execution::Result, solidity_interface, types::*, solidity, weight};
-use evm_coder::{types::Signature};
+use evm_coder::{
+	abi::AbiType, ToLog, execution::Result, solidity_interface, types::*, solidity, weight,
+};
 
 pub struct Impls;
 
modifiedcrates/evm-coder/tests/solidity_generation.rsdiffbeforeafterboth
--- a/crates/evm-coder/tests/solidity_generation.rs
+++ b/crates/evm-coder/tests/solidity_generation.rs
@@ -14,8 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
 
-use evm_coder::{execution::Result, generate_stubgen, solidity_interface, types::*};
-use evm_coder::{types::Signature};
+use evm_coder::{abi::AbiType, execution::Result, generate_stubgen, solidity_interface, types::*};
 
 pub struct ERC20;
 
modifiedpallets/common/src/erc.rsdiffbeforeafterboth
--- a/pallets/common/src/erc.rs
+++ b/pallets/common/src/erc.rs
@@ -17,6 +17,7 @@
 //! This module contains the implementation of pallet methods for evm.
 
 use evm_coder::{
+	abi::AbiType,
 	solidity_interface, solidity, ToLog,
 	types::*,
 	execution::{Result, Error},
modifiedpallets/evm-contract-helpers/src/eth.rsdiffbeforeafterboth
before · pallets/evm-contract-helpers/src/eth.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//! Implementation of magic contract1819extern crate alloc;20use core::marker::PhantomData;21use evm_coder::{22	abi::AbiWriter, execution::Result, generate_stubgen, solidity_interface, types::*, ToLog,23};24use pallet_evm::{25	ExitRevert, OnCreate, OnMethodCall, PrecompileResult, PrecompileFailure, PrecompileHandle,26	account::CrossAccountId,27};28use pallet_evm_coder_substrate::{SubstrateRecorder, WithRecorder, dispatch_to_evm};29use pallet_evm_transaction_payment::CallContext;30use sp_core::{H160, U256};31use up_data_structs::SponsorshipState;32use crate::{33	AllowlistEnabled, Config, Owner, Pallet, SponsorBasket, SponsoringFeeLimit,34	SponsoringRateLimit, SponsoringModeT, Sponsoring,35};36use frame_support::traits::Get;37use up_sponsorship::SponsorshipHandler;38use sp_std::vec::Vec;3940/// Pallet events.41#[derive(ToLog)]42pub enum ContractHelpersEvents {43	/// Contract sponsor was set.44	ContractSponsorSet {45		/// Contract address of the affected collection.46		#[indexed]47		contract_address: address,48		/// New sponsor address.49		sponsor: address,50	},5152	/// New sponsor was confirm.53	ContractSponsorshipConfirmed {54		/// Contract address of the affected collection.55		#[indexed]56		contract_address: address,57		/// New sponsor address.58		sponsor: address,59	},6061	/// Collection sponsor was removed.62	ContractSponsorRemoved {63		/// Contract address of the affected collection.64		#[indexed]65		contract_address: address,66	},67}6869/// See [`ContractHelpersCall`]70pub struct ContractHelpers<T: Config>(SubstrateRecorder<T>);71impl<T: Config> WithRecorder<T> for ContractHelpers<T> {72	fn recorder(&self) -> &SubstrateRecorder<T> {73		&self.074	}7576	fn into_recorder(self) -> SubstrateRecorder<T> {77		self.078	}79}8081/// @title Magic contract, which allows users to reconfigure other contracts82#[solidity_interface(name = ContractHelpers, events(ContractHelpersEvents))]83impl<T: Config> ContractHelpers<T>84where85	T::AccountId: AsRef<[u8; 32]>,86{87	/// Get user, which deployed specified contract88	/// @dev May return zero address in case if contract is deployed89	///  using uniquenetwork evm-migration pallet, or using other terms not90	///  intended by pallet-evm91	/// @dev Returns zero address if contract does not exists92	/// @param contractAddress Contract to get owner of93	/// @return address Owner of contract94	fn contract_owner(&self, contract_address: address) -> Result<address> {95		Ok(<Owner<T>>::get(contract_address))96	}9798	/// Set sponsor.99	/// @param contractAddress Contract for which a sponsor is being established.100	/// @param sponsor User address who set as pending sponsor.101	fn set_sponsor(102		&mut self,103		caller: caller,104		contract_address: address,105		sponsor: address,106	) -> Result<void> {107		self.recorder().consume_sload()?;108		self.recorder().consume_sstore()?;109110		Pallet::<T>::set_sponsor(111			&T::CrossAccountId::from_eth(caller),112			contract_address,113			&T::CrossAccountId::from_eth(sponsor),114		)115		.map_err(dispatch_to_evm::<T>)?;116117		Ok(())118	}119120	/// Set contract as self sponsored.121	///122	/// @param contractAddress Contract for which a self sponsoring is being enabled.123	fn self_sponsored_enable(&mut self, caller: caller, contract_address: address) -> Result<void> {124		self.recorder().consume_sload()?;125		self.recorder().consume_sstore()?;126127		let caller = T::CrossAccountId::from_eth(caller);128129		Pallet::<T>::ensure_owner(contract_address, *caller.as_eth())130			.map_err(dispatch_to_evm::<T>)?;131132		Pallet::<T>::force_set_sponsor(133			contract_address,134			&T::CrossAccountId::from_eth(contract_address),135		)136		.map_err(dispatch_to_evm::<T>)?;137138		Ok(())139	}140141	/// Remove sponsor.142	///143	/// @param contractAddress Contract for which a sponsorship is being removed.144	fn remove_sponsor(&mut self, caller: caller, contract_address: address) -> Result<void> {145		self.recorder().consume_sload()?;146		self.recorder().consume_sstore()?;147148		Pallet::<T>::remove_sponsor(&T::CrossAccountId::from_eth(caller), contract_address)149			.map_err(dispatch_to_evm::<T>)?;150151		Ok(())152	}153154	/// Confirm sponsorship.155	///156	/// @dev Caller must be same that set via [`setSponsor`].157	///158	/// @param contractAddress Сontract for which need to confirm sponsorship.159	fn confirm_sponsorship(&mut self, caller: caller, contract_address: address) -> Result<void> {160		self.recorder().consume_sload()?;161		self.recorder().consume_sstore()?;162163		Pallet::<T>::confirm_sponsorship(&T::CrossAccountId::from_eth(caller), contract_address)164			.map_err(dispatch_to_evm::<T>)?;165166		Ok(())167	}168169	/// Get current sponsor.170	///171	/// @param contractAddress The contract for which a sponsor is requested.172	/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.173	fn sponsor(&self, contract_address: address) -> Result<(address, uint256)> {174		let sponsor =175			Pallet::<T>::get_sponsor(contract_address).ok_or("Contract has no sponsor")?;176		Ok(pallet_common::eth::convert_cross_account_to_tuple::<T>(177			&sponsor,178		))179	}180181	/// Check tat contract has confirmed sponsor.182	///183	/// @param contractAddress The contract for which the presence of a confirmed sponsor is checked.184	/// @return **true** if contract has confirmed sponsor.185	fn has_sponsor(&self, contract_address: address) -> Result<bool> {186		Ok(Pallet::<T>::get_sponsor(contract_address).is_some())187	}188189	/// Check tat contract has pending sponsor.190	///191	/// @param contractAddress The contract for which the presence of a pending sponsor is checked.192	/// @return **true** if contract has pending sponsor.193	fn has_pending_sponsor(&self, contract_address: address) -> Result<bool> {194		Ok(match Sponsoring::<T>::get(contract_address) {195			SponsorshipState::Disabled | SponsorshipState::Confirmed(_) => false,196			SponsorshipState::Unconfirmed(_) => true,197		})198	}199200	fn sponsoring_enabled(&self, contract_address: address) -> Result<bool> {201		Ok(<Pallet<T>>::sponsoring_mode(contract_address) != SponsoringModeT::Disabled)202	}203204	fn set_sponsoring_mode(205		&mut self,206		caller: caller,207		contract_address: address,208		// TODO: implement support for enums in evm-coder209		mode: uint8,210	) -> Result<void> {211		self.recorder().consume_sload()?;212		self.recorder().consume_sstore()?;213214		<Pallet<T>>::ensure_owner(contract_address, caller).map_err(dispatch_to_evm::<T>)?;215		let mode = SponsoringModeT::from_eth(mode).ok_or("unknown mode")?;216		<Pallet<T>>::set_sponsoring_mode(contract_address, mode);217218		Ok(())219	}220221	/// Get current contract sponsoring rate limit222	/// @param contractAddress Contract to get sponsoring rate limit of223	/// @return uint32 Amount of blocks between two sponsored transactions224	fn sponsoring_rate_limit(&self, contract_address: address) -> Result<uint32> {225		self.recorder().consume_sload()?;226227		Ok(<SponsoringRateLimit<T>>::get(contract_address)228			.try_into()229			.map_err(|_| "rate limit > u32::MAX")?)230	}231232	/// Set contract sponsoring rate limit233	/// @dev Sponsoring rate limit - is a minimum amount of blocks that should234	///  pass between two sponsored transactions235	/// @param contractAddress Contract to change sponsoring rate limit of236	/// @param rateLimit Target rate limit237	/// @dev Only contract owner can change this setting238	fn set_sponsoring_rate_limit(239		&mut self,240		caller: caller,241		contract_address: address,242		rate_limit: uint32,243	) -> Result<void> {244		self.recorder().consume_sload()?;245		self.recorder().consume_sstore()?;246247		<Pallet<T>>::ensure_owner(contract_address, caller).map_err(dispatch_to_evm::<T>)?;248		<Pallet<T>>::set_sponsoring_rate_limit(contract_address, rate_limit.into());249		Ok(())250	}251252	/// Set contract sponsoring fee limit253	/// @dev Sponsoring fee limit - is maximum fee that could be spent by254	///  single transaction255	/// @param contractAddress Contract to change sponsoring fee limit of256	/// @param feeLimit Fee limit257	/// @dev Only contract owner can change this setting258	fn set_sponsoring_fee_limit(259		&mut self,260		caller: caller,261		contract_address: address,262		fee_limit: uint256,263	) -> Result<void> {264		self.recorder().consume_sload()?;265		self.recorder().consume_sstore()?;266267		<Pallet<T>>::ensure_owner(contract_address, caller).map_err(dispatch_to_evm::<T>)?;268		<Pallet<T>>::set_sponsoring_fee_limit(contract_address, fee_limit.into())269			.map_err(dispatch_to_evm::<T>)?;270		Ok(())271	}272273	/// Get current contract sponsoring fee limit274	/// @param contractAddress Contract to get sponsoring fee limit of275	/// @return uint256 Maximum amount of fee that could be spent by single276	///  transaction277	fn sponsoring_fee_limit(&self, contract_address: address) -> Result<uint256> {278		self.recorder().consume_sload()?;279280		Ok(get_sponsoring_fee_limit::<T>(contract_address))281	}282283	/// Is specified user present in contract allow list284	/// @dev Contract owner always implicitly included285	/// @param contractAddress Contract to check allowlist of286	/// @param user User to check287	/// @return bool Is specified users exists in contract allowlist288	fn allowed(&self, contract_address: address, user: address) -> Result<bool> {289		self.0.consume_sload()?;290		Ok(<Pallet<T>>::allowed(contract_address, user))291	}292293	/// Toggle user presence in contract allowlist294	/// @param contractAddress Contract to change allowlist of295	/// @param user Which user presence should be toggled296	/// @param isAllowed `true` if user should be allowed to be sponsored297	///  or call this contract, `false` otherwise298	/// @dev Only contract owner can change this setting299	fn toggle_allowed(300		&mut self,301		caller: caller,302		contract_address: address,303		user: address,304		is_allowed: bool,305	) -> Result<void> {306		self.recorder().consume_sload()?;307		self.recorder().consume_sstore()?;308309		<Pallet<T>>::ensure_owner(contract_address, caller).map_err(dispatch_to_evm::<T>)?;310		<Pallet<T>>::toggle_allowed(contract_address, user, is_allowed);311312		Ok(())313	}314315	/// Is this contract has allowlist access enabled316	/// @dev Allowlist always can have users, and it is used for two purposes:317	///  in case of allowlist sponsoring mode, users will be sponsored if they exist in allowlist318	///  in case of allowlist access enabled, only users from allowlist may call this contract319	/// @param contractAddress Contract to get allowlist access of320	/// @return bool Is specified contract has allowlist access enabled321	fn allowlist_enabled(&self, contract_address: address) -> Result<bool> {322		Ok(<AllowlistEnabled<T>>::get(contract_address))323	}324325	/// Toggle contract allowlist access326	/// @param contractAddress Contract to change allowlist access of327	/// @param enabled Should allowlist access to be enabled?328	fn toggle_allowlist(329		&mut self,330		caller: caller,331		contract_address: address,332		enabled: bool,333	) -> Result<void> {334		self.recorder().consume_sload()?;335		self.recorder().consume_sstore()?;336337		<Pallet<T>>::ensure_owner(contract_address, caller).map_err(dispatch_to_evm::<T>)?;338		<Pallet<T>>::toggle_allowlist(contract_address, enabled);339		Ok(())340	}341}342343/// Implements [`OnMethodCall`], which delegates call to [`ContractHelpers`]344pub struct HelpersOnMethodCall<T: Config>(PhantomData<*const T>);345impl<T: Config> OnMethodCall<T> for HelpersOnMethodCall<T>346where347	T::AccountId: AsRef<[u8; 32]>,348{349	fn is_reserved(contract: &sp_core::H160) -> bool {350		contract == &T::ContractAddress::get()351	}352353	fn is_used(contract: &sp_core::H160) -> bool {354		contract == &T::ContractAddress::get()355	}356357	fn call(handle: &mut impl PrecompileHandle) -> Option<PrecompileResult> {358		// TODO: Extract to another OnMethodCall handler359		if <AllowlistEnabled<T>>::get(handle.code_address())360			&& !<Pallet<T>>::allowed(handle.code_address(), handle.context().caller)361		{362			return Some(Err(PrecompileFailure::Revert {363				exit_status: ExitRevert::Reverted,364				output: {365					let mut writer = AbiWriter::new_call(evm_coder::fn_selector!(Error(string)));366					writer.string("Target contract is allowlisted");367					writer.finish()368				},369			}));370		}371372		if handle.code_address() != T::ContractAddress::get() {373			return None;374		}375376		let helpers = ContractHelpers::<T>(SubstrateRecorder::<T>::new(handle.remaining_gas()));377		pallet_evm_coder_substrate::call(handle, helpers)378	}379380	fn get_code(contract: &sp_core::H160) -> Option<Vec<u8>> {381		(contract == &T::ContractAddress::get())382			.then(|| include_bytes!("./stubs/ContractHelpers.raw").to_vec())383	}384}385386/// Hooks into contract creation, storing owner of newly deployed contract387pub struct HelpersOnCreate<T: Config>(PhantomData<*const T>);388impl<T: Config> OnCreate<T> for HelpersOnCreate<T> {389	fn on_create(owner: H160, contract: H160) {390		<Owner<T>>::insert(contract, owner);391	}392}393394/// Bridge to pallet-sponsoring395pub struct HelpersContractSponsoring<T: Config>(PhantomData<*const T>);396impl<T: Config> SponsorshipHandler<T::CrossAccountId, CallContext>397	for HelpersContractSponsoring<T>398{399	fn get_sponsor(400		who: &T::CrossAccountId,401		call_context: &CallContext,402	) -> Option<T::CrossAccountId> {403		let contract_address = call_context.contract_address;404		let mode = <Pallet<T>>::sponsoring_mode(contract_address);405		if mode == SponsoringModeT::Disabled {406			return None;407		}408409		let sponsor = match <Pallet<T>>::get_sponsor(contract_address) {410			Some(sponsor) => sponsor,411			None => return None,412		};413414		if mode == SponsoringModeT::Allowlisted415			&& !<Pallet<T>>::allowed(contract_address, *who.as_eth())416		{417			return None;418		}419		let block_number = <frame_system::Pallet<T>>::block_number() as T::BlockNumber;420421		if let Some(last_tx_block) = <SponsorBasket<T>>::get(contract_address, who.as_eth()) {422			let limit = <SponsoringRateLimit<T>>::get(contract_address);423424			let timeout = last_tx_block + limit;425			if block_number < timeout {426				return None;427			}428		}429430		let sponsored_fee_limit = get_sponsoring_fee_limit::<T>(contract_address);431432		if call_context.max_fee > sponsored_fee_limit {433			return None;434		}435436		<SponsorBasket<T>>::insert(contract_address, who.as_eth(), block_number);437438		Some(sponsor)439	}440}441442fn get_sponsoring_fee_limit<T: Config>(contract_address: address) -> uint256 {443	<SponsoringFeeLimit<T>>::get(contract_address)444		.get(&0xffffffff)445		.cloned()446		.unwrap_or(U256::MAX)447}448449generate_stubgen!(contract_helpers_impl, ContractHelpersCall<()>, true);450generate_stubgen!(contract_helpers_iface, ContractHelpersCall<()>, false);
after · pallets/evm-contract-helpers/src/eth.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//! Implementation of magic contract1819extern crate alloc;20use core::marker::PhantomData;21use evm_coder::{22	abi::{AbiWriter, AbiType},23	execution::Result,24	generate_stubgen, solidity_interface,25	types::*,26	ToLog,27};28use pallet_evm::{29	ExitRevert, OnCreate, OnMethodCall, PrecompileResult, PrecompileFailure, PrecompileHandle,30	account::CrossAccountId,31};32use pallet_evm_coder_substrate::{SubstrateRecorder, WithRecorder, dispatch_to_evm};33use pallet_evm_transaction_payment::CallContext;34use sp_core::{H160, U256};35use up_data_structs::SponsorshipState;36use crate::{37	AllowlistEnabled, Config, Owner, Pallet, SponsorBasket, SponsoringFeeLimit,38	SponsoringRateLimit, SponsoringModeT, Sponsoring,39};40use frame_support::traits::Get;41use up_sponsorship::SponsorshipHandler;42use sp_std::vec::Vec;4344/// Pallet events.45#[derive(ToLog)]46pub enum ContractHelpersEvents {47	/// Contract sponsor was set.48	ContractSponsorSet {49		/// Contract address of the affected collection.50		#[indexed]51		contract_address: address,52		/// New sponsor address.53		sponsor: address,54	},5556	/// New sponsor was confirm.57	ContractSponsorshipConfirmed {58		/// Contract address of the affected collection.59		#[indexed]60		contract_address: address,61		/// New sponsor address.62		sponsor: address,63	},6465	/// Collection sponsor was removed.66	ContractSponsorRemoved {67		/// Contract address of the affected collection.68		#[indexed]69		contract_address: address,70	},71}7273/// See [`ContractHelpersCall`]74pub struct ContractHelpers<T: Config>(SubstrateRecorder<T>);75impl<T: Config> WithRecorder<T> for ContractHelpers<T> {76	fn recorder(&self) -> &SubstrateRecorder<T> {77		&self.078	}7980	fn into_recorder(self) -> SubstrateRecorder<T> {81		self.082	}83}8485/// @title Magic contract, which allows users to reconfigure other contracts86#[solidity_interface(name = ContractHelpers, events(ContractHelpersEvents))]87impl<T: Config> ContractHelpers<T>88where89	T::AccountId: AsRef<[u8; 32]>,90{91	/// Get user, which deployed specified contract92	/// @dev May return zero address in case if contract is deployed93	///  using uniquenetwork evm-migration pallet, or using other terms not94	///  intended by pallet-evm95	/// @dev Returns zero address if contract does not exists96	/// @param contractAddress Contract to get owner of97	/// @return address Owner of contract98	fn contract_owner(&self, contract_address: address) -> Result<address> {99		Ok(<Owner<T>>::get(contract_address))100	}101102	/// Set sponsor.103	/// @param contractAddress Contract for which a sponsor is being established.104	/// @param sponsor User address who set as pending sponsor.105	fn set_sponsor(106		&mut self,107		caller: caller,108		contract_address: address,109		sponsor: address,110	) -> Result<void> {111		self.recorder().consume_sload()?;112		self.recorder().consume_sstore()?;113114		Pallet::<T>::set_sponsor(115			&T::CrossAccountId::from_eth(caller),116			contract_address,117			&T::CrossAccountId::from_eth(sponsor),118		)119		.map_err(dispatch_to_evm::<T>)?;120121		Ok(())122	}123124	/// Set contract as self sponsored.125	///126	/// @param contractAddress Contract for which a self sponsoring is being enabled.127	fn self_sponsored_enable(&mut self, caller: caller, contract_address: address) -> Result<void> {128		self.recorder().consume_sload()?;129		self.recorder().consume_sstore()?;130131		let caller = T::CrossAccountId::from_eth(caller);132133		Pallet::<T>::ensure_owner(contract_address, *caller.as_eth())134			.map_err(dispatch_to_evm::<T>)?;135136		Pallet::<T>::force_set_sponsor(137			contract_address,138			&T::CrossAccountId::from_eth(contract_address),139		)140		.map_err(dispatch_to_evm::<T>)?;141142		Ok(())143	}144145	/// Remove sponsor.146	///147	/// @param contractAddress Contract for which a sponsorship is being removed.148	fn remove_sponsor(&mut self, caller: caller, contract_address: address) -> Result<void> {149		self.recorder().consume_sload()?;150		self.recorder().consume_sstore()?;151152		Pallet::<T>::remove_sponsor(&T::CrossAccountId::from_eth(caller), contract_address)153			.map_err(dispatch_to_evm::<T>)?;154155		Ok(())156	}157158	/// Confirm sponsorship.159	///160	/// @dev Caller must be same that set via [`setSponsor`].161	///162	/// @param contractAddress Сontract for which need to confirm sponsorship.163	fn confirm_sponsorship(&mut self, caller: caller, contract_address: address) -> Result<void> {164		self.recorder().consume_sload()?;165		self.recorder().consume_sstore()?;166167		Pallet::<T>::confirm_sponsorship(&T::CrossAccountId::from_eth(caller), contract_address)168			.map_err(dispatch_to_evm::<T>)?;169170		Ok(())171	}172173	/// Get current sponsor.174	///175	/// @param contractAddress The contract for which a sponsor is requested.176	/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.177	fn sponsor(&self, contract_address: address) -> Result<(address, uint256)> {178		let sponsor =179			Pallet::<T>::get_sponsor(contract_address).ok_or("Contract has no sponsor")?;180		Ok(pallet_common::eth::convert_cross_account_to_tuple::<T>(181			&sponsor,182		))183	}184185	/// Check tat contract has confirmed sponsor.186	///187	/// @param contractAddress The contract for which the presence of a confirmed sponsor is checked.188	/// @return **true** if contract has confirmed sponsor.189	fn has_sponsor(&self, contract_address: address) -> Result<bool> {190		Ok(Pallet::<T>::get_sponsor(contract_address).is_some())191	}192193	/// Check tat contract has pending sponsor.194	///195	/// @param contractAddress The contract for which the presence of a pending sponsor is checked.196	/// @return **true** if contract has pending sponsor.197	fn has_pending_sponsor(&self, contract_address: address) -> Result<bool> {198		Ok(match Sponsoring::<T>::get(contract_address) {199			SponsorshipState::Disabled | SponsorshipState::Confirmed(_) => false,200			SponsorshipState::Unconfirmed(_) => true,201		})202	}203204	fn sponsoring_enabled(&self, contract_address: address) -> Result<bool> {205		Ok(<Pallet<T>>::sponsoring_mode(contract_address) != SponsoringModeT::Disabled)206	}207208	fn set_sponsoring_mode(209		&mut self,210		caller: caller,211		contract_address: address,212		// TODO: implement support for enums in evm-coder213		mode: uint8,214	) -> Result<void> {215		self.recorder().consume_sload()?;216		self.recorder().consume_sstore()?;217218		<Pallet<T>>::ensure_owner(contract_address, caller).map_err(dispatch_to_evm::<T>)?;219		let mode = SponsoringModeT::from_eth(mode).ok_or("unknown mode")?;220		<Pallet<T>>::set_sponsoring_mode(contract_address, mode);221222		Ok(())223	}224225	/// Get current contract sponsoring rate limit226	/// @param contractAddress Contract to get sponsoring rate limit of227	/// @return uint32 Amount of blocks between two sponsored transactions228	fn sponsoring_rate_limit(&self, contract_address: address) -> Result<uint32> {229		self.recorder().consume_sload()?;230231		Ok(<SponsoringRateLimit<T>>::get(contract_address)232			.try_into()233			.map_err(|_| "rate limit > u32::MAX")?)234	}235236	/// Set contract sponsoring rate limit237	/// @dev Sponsoring rate limit - is a minimum amount of blocks that should238	///  pass between two sponsored transactions239	/// @param contractAddress Contract to change sponsoring rate limit of240	/// @param rateLimit Target rate limit241	/// @dev Only contract owner can change this setting242	fn set_sponsoring_rate_limit(243		&mut self,244		caller: caller,245		contract_address: address,246		rate_limit: uint32,247	) -> Result<void> {248		self.recorder().consume_sload()?;249		self.recorder().consume_sstore()?;250251		<Pallet<T>>::ensure_owner(contract_address, caller).map_err(dispatch_to_evm::<T>)?;252		<Pallet<T>>::set_sponsoring_rate_limit(contract_address, rate_limit.into());253		Ok(())254	}255256	/// Set contract sponsoring fee limit257	/// @dev Sponsoring fee limit - is maximum fee that could be spent by258	///  single transaction259	/// @param contractAddress Contract to change sponsoring fee limit of260	/// @param feeLimit Fee limit261	/// @dev Only contract owner can change this setting262	fn set_sponsoring_fee_limit(263		&mut self,264		caller: caller,265		contract_address: address,266		fee_limit: uint256,267	) -> Result<void> {268		self.recorder().consume_sload()?;269		self.recorder().consume_sstore()?;270271		<Pallet<T>>::ensure_owner(contract_address, caller).map_err(dispatch_to_evm::<T>)?;272		<Pallet<T>>::set_sponsoring_fee_limit(contract_address, fee_limit.into())273			.map_err(dispatch_to_evm::<T>)?;274		Ok(())275	}276277	/// Get current contract sponsoring fee limit278	/// @param contractAddress Contract to get sponsoring fee limit of279	/// @return uint256 Maximum amount of fee that could be spent by single280	///  transaction281	fn sponsoring_fee_limit(&self, contract_address: address) -> Result<uint256> {282		self.recorder().consume_sload()?;283284		Ok(get_sponsoring_fee_limit::<T>(contract_address))285	}286287	/// Is specified user present in contract allow list288	/// @dev Contract owner always implicitly included289	/// @param contractAddress Contract to check allowlist of290	/// @param user User to check291	/// @return bool Is specified users exists in contract allowlist292	fn allowed(&self, contract_address: address, user: address) -> Result<bool> {293		self.0.consume_sload()?;294		Ok(<Pallet<T>>::allowed(contract_address, user))295	}296297	/// Toggle user presence in contract allowlist298	/// @param contractAddress Contract to change allowlist of299	/// @param user Which user presence should be toggled300	/// @param isAllowed `true` if user should be allowed to be sponsored301	///  or call this contract, `false` otherwise302	/// @dev Only contract owner can change this setting303	fn toggle_allowed(304		&mut self,305		caller: caller,306		contract_address: address,307		user: address,308		is_allowed: bool,309	) -> Result<void> {310		self.recorder().consume_sload()?;311		self.recorder().consume_sstore()?;312313		<Pallet<T>>::ensure_owner(contract_address, caller).map_err(dispatch_to_evm::<T>)?;314		<Pallet<T>>::toggle_allowed(contract_address, user, is_allowed);315316		Ok(())317	}318319	/// Is this contract has allowlist access enabled320	/// @dev Allowlist always can have users, and it is used for two purposes:321	///  in case of allowlist sponsoring mode, users will be sponsored if they exist in allowlist322	///  in case of allowlist access enabled, only users from allowlist may call this contract323	/// @param contractAddress Contract to get allowlist access of324	/// @return bool Is specified contract has allowlist access enabled325	fn allowlist_enabled(&self, contract_address: address) -> Result<bool> {326		Ok(<AllowlistEnabled<T>>::get(contract_address))327	}328329	/// Toggle contract allowlist access330	/// @param contractAddress Contract to change allowlist access of331	/// @param enabled Should allowlist access to be enabled?332	fn toggle_allowlist(333		&mut self,334		caller: caller,335		contract_address: address,336		enabled: bool,337	) -> Result<void> {338		self.recorder().consume_sload()?;339		self.recorder().consume_sstore()?;340341		<Pallet<T>>::ensure_owner(contract_address, caller).map_err(dispatch_to_evm::<T>)?;342		<Pallet<T>>::toggle_allowlist(contract_address, enabled);343		Ok(())344	}345}346347/// Implements [`OnMethodCall`], which delegates call to [`ContractHelpers`]348pub struct HelpersOnMethodCall<T: Config>(PhantomData<*const T>);349impl<T: Config> OnMethodCall<T> for HelpersOnMethodCall<T>350where351	T::AccountId: AsRef<[u8; 32]>,352{353	fn is_reserved(contract: &sp_core::H160) -> bool {354		contract == &T::ContractAddress::get()355	}356357	fn is_used(contract: &sp_core::H160) -> bool {358		contract == &T::ContractAddress::get()359	}360361	fn call(handle: &mut impl PrecompileHandle) -> Option<PrecompileResult> {362		// TODO: Extract to another OnMethodCall handler363		if <AllowlistEnabled<T>>::get(handle.code_address())364			&& !<Pallet<T>>::allowed(handle.code_address(), handle.context().caller)365		{366			return Some(Err(PrecompileFailure::Revert {367				exit_status: ExitRevert::Reverted,368				output: {369					let mut writer = AbiWriter::new_call(evm_coder::fn_selector!(Error(string)));370					writer.string("Target contract is allowlisted");371					writer.finish()372				},373			}));374		}375376		if handle.code_address() != T::ContractAddress::get() {377			return None;378		}379380		let helpers = ContractHelpers::<T>(SubstrateRecorder::<T>::new(handle.remaining_gas()));381		pallet_evm_coder_substrate::call(handle, helpers)382	}383384	fn get_code(contract: &sp_core::H160) -> Option<Vec<u8>> {385		(contract == &T::ContractAddress::get())386			.then(|| include_bytes!("./stubs/ContractHelpers.raw").to_vec())387	}388}389390/// Hooks into contract creation, storing owner of newly deployed contract391pub struct HelpersOnCreate<T: Config>(PhantomData<*const T>);392impl<T: Config> OnCreate<T> for HelpersOnCreate<T> {393	fn on_create(owner: H160, contract: H160) {394		<Owner<T>>::insert(contract, owner);395	}396}397398/// Bridge to pallet-sponsoring399pub struct HelpersContractSponsoring<T: Config>(PhantomData<*const T>);400impl<T: Config> SponsorshipHandler<T::CrossAccountId, CallContext>401	for HelpersContractSponsoring<T>402{403	fn get_sponsor(404		who: &T::CrossAccountId,405		call_context: &CallContext,406	) -> Option<T::CrossAccountId> {407		let contract_address = call_context.contract_address;408		let mode = <Pallet<T>>::sponsoring_mode(contract_address);409		if mode == SponsoringModeT::Disabled {410			return None;411		}412413		let sponsor = match <Pallet<T>>::get_sponsor(contract_address) {414			Some(sponsor) => sponsor,415			None => return None,416		};417418		if mode == SponsoringModeT::Allowlisted419			&& !<Pallet<T>>::allowed(contract_address, *who.as_eth())420		{421			return None;422		}423		let block_number = <frame_system::Pallet<T>>::block_number() as T::BlockNumber;424425		if let Some(last_tx_block) = <SponsorBasket<T>>::get(contract_address, who.as_eth()) {426			let limit = <SponsoringRateLimit<T>>::get(contract_address);427428			let timeout = last_tx_block + limit;429			if block_number < timeout {430				return None;431			}432		}433434		let sponsored_fee_limit = get_sponsoring_fee_limit::<T>(contract_address);435436		if call_context.max_fee > sponsored_fee_limit {437			return None;438		}439440		<SponsorBasket<T>>::insert(contract_address, who.as_eth(), block_number);441442		Some(sponsor)443	}444}445446fn get_sponsoring_fee_limit<T: Config>(contract_address: address) -> uint256 {447	<SponsoringFeeLimit<T>>::get(contract_address)448		.get(&0xffffffff)449		.cloned()450		.unwrap_or(U256::MAX)451}452453generate_stubgen!(contract_helpers_impl, ContractHelpersCall<()>, true);454generate_stubgen!(contract_helpers_iface, ContractHelpersCall<()>, false);
modifiedpallets/fungible/src/erc.rsdiffbeforeafterboth
--- a/pallets/fungible/src/erc.rs
+++ b/pallets/fungible/src/erc.rs
@@ -19,7 +19,9 @@
 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};
+use evm_coder::{
+	abi::AbiType, 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
--- a/pallets/nonfungible/src/erc.rs
+++ b/pallets/nonfungible/src/erc.rs
@@ -24,7 +24,10 @@
 	char::{REPLACEMENT_CHARACTER, decode_utf16},
 	convert::TryInto,
 };
-use evm_coder::{ToLog, execution::*, generate_stubgen, solidity, solidity_interface, types::*, weight};
+use evm_coder::{
+	abi::AbiType, ToLog, execution::*, generate_stubgen, solidity, solidity_interface, types::*,
+	weight,
+};
 use frame_support::BoundedVec;
 use up_data_structs::{
 	TokenId, PropertyPermission, PropertyKeyPermission, Property, CollectionId, PropertyKey,
modifiedpallets/refungible/src/erc.rsdiffbeforeafterboth
--- a/pallets/refungible/src/erc.rs
+++ b/pallets/refungible/src/erc.rs
@@ -25,7 +25,10 @@
 	char::{REPLACEMENT_CHARACTER, decode_utf16},
 	convert::TryInto,
 };
-use evm_coder::{ToLog, execution::*, generate_stubgen, solidity, solidity_interface, types::*, weight};
+use evm_coder::{
+	abi::AbiType, 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,7 +29,9 @@
 	convert::TryInto,
 	ops::Deref,
 };
-use evm_coder::{ToLog, execution::*, generate_stubgen, solidity_interface, types::*, weight};
+use evm_coder::{
+	abi::AbiType, ToLog, execution::*, generate_stubgen, solidity_interface, types::*, weight,
+};
 use pallet_common::{
 	CommonWeightInfo,
 	erc::{CommonEvmHandler, PrecompileResult},
modifiedpallets/unique/Cargo.tomldiffbeforeafterboth
--- a/pallets/unique/Cargo.toml
+++ b/pallets/unique/Cargo.toml
@@ -35,6 +35,7 @@
 try-runtime = ["frame-support/try-runtime"]
 limit-testing = ["up-data-structs/limit-testing"]
 stubgen = ["evm-coder/stubgen", "pallet-common/stubgen"]
+
 ################################################################################
 # Standart Dependencies
 
modifiedpallets/unique/src/eth/mod.rsdiffbeforeafterboth
--- a/pallets/unique/src/eth/mod.rs
+++ b/pallets/unique/src/eth/mod.rs
@@ -18,14 +18,16 @@
 
 use core::marker::PhantomData;
 use ethereum as _;
-use evm_coder::{execution::*, generate_stubgen, solidity, solidity_interface, types::*, weight};
+use evm_coder::{
+	abi::AbiType, execution::*, generate_stubgen, solidity, solidity_interface, types::*, weight,
+};
 use frame_support::traits::Get;
 use crate::Pallet;
 
 use pallet_common::{
 	CollectionById,
 	dispatch::CollectionDispatch,
-	erc::{static_property::key, CollectionHelpersEvents},
+	erc::{CollectionHelpersEvents, static_property::key},
 	Pallet as PalletCommon,
 };
 use pallet_evm::{account::CrossAccountId, OnMethodCall, PrecompileHandle, PrecompileResult};