git.delta.rocks / unique-network / refs/commits / 5c9ffb7fd329

difftreelog

Merge pull request #827 from UniqueNetwork/fix/frontier-get-code

Yaroslav Bolyukin2023-01-16parents: #316164b #706a257.patch.diff
in: master
Fix eth_getCode

15 files changed

modifiedCargo.lockdiffbeforeafterboth
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2467,7 +2467,7 @@
 [[package]]
 name = "fc-consensus"
 version = "2.0.0-dev"
-source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.36#cf1894629c7df1c4dafe58aa773627a3d940da14"
+source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.36#ef8d2809ed05da0664e9b43cb87436451295b634"
 dependencies = [
  "async-trait",
  "fc-db",
@@ -2486,7 +2486,7 @@
 [[package]]
 name = "fc-db"
 version = "2.0.0-dev"
-source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.36#cf1894629c7df1c4dafe58aa773627a3d940da14"
+source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.36#ef8d2809ed05da0664e9b43cb87436451295b634"
 dependencies = [
  "fp-storage",
  "kvdb-rocksdb",
@@ -2505,7 +2505,7 @@
 [[package]]
 name = "fc-mapping-sync"
 version = "2.0.0-dev"
-source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.36#cf1894629c7df1c4dafe58aa773627a3d940da14"
+source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.36#ef8d2809ed05da0664e9b43cb87436451295b634"
 dependencies = [
  "fc-db",
  "fp-consensus",
@@ -2522,7 +2522,7 @@
 [[package]]
 name = "fc-rpc"
 version = "2.0.0-dev"
-source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.36#cf1894629c7df1c4dafe58aa773627a3d940da14"
+source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.36#ef8d2809ed05da0664e9b43cb87436451295b634"
 dependencies = [
  "ethereum 0.14.0",
  "ethereum-types 0.14.1",
@@ -2565,7 +2565,7 @@
 [[package]]
 name = "fc-rpc-core"
 version = "1.1.0-dev"
-source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.36#cf1894629c7df1c4dafe58aa773627a3d940da14"
+source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.36#ef8d2809ed05da0664e9b43cb87436451295b634"
 dependencies = [
  "ethereum 0.14.0",
  "ethereum-types 0.14.1",
@@ -2730,7 +2730,7 @@
 [[package]]
 name = "fp-consensus"
 version = "2.0.0-dev"
-source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.36#cf1894629c7df1c4dafe58aa773627a3d940da14"
+source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.36#ef8d2809ed05da0664e9b43cb87436451295b634"
 dependencies = [
  "ethereum 0.14.0",
  "parity-scale-codec 3.2.1",
@@ -2742,7 +2742,7 @@
 [[package]]
 name = "fp-ethereum"
 version = "1.0.0-dev"
-source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.36#cf1894629c7df1c4dafe58aa773627a3d940da14"
+source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.36#ef8d2809ed05da0664e9b43cb87436451295b634"
 dependencies = [
  "ethereum 0.14.0",
  "ethereum-types 0.14.1",
@@ -2757,7 +2757,7 @@
 [[package]]
 name = "fp-evm"
 version = "3.0.0-dev"
-source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.36#cf1894629c7df1c4dafe58aa773627a3d940da14"
+source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.36#ef8d2809ed05da0664e9b43cb87436451295b634"
 dependencies = [
  "evm",
  "frame-support",
@@ -2771,7 +2771,7 @@
 [[package]]
 name = "fp-evm-mapping"
 version = "0.1.0"
-source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.36#cf1894629c7df1c4dafe58aa773627a3d940da14"
+source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.36#ef8d2809ed05da0664e9b43cb87436451295b634"
 dependencies = [
  "frame-support",
  "sp-core",
@@ -2780,7 +2780,7 @@
 [[package]]
 name = "fp-rpc"
 version = "3.0.0-dev"
-source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.36#cf1894629c7df1c4dafe58aa773627a3d940da14"
+source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.36#ef8d2809ed05da0664e9b43cb87436451295b634"
 dependencies = [
  "ethereum 0.14.0",
  "ethereum-types 0.14.1",
@@ -2797,7 +2797,7 @@
 [[package]]
 name = "fp-self-contained"
 version = "1.0.0-dev"
-source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.36#cf1894629c7df1c4dafe58aa773627a3d940da14"
+source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.36#ef8d2809ed05da0664e9b43cb87436451295b634"
 dependencies = [
  "ethereum 0.14.0",
  "frame-support",
@@ -2810,7 +2810,7 @@
 [[package]]
 name = "fp-storage"
 version = "2.0.0"
-source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.36#cf1894629c7df1c4dafe58aa773627a3d940da14"
+source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.36#ef8d2809ed05da0664e9b43cb87436451295b634"
 dependencies = [
  "parity-scale-codec 3.2.1",
  "serde",
@@ -5687,7 +5687,7 @@
 [[package]]
 name = "pallet-base-fee"
 version = "1.0.0"
-source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.36#cf1894629c7df1c4dafe58aa773627a3d940da14"
+source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.36#ef8d2809ed05da0664e9b43cb87436451295b634"
 dependencies = [
  "fp-evm",
  "frame-support",
@@ -5952,7 +5952,7 @@
 [[package]]
 name = "pallet-ethereum"
 version = "4.0.0-dev"
-source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.36#cf1894629c7df1c4dafe58aa773627a3d940da14"
+source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.36#ef8d2809ed05da0664e9b43cb87436451295b634"
 dependencies = [
  "ethereum 0.14.0",
  "ethereum-types 0.14.1",
@@ -5980,7 +5980,7 @@
 [[package]]
 name = "pallet-evm"
 version = "6.0.0-dev"
-source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.36#cf1894629c7df1c4dafe58aa773627a3d940da14"
+source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.36#ef8d2809ed05da0664e9b43cb87436451295b634"
 dependencies = [
  "environmental",
  "evm",
@@ -6066,7 +6066,7 @@
 [[package]]
 name = "pallet-evm-precompile-simple"
 version = "2.0.0-dev"
-source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.36#cf1894629c7df1c4dafe58aa773627a3d940da14"
+source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.36#ef8d2809ed05da0664e9b43cb87436451295b634"
 dependencies = [
  "fp-evm",
  "ripemd",
modifiedcrates/evm-coder/procedural/src/solidity_interface.rsdiffbeforeafterboth
--- a/crates/evm-coder/procedural/src/solidity_interface.rs
+++ b/crates/evm-coder/procedural/src/solidity_interface.rs
@@ -811,6 +811,13 @@
 	let list = generics_list(gen);
 	quote! { <#list> }
 }
+fn generics_stub(gen: &Generics) -> proc_macro2::TokenStream {
+	if gen.params.is_empty() {
+		return quote! {};
+	}
+	let params = (0..gen.params.len()).map(|_| quote! {()});
+	quote! {<#(#params,)*>}
+}
 fn generics_data(gen: &Generics) -> proc_macro2::TokenStream {
 	let list = generics_list(gen);
 	if gen.params.len() == 1 {
@@ -866,6 +873,7 @@
 		let generics = self.generics;
 		let gen_ref = generics_reference(&generics);
 		let gen_data = generics_data(&generics);
+		let gen_stub = generics_stub(&generics);
 		let gen_where = &generics.where_clause;
 
 		let call_sub = self
@@ -936,6 +944,12 @@
 		let solidity_events_idents = self.info.events.0.iter().map(|is| is.name.clone());
 		let docs = &self.docs;
 
+		let expect_selector = self.info.expect_selector.map(|s| {
+            quote! {
+                const _: () = assert!(#s == u32::from_be_bytes(<#call_name #gen_stub>::interface_id()), "selector mismatch, review contained function selectors");
+            }
+        });
+
 		quote! {
 			#(
 				const _: ::core::marker::PhantomData<#solidity_events_idents> = ::core::marker::PhantomData;
@@ -952,12 +966,15 @@
 					#call_sub,
 				)*
 			}
+
+			#expect_selector
+
 			impl #gen_ref #call_name #gen_ref {
 				#(
 					#consts
 				)*
 				/// Return this call ERC165 selector
-				pub fn interface_id() -> ::evm_coder::types::bytes4 {
+				pub const fn interface_id() -> ::evm_coder::types::bytes4 {
 					let mut interface_id = 0;
 					#(#interface_id)*
 					#(#inline_interface_id)*
modifiedpallets/nonfungible/src/erc.rsdiffbeforeafterboth
--- a/pallets/nonfungible/src/erc.rs
+++ b/pallets/nonfungible/src/erc.rs
@@ -524,11 +524,6 @@
 
 		Ok(<Pallet<T>>::allowance_for_all(self, &owner, &operator))
 	}
-
-	/// @notice Returns collection helper contract address
-	fn collection_helper_address(&self) -> Result<address> {
-		Ok(T::ContractAddress::get())
-	}
 }
 
 /// @title ERC721 Token that can be irreversibly burned (destroyed).
@@ -1058,6 +1053,11 @@
 
 		Ok(token_id.into())
 	}
+
+	/// @notice Returns collection helper contract address
+	fn collection_helper_address(&self) -> Result<address> {
+		Ok(T::ContractAddress::get())
+	}
 }
 
 #[solidity_interface(
modifiedpallets/nonfungible/src/stubs/UniqueNFT.rawdiffbeforeafterboth

binary blob — no preview

modifiedpallets/nonfungible/src/stubs/UniqueNFT.soldiffbeforeafterboth
--- a/pallets/nonfungible/src/stubs/UniqueNFT.sol
+++ b/pallets/nonfungible/src/stubs/UniqueNFT.sol
@@ -785,7 +785,7 @@
 }
 
 /// @title Unique extensions for ERC721.
-/// @dev the ERC-165 identifier for this interface is 0x0e48fdb4
+/// @dev the ERC-165 identifier for this interface is 0x16de3152
 contract ERC721UniqueExtensions is Dummy, ERC165 {
 	/// @notice A descriptive name for a collection of NFTs in this contract
 	/// @dev EVM selector for this function is: 0x06fdde03,
@@ -986,6 +986,15 @@
 		dummy = 0;
 		return 0;
 	}
+
+	/// @notice Returns collection helper contract address
+	/// @dev EVM selector for this function is: 0x1896cce6,
+	///  or in textual repr: collectionHelperAddress()
+	function collectionHelperAddress() public view returns (address) {
+		require(false, stub_error);
+		dummy;
+		return 0x0000000000000000000000000000000000000000;
+	}
 }
 
 /// @dev anonymous struct
@@ -1043,7 +1052,7 @@
 
 /// @title ERC-721 Non-Fungible Token Standard
 /// @dev See https://github.com/ethereum/EIPs/blob/master/EIPS/eip-721.md
-/// @dev the ERC-165 identifier for this interface is 0x983a942b
+/// @dev the ERC-165 identifier for this interface is 0x80ac58cd
 contract ERC721 is Dummy, ERC165, ERC721Events {
 	/// @notice Count all NFTs assigned to an owner
 	/// @dev NFTs assigned to the zero address are considered invalid, and this
@@ -1175,15 +1184,6 @@
 		operator;
 		dummy;
 		return false;
-	}
-
-	/// @notice Returns collection helper contract address
-	/// @dev EVM selector for this function is: 0x1896cce6,
-	///  or in textual repr: collectionHelperAddress()
-	function collectionHelperAddress() public view returns (address) {
-		require(false, stub_error);
-		dummy;
-		return 0x0000000000000000000000000000000000000000;
 	}
 }
 
modifiedpallets/refungible/src/erc.rsdiffbeforeafterboth
--- a/pallets/refungible/src/erc.rs
+++ b/pallets/refungible/src/erc.rs
@@ -295,7 +295,9 @@
 	MintingFinished {},
 }
 
-#[solidity_interface(name = ERC721Metadata)]
+/// @title ERC-721 Non-Fungible Token Standard, optional metadata extension
+/// @dev See https://eips.ethereum.org/EIPS/eip-721
+#[solidity_interface(name = ERC721Metadata, expect_selector = 0x5b5e139f)]
 impl<T: Config> RefungibleHandle<T>
 where
 	T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]>,
@@ -364,7 +366,7 @@
 
 /// @title ERC-721 Non-Fungible Token Standard, optional enumeration extension
 /// @dev See https://eips.ethereum.org/EIPS/eip-721
-#[solidity_interface(name = ERC721Enumerable)]
+#[solidity_interface(name = ERC721Enumerable, expect_selector = 0x780e9d63)]
 impl<T: Config> RefungibleHandle<T> {
 	/// @notice Enumerate valid RFTs
 	/// @param index A counter less than `totalSupply()`
@@ -391,7 +393,7 @@
 
 /// @title ERC-721 Non-Fungible Token Standard
 /// @dev See https://github.com/ethereum/EIPs/blob/master/EIPS/eip-721.md
-#[solidity_interface(name = ERC721, events(ERC721Events))]
+#[solidity_interface(name = ERC721, events(ERC721Events), expect_selector = 0x80ac58cd)]
 impl<T: Config> RefungibleHandle<T> {
 	/// @notice Count all RFTs assigned to an owner
 	/// @dev RFTs assigned to the zero address are considered invalid, and this
@@ -422,6 +424,7 @@
 	}
 
 	/// @dev Not implemented
+	#[solidity(rename_selector = "safeTransferFrom")]
 	fn safe_transfer_from_with_data(
 		&mut self,
 		_from: address,
@@ -434,6 +437,7 @@
 	}
 
 	/// @dev Not implemented
+	#[solidity(rename_selector = "safeTransferFrom")]
 	fn safe_transfer_from(
 		&mut self,
 		_from: address,
@@ -517,11 +521,6 @@
 
 		Ok(<Pallet<T>>::allowance_for_all(self, &owner, &operator))
 	}
-
-	/// @notice Returns collection helper contract address
-	fn collection_helper_address(&self) -> Result<address> {
-		Ok(T::ContractAddress::get())
-	}
 }
 
 /// Returns amount of pieces of `token` that `owner` have
@@ -1116,6 +1115,11 @@
 			token.try_into().map_err(|_| "token id overflow")?,
 		))
 	}
+
+	/// @notice Returns collection helper contract address
+	fn collection_helper_address(&self) -> Result<address> {
+		Ok(T::ContractAddress::get())
+	}
 }
 
 #[solidity_interface(
modifiedpallets/refungible/src/stubs/UniqueRefungible.rawdiffbeforeafterboth

binary blob — no preview

modifiedpallets/refungible/src/stubs/UniqueRefungible.soldiffbeforeafterboth
--- a/pallets/refungible/src/stubs/UniqueRefungible.sol
+++ b/pallets/refungible/src/stubs/UniqueRefungible.sol
@@ -641,6 +641,8 @@
 	TransferEnabled
 }
 
+/// @title ERC-721 Non-Fungible Token Standard, optional metadata extension
+/// @dev See https://eips.ethereum.org/EIPS/eip-721
 /// @dev the ERC-165 identifier for this interface is 0x5b5e139f
 contract ERC721Metadata is Dummy, ERC165 {
 	// /// @notice A descriptive name for a collection of NFTs in this contract
@@ -783,7 +785,7 @@
 }
 
 /// @title Unique extensions for ERC721.
-/// @dev the ERC-165 identifier for this interface is 0xabf30dc2
+/// @dev the ERC-165 identifier for this interface is 0xb365c124
 contract ERC721UniqueExtensions is Dummy, ERC165 {
 	/// @notice A descriptive name for a collection of NFTs in this contract
 	/// @dev EVM selector for this function is: 0x06fdde03,
@@ -985,6 +987,15 @@
 		dummy;
 		return 0x0000000000000000000000000000000000000000;
 	}
+
+	/// @notice Returns collection helper contract address
+	/// @dev EVM selector for this function is: 0x1896cce6,
+	///  or in textual repr: collectionHelperAddress()
+	function collectionHelperAddress() public view returns (address) {
+		require(false, stub_error);
+		dummy;
+		return 0x0000000000000000000000000000000000000000;
+	}
 }
 
 /// @dev anonymous struct
@@ -1042,7 +1053,7 @@
 
 /// @title ERC-721 Non-Fungible Token Standard
 /// @dev See https://github.com/ethereum/EIPs/blob/master/EIPS/eip-721.md
-/// @dev the ERC-165 identifier for this interface is 0x4016cd87
+/// @dev the ERC-165 identifier for this interface is 0x80ac58cd
 contract ERC721 is Dummy, ERC165, ERC721Events {
 	/// @notice Count all RFTs assigned to an owner
 	/// @dev RFTs assigned to the zero address are considered invalid, and this
@@ -1075,9 +1086,9 @@
 	}
 
 	/// @dev Not implemented
-	/// @dev EVM selector for this function is: 0x60a11672,
-	///  or in textual repr: safeTransferFromWithData(address,address,uint256,bytes)
-	function safeTransferFromWithData(
+	/// @dev EVM selector for this function is: 0xb88d4fde,
+	///  or in textual repr: safeTransferFrom(address,address,uint256,bytes)
+	function safeTransferFrom(
 		address from,
 		address to,
 		uint256 tokenId,
@@ -1172,15 +1183,6 @@
 		operator;
 		dummy;
 		return false;
-	}
-
-	/// @notice Returns collection helper contract address
-	/// @dev EVM selector for this function is: 0x1896cce6,
-	///  or in textual repr: collectionHelperAddress()
-	function collectionHelperAddress() public view returns (address) {
-		require(false, stub_error);
-		dummy;
-		return 0x0000000000000000000000000000000000000000;
 	}
 }
 
modifiedruntime/common/ethereum/sponsoring/refungible.rsdiffbeforeafterboth
--- a/runtime/common/ethereum/sponsoring/refungible.rs
+++ b/runtime/common/ethereum/sponsoring/refungible.rs
@@ -139,8 +139,7 @@
 			| BalanceOf { .. }
 			| OwnerOf { .. }
 			| GetApproved { .. }
-			| IsApprovedForAll { .. }
-			| CollectionHelperAddress => None,
+			| IsApprovedForAll { .. } => None,
 
 			// Not sponsored
 			SafeTransferFromWithData { .. }
@@ -230,7 +229,8 @@
 			| CrossOwnerOf { .. }
 			| Properties { .. }
 			| NextTokenId
-			| TokenContractAddress { .. } => None,
+			| TokenContractAddress { .. }
+			| CollectionHelperAddress => None,
 
 			// Not sponsored
 			BurnFrom { .. }
modifiedruntime/common/runtime_apis.rsdiffbeforeafterboth
before · runtime/common/runtime_apis.rs
1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617#[macro_export]18macro_rules! dispatch_unique_runtime {19	($collection:ident.$method:ident($($name:ident),*)) => {{20		let collection = <Runtime as pallet_common::Config>::CollectionDispatch::dispatch(<pallet_common::CollectionHandle<Runtime>>::try_get($collection)?);21		let dispatch = collection.as_dyn();2223		Ok::<_, DispatchError>(dispatch.$method($($name),*))24	}};25}2627#[macro_export]28macro_rules! impl_common_runtime_apis {29    (30        $(31            #![custom_apis]3233            $($custom_apis:tt)+34        )?35    ) => {36        use sp_std::prelude::*;37        use sp_api::impl_runtime_apis;38        use sp_core::{crypto::KeyTypeId, OpaqueMetadata, H256, U256, H160, Bytes};39        use sp_runtime::{40            Permill,41            traits::Block as BlockT,42            transaction_validity::{TransactionSource, TransactionValidity},43            ApplyExtrinsicResult, DispatchError,44        };45        use fp_rpc::TransactionStatus;46        use pallet_transaction_payment::{47            FeeDetails, RuntimeDispatchInfo,48        };49        use pallet_evm::{50            Runner, account::CrossAccountId as _,51            Account as EVMAccount, FeeCalculator,52        };53        use runtime_common::{54            sponsoring::{SponsorshipPredict, UniqueSponsorshipPredict},55            dispatch::CollectionDispatch,56            config::ethereum::CrossAccountId,57        };58        use up_data_structs::*;596061        impl_runtime_apis! {62            $($($custom_apis)+)?6364            impl up_rpc::UniqueApi<Block, CrossAccountId, AccountId> for Runtime {65                fn account_tokens(collection: CollectionId, account: CrossAccountId) -> Result<Vec<TokenId>, DispatchError> {66                    dispatch_unique_runtime!(collection.account_tokens(account))67                }68                fn collection_tokens(collection: CollectionId) -> Result<Vec<TokenId>, DispatchError> {69                    dispatch_unique_runtime!(collection.collection_tokens())70                }71                fn token_exists(collection: CollectionId, token: TokenId) -> Result<bool, DispatchError> {72                    dispatch_unique_runtime!(collection.token_exists(token))73                }7475                fn token_owner(collection: CollectionId, token: TokenId) -> Result<Option<CrossAccountId>, DispatchError> {76                    dispatch_unique_runtime!(collection.token_owner(token))77                }7879                fn token_owners(collection: CollectionId, token: TokenId) -> Result<Vec::<CrossAccountId>, DispatchError>  {80                   dispatch_unique_runtime!(collection.token_owners(token))81                }8283                fn topmost_token_owner(collection: CollectionId, token: TokenId) -> Result<Option<CrossAccountId>, DispatchError> {84                    let budget = up_data_structs::budget::Value::new(10);8586                    Ok(Some(<pallet_structure::Pallet<Runtime>>::find_topmost_owner(collection, token, &budget)?))87                }88                fn token_children(collection: CollectionId, token: TokenId) -> Result<Vec<TokenChild>, DispatchError> {89                    Ok(<pallet_nonfungible::Pallet<Runtime>>::token_children_ids(collection, token))90                }91                fn collection_properties(92                    collection: CollectionId,93                    keys: Option<Vec<Vec<u8>>>94                ) -> Result<Vec<Property>, DispatchError> {95                    let keys = keys.map(96                        |keys| Common::bytes_keys_to_property_keys(keys)97                    ).transpose()?;9899                    Common::filter_collection_properties(collection, keys)100                }101102                fn token_properties(103                    collection: CollectionId,104                    token_id: TokenId,105                    keys: Option<Vec<Vec<u8>>>106                ) -> Result<Vec<Property>, DispatchError> {107                    let keys = keys.map(108                        |keys| Common::bytes_keys_to_property_keys(keys)109                    ).transpose()?;110111                    dispatch_unique_runtime!(collection.token_properties(token_id, keys))112                }113114                fn property_permissions(115                    collection: CollectionId,116                    keys: Option<Vec<Vec<u8>>>117                ) -> Result<Vec<PropertyKeyPermission>, DispatchError> {118                    let keys = keys.map(119                        |keys| Common::bytes_keys_to_property_keys(keys)120                    ).transpose()?;121122                    Common::filter_property_permissions(collection, keys)123                }124125                fn token_data(126                    collection: CollectionId,127                    token_id: TokenId,128                    keys: Option<Vec<Vec<u8>>>129                ) -> Result<TokenData<CrossAccountId>, DispatchError> {130                    let token_data = TokenData {131                        properties: Self::token_properties(collection, token_id, keys)?,132                        owner: Self::token_owner(collection, token_id)?,133                        pieces: Self::total_pieces(collection, token_id)?.unwrap_or(0),134                    };135136                    Ok(token_data)137                }138139                fn total_supply(collection: CollectionId) -> Result<u32, DispatchError> {140                    dispatch_unique_runtime!(collection.total_supply())141                }142                fn account_balance(collection: CollectionId, account: CrossAccountId) -> Result<u32, DispatchError> {143                    dispatch_unique_runtime!(collection.account_balance(account))144                }145                fn balance(collection: CollectionId, account: CrossAccountId, token: TokenId) -> Result<u128, DispatchError> {146                    dispatch_unique_runtime!(collection.balance(account, token))147                }148                fn allowance(149                    collection: CollectionId,150                    sender: CrossAccountId,151                    spender: CrossAccountId,152                    token: TokenId,153                ) -> Result<u128, DispatchError> {154                    dispatch_unique_runtime!(collection.allowance(sender, spender, token))155                }156157                fn adminlist(collection: CollectionId) -> Result<Vec<CrossAccountId>, DispatchError> {158                    Ok(<pallet_common::Pallet<Runtime>>::adminlist(collection))159                }160                fn allowlist(collection: CollectionId) -> Result<Vec<CrossAccountId>, DispatchError> {161                    Ok(<pallet_common::Pallet<Runtime>>::allowlist(collection))162                }163                fn allowed(collection: CollectionId, user: CrossAccountId) -> Result<bool, DispatchError> {164                    Ok(<pallet_common::Pallet<Runtime>>::allowed(collection, user))165                }166                fn last_token_id(collection: CollectionId) -> Result<TokenId, DispatchError> {167                    dispatch_unique_runtime!(collection.last_token_id())168                }169                fn collection_by_id(collection: CollectionId) -> Result<Option<RpcCollection<AccountId>>, DispatchError> {170                    Ok(<pallet_common::Pallet<Runtime>>::rpc_collection(collection))171                }172                fn collection_stats() -> Result<CollectionStats, DispatchError> {173                    Ok(<pallet_common::Pallet<Runtime>>::collection_stats())174                }175                fn next_sponsored(collection: CollectionId, account: CrossAccountId, token: TokenId) -> Result<Option<u64>, DispatchError> {176                    Ok(<UniqueSponsorshipPredict<Runtime> as SponsorshipPredict<Runtime>>::predict(177                        collection,178                        account,179                        token180                    ))181                }182183                fn effective_collection_limits(collection: CollectionId) -> Result<Option<CollectionLimits>, DispatchError> {184                    Ok(<pallet_common::Pallet<Runtime>>::effective_collection_limits(collection))185                }186187                fn total_pieces(collection: CollectionId, token_id: TokenId) -> Result<Option<u128>, DispatchError> {188                    dispatch_unique_runtime!(collection.total_pieces(token_id))189                }190191		        fn allowance_for_all(collection: CollectionId, owner: CrossAccountId, operator: CrossAccountId) -> Result<bool, DispatchError> {192                    dispatch_unique_runtime!(collection.allowance_for_all(owner, operator))193                }194            }195196            impl app_promotion_rpc::AppPromotionApi<Block, BlockNumber, CrossAccountId, AccountId> for Runtime {197                #[allow(unused_variables)]198                fn total_staked(staker: Option<CrossAccountId>) -> Result<u128, DispatchError> {199                    #[cfg(not(feature = "app-promotion"))]200                    return unsupported!();201202                    #[cfg(feature = "app-promotion")]203                    return Ok(<pallet_app_promotion::Pallet<Runtime>>::cross_id_total_staked(staker).unwrap_or_default());204                }205206                #[allow(unused_variables)]207                fn total_staked_per_block(staker: CrossAccountId) -> Result<Vec<(BlockNumber, u128)>, DispatchError> {208                    #[cfg(not(feature = "app-promotion"))]209                    return unsupported!();210211                    #[cfg(feature = "app-promotion")]212                    return Ok(<pallet_app_promotion::Pallet<Runtime>>::cross_id_total_staked_per_block(staker));213                }214215                #[allow(unused_variables)]216                fn pending_unstake(staker: Option<CrossAccountId>) -> Result<u128, DispatchError> {217                    #[cfg(not(feature = "app-promotion"))]218                    return unsupported!();219220                    #[cfg(feature = "app-promotion")]221                    return Ok(<pallet_app_promotion::Pallet<Runtime>>::cross_id_pending_unstake(staker));222                }223224                #[allow(unused_variables)]225                fn pending_unstake_per_block(staker: CrossAccountId) -> Result<Vec<(BlockNumber, u128)>, DispatchError> {226                    #[cfg(not(feature = "app-promotion"))]227                    return unsupported!();228229                    #[cfg(feature = "app-promotion")]230                    return Ok(<pallet_app_promotion::Pallet<Runtime>>::cross_id_pending_unstake_per_block(staker))231                }232            }233234            impl rmrk_rpc::RmrkApi<235                Block,236                AccountId,237                RmrkCollectionInfo<AccountId>,238                RmrkInstanceInfo<AccountId>,239                RmrkResourceInfo,240                RmrkPropertyInfo,241                RmrkBaseInfo<AccountId>,242                RmrkPartType,243                RmrkTheme244            > for Runtime {245                fn last_collection_idx() -> Result<RmrkCollectionId, DispatchError> {246                    #[cfg(feature = "rmrk")]247                    return pallet_proxy_rmrk_core::rpc::last_collection_idx::<Runtime>();248249                    #[cfg(not(feature = "rmrk"))]250                    return unsupported!();251                }252253                #[allow(unused_variables)]254                fn collection_by_id(collection_id: RmrkCollectionId) -> Result<Option<RmrkCollectionInfo<AccountId>>, DispatchError> {255                    #[cfg(feature = "rmrk")]256                    return pallet_proxy_rmrk_core::rpc::collection_by_id::<Runtime>(collection_id);257258                    #[cfg(not(feature = "rmrk"))]259                    return unsupported!();260                }261262                #[allow(unused_variables)]263                fn nft_by_id(collection_id: RmrkCollectionId, nft_by_id: RmrkNftId) -> Result<Option<RmrkInstanceInfo<AccountId>>, DispatchError> {264                    #[cfg(feature = "rmrk")]265                    return pallet_proxy_rmrk_core::rpc::nft_by_id::<Runtime>(collection_id, nft_by_id);266267                    #[cfg(not(feature = "rmrk"))]268                    return unsupported!();269                }270271                #[allow(unused_variables)]272                fn account_tokens(account_id: AccountId, collection_id: RmrkCollectionId) -> Result<Vec<RmrkNftId>, DispatchError> {273                    #[cfg(feature = "rmrk")]274                    return pallet_proxy_rmrk_core::rpc::account_tokens::<Runtime>(account_id, collection_id);275276                    #[cfg(not(feature = "rmrk"))]277                    return unsupported!();278                }279280                #[allow(unused_variables)]281                fn nft_children(collection_id: RmrkCollectionId, nft_id: RmrkNftId) -> Result<Vec<RmrkNftChild>, DispatchError> {282                    #[cfg(feature = "rmrk")]283                    return pallet_proxy_rmrk_core::rpc::nft_children::<Runtime>(collection_id, nft_id);284285                    #[cfg(not(feature = "rmrk"))]286                    return unsupported!();287                }288289                #[allow(unused_variables)]290                fn collection_properties(291                    collection_id: RmrkCollectionId,292                    filter_keys: Option<Vec<RmrkPropertyKey>>293                ) -> Result<Vec<RmrkPropertyInfo>, DispatchError> {294                    #[cfg(feature = "rmrk")]295                    return pallet_proxy_rmrk_core::rpc::collection_properties::<Runtime>(collection_id, filter_keys);296297                    #[cfg(not(feature = "rmrk"))]298                    return unsupported!();299                }300301                #[allow(unused_variables)]302                fn nft_properties(303                    collection_id: RmrkCollectionId,304                    nft_id: RmrkNftId,305                    filter_keys: Option<Vec<RmrkPropertyKey>>306                ) -> Result<Vec<RmrkPropertyInfo>, DispatchError> {307                    #[cfg(feature = "rmrk")]308                    return pallet_proxy_rmrk_core::rpc::nft_properties::<Runtime>(collection_id, nft_id, filter_keys);309310                    #[cfg(not(feature = "rmrk"))]311                    return unsupported!();312                }313314                #[allow(unused_variables)]315                fn nft_resources(collection_id: RmrkCollectionId,nft_id: RmrkNftId) -> Result<Vec<RmrkResourceInfo>, DispatchError> {316                    #[cfg(feature = "rmrk")]317                    return pallet_proxy_rmrk_core::rpc::nft_resources::<Runtime>(collection_id, nft_id);318319                    #[cfg(not(feature = "rmrk"))]320                    return unsupported!();321                }322323                #[allow(unused_variables)]324                fn nft_resource_priority(325                    collection_id: RmrkCollectionId,326                    nft_id: RmrkNftId,327                    resource_id: RmrkResourceId328                ) -> Result<Option<u32>, DispatchError> {329                    #[cfg(feature = "rmrk")]330                    return pallet_proxy_rmrk_core::rpc::nft_resource_priority::<Runtime>(collection_id, nft_id, resource_id);331332                    #[cfg(not(feature = "rmrk"))]333                    return unsupported!();334                }335336                #[allow(unused_variables)]337                fn base(base_id: RmrkBaseId) -> Result<Option<RmrkBaseInfo<AccountId>>, DispatchError> {338                    #[cfg(feature = "rmrk")]339                    return pallet_proxy_rmrk_equip::rpc::base::<Runtime>(base_id);340341                    #[cfg(not(feature = "rmrk"))]342                    return unsupported!();343                }344345                #[allow(unused_variables)]346                fn base_parts(base_id: RmrkBaseId) -> Result<Vec<RmrkPartType>, DispatchError> {347                    #[cfg(feature = "rmrk")]348                    return pallet_proxy_rmrk_equip::rpc::base_parts::<Runtime>(base_id);349350                    #[cfg(not(feature = "rmrk"))]351                    return unsupported!();352                }353354                #[allow(unused_variables)]355                fn theme_names(base_id: RmrkBaseId) -> Result<Vec<RmrkThemeName>, DispatchError> {356                    #[cfg(feature = "rmrk")]357                    return pallet_proxy_rmrk_equip::rpc::theme_names::<Runtime>(base_id);358359                    #[cfg(not(feature = "rmrk"))]360                    return unsupported!();361                }362363                #[allow(unused_variables)]364                fn theme(365                    base_id: RmrkBaseId,366                    theme_name: RmrkThemeName,367                    filter_keys: Option<Vec<RmrkPropertyKey>>368                ) -> Result<Option<RmrkTheme>, DispatchError> {369                    #[cfg(feature = "rmrk")]370                    return pallet_proxy_rmrk_equip::rpc::theme::<Runtime>(base_id, theme_name, filter_keys);371372                    #[cfg(not(feature = "rmrk"))]373                    return unsupported!();374                }375            }376377            impl sp_api::Core<Block> for Runtime {378                fn version() -> RuntimeVersion {379                    VERSION380                }381382                fn execute_block(block: Block) {383                    Executive::execute_block(block)384                }385386                fn initialize_block(header: &<Block as BlockT>::Header) {387                    Executive::initialize_block(header)388                }389            }390391            impl sp_api::Metadata<Block> for Runtime {392                fn metadata() -> OpaqueMetadata {393                    OpaqueMetadata::new(Runtime::metadata().into())394                }395            }396397            impl sp_block_builder::BlockBuilder<Block> for Runtime {398                fn apply_extrinsic(extrinsic: <Block as BlockT>::Extrinsic) -> ApplyExtrinsicResult {399                    Executive::apply_extrinsic(extrinsic)400                }401402                fn finalize_block() -> <Block as BlockT>::Header {403                    Executive::finalize_block()404                }405406                fn inherent_extrinsics(data: sp_inherents::InherentData) -> Vec<<Block as BlockT>::Extrinsic> {407                    data.create_extrinsics()408                }409410                fn check_inherents(411                    block: Block,412                    data: sp_inherents::InherentData,413                ) -> sp_inherents::CheckInherentsResult {414                    data.check_extrinsics(&block)415                }416417                // fn random_seed() -> <Block as BlockT>::Hash {418                //     RandomnessCollectiveFlip::random_seed().0419                // }420            }421422            impl sp_transaction_pool::runtime_api::TaggedTransactionQueue<Block> for Runtime {423                fn validate_transaction(424                    source: TransactionSource,425                    tx: <Block as BlockT>::Extrinsic,426                    hash: <Block as BlockT>::Hash,427                ) -> TransactionValidity {428                    Executive::validate_transaction(source, tx, hash)429                }430            }431432            impl sp_offchain::OffchainWorkerApi<Block> for Runtime {433                fn offchain_worker(header: &<Block as BlockT>::Header) {434                    Executive::offchain_worker(header)435                }436            }437438            impl fp_rpc::EthereumRuntimeRPCApi<Block> for Runtime {439                fn chain_id() -> u64 {440                    <Runtime as pallet_evm::Config>::ChainId::get()441                }442443                fn account_basic(address: H160) -> EVMAccount {444                    let (account, _) = EVM::account_basic(&address);445                    account446                }447448                fn gas_price() -> U256 {449                    let (price, _) = <Runtime as pallet_evm::Config>::FeeCalculator::min_gas_price();450                    price451                }452453                fn account_code_at(address: H160) -> Vec<u8> {454                    EVM::account_codes(address)455                }456457                fn author() -> H160 {458                    <pallet_evm::Pallet<Runtime>>::find_author()459                }460461                fn storage_at(address: H160, index: U256) -> H256 {462                    let mut tmp = [0u8; 32];463                    index.to_big_endian(&mut tmp);464                    EVM::account_storages(address, H256::from_slice(&tmp[..]))465                }466467                #[allow(clippy::redundant_closure)]468                fn call(469                    from: H160,470                    to: H160,471                    data: Vec<u8>,472                    value: U256,473                    gas_limit: U256,474                    max_fee_per_gas: Option<U256>,475                    max_priority_fee_per_gas: Option<U256>,476                    nonce: Option<U256>,477                    estimate: bool,478                    access_list: Option<Vec<(H160, Vec<H256>)>>,479                ) -> Result<pallet_evm::CallInfo, sp_runtime::DispatchError> {480                    let config = if estimate {481                        let mut config = <Runtime as pallet_evm::Config>::config().clone();482                        config.estimate = true;483                        Some(config)484                    } else {485                        None486                    };487488                    let is_transactional = false;489                    let validate = false;490                    <Runtime as pallet_evm::Config>::Runner::call(491                        CrossAccountId::from_eth(from),492                        to,493                        data,494                        value,495                        gas_limit.low_u64(),496                        max_fee_per_gas,497                        max_priority_fee_per_gas,498                        nonce,499                        access_list.unwrap_or_default(),500                        is_transactional,501                        validate,502                        config.as_ref().unwrap_or_else(|| <Runtime as pallet_evm::Config>::config()),503                    ).map_err(|err| err.error.into())504                }505506                #[allow(clippy::redundant_closure)]507                fn create(508                    from: H160,509                    data: Vec<u8>,510                    value: U256,511                    gas_limit: U256,512                    max_fee_per_gas: Option<U256>,513                    max_priority_fee_per_gas: Option<U256>,514                    nonce: Option<U256>,515                    estimate: bool,516                    access_list: Option<Vec<(H160, Vec<H256>)>>,517                ) -> Result<pallet_evm::CreateInfo, sp_runtime::DispatchError> {518                    let config = if estimate {519                        let mut config = <Runtime as pallet_evm::Config>::config().clone();520                        config.estimate = true;521                        Some(config)522                    } else {523                        None524                    };525526                    let is_transactional = false;527                    let validate = false;528                    <Runtime as pallet_evm::Config>::Runner::create(529                        CrossAccountId::from_eth(from),530                        data,531                        value,532                        gas_limit.low_u64(),533                        max_fee_per_gas,534                        max_priority_fee_per_gas,535                        nonce,536                        access_list.unwrap_or_default(),537                        is_transactional,538                        validate,539                        config.as_ref().unwrap_or_else(|| <Runtime as pallet_evm::Config>::config()),540                    ).map_err(|err| err.error.into())541                }542543                fn current_transaction_statuses() -> Option<Vec<TransactionStatus>> {544                    Ethereum::current_transaction_statuses()545                }546547                fn current_block() -> Option<pallet_ethereum::Block> {548                    Ethereum::current_block()549                }550551                fn current_receipts() -> Option<Vec<pallet_ethereum::Receipt>> {552                    Ethereum::current_receipts()553                }554555                fn current_all() -> (556                    Option<pallet_ethereum::Block>,557                    Option<Vec<pallet_ethereum::Receipt>>,558                    Option<Vec<TransactionStatus>>559                ) {560                    (561                        Ethereum::current_block(),562                        Ethereum::current_receipts(),563                        Ethereum::current_transaction_statuses()564                    )565                }566567                fn extrinsic_filter(xts: Vec<<Block as sp_api::BlockT>::Extrinsic>) -> Vec<pallet_ethereum::Transaction> {568                    xts.into_iter().filter_map(|xt| match xt.0.function {569                        RuntimeCall::Ethereum(pallet_ethereum::Call::transact { transaction }) => Some(transaction),570                        _ => None571                    }).collect()572                }573574                fn elasticity() -> Option<Permill> {575                    None576                }577578                fn gas_limit_multiplier_support() {}579            }580581            impl fp_rpc::ConvertTransactionRuntimeApi<Block> for Runtime {582                fn convert_transaction(transaction: pallet_ethereum::Transaction) -> <Block as BlockT>::Extrinsic  {583                    UncheckedExtrinsic::new_unsigned(584                        pallet_ethereum::Call::<Runtime>::transact { transaction }.into(),585                    )586                }587            }588589            impl sp_session::SessionKeys<Block> for Runtime {590                fn decode_session_keys(591                    encoded: Vec<u8>,592                ) -> Option<Vec<(Vec<u8>, KeyTypeId)>> {593                    SessionKeys::decode_into_raw_public_keys(&encoded)594                }595596                fn generate_session_keys(seed: Option<Vec<u8>>) -> Vec<u8> {597                    SessionKeys::generate(seed)598                }599            }600601            impl sp_consensus_aura::AuraApi<Block, AuraId> for Runtime {602                fn slot_duration() -> sp_consensus_aura::SlotDuration {603                    sp_consensus_aura::SlotDuration::from_millis(Aura::slot_duration())604                }605606                fn authorities() -> Vec<AuraId> {607                    Aura::authorities().to_vec()608                }609            }610611            impl cumulus_primitives_core::CollectCollationInfo<Block> for Runtime {612                fn collect_collation_info(header: &<Block as BlockT>::Header) -> cumulus_primitives_core::CollationInfo {613                    ParachainSystem::collect_collation_info(header)614                }615            }616617            impl frame_system_rpc_runtime_api::AccountNonceApi<Block, AccountId, Index> for Runtime {618                fn account_nonce(account: AccountId) -> Index {619                    System::account_nonce(account)620                }621            }622623            impl pallet_transaction_payment_rpc_runtime_api::TransactionPaymentApi<Block, Balance> for Runtime {624                fn query_info(uxt: <Block as BlockT>::Extrinsic, len: u32) -> RuntimeDispatchInfo<Balance> {625                    TransactionPayment::query_info(uxt, len)626                }627                fn query_fee_details(uxt: <Block as BlockT>::Extrinsic, len: u32) -> FeeDetails<Balance> {628                    TransactionPayment::query_fee_details(uxt, len)629                }630            }631632            /*633            impl pallet_contracts_rpc_runtime_api::ContractsApi<Block, AccountId, Balance, BlockNumber, Hash>634                for Runtime635            {636                fn call(637                    origin: AccountId,638                    dest: AccountId,639                    value: Balance,640                    gas_limit: u64,641                    input_data: Vec<u8>,642                ) -> pallet_contracts_primitives::ContractExecResult {643                    Contracts::bare_call(origin, dest, value, gas_limit, input_data, false)644                }645646                fn instantiate(647                    origin: AccountId,648                    endowment: Balance,649                    gas_limit: u64,650                    code: pallet_contracts_primitives::Code<Hash>,651                    data: Vec<u8>,652                    salt: Vec<u8>,653                ) -> pallet_contracts_primitives::ContractInstantiateResult<AccountId, BlockNumber>654                {655                    Contracts::bare_instantiate(origin, endowment, gas_limit, code, data, salt, true, false)656                }657658                fn get_storage(659                    address: AccountId,660                    key: [u8; 32],661                ) -> pallet_contracts_primitives::GetStorageResult {662                    Contracts::get_storage(address, key)663                }664665                fn rent_projection(666                    address: AccountId,667                ) -> pallet_contracts_primitives::RentProjectionResult<BlockNumber> {668                    Contracts::rent_projection(address)669                }670            }671            */672673            #[cfg(feature = "runtime-benchmarks")]674            impl frame_benchmarking::Benchmark<Block> for Runtime {675                fn benchmark_metadata(extra: bool) -> (676                    Vec<frame_benchmarking::BenchmarkList>,677                    Vec<frame_support::traits::StorageInfo>,678                ) {679                    use frame_benchmarking::{list_benchmark, Benchmarking, BenchmarkList};680                    use frame_support::traits::StorageInfoTrait;681682                    let mut list = Vec::<BenchmarkList>::new();683684                    list_benchmark!(list, extra, pallet_evm_migration, EvmMigration);685                    list_benchmark!(list, extra, pallet_common, Common);686                    list_benchmark!(list, extra, pallet_unique, Unique);687                    list_benchmark!(list, extra, pallet_structure, Structure);688                    list_benchmark!(list, extra, pallet_inflation, Inflation);689                    list_benchmark!(list, extra, pallet_configuration, Configuration);690691                    #[cfg(feature = "app-promotion")]692                    list_benchmark!(list, extra, pallet_app_promotion, AppPromotion);693694                    list_benchmark!(list, extra, pallet_fungible, Fungible);695                    list_benchmark!(list, extra, pallet_nonfungible, Nonfungible);696697                    #[cfg(feature = "refungible")]698                    list_benchmark!(list, extra, pallet_refungible, Refungible);699700                    #[cfg(feature = "scheduler")]701                    list_benchmark!(list, extra, pallet_unique_scheduler_v2, Scheduler);702703                    #[cfg(feature = "rmrk")]704                    list_benchmark!(list, extra, pallet_proxy_rmrk_core, RmrkCore);705706                    #[cfg(feature = "rmrk")]707                    list_benchmark!(list, extra, pallet_proxy_rmrk_equip, RmrkEquip);708709                    #[cfg(feature = "collator-selection")]710                    list_benchmark!(list, extra, pallet_collator_selection, CollatorSelection);711712                    #[cfg(feature = "collator-selection")]713                    list_benchmark!(list, extra, pallet_identity, Identity);714715                    #[cfg(feature = "foreign-assets")]716                    list_benchmark!(list, extra, pallet_foreign_assets, ForeignAssets);717718719                    // list_benchmark!(list, extra, pallet_evm_coder_substrate, EvmCoderSubstrate);720721                    let storage_info = AllPalletsReversedWithSystemFirst::storage_info();722723                    return (list, storage_info)724                }725726                fn dispatch_benchmark(727                    config: frame_benchmarking::BenchmarkConfig728                ) -> Result<Vec<frame_benchmarking::BenchmarkBatch>, sp_runtime::RuntimeString> {729                    use frame_benchmarking::{Benchmarking, BenchmarkBatch, add_benchmark, TrackedStorageKey};730731                    let allowlist: Vec<TrackedStorageKey> = vec![732                        // Total Issuance733                        hex_literal::hex!("c2261276cc9d1f8598ea4b6a74b15c2f57c875e4cff74148e4628f264b974c80").to_vec().into(),734735                        // Block Number736                        hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef702a5c1b19ab7a04f536c519aca4983ac").to_vec().into(),737                        // Execution Phase738                        hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef7ff553b5a9862a516939d82b3d3d8661a").to_vec().into(),739                        // Event Count740                        hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef70a98fdbe9ce6c55837576c60c7af3850").to_vec().into(),741                        // System Events742                        hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef780d41e5e16056765bc8461851072c9d7").to_vec().into(),743744                        // Evm CurrentLogs745                        hex_literal::hex!("1da53b775b270400e7e61ed5cbc5a146547f210cec367e9af919603343b9cb56").to_vec().into(),746747                        // Transactional depth748                        hex_literal::hex!("3a7472616e73616374696f6e5f6c6576656c3a").to_vec().into(),749                    ];750751                    let mut batches = Vec::<BenchmarkBatch>::new();752                    let params = (&config, &allowlist);753754                    add_benchmark!(params, batches, pallet_evm_migration, EvmMigration);755                    add_benchmark!(params, batches, pallet_common, Common);756                    add_benchmark!(params, batches, pallet_unique, Unique);757                    add_benchmark!(params, batches, pallet_structure, Structure);758                    add_benchmark!(params, batches, pallet_inflation, Inflation);759                    add_benchmark!(params, batches, pallet_configuration, Configuration);760761                    #[cfg(feature = "app-promotion")]762                    add_benchmark!(params, batches, pallet_app_promotion, AppPromotion);763764                    add_benchmark!(params, batches, pallet_fungible, Fungible);765                    add_benchmark!(params, batches, pallet_nonfungible, Nonfungible);766767                    #[cfg(feature = "refungible")]768                    add_benchmark!(params, batches, pallet_refungible, Refungible);769770                    #[cfg(feature = "scheduler")]771                    add_benchmark!(params, batches, pallet_unique_scheduler_v2, Scheduler);772773                    #[cfg(feature = "rmrk")]774                    add_benchmark!(params, batches, pallet_proxy_rmrk_core, RmrkCore);775776                    #[cfg(feature = "rmrk")]777                    add_benchmark!(params, batches, pallet_proxy_rmrk_equip, RmrkEquip);778779                    #[cfg(feature = "collator-selection")]780                    add_benchmark!(params, batches, pallet_collator_selection, CollatorSelection);781782                    #[cfg(feature = "collator-selection")]783                    add_benchmark!(params, batches, pallet_identity, Identity);784785                    #[cfg(feature = "foreign-assets")]786                    add_benchmark!(params, batches, pallet_foreign_assets, ForeignAssets);787788                    // add_benchmark!(params, batches, pallet_evm_coder_substrate, EvmCoderSubstrate);789790                    if batches.is_empty() { return Err("Benchmark not found for this pallet.".into()) }791                    Ok(batches)792                }793            }794795            impl up_pov_estimate_rpc::PovEstimateApi<Block> for Runtime {796                #[allow(unused_variables)]797                fn pov_estimate(uxt: Bytes) -> ApplyExtrinsicResult {798                    #[cfg(feature = "pov-estimate")]799                    {800                        use codec::Decode;801802                        let uxt_decode = <<Block as BlockT>::Extrinsic as Decode>::decode(&mut &*uxt)803                            .map_err(|_| DispatchError::Other("failed to decode the extrinsic"));804805                        let uxt = match uxt_decode {806                            Ok(uxt) => uxt,807                            Err(err) => return Ok(err.into()),808                        };809810                        Executive::apply_extrinsic(uxt)811                    }812813                    #[cfg(not(feature = "pov-estimate"))]814                    return Ok(unsupported!());815                }816            }817818            #[cfg(feature = "try-runtime")]819            impl frame_try_runtime::TryRuntime<Block> for Runtime {820                fn on_runtime_upgrade(checks: bool) -> (frame_support::pallet_prelude::Weight, frame_support::pallet_prelude::Weight) {821                    log::info!("try-runtime::on_runtime_upgrade unique-chain.");822                    let weight = Executive::try_runtime_upgrade(checks).unwrap();823                    (weight, crate::config::substrate::RuntimeBlockWeights::get().max_block)824                }825826                fn execute_block(827                    block: Block,828                    state_root_check: bool,829                    signature_check: bool,830                    select: frame_try_runtime::TryStateSelect831                ) -> frame_support::pallet_prelude::Weight {832                    log::info!(833                        target: "node-runtime",834                        "try-runtime: executing block {:?} / root checks: {:?} / try-state-select: {:?}",835                        block.header.hash(),836                        state_root_check,837                        select,838                    );839840                    Executive::try_execute_block(block, state_root_check, signature_check, select).unwrap()841                }842            }843        }844    }845}
modifiedtests/src/eth/abi/nonFungible.jsondiffbeforeafterboth
--- a/tests/src/eth/abi/nonFungible.json
+++ b/tests/src/eth/abi/nonFungible.json
@@ -51,6 +51,12 @@
   },
   {
     "anonymous": false,
+    "inputs": [],
+    "name": "MintingFinished",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
     "inputs": [
       {
         "indexed": true,
@@ -417,6 +423,13 @@
     "type": "function"
   },
   {
+    "inputs": [],
+    "name": "finishMinting",
+    "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
     "inputs": [
       { "internalType": "uint256", "name": "tokenId", "type": "uint256" }
     ],
@@ -504,6 +517,13 @@
   },
   {
     "inputs": [],
+    "name": "mintingFinished",
+    "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [],
     "name": "name",
     "outputs": [{ "internalType": "string", "name": "", "type": "string" }],
     "stateMutability": "view",
modifiedtests/src/eth/abi/reFungible.jsondiffbeforeafterboth
--- a/tests/src/eth/abi/reFungible.json
+++ b/tests/src/eth/abi/reFungible.json
@@ -51,6 +51,12 @@
   },
   {
     "anonymous": false,
+    "inputs": [],
+    "name": "MintingFinished",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
     "inputs": [
       {
         "indexed": true,
@@ -399,6 +405,13 @@
     "type": "function"
   },
   {
+    "inputs": [],
+    "name": "finishMinting",
+    "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
     "inputs": [
       { "internalType": "uint256", "name": "tokenId", "type": "uint256" }
     ],
@@ -486,6 +499,13 @@
   },
   {
     "inputs": [],
+    "name": "mintingFinished",
+    "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [],
     "name": "name",
     "outputs": [{ "internalType": "string", "name": "", "type": "string" }],
     "stateMutability": "view",
@@ -596,7 +616,7 @@
       { "internalType": "uint256", "name": "tokenId", "type": "uint256" },
       { "internalType": "bytes", "name": "data", "type": "bytes" }
     ],
-    "name": "safeTransferFromWithData",
+    "name": "safeTransferFrom",
     "outputs": [],
     "stateMutability": "nonpayable",
     "type": "function"
modifiedtests/src/eth/abi/reFungibleToken.jsondiffbeforeafterboth
--- a/tests/src/eth/abi/reFungibleToken.json
+++ b/tests/src/eth/abi/reFungibleToken.json
@@ -98,6 +98,16 @@
   },
   {
     "inputs": [
+      { "internalType": "address", "name": "from", "type": "address" },
+      { "internalType": "uint256", "name": "amount", "type": "uint256" }
+    ],
+    "name": "burnFrom",
+    "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
       {
         "components": [
           { "internalType": "address", "name": "eth", "type": "address" },
modifiedtests/src/eth/api/UniqueNFT.soldiffbeforeafterboth
--- a/tests/src/eth/api/UniqueNFT.sol
+++ b/tests/src/eth/api/UniqueNFT.sol
@@ -536,7 +536,7 @@
 }
 
 /// @title Unique extensions for ERC721.
-/// @dev the ERC-165 identifier for this interface is 0x0e48fdb4
+/// @dev the ERC-165 identifier for this interface is 0x16de3152
 interface ERC721UniqueExtensions is Dummy, ERC165 {
 	/// @notice A descriptive name for a collection of NFTs in this contract
 	/// @dev EVM selector for this function is: 0x06fdde03,
@@ -661,6 +661,11 @@
 	/// @dev EVM selector for this function is: 0xb904db03,
 	///  or in textual repr: mintCross((address,uint256),(string,bytes)[])
 	function mintCross(CrossAddress memory to, Property[] memory properties) external returns (uint256);
+
+	/// @notice Returns collection helper contract address
+	/// @dev EVM selector for this function is: 0x1896cce6,
+	///  or in textual repr: collectionHelperAddress()
+	function collectionHelperAddress() external view returns (address);
 }
 
 /// @dev anonymous struct
@@ -703,7 +708,7 @@
 
 /// @title ERC-721 Non-Fungible Token Standard
 /// @dev See https://github.com/ethereum/EIPs/blob/master/EIPS/eip-721.md
-/// @dev the ERC-165 identifier for this interface is 0x983a942b
+/// @dev the ERC-165 identifier for this interface is 0x80ac58cd
 interface ERC721 is Dummy, ERC165, ERC721Events {
 	/// @notice Count all NFTs assigned to an owner
 	/// @dev NFTs assigned to the zero address are considered invalid, and this
@@ -786,11 +791,6 @@
 	/// @dev EVM selector for this function is: 0xe985e9c5,
 	///  or in textual repr: isApprovedForAll(address,address)
 	function isApprovedForAll(address owner, address operator) external view returns (bool);
-
-	/// @notice Returns collection helper contract address
-	/// @dev EVM selector for this function is: 0x1896cce6,
-	///  or in textual repr: collectionHelperAddress()
-	function collectionHelperAddress() external view returns (address);
 }
 
 interface UniqueNFT is
modifiedtests/src/eth/api/UniqueRefungible.soldiffbeforeafterboth
--- a/tests/src/eth/api/UniqueRefungible.sol
+++ b/tests/src/eth/api/UniqueRefungible.sol
@@ -441,6 +441,8 @@
 	TransferEnabled
 }
 
+/// @title ERC-721 Non-Fungible Token Standard, optional metadata extension
+/// @dev See https://eips.ethereum.org/EIPS/eip-721
 /// @dev the ERC-165 identifier for this interface is 0x5b5e139f
 interface ERC721Metadata is Dummy, ERC165 {
 	// /// @notice A descriptive name for a collection of NFTs in this contract
@@ -534,7 +536,7 @@
 }
 
 /// @title Unique extensions for ERC721.
-/// @dev the ERC-165 identifier for this interface is 0xabf30dc2
+/// @dev the ERC-165 identifier for this interface is 0xb365c124
 interface ERC721UniqueExtensions is Dummy, ERC165 {
 	/// @notice A descriptive name for a collection of NFTs in this contract
 	/// @dev EVM selector for this function is: 0x06fdde03,
@@ -660,6 +662,11 @@
 	/// @dev EVM selector for this function is: 0xab76fac6,
 	///  or in textual repr: tokenContractAddress(uint256)
 	function tokenContractAddress(uint256 token) external view returns (address);
+
+	/// @notice Returns collection helper contract address
+	/// @dev EVM selector for this function is: 0x1896cce6,
+	///  or in textual repr: collectionHelperAddress()
+	function collectionHelperAddress() external view returns (address);
 }
 
 /// @dev anonymous struct
@@ -702,7 +709,7 @@
 
 /// @title ERC-721 Non-Fungible Token Standard
 /// @dev See https://github.com/ethereum/EIPs/blob/master/EIPS/eip-721.md
-/// @dev the ERC-165 identifier for this interface is 0x4016cd87
+/// @dev the ERC-165 identifier for this interface is 0x80ac58cd
 interface ERC721 is Dummy, ERC165, ERC721Events {
 	/// @notice Count all RFTs assigned to an owner
 	/// @dev RFTs assigned to the zero address are considered invalid, and this
@@ -725,9 +732,9 @@
 	function ownerOf(uint256 tokenId) external view returns (address);
 
 	/// @dev Not implemented
-	/// @dev EVM selector for this function is: 0x60a11672,
-	///  or in textual repr: safeTransferFromWithData(address,address,uint256,bytes)
-	function safeTransferFromWithData(
+	/// @dev EVM selector for this function is: 0xb88d4fde,
+	///  or in textual repr: safeTransferFrom(address,address,uint256,bytes)
+	function safeTransferFrom(
 		address from,
 		address to,
 		uint256 tokenId,
@@ -783,11 +790,6 @@
 	/// @dev EVM selector for this function is: 0xe985e9c5,
 	///  or in textual repr: isApprovedForAll(address,address)
 	function isApprovedForAll(address owner, address operator) external view returns (bool);
-
-	/// @notice Returns collection helper contract address
-	/// @dev EVM selector for this function is: 0x1896cce6,
-	///  or in textual repr: collectionHelperAddress()
-	function collectionHelperAddress() external view returns (address);
 }
 
 interface UniqueRefungible is