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
--- a/pallets/common/src/erc.rs
+++ b/pallets/common/src/erc.rs
@@ -47,8 +47,9 @@
 }
 
 #[solidity_interface(name = "Collection")]
-impl<T: Config> CollectionHandle<T>
-// where
+
+impl<T: Config> CollectionHandle<T> 
+// where 
 // 	T::AccountId: From<H256>
 {
 	fn set_collection_property(&mut self, caller: caller, key: string, value: bytes) -> Result<()> {
@@ -192,7 +193,7 @@
 	// 	Ok(())
 	// }
 
-	fn add_collection_admin(&self, caller: caller, new_admin: address) -> Result<void> {
+	fn add_admin(&self, caller: caller, new_admin: address) -> Result<void> {
 		let caller = T::CrossAccountId::from_eth(caller);
 		self.check_is_owner_or_admin(&caller)
 			.map_err(dispatch_to_evm::<T>)?;
@@ -202,16 +203,17 @@
 		Ok(())
 	}
 
-	fn remove_collection_admin(&self, caller: caller, admin: address) -> Result<void> {
+	fn remove_admin(&self, caller: caller, admin: address) -> Result<void> {
 		let caller = T::CrossAccountId::from_eth(caller);
 		self.check_is_owner_or_admin(&caller)
 			.map_err(dispatch_to_evm::<T>)?;
 		let admin = T::CrossAccountId::from_eth(admin);
-		<Pallet<T>>::toggle_admin(&self, &caller, &admin, false).map_err(dispatch_to_evm::<T>)?;
+		<Pallet<T>>::toggle_admin(&self, &caller, &admin, false)
+			.map_err(dispatch_to_evm::<T>)?;
 		Ok(())
 	}
 
-	#[solidity(rename_selector = "setCollectionNesting")]
+	#[solidity(rename_selector = "setNesting")]
 	fn set_nesting_bool(&mut self, caller: caller, enable: bool) -> Result<void> {
 		let caller = T::CrossAccountId::from_eth(caller);
 		self.check_is_owner_or_admin(&caller)
@@ -224,22 +226,13 @@
 		Ok(())
 	}
 
-	#[solidity(rename_selector = "setCollectionNesting")]
-	fn set_nesting(
-		&mut self,
-		caller: caller,
-		enable: bool,
-		collections: Vec<address>,
-	) -> Result<void> {
+	#[solidity(rename_selector = "setNesting")]
+	fn set_nesting(&mut self, caller: caller, enable: bool, collections: Vec<address>) -> Result<void> {
 		if collections.is_empty() {
 			return Err("No addresses provided".into());
 		}
 		if collections.len() >= OwnerRestrictedSet::bound() {
-			return Err(Error::Revert(format!(
-				"Out of bound: {} >= {}",
-				collections.len(),
-				OwnerRestrictedSet::bound()
-			)));
+			return Err(Error::Revert(format!("Out of bound: {} >= {}", collections.len(), OwnerRestrictedSet::bound())));
 		}
 		let caller = T::CrossAccountId::from_eth(caller);
 		self.check_is_owner_or_admin(&caller)
@@ -249,48 +242,14 @@
 			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(),
-					))?)
-					.map_err(|e| Error::Revert(format!("{:?}", e)))?;
+					bv.try_insert(
+						crate::eth::map_eth_to_id(&i)
+							.ok_or(Error::Revert("Can't convert address into collection id".into()))?
+					).map_err(|e| Error::Revert(format!("{:?}", e)))?;
 				}
-				NestingRule::OwnerRestricted(bv)
+				NestingRule::OwnerRestricted (bv)
 			}
-		});
-		save(self);
-		Ok(())
-	}
-
-	fn set_collection_access(&mut self, caller: caller, mode: uint8) -> Result<void> {
-		let caller = T::CrossAccountId::from_eth(caller);
-		self.check_is_owner_or_admin(&caller)
-			.map_err(dispatch_to_evm::<T>)?;
-		self.collection.permissions.access = Some(match mode {
-			0 => AccessMode::Normal,
-			1 => AccessMode::AllowList,
-			_ => return Err("Not supported access mode".into()),
 		});
-		save(self);
-		Ok(())
-	}
-
-	fn add_to_collection_allow_list(&self, caller: caller, user: address) -> Result<void> {
-		let caller = check_is_owner_or_admin(caller, self)?;
-		let user = T::CrossAccountId::from_eth(user);
-		<Pallet<T>>::toggle_allowlist(self, &caller, &user, true).map_err(dispatch_to_evm::<T>)?;
-		Ok(())
-	}
-
-	fn remove_from_collection_allow_list(&self, caller: caller, user: address) -> Result<void> {
-		let caller = check_is_owner_or_admin(caller, self)?;
-		let user = T::CrossAccountId::from_eth(user);
-		<Pallet<T>>::toggle_allowlist(self, &caller, &user, false).map_err(dispatch_to_evm::<T>)?;
-		Ok(())
-	}
-
-	fn set_collection_mint_mode(&mut self, caller: caller, mode: bool) -> Result<void> {
-		check_is_owner_or_admin(caller, self)?;
-		self.collection.permissions.mint_mode = Some(mode);
 		save(self);
 		Ok(())
 	}
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
before · pallets/nonfungible/src/stubs/UniqueNFT.sol
1// SPDX-License-Identifier: OTHER2// This code is automatically generated34pragma solidity >=0.8.0 <0.9.0;56// Anonymous struct7struct Tuple0 {8	uint256 field_0;9	string field_1;10}1112// Common stubs holder13contract Dummy {14	uint8 dummy;15	string stub_error = "this contract is implemented in native";16}1718contract ERC165 is Dummy {19	function supportsInterface(bytes4 interfaceID)20		external21		view22		returns (bool)23	{24		require(false, stub_error);25		interfaceID;26		return true;27	}28}2930// Inline31contract ERC721Events {32	event Transfer(33		address indexed from,34		address indexed to,35		uint256 indexed tokenId36	);37	event Approval(38		address indexed owner,39		address indexed approved,40		uint256 indexed tokenId41	);42	event ApprovalForAll(43		address indexed owner,44		address indexed operator,45		bool approved46	);47}4849// Inline50contract ERC721MintableEvents {51	event MintingFinished();52}5354// Selector: 4136937755contract TokenProperties is Dummy, ERC165 {56	// Selector: setTokenPropertyPermission(string,bool,bool,bool) 222d97fa57	function setTokenPropertyPermission(58		string memory key,59		bool isMutable,60		bool collectionAdmin,61		bool tokenOwner62	) public {63		require(false, stub_error);64		key;65		isMutable;66		collectionAdmin;67		tokenOwner;68		dummy = 0;69	}7071	// Selector: setProperty(uint256,string,bytes) 1752d67b72	function setProperty(73		uint256 tokenId,74		string memory key,75		bytes memory value76	) public {77		require(false, stub_error);78		tokenId;79		key;80		value;81		dummy = 0;82	}8384	// Selector: deleteProperty(uint256,string) 066111d185	function deleteProperty(uint256 tokenId, string memory key) public {86		require(false, stub_error);87		tokenId;88		key;89		dummy = 0;90	}9192	// Throws error if key not found93	//94	// Selector: property(uint256,string) 7228c32795	function property(uint256 tokenId, string memory key)96		public97		view98		returns (bytes memory)99	{100		require(false, stub_error);101		tokenId;102		key;103		dummy;104		return hex"";105	}106}107108// Selector: 42966c68109contract ERC721Burnable is Dummy, ERC165 {110	// Selector: burn(uint256) 42966c68111	function burn(uint256 tokenId) public {112		require(false, stub_error);113		tokenId;114		dummy = 0;115	}116}117118// Selector: 58800161119contract ERC721 is Dummy, ERC165, ERC721Events {120	// Selector: balanceOf(address) 70a08231121	function balanceOf(address owner) public view returns (uint256) {122		require(false, stub_error);123		owner;124		dummy;125		return 0;126	}127128	// Selector: ownerOf(uint256) 6352211e129	function ownerOf(uint256 tokenId) public view returns (address) {130		require(false, stub_error);131		tokenId;132		dummy;133		return 0x0000000000000000000000000000000000000000;134	}135136	// Not implemented137	//138	// Selector: safeTransferFromWithData(address,address,uint256,bytes) 60a11672139	function safeTransferFromWithData(140		address from,141		address to,142		uint256 tokenId,143		bytes memory data144	) public {145		require(false, stub_error);146		from;147		to;148		tokenId;149		data;150		dummy = 0;151	}152153	// Not implemented154	//155	// Selector: safeTransferFrom(address,address,uint256) 42842e0e156	function safeTransferFrom(157		address from,158		address to,159		uint256 tokenId160	) public {161		require(false, stub_error);162		from;163		to;164		tokenId;165		dummy = 0;166	}167168	// Selector: transferFrom(address,address,uint256) 23b872dd169	function transferFrom(170		address from,171		address to,172		uint256 tokenId173	) public {174		require(false, stub_error);175		from;176		to;177		tokenId;178		dummy = 0;179	}180181	// Selector: approve(address,uint256) 095ea7b3182	function approve(address approved, uint256 tokenId) public {183		require(false, stub_error);184		approved;185		tokenId;186		dummy = 0;187	}188189	// Not implemented190	//191	// Selector: setApprovalForAll(address,bool) a22cb465192	function setApprovalForAll(address operator, bool approved) public {193		require(false, stub_error);194		operator;195		approved;196		dummy = 0;197	}198199	// Not implemented200	//201	// Selector: getApproved(uint256) 081812fc202	function getApproved(uint256 tokenId) public view returns (address) {203		require(false, stub_error);204		tokenId;205		dummy;206		return 0x0000000000000000000000000000000000000000;207	}208209	// Not implemented210	//211	// Selector: isApprovedForAll(address,address) e985e9c5212	function isApprovedForAll(address owner, address operator)213		public214		view215		returns (address)216	{217		require(false, stub_error);218		owner;219		operator;220		dummy;221		return 0x0000000000000000000000000000000000000000;222	}223}224225// Selector: 5b5e139f226contract ERC721Metadata is Dummy, ERC165 {227	// Selector: name() 06fdde03228	function name() public view returns (string memory) {229		require(false, stub_error);230		dummy;231		return "";232	}233234	// Selector: symbol() 95d89b41235	function symbol() public view returns (string memory) {236		require(false, stub_error);237		dummy;238		return "";239	}240241	// Returns token's const_metadata242	//243	// Selector: tokenURI(uint256) c87b56dd244	function tokenURI(uint256 tokenId) public view returns (string memory) {245		require(false, stub_error);246		tokenId;247		dummy;248		return "";249	}250}251252// Selector: 68ccfe89253contract ERC721Mintable is Dummy, ERC165, ERC721MintableEvents {254	// Selector: mintingFinished() 05d2035b255	function mintingFinished() public view returns (bool) {256		require(false, stub_error);257		dummy;258		return false;259	}260261	// `token_id` should be obtained with `next_token_id` method,262	// unlike standard, you can't specify it manually263	//264	// Selector: mint(address,uint256) 40c10f19265	function mint(address to, uint256 tokenId) public returns (bool) {266		require(false, stub_error);267		to;268		tokenId;269		dummy = 0;270		return false;271	}272273	// `token_id` should be obtained with `next_token_id` method,274	// unlike standard, you can't specify it manually275	//276	// Selector: mintWithTokenURI(address,uint256,string) 50bb4e7f277	function mintWithTokenURI(278		address to,279		uint256 tokenId,280		string memory tokenUri281	) public returns (bool) {282		require(false, stub_error);283		to;284		tokenId;285		tokenUri;286		dummy = 0;287		return false;288	}289290	// Not implemented291	//292	// Selector: finishMinting() 7d64bcb4293	function finishMinting() public returns (bool) {294		require(false, stub_error);295		dummy = 0;296		return false;297	}298}299300// Selector: 6aea9834301contract Collection is Dummy, ERC165 {302	// Selector: setCollectionProperty(string,bytes) 2f073f66303	function setCollectionProperty(string memory key, bytes memory value)304		public305	{306		require(false, stub_error);307		key;308		value;309		dummy = 0;310	}311312	// Selector: deleteCollectionProperty(string) 7b7debce313	function deleteCollectionProperty(string memory key) public {314		require(false, stub_error);315		key;316		dummy = 0;317	}318319	// Throws error if key not found320	//321	// Selector: collectionProperty(string) cf24fd6d322	function collectionProperty(string memory key)323		public324		view325		returns (bytes memory)326	{327		require(false, stub_error);328		key;329		dummy;330		return hex"";331	}332333	// Selector: setCollectionSponsor(address) 7623402e334	function setCollectionSponsor(address sponsor) public {335		require(false, stub_error);336		sponsor;337		dummy = 0;338	}339340	// Selector: confirmCollectionSponsorship() 3c50e97a341	function confirmCollectionSponsorship() public {342		require(false, stub_error);343		dummy = 0;344	}345346	// Selector: setCollectionLimit(string,uint32) 6a3841db347	function setCollectionLimit(string memory limit, uint32 value) public {348		require(false, stub_error);349		limit;350		value;351		dummy = 0;352	}353354	// Selector: setCollectionLimit(string,bool) 993b7fba355	function setCollectionLimit(string memory limit, bool value) public {356		require(false, stub_error);357		limit;358		value;359		dummy = 0;360	}361362	// Selector: contractAddress() f6b4dfb4363	function contractAddress() public view returns (address) {364		require(false, stub_error);365		dummy;366		return 0x0000000000000000000000000000000000000000;367	}368369	// Selector: addCollectionAdmin(address) 92e462c7370	function addCollectionAdmin(address newAdmin) public view {371		require(false, stub_error);372		newAdmin;373		dummy;374	}375376	// Selector: removeCollectionAdmin(address) fafd7b42377	function removeCollectionAdmin(address admin) public view {378		require(false, stub_error);379		admin;380		dummy;381	}382383	// Selector: setCollectionNesting(bool) 112d4586384	function setCollectionNesting(bool enable) public {385		require(false, stub_error);386		enable;387		dummy = 0;388	}389390	// Selector: setCollectionNesting(bool,address[]) 64872396391	function setCollectionNesting(bool enable, address[] memory collections)392		public393	{394		require(false, stub_error);395		enable;396		collections;397		dummy = 0;398	}399400	// Selector: setCollectionAccess(uint8) 41835d4c401	function setCollectionAccess(uint8 mode) public {402		require(false, stub_error);403		mode;404		dummy = 0;405	}406407	// Selector: addToCollectionAllowList(address) 67844fe6408	function addToCollectionAllowList(address user) public view {409		require(false, stub_error);410		user;411		dummy;412	}413414	// Selector: removeFromCollectionAllowList(address) 85c51acb415	function removeFromCollectionAllowList(address user) public view {416		require(false, stub_error);417		user;418		dummy;419	}420421	// Selector: setCollectionMintMode(bool) 00018e84422	function setCollectionMintMode(bool mode) public {423		require(false, stub_error);424		mode;425		dummy = 0;426	}427}428429// Selector: 780e9d63430contract ERC721Enumerable is Dummy, ERC165 {431	// Selector: tokenByIndex(uint256) 4f6ccce7432	function tokenByIndex(uint256 index) public view returns (uint256) {433		require(false, stub_error);434		index;435		dummy;436		return 0;437	}438439	// Not implemented440	//441	// Selector: tokenOfOwnerByIndex(address,uint256) 2f745c59442	function tokenOfOwnerByIndex(address owner, uint256 index)443		public444		view445		returns (uint256)446	{447		require(false, stub_error);448		owner;449		index;450		dummy;451		return 0;452	}453454	// Selector: totalSupply() 18160ddd455	function totalSupply() public view returns (uint256) {456		require(false, stub_error);457		dummy;458		return 0;459	}460}461462// Selector: d74d154f463contract ERC721UniqueExtensions is Dummy, ERC165 {464	// Selector: transfer(address,uint256) a9059cbb465	function transfer(address to, uint256 tokenId) public {466		require(false, stub_error);467		to;468		tokenId;469		dummy = 0;470	}471472	// Selector: burnFrom(address,uint256) 79cc6790473	function burnFrom(address from, uint256 tokenId) public {474		require(false, stub_error);475		from;476		tokenId;477		dummy = 0;478	}479480	// Selector: nextTokenId() 75794a3c481	function nextTokenId() public view returns (uint256) {482		require(false, stub_error);483		dummy;484		return 0;485	}486487	// Selector: mintBulk(address,uint256[]) 44a9945e488	function mintBulk(address to, uint256[] memory tokenIds)489		public490		returns (bool)491	{492		require(false, stub_error);493		to;494		tokenIds;495		dummy = 0;496		return false;497	}498499	// Selector: mintBulkWithTokenURI(address,(uint256,string)[]) 36543006500	function mintBulkWithTokenURI(address to, Tuple0[] memory tokens)501		public502		returns (bool)503	{504		require(false, stub_error);505		to;506		tokens;507		dummy = 0;508		return false;509	}510}511512contract UniqueNFT is513	Dummy,514	ERC165,515	ERC721,516	ERC721Metadata,517	ERC721Enumerable,518	ERC721UniqueExtensions,519	ERC721Mintable,520	ERC721Burnable,521	Collection,522	TokenProperties523{}
after · pallets/nonfungible/src/stubs/UniqueNFT.sol
1// SPDX-License-Identifier: OTHER2// This code is automatically generated34pragma solidity >=0.8.0 <0.9.0;56// Anonymous struct7struct Tuple0 {8	uint256 field_0;9	string field_1;10}1112// Common stubs holder13contract Dummy {14	uint8 dummy;15	string stub_error = "this contract is implemented in native";16}1718contract ERC165 is Dummy {19	function supportsInterface(bytes4 interfaceID)20		external21		view22		returns (bool)23	{24		require(false, stub_error);25		interfaceID;26		return true;27	}28}2930// Inline31contract ERC721Events {32	event Transfer(33		address indexed from,34		address indexed to,35		uint256 indexed tokenId36	);37	event Approval(38		address indexed owner,39		address indexed approved,40		uint256 indexed tokenId41	);42	event ApprovalForAll(43		address indexed owner,44		address indexed operator,45		bool approved46	);47}4849// Inline50contract ERC721MintableEvents {51	event MintingFinished();52}5354// Selector: 3a54513b55contract Collection is Dummy, ERC165 {56	// Selector: setCollectionProperty(string,bytes) 2f073f6657	function setCollectionProperty(string memory key, bytes memory value)58		public59	{60		require(false, stub_error);61		key;62		value;63		dummy = 0;64	}6566	// Selector: deleteCollectionProperty(string) 7b7debce67	function deleteCollectionProperty(string memory key) public {68		require(false, stub_error);69		key;70		dummy = 0;71	}7273	// Throws error if key not found74	//75	// Selector: collectionProperty(string) cf24fd6d76	function collectionProperty(string memory key)77		public78		view79		returns (bytes memory)80	{81		require(false, stub_error);82		key;83		dummy;84		return hex"";85	}8687	// Selector: ethSetSponsor(address) 8f9af35688	function ethSetSponsor(address sponsor) public {89		require(false, stub_error);90		sponsor;91		dummy = 0;92	}9394	// Selector: ethConfirmSponsorship() a8580d1a95	function ethConfirmSponsorship() public {96		require(false, stub_error);97		dummy = 0;98	}99100	// Selector: setLimit(string,uint32) 68db30ca101	function setLimit(string memory limit, uint32 value) public {102		require(false, stub_error);103		limit;104		value;105		dummy = 0;106	}107108	// Selector: setLimit(string,bool) ea67e4c2109	function setLimit(string memory limit, bool value) public {110		require(false, stub_error);111		limit;112		value;113		dummy = 0;114	}115116	// Selector: contractAddress() f6b4dfb4117	function contractAddress() public view returns (address) {118		require(false, stub_error);119		dummy;120		return 0x0000000000000000000000000000000000000000;121	}122123	// Selector: addAdmin(address) 70480275124	function addAdmin(address newAdmin) public view {125		require(false, stub_error);126		newAdmin;127		dummy;128	}129130	// Selector: removeAdmin(address) 1785f53c131	function removeAdmin(address admin) public view {132		require(false, stub_error);133		admin;134		dummy;135	}136137	// Selector: setNesting(bool) e8fc50dd138	function setNesting(bool enable) public {139		require(false, stub_error);140		enable;141		dummy = 0;142	}143144	// Selector: setNesting(bool,address[]) 7df12a9a145	function setNesting(bool enable, address[] memory collections) public {146		require(false, stub_error);147		enable;148		collections;149		dummy = 0;150	}151}152153// Selector: 41369377154contract TokenProperties is Dummy, ERC165 {155	// Selector: setTokenPropertyPermission(string,bool,bool,bool) 222d97fa156	function setTokenPropertyPermission(157		string memory key,158		bool isMutable,159		bool collectionAdmin,160		bool tokenOwner161	) public {162		require(false, stub_error);163		key;164		isMutable;165		collectionAdmin;166		tokenOwner;167		dummy = 0;168	}169170	// Selector: setProperty(uint256,string,bytes) 1752d67b171	function setProperty(172		uint256 tokenId,173		string memory key,174		bytes memory value175	) public {176		require(false, stub_error);177		tokenId;178		key;179		value;180		dummy = 0;181	}182183	// Selector: deleteProperty(uint256,string) 066111d1184	function deleteProperty(uint256 tokenId, string memory key) public {185		require(false, stub_error);186		tokenId;187		key;188		dummy = 0;189	}190191	// Throws error if key not found192	//193	// Selector: property(uint256,string) 7228c327194	function property(uint256 tokenId, string memory key)195		public196		view197		returns (bytes memory)198	{199		require(false, stub_error);200		tokenId;201		key;202		dummy;203		return hex"";204	}205}206207// Selector: 42966c68208contract ERC721Burnable is Dummy, ERC165 {209	// Selector: burn(uint256) 42966c68210	function burn(uint256 tokenId) public {211		require(false, stub_error);212		tokenId;213		dummy = 0;214	}215}216217// Selector: 58800161218contract ERC721 is Dummy, ERC165, ERC721Events {219	// Selector: balanceOf(address) 70a08231220	function balanceOf(address owner) public view returns (uint256) {221		require(false, stub_error);222		owner;223		dummy;224		return 0;225	}226227	// Selector: ownerOf(uint256) 6352211e228	function ownerOf(uint256 tokenId) public view returns (address) {229		require(false, stub_error);230		tokenId;231		dummy;232		return 0x0000000000000000000000000000000000000000;233	}234235	// Not implemented236	//237	// Selector: safeTransferFromWithData(address,address,uint256,bytes) 60a11672238	function safeTransferFromWithData(239		address from,240		address to,241		uint256 tokenId,242		bytes memory data243	) public {244		require(false, stub_error);245		from;246		to;247		tokenId;248		data;249		dummy = 0;250	}251252	// Not implemented253	//254	// Selector: safeTransferFrom(address,address,uint256) 42842e0e255	function safeTransferFrom(256		address from,257		address to,258		uint256 tokenId259	) public {260		require(false, stub_error);261		from;262		to;263		tokenId;264		dummy = 0;265	}266267	// Selector: transferFrom(address,address,uint256) 23b872dd268	function transferFrom(269		address from,270		address to,271		uint256 tokenId272	) public {273		require(false, stub_error);274		from;275		to;276		tokenId;277		dummy = 0;278	}279280	// Selector: approve(address,uint256) 095ea7b3281	function approve(address approved, uint256 tokenId) public {282		require(false, stub_error);283		approved;284		tokenId;285		dummy = 0;286	}287288	// Not implemented289	//290	// Selector: setApprovalForAll(address,bool) a22cb465291	function setApprovalForAll(address operator, bool approved) public {292		require(false, stub_error);293		operator;294		approved;295		dummy = 0;296	}297298	// Not implemented299	//300	// Selector: getApproved(uint256) 081812fc301	function getApproved(uint256 tokenId) public view returns (address) {302		require(false, stub_error);303		tokenId;304		dummy;305		return 0x0000000000000000000000000000000000000000;306	}307308	// Not implemented309	//310	// Selector: isApprovedForAll(address,address) e985e9c5311	function isApprovedForAll(address owner, address operator)312		public313		view314		returns (address)315	{316		require(false, stub_error);317		owner;318		operator;319		dummy;320		return 0x0000000000000000000000000000000000000000;321	}322}323324// Selector: 5b5e139f325contract ERC721Metadata is Dummy, ERC165 {326	// Selector: name() 06fdde03327	function name() public view returns (string memory) {328		require(false, stub_error);329		dummy;330		return "";331	}332333	// Selector: symbol() 95d89b41334	function symbol() public view returns (string memory) {335		require(false, stub_error);336		dummy;337		return "";338	}339340	// Returns token's const_metadata341	//342	// Selector: tokenURI(uint256) c87b56dd343	function tokenURI(uint256 tokenId) public view returns (string memory) {344		require(false, stub_error);345		tokenId;346		dummy;347		return "";348	}349}350351// Selector: 68ccfe89352contract ERC721Mintable is Dummy, ERC165, ERC721MintableEvents {353	// Selector: mintingFinished() 05d2035b354	function mintingFinished() public view returns (bool) {355		require(false, stub_error);356		dummy;357		return false;358	}359360	// `token_id` should be obtained with `next_token_id` method,361	// unlike standard, you can't specify it manually362	//363	// Selector: mint(address,uint256) 40c10f19364	function mint(address to, uint256 tokenId) public returns (bool) {365		require(false, stub_error);366		to;367		tokenId;368		dummy = 0;369		return false;370	}371372	// `token_id` should be obtained with `next_token_id` method,373	// unlike standard, you can't specify it manually374	//375	// Selector: mintWithTokenURI(address,uint256,string) 50bb4e7f376	function mintWithTokenURI(377		address to,378		uint256 tokenId,379		string memory tokenUri380	) public returns (bool) {381		require(false, stub_error);382		to;383		tokenId;384		tokenUri;385		dummy = 0;386		return false;387	}388389	// Not implemented390	//391	// Selector: finishMinting() 7d64bcb4392	function finishMinting() public returns (bool) {393		require(false, stub_error);394		dummy = 0;395		return false;396	}397}398399// Selector: 780e9d63400contract ERC721Enumerable is Dummy, ERC165 {401	// Selector: tokenByIndex(uint256) 4f6ccce7402	function tokenByIndex(uint256 index) public view returns (uint256) {403		require(false, stub_error);404		index;405		dummy;406		return 0;407	}408409	// Not implemented410	//411	// Selector: tokenOfOwnerByIndex(address,uint256) 2f745c59412	function tokenOfOwnerByIndex(address owner, uint256 index)413		public414		view415		returns (uint256)416	{417		require(false, stub_error);418		owner;419		index;420		dummy;421		return 0;422	}423424	// Selector: totalSupply() 18160ddd425	function totalSupply() public view returns (uint256) {426		require(false, stub_error);427		dummy;428		return 0;429	}430}431432// Selector: d74d154f433contract ERC721UniqueExtensions is Dummy, ERC165 {434	// Selector: transfer(address,uint256) a9059cbb435	function transfer(address to, uint256 tokenId) public {436		require(false, stub_error);437		to;438		tokenId;439		dummy = 0;440	}441442	// Selector: burnFrom(address,uint256) 79cc6790443	function burnFrom(address from, uint256 tokenId) public {444		require(false, stub_error);445		from;446		tokenId;447		dummy = 0;448	}449450	// Selector: nextTokenId() 75794a3c451	function nextTokenId() public view returns (uint256) {452		require(false, stub_error);453		dummy;454		return 0;455	}456457	// Selector: mintBulk(address,uint256[]) 44a9945e458	function mintBulk(address to, uint256[] memory tokenIds)459		public460		returns (bool)461	{462		require(false, stub_error);463		to;464		tokenIds;465		dummy = 0;466		return false;467	}468469	// Selector: mintBulkWithTokenURI(address,(uint256,string)[]) 36543006470	function mintBulkWithTokenURI(address to, Tuple0[] memory tokens)471		public472		returns (bool)473	{474		require(false, stub_error);475		to;476		tokens;477		dummy = 0;478		return false;479	}480}481482contract UniqueNFT is483	Dummy,484	ERC165,485	ERC721,486	ERC721Metadata,487	ERC721Enumerable,488	ERC721UniqueExtensions,489	ERC721Mintable,490	ERC721Burnable,491	Collection,492	TokenProperties493{}
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;