git.delta.rocks / unique-network / refs/commits / 488175cd133a

difftreelog

Merge pull request #569 from UniqueNetwork/feature/evm-conditional-inheritance

Yaroslav Bolyukin2022-09-19parents: #065efcf #3fefb83.patch.diff
in: master

11 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
@@ -42,6 +42,7 @@
 	pascal_call_name: Ident,
 	snake_call_name: Ident,
 	via: Option<(Type, Ident)>,
+	condition: Option<Expr>,
 }
 impl Is {
 	fn expand_call_def(&self, gen_ref: &proc_macro2::TokenStream) -> proc_macro2::TokenStream {
@@ -64,8 +65,13 @@
 		generics: &proc_macro2::TokenStream,
 	) -> proc_macro2::TokenStream {
 		let pascal_call_name = &self.pascal_call_name;
+		let condition = self.condition.as_ref().map(|condition| {
+			quote! {
+				(#condition) &&
+			}
+		});
 		quote! {
-			<#pascal_call_name #generics>::supports_interface(interface_id)
+			#condition <#pascal_call_name #generics>::supports_interface(this, interface_id)
 		}
 	}
 
@@ -93,8 +99,13 @@
 			.as_ref()
 			.map(|(_, i)| quote! {.#i()})
 			.unwrap_or_default();
+		let condition = self.condition.as_ref().map(|condition| {
+			quote! {
+				if ({let this = &self; (#condition)})
+			}
+		});
 		quote! {
-			#call_name::#name(call) => return <#via_typ as ::evm_coder::Callable<#pascal_call_name #generics>>::call(self #via_map, Msg {
+			#call_name::#name(call) #condition => return <#via_typ as ::evm_coder::Callable<#pascal_call_name #generics>>::call(self #via_map, Msg {
 				call,
 				caller: c.caller,
 				value: c.value,
@@ -138,17 +149,50 @@
 			}
 			let name = input.parse::<Ident>()?;
 			let lookahead = input.lookahead1();
-			let via = if lookahead.peek(syn::token::Paren) {
+
+			let mut condition: Option<Expr> = None;
+			let mut via: Option<(Type, Ident)> = None;
+
+			if lookahead.peek(syn::token::Paren) {
 				let contents;
 				parenthesized!(contents in input);
-				let method = contents.parse::<Ident>()?;
-				contents.parse::<Token![,]>()?;
-				let ty = contents.parse::<Type>()?;
-				Some((ty, method))
-			} else if lookahead.peek(Token![,]) {
-				None
-			} else if input.is_empty() {
-				None
+				let input = contents;
+
+				while !input.is_empty() {
+					let lookahead = input.lookahead1();
+					if lookahead.peek(Token![if]) {
+						input.parse::<Token![if]>()?;
+						let contents;
+						parenthesized!(contents in input);
+						let contents = contents.parse::<Expr>()?;
+
+						if condition.replace(contents).is_some() {
+							return Err(syn::Error::new(input.span(), "condition is already set"));
+						}
+					} else if lookahead.peek(kw::via) {
+						input.parse::<kw::via>()?;
+						let contents;
+						parenthesized!(contents in input);
+
+						let method = contents.parse::<Ident>()?;
+						contents.parse::<kw::returns>()?;
+						let ty = contents.parse::<Type>()?;
+
+						if via.replace((ty, method)).is_some() {
+							return Err(syn::Error::new(input.span(), "via is already set"));
+						}
+					} else {
+						return Err(lookahead.error());
+					}
+
+					if input.peek(Token![,]) {
+						input.parse::<Token![,]>()?;
+					} else if !input.is_empty() {
+						return Err(syn::Error::new(input.span(), "expected end"));
+					}
+				}
+			} else if lookahead.peek(Token![,]) || input.is_empty() {
+				// Pass
 			} else {
 				return Err(lookahead.error());
 			};
@@ -157,6 +201,7 @@
 				snake_call_name: pascal_ident_to_snake_call(&name),
 				name,
 				via,
+				condition,
 			});
 			if input.peek(Token![,]) {
 				input.parse::<Token![,]>()?;
@@ -495,6 +540,7 @@
 	syn::custom_keyword!(weight);
 
 	syn::custom_keyword!(via);
+	syn::custom_keyword!(returns);
 	syn::custom_keyword!(name);
 	syn::custom_keyword!(is);
 	syn::custom_keyword!(inline_is);
@@ -996,16 +1042,6 @@
 					#(#inline_interface_id)*
 					u32::to_be_bytes(interface_id)
 				}
-				/// Is this contract implements specified ERC165 selector
-				pub fn supports_interface(interface_id: ::evm_coder::types::bytes4) -> bool {
-					interface_id != u32::to_be_bytes(0xffffff) && (
-						interface_id == ::evm_coder::ERC165Call::INTERFACE_ID ||
-						interface_id == Self::interface_id()
-						#(
-							|| #supports_interface
-						)*
-					)
-				}
 				/// Generate solidity definitions for methods described in this interface
 				pub fn generate_solidity_interface(tc: &evm_coder::solidity::TypeCollector, is_impl: bool) {
 					use evm_coder::solidity::*;
@@ -1024,7 +1060,7 @@
 						)*),
 					};
 
-					let mut out = string::new();
+					let mut out = ::evm_coder::types::string::new();
 					if #solidity_name.starts_with("Inline") {
 						out.push_str("/// @dev inlined interface\n");
 					}
@@ -1062,6 +1098,20 @@
 					return Ok(None);
 				}
 			}
