git.delta.rocks / unique-network / refs/commits / 686ae3536232

difftreelog

CORE-302 Refactor collection for eth

Trubnikov Sergey2022-05-24parent: #ad8f1f0.patch.diff
in: master

20 files changed

modifiedCargo.lockdiffbeforeafterboth
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5467,9 +5467,9 @@
 
 [[package]]
 name = "once_cell"
-version = "1.11.0"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b10983b38c53aebdf33f542c6275b0f58a238129d00c4ae0e6fb59738d783ca"
+checksum = "7709cef83f0c1f58f666e746a08b21e0085f7440fa6a29cc194d68aac97a4225"
 
 [[package]]
 name = "opal-runtime"
@@ -6830,7 +6830,6 @@
  "parity-scale-codec 3.1.2",
  "scale-info",
  "serde",
- "serde-json-core",
  "sp-core",
  "sp-io",
  "sp-runtime",
@@ -10735,16 +10734,6 @@
 ]
 
 [[package]]
-name = "serde-json-core"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8014aeea272bca0f0779778d43253f2f3375b414185b30e6ecc4d3e4a9994781"
-dependencies = [
- "ryu",
- "serde",
-]
-
-[[package]]
 name = "serde_derive"
 version = "1.0.137"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -12025,9 +12014,9 @@
 
 [[package]]
 name = "target-lexicon"
-version = "0.12.3"
+version = "0.12.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7fa7e55043acb85fca6b3c01485a2eeb6b69c5d21002e273c79e465f43b7ac1"
+checksum = "c02424087780c9b71cc96799eaeddff35af2bc513278cda5c99fc1f5d026d3c1"
 
 [[package]]
 name = "tempfile"
modifiedMakefilediffbeforeafterboth
--- a/Makefile
+++ b/Makefile
@@ -15,16 +15,13 @@
 CONTRACT_HELPERS_STUBS=./pallets/evm-contract-helpers/src/stubs/
 CONTRACT_HELPERS_ABI=./tests/src/eth/util/contractHelpersAbi.json
 
-COLLECTION_STUBS=./pallets/unique/src/eth/stubs/
-COLLECTION_ABI=./tests/src/eth/collectionAbi.json
-
 COLLECTION_HELPER_STUBS=$(COLLECTION_STUBS)
 COLLECTION_HELPER_ABI=./tests/src/eth/collectionHelperAbi.json
 
 TESTS_API=./tests/src/eth/api/
 
 .PHONY: regenerate_solidity
-regenerate_solidity: UniqueFungible.sol UniqueNFT.sol ContractHelpers.sol Collection.sol CollectionHelper.sol
+regenerate_solidity: UniqueFungible.sol UniqueNFT.sol ContractHelpers.sol CollectionHelper.sol
 
 UniqueFungible.sol:
 	PACKAGE=pallet-fungible NAME=erc::gen_iface OUTPUT=$(TESTS_API)/$@ ./.maintain/scripts/generate_sol.sh
@@ -38,10 +35,6 @@
 	PACKAGE=pallet-evm-contract-helpers NAME=eth::contract_helpers_iface OUTPUT=$(TESTS_API)/$@ ./.maintain/scripts/generate_sol.sh
 	PACKAGE=pallet-evm-contract-helpers NAME=eth::contract_helpers_impl OUTPUT=$(CONTRACT_HELPERS_STUBS)/$@ ./.maintain/scripts/generate_sol.sh
 
-Collection.sol:
-	PACKAGE=pallet-unique NAME=eth::evm_collection::collection_iface OUTPUT=$(TESTS_API)/$@ ./.maintain/scripts/generate_sol.sh
-	PACKAGE=pallet-unique NAME=eth::evm_collection::collection_impl OUTPUT=$(COLLECTION_STUBS)/$@ ./.maintain/scripts/generate_sol.sh
-
 CollectionHelper.sol:
 	PACKAGE=pallet-unique NAME=eth::evm_collection::collection_helper_iface OUTPUT=$(TESTS_API)/$@ ./.maintain/scripts/generate_sol.sh
 	PACKAGE=pallet-unique NAME=eth::evm_collection::collection_helper_impl OUTPUT=$(COLLECTION_HELPER_STUBS)/$@ ./.maintain/scripts/generate_sol.sh
@@ -58,15 +51,11 @@
 	INPUT=$(CONTRACT_HELPERS_STUBS)/$< OUTPUT=$(CONTRACT_HELPERS_STUBS)/ContractHelpers.raw ./.maintain/scripts/compile_stub.sh
 	INPUT=$(CONTRACT_HELPERS_STUBS)/$< OUTPUT=$(CONTRACT_HELPERS_ABI) ./.maintain/scripts/generate_abi.sh
 
-Collection: Collection.sol
-	INPUT=$(COLLECTION_STUBS)/$< OUTPUT=$(COLLECTION_STUBS)/Collection.raw ./.maintain/scripts/compile_stub.sh
-	INPUT=$(COLLECTION_STUBS)/$< OUTPUT=$(COLLECTION_ABI) ./.maintain/scripts/generate_abi.sh
-
 CollectionHelper: CollectionHelper.sol
 	INPUT=$(COLLECTION_HELPER_STUBS)/$< OUTPUT=$(COLLECTION_HELPER_STUBS)/CollectionHelper.raw ./.maintain/scripts/compile_stub.sh
 	INPUT=$(COLLECTION_HELPER_STUBS)/$< OUTPUT=$(COLLECTION_HELPER_ABI) ./.maintain/scripts/generate_abi.sh
 
-evm_stubs: UniqueFungible UniqueNFT ContractHelpers Collection CollectionHelper
+evm_stubs: UniqueFungible UniqueNFT ContractHelpers CollectionHelper
 
 .PHONY: _bench
 _bench:
modifiedpallets/common/src/erc.rsdiffbeforeafterboth
--- a/pallets/common/src/erc.rs
+++ b/pallets/common/src/erc.rs
@@ -14,9 +14,9 @@
 // You should have received a copy of the GNU General Public License
 // along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
 
-use evm_coder::{solidity_interface, types::*, execution::Result};
+use evm_coder::{solidity_interface, types::*, execution::{Result, Error}};
 pub use pallet_evm::{PrecompileOutput, PrecompileResult, account::CrossAccountId};
-use pallet_evm_coder_substrate::dispatch_to_evm;
+use pallet_evm_coder_substrate::{dispatch_to_evm, SubstrateRecorder};
 use sp_core::{H160, U256};
 use sp_std::vec::Vec;
 use up_data_structs::Property;
@@ -31,7 +31,7 @@
 	fn call(self, source: &H160, input: &[u8], value: U256) -> Option<PrecompileResult>;
 }
 
-#[solidity_interface(name = "CollectionProperties")]
+#[solidity_interface(name = "Collection")]
 impl<T: Config> CollectionHandle<T> {
 	fn set_collection_property(&mut self, caller: caller, key: string, value: bytes) -> Result<()> {
 		let caller = T::CrossAccountId::from_eth(caller);
@@ -64,4 +64,70 @@
 
 		Ok(prop.to_vec())
 	}
+
+	fn eth_set_sponsor(
+		&mut self,
+		caller: caller,
+		sponsor: address,
+	) -> Result<void> {
+		check_is_owner(caller, self)?;
+
+		let sponsor = T::CrossAccountId::from_eth(sponsor);
+		self.set_sponsor(sponsor.as_sub().clone());
+		save(self);
+		Ok(())
+	}
+
+	fn eth_confirm_sponsorship(&mut self, caller: caller) -> Result<void> {
+		let caller = T::CrossAccountId::from_eth(caller);
+		if !self.confirm_sponsorship(caller.as_sub()) {
+			return Err(Error::Revert("Caller is not set as sponsor".into()));
+		}
+		save(self);
+		Ok(())
+	}
+
+	fn set_limits(
+		&self,
+		caller: caller,
+		limits_json: string,
+	) -> Result<void> {
+		// let mut collection = collection_from_address::<T>(self.contract_address(caller).unwrap(), self.1.gas_left())?;
+		// check_is_owner(caller, &collection)?;
+
+		// let limits = serde_json_core::from_str(limits_json.as_ref())
+		// 	.map_err(|e| Error::Revert(format!("Parse JSON error: {}", e)))?;
+		// collection.limits = limits.0;
+		// collection.save().map_err(pallet_evm_coder_substrate::dispatch_to_evm::<T>)?;
+		Ok(())
+	}
+
+	fn contract_address(&self, _caller: caller) -> Result<address> {
+		Ok(crate::eth::collection_id_to_address(self.id))
+	}
+}
+
+fn collection_from_address<T: Config>(
+	collection_address: address,
+	gas_limit: u64
+) -> Result<CollectionHandle<T>> {
+	let collection_id = crate::eth::map_eth_to_id(&collection_address)
+	.ok_or(Error::Revert("Contract is not an unique collection".into()))?;
+	let recorder = <SubstrateRecorder<T>>::new(gas_limit);
+	let collection =
+		CollectionHandle::new_with_recorder(collection_id, recorder)
+			.ok_or(Error::Revert("Create collection handle error".into()))?;
+	Ok(collection)
+}
+
+fn check_is_owner<T: Config>(caller: caller, collection: &CollectionHandle<T>) -> Result<()> {
+	let caller = T::CrossAccountId::from_eth(caller);
+	collection
+		.check_is_owner(&caller)
+		.map_err(pallet_evm_coder_substrate::dispatch_to_evm::<T>)?;
+	Ok(())
 }
+
+fn save<T: Config>(collection: &CollectionHandle<T>) {
+	<crate::CollectionById<T>>::insert(collection.id, collection.collection.clone());
+}
\ No newline at end of file
modifiedpallets/common/src/lib.rsdiffbeforeafterboth
--- a/pallets/common/src/lib.rs
+++ b/pallets/common/src/lib.rs
@@ -20,7 +20,7 @@
 
 use core::ops::{Deref, DerefMut};
 use pallet_evm_coder_substrate::{SubstrateRecorder, WithRecorder};
