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

difftreelog

CORE-386 Add methodt to evm

Trubnikov Sergey2022-05-31parent: #9e257c4.patch.diff
in: master

8 files changed

modifiedpallets/common/src/erc.rsdiffbeforeafterboth
before · pallets/common/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/>.1617use evm_coder::{18	solidity_interface, solidity, ToLog,19	types::*,20	execution::{Result, Error},21};22pub use pallet_evm::{PrecompileOutput, PrecompileResult, PrecompileHandle, account::CrossAccountId};23use pallet_evm_coder_substrate::dispatch_to_evm;24use sp_core::{H160, U256, H256};25use sp_std::vec::Vec;26use up_data_structs::{Property, SponsoringRateLimit, NestingRule, OwnerRestrictedSet, AccessMode};27use alloc::format;2829use crate::{Pallet, CollectionHandle, Config, CollectionProperties};3031#[derive(ToLog)]32pub enum CollectionHelpersEvents {33	CollectionCreated {34		#[indexed]35		owner: address,36		#[indexed]37		collection_id: address,38	},39}4041/// Does not always represent a full collection, for RFT it is either42/// collection (Implementing ERC721), or specific collection token (Implementing ERC20)43pub trait CommonEvmHandler {44	const CODE: &'static [u8];4546	fn call(self, handle: &mut impl PrecompileHandle) -> Option<PrecompileResult>;47}4849#[solidity_interface(name = "Collection")]50impl<T: Config> CollectionHandle<T>51// where52// 	T::AccountId: From<H256>53{54	fn set_collection_property(&mut self, caller: caller, key: string, value: bytes) -> Result<()> {55		let caller = T::CrossAccountId::from_eth(caller);56		let key = <Vec<u8>>::from(key)57			.try_into()58			.map_err(|_| "key too large")?;59		let value = value.try_into().map_err(|_| "value too large")?;6061		<Pallet<T>>::set_collection_property(self, &caller, Property { key, value })62			.map_err(dispatch_to_evm::<T>)63	}6465	fn delete_collection_property(&mut self, caller: caller, key: string) -> Result<()> {66		let caller = T::CrossAccountId::from_eth(caller);67		let key = <Vec<u8>>::from(key)68			.try_into()69			.map_err(|_| "key too large")?;7071		<Pallet<T>>::delete_collection_property(self, &caller, key).map_err(dispatch_to_evm::<T>)72	}7374	/// Throws error if key not found75	fn collection_property(&self, key: string) -> Result<bytes> {76		let key = <Vec<u8>>::from(key)77			.try_into()78			.map_err(|_| "key too large")?;7980		let props = <CollectionProperties<T>>::get(self.id);81		let prop = props.get(&key).ok_or("key not found")?;8283		Ok(prop.to_vec())84	}8586	fn set_collection_sponsor(&mut self, caller: caller, sponsor: address) -> Result<void> {87		check_is_owner(caller, self)?;8889		let sponsor = T::CrossAccountId::from_eth(sponsor);90		self.set_sponsor(sponsor.as_sub().clone())91			.map_err(dispatch_to_evm::<T>)?;92		save(self)93	}9495	fn confirm_collection_sponsorship(&mut self, caller: caller) -> Result<void> {96		let caller = T::CrossAccountId::from_eth(caller);97		if !self98			.confirm_sponsorship(caller.as_sub())99			.map_err(dispatch_to_evm::<T>)?100		{101			return Err(Error::Revert("Caller is not set as sponsor".into()));102		}103		save(self)104	}105106	#[solidity(rename_selector = "setCollectionLimit")]107	fn set_int_limit(&mut self, caller: caller, limit: string, value: uint32) -> Result<void> {108		check_is_owner(caller, self)?;109		let mut limits = self.limits.clone();110111		match limit.as_str() {112			"accountTokenOwnershipLimit" => {113				limits.account_token_ownership_limit = Some(value);114			}115			"sponsoredDataSize" => {116				limits.sponsored_data_size = Some(value);117			}118			"sponsoredDataRateLimit" => {119				limits.sponsored_data_rate_limit = Some(SponsoringRateLimit::Blocks(value));120			}121			"tokenLimit" => {122				limits.token_limit = Some(value);123			}124			"sponsorTransferTimeout" => {125				limits.sponsor_transfer_timeout = Some(value);126			}127			"sponsorApproveTimeout" => {128				limits.sponsor_approve_timeout = Some(value);129			}130			_ => {131				return Err(Error::Revert(format!(132					"Unknown integer limit \"{}\"",133					limit134				)))135			}136		}137		self.limits = <Pallet<T>>::clamp_limits(self.mode.clone(), &self.limits, limits)138			.map_err(dispatch_to_evm::<T>)?;139		save(self)140	}141142	#[solidity(rename_selector = "setCollectionLimit")]143	fn set_bool_limit(&mut self, caller: caller, limit: string, value: bool) -> Result<void> {144		check_is_owner(caller, self)?;145		let mut limits = self.limits.clone();146147		match limit.as_str() {148			"ownerCanTransfer" => {149				limits.owner_can_transfer = Some(value);150			}151			"ownerCanDestroy" => {152				limits.owner_can_destroy = Some(value);153			}154			"transfersEnabled" => {155				limits.transfers_enabled = Some(value);156			}157			_ => {158				return Err(Error::Revert(format!(159					"Unknown boolean limit \"{}\"",160					limit161				)))162			}163		}164		self.limits = <Pallet<T>>::clamp_limits(self.mode.clone(), &self.limits, limits)165			.map_err(dispatch_to_evm::<T>)?;166		save(self)167	}168169	fn contract_address(&self, _caller: caller) -> Result<address> {170		Ok(crate::eth::collection_id_to_address(self.id))171	}172173	// fn add_admin_substrate(&self, caller: caller, new_admin: uint256) -> Result<void> {174	// 	let mut new_admin_h256 = H256::default();175	// 	new_admin.to_little_endian(&mut new_admin_h256.0);176	// 	let account_id = T::AccountId::from(new_admin_h256);177	// 	let caller = T::CrossAccountId::from_eth(caller);178	// 	let new_admin = T::CrossAccountId::from_sub(account_id);179	// 	<Pallet<T>>::toggle_admin(&self, &caller, &new_admin, true)180	// 		.map_err(dispatch_to_evm::<T>)?;181	// 	Ok(())182	// }183184	// fn remove_admin_substrate(&self, caller: caller, new_admin: uint256) -> Result<void> {185	// 	let mut new_admin_h256 = H256::default();186	// 	new_admin.to_little_endian(&mut new_admin_h256.0);187	// 	let account_id = T::AccountId::from(new_admin_h256);188	// 	let caller = T::CrossAccountId::from_eth(caller);189	// 	let new_admin = T::CrossAccountId::from_sub(account_id);190	// 	<Pallet<T>>::toggle_admin(&self, &caller, &new_admin, false)191	// 		.map_err(dispatch_to_evm::<T>)?;192	// 	Ok(())193	// }194195	fn add_collection_admin(&self, caller: caller, new_admin: address) -> Result<void> {196		let caller = T::CrossAccountId::from_eth(caller);197		self.check_is_owner_or_admin(&caller)198			.map_err(dispatch_to_evm::<T>)?;199		let new_admin = T::CrossAccountId::from_eth(new_admin);200		<Pallet<T>>::toggle_admin(&self, &caller, &new_admin, true)201			.map_err(dispatch_to_evm::<T>)?;202		Ok(())203	}204205	fn remove_collection_admin(&self, caller: caller, admin: address) -> Result<void> {206		let caller = T::CrossAccountId::from_eth(caller);207		self.check_is_owner_or_admin(&caller)208			.map_err(dispatch_to_evm::<T>)?;209		let admin = T::CrossAccountId::from_eth(admin);210		<Pallet<T>>::toggle_admin(&self, &caller, &admin, false).map_err(dispatch_to_evm::<T>)?;211		Ok(())212	}213214	#[solidity(rename_selector = "setCollectionNesting")]215	fn set_nesting_bool(&mut self, caller: caller, enable: bool) -> Result<void> {216		let caller = T::CrossAccountId::from_eth(caller);217		self.check_is_owner_or_admin(&caller)218			.map_err(dispatch_to_evm::<T>)?;219		self.collection.permissions.nesting = Some(match enable {220			false => NestingRule::Disabled,221			true => NestingRule::Owner,222		});223		save(self);224		Ok(())225	}226227	#[solidity(rename_selector = "setCollectionNesting")]228	fn set_nesting(229		&mut self,230		caller: caller,231		enable: bool,232		collections: Vec<address>,233	) -> Result<void> {234		if collections.is_empty() {235			return Err("No addresses provided".into());236		}237		if collections.len() >= OwnerRestrictedSet::bound() {238			return Err(Error::Revert(format!(239				"Out of bound: {} >= {}",240				collections.len(),241				OwnerRestrictedSet::bound()242			)));243		}244		let caller = T::CrossAccountId::from_eth(caller);245		self.check_is_owner_or_admin(&caller)246			.map_err(dispatch_to_evm::<T>)?;247		self.collection.permissions.nesting = Some(match enable {248			false => NestingRule::Disabled,249			true => {250				let mut bv = OwnerRestrictedSet::new();251				for i in collections {252					bv.try_insert(crate::eth::map_eth_to_id(&i).ok_or(Error::Revert(253						"Can't convert address into collection id".into(),254					))?)255					.map_err(|e| Error::Revert(format!("{:?}", e)))?;256				}257				NestingRule::OwnerRestricted(bv)258			}259		});260		save(self);261		Ok(())262	}263264	fn set_collection_access(&mut self, caller: caller, mode: uint8) -> Result<void> {265		let caller = T::CrossAccountId::from_eth(caller);266		self.check_is_owner_or_admin(&caller)267			.map_err(dispatch_to_evm::<T>)?;268		self.collection.permissions.access = Some(match mode {269			0 => AccessMode::Normal,270			1 => AccessMode::AllowList,271			_ => return Err("Not supported access mode".into()),272		});273		save(self);274		Ok(())275	}276277	fn add_to_collection_allow_list(&self, caller: caller, user: address) -> Result<void> {278		let caller = check_is_owner_or_admin(caller, self)?;279		let user = T::CrossAccountId::from_eth(user);280		<Pallet<T>>::toggle_allowlist(self, &caller, &user, true).map_err(dispatch_to_evm::<T>)?;281		Ok(())282	}283284	fn remove_from_collection_allow_list(&self, caller: caller, user: address) -> Result<void> {285		let caller = check_is_owner_or_admin(caller, self)?;286		let user = T::CrossAccountId::from_eth(user);287		<Pallet<T>>::toggle_allowlist(self, &caller, &user, false).map_err(dispatch_to_evm::<T>)?;288		Ok(())289	}290291	fn set_collection_mint_mode(&mut self, caller: caller, mode: bool) -> Result<void> {292		check_is_owner_or_admin(caller, self)?;293		self.collection.permissions.mint_mode = Some(mode);294		save(self);295		Ok(())296	}297}298299fn check_is_owner<T: Config>(caller: caller, collection: &CollectionHandle<T>) -> Result<void> {300	let caller = T::CrossAccountId::from_eth(caller);301	collection302		.check_is_owner(&caller)303		.map_err(pallet_evm_coder_substrate::dispatch_to_evm::<T>)?;304	Ok(())305}306307fn check_is_owner_or_admin<T: Config>(308	caller: caller,309	collection: &CollectionHandle<T>,310) -> Result<T::CrossAccountId> {311	let caller = T::CrossAccountId::from_eth(caller);312	collection313		.check_is_owner_or_admin(&caller)314		.map_err(pallet_evm_coder_substrate::dispatch_to_evm::<T>)?;315	Ok(caller)316}317318fn save<T: Config>(collection: &CollectionHandle<T>) -> Result<void> {319	// TODO possibly delete for the lack of transaction320	collection321		.check_is_internal()322		.map_err(dispatch_to_evm::<T>)?;323	<crate::CollectionById<T>>::insert(collection.id, collection.collection.clone());324	Ok(())325}326327pub fn token_uri_key() -> up_data_structs::PropertyKey {328	b"tokenURI"329		.to_vec()330		.try_into()331		.expect("length < limit; qed")332}
after · pallets/common/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/>.1617use evm_coder::{18	solidity_interface, solidity, ToLog,19	types::*,20	execution::{Result, Error},21};22pub use pallet_evm::{PrecompileOutput, PrecompileResult, PrecompileHandle, account::CrossAccountId};23use pallet_evm_coder_substrate::dispatch_to_evm;24use sp_core::{H160, U256, H256};25use sp_std::vec::Vec;26use up_data_structs::{Property, SponsoringRateLimit, NestingRule, OwnerRestrictedSet, AccessMode};27use alloc::format;2829use crate::{Pallet, CollectionHandle, Config, CollectionProperties};3031#[derive(ToLog)]32pub enum CollectionHelpersEvents {33	CollectionCreated {34		#[indexed]35		owner: address,36		#[indexed]37		collection_id: address,38	},39}4041/// Does not always represent a full collection, for RFT it is either42/// collection (Implementing ERC721), or specific collection token (Implementing ERC20)43pub trait CommonEvmHandler {44	const CODE: &'static [u8];4546	fn call(self, handle: &mut impl PrecompileHandle) -> Option<PrecompileResult>;47}4849#[solidity_interface(name = "Collection")]5051impl<T: Config> CollectionHandle<T> 52// where 53// 	T::AccountId: From<H256>54{55	fn set_collection_property(&mut self, caller: caller, key: string, value: bytes) -> Result<()> {56		let caller = T::CrossAccountId::from_eth(caller);57		let key = <Vec<u8>>::from(key)58			.try_into()59			.map_err(|_| "key too large")?;60		let value = value.try_into().map_err(|_| "value too large")?;6162		<Pallet<T>>::set_collection_property(self, &caller, Property { key, value })63			.map_err(dispatch_to_evm::<T>)64	}6566	fn delete_collection_property(&mut self, caller: caller, key: string) -> Result<()> {67		let caller = T::CrossAccountId::from_eth(caller);68		let key = <Vec<u8>>::from(key)69			.try_into()70			.map_err(|_| "key too large")?;7172		<Pallet<T>>::delete_collection_property(self, &caller, key).map_err(dispatch_to_evm::<T>)73	}7475	/// Throws error if key not found76	fn collection_property(&self, key: string) -> Result<bytes> {77		let key = <Vec<u8>>::from(key)78			.try_into()79			.map_err(|_| "key too large")?;8081		let props = <CollectionProperties<T>>::get(self.id);82		let prop = props.get(&key).ok_or("key not found")?;8384		Ok(prop.to_vec())85	}8687	fn set_collection_sponsor(&mut self, caller: caller, sponsor: address) -> Result<void> {88		check_is_owner(caller, self)?;8990		let sponsor = T::CrossAccountId::from_eth(sponsor);91		self.set_sponsor(sponsor.as_sub().clone())92			.map_err(dispatch_to_evm::<T>)?;93		save(self)94	}9596	fn confirm_collection_sponsorship(&mut self, caller: caller) -> Result<void> {97		let caller = T::CrossAccountId::from_eth(caller);98		if !self99			.confirm_sponsorship(caller.as_sub())100			.map_err(dispatch_to_evm::<T>)?101		{102			return Err(Error::Revert("Caller is not set as sponsor".into()));103		}104		save(self)105	}106107	#[solidity(rename_selector = "setCollectionLimit")]108	fn set_int_limit(&mut self, caller: caller, limit: string, value: uint32) -> Result<void> {109		check_is_owner(caller, self)?;110		let mut limits = self.limits.clone();111112		match limit.as_str() {113			"accountTokenOwnershipLimit" => {114				limits.account_token_ownership_limit = Some(value);115			}116			"sponsoredDataSize" => {117				limits.sponsored_data_size = Some(value);118			}119			"sponsoredDataRateLimit" => {120				limits.sponsored_data_rate_limit = Some(SponsoringRateLimit::Blocks(value));121			}122			"tokenLimit" => {123				limits.token_limit = Some(value);124			}125			"sponsorTransferTimeout" => {126				limits.sponsor_transfer_timeout = Some(value);127			}128			"sponsorApproveTimeout" => {129				limits.sponsor_approve_timeout = Some(value);130			}131			_ => {132				return Err(Error::Revert(format!(133					"Unknown integer limit \"{}\"",134					limit135				)))136			}137		}138		self.limits = <Pallet<T>>::clamp_limits(self.mode.clone(), &self.limits, limits)139			.map_err(dispatch_to_evm::<T>)?;140		save(self)141	}142143	#[solidity(rename_selector = "setCollectionLimit")]144	fn set_bool_limit(&mut self, caller: caller, limit: string, value: bool) -> Result<void> {145		check_is_owner(caller, self)?;146		let mut limits = self.limits.clone();147148		match limit.as_str() {149			"ownerCanTransfer" => {150				limits.owner_can_transfer = Some(value);151			}152			"ownerCanDestroy" => {153				limits.owner_can_destroy = Some(value);154			}155			"transfersEnabled" => {156				limits.transfers_enabled = Some(value);157			}158			_ => {159				return Err(Error::Revert(format!(160					"Unknown boolean limit \"{}\"",161					limit162				)))163			}164		}165		self.limits = <Pallet<T>>::clamp_limits(self.mode.clone(), &self.limits, limits)166			.map_err(dispatch_to_evm::<T>)?;167		save(self)168	}169170	fn contract_address(&self, _caller: caller) -> Result<address> {171		Ok(crate::eth::collection_id_to_address(self.id))172	}173174	// fn add_admin_substrate(&self, caller: caller, new_admin: uint256) -> Result<void> {175	// 	let mut new_admin_h256 = H256::default();176	// 	new_admin.to_little_endian(&mut new_admin_h256.0);177	// 	let account_id = T::AccountId::from(new_admin_h256);178	// 	let caller = T::CrossAccountId::from_eth(caller);179	// 	let new_admin = T::CrossAccountId::from_sub(account_id);180	// 	<Pallet<T>>::toggle_admin(&self, &caller, &new_admin, true)181	// 		.map_err(dispatch_to_evm::<T>)?;182	// 	Ok(())183	// }184185	// fn remove_admin_substrate(&self, caller: caller, new_admin: uint256) -> Result<void> {186	// 	let mut new_admin_h256 = H256::default();187	// 	new_admin.to_little_endian(&mut new_admin_h256.0);188	// 	let account_id = T::AccountId::from(new_admin_h256);189	// 	let caller = T::CrossAccountId::from_eth(caller);190	// 	let new_admin = T::CrossAccountId::from_sub(account_id);191	// 	<Pallet<T>>::toggle_admin(&self, &caller, &new_admin, false)192	// 		.map_err(dispatch_to_evm::<T>)?;193	// 	Ok(())194	// }195196	fn add_admin(&self, caller: caller, new_admin: address) -> Result<void> {197		let caller = T::CrossAccountId::from_eth(caller);198		self.check_is_owner_or_admin(&caller)199			.map_err(dispatch_to_evm::<T>)?;200		let new_admin = T::CrossAccountId::from_eth(new_admin);201		<Pallet<T>>::toggle_admin(&self, &caller, &new_admin, true)202			.map_err(dispatch_to_evm::<T>)?;203		Ok(())204	}205206	fn remove_admin(&self, caller: caller, admin: address) -> Result<void> {207		let caller = T::CrossAccountId::from_eth(caller);208		self.check_is_owner_or_admin(&caller)209			.map_err(dispatch_to_evm::<T>)?;210		let admin = T::CrossAccountId::from_eth(admin);211		<Pallet<T>>::toggle_admin(&self, &caller, &admin, false)212			.map_err(dispatch_to_evm::<T>)?;213		Ok(())214	}215216	#[solidity(rename_selector = "setNesting")]217	fn set_nesting_bool(&mut self, caller: caller, enable: bool) -> Result<void> {218		let caller = T::CrossAccountId::from_eth(caller);219		self.check_is_owner_or_admin(&caller)220			.map_err(dispatch_to_evm::<T>)?;221		self.collection.permissions.nesting = Some(match enable {222			false => NestingRule::Disabled,223			true => NestingRule::Owner,224		});225		save(self);226		Ok(())227	}228229	#[solidity(rename_selector = "setNesting")]230	fn set_nesting(&mut self, caller: caller, enable: bool, collections: Vec<address>) -> Result<void> {231		if collections.is_empty() {232			return Err("No addresses provided".into());233		}234		if collections.len() >= OwnerRestrictedSet::bound() {235			return Err(Error::Revert(format!("Out of bound: {} >= {}", collections.len(), OwnerRestrictedSet::bound())));236		}237		let caller = T::CrossAccountId::from_eth(caller);238		self.check_is_owner_or_admin(&caller)239			.map_err(dispatch_to_evm::<T>)?;240		self.collection.permissions.nesting = Some(match enable {241			false => NestingRule::Disabled,242			true => {243				let mut bv = OwnerRestrictedSet::new();244				for i in collections {245					bv.try_insert(246						crate::eth::map_eth_to_id(&i)247							.ok_or(Error::Revert("Can't convert address into collection id".into()))?248					).map_err(|e| Error::Revert(format!("{:?}", e)))?;249				}250				NestingRule::OwnerRestricted (bv)251			}252		});253		save(self);254		Ok(())255	}256}257258fn check_is_owner<T: Config>(caller: caller, collection: &CollectionHandle<T>) -> Result<void> {259	let caller = T::CrossAccountId::from_eth(caller);260	collection261		.check_is_owner(&caller)262		.map_err(pallet_evm_coder_substrate::dispatch_to_evm::<T>)?;263	Ok(())264}265266fn check_is_owner_or_admin<T: Config>(267	caller: caller,268	collection: &CollectionHandle<T>,269) -> Result<T::CrossAccountId> {270	let caller = T::CrossAccountId::from_eth(caller);271	collection272		.check_is_owner_or_admin(&caller)273		.map_err(pallet_evm_coder_substrate::dispatch_to_evm::<T>)?;274	Ok(caller)275}276277fn save<T: Config>(collection: &CollectionHandle<T>) -> Result<void> {278	// TODO possibly delete for the lack of transaction279	collection280		.check_is_internal()281		.map_err(dispatch_to_evm::<T>)?;282	<crate::CollectionById<T>>::insert(collection.id, collection.collection.clone());283	Ok(())284}285286pub fn token_uri_key() -> up_data_structs::PropertyKey {287	b"tokenURI"288		.to_vec()289		.try_into()290		.expect("length < limit; qed")291}
modifiedpallets/common/src/lib.rsdiffbeforeafterboth
--- a/pallets/common/src/lib.rs
+++ b/pallets/common/src/lib.rs
@@ -148,7 +148,8 @@
 					.saturating_mul(writes),
 			))
 	}