+			impl #generics #call_name #gen_ref
+			#gen_where
+			{
+				/// Is this contract implements specified ERC165 selector
+				pub fn supports_interface(this: &#name, interface_id: ::evm_coder::types::bytes4) -> bool {
+					interface_id != u32::to_be_bytes(0xffffff) && (
+						interface_id == ::evm_coder::ERC165Call::INTERFACE_ID ||
+						interface_id == Self::interface_id()
+						#(
+							|| #supports_interface
+						)*
+					)
+				}
+			}
 			impl #generics ::evm_coder::Weighted for #call_name #gen_ref
 			#gen_where
 			{
@@ -1091,7 +1141,7 @@
 						)*
 						#call_name::ERC165Call(::evm_coder::ERC165Call::SupportsInterface {interface_id}, _) => {
 							let mut writer = ::evm_coder::abi::AbiWriter::default();
-							writer.bool(&<#call_name #gen_ref>::supports_interface(interface_id));
+							writer.bool(&<#call_name #gen_ref>::supports_interface(self, interface_id));
 							return Ok(writer.into());
 						}
 						_ => {},
@@ -1101,7 +1151,7 @@
 						#(
 							#call_variants_this,
 						)*
-						_ => unreachable!()
+						_ => Err(::evm_coder::execution::Error::from("method is not available").into()),
 					}
 				}
 			}
modifiedcrates/evm-coder/src/abi.rsdiffbeforeafterboth
--- a/crates/evm-coder/src/abi.rs
+++ b/crates/evm-coder/src/abi.rs
@@ -313,7 +313,7 @@
 	/// 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() - self.had_call.then(|| 4).unwrap_or(0);