-use sp_std::{vec::Vec, rc::Rc};
+use sp_std::vec::Vec;
 use pallet_evm::account::CrossAccountId;
 use frame_support::{
 	dispatch::{DispatchErrorWithPostInfo, DispatchResultWithPostInfo, Weight, PostDispatchInfo},
modifiedpallets/fungible/src/erc.rsdiffbeforeafterboth
--- a/pallets/fungible/src/erc.rs
+++ b/pallets/fungible/src/erc.rs
@@ -24,7 +24,7 @@
 use pallet_evm::account::CrossAccountId;
 use pallet_evm_coder_substrate::{call, dispatch_to_evm};
 use pallet_structure::{SelfWeightOf as StructureWeight, weights::WeightInfo as _};
-use pallet_common::{CollectionHandle, erc::CollectionPropertiesCall};
+use pallet_common::{CollectionHandle, erc::CollectionCall};
 
 use crate::{
 	Allowance, Balance, Config, FungibleHandle, Pallet, SelfWeightOf, TotalSupply,
@@ -150,7 +150,7 @@
 	is(
 		ERC20,
 		ERC20UniqueExtensions,
-		via("CollectionHandle<T>", common_mut, CollectionProperties)
+		via("CollectionHandle<T>", common_mut, Collection)
 	)
 )]
 impl<T: Config> FungibleHandle<T> {}
modifiedpallets/nonfungible/src/erc.rsdiffbeforeafterboth
--- a/pallets/nonfungible/src/erc.rs
+++ b/pallets/nonfungible/src/erc.rs
@@ -26,7 +26,7 @@
 use sp_core::{H160, U256};
 use sp_std::vec::Vec;
 use pallet_common::{
-	erc::{CommonEvmHandler, PrecompileResult, CollectionPropertiesCall},
+	erc::{CommonEvmHandler, PrecompileResult, CollectionCall},
 	CollectionHandle,
 };
 use pallet_evm::account::CrossAccountId;
@@ -513,7 +513,7 @@
 		ERC721UniqueExtensions,
 		ERC721Mintable,
 		ERC721Burnable,
-		via("CollectionHandle<T>", common_mut, CollectionProperties),
+		via("CollectionHandle<T>", common_mut, Collection),
 		TokenProperties,
 	)
 )]
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
@@ -51,6 +51,67 @@
 	event MintingFinished();
 }
 
+// Selector: 38e33c60
+contract Collection is Dummy, ERC165 {
+	// Selector: setCollectionProperty(string,bytes) 2f073f66
+	function setCollectionProperty(string memory key, bytes memory value)
+		public
+	{
+		require(false, stub_error);
+		key;
+		value;
+		dummy = 0;
+	}
+
+	// Selector: deleteCollectionProperty(string) 7b7debce
+	function deleteCollectionProperty(string memory key) public {
+		require(false, stub_error);
+		key;
+		dummy = 0;
+	}
+
+	// Throws error if key not found
+	//
+	// Selector: collectionProperty(string) cf24fd6d
+	function collectionProperty(string memory key)
+		public
+		view
+		returns (bytes memory)
+	{
+		require(false, stub_error);
+		key;
+		dummy;
+		return hex"";
+	}
+
+	// Selector: ethSetSponsor(address) 8f9af356
+	function ethSetSponsor(address sponsor) public {
+		require(false, stub_error);
+		sponsor;
+		dummy = 0;
+	}
+
+	// Selector: ethConfirmSponsorship() a8580d1a
+	function ethConfirmSponsorship() public {
+		require(false, stub_error);
+		dummy = 0;
+	}
+
+	// Selector: setLimits(string) 72cb345d
+	function setLimits(string memory limitsJson) public view {
+		require(false, stub_error);
+		limitsJson;
+		dummy;
+	}
+
+	// Selector: contractAddress() f6b4dfb4
+	function contractAddress() public view returns (address) {
+		require(false, stub_error);
+		dummy;
+		return 0x0000000000000000000000000000000000000000;
+	}
+}
+
 // Selector: 41369377
 contract TokenProperties is Dummy, ERC165 {
 	// Selector: setTokenPropertyPermission(string,bool,bool,bool) 222d97fa
@@ -327,40 +388,6 @@
 		require(false, stub_error);
 		dummy;
 		return 0;
-	}
-}
-
-// Selector: 9b5e29c5
-contract CollectionProperties is Dummy, ERC165 {
-	// Selector: setCollectionProperty(string,bytes) 2f073f66
-	function setCollectionProperty(string memory key, bytes memory value)
-		public
-	{
-		require(false, stub_error);
-		key;
-		value;
-		dummy = 0;
-	}
-
-	// Selector: deleteCollectionProperty(string) 7b7debce
-	function deleteCollectionProperty(string memory key) public {
-		require(false, stub_error);
-		key;
-		dummy = 0;
-	}
-
-	// Throws error if key not found
-	//
-	// Selector: collectionProperty(string) cf24fd6d
-	function collectionProperty(string memory key)
-		public
-		view
-		returns (bytes memory)
-	{
-		require(false, stub_error);
-		key;
-		dummy;
-		return hex"";
 	}
 }
 
@@ -423,6 +450,6 @@
 	ERC721UniqueExtensions,
 	ERC721Mintable,
 	ERC721Burnable,
-	CollectionProperties,
+	Collection,
 	TokenProperties
 {}
modifiedpallets/unique/Cargo.tomldiffbeforeafterboth
--- a/pallets/unique/Cargo.toml
+++ b/pallets/unique/Cargo.toml
@@ -20,7 +20,6 @@
 std = [
     'codec/std',
     'serde/std',
-    'serde-json-core/std',
     'frame-support/std',
     'frame-system/std',
     'pallet-evm/std',
@@ -42,10 +41,6 @@
 default-features = false
 features = ['derive']
 version = '1.0.130'
-
-[dependencies.serde-json-core]
-default-features = false
-version = "0.4"
 
 [dependencies.ethereum]
 version = "0.12.0"
modifiedpallets/unique/src/eth/mod.rsdiffbeforeafterboth
--- a/pallets/unique/src/eth/mod.rs
+++ b/pallets/unique/src/eth/mod.rs
@@ -110,17 +110,6 @@
 		}
 	}
 	
-	struct EvmCollection<T: Config>(H160, SubstrateRecorder<T>);
-	impl<T: Config> WithRecorder<T> for EvmCollection<T> {
-		fn recorder(&self) -> &SubstrateRecorder<T> {
-			&self.1
-		}
-	
-		fn into_recorder(self) -> SubstrateRecorder<T> {
-			self.1
-		}
-	}
-	
 	#[derive(ToLog)]
 	pub enum EthCollectionEvent {
 		CollectionCreated {
@@ -129,78 +118,7 @@
 			#[indexed]
 			collection_id: address,
 		},
-	}
-	
-	#[solidity_interface(name = "Collection")]
-	impl<T: Config> EvmCollection<T> {
-		fn set_sponsor(
-			&self,
-			caller: caller,
-			sponsor: address,
-		) -> Result<void> {
-			let mut collection = collection_from_address::<T>(self.contract_address(caller).unwrap(), self.1.gas_left())?;
-			check_is_owner(caller, &collection)?;
-	
-			let sponsor = T::CrossAccountId::from_eth(sponsor);
-			collection.set_sponsor(sponsor.as_sub().clone());
-			collection.save().map_err(pallet_evm_coder_substrate::dispatch_to_evm::<T>)?;
-		Ok(())
-		}
-	
-		fn confirm_sponsorship(&self, caller: caller) -> Result<void> {
-			let mut collection = collection_from_address::<T>(self.contract_address(caller).unwrap(), self.1.gas_left())?;
-			let caller = T::CrossAccountId::from_eth(caller);
-			if !collection.confirm_sponsorship(caller.as_sub()) {
-				return Err(Error::Revert("Caller is not set as sponsor".into()));
-			}
-			collection.save().map_err(pallet_evm_coder_substrate::dispatch_to_evm::<T>)?;
-		Ok(())
-		}
-	
-		fn set_limits(
-			&self,
-			caller: caller,
-			limits_json: string,
-		) -> Result<void> {
-			let mut collection = collection_from_address::<T>(self.contract_address(caller).unwrap(), self.1.gas_left())?;
-			check_is_owner(caller, &collection)?;
-	
-			let limits = serde_json_core::from_str(limits_json.as_ref())
-				.map_err(|e| Error::Revert(format!("Parse JSON error: {}", e)))?;
-			collection.limits = limits.0;
-			collection.save().map_err(pallet_evm_coder_substrate::dispatch_to_evm::<T>)?;
-		Ok(())
-		}
-
-		fn contract_address(&self, _caller: caller) -> Result<address> {
-			Ok(self.0)
-		}
-	}
-	
-	fn error_feild_too_long(feild: &str, bound: u32) -> Error {
-		Error::Revert(format!("{} is too long. Max length is {}.", feild, bound))
 	}
-	
-	fn collection_from_address<T: Config>(
-		collection_address: address,
-		gas_limit: u64
-	) -> Result<CollectionHandle<T>> {
-		let collection_id = pallet_common::eth::map_eth_to_id(&collection_address)
-		.ok_or(Error::Revert("Contract is not an unique collection".into()))?;
-		let recorder = <SubstrateRecorder<T>>::new(gas_limit);
-		let collection =
-			pallet_common::CollectionHandle::new_with_recorder(collection_id, recorder)
-				.ok_or(Error::Revert("Create collection handle error".into()))?;
-		Ok(collection)
-	}
-	
-	fn check_is_owner<T: Config>(caller: caller, collection: &CollectionHandle<T>) -> Result<()> {
-		let caller = T::CrossAccountId::from_eth(caller);
-		collection
-			.check_is_owner(&caller)
-			.map_err(pallet_evm_coder_substrate::dispatch_to_evm::<T>)?;
-		Ok(())
-	}
 
 	pub struct CollectionHelperOnMethodCall<T: Config>(PhantomData<*const T>);
 	impl<T: Config> OnMethodCall<T> for CollectionHelperOnMethodCall<T> {
@@ -235,38 +153,8 @@
 	
 	generate_stubgen!(collection_helper_impl, CollectionHelperCall<()>, true);
 	generate_stubgen!(collection_helper_iface, CollectionHelperCall<()>, false);
-	
-	pub struct CollectionOnMethodCall<T: Config>(PhantomData<*const T>);
-	impl<T: Config> OnMethodCall<T> for CollectionOnMethodCall<T> {
-		fn is_reserved(contract: &sp_core::H160) -> bool {
-			contract == &T::ContractAddress::get()
-		}
-	
-		fn is_used(contract: &sp_core::H160) -> bool {
-			contract == &T::ContractAddress::get()
-		}
-	
-		fn call(
-			source: &sp_core::H160,
-			target: &sp_core::H160,
-			gas_left: u64,
-			input: &[u8],
-			value: sp_core::U256,
-		) -> Option<PrecompileResult> {
-			if !pallet_common::eth::is_collection(target) {
-				return None;
-			}
 
-			let helpers = EvmCollection::<T>(*target, SubstrateRecorder::<T>::new(gas_left));
-			pallet_evm_coder_substrate::call(*source, helpers, value, input)
-		}
-	
-		fn get_code(contract: &sp_core::H160) -> Option<Vec<u8>> {
-			(contract == &T::ContractAddress::get())
-				.then(|| include_bytes!("./stubs/Collection.raw").to_vec())
-		}
+	fn error_feild_too_long(feild: &str, bound: u32) -> Error {
+		Error::Revert(format!("{} is too long. Max length is {}.", feild, bound))
 	}
-	
-	generate_stubgen!(collection_impl, CollectionCall<()>, true);
-	generate_stubgen!(collection_iface, CollectionCall<()>, false);
 }
deletedpallets/unique/src/eth/stubs/Collection.rawdiffbeforeafterboth

binary blob — no preview

deletedpallets/unique/src/eth/stubs/Collection.soldiffbeforeafterboth
--- a/pallets/unique/src/eth/stubs/Collection.sol
+++ /dev/null
@@ -1,52 +0,0 @@
-// SPDX-License-Identifier: OTHER
-// This code is automatically generated
-
-pragma solidity >=0.8.0 <0.9.0;
-
-// Common stubs holder
-contract Dummy {
-	uint8 dummy;
-	string stub_error = "this contract is implemented in native";
-}
-
-contract ERC165 is Dummy {
-	function supportsInterface(bytes4 interfaceID)
-		external
-		view
-		returns (bool)
-	{
-		require(false, stub_error);
-		interfaceID;
-		return true;
-	}
-}
-
-// Selector: 15cc740e
-contract Collection is Dummy, ERC165 {
-	// Selector: setSponsor(address) 59753fb1
-	function setSponsor(address sponsor) public view {
-		require(false, stub_error);
-		sponsor;
-		dummy;
-	}
-
-	// Selector: confirmSponsorship() c8c6a056
-	function confirmSponsorship() public view {
-		require(false, stub_error);
-		dummy;
-	}
-
-	// Selector: setLimits(string) 72cb345d
-	function setLimits(string memory limitsJson) public view {
-		require(false, stub_error);
-		limitsJson;
-		dummy;
-	}
-
-	// Selector: contractAddress() f6b4dfb4
-	function contractAddress() public view returns (address) {
-		require(false, stub_error);
-		dummy;
-		return 0x0000000000000000000000000000000000000000;
-	}
-}
modifiedruntime/opal/src/lib.rsdiffbeforeafterboth
--- a/runtime/opal/src/lib.rs
+++ b/runtime/opal/src/lib.rs
@@ -307,7 +307,6 @@
 		pallet_evm_migration::OnMethodCall<Self>,
 		pallet_evm_contract_helpers::HelpersOnMethodCall<Self>,
 		CollectionDispatchT<Self>,
-		evm_collection::CollectionOnMethodCall<Self>,
 		evm_collection::CollectionHelperOnMethodCall<Self>,
 	);
 	type OnCreate = pallet_evm_contract_helpers::HelpersOnCreate<Self>;
modifiedruntime/quartz/src/lib.rsdiffbeforeafterboth
--- a/runtime/quartz/src/lib.rs
+++ b/runtime/quartz/src/lib.rs
@@ -286,7 +286,6 @@
 		pallet_evm_migration::OnMethodCall<Self>,
 		pallet_evm_contract_helpers::HelpersOnMethodCall<Self>,
 		CollectionDispatchT<Self>,
-		evm_collection::CollectionOnMethodCall<Self>,
 		evm_collection::CollectionHelperOnMethodCall<Self>,
 	);
 	type OnCreate = pallet_evm_contract_helpers::HelpersOnCreate<Self>;
modifiedruntime/unique/src/lib.rsdiffbeforeafterboth
before · runtime/unique/src/lib.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//! The Substrate Node Template runtime. This can be compiled with `#[no_std]`, ready for Wasm.1819#![cfg_attr(not(feature = "std"), no_std)]20// `construct_runtime!` does a lot of recursion and requires us to increase the limit to 256.21#![recursion_limit = "1024"]22#![allow(clippy::from_over_into, clippy::identity_op)]23#![allow(clippy::fn_to_numeric_cast_with_truncation)]24// Make the WASM binary available.25#[cfg(feature = "std")]26include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));2728use sp_api::impl_runtime_apis;29use sp_core::{crypto::KeyTypeId, OpaqueMetadata, H256, U256, H160};30use sp_runtime::DispatchError;31// #[cfg(any(feature = "std", test))]32// pub use sp_runtime::BuildStorage;3334use sp_runtime::{35	Permill, Perbill, Percent, create_runtime_str, generic, impl_opaque_keys,36	traits::{AccountIdLookup, BlakeTwo256, Block as BlockT, AccountIdConversion, Zero},37	transaction_validity::{TransactionSource, TransactionValidity},38	ApplyExtrinsicResult, RuntimeAppPublic,39};4041use sp_std::prelude::*;4243#[cfg(feature = "std")]44use sp_version::NativeVersion;45use sp_version::RuntimeVersion;46pub use pallet_transaction_payment::{47	Multiplier, TargetedFeeAdjustment, FeeDetails, RuntimeDispatchInfo,48};49// A few exports that help ease life for downstream crates.50pub use pallet_balances::Call as BalancesCall;51pub use pallet_evm::{52	EnsureAddressTruncated, HashedAddressMapping, Runner, account::CrossAccountId as _, OnMethodCall,53	Account as EVMAccount, FeeCalculator, GasWeightMapping,54};55pub use frame_support::{56	construct_runtime, match_types,57	dispatch::DispatchResult,58	PalletId, parameter_types, StorageValue, ConsensusEngineId,59	traits::{60		tokens::currency::Currency as CurrencyT, OnUnbalanced as OnUnbalancedT, Everything,61		Currency, ExistenceRequirement, Get, IsInVec, KeyOwnerProofSystem, LockIdentifier,62		OnUnbalanced, Randomness, FindAuthor, ConstU32, Imbalance,63	},64	weights::{65		constants::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, WEIGHT_PER_SECOND},66		DispatchClass, DispatchInfo, GetDispatchInfo, IdentityFee, Pays, PostDispatchInfo, Weight,67		WeightToFeePolynomial, WeightToFeeCoefficient, WeightToFeeCoefficients, ConstantMultiplier,68	},69};70use unique_runtime_common::{71	dispatch::{CollectionDispatchT, CollectionDispatch},72	weights::CommonWeights,73	sponsoring::UniqueSponsorshipHandler,74	eth_sponsoring::UniqueEthSponsorshipHandler,75};76use up_data_structs::*;77// use pallet_contracts::weights::WeightInfo;78// #[cfg(any(feature = "std", test))]79use frame_system::{80	self as frame_system, EnsureRoot, EnsureSigned,81	limits::{BlockWeights, BlockLength},82};83use sp_arithmetic::{84	traits::{BaseArithmetic, Unsigned},85};86use smallvec::smallvec;87use codec::{Encode, Decode};88use pallet_unique::eth::evm_collection;89use fp_rpc::TransactionStatus;90use sp_runtime::{91	traits::{BlockNumberProvider, Dispatchable, PostDispatchInfoOf, Saturating},92	transaction_validity::TransactionValidityError,93	SaturatedConversion,94};9596// pub use pallet_timestamp::Call as TimestampCall;9798// Polkadot imports99use pallet_xcm::XcmPassthrough;100use polkadot_parachain::primitives::Sibling;101use up_data_structs::mapping::{CrossTokenAddressMapping, EvmTokenAddressMapping};102use xcm::v1::{BodyId, Junction::*, MultiLocation, NetworkId, Junctions::*};103use xcm_builder::{104	AccountId32Aliases, AllowTopLevelPaidExecutionFrom, AllowUnpaidExecutionFrom, CurrencyAdapter,105	EnsureXcmOrigin, FixedWeightBounds, LocationInverter, NativeAsset, ParentAsSuperuser,106	RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia,107	SignedAccountId32AsNative, SignedToAccountId32, SovereignSignedViaLocation, TakeWeightCredit,108	ParentIsPreset,109};110use xcm_executor::{Config, XcmExecutor, Assets};111use sp_std::{marker::PhantomData};112113use xcm::latest::{114	//	Xcm,115	AssetId::{Concrete},116	Fungibility::Fungible as XcmFungible,117	MultiAsset,118	Error as XcmError,119};120use xcm_executor::traits::{MatchesFungible, WeightTrader};121//use xcm_executor::traits::MatchesFungible;122use sp_runtime::traits::CheckedConversion;123124use unique_runtime_common::{125	impl_common_runtime_apis,126	types::*,127	constants::*,128	dispatch::{CollectionDispatchT, CollectionDispatch},129	sponsoring::UniqueSponsorshipHandler,130	eth_sponsoring::UniqueEthSponsorshipHandler,131	weights::CommonWeights,132};133134pub const RUNTIME_NAME: &str = "unique";135pub const TOKEN_SYMBOL: &str = "UNQ";136137type CrossAccountId = pallet_evm::account::BasicCrossAccountId<Runtime>;138139impl RuntimeInstance for Runtime {140	type CrossAccountId = self::CrossAccountId;141142	type TransactionConverter = self::TransactionConverter;143144	fn get_transaction_converter() -> TransactionConverter {145		TransactionConverter146	}147}148149/// Opaque types. These are used by the CLI to instantiate machinery that don't need to know150/// the specifics of the runtime. They can then be made to be agnostic over specific formats151/// of data like extrinsics, allowing for them to continue syncing the network through upgrades152/// to even the core data structures.153pub mod opaque {154	use sp_std::prelude::*;155	use sp_runtime::impl_opaque_keys;156	use super::Aura;157158	pub use unique_runtime_common::types::*;159160	impl_opaque_keys! {161		pub struct SessionKeys {162			pub aura: Aura,163		}164	}165}166167/// This runtime version.168pub const VERSION: RuntimeVersion = RuntimeVersion {169	spec_name: create_runtime_str!(RUNTIME_NAME),170	impl_name: create_runtime_str!(RUNTIME_NAME),171	authoring_version: 1,172	spec_version: 920000,173	impl_version: 0,174	apis: RUNTIME_API_VERSIONS,175	transaction_version: 1,176	state_version: 0,177};178179#[derive(codec::Encode, codec::Decode)]180pub enum XCMPMessage<XAccountId, XBalance> {181	/// Transfer tokens to the given account from the Parachain account.182	TransferToken(XAccountId, XBalance),183}184185/// The version information used to identify this runtime when compiled natively.186#[cfg(feature = "std")]187pub fn native_version() -> NativeVersion {188	NativeVersion {189		runtime_version: VERSION,190		can_author_with: Default::default(),191	}192}193194type NegativeImbalance = <Balances as Currency<AccountId>>::NegativeImbalance;195196pub struct DealWithFees;197impl OnUnbalanced<NegativeImbalance> for DealWithFees {198	fn on_unbalanceds<B>(mut fees_then_tips: impl Iterator<Item = NegativeImbalance>) {199		if let Some(fees) = fees_then_tips.next() {200			// for fees, 100% to treasury201			let mut split = fees.ration(100, 0);202			if let Some(tips) = fees_then_tips.next() {203				// for tips, if any, 100% to treasury204				tips.ration_merge_into(100, 0, &mut split);205			}206			Treasury::on_unbalanced(split.0);207			// Author::on_unbalanced(split.1);208		}209	}210}211212parameter_types! {213	pub const BlockHashCount: BlockNumber = 2400;214	pub RuntimeBlockLength: BlockLength =215		BlockLength::max_with_normal_ratio(5 * 1024 * 1024, NORMAL_DISPATCH_RATIO);216	pub const AvailableBlockRatio: Perbill = Perbill::from_percent(75);217	pub const MaximumBlockLength: u32 = 5 * 1024 * 1024;218	pub RuntimeBlockWeights: BlockWeights = BlockWeights::builder()219		.base_block(BlockExecutionWeight::get())220		.for_class(DispatchClass::all(), |weights| {221			weights.base_extrinsic = ExtrinsicBaseWeight::get();222		})223		.for_class(DispatchClass::Normal, |weights| {224			weights.max_total = Some(NORMAL_DISPATCH_RATIO * MAXIMUM_BLOCK_WEIGHT);225		})226		.for_class(DispatchClass::Operational, |weights| {227			weights.max_total = Some(MAXIMUM_BLOCK_WEIGHT);228			// Operational transactions have some extra reserved space, so that they229			// are included even if block reached `MAXIMUM_BLOCK_WEIGHT`.230			weights.reserved = Some(231				MAXIMUM_BLOCK_WEIGHT - NORMAL_DISPATCH_RATIO * MAXIMUM_BLOCK_WEIGHT232			);233		})234		.avg_block_initialization(AVERAGE_ON_INITIALIZE_RATIO)235		.build_or_panic();236	pub const Version: RuntimeVersion = VERSION;237	pub const SS58Prefix: u16 = 7391;238}239240parameter_types! {241	pub const ChainId: u64 = 8880;242}243244pub struct FixedFee;245impl FeeCalculator for FixedFee {246	fn min_gas_price() -> U256 {247		MIN_GAS_PRICE.into()248	}249}250251// Assuming slowest ethereum opcode is SSTORE, with gas price of 20000 as our worst case252// (contract, which only writes a lot of data),253// approximating on top of our real store write weight254parameter_types! {255	pub const WritesPerSecond: u64 = WEIGHT_PER_SECOND / <Runtime as frame_system::Config>::DbWeight::get().write;256	pub const GasPerSecond: u64 = WritesPerSecond::get() * 20000;257	pub const WeightPerGas: u64 = WEIGHT_PER_SECOND / GasPerSecond::get();258}259260/// Limiting EVM execution to 50% of block for substrate users and management tasks261/// EVM transaction consumes more weight than substrate's, so we can't rely on them being262/// scheduled fairly263const EVM_DISPATCH_RATIO: Perbill = Perbill::from_percent(50);264parameter_types! {265	pub BlockGasLimit: U256 = U256::from(NORMAL_DISPATCH_RATIO * EVM_DISPATCH_RATIO * MAXIMUM_BLOCK_WEIGHT / WeightPerGas::get());266}267268pub enum FixedGasWeightMapping {}269impl GasWeightMapping for FixedGasWeightMapping {270	fn gas_to_weight(gas: u64) -> Weight {271		gas.saturating_mul(WeightPerGas::get())272	}273	fn weight_to_gas(weight: Weight) -> u64 {274		weight / WeightPerGas::get()275	}276}277278impl pallet_evm::Config for Runtime {279	type BlockGasLimit = BlockGasLimit;280	type FeeCalculator = FixedFee;281	type GasWeightMapping = FixedGasWeightMapping;282	type BlockHashMapping = pallet_ethereum::EthereumBlockHashMapping<Self>;283	type CallOrigin = EnsureAddressTruncated<Self>;284	type WithdrawOrigin = EnsureAddressTruncated<Self>;285	type AddressMapping = HashedAddressMapping<Self::Hashing>;286	type PrecompilesType = ();287	type PrecompilesValue = ();288	type Currency = Balances;289	type Event = Event;290	type OnMethodCall = (291		pallet_evm_migration::OnMethodCall<Self>,292		pallet_evm_contract_helpers::HelpersOnMethodCall<Self>,293		CollectionDispatchT<Self>,294		evm_collection::CollectionOnMethodCall<Self>,295		evm_collection::CollectionHelperOnMethodCall<Self>,296	);297	type OnCreate = pallet_evm_contract_helpers::HelpersOnCreate<Self>;298	type ChainId = ChainId;299	type Runner = pallet_evm::runner::stack::Runner<Self>;300	type OnChargeTransaction = pallet_evm::EVMCurrencyAdapter<Balances, DealWithFees>;301	type TransactionValidityHack = pallet_evm_transaction_payment::TransactionValidityHack<Self>;302	type FindAuthor = EthereumFindAuthor<Aura>;303}304305impl pallet_evm_migration::Config for Runtime {306	type WeightInfo = pallet_evm_migration::weights::SubstrateWeight<Self>;307}308309pub struct EthereumFindAuthor<F>(core::marker::PhantomData<F>);310impl<F: FindAuthor<u32>> FindAuthor<H160> for EthereumFindAuthor<F> {311	fn find_author<'a, I>(digests: I) -> Option<H160>312	where313		I: 'a + IntoIterator<Item = (ConsensusEngineId, &'a [u8])>,314	{315		if let Some(author_index) = F::find_author(digests) {316			let authority_id = Aura::authorities()[author_index as usize].clone();317			return Some(H160::from_slice(&authority_id.to_raw_vec()[4..24]));318		}319		None320	}321}322323impl pallet_ethereum::Config for Runtime {324	type Event = Event;325	type StateRoot = pallet_ethereum::IntermediateStateRoot<Self>;326}327328impl pallet_randomness_collective_flip::Config for Runtime {}329330impl frame_system::Config for Runtime {331	/// The data to be stored in an account.332	type AccountData = pallet_balances::AccountData<Balance>;333	/// The identifier used to distinguish between accounts.334	type AccountId = AccountId;335	/// The basic call filter to use in dispatchable.336	type BaseCallFilter = Everything;337	/// Maximum number of block number to block hash mappings to keep (oldest pruned first).338	type BlockHashCount = BlockHashCount;339	/// The maximum length of a block (in bytes).340	type BlockLength = RuntimeBlockLength;341	/// The index type for blocks.342	type BlockNumber = BlockNumber;343	/// The weight of the overhead invoked on the block import process, independent of the extrinsics included in that block.344	type BlockWeights = RuntimeBlockWeights;345	/// The aggregated dispatch type that is available for extrinsics.346	type Call = Call;347	/// The weight of database operations that the runtime can invoke.348	type DbWeight = RocksDbWeight;349	/// The ubiquitous event type.350	type Event = Event;351	/// The type for hashing blocks and tries.352	type Hash = Hash;353	/// The hashing algorithm used.354	type Hashing = BlakeTwo256;355	/// The header type.356	type Header = generic::Header<BlockNumber, BlakeTwo256>;357	/// The index type for storing how many extrinsics an account has signed.358	type Index = Index;359	/// The lookup mechanism to get account ID from whatever is passed in dispatchers.360	type Lookup = AccountIdLookup<AccountId, ()>;361	/// What to do if an account is fully reaped from the system.362	type OnKilledAccount = ();363	/// What to do if a new account is created.364	type OnNewAccount = ();365	type OnSetCode = cumulus_pallet_parachain_system::ParachainSetCode<Self>;366	/// The ubiquitous origin type.367	type Origin = Origin;368	/// This type is being generated by `construct_runtime!`.369	type PalletInfo = PalletInfo;370	/// This is used as an identifier of the chain. 42 is the generic substrate prefix.371	type SS58Prefix = SS58Prefix;372	/// Weight information for the extrinsics of this pallet.373	type SystemWeightInfo = frame_system::weights::SubstrateWeight<Self>;374	/// Version of the runtime.375	type Version = Version;376	type MaxConsumers = ConstU32<16>;377}378379parameter_types! {380	pub const MinimumPeriod: u64 = SLOT_DURATION / 2;381}382383impl pallet_timestamp::Config for Runtime {384	/// A timestamp: milliseconds since the unix epoch.385	type Moment = u64;386	type OnTimestampSet = ();387	type MinimumPeriod = MinimumPeriod;388	type WeightInfo = ();389}390391parameter_types! {392	// pub const ExistentialDeposit: u128 = 500;393	pub const ExistentialDeposit: u128 = 0;394	pub const MaxLocks: u32 = 50;395}396397impl pallet_balances::Config for Runtime {398	type MaxLocks = MaxLocks;399	type MaxReserves = ();400	type ReserveIdentifier = [u8; 8];401	/// The type for recording an account's balance.402	type Balance = Balance;403	/// The ubiquitous event type.404	type Event = Event;405	type DustRemoval = Treasury;406	type ExistentialDeposit = ExistentialDeposit;407	type AccountStore = System;408	type WeightInfo = pallet_balances::weights::SubstrateWeight<Self>;409}410411pub const fn deposit(items: u32, bytes: u32) -> Balance {412	items as Balance * 15 * CENTIUNIQUE + (bytes as Balance) * 6 * CENTIUNIQUE413}414415/*416parameter_types! {417	pub TombstoneDeposit: Balance = deposit(418		1,419		sp_std::mem::size_of::<pallet_contracts::Pallet<Runtime>> as u32,420	);421	pub DepositPerContract: Balance = TombstoneDeposit::get();422	pub const DepositPerStorageByte: Balance = deposit(0, 1);423	pub const DepositPerStorageItem: Balance = deposit(1, 0);424	pub RentFraction: Perbill = Perbill::from_rational(1u32, 30 * DAYS);425	pub const SurchargeReward: Balance = 150 * MILLIUNIQUE;426	pub const SignedClaimHandicap: u32 = 2;427	pub const MaxDepth: u32 = 32;428	pub const MaxValueSize: u32 = 16 * 1024;429	pub const MaxCodeSize: u32 = 1024 * 1024 * 25; // 25 Mb430	// The lazy deletion runs inside on_initialize.431	pub DeletionWeightLimit: Weight = AVERAGE_ON_INITIALIZE_RATIO *432		RuntimeBlockWeights::get().max_block;433	// The weight needed for decoding the queue should be less or equal than a fifth434	// of the overall weight dedicated to the lazy deletion.435	pub DeletionQueueDepth: u32 = ((DeletionWeightLimit::get() / (436			<Runtime as pallet_contracts::Config>::WeightInfo::on_initialize_per_queue_item(1) -437			<Runtime as pallet_contracts::Config>::WeightInfo::on_initialize_per_queue_item(0)438		)) / 5) as u32;439	pub Schedule: pallet_contracts::Schedule<Runtime> = Default::default();440}441442impl pallet_contracts::Config for Runtime {443	type Time = Timestamp;444	type Randomness = RandomnessCollectiveFlip;445	type Currency = Balances;446	type Event = Event;447	type RentPayment = ();448	type SignedClaimHandicap = SignedClaimHandicap;449	type TombstoneDeposit = TombstoneDeposit;450	type DepositPerContract = DepositPerContract;451	type DepositPerStorageByte = DepositPerStorageByte;452	type DepositPerStorageItem = DepositPerStorageItem;453	type RentFraction = RentFraction;454	type SurchargeReward = SurchargeReward;455	type WeightPrice = pallet_transaction_payment::Pallet<Self>;456	type WeightInfo = pallet_contracts::weights::SubstrateWeight<Self>;457	type ChainExtension = NFTExtension;458	type DeletionQueueDepth = DeletionQueueDepth;459	type DeletionWeightLimit = DeletionWeightLimit;460	type Schedule = Schedule;461	type CallStack = [pallet_contracts::Frame<Self>; 31];462}463*/464465parameter_types! {466	/// This value increases the priority of `Operational` transactions by adding467	/// a "virtual tip" that's equal to the `OperationalFeeMultiplier * final_fee`.468	pub const OperationalFeeMultiplier: u8 = 5;469}470471/// Linear implementor of `WeightToFeePolynomial`472pub struct LinearFee<T>(sp_std::marker::PhantomData<T>);473474impl<T> WeightToFeePolynomial for LinearFee<T>475where476	T: BaseArithmetic + From<u32> + Copy + Unsigned,477{478	type Balance = T;479480	fn polynomial() -> WeightToFeeCoefficients<Self::Balance> {481		smallvec!(WeightToFeeCoefficient {482			// Targeting 0.1 Unique per NFT transfer483			coeff_integer: WEIGHT_TO_FEE_COEFF.into(),484			coeff_frac: Perbill::zero(),485			negative: false,486			degree: 1,487		})488	}489}490491impl pallet_transaction_payment::Config for Runtime {492	type OnChargeTransaction = pallet_transaction_payment::CurrencyAdapter<Balances, DealWithFees>;493	type LengthToFee = ConstantMultiplier<Balance, TransactionByteFee>;494	type OperationalFeeMultiplier = OperationalFeeMultiplier;495	type WeightToFee = LinearFee<Balance>;496	type FeeMultiplierUpdate = ();497}498499parameter_types! {500	pub const ProposalBond: Permill = Permill::from_percent(5);501	pub const ProposalBondMinimum: Balance = 1 * UNIQUE;502	pub const ProposalBondMaximum: Balance = 1000 * UNIQUE;503	pub const SpendPeriod: BlockNumber = 5 * MINUTES;504	pub const Burn: Permill = Permill::from_percent(0);505	pub const TipCountdown: BlockNumber = 1 * DAYS;506	pub const TipFindersFee: Percent = Percent::from_percent(20);507	pub const TipReportDepositBase: Balance = 1 * UNIQUE;508	pub const DataDepositPerByte: Balance = 1 * CENTIUNIQUE;509	pub const BountyDepositBase: Balance = 1 * UNIQUE;510	pub const BountyDepositPayoutDelay: BlockNumber = 1 * DAYS;511	pub const TreasuryModuleId: PalletId = PalletId(*b"py/trsry");512	pub const BountyUpdatePeriod: BlockNumber = 14 * DAYS;513	pub const MaximumReasonLength: u32 = 16384;514	pub const BountyCuratorDeposit: Permill = Permill::from_percent(50);515	pub const BountyValueMinimum: Balance = 5 * UNIQUE;516	pub const MaxApprovals: u32 = 100;517}518519impl pallet_treasury::Config for Runtime {520	type PalletId = TreasuryModuleId;521	type Currency = Balances;522	type ApproveOrigin = EnsureRoot<AccountId>;523	type RejectOrigin = EnsureRoot<AccountId>;524	type Event = Event;525	type OnSlash = ();526	type ProposalBond = ProposalBond;527	type ProposalBondMinimum = ProposalBondMinimum;528	type ProposalBondMaximum = ProposalBondMaximum;529	type SpendPeriod = SpendPeriod;530	type Burn = Burn;531	type BurnDestination = ();532	type SpendFunds = ();533	type WeightInfo = pallet_treasury::weights::SubstrateWeight<Self>;534	type MaxApprovals = MaxApprovals;535}536537impl pallet_sudo::Config for Runtime {538	type Event = Event;539	type Call = Call;540}541542pub struct RelayChainBlockNumberProvider<T>(sp_std::marker::PhantomData<T>);543544impl<T: cumulus_pallet_parachain_system::Config> BlockNumberProvider545	for RelayChainBlockNumberProvider<T>546{547	type BlockNumber = BlockNumber;548549	fn current_block_number() -> Self::BlockNumber {550		cumulus_pallet_parachain_system::Pallet::<T>::validation_data()551			.map(|d| d.relay_parent_number)552			.unwrap_or_default()553	}554}555556parameter_types! {557	pub const MinVestedTransfer: Balance = 10 * UNIQUE;558	pub const MaxVestingSchedules: u32 = 28;559}560561impl orml_vesting::Config for Runtime {562	type Event = Event;563	type Currency = pallet_balances::Pallet<Runtime>;564	type MinVestedTransfer = MinVestedTransfer;565	type VestedTransferOrigin = EnsureSigned<AccountId>;566	type WeightInfo = ();567	type MaxVestingSchedules = MaxVestingSchedules;568	type BlockNumberProvider = RelayChainBlockNumberProvider<Runtime>;569}570571parameter_types! {572	pub const ReservedDmpWeight: Weight = MAXIMUM_BLOCK_WEIGHT / 4;573	pub const ReservedXcmpWeight: Weight = MAXIMUM_BLOCK_WEIGHT / 4;574}575576impl cumulus_pallet_parachain_system::Config for Runtime {577	type Event = Event;578	type SelfParaId = parachain_info::Pallet<Self>;579	type OnSystemEvent = ();580	// type DownwardMessageHandlers = cumulus_primitives_utility::UnqueuedDmpAsParent<581	// 	MaxDownwardMessageWeight,582	// 	XcmExecutor<XcmConfig>,583	// 	Call,584	// >;585	type OutboundXcmpMessageSource = XcmpQueue;586	type DmpMessageHandler = DmpQueue;587	type ReservedDmpWeight = ReservedDmpWeight;588	type ReservedXcmpWeight = ReservedXcmpWeight;589	type XcmpMessageHandler = XcmpQueue;590}591592impl parachain_info::Config for Runtime {}593594impl cumulus_pallet_aura_ext::Config for Runtime {}595596parameter_types! {597	pub const RelayLocation: MultiLocation = MultiLocation::parent();598	pub const RelayNetwork: NetworkId = NetworkId::Polkadot;599	pub RelayOrigin: Origin = cumulus_pallet_xcm::Origin::Relay.into();600	pub Ancestry: MultiLocation = Parachain(ParachainInfo::parachain_id().into()).into();601}602603/// Type for specifying how a `MultiLocation` can be converted into an `AccountId`. This is used604/// when determining ownership of accounts for asset transacting and when attempting to use XCM605/// `Transact` in order to determine the dispatch Origin.606pub type LocationToAccountId = (607	// The parent (Relay-chain) origin converts to the default `AccountId`.608	ParentIsPreset<AccountId>,609	// Sibling parachain origins convert to AccountId via the `ParaId::into`.610	SiblingParachainConvertsVia<Sibling, AccountId>,611	// Straight up local `AccountId32` origins just alias directly to `AccountId`.612	AccountId32Aliases<RelayNetwork, AccountId>,613);614615pub struct OnlySelfCurrency;616impl<B: TryFrom<u128>> MatchesFungible<B> for OnlySelfCurrency {617	fn matches_fungible(a: &MultiAsset) -> Option<B> {618		match (&a.id, &a.fun) {619			(Concrete(_), XcmFungible(ref amount)) => CheckedConversion::checked_from(*amount),620			_ => None,621		}622	}623}624625/// Means for transacting assets on this chain.626pub type LocalAssetTransactor = CurrencyAdapter<627	// Use this currency:628	Balances,629	// Use this currency when it is a fungible asset matching the given location or name:630	OnlySelfCurrency,631	// Do a simple punn to convert an AccountId32 MultiLocation into a native chain account ID:632	LocationToAccountId,633	// Our chain's account ID type (we can't get away without mentioning it explicitly):634	AccountId,635	// We don't track any teleports.636	(),637>;638639/// This is the type we use to convert an (incoming) XCM origin into a local `Origin` instance,640/// ready for dispatching a transaction with Xcm's `Transact`. There is an `OriginKind` which can641/// biases the kind of local `Origin` it will become.642pub type XcmOriginToTransactDispatchOrigin = (643	// Sovereign account converter; this attempts to derive an `AccountId` from the origin location644	// using `LocationToAccountId` and then turn that into the usual `Signed` origin. Useful for645	// foreign chains who want to have a local sovereign account on this chain which they control.646	SovereignSignedViaLocation<LocationToAccountId, Origin>,647	// Native converter for Relay-chain (Parent) location; will converts to a `Relay` origin when648	// recognised.649	RelayChainAsNative<RelayOrigin, Origin>,650	// Native converter for sibling Parachains; will convert to a `SiblingPara` origin when651	// recognised.652	SiblingParachainAsNative<cumulus_pallet_xcm::Origin, Origin>,653	// Superuser converter for the Relay-chain (Parent) location. This will allow it to issue a654	// transaction from the Root origin.655	ParentAsSuperuser<Origin>,656	// Native signed account converter; this just converts an `AccountId32` origin into a normal657	// `Origin::Signed` origin of the same 32-byte value.658	SignedAccountId32AsNative<RelayNetwork, Origin>,659	// Xcm origins can be represented natively under the Xcm pallet's Xcm origin.660	XcmPassthrough<Origin>,661);662663parameter_types! {664	// One XCM operation is 1_000_000 weight - almost certainly a conservative estimate.665	pub UnitWeightCost: Weight = 1_000_000;666	// 1200 UNIQUEs buy 1 second of weight.667	pub const WeightPrice: (MultiLocation, u128) = (MultiLocation::parent(), 1_200 * UNIQUE);668	pub const MaxInstructions: u32 = 100;669	pub const MaxAuthorities: u32 = 100_000;670}671672match_types! {673	pub type ParentOrParentsUnitPlurality: impl Contains<MultiLocation> = {674		MultiLocation { parents: 1, interior: Here } |675		MultiLocation { parents: 1, interior: X1(Plurality { id: BodyId::Unit, .. }) }676	};677}678679pub type Barrier = (680	TakeWeightCredit,681	AllowTopLevelPaidExecutionFrom<Everything>,682	AllowUnpaidExecutionFrom<ParentOrParentsUnitPlurality>,683	// ^^^ Parent & its unit plurality gets free execution684);685686pub struct UsingOnlySelfCurrencyComponents<687	WeightToFee: WeightToFeePolynomial<Balance = Currency::Balance>,688	AssetId: Get<MultiLocation>,689	AccountId,690	Currency: CurrencyT<AccountId>,691	OnUnbalanced: OnUnbalancedT<Currency::NegativeImbalance>,692>(693	Weight,694	Currency::Balance,695	PhantomData<(WeightToFee, AssetId, AccountId, Currency, OnUnbalanced)>,696);697impl<698		WeightToFee: WeightToFeePolynomial<Balance = Currency::Balance>,699		AssetId: Get<MultiLocation>,700		AccountId,701		Currency: CurrencyT<AccountId>,702		OnUnbalanced: OnUnbalancedT<Currency::NegativeImbalance>,703	> WeightTrader704	for UsingOnlySelfCurrencyComponents<WeightToFee, AssetId, AccountId, Currency, OnUnbalanced>705{706	fn new() -> Self {707		Self(0, Zero::zero(), PhantomData)708	}709710	fn buy_weight(&mut self, weight: Weight, payment: Assets) -> Result<Assets, XcmError> {711		let amount = WeightToFee::calc(&weight);712		let u128_amount: u128 = amount.try_into().map_err(|_| XcmError::Overflow)?;713714		// location to this parachain through relay chain715		let option1: xcm::v1::AssetId = Concrete(MultiLocation {716			parents: 1,717			interior: X1(Parachain(ParachainInfo::parachain_id().into())),718		});719		// direct location720		let option2: xcm::v1::AssetId = Concrete(MultiLocation {721			parents: 0,722			interior: Here,723		});724725		let required = if payment.fungible.contains_key(&option1) {726			(option1, u128_amount).into()727		} else if payment.fungible.contains_key(&option2) {728			(option2, u128_amount).into()729		} else {730			(Concrete(MultiLocation::default()), u128_amount).into()731		};732733		let unused = payment734			.checked_sub(required)735			.map_err(|_| XcmError::TooExpensive)?;736		self.0 = self.0.saturating_add(weight);737		self.1 = self.1.saturating_add(amount);738		Ok(unused)739	}740741	fn refund_weight(&mut self, weight: Weight) -> Option<MultiAsset> {742		let weight = weight.min(self.0);743		let amount = WeightToFee::calc(&weight);744		self.0 -= weight;745		self.1 = self.1.saturating_sub(amount);746		let amount: u128 = amount.saturated_into();747		if amount > 0 {748			Some((AssetId::get(), amount).into())749		} else {750			None751		}752	}753}754impl<755		WeightToFee: WeightToFeePolynomial<Balance = Currency::Balance>,756		AssetId: Get<MultiLocation>,757		AccountId,758		Currency: CurrencyT<AccountId>,759		OnUnbalanced: OnUnbalancedT<Currency::NegativeImbalance>,760	> Drop761	for UsingOnlySelfCurrencyComponents<WeightToFee, AssetId, AccountId, Currency, OnUnbalanced>762{763	fn drop(&mut self) {764		OnUnbalanced::on_unbalanced(Currency::issue(self.1));765	}766}767768pub struct XcmConfig;769impl Config for XcmConfig {770	type Call = Call;771	type XcmSender = XcmRouter;772	// How to withdraw and deposit an asset.773	type AssetTransactor = LocalAssetTransactor;774	type OriginConverter = XcmOriginToTransactDispatchOrigin;775	type IsReserve = NativeAsset;776	type IsTeleporter = (); // Teleportation is disabled777	type LocationInverter = LocationInverter<Ancestry>;778	type Barrier = Barrier;779	type Weigher = FixedWeightBounds<UnitWeightCost, Call, MaxInstructions>;780	type Trader = UsingOnlySelfCurrencyComponents<781		IdentityFee<Balance>,782		RelayLocation,783		AccountId,784		Balances,785		(),786	>;787	type ResponseHandler = (); // Don't handle responses for now.788	type SubscriptionService = PolkadotXcm;789790	type AssetTrap = PolkadotXcm;791	type AssetClaims = PolkadotXcm;792}793794// parameter_types! {795// 	pub const MaxDownwardMessageWeight: Weight = MAXIMUM_BLOCK_WEIGHT / 10;796// }797798/// No local origins on this chain are allowed to dispatch XCM sends/executions.799pub type LocalOriginToLocation = (SignedToAccountId32<Origin, AccountId, RelayNetwork>,);800801/// The means for routing XCM messages which are not for local execution into the right message802/// queues.803pub type XcmRouter = (804	// Two routers - use UMP to communicate with the relay chain:805	cumulus_primitives_utility::ParentAsUmp<ParachainSystem, ()>,806	// ..and XCMP to communicate with the sibling chains.807	XcmpQueue,808);809810impl pallet_evm_coder_substrate::Config for Runtime {811	type GasWeightMapping = FixedGasWeightMapping;812}813814impl pallet_xcm::Config for Runtime {815	type Event = Event;816	type SendXcmOrigin = EnsureXcmOrigin<Origin, LocalOriginToLocation>;817	type XcmRouter = XcmRouter;818	type ExecuteXcmOrigin = EnsureXcmOrigin<Origin, LocalOriginToLocation>;819	type XcmExecuteFilter = Everything;820	type XcmExecutor = XcmExecutor<XcmConfig>;821	type XcmTeleportFilter = Everything;822	type XcmReserveTransferFilter = Everything;823	type Weigher = FixedWeightBounds<UnitWeightCost, Call, MaxInstructions>;824	type LocationInverter = LocationInverter<Ancestry>;825	type Origin = Origin;826	type Call = Call;827	const VERSION_DISCOVERY_QUEUE_SIZE: u32 = 100;828	type AdvertisedXcmVersion = pallet_xcm::CurrentXcmVersion;829}830831impl cumulus_pallet_xcm::Config for Runtime {832	type Event = Event;833	type XcmExecutor = XcmExecutor<XcmConfig>;834}835836impl cumulus_pallet_xcmp_queue::Config for Runtime {837	type WeightInfo = ();838	type Event = Event;839	type XcmExecutor = XcmExecutor<XcmConfig>;840	type ChannelInfo = ParachainSystem;841	type VersionWrapper = ();842	type ExecuteOverweightOrigin = frame_system::EnsureRoot<AccountId>;843	type ControllerOrigin = EnsureRoot<AccountId>;844	type ControllerOriginConverter = XcmOriginToTransactDispatchOrigin;845}846847impl cumulus_pallet_dmp_queue::Config for Runtime {848	type Event = Event;849	type XcmExecutor = XcmExecutor<XcmConfig>;850	type ExecuteOverweightOrigin = frame_system::EnsureRoot<AccountId>;851}852853impl pallet_aura::Config for Runtime {854	type AuthorityId = AuraId;855	type DisabledValidators = ();856	type MaxAuthorities = MaxAuthorities;857}858859parameter_types! {860	pub TreasuryAccountId: AccountId = TreasuryModuleId::get().into_account();861	pub const CollectionCreationPrice: Balance = 2 * UNIQUE;862}863864impl pallet_common::Config for Runtime {865	type WeightInfo = pallet_common::weights::SubstrateWeight<Self>;866	type Event = Event;867	type Currency = Balances;868	type CollectionCreationPrice = CollectionCreationPrice;869	type TreasuryAccountId = TreasuryAccountId;870	type CollectionDispatch = CollectionDispatchT<Self>;871872	type EvmTokenAddressMapping = EvmTokenAddressMapping;873	type CrossTokenAddressMapping = CrossTokenAddressMapping<Self::AccountId>;874}875876impl pallet_structure::Config for Runtime {877	type Event = Event;878	type Call = Call;879	type WeightInfo = pallet_structure::weights::SubstrateWeight<Self>;880}881882impl pallet_evm::account::Config for Runtime {883	type CrossAccountId = pallet_evm::account::BasicCrossAccountId<Self>;884	type EvmAddressMapping = HashedAddressMapping<Self::Hashing>;885	type EvmBackwardsAddressMapping = fp_evm_mapping::MapBackwardsAddressTruncated;886}887888impl pallet_fungible::Config for Runtime {889	type WeightInfo = pallet_fungible::weights::SubstrateWeight<Self>;890}891impl pallet_refungible::Config for Runtime {892	type WeightInfo = pallet_refungible::weights::SubstrateWeight<Self>;893}894impl pallet_nonfungible::Config for Runtime {895	type WeightInfo = pallet_nonfungible::weights::SubstrateWeight<Self>;896}897898impl pallet_proxy_rmrk_core::Config for Runtime {899	type Event = Event;900}901902impl pallet_proxy_rmrk_equip::Config for Runtime {903	type Event = Event;904}905906impl pallet_unique::Config for Runtime {907	type Event = Event;908	type WeightInfo = pallet_unique::weights::SubstrateWeight<Self>;909	type CommonWeightInfo = CommonWeights<Self>;910}911912parameter_types! {913	pub const InflationBlockInterval: BlockNumber = 100; // every time per how many blocks inflation is applied914}915916/// Used for the pallet inflation917impl pallet_inflation::Config for Runtime {918	type Currency = Balances;919	type TreasuryAccountId = TreasuryAccountId;920	type InflationBlockInterval = InflationBlockInterval;921	type BlockNumberProvider = RelayChainBlockNumberProvider<Runtime>;922}923924// parameter_types! {925// 	pub MaximumSchedulerWeight: Weight = Perbill::from_percent(50) *926// 		RuntimeBlockWeights::get().max_block;927// 	pub const MaxScheduledPerBlock: u32 = 50;928// }929930type EvmSponsorshipHandler = (931	UniqueEthSponsorshipHandler<Runtime>,932	pallet_evm_contract_helpers::HelpersContractSponsoring<Runtime>,933);934type SponsorshipHandler = (935	UniqueSponsorshipHandler<Runtime>,936	//pallet_contract_helpers::ContractSponsorshipHandler<Runtime>,937	pallet_evm_transaction_payment::BridgeSponsorshipHandler<Runtime>,938);939940// impl pallet_unq_scheduler::Config for Runtime {941// 	type Event = Event;942// 	type Origin = Origin;943// 	type PalletsOrigin = OriginCaller;944// 	type Call = Call;945// 	type MaximumWeight = MaximumSchedulerWeight;946// 	type ScheduleOrigin = EnsureSigned<AccountId>;947// 	type MaxScheduledPerBlock = MaxScheduledPerBlock;948// 	type SponsorshipHandler = SponsorshipHandler;949// 	type WeightInfo = ();950// }951952impl pallet_evm_transaction_payment::Config for Runtime {953	type EvmSponsorshipHandler = EvmSponsorshipHandler;954	type Currency = Balances;955}956957impl pallet_charge_transaction::Config for Runtime {958	type SponsorshipHandler = SponsorshipHandler;959}960961// impl pallet_contract_helpers::Config for Runtime {962//	 type DefaultSponsoringRateLimit = DefaultSponsoringRateLimit;963// }964965parameter_types! {966	// 0x842899ECF380553E8a4de75bF534cdf6fBF64049967	pub const HelpersContractAddress: H160 = H160([968		0x84, 0x28, 0x99, 0xec, 0xf3, 0x80, 0x55, 0x3e, 0x8a, 0x4d, 0xe7, 0x5b, 0xf5, 0x34, 0xcd, 0xf6, 0xfb, 0xf6, 0x40, 0x49,969	]);970		971	// 0x6c4e9fe1ae37a41e93cee429e8e1881abdcbb54f972	pub const EvmCollectionHelperAddress: H160 = H160([973		0x6c, 0x4e, 0x9f, 0xe1, 0xae, 0x37, 0xa4, 0x1e, 0x93, 0xce, 0xe4, 0x29, 0xe8, 0xe1, 0x88, 0x1a, 0xbd, 0xcb, 0xb5, 0x4f,974	]);975}976977impl pallet_evm_contract_helpers::Config for Runtime {978	type ContractAddress = HelpersContractAddress;979	type DefaultSponsoringRateLimit = DefaultSponsoringRateLimit;980}981982impl evm_collection::Config for Runtime {983	type ContractAddress = EvmCollectionHelperAddress;984}985986construct_runtime!(987	pub enum Runtime where988		Block = Block,989		NodeBlock = opaque::Block,990		UncheckedExtrinsic = UncheckedExtrinsic991	{992		ParachainSystem: cumulus_pallet_parachain_system::{Pallet, Call, Config, Storage, Inherent, Event<T>, ValidateUnsigned} = 20,993		ParachainInfo: parachain_info::{Pallet, Storage, Config} = 21,994995		Aura: pallet_aura::{Pallet, Config<T>} = 22,996		AuraExt: cumulus_pallet_aura_ext::{Pallet, Config} = 23,997998		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>} = 30,999		RandomnessCollectiveFlip: pallet_randomness_collective_flip::{Pallet, Storage} = 31,1000		Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent} = 32,1001		TransactionPayment: pallet_transaction_payment::{Pallet, Storage} = 33,1002		Treasury: pallet_treasury::{Pallet, Call, Storage, Config, Event<T>} = 34,1003		Sudo: pallet_sudo::{Pallet, Call, Storage, Config<T>, Event<T>} = 35,1004		System: frame_system::{Pallet, Call, Storage, Config, Event<T>} = 36,1005		Vesting: orml_vesting::{Pallet, Storage, Call, Event<T>, Config<T>} = 37,1006		// Vesting: pallet_vesting::{Pallet, Call, Config<T>, Storage, Event<T>} = 37,1007		// Contracts: pallet_contracts::{Pallet, Call, Storage, Event<T>} = 38,10081009		// XCM helpers.1010		XcmpQueue: cumulus_pallet_xcmp_queue::{Pallet, Call, Storage, Event<T>} = 50,1011		PolkadotXcm: pallet_xcm::{Pallet, Call, Event<T>, Origin} = 51,1012		CumulusXcm: cumulus_pallet_xcm::{Pallet, Call, Event<T>, Origin} = 52,1013		DmpQueue: cumulus_pallet_dmp_queue::{Pallet, Call, Storage, Event<T>} = 53,10141015		// Unique Pallets1016		Inflation: pallet_inflation::{Pallet, Call, Storage} = 60,1017		Unique: pallet_unique::{Pallet, Call, Storage, Event<T>} = 61,1018		// Scheduler: pallet_unq_scheduler::{Pallet, Call, Storage, Event<T>} = 62,1019		// free = 631020		Charging: pallet_charge_transaction::{Pallet, Call, Storage } = 64,1021		// ContractHelpers: pallet_contract_helpers::{Pallet, Call, Storage} = 65,1022		Common: pallet_common::{Pallet, Storage, Event<T>} = 66,1023		Fungible: pallet_fungible::{Pallet, Storage} = 67,1024		Refungible: pallet_refungible::{Pallet, Storage} = 68,1025		Nonfungible: pallet_nonfungible::{Pallet, Storage} = 69,1026		Structure: pallet_structure::{Pallet, Call, Storage, Event<T>} = 70,1027		RmrkCore: pallet_proxy_rmrk_core::{Pallet, Call, Storage, Event<T>} = 71,1028		RmrkEquip: pallet_proxy_rmrk_equip::{Pallet, Call, Storage, Event<T>} = 72,10291030		// Frontier1031		EVM: pallet_evm::{Pallet, Config, Call, Storage, Event<T>} = 100,1032		Ethereum: pallet_ethereum::{Pallet, Config, Call, Storage, Event, Origin} = 101,10331034		EvmCoderSubstrate: pallet_evm_coder_substrate::{Pallet, Storage} = 150,1035		EvmContractHelpers: pallet_evm_contract_helpers::{Pallet, Storage} = 151,1036		EvmTransactionPayment: pallet_evm_transaction_payment::{Pallet} = 152,1037		EvmMigration: pallet_evm_migration::{Pallet, Call, Storage} = 153,1038	}1039);10401041pub struct TransactionConverter;10421043impl fp_rpc::ConvertTransaction<UncheckedExtrinsic> for TransactionConverter {1044	fn convert_transaction(&self, transaction: pallet_ethereum::Transaction) -> UncheckedExtrinsic {1045		UncheckedExtrinsic::new_unsigned(1046			pallet_ethereum::Call::<Runtime>::transact { transaction }.into(),1047		)1048	}1049}10501051impl fp_rpc::ConvertTransaction<opaque::UncheckedExtrinsic> for TransactionConverter {1052	fn convert_transaction(1053		&self,1054		transaction: pallet_ethereum::Transaction,1055	) -> opaque::UncheckedExtrinsic {1056		let extrinsic = UncheckedExtrinsic::new_unsigned(1057			pallet_ethereum::Call::<Runtime>::transact { transaction }.into(),1058		);1059		let encoded = extrinsic.encode();1060		opaque::UncheckedExtrinsic::decode(&mut &encoded[..])1061			.expect("Encoded extrinsic is always valid")1062	}1063}10641065/// The address format for describing accounts.1066pub type Address = sp_runtime::MultiAddress<AccountId, ()>;1067/// Block header type as expected by this runtime.1068pub type Header = generic::Header<BlockNumber, BlakeTwo256>;1069/// Block type as expected by this runtime.1070pub type Block = generic::Block<Header, UncheckedExtrinsic>;1071/// A Block signed with a Justification1072pub type SignedBlock = generic::SignedBlock<Block>;1073/// BlockId type as expected by this runtime.1074pub type BlockId = generic::BlockId<Block>;1075/// The SignedExtension to the basic transaction logic.1076pub type SignedExtra = (1077	frame_system::CheckSpecVersion<Runtime>,1078	// system::CheckTxVersion<Runtime>,1079	frame_system::CheckGenesis<Runtime>,1080	frame_system::CheckEra<Runtime>,1081	frame_system::CheckNonce<Runtime>,1082	frame_system::CheckWeight<Runtime>,1083	pallet_charge_transaction::ChargeTransactionPayment<Runtime>,1084	//pallet_contract_helpers::ContractHelpersExtension<Runtime>,1085	pallet_ethereum::FakeTransactionFinalizer<Runtime>,1086);1087/// Unchecked extrinsic type as expected by this runtime.1088pub type UncheckedExtrinsic =1089	fp_self_contained::UncheckedExtrinsic<Address, Call, Signature, SignedExtra>;1090/// Extrinsic type that has already been checked.1091pub type CheckedExtrinsic = fp_self_contained::CheckedExtrinsic<AccountId, Call, SignedExtra, H160>;1092/// Executive: handles dispatch to the various modules.1093pub type Executive = frame_executive::Executive<1094	Runtime,1095	Block,1096	frame_system::ChainContext<Runtime>,1097	Runtime,1098	AllPalletsReversedWithSystemFirst,1099>;11001101impl_opaque_keys! {1102	pub struct SessionKeys {1103		pub aura: Aura,1104	}1105}11061107impl fp_self_contained::SelfContainedCall for Call {1108	type SignedInfo = H160;11091110	fn is_self_contained(&self) -> bool {1111		match self {1112			Call::Ethereum(call) => call.is_self_contained(),1113			_ => false,1114		}1115	}11161117	fn check_self_contained(&self) -> Option<Result<Self::SignedInfo, TransactionValidityError>> {1118		match self {1119			Call::Ethereum(call) => call.check_self_contained(),1120			_ => None,1121		}1122	}11231124	fn validate_self_contained(&self, info: &Self::SignedInfo) -> Option<TransactionValidity> {1125		match self {1126			Call::Ethereum(call) => call.validate_self_contained(info),1127			_ => None,1128		}1129	}11301131	fn pre_dispatch_self_contained(1132		&self,1133		info: &Self::SignedInfo,1134	) -> Option<Result<(), TransactionValidityError>> {1135		match self {1136			Call::Ethereum(call) => call.pre_dispatch_self_contained(info),1137			_ => None,1138		}1139	}11401141	fn apply_self_contained(1142		self,1143		info: Self::SignedInfo,1144	) -> Option<sp_runtime::DispatchResultWithInfo<PostDispatchInfoOf<Self>>> {1145		match self {1146			call @ Call::Ethereum(pallet_ethereum::Call::transact { .. }) => Some(call.dispatch(1147				Origin::from(pallet_ethereum::RawOrigin::EthereumTransaction(info)),1148			)),1149			_ => None,1150		}1151	}1152}11531154macro_rules! dispatch_unique_runtime {1155	($collection:ident.$method:ident($($name:ident),*)) => {{1156		let collection = <Runtime as pallet_common::Config>::CollectionDispatch::dispatch(<pallet_common::CollectionHandle<Runtime>>::try_get($collection)?);1157		let dispatch = collection.as_dyn();11581159		Ok::<_, DispatchError>(dispatch.$method($($name),*))1160	}};1161}11621163impl_common_runtime_apis!();11641165struct CheckInherents;11661167impl cumulus_pallet_parachain_system::CheckInherents<Block> for CheckInherents {1168	fn check_inherents(1169		block: &Block,1170		relay_state_proof: &cumulus_pallet_parachain_system::RelayChainStateProof,1171	) -> sp_inherents::CheckInherentsResult {1172		let relay_chain_slot = relay_state_proof1173			.read_slot()1174			.expect("Could not read the relay chain slot from the proof");11751176		let inherent_data =1177			cumulus_primitives_timestamp::InherentDataProvider::from_relay_chain_slot_and_duration(1178				relay_chain_slot,1179				sp_std::time::Duration::from_secs(6),1180			)1181			.create_inherent_data()1182			.expect("Could not create the timestamp inherent data");11831184		inherent_data.check_extrinsics(block)1185	}1186}11871188cumulus_pallet_parachain_system::register_validate_block!(1189	Runtime = Runtime,1190	BlockExecutor = cumulus_pallet_aura_ext::BlockExecutor::<Runtime, Executive>,1191	CheckInherents = CheckInherents,1192);
modifiedtests/src/eth/api/UniqueNFT.soldiffbeforeafterboth
--- a/tests/src/eth/api/UniqueNFT.sol
+++ b/tests/src/eth/api/UniqueNFT.sol
@@ -42,6 +42,36 @@
 	event MintingFinished();
 }
 
+// Selector: 38e33c60
+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: setLimits(string) 72cb345d
+	function setLimits(string memory limitsJson) external view;
+
+	// Selector: contractAddress() f6b4dfb4
+	function contractAddress() external view returns (address);
+}
+
 // Selector: 41369377
 interface TokenProperties is Dummy, ERC165 {
 	// Selector: setTokenPropertyPermission(string,bool,bool,bool) 222d97fa
@@ -191,24 +221,6 @@
 	function totalSupply() external view returns (uint256);
 }
 
-// Selector: 9b5e29c5
-interface CollectionProperties 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: d74d154f
 interface ERC721UniqueExtensions is Dummy, ERC165 {
 	// Selector: transfer(address,uint256) a9059cbb
@@ -240,6 +252,6 @@
 	ERC721UniqueExtensions,
 	ERC721Mintable,
 	ERC721Burnable,
-	CollectionProperties,
+	Collection,
 	TokenProperties
 {}
deletedtests/src/eth/collectionAbi.jsondiffbeforeafterboth
--- a/tests/src/eth/collectionAbi.json
+++ /dev/null
@@ -1,43 +0,0 @@
-[
-  {
-    "inputs": [],
-    "name": "confirmSponsorship",
-    "outputs": [],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "contractAddress",
-    "outputs": [{ "internalType": "address", "name": "", "type": "address" }],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      { "internalType": "string", "name": "limitsJson", "type": "string" }
-    ],
-    "name": "setLimits",
-    "outputs": [],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      { "internalType": "address", "name": "sponsor", "type": "address" }
-    ],
-    "name": "setSponsor",
-    "outputs": [],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      { "internalType": "bytes4", "name": "interfaceID", "type": "bytes4" }
-    ],
-    "name": "supportsInterface",
-    "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
-    "stateMutability": "view",
-    "type": "function"
-  }
-]
modifiedtests/src/eth/createCollection.test.tsdiffbeforeafterboth
--- a/tests/src/eth/createCollection.test.ts
+++ b/tests/src/eth/createCollection.test.ts
@@ -88,13 +88,13 @@
     const {collectionIdAddress, collectionId} = await getCollectionAddressFromResult(api, result);
     const sponsor = await createEthAccountWithBalance(api, web3);
     const collectionEvm = evmCollection(web3, owner, collectionIdAddress);
-    result = await collectionEvm.methods.setSponsor(sponsor).send();
+    result = await collectionEvm.methods.ethSetSponsor(sponsor).send();
     let collectionSub = (await getDetailedCollectionInfo(api, collectionId))!;
     expect(collectionSub.sponsorship.isUnconfirmed).to.be.true;
     expect(collectionSub.sponsorship.asUnconfirmed.toHuman()).to.be.eq(evmToAddress(sponsor));
-    await expect(collectionEvm.methods.confirmSponsorship().call()).to.be.rejectedWith('Caller is not set as sponsor');
+    await expect(collectionEvm.methods.ethConfirmSponsorship().call()).to.be.rejectedWith('Caller is not set as sponsor');
     const sponsorCollection = evmCollection(web3, sponsor, collectionIdAddress);
-    await sponsorCollection.methods.confirmSponsorship().send();
+    await sponsorCollection.methods.ethConfirmSponsorship().send();
     collectionSub = (await getDetailedCollectionInfo(api, collectionId))!;
     expect(collectionSub.sponsorship.isConfirmed).to.be.true;
     expect(collectionSub.sponsorship.asConfirmed.toHuman()).to.be.eq(evmToAddress(sponsor));
modifiedtests/src/eth/nonFungibleAbi.jsondiffbeforeafterboth
--- a/tests/src/eth/nonFungibleAbi.json
+++ b/tests/src/eth/nonFungibleAbi.json
@@ -126,6 +126,13 @@
     "type": "function"
   },
   {
+    "inputs": [],
+    "name": "contractAddress",
+    "outputs": [{ "internalType": "address", "name": "", "type": "address" }],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
     "inputs": [{ "internalType": "string", "name": "key", "type": "string" }],
     "name": "deleteCollectionProperty",
     "outputs": [],
@@ -144,6 +151,22 @@
   },
   {
     "inputs": [],
+    "name": "ethConfirmSponsorship",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      { "internalType": "address", "name": "sponsor", "type": "address" }
+    ],
+    "name": "ethSetSponsor",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [],
     "name": "finishMinting",
     "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
     "stateMutability": "nonpayable",
@@ -302,6 +325,15 @@
   },
   {
     "inputs": [
+      { "internalType": "string", "name": "limitsJson", "type": "string" }
+    ],
+    "name": "setLimits",
+    "outputs": [],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [
       { "internalType": "uint256", "name": "tokenId", "type": "uint256" },
       { "internalType": "string", "name": "key", "type": "string" },
       { "internalType": "bytes", "name": "value", "type": "bytes" }
modifiedtests/src/eth/util/helpers.tsdiffbeforeafterboth
--- a/tests/src/eth/util/helpers.ts
+++ b/tests/src/eth/util/helpers.ts
@@ -28,7 +28,7 @@
 import config from '../../config';
 import privateKey from '../../substrate/privateKey';
 import contractHelpersAbi from './contractHelpersAbi.json';
-import collectionAbi from '../collectionAbi.json';
+import collectionAbi from '../nonFungibleAbi.json';
 import collectionHelperAbi from '../collectionHelperAbi.json';
 import getBalance from '../../substrate/get-balance';
 import waitNewBlocks from '../../substrate/wait-new-blocks';