-	pub fn save(self) -> Result<(), DispatchError> {
+
+	pub fn save(self) -> DispatchResult {
 		<CollectionById<T>>::insert(self.id, self.collection);
 		Ok(())
 	}
modifiedpallets/nonfungible/src/stubs/UniqueNFT.soldiffbeforeafterboth
--- a/pallets/nonfungible/src/stubs/UniqueNFT.sol
+++ b/pallets/nonfungible/src/stubs/UniqueNFT.sol
@@ -51,6 +51,105 @@
 	event MintingFinished();
 }
 
+// Selector: 3a54513b
+contract Collection is Dummy, ERC165 {
+	// Selector: setCollectionProperty(string,bytes) 2f073f66
+	function setCollectionProperty(string memory key, bytes memory value)
+		public
+	{
+		require(false, stub_error);
+		key;
+		value;
+		dummy = 0;
+	}
+
+	// Selector: deleteCollectionProperty(string) 7b7debce
+	function deleteCollectionProperty(string memory key) public {
+		require(false, stub_error);
+		key;
+		dummy = 0;
+	}
+
+	// Throws error if key not found
+	//
+	// Selector: collectionProperty(string) cf24fd6d
+	function collectionProperty(string memory key)
+		public
+		view
+		returns (bytes memory)
+	{
+		require(false, stub_error);
+		key;
+		dummy;
+		return hex"";
+	}
+
+	// Selector: ethSetSponsor(address) 8f9af356
+	function ethSetSponsor(address sponsor) public {
+		require(false, stub_error);
+		sponsor;
+		dummy = 0;
+	}
+
+	// Selector: ethConfirmSponsorship() a8580d1a
+	function ethConfirmSponsorship() public {
+		require(false, stub_error);
+		dummy = 0;
+	}
+
+	// Selector: setLimit(string,uint32) 68db30ca
+	function setLimit(string memory limit, uint32 value) public {
+		require(false, stub_error);
+		limit;
+		value;
+		dummy = 0;
+	}
+
+	// Selector: setLimit(string,bool) ea67e4c2
+	function setLimit(string memory limit, bool value) public {
+		require(false, stub_error);
+		limit;
+		value;
+		dummy = 0;
+	}
+
+	// Selector: contractAddress() f6b4dfb4
+	function contractAddress() public view returns (address) {
+		require(false, stub_error);
+		dummy;
+		return 0x0000000000000000000000000000000000000000;
+	}
+
+	// Selector: addAdmin(address) 70480275
+	function addAdmin(address newAdmin) public view {
+		require(false, stub_error);
+		newAdmin;
+		dummy;
+	}
+
+	// Selector: removeAdmin(address) 1785f53c
+	function removeAdmin(address admin) public view {
+		require(false, stub_error);
+		admin;
+		dummy;
+	}
+
+	// Selector: setNesting(bool) e8fc50dd
+	function setNesting(bool enable) public {
+		require(false, stub_error);
+		enable;
+		dummy = 0;
+	}
+
+	// Selector: setNesting(bool,address[]) 7df12a9a
+	function setNesting(bool enable, address[] memory collections) public {
+		require(false, stub_error);
+		enable;
+		collections;
+		dummy = 0;
+	}
+}
+
 // Selector: 41369377
 contract TokenProperties is Dummy, ERC165 {
 	// Selector: setTokenPropertyPermission(string,bool,bool,bool) 222d97fa
@@ -294,135 +393,6 @@
 		require(false, stub_error);
 		dummy = 0;
 		return false;
-	}
-}
-
-// Selector: 6aea9834
-contract Collection is Dummy, ERC165 {
-	// Selector: setCollectionProperty(string,bytes) 2f073f66
-	function setCollectionProperty(string memory key, bytes memory value)
-		public
-	{
-		require(false, stub_error);
-		key;
-		value;
-		dummy = 0;
-	}
-
-	// Selector: deleteCollectionProperty(string) 7b7debce
-	function deleteCollectionProperty(string memory key) public {
-		require(false, stub_error);
-		key;
-		dummy = 0;
-	}
-
-	// Throws error if key not found
-	//
-	// Selector: collectionProperty(string) cf24fd6d
-	function collectionProperty(string memory key)
-		public
-		view
-		returns (bytes memory)
-	{
-		require(false, stub_error);
-		key;
-		dummy;
-		return hex"";
-	}
-
-	// Selector: setCollectionSponsor(address) 7623402e
-	function setCollectionSponsor(address sponsor) public {
-		require(false, stub_error);
-		sponsor;
-		dummy = 0;
-	}
-
-	// Selector: confirmCollectionSponsorship() 3c50e97a
-	function confirmCollectionSponsorship() public {
-		require(false, stub_error);
-		dummy = 0;
-	}
-
-	// Selector: setCollectionLimit(string,uint32) 6a3841db
-	function setCollectionLimit(string memory limit, uint32 value) public {
-		require(false, stub_error);
-		limit;
-		value;
-		dummy = 0;
-	}
-
-	// Selector: setCollectionLimit(string,bool) 993b7fba
-	function setCollectionLimit(string memory limit, bool value) public {
-		require(false, stub_error);
-		limit;
-		value;
-		dummy = 0;
-	}
-
-	// Selector: contractAddress() f6b4dfb4
-	function contractAddress() public view returns (address) {
-		require(false, stub_error);
-		dummy;
-		return 0x0000000000000000000000000000000000000000;
-	}
-
-	// Selector: addCollectionAdmin(address) 92e462c7
-	function addCollectionAdmin(address newAdmin) public view {
-		require(false, stub_error);
-		newAdmin;
-		dummy;
-	}
-
-	// Selector: removeCollectionAdmin(address) fafd7b42
-	function removeCollectionAdmin(address admin) public view {
-		require(false, stub_error);
-		admin;
-		dummy;
-	}
-
-	// Selector: setCollectionNesting(bool) 112d4586
-	function setCollectionNesting(bool enable) public {
-		require(false, stub_error);
-		enable;
-		dummy = 0;
-	}
-
-	// Selector: setCollectionNesting(bool,address[]) 64872396
-	function setCollectionNesting(bool enable, address[] memory collections)
-		public
-	{
-		require(false, stub_error);
-		enable;
-		collections;
-		dummy = 0;
-	}
-
-	// Selector: setCollectionAccess(uint8) 41835d4c
-	function setCollectionAccess(uint8 mode) public {
-		require(false, stub_error);
-		mode;
-		dummy = 0;
-	}
-
-	// Selector: addToCollectionAllowList(address) 67844fe6
-	function addToCollectionAllowList(address user) public view {
-		require(false, stub_error);
-		user;
-		dummy;
-	}
-
-	// Selector: removeFromCollectionAllowList(address) 85c51acb
-	function removeFromCollectionAllowList(address user) public view {
-		require(false, stub_error);
-		user;
-		dummy;
-	}
-
-	// Selector: setCollectionMintMode(bool) 00018e84
-	function setCollectionMintMode(bool mode) public {
-		require(false, stub_error);
-		mode;
-		dummy = 0;
 	}
 }
 