+			let part_offset = self.static_part.len() - if self.had_call { 4 } else { 0 };
 
 			let encoded_dynamic_offset = usize::to_be_bytes(part_offset);
 			self.static_part[static_offset + ABI_ALIGNMENT - encoded_dynamic_offset.len()
modifiedcrates/evm-coder/src/lib.rsdiffbeforeafterboth
--- a/crates/evm-coder/src/lib.rs
+++ b/crates/evm-coder/src/lib.rs
@@ -74,10 +74,10 @@
 /// #[solidity_interface(name = MyContract, is(SuperContract), inline_is(InlineContract))]
 /// impl Contract {
 ///     /// Multiply two numbers
-/// 	/// @param a First number
-/// 	/// @param b Second number
-/// 	/// @return uint32 Product of two passed numbers
-/// 	/// @dev This function returns error in case of overflow
+///     /// @param a First number
+///     /// @param b Second number
+///     /// @return uint32 Product of two passed numbers
+///     /// @dev This function returns error in case of overflow
 ///     #[weight(200 + a + b)]
 ///     #[solidity_interface(rename_selector = "mul")]
 ///     fn mul(&mut self, a: uint32, b: uint32) -> Result<uint32> {
addedcrates/evm-coder/tests/conditional_is.rsdiffbeforeafterboth
--- /dev/null
+++ b/crates/evm-coder/tests/conditional_is.rs
@@ -0,0 +1,44 @@
+use evm_coder::{types::*, solidity_interface, execution::Result, Call};
+
+pub struct Contract(bool);
+
+#[solidity_interface(name = A)]
+impl Contract {
+	fn method_a() -> Result<void> {
+		Ok(())
+	}
+}
+
+#[solidity_interface(name = B)]
+impl Contract {
+	fn method_b() -> Result<void> {
+		Ok(())
+	}
+}
+
+#[solidity_interface(name = Contract, is(
+	A(if(this.0)),
+	B(if(!this.0)),
+))]
+impl Contract {}
+
+#[test]
+fn conditional_erc165() {
+	assert!(ContractCall::supports_interface(
+		&Contract(true),
+		ACall::METHOD_A
+	));
+	assert!(!ContractCall::supports_interface(
+		&Contract(false),
+		ACall::METHOD_A
+	));
+
+	assert!(ContractCall::supports_interface(
+		&Contract(false),
+		BCall::METHOD_B
+	));
+	assert!(!ContractCall::supports_interface(
+		&Contract(true),
+		BCall::METHOD_B
+	));
+}
modifiedcrates/evm-coder/tests/generics.rsdiffbeforeafterboth
--- a/crates/evm-coder/tests/generics.rs
+++ b/crates/evm-coder/tests/generics.rs
@@ -17,7 +17,7 @@
 use std::marker::PhantomData;
 use evm_coder::{execution::Result, generate_stubgen, solidity_interface, types::*};
 
-struct Generic<T>(PhantomData<T>);
+pub struct Generic<T>(PhantomData<T>);
 
 #[solidity_interface(name = GenericIs)]
 impl<T> Generic<T> {
modifiedcrates/evm-coder/tests/random.rsdiffbeforeafterboth
--- a/crates/evm-coder/tests/random.rs
+++ b/crates/evm-coder/tests/random.rs
@@ -18,7 +18,7 @@
 
 use evm_coder::{ToLog, execution::Result, solidity_interface, types::*, solidity, weight};
 
-struct Impls;
+pub struct Impls;
 
 #[solidity_interface(name = OurInterface)]
 impl Impls {
modifiedcrates/evm-coder/tests/solidity_generation.rsdiffbeforeafterboth
--- a/crates/evm-coder/tests/solidity_generation.rs
+++ b/crates/evm-coder/tests/solidity_generation.rs
@@ -16,7 +16,7 @@
 
 use evm_coder::{execution::Result, generate_stubgen, solidity_interface, types::*};
 
-struct ERC20;
+pub struct ERC20;
 
 #[solidity_interface(name = ERC20)]
 impl ERC20 {
modifiedpallets/common/src/erc.rsdiffbeforeafterboth
--- a/pallets/common/src/erc.rs
+++ b/pallets/common/src/erc.rs
@@ -406,9 +406,9 @@
 			true => {
 				let mut bv = OwnerRestrictedSet::new();
 				for i in collections {
-					bv.try_insert(crate::eth::map_eth_to_id(&i).ok_or(Error::Revert(
-						"Can't convert address into collection id".into(),
-					))?)
+					bv.try_insert(crate::eth::map_eth_to_id(&i).ok_or_else(|| {
+						Error::Revert("Can't convert address into collection id".into())
+					})?)
 					.map_err(|_| "too many collections")?;
 				}
 				let mut nesting = permissions.nesting().clone();
modifiedpallets/fungible/src/erc.rsdiffbeforeafterboth
before · pallets/fungible/src/erc.rs
1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617//! ERC-20 standart support implementation.1819use core::char::{REPLACEMENT_CHARACTER, decode_utf16};20use core::convert::TryInto;21use evm_coder::{ToLog, execution::*, generate_stubgen, solidity_interface, types::*, weight};22use up_data_structs::CollectionMode;23use pallet_common::erc::{CommonEvmHandler, PrecompileResult};24use sp_std::vec::Vec;25use pallet_evm::{account::CrossAccountId, PrecompileHandle};26use pallet_evm_coder_substrate::{call, dispatch_to_evm};27use pallet_structure::{SelfWeightOf as StructureWeight, weights::WeightInfo as _};28use pallet_common::{CollectionHandle, erc::CollectionCall};2930use crate::{31	Allowance, Balance, Config, FungibleHandle, Pallet, SelfWeightOf, TotalSupply,32	weights::WeightInfo,33};3435#[derive(ToLog)]36pub enum ERC20Events {37	Transfer {38		#[indexed]39		from: address,40		#[indexed]41		to: address,42		value: uint256,43	},44	Approval {45		#[indexed]46		owner: address,47		#[indexed]48		spender: address,49		value: uint256,50	},51}5253#[solidity_interface(name = ERC20, events(ERC20Events))]54impl<T: Config> FungibleHandle<T> {55	fn name(&self) -> Result<string> {56		Ok(decode_utf16(self.name.iter().copied())57			.map(|r| r.unwrap_or(REPLACEMENT_CHARACTER))58			.collect::<string>())59	}60	fn symbol(&self) -> Result<string> {61		Ok(string::from_utf8_lossy(&self.token_prefix).into())62	}63	fn total_supply(&self) -> Result<uint256> {64		self.consume_store_reads(1)?;65		Ok(<TotalSupply<T>>::get(self.id).into())66	}6768	fn decimals(&self) -> Result<uint8> {69		Ok(if let CollectionMode::Fungible(decimals) = &self.mode {70			*decimals71		} else {72			unreachable!()73		})74	}75	fn balance_of(&self, owner: address) -> Result<uint256> {76		self.consume_store_reads(1)?;77		let owner = T::CrossAccountId::from_eth(owner);78		let balance = <Balance<T>>::get((self.id, owner));79		Ok(balance.into())80	}81	#[weight(<SelfWeightOf<T>>::transfer())]82	fn transfer(&mut self, caller: caller, to: address, amount: uint256) -> Result<bool> {83		let caller = T::CrossAccountId::from_eth(caller);84		let to = T::CrossAccountId::from_eth(to);85		let amount = amount.try_into().map_err(|_| "amount overflow")?;86		let budget = self87			.recorder88			.weight_calls_budget(<StructureWeight<T>>::find_parent());8990		<Pallet<T>>::transfer(self, &caller, &to, amount, &budget).map_err(|_| "transfer error")?;91		Ok(true)92	}93	#[weight(<SelfWeightOf<T>>::transfer_from())]94	fn transfer_from(95		&mut self,96		caller: caller,97		from: address,98		to: address,99		amount: uint256,100	) -> Result<bool> {101		let caller = T::CrossAccountId::from_eth(caller);102		let from = T::CrossAccountId::from_eth(from);103		let to = T::CrossAccountId::from_eth(to);104		let amount = amount.try_into().map_err(|_| "amount overflow")?;105		let budget = self106			.recorder107			.weight_calls_budget(<StructureWeight<T>>::find_parent());108109		<Pallet<T>>::transfer_from(self, &caller, &from, &to, amount, &budget)110			.map_err(dispatch_to_evm::<T>)?;111		Ok(true)112	}113	#[weight(<SelfWeightOf<T>>::approve())]114	fn approve(&mut self, caller: caller, spender: address, amount: uint256) -> Result<bool> {115		let caller = T::CrossAccountId::from_eth(caller);116		let spender = T::CrossAccountId::from_eth(spender);117		let amount = amount.try_into().map_err(|_| "amount overflow")?;118119		<Pallet<T>>::set_allowance(self, &caller, &spender, amount)120			.map_err(dispatch_to_evm::<T>)?;121		Ok(true)122	}123	fn allowance(&self, owner: address, spender: address) -> Result<uint256> {124		self.consume_store_reads(1)?;125		let owner = T::CrossAccountId::from_eth(owner);126		let spender = T::CrossAccountId::from_eth(spender);127128		Ok(<Allowance<T>>::get((self.id, owner, spender)).into())129	}130}131132#[solidity_interface(name = ERC20Mintable)]133impl<T: Config> FungibleHandle<T> {134	/// Mint tokens for `to` account.135	/// @param to account that will receive minted tokens136	/// @param amount amount of tokens to mint137	#[weight(<SelfWeightOf<T>>::create_item())]138	fn mint(&mut self, caller: caller, to: address, amount: uint256) -> Result<bool> {139		let caller = T::CrossAccountId::from_eth(caller);140		let to = T::CrossAccountId::from_eth(to);141		let amount = amount.try_into().map_err(|_| "amount overflow")?;142		let budget = self143			.recorder144			.weight_calls_budget(<StructureWeight<T>>::find_parent());145		<Pallet<T>>::create_item(&self, &caller, (to, amount), &budget)146			.map_err(dispatch_to_evm::<T>)?;147		Ok(true)148	}149}150151#[solidity_interface(name = ERC20UniqueExtensions)]152impl<T: Config> FungibleHandle<T> {153	/// Burn tokens from account154	/// @dev Function that burns an `amount` of the tokens of a given account,155	/// deducting from the sender's allowance for said account.156	/// @param from The account whose tokens will be burnt.157	/// @param amount The amount that will be burnt.158	#[weight(<SelfWeightOf<T>>::burn_from())]159	fn burn_from(&mut self, caller: caller, from: address, amount: uint256) -> Result<bool> {160		let caller = T::CrossAccountId::from_eth(caller);161		let from = T::CrossAccountId::from_eth(from);162		let amount = amount.try_into().map_err(|_| "amount overflow")?;163		let budget = self164			.recorder165			.weight_calls_budget(<StructureWeight<T>>::find_parent());166167		<Pallet<T>>::burn_from(self, &caller, &from, amount, &budget)168			.map_err(dispatch_to_evm::<T>)?;169		Ok(true)170	}171172	/// Mint tokens for multiple accounts.173	/// @param amounts array of pairs of account address and amount174	#[weight(<SelfWeightOf<T>>::create_multiple_items_ex(amounts.len() as u32))]175	fn mint_bulk(&mut self, caller: caller, amounts: Vec<(address, uint256)>) -> Result<bool> {176		let caller = T::CrossAccountId::from_eth(caller);177		let budget = self178			.recorder179			.weight_calls_budget(<StructureWeight<T>>::find_parent());180		let amounts = amounts181			.into_iter()182			.map(|(to, amount)| {183				Ok((184					T::CrossAccountId::from_eth(to),185					amount.try_into().map_err(|_| "amount overflow")?,186				))187			})188			.collect::<Result<_>>()?;189190		<Pallet<T>>::create_multiple_items(&self, &caller, amounts, &budget)191			.map_err(dispatch_to_evm::<T>)?;192		Ok(true)193	}194}195196#[solidity_interface(197	name = UniqueFungible,198	is(199		ERC20,200		ERC20Mintable,201		ERC20UniqueExtensions,202		Collection(common_mut, CollectionHandle<T>),203	)204)]205impl<T: Config> FungibleHandle<T> where T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]> {}206207generate_stubgen!(gen_impl, UniqueFungibleCall<()>, true);208generate_stubgen!(gen_iface, UniqueFungibleCall<()>, false);209210impl<T: Config> CommonEvmHandler for FungibleHandle<T>211where212	T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]>,213{214	const CODE: &'static [u8] = include_bytes!("./stubs/UniqueFungible.raw");215216	fn call(self, handle: &mut impl PrecompileHandle) -> Option<PrecompileResult> {217		call::<T, UniqueFungibleCall<T>, _, _>(handle, self)218	}219}
after · pallets/fungible/src/erc.rs
1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617//! ERC-20 standart support implementation.1819use core::char::{REPLACEMENT_CHARACTER, decode_utf16};20use core::convert::TryInto;21use evm_coder::{ToLog, execution::*, generate_stubgen, solidity_interface, types::*, weight};22use up_data_structs::CollectionMode;23use pallet_common::erc::{CommonEvmHandler, PrecompileResult};24use sp_std::vec::Vec;25use pallet_evm::{account::CrossAccountId, PrecompileHandle};26use pallet_evm_coder_substrate::{call, dispatch_to_evm};27use pallet_structure::{SelfWeightOf as StructureWeight, weights::WeightInfo as _};28use pallet_common::{CollectionHandle, erc::CollectionCall};2930use crate::{31	Allowance, Balance, Config, FungibleHandle, Pallet, SelfWeightOf, TotalSupply,32	weights::WeightInfo,33};3435#[derive(ToLog)]36pub enum ERC20Events {37	Transfer {38		#[indexed]39		from: address,40		#[indexed]41		to: address,42		value: uint256,43	},44	Approval {45		#[indexed]46		owner: address,47		#[indexed]48		spender: address,49		value: uint256,50	},51}5253#[solidity_interface(name = ERC20, events(ERC20Events))]54impl<T: Config> FungibleHandle<T> {55	fn name(&self) -> Result<string> {56		Ok(decode_utf16(self.name.iter().copied())57			.map(|r| r.unwrap_or(REPLACEMENT_CHARACTER))58			.collect::<string>())59	}60	fn symbol(&self) -> Result<string> {61		Ok(string::from_utf8_lossy(&self.token_prefix).into())62	}63	fn total_supply(&self) -> Result<uint256> {64		self.consume_store_reads(1)?;65		Ok(<TotalSupply<T>>::get(self.id).into())66	}6768	fn decimals(&self) -> Result<uint8> {69		Ok(if let CollectionMode::Fungible(decimals) = &self.mode {70			*decimals71		} else {72			unreachable!()73		})74	}75	fn balance_of(&self, owner: address) -> Result<uint256> {76		self.consume_store_reads(1)?;77		let owner = T::CrossAccountId::from_eth(owner);78		let balance = <Balance<T>>::get((self.id, owner));79		Ok(balance.into())80	}81	#[weight(<SelfWeightOf<T>>::transfer())]82	fn transfer(&mut self, caller: caller, to: address, amount: uint256) -> Result<bool> {83		let caller = T::CrossAccountId::from_eth(caller);84		let to = T::CrossAccountId::from_eth(to);85		let amount = amount.try_into().map_err(|_| "amount overflow")?;86		let budget = self87			.recorder88			.weight_calls_budget(<StructureWeight<T>>::find_parent());8990		<Pallet<T>>::transfer(self, &caller, &to, amount, &budget).map_err(|_| "transfer error")?;91		Ok(true)92	}93	#[weight(<SelfWeightOf<T>>::transfer_from())]94	fn transfer_from(95		&mut self,96		caller: caller,97		from: address,98		to: address,99		amount: uint256,100	) -> Result<bool> {101		let caller = T::CrossAccountId::from_eth(caller);102		let from = T::CrossAccountId::from_eth(from);103		let to = T::CrossAccountId::from_eth(to);104		let amount = amount.try_into().map_err(|_| "amount overflow")?;105		let budget = self106			.recorder107			.weight_calls_budget(<StructureWeight<T>>::find_parent());108109		<Pallet<T>>::transfer_from(self, &caller, &from, &to, amount, &budget)110			.map_err(dispatch_to_evm::<T>)?;111		Ok(true)112	}113	#[weight(<SelfWeightOf<T>>::approve())]114	fn approve(&mut self, caller: caller, spender: address, amount: uint256) -> Result<bool> {115		let caller = T::CrossAccountId::from_eth(caller);116		let spender = T::CrossAccountId::from_eth(spender);117		let amount = amount.try_into().map_err(|_| "amount overflow")?;118119		<Pallet<T>>::set_allowance(self, &caller, &spender, amount)120			.map_err(dispatch_to_evm::<T>)?;121		Ok(true)122	}123	fn allowance(&self, owner: address, spender: address) -> Result<uint256> {124		self.consume_store_reads(1)?;125		let owner = T::CrossAccountId::from_eth(owner);126		let spender = T::CrossAccountId::from_eth(spender);127128		Ok(<Allowance<T>>::get((self.id, owner, spender)).into())129	}130}131132#[solidity_interface(name = ERC20Mintable)]133impl<T: Config> FungibleHandle<T> {134	/// Mint tokens for `to` account.135	/// @param to account that will receive minted tokens136	/// @param amount amount of tokens to mint137	#[weight(<SelfWeightOf<T>>::create_item())]138	fn mint(&mut self, caller: caller, to: address, amount: uint256) -> Result<bool> {139		let caller = T::CrossAccountId::from_eth(caller);140		let to = T::CrossAccountId::from_eth(to);141		let amount = amount.try_into().map_err(|_| "amount overflow")?;142		let budget = self143			.recorder144			.weight_calls_budget(<StructureWeight<T>>::find_parent());145		<Pallet<T>>::create_item(&self, &caller, (to, amount), &budget)146			.map_err(dispatch_to_evm::<T>)?;147		Ok(true)148	}149}150151#[solidity_interface(name = ERC20UniqueExtensions)]152impl<T: Config> FungibleHandle<T> {153	/// Burn tokens from account154	/// @dev Function that burns an `amount` of the tokens of a given account,155	/// deducting from the sender's allowance for said account.156	/// @param from The account whose tokens will be burnt.157	/// @param amount The amount that will be burnt.158	#[weight(<SelfWeightOf<T>>::burn_from())]159	fn burn_from(&mut self, caller: caller, from: address, amount: uint256) -> Result<bool> {160		let caller = T::CrossAccountId::from_eth(caller);161		let from = T::CrossAccountId::from_eth(from);162		let amount = amount.try_into().map_err(|_| "amount overflow")?;163		let budget = self164			.recorder165			.weight_calls_budget(<StructureWeight<T>>::find_parent());166167		<Pallet<T>>::burn_from(self, &caller, &from, amount, &budget)168			.map_err(dispatch_to_evm::<T>)?;169		Ok(true)170	}171172	/// Mint tokens for multiple accounts.173	/// @param amounts array of pairs of account address and amount174	#[weight(<SelfWeightOf<T>>::create_multiple_items_ex(amounts.len() as u32))]175	fn mint_bulk(&mut self, caller: caller, amounts: Vec<(address, uint256)>) -> Result<bool> {176		let caller = T::CrossAccountId::from_eth(caller);177		let budget = self178			.recorder179			.weight_calls_budget(<StructureWeight<T>>::find_parent());180		let amounts = amounts181			.into_iter()182			.map(|(to, amount)| {183				Ok((184					T::CrossAccountId::from_eth(to),185					amount.try_into().map_err(|_| "amount overflow")?,186				))187			})188			.collect::<Result<_>>()?;189190		<Pallet<T>>::create_multiple_items(&self, &caller, amounts, &budget)191			.map_err(dispatch_to_evm::<T>)?;192		Ok(true)193	}194}195196#[solidity_interface(197	name = UniqueFungible,198	is(199		ERC20,200		ERC20Mintable,201		ERC20UniqueExtensions,202		Collection(via(common_mut returns CollectionHandle<T>)),203	)204)]205impl<T: Config> FungibleHandle<T> where T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]> {}206207generate_stubgen!(gen_impl, UniqueFungibleCall<()>, true);208generate_stubgen!(gen_iface, UniqueFungibleCall<()>, false);209210impl<T: Config> CommonEvmHandler for FungibleHandle<T>211where212	T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]>,213{214	const CODE: &'static [u8] = include_bytes!("./stubs/UniqueFungible.raw");215216	fn call(self, handle: &mut impl PrecompileHandle) -> Option<PrecompileResult> {217		call::<T, UniqueFungibleCall<T>, _, _>(handle, self)218	}219}
modifiedpallets/nonfungible/src/erc.rsdiffbeforeafterboth
--- a/pallets/nonfungible/src/erc.rs
+++ b/pallets/nonfungible/src/erc.rs
@@ -736,7 +736,7 @@
 		ERC721UniqueExtensions,
 		ERC721Mintable,
 		ERC721Burnable,
-		Collection(common_mut, CollectionHandle<T>),
+		Collection(via(common_mut returns CollectionHandle<T>)),
 		TokenProperties,
 	)
 )]
modifiedpallets/refungible/src/erc.rsdiffbeforeafterboth
--- a/pallets/refungible/src/erc.rs
+++ b/pallets/refungible/src/erc.rs
@@ -785,7 +785,7 @@
 		ERC721UniqueExtensions,
 		ERC721Mintable,
 		ERC721Burnable,
-		Collection(common_mut, CollectionHandle<T>),
+		Collection(via(common_mut returns CollectionHandle<T>)),
 		TokenProperties,
 	)
 )]