modifiedtests/src/eth/api/UniqueNFT.soldiffbeforeafterboth
--- a/tests/src/eth/api/UniqueNFT.sol
+++ b/tests/src/eth/api/UniqueNFT.sol
@@ -42,6 +42,51 @@
 	event MintingFinished();
 }
 
+// Selector: 3a54513b
+interface Collection is Dummy, ERC165 {
+	// Selector: setCollectionProperty(string,bytes) 2f073f66
+	function setCollectionProperty(string memory key, bytes memory value)
+		external;
+
+	// Selector: deleteCollectionProperty(string) 7b7debce
+	function deleteCollectionProperty(string memory key) external;
+
+	// Throws error if key not found
+	//
+	// Selector: collectionProperty(string) cf24fd6d
+	function collectionProperty(string memory key)
+		external
+		view
+		returns (bytes memory);
+
+	// Selector: ethSetSponsor(address) 8f9af356
+	function ethSetSponsor(address sponsor) external;
+
+	// Selector: ethConfirmSponsorship() a8580d1a
+	function ethConfirmSponsorship() external;
+
+	// Selector: setLimit(string,uint32) 68db30ca
+	function setLimit(string memory limit, uint32 value) external;
+
+	// Selector: setLimit(string,bool) ea67e4c2
+	function setLimit(string memory limit, bool value) external;
+
+	// Selector: contractAddress() f6b4dfb4
+	function contractAddress() external view returns (address);
+
+	// Selector: addAdmin(address) 70480275
+	function addAdmin(address newAdmin) external view;
+
+	// Selector: removeAdmin(address) 1785f53c
+	function removeAdmin(address admin) external view;
+
+	// Selector: setNesting(bool) e8fc50dd
+	function setNesting(bool enable) external;
+
+	// Selector: setNesting(bool,address[]) 7df12a9a
+	function setNesting(bool enable, address[] memory collections) external;
+}
+
 // Selector: 41369377
 interface TokenProperties is Dummy, ERC165 {
 	// Selector: setTokenPropertyPermission(string,bool,bool,bool) 222d97fa
@@ -172,64 +217,6 @@
 	//
 	// Selector: finishMinting() 7d64bcb4
 	function finishMinting() external returns (bool);
-}
-
-// Selector: 6aea9834
-interface Collection is Dummy, ERC165 {
-	// Selector: setCollectionProperty(string,bytes) 2f073f66
-	function setCollectionProperty(string memory key, bytes memory value)
-		external;
-
-	// Selector: deleteCollectionProperty(string) 7b7debce
-	function deleteCollectionProperty(string memory key) external;
-
-	// Throws error if key not found
-	//
-	// Selector: collectionProperty(string) cf24fd6d
-	function collectionProperty(string memory key)
-		external
-		view
-		returns (bytes memory);
-
-	// Selector: setCollectionSponsor(address) 7623402e
-	function setCollectionSponsor(address sponsor) external;
-
-	// Selector: confirmCollectionSponsorship() 3c50e97a
-	function confirmCollectionSponsorship() external;
-
-	// Selector: setCollectionLimit(string,uint32) 6a3841db
-	function setCollectionLimit(string memory limit, uint32 value) external;
-
-	// Selector: setCollectionLimit(string,bool) 993b7fba
-	function setCollectionLimit(string memory limit, bool value) external;
-
-	// Selector: contractAddress() f6b4dfb4
-	function contractAddress() external view returns (address);
-
-	// Selector: addCollectionAdmin(address) 92e462c7
-	function addCollectionAdmin(address newAdmin) external view;
-
-	// Selector: removeCollectionAdmin(address) fafd7b42
-	function removeCollectionAdmin(address admin) external view;
-
-	// Selector: setCollectionNesting(bool) 112d4586
-	function setCollectionNesting(bool enable) external;
-
-	// Selector: setCollectionNesting(bool,address[]) 64872396
-	function setCollectionNesting(bool enable, address[] memory collections)
-		external;
-
-	// Selector: setCollectionAccess(uint8) 41835d4c
-	function setCollectionAccess(uint8 mode) external;
-
-	// Selector: addToCollectionAllowList(address) 67844fe6
-	function addToCollectionAllowList(address user) external view;
-
-	// Selector: removeFromCollectionAllowList(address) 85c51acb
-	function removeFromCollectionAllowList(address user) external view;
-
-	// Selector: setCollectionMintMode(bool) 00018e84
-	function setCollectionMintMode(bool mode) external;
 }
 
 // Selector: 780e9d63
modifiedtests/src/eth/nonFungibleAbi.jsondiffbeforeafterboth
--- a/tests/src/eth/nonFungibleAbi.json
+++ b/tests/src/eth/nonFungibleAbi.json
@@ -84,16 +84,7 @@
     "inputs": [
       { "internalType": "address", "name": "newAdmin", "type": "address" }
     ],
-    "name": "addCollectionAdmin",
-    "outputs": [],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      { "internalType": "address", "name": "user", "type": "address" }
-    ],
-    "name": "addToCollectionAllowList",
+    "name": "addAdmin",
     "outputs": [],
     "stateMutability": "view",
     "type": "function"
@@ -293,16 +284,7 @@
     "inputs": [
       { "internalType": "address", "name": "admin", "type": "address" }
     ],
-    "name": "removeCollectionAdmin",
-    "outputs": [],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      { "internalType": "address", "name": "user", "type": "address" }
-    ],
-    "name": "removeFromCollectionAllowList",
+    "name": "removeAdmin",
     "outputs": [],
     "stateMutability": "view",
     "type": "function"
@@ -416,6 +398,27 @@
   },
   {
     "inputs": [
+      { "internalType": "bool", "name": "enable", "type": "bool" },
+      {
+        "internalType": "address[]",
+        "name": "collections",
+        "type": "address[]"
+      }
+    ],
+    "name": "setNesting",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [{ "internalType": "bool", "name": "enable", "type": "bool" }],
+    "name": "setNesting",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
       { "internalType": "uint256", "name": "tokenId", "type": "uint256" },
       { "internalType": "string", "name": "key", "type": "string" },
       { "internalType": "bytes", "name": "value", "type": "bytes" }
modifiedtests/src/eth/proxy/nonFungibleProxy.test.tsdiffbeforeafterboth
--- a/tests/src/eth/proxy/nonFungibleProxy.test.ts
+++ b/tests/src/eth/proxy/nonFungibleProxy.test.ts
@@ -99,7 +99,7 @@
     const collectionEvmOwned = evmCollection(web3, owner, collectionIdAddress);
     const collectionEvm = evmCollection(web3, caller, collectionIdAddress);
     const contract = await proxyWrap(api, web3, collectionEvm);
-    await collectionEvmOwned.methods.addCollectionAdmin(contract.options.address).send();
+    await collectionEvmOwned.methods.addAdmin(contract.options.address).send();
 
     {
       const nextTokenId = await contract.methods.nextTokenId().call();
modifiedtests/src/interfaces/augment-api-rpc.tsdiffbeforeafterboth
--- a/tests/src/interfaces/augment-api-rpc.ts
+++ b/tests/src/interfaces/augment-api-rpc.ts
@@ -18,7 +18,7 @@
 import type { EthAccount, EthCallRequest, EthFilter, EthFilterChanges, EthLog, EthReceipt, EthRichBlock, EthSubKind, EthSubParams, EthSyncStatus, EthTransaction, EthTransactionRequest, EthWork } from '@polkadot/types/interfaces/eth';
 import type { Extrinsic } from '@polkadot/types/interfaces/extrinsics';
 import type { EncodedFinalityProofs, JustificationNotification, ReportedRoundStates } from '@polkadot/types/interfaces/grandpa';
-import type { MmrLeafBatchProof, MmrLeafProof } from '@polkadot/types/interfaces/mmr';
+import type { MmrLeafProof } from '@polkadot/types/interfaces/mmr';
 import type { StorageKind } from '@polkadot/types/interfaces/offchain';
 import type { FeeDetails, RuntimeDispatchInfo } from '@polkadot/types/interfaces/payment';
 import type { RpcMethods } from '@polkadot/types/interfaces/rpc';
@@ -354,14 +354,10 @@
       subscribeJustifications: AugmentedRpc<() => Observable<JustificationNotification>>;
     };
     mmr: {
-      /**
-       * Generate MMR proof for the given leaf indices.
-       **/
-      generateBatchProof: AugmentedRpc<(leafIndices: Vec<u64> | (u64 | AnyNumber | Uint8Array)[], at?: BlockHash | string | Uint8Array) => Observable<MmrLeafProof>>;
       /**
        * Generate MMR proof for given leaf index.
        **/
-      generateProof: AugmentedRpc<(leafIndex: u64 | AnyNumber | Uint8Array, at?: BlockHash | string | Uint8Array) => Observable<MmrLeafBatchProof>>;
+      generateProof: AugmentedRpc<(leafIndex: u64 | AnyNumber | Uint8Array, at?: BlockHash | string | Uint8Array) => Observable<MmrLeafProof>>;
     };
     net: {
       /**
modifiedtests/src/interfaces/augment-types.tsdiffbeforeafterboth
--- a/tests/src/interfaces/augment-types.ts
+++ b/tests/src/interfaces/augment-types.ts
@@ -3,7 +3,7 @@
 
 import type { CumulusPalletDmpQueueCall, CumulusPalletDmpQueueConfigData, CumulusPalletDmpQueueError, CumulusPalletDmpQueueEvent, CumulusPalletDmpQueuePageIndexData, CumulusPalletParachainSystemCall, CumulusPalletParachainSystemError, CumulusPalletParachainSystemEvent, CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot, CumulusPalletXcmCall, CumulusPalletXcmError, CumulusPalletXcmEvent, CumulusPalletXcmOrigin, CumulusPalletXcmpQueueCall, CumulusPalletXcmpQueueError, CumulusPalletXcmpQueueEvent, CumulusPalletXcmpQueueInboundChannelDetails, CumulusPalletXcmpQueueInboundState, CumulusPalletXcmpQueueOutboundChannelDetails, CumulusPalletXcmpQueueOutboundState, CumulusPalletXcmpQueueQueueConfigData, CumulusPrimitivesParachainInherentParachainInherentData, EthbloomBloom, EthereumBlock, EthereumHeader, EthereumLog, EthereumReceiptEip658ReceiptData, EthereumReceiptReceiptV3, EthereumTransactionAccessListItem, EthereumTransactionEip1559Transaction, EthereumTransactionEip2930Transaction, EthereumTransactionLegacyTransaction, EthereumTransactionTransactionAction, EthereumTransactionTransactionSignature, EthereumTransactionTransactionV2, EthereumTypesHashH64, EvmCoreErrorExitError, EvmCoreErrorExitFatal, EvmCoreErrorExitReason, EvmCoreErrorExitRevert, EvmCoreErrorExitSucceed, FpRpcTransactionStatus, FrameSupportDispatchRawOrigin, FrameSupportPalletId, FrameSupportScheduleLookupError, FrameSupportScheduleMaybeHashed, FrameSupportTokensMiscBalanceStatus, FrameSupportWeightsDispatchClass, FrameSupportWeightsDispatchInfo, FrameSupportWeightsPays, FrameSupportWeightsPerDispatchClassU32, FrameSupportWeightsPerDispatchClassU64, FrameSupportWeightsPerDispatchClassWeightsPerClass, FrameSupportWeightsRuntimeDbWeight, FrameSupportWeightsWeightToFeeCoefficient, FrameSystemAccountInfo, FrameSystemCall, FrameSystemError, FrameSystemEvent, FrameSystemEventRecord, FrameSystemExtensionsCheckGenesis, FrameSystemExtensionsCheckNonce, FrameSystemExtensionsCheckSpecVersion, FrameSystemExtensionsCheckWeight, FrameSystemLastRuntimeUpgradeInfo, FrameSystemLimitsBlockLength, FrameSystemLimitsBlockWeights, FrameSystemLimitsWeightsPerClass, FrameSystemPhase, OpalRuntimeOriginCaller, OpalRuntimeRuntime, OrmlVestingModuleCall, OrmlVestingModuleError, OrmlVestingModuleEvent, OrmlVestingVestingSchedule, PalletBalancesAccountData, PalletBalancesBalanceLock, PalletBalancesCall, PalletBalancesError, PalletBalancesEvent, PalletBalancesReasons, PalletBalancesReleases, PalletBalancesReserveData, PalletCommonError, PalletCommonEvent, PalletEthereumCall, PalletEthereumError, PalletEthereumEvent, PalletEthereumFakeTransactionFinalizer, PalletEthereumRawOrigin, PalletEvmAccountBasicCrossAccountIdRepr, PalletEvmCall, PalletEvmCoderSubstrateError, PalletEvmContractHelpersError, PalletEvmContractHelpersSponsoringModeT, PalletEvmError, PalletEvmEvent, PalletEvmMigrationCall, PalletEvmMigrationError, PalletFungibleError, PalletInflationCall, PalletNonfungibleError, PalletNonfungibleItemData, PalletRefungibleError, PalletRefungibleItemData, PalletRmrkCoreCall, PalletRmrkCoreError, PalletRmrkCoreEvent, PalletRmrkEquipCall, PalletRmrkEquipError, PalletRmrkEquipEvent, PalletStructureCall, PalletStructureError, PalletStructureEvent, PalletSudoCall, PalletSudoError, PalletSudoEvent, PalletTemplateTransactionPaymentCall, PalletTemplateTransactionPaymentChargeTransactionPayment, PalletTimestampCall, PalletTransactionPaymentReleases, PalletTreasuryCall, PalletTreasuryError, PalletTreasuryEvent, PalletTreasuryProposal, PalletUniqueCall, PalletUniqueError, PalletUniqueRawEvent, PalletUnqSchedulerCall, PalletUnqSchedulerError, PalletUnqSchedulerEvent, PalletUnqSchedulerScheduledV3, PalletXcmCall, PalletXcmError, PalletXcmEvent, PalletXcmOrigin, PhantomTypeUpDataStructs, PolkadotCorePrimitivesInboundDownwardMessage, PolkadotCorePrimitivesInboundHrmpMessage, PolkadotCorePrimitivesOutboundHrmpMessage, PolkadotParachainPrimitivesXcmpMessageFormat, PolkadotPrimitivesV2AbridgedHostConfiguration, PolkadotPrimitivesV2AbridgedHrmpChannel, PolkadotPrimitivesV2PersistedValidationData, PolkadotPrimitivesV2UpgradeRestriction, RmrkTraitsBaseBaseInfo, RmrkTraitsCollectionCollectionInfo, RmrkTraitsNftAccountIdOrCollectionNftTuple, RmrkTraitsNftNftChild, RmrkTraitsNftNftInfo, RmrkTraitsNftRoyaltyInfo, RmrkTraitsPartEquippableList, RmrkTraitsPartFixedPart, RmrkTraitsPartPartType, RmrkTraitsPartSlotPart, RmrkTraitsPropertyPropertyInfo, RmrkTraitsResourceBasicResource, RmrkTraitsResourceComposableResource, RmrkTraitsResourceResourceInfo, RmrkTraitsResourceResourceTypes, RmrkTraitsResourceSlotResource, RmrkTraitsTheme, RmrkTraitsThemeThemeProperty, SpCoreEcdsaSignature, SpCoreEd25519Signature, SpCoreSr25519Signature, SpCoreVoid, SpRuntimeArithmeticError, SpRuntimeDigest, SpRuntimeDigestDigestItem, SpRuntimeDispatchError, SpRuntimeModuleError, SpRuntimeMultiSignature, SpRuntimeTokenError, SpRuntimeTransactionalError, SpTrieStorageProof, SpVersionRuntimeVersion, UpDataStructsAccessMode, UpDataStructsCollection, UpDataStructsCollectionLimits, UpDataStructsCollectionMode, UpDataStructsCollectionPermissions, UpDataStructsCollectionStats, UpDataStructsCreateCollectionData, UpDataStructsCreateFungibleData, UpDataStructsCreateItemData, UpDataStructsCreateItemExData, UpDataStructsCreateNftData, UpDataStructsCreateNftExData, UpDataStructsCreateReFungibleData, UpDataStructsCreateRefungibleExData, UpDataStructsNestingRule, UpDataStructsProperties, UpDataStructsPropertiesMapBoundedVec, UpDataStructsPropertiesMapPropertyPermission, UpDataStructsProperty, UpDataStructsPropertyKeyPermission, UpDataStructsPropertyPermission, UpDataStructsRpcCollection, UpDataStructsSponsoringRateLimit, UpDataStructsSponsorshipState, UpDataStructsTokenChild, UpDataStructsTokenData, XcmDoubleEncoded, XcmV0Junction, XcmV0JunctionBodyId, XcmV0JunctionBodyPart, XcmV0JunctionNetworkId, XcmV0MultiAsset, XcmV0MultiLocation, XcmV0Order, XcmV0OriginKind, XcmV0Response, XcmV0Xcm, XcmV1Junction, XcmV1MultiAsset, XcmV1MultiLocation, XcmV1MultiassetAssetId, XcmV1MultiassetAssetInstance, XcmV1MultiassetFungibility, XcmV1MultiassetMultiAssetFilter, XcmV1MultiassetMultiAssets, XcmV1MultiassetWildFungibility, XcmV1MultiassetWildMultiAsset, XcmV1MultilocationJunctions, XcmV1Order, XcmV1Response, XcmV1Xcm, XcmV2Instruction, XcmV2Response, XcmV2TraitsError, XcmV2TraitsOutcome, XcmV2WeightLimit, XcmV2Xcm, XcmVersionedMultiAssets, XcmVersionedMultiLocation, XcmVersionedXcm } from './default';
 import type { Data, StorageKey } from '@polkadot/types';
-import type { BitVec, Bool, Bytes, I128, I16, I256, I32, I64, I8, Json, Null, OptionBool, Raw, Text, Type, U128, U16, U256, U32, U64, U8, USize, bool, i128, i16, i256, i32, i64, i8, u128, u16, u256, u32, u64, u8, usize } from '@polkadot/types-codec';
+import type { BitVec, Bool, Bytes, I128, I16, I256, I32, I64, I8, Json, Null, Raw, Text, Type, U128, U16, U256, U32, U64, U8, USize, bool, i128, i16, i256, i32, i64, i8, u128, u16, u256, u32, u64, u8, usize } from '@polkadot/types-codec';
 import type { AssetApproval, AssetApprovalKey, AssetBalance, AssetDestroyWitness, AssetDetails, AssetMetadata, TAssetBalance, TAssetDepositBalance } from '@polkadot/types/interfaces/assets';
 import type { BlockAttestations, IncludedBlocks, MoreAttestations } from '@polkadot/types/interfaces/attestations';
 import type { RawAuraPreDigest } from '@polkadot/types/interfaces/aura';
@@ -36,7 +36,7 @@
 import type { AuthIndex, AuthoritySignature, Heartbeat, HeartbeatTo244, OpaqueMultiaddr, OpaqueNetworkState, OpaquePeerId } from '@polkadot/types/interfaces/imOnline';
 import type { CallIndex, LotteryConfig } from '@polkadot/types/interfaces/lottery';
 import type { ErrorMetadataLatest, ErrorMetadataV10, ErrorMetadataV11, ErrorMetadataV12, ErrorMetadataV13, ErrorMetadataV14, ErrorMetadataV9, EventMetadataLatest, EventMetadataV10, EventMetadataV11, EventMetadataV12, EventMetadataV13, EventMetadataV14, EventMetadataV9, ExtrinsicMetadataLatest, ExtrinsicMetadataV11, ExtrinsicMetadataV12, ExtrinsicMetadataV13, ExtrinsicMetadataV14, FunctionArgumentMetadataLatest, FunctionArgumentMetadataV10, FunctionArgumentMetadataV11, FunctionArgumentMetadataV12, FunctionArgumentMetadataV13, FunctionArgumentMetadataV14, FunctionArgumentMetadataV9, FunctionMetadataLatest, FunctionMetadataV10, FunctionMetadataV11, FunctionMetadataV12, FunctionMetadataV13, FunctionMetadataV14, FunctionMetadataV9, MetadataAll, MetadataLatest, MetadataV10, MetadataV11, MetadataV12, MetadataV13, MetadataV14, MetadataV9, ModuleConstantMetadataV10, ModuleConstantMetadataV11, ModuleConstantMetadataV12, ModuleConstantMetadataV13, ModuleConstantMetadataV9, ModuleMetadataV10, ModuleMetadataV11, ModuleMetadataV12, ModuleMetadataV13, ModuleMetadataV9, PalletCallMetadataLatest, PalletCallMetadataV14, PalletConstantMetadataLatest, PalletConstantMetadataV14, PalletErrorMetadataLatest, PalletErrorMetadataV14, PalletEventMetadataLatest, PalletEventMetadataV14, PalletMetadataLatest, PalletMetadataV14, PalletStorageMetadataLatest, PalletStorageMetadataV14, PortableType, PortableTypeV14, SignedExtensionMetadataLatest, SignedExtensionMetadataV14, StorageEntryMetadataLatest, StorageEntryMetadataV10, StorageEntryMetadataV11, StorageEntryMetadataV12, StorageEntryMetadataV13, StorageEntryMetadataV14, StorageEntryMetadataV9, StorageEntryModifierLatest, StorageEntryModifierV10, StorageEntryModifierV11, StorageEntryModifierV12, StorageEntryModifierV13, StorageEntryModifierV14, StorageEntryModifierV9, StorageEntryTypeLatest, StorageEntryTypeV10, StorageEntryTypeV11, StorageEntryTypeV12, StorageEntryTypeV13, StorageEntryTypeV14, StorageEntryTypeV9, StorageHasher, StorageHasherV10, StorageHasherV11, StorageHasherV12, StorageHasherV13, StorageHasherV14, StorageHasherV9, StorageMetadataV10, StorageMetadataV11, StorageMetadataV12, StorageMetadataV13, StorageMetadataV9 } from '@polkadot/types/interfaces/metadata';
-import type { MmrLeafBatchProof, MmrLeafProof } from '@polkadot/types/interfaces/mmr';
+import type { MmrLeafProof } from '@polkadot/types/interfaces/mmr';
 import type { StorageKind } from '@polkadot/types/interfaces/offchain';
 import type { DeferredOffenceOf, Kind, OffenceDetails, Offender, OpaqueTimeSlot, ReportIdOf, Reporter } from '@polkadot/types/interfaces/offences';
 import type { AbridgedCandidateReceipt, AbridgedHostConfiguration, AbridgedHrmpChannel, AssignmentId, AssignmentKind, AttestedCandidate, AuctionIndex, AuthorityDiscoveryId, AvailabilityBitfield, AvailabilityBitfieldRecord, BackedCandidate, Bidder, BufferedSessionChange, CandidateCommitments, CandidateDescriptor, CandidateHash, CandidateInfo, CandidatePendingAvailability, CandidateReceipt, CollatorId, CollatorSignature, CommittedCandidateReceipt, CoreAssignment, CoreIndex, CoreOccupied, DisputeLocation, DisputeResult, DisputeState, DisputeStatement, DisputeStatementSet, DoubleVoteReport, DownwardMessage, ExplicitDisputeStatement, GlobalValidationData, GlobalValidationSchedule, GroupIndex, HeadData, HostConfiguration, HrmpChannel, HrmpChannelId, HrmpOpenChannelRequest, InboundDownwardMessage, InboundHrmpMessage, InboundHrmpMessages, IncomingParachain, IncomingParachainDeploy, IncomingParachainFixed, InvalidDisputeStatementKind, LeasePeriod, LeasePeriodOf, LocalValidationData, MessageIngestionType, MessageQueueChain, MessagingStateSnapshot, MessagingStateSnapshotEgressEntry, MultiDisputeStatementSet, NewBidder, OutboundHrmpMessage, ParaGenesisArgs, ParaId, ParaInfo, ParaLifecycle, ParaPastCodeMeta, ParaScheduling, ParaValidatorIndex, ParachainDispatchOrigin, ParachainInherentData, ParachainProposal, ParachainsInherentData, ParathreadClaim, ParathreadClaimQueue, ParathreadEntry, PersistedValidationData, QueuedParathread, RegisteredParachainInfo, RelayBlockNumber, RelayChainBlockNumber, RelayChainHash, RelayHash, Remark, ReplacementTimes, Retriable, Scheduling, ServiceQuality, SessionInfo, SessionInfoValidatorGroup, SignedAvailabilityBitfield, SignedAvailabilityBitfields, SigningContext, SlotRange, SlotRange10, Statement, SubId, SystemInherentData, TransientValidationData, UpgradeGoAhead, UpgradeRestriction, UpwardMessage, ValidDisputeStatementKind, ValidationCode, ValidationCodeHash, ValidationData, ValidationDataType, ValidationFunctionParams, ValidatorSignature, ValidityAttestation, VecInboundHrmpMessage, WinnersData, WinnersData10, WinnersDataTuple, WinnersDataTuple10, WinningData, WinningData10, WinningDataEntry } from '@polkadot/types/interfaces/parachains';
@@ -664,7 +664,6 @@
     MetadataV14: MetadataV14;
     MetadataV9: MetadataV9;
     MigrationStatusResult: MigrationStatusResult;
-    MmrLeafBatchProof: MmrLeafBatchProof;
     MmrLeafProof: MmrLeafProof;
     MmrRootHash: MmrRootHash;
     ModuleConstantMetadataV10: ModuleConstantMetadataV10;
@@ -732,7 +731,6 @@
     OpenTipTip: OpenTipTip;
     OpenTipTo225: OpenTipTo225;
     OperatingMode: OperatingMode;
-    OptionBool: OptionBool;
     Origin: Origin;
     OriginCaller: OriginCaller;
     OriginKindV0: OriginKindV0;