git.delta.rocks / unique-network / refs/commits / 66503d98270f

difftreelog

CORE-324 Use CrossAccountId in Runner::call

Trubnikov Sergey2022-03-29parent: #b52611d.patch.diff
in: master

17 files changed

modifiedruntime/common/src/runtime_apis.rsdiffbeforeafterboth
--- a/runtime/common/src/runtime_apis.rs
+++ b/runtime/common/src/runtime_apis.rs
@@ -181,7 +181,7 @@
                     };
 
                     <Runtime as pallet_evm::Config>::Runner::call(
-                        from,
+                        CrossAccountId::from_eth(from),
                         to,
                         data,
                         value,
@@ -215,7 +215,7 @@
                     };
 
                     <Runtime as pallet_evm::Config>::Runner::create(
-                        from,
+                        CrossAccountId::from_eth(from),
                         data,
                         value,
                         gas_limit.low_u64(),
modifiedruntime/opal/src/lib.rsdiffbeforeafterboth
--- a/runtime/opal/src/lib.rs
+++ b/runtime/opal/src/lib.rs
@@ -48,7 +48,7 @@
 };
 // A few exports that help ease life for downstream crates.
 pub use pallet_balances::Call as BalancesCall;
-pub use pallet_evm::{EnsureAddressTruncated, HashedAddressMapping, Runner};
+pub use pallet_evm::{EnsureAddressTruncated, HashedAddressMapping, Runner, account::CrossAccountId as _};
 pub use frame_support::{
 	construct_runtime, match_type,
 	dispatch::DispatchResult,
modifiedruntime/quartz/src/lib.rsdiffbeforeafterboth
before · runtime/quartz/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::{EnsureAddressTruncated, HashedAddressMapping, Runner};52pub use frame_support::{53	construct_runtime, match_type,54	dispatch::DispatchResult,55	PalletId, parameter_types, StorageValue, ConsensusEngineId,56	traits::{57		tokens::currency::Currency as CurrencyT, OnUnbalanced as OnUnbalancedT, Everything,58		Currency, ExistenceRequirement, Get, IsInVec, KeyOwnerProofSystem, LockIdentifier,59		OnUnbalanced, Randomness, FindAuthor,60	},61	weights::{62		constants::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, WEIGHT_PER_SECOND},63		DispatchClass, DispatchInfo, GetDispatchInfo, IdentityFee, Pays, PostDispatchInfo, Weight,64		WeightToFeePolynomial, WeightToFeeCoefficient, WeightToFeeCoefficients,65	},66};67use up_data_structs::*;68// use pallet_contracts::weights::WeightInfo;69// #[cfg(any(feature = "std", test))]70use frame_system::{71	self as frame_system, EnsureRoot, EnsureSigned,72	limits::{BlockWeights, BlockLength},73};74use sp_arithmetic::{75	traits::{BaseArithmetic, Unsigned},76};77use smallvec::smallvec;78use codec::{Encode, Decode};79use pallet_evm::{Account as EVMAccount, FeeCalculator, GasWeightMapping, OnMethodCall};80use fp_rpc::TransactionStatus;81use sp_runtime::{82	traits::{BlockNumberProvider, Dispatchable, PostDispatchInfoOf, Saturating},83	transaction_validity::TransactionValidityError,84	SaturatedConversion,85};8687// pub use pallet_timestamp::Call as TimestampCall;88pub use sp_consensus_aura::sr25519::AuthorityId as AuraId;8990// Polkadot imports91use pallet_xcm::XcmPassthrough;92use polkadot_parachain::primitives::Sibling;93use xcm::v1::{BodyId, Junction::*, MultiLocation, NetworkId, Junctions::*};94use xcm_builder::{95	AccountId32Aliases, AllowTopLevelPaidExecutionFrom, AllowUnpaidExecutionFrom, CurrencyAdapter,96	EnsureXcmOrigin, FixedWeightBounds, LocationInverter, NativeAsset, ParentAsSuperuser,97	RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia,98	SignedAccountId32AsNative, SignedToAccountId32, SovereignSignedViaLocation, TakeWeightCredit,99	ParentIsPreset,100};101use xcm_executor::{Config, XcmExecutor, Assets};102use sp_std::{marker::PhantomData};103104use xcm::latest::{105	//	Xcm,106	AssetId::{Concrete},107	Fungibility::Fungible as XcmFungible,108	MultiAsset,109	Error as XcmError,110};111use xcm_executor::traits::{MatchesFungible, WeightTrader};112//use xcm_executor::traits::MatchesFungible;113use sp_runtime::traits::CheckedConversion;114115use unique_runtime_common::{impl_common_runtime_apis, types::*, constants::*};116117pub const RUNTIME_NAME: &str = "Quartz";118119type CrossAccountId = pallet_evm::account::BasicCrossAccountId<Runtime>;120121impl RuntimeInstance for Runtime {122	type CrossAccountId = self::CrossAccountId;123124	type TransactionConverter = self::TransactionConverter;125126	fn get_transaction_converter() -> TransactionConverter {127		TransactionConverter128	}129}130131/// Opaque types. These are used by the CLI to instantiate machinery that don't need to know132/// the specifics of the runtime. They can then be made to be agnostic over specific formats133/// of data like extrinsics, allowing for them to continue syncing the network through upgrades134/// to even the core data structures.135pub mod opaque {136	use sp_std::prelude::*;137	use sp_runtime::impl_opaque_keys;138	use super::Aura;139140	pub use unique_runtime_common::types::*;141142	impl_opaque_keys! {143		pub struct SessionKeys {144			pub aura: Aura,145		}146	}147}148149/// This runtime version.150pub const VERSION: RuntimeVersion = RuntimeVersion {151	spec_name: create_runtime_str!(RUNTIME_NAME),152	impl_name: create_runtime_str!(RUNTIME_NAME),153	authoring_version: 1,154	spec_version: 917004,155	impl_version: 0,156	apis: RUNTIME_API_VERSIONS,157	transaction_version: 1,158	state_version: 0,159};160161#[derive(codec::Encode, codec::Decode)]162pub enum XCMPMessage<XAccountId, XBalance> {163	/// Transfer tokens to the given account from the Parachain account.164	TransferToken(XAccountId, XBalance),165}166167/// The version information used to identify this runtime when compiled natively.168#[cfg(feature = "std")]169pub fn native_version() -> NativeVersion {170	NativeVersion {171		runtime_version: VERSION,172		can_author_with: Default::default(),173	}174}175176type NegativeImbalance = <Balances as Currency<AccountId>>::NegativeImbalance;177178pub struct DealWithFees;179impl OnUnbalanced<NegativeImbalance> for DealWithFees {180	fn on_unbalanceds<B>(mut fees_then_tips: impl Iterator<Item = NegativeImbalance>) {181		if let Some(fees) = fees_then_tips.next() {182			// for fees, 100% to treasury183			let mut split = fees.ration(100, 0);184			if let Some(tips) = fees_then_tips.next() {185				// for tips, if any, 100% to treasury186				tips.ration_merge_into(100, 0, &mut split);187			}188			Treasury::on_unbalanced(split.0);189			// Author::on_unbalanced(split.1);190		}191	}192}193194parameter_types! {195	pub const BlockHashCount: BlockNumber = 2400;196	pub RuntimeBlockLength: BlockLength =197		BlockLength::max_with_normal_ratio(5 * 1024 * 1024, NORMAL_DISPATCH_RATIO);198	pub const AvailableBlockRatio: Perbill = Perbill::from_percent(75);199	pub const MaximumBlockLength: u32 = 5 * 1024 * 1024;200	pub RuntimeBlockWeights: BlockWeights = BlockWeights::builder()201		.base_block(BlockExecutionWeight::get())202		.for_class(DispatchClass::all(), |weights| {203			weights.base_extrinsic = ExtrinsicBaseWeight::get();204		})205		.for_class(DispatchClass::Normal, |weights| {206			weights.max_total = Some(NORMAL_DISPATCH_RATIO * MAXIMUM_BLOCK_WEIGHT);207		})208		.for_class(DispatchClass::Operational, |weights| {209			weights.max_total = Some(MAXIMUM_BLOCK_WEIGHT);210			// Operational transactions have some extra reserved space, so that they211			// are included even if block reached `MAXIMUM_BLOCK_WEIGHT`.212			weights.reserved = Some(213				MAXIMUM_BLOCK_WEIGHT - NORMAL_DISPATCH_RATIO * MAXIMUM_BLOCK_WEIGHT214			);215		})216		.avg_block_initialization(AVERAGE_ON_INITIALIZE_RATIO)217		.build_or_panic();218	pub const Version: RuntimeVersion = VERSION;219	pub const SS58Prefix: u8 = 255;220}221222parameter_types! {223	pub const ChainId: u64 = 8881;224}225226pub struct FixedFee;227impl FeeCalculator for FixedFee {228	fn min_gas_price() -> U256 {229		MIN_GAS_PRICE.into()230	}231}232233// Assuming slowest ethereum opcode is SSTORE, with gas price of 20000 as our worst case234// (contract, which only writes a lot of data),235// approximating on top of our real store write weight236parameter_types! {237	pub const WritesPerSecond: u64 = WEIGHT_PER_SECOND / <Runtime as frame_system::Config>::DbWeight::get().write;238	pub const GasPerSecond: u64 = WritesPerSecond::get() * 20000;239	pub const WeightPerGas: u64 = WEIGHT_PER_SECOND / GasPerSecond::get();240}241242/// Limiting EVM execution to 50% of block for substrate users and management tasks243/// EVM transaction consumes more weight than substrate's, so we can't rely on them being244/// scheduled fairly245const EVM_DISPATCH_RATIO: Perbill = Perbill::from_percent(50);246parameter_types! {247	pub BlockGasLimit: U256 = U256::from(NORMAL_DISPATCH_RATIO * EVM_DISPATCH_RATIO * MAXIMUM_BLOCK_WEIGHT / WeightPerGas::get());248}249250pub enum FixedGasWeightMapping {}251impl GasWeightMapping for FixedGasWeightMapping {252	fn gas_to_weight(gas: u64) -> Weight {253		gas.saturating_mul(WeightPerGas::get())254	}255	fn weight_to_gas(weight: Weight) -> u64 {256		weight / WeightPerGas::get()257	}258}259260impl pallet_evm::Config for Runtime {261	type BlockGasLimit = BlockGasLimit;262	type FeeCalculator = FixedFee;263	type GasWeightMapping = FixedGasWeightMapping;264	type BlockHashMapping = pallet_ethereum::EthereumBlockHashMapping<Self>;265	type CallOrigin = EnsureAddressTruncated;266	type WithdrawOrigin = EnsureAddressTruncated;267	type AddressMapping = HashedAddressMapping<Self::Hashing>;268	type PrecompilesType = ();269	type PrecompilesValue = ();270	type Currency = Balances;271	type Event = Event;272	type OnMethodCall = (273		pallet_evm_migration::OnMethodCall<Self>,274		pallet_unique::UniqueErcSupport<Self>,275		pallet_evm_contract_helpers::HelpersOnMethodCall<Self>,276	);277	type OnCreate = pallet_evm_contract_helpers::HelpersOnCreate<Self>;278	type ChainId = ChainId;279	type Runner = pallet_evm::runner::stack::Runner<Self>;280	type OnChargeTransaction = pallet_evm_transaction_payment::OnChargeTransaction<Self>;281	type TransactionValidityHack = pallet_evm_transaction_payment::TransactionValidityHack<Self>;282	type FindAuthor = EthereumFindAuthor<Aura>;283}284285impl pallet_evm_migration::Config for Runtime {286	type WeightInfo = pallet_evm_migration::weights::SubstrateWeight<Self>;287}288289pub struct EthereumFindAuthor<F>(core::marker::PhantomData<F>);290impl<F: FindAuthor<u32>> FindAuthor<H160> for EthereumFindAuthor<F> {291	fn find_author<'a, I>(digests: I) -> Option<H160>292	where293		I: 'a + IntoIterator<Item = (ConsensusEngineId, &'a [u8])>,294	{295		if let Some(author_index) = F::find_author(digests) {296			let authority_id = Aura::authorities()[author_index as usize].clone();297			return Some(H160::from_slice(&authority_id.to_raw_vec()[4..24]));298		}299		None300	}301}302303impl pallet_ethereum::Config for Runtime {304	type Event = Event;305	type StateRoot = pallet_ethereum::IntermediateStateRoot;306}307308impl pallet_randomness_collective_flip::Config for Runtime {}309310impl frame_system::Config for Runtime {311	/// The data to be stored in an account.312	type AccountData = pallet_balances::AccountData<Balance>;313	/// The identifier used to distinguish between accounts.314	type AccountId = AccountId;315	/// The basic call filter to use in dispatchable.316	type BaseCallFilter = Everything;317	/// Maximum number of block number to block hash mappings to keep (oldest pruned first).318	type BlockHashCount = BlockHashCount;319	/// The maximum length of a block (in bytes).320	type BlockLength = RuntimeBlockLength;321	/// The index type for blocks.322	type BlockNumber = BlockNumber;323	/// The weight of the overhead invoked on the block import process, independent of the extrinsics included in that block.324	type BlockWeights = RuntimeBlockWeights;325	/// The aggregated dispatch type that is available for extrinsics.326	type Call = Call;327	/// The weight of database operations that the runtime can invoke.328	type DbWeight = RocksDbWeight;329	/// The ubiquitous event type.330	type Event = Event;331	/// The type for hashing blocks and tries.332	type Hash = Hash;333	/// The hashing algorithm used.334	type Hashing = BlakeTwo256;335	/// The header type.336	type Header = generic::Header<BlockNumber, BlakeTwo256>;337	/// The index type for storing how many extrinsics an account has signed.338	type Index = Index;339	/// The lookup mechanism to get account ID from whatever is passed in dispatchers.340	type Lookup = AccountIdLookup<AccountId, ()>;341	/// What to do if an account is fully reaped from the system.342	type OnKilledAccount = ();343	/// What to do if a new account is created.344	type OnNewAccount = ();345	type OnSetCode = cumulus_pallet_parachain_system::ParachainSetCode<Self>;346	/// The ubiquitous origin type.347	type Origin = Origin;348	/// This type is being generated by `construct_runtime!`.349	type PalletInfo = PalletInfo;350	/// This is used as an identifier of the chain. 42 is the generic substrate prefix.351	type SS58Prefix = SS58Prefix;352	/// Weight information for the extrinsics of this pallet.353	type SystemWeightInfo = frame_system::weights::SubstrateWeight<Self>;354	/// Version of the runtime.355	type Version = Version;356	type MaxConsumers = ConstU32<16>;357}358359parameter_types! {360	pub const MinimumPeriod: u64 = SLOT_DURATION / 2;361}362363impl pallet_timestamp::Config for Runtime {364	/// A timestamp: milliseconds since the unix epoch.365	type Moment = u64;366	type OnTimestampSet = ();367	type MinimumPeriod = MinimumPeriod;368	type WeightInfo = ();369}370371parameter_types! {372	// pub const ExistentialDeposit: u128 = 500;373	pub const ExistentialDeposit: u128 = 0;374	pub const MaxLocks: u32 = 50;375}376377impl pallet_balances::Config for Runtime {378	type MaxLocks = MaxLocks;379	type MaxReserves = ();380	type ReserveIdentifier = [u8; 8];381	/// The type for recording an account's balance.382	type Balance = Balance;383	/// The ubiquitous event type.384	type Event = Event;385	type DustRemoval = Treasury;386	type ExistentialDeposit = ExistentialDeposit;387	type AccountStore = System;388	type WeightInfo = pallet_balances::weights::SubstrateWeight<Self>;389}390391pub const fn deposit(items: u32, bytes: u32) -> Balance {392	items as Balance * 15 * CENTIUNIQUE + (bytes as Balance) * 6 * CENTIUNIQUE393}394395/*396parameter_types! {397	pub TombstoneDeposit: Balance = deposit(398		1,399		sp_std::mem::size_of::<pallet_contracts::Pallet<Runtime>> as u32,400	);401	pub DepositPerContract: Balance = TombstoneDeposit::get();402	pub const DepositPerStorageByte: Balance = deposit(0, 1);403	pub const DepositPerStorageItem: Balance = deposit(1, 0);404	pub RentFraction: Perbill = Perbill::from_rational(1u32, 30 * DAYS);405	pub const SurchargeReward: Balance = 150 * MILLIUNIQUE;406	pub const SignedClaimHandicap: u32 = 2;407	pub const MaxDepth: u32 = 32;408	pub const MaxValueSize: u32 = 16 * 1024;409	pub const MaxCodeSize: u32 = 1024 * 1024 * 25; // 25 Mb410	// The lazy deletion runs inside on_initialize.411	pub DeletionWeightLimit: Weight = AVERAGE_ON_INITIALIZE_RATIO *412		RuntimeBlockWeights::get().max_block;413	// The weight needed for decoding the queue should be less or equal than a fifth414	// of the overall weight dedicated to the lazy deletion.415	pub DeletionQueueDepth: u32 = ((DeletionWeightLimit::get() / (416			<Runtime as pallet_contracts::Config>::WeightInfo::on_initialize_per_queue_item(1) -417			<Runtime as pallet_contracts::Config>::WeightInfo::on_initialize_per_queue_item(0)418		)) / 5) as u32;419	pub Schedule: pallet_contracts::Schedule<Runtime> = Default::default();420}421422impl pallet_contracts::Config for Runtime {423	type Time = Timestamp;424	type Randomness = RandomnessCollectiveFlip;425	type Currency = Balances;426	type Event = Event;427	type RentPayment = ();428	type SignedClaimHandicap = SignedClaimHandicap;429	type TombstoneDeposit = TombstoneDeposit;430	type DepositPerContract = DepositPerContract;431	type DepositPerStorageByte = DepositPerStorageByte;432	type DepositPerStorageItem = DepositPerStorageItem;433	type RentFraction = RentFraction;434	type SurchargeReward = SurchargeReward;435	type WeightPrice = pallet_transaction_payment::Pallet<Self>;436	type WeightInfo = pallet_contracts::weights::SubstrateWeight<Self>;437	type ChainExtension = NFTExtension;438	type DeletionQueueDepth = DeletionQueueDepth;439	type DeletionWeightLimit = DeletionWeightLimit;440	type Schedule = Schedule;441	type CallStack = [pallet_contracts::Frame<Self>; 31];442}443*/444445parameter_types! {446	/// This value increases the priority of `Operational` transactions by adding447	/// a "virtual tip" that's equal to the `OperationalFeeMultiplier * final_fee`.448	pub const OperationalFeeMultiplier: u8 = 5;449}450451/// Linear implementor of `WeightToFeePolynomial`452pub struct LinearFee<T>(sp_std::marker::PhantomData<T>);453454impl<T> WeightToFeePolynomial for LinearFee<T>455where456	T: BaseArithmetic + From<u32> + Copy + Unsigned,457{458	type Balance = T;459460	fn polynomial() -> WeightToFeeCoefficients<Self::Balance> {461		smallvec!(WeightToFeeCoefficient {462			// Targeting 0.1 Unique per NFT transfer463			coeff_integer: WEIGHT_TO_FEE_COEFF.into(),464			coeff_frac: Perbill::zero(),465			negative: false,466			degree: 1,467		})468	}469}470471impl pallet_transaction_payment::Config for Runtime {472	type OnChargeTransaction = pallet_transaction_payment::CurrencyAdapter<Balances, DealWithFees>;473	type TransactionByteFee = TransactionByteFee;474	type OperationalFeeMultiplier = OperationalFeeMultiplier;475	type WeightToFee = LinearFee<Balance>;476	type FeeMultiplierUpdate = ();477}478479parameter_types! {480	pub const ProposalBond: Permill = Permill::from_percent(5);481	pub const ProposalBondMinimum: Balance = 1 * UNIQUE;482	pub const ProposalBondMaximum: Balance = 1000 * UNIQUE;483	pub const SpendPeriod: BlockNumber = 5 * MINUTES;484	pub const Burn: Permill = Permill::from_percent(0);485	pub const TipCountdown: BlockNumber = 1 * DAYS;486	pub const TipFindersFee: Percent = Percent::from_percent(20);487	pub const TipReportDepositBase: Balance = 1 * UNIQUE;488	pub const DataDepositPerByte: Balance = 1 * CENTIUNIQUE;489	pub const BountyDepositBase: Balance = 1 * UNIQUE;490	pub const BountyDepositPayoutDelay: BlockNumber = 1 * DAYS;491	pub const TreasuryModuleId: PalletId = PalletId(*b"py/trsry");492	pub const BountyUpdatePeriod: BlockNumber = 14 * DAYS;493	pub const MaximumReasonLength: u32 = 16384;494	pub const BountyCuratorDeposit: Permill = Permill::from_percent(50);495	pub const BountyValueMinimum: Balance = 5 * UNIQUE;496	pub const MaxApprovals: u32 = 100;497}498499impl pallet_treasury::Config for Runtime {500	type PalletId = TreasuryModuleId;501	type Currency = Balances;502	type ApproveOrigin = EnsureRoot<AccountId>;503	type RejectOrigin = EnsureRoot<AccountId>;504	type Event = Event;505	type OnSlash = ();506	type ProposalBond = ProposalBond;507	type ProposalBondMinimum = ProposalBondMinimum;508	type ProposalBondMaximum = ProposalBondMaximum;509	type SpendPeriod = SpendPeriod;510	type Burn = Burn;511	type BurnDestination = ();512	type SpendFunds = ();513	type WeightInfo = pallet_treasury::weights::SubstrateWeight<Self>;514	type MaxApprovals = MaxApprovals;515}516517impl pallet_sudo::Config for Runtime {518	type Event = Event;519	type Call = Call;520}521522pub struct RelayChainBlockNumberProvider<T>(sp_std::marker::PhantomData<T>);523524impl<T: cumulus_pallet_parachain_system::Config> BlockNumberProvider525	for RelayChainBlockNumberProvider<T>526{527	type BlockNumber = BlockNumber;528529	fn current_block_number() -> Self::BlockNumber {530		cumulus_pallet_parachain_system::Pallet::<T>::validation_data()531			.map(|d| d.relay_parent_number)532			.unwrap_or_default()533	}534}535536parameter_types! {537	pub const MinVestedTransfer: Balance = 10 * UNIQUE;538	pub const MaxVestingSchedules: u32 = 28;539}540541impl orml_vesting::Config for Runtime {542	type Event = Event;543	type Currency = pallet_balances::Pallet<Runtime>;544	type MinVestedTransfer = MinVestedTransfer;545	type VestedTransferOrigin = EnsureSigned<AccountId>;546	type WeightInfo = ();547	type MaxVestingSchedules = MaxVestingSchedules;548	type BlockNumberProvider = RelayChainBlockNumberProvider<Runtime>;549}550551parameter_types! {552	pub const ReservedDmpWeight: Weight = MAXIMUM_BLOCK_WEIGHT / 4;553	pub const ReservedXcmpWeight: Weight = MAXIMUM_BLOCK_WEIGHT / 4;554}555556impl cumulus_pallet_parachain_system::Config for Runtime {557	type Event = Event;558	type SelfParaId = parachain_info::Pallet<Self>;559	type OnSystemEvent = ();560	// type DownwardMessageHandlers = cumulus_primitives_utility::UnqueuedDmpAsParent<561	// 	MaxDownwardMessageWeight,562	// 	XcmExecutor<XcmConfig>,563	// 	Call,564	// >;565	type OutboundXcmpMessageSource = XcmpQueue;566	type DmpMessageHandler = DmpQueue;567	type ReservedDmpWeight = ReservedDmpWeight;568	type ReservedXcmpWeight = ReservedXcmpWeight;569	type XcmpMessageHandler = XcmpQueue;570}571572impl parachain_info::Config for Runtime {}573574impl cumulus_pallet_aura_ext::Config for Runtime {}575576parameter_types! {577	pub const RelayLocation: MultiLocation = MultiLocation::parent();578	pub const RelayNetwork: NetworkId = NetworkId::Polkadot;579	pub RelayOrigin: Origin = cumulus_pallet_xcm::Origin::Relay.into();580	pub Ancestry: MultiLocation = Parachain(ParachainInfo::parachain_id().into()).into();581}582583/// Type for specifying how a `MultiLocation` can be converted into an `AccountId`. This is used584/// when determining ownership of accounts for asset transacting and when attempting to use XCM585/// `Transact` in order to determine the dispatch Origin.586pub type LocationToAccountId = (587	// The parent (Relay-chain) origin converts to the default `AccountId`.588	ParentIsPreset<AccountId>,589	// Sibling parachain origins convert to AccountId via the `ParaId::into`.590	SiblingParachainConvertsVia<Sibling, AccountId>,591	// Straight up local `AccountId32` origins just alias directly to `AccountId`.592	AccountId32Aliases<RelayNetwork, AccountId>,593);594595pub struct OnlySelfCurrency;596impl<B: TryFrom<u128>> MatchesFungible<B> for OnlySelfCurrency {597	fn matches_fungible(a: &MultiAsset) -> Option<B> {598		match (&a.id, &a.fun) {599			(Concrete(_), XcmFungible(ref amount)) => CheckedConversion::checked_from(*amount),600			_ => None,601		}602	}603}604605/// Means for transacting assets on this chain.606pub type LocalAssetTransactor = CurrencyAdapter<607	// Use this currency:608	Balances,609	// Use this currency when it is a fungible asset matching the given location or name:610	OnlySelfCurrency,611	// Do a simple punn to convert an AccountId32 MultiLocation into a native chain account ID:612	LocationToAccountId,613	// Our chain's account ID type (we can't get away without mentioning it explicitly):614	AccountId,615	// We don't track any teleports.616	(),617>;618619/// This is the type we use to convert an (incoming) XCM origin into a local `Origin` instance,620/// ready for dispatching a transaction with Xcm's `Transact`. There is an `OriginKind` which can621/// biases the kind of local `Origin` it will become.622pub type XcmOriginToTransactDispatchOrigin = (623	// Sovereign account converter; this attempts to derive an `AccountId` from the origin location624	// using `LocationToAccountId` and then turn that into the usual `Signed` origin. Useful for625	// foreign chains who want to have a local sovereign account on this chain which they control.626	SovereignSignedViaLocation<LocationToAccountId, Origin>,627	// Native converter for Relay-chain (Parent) location; will converts to a `Relay` origin when628	// recognised.629	RelayChainAsNative<RelayOrigin, Origin>,630	// Native converter for sibling Parachains; will convert to a `SiblingPara` origin when631	// recognised.632	SiblingParachainAsNative<cumulus_pallet_xcm::Origin, Origin>,633	// Superuser converter for the Relay-chain (Parent) location. This will allow it to issue a634	// transaction from the Root origin.635	ParentAsSuperuser<Origin>,636	// Native signed account converter; this just converts an `AccountId32` origin into a normal637	// `Origin::Signed` origin of the same 32-byte value.638	SignedAccountId32AsNative<RelayNetwork, Origin>,639	// Xcm origins can be represented natively under the Xcm pallet's Xcm origin.640	XcmPassthrough<Origin>,641);642643parameter_types! {644	// One XCM operation is 1_000_000 weight - almost certainly a conservative estimate.645	pub UnitWeightCost: Weight = 1_000_000;646	// 1200 UNIQUEs buy 1 second of weight.647	pub const WeightPrice: (MultiLocation, u128) = (MultiLocation::parent(), 1_200 * UNIQUE);648	pub const MaxInstructions: u32 = 100;649	pub const MaxAuthorities: u32 = 100_000;650}651652match_type! {653	pub type ParentOrParentsUnitPlurality: impl Contains<MultiLocation> = {654		MultiLocation { parents: 1, interior: Here } |655		MultiLocation { parents: 1, interior: X1(Plurality { id: BodyId::Unit, .. }) }656	};657}658659pub type Barrier = (660	TakeWeightCredit,661	AllowTopLevelPaidExecutionFrom<Everything>,662	AllowUnpaidExecutionFrom<ParentOrParentsUnitPlurality>,663	// ^^^ Parent & its unit plurality gets free execution664);665666pub struct UsingOnlySelfCurrencyComponents<667	WeightToFee: WeightToFeePolynomial<Balance = Currency::Balance>,668	AssetId: Get<MultiLocation>,669	AccountId,670	Currency: CurrencyT<AccountId>,671	OnUnbalanced: OnUnbalancedT<Currency::NegativeImbalance>,672>(673	Weight,674	Currency::Balance,675	PhantomData<(WeightToFee, AssetId, AccountId, Currency, OnUnbalanced)>,676);677impl<678		WeightToFee: WeightToFeePolynomial<Balance = Currency::Balance>,679		AssetId: Get<MultiLocation>,680		AccountId,681		Currency: CurrencyT<AccountId>,682		OnUnbalanced: OnUnbalancedT<Currency::NegativeImbalance>,683	> WeightTrader684	for UsingOnlySelfCurrencyComponents<WeightToFee, AssetId, AccountId, Currency, OnUnbalanced>685{686	fn new() -> Self {687		Self(0, Zero::zero(), PhantomData)688	}689690	fn buy_weight(&mut self, weight: Weight, payment: Assets) -> Result<Assets, XcmError> {691		let amount = WeightToFee::calc(&weight);692		let u128_amount: u128 = amount.try_into().map_err(|_| XcmError::Overflow)?;693694		// location to this parachain through relay chain695		let option1: xcm::v1::AssetId = Concrete(MultiLocation {696			parents: 1,697			interior: X1(Parachain(ParachainInfo::parachain_id().into())),698		});699		// direct location700		let option2: xcm::v1::AssetId = Concrete(MultiLocation {701			parents: 0,702			interior: Here,703		});704705		let required = if payment.fungible.contains_key(&option1) {706			(option1, u128_amount).into()707		} else if payment.fungible.contains_key(&option2) {708			(option2, u128_amount).into()709		} else {710			(Concrete(MultiLocation::default()), u128_amount).into()711		};712713		let unused = payment714			.checked_sub(required)715			.map_err(|_| XcmError::TooExpensive)?;716		self.0 = self.0.saturating_add(weight);717		self.1 = self.1.saturating_add(amount);718		Ok(unused)719	}720721	fn refund_weight(&mut self, weight: Weight) -> Option<MultiAsset> {722		let weight = weight.min(self.0);723		let amount = WeightToFee::calc(&weight);724		self.0 -= weight;725		self.1 = self.1.saturating_sub(amount);726		let amount: u128 = amount.saturated_into();727		if amount > 0 {728			Some((AssetId::get(), amount).into())729		} else {730			None731		}732	}733}734impl<735		WeightToFee: WeightToFeePolynomial<Balance = Currency::Balance>,736		AssetId: Get<MultiLocation>,737		AccountId,738		Currency: CurrencyT<AccountId>,739		OnUnbalanced: OnUnbalancedT<Currency::NegativeImbalance>,740	> Drop741	for UsingOnlySelfCurrencyComponents<WeightToFee, AssetId, AccountId, Currency, OnUnbalanced>742{743	fn drop(&mut self) {744		OnUnbalanced::on_unbalanced(Currency::issue(self.1));745	}746}747748pub struct XcmConfig;749impl Config for XcmConfig {750	type Call = Call;751	type XcmSender = XcmRouter;752	// How to withdraw and deposit an asset.753	type AssetTransactor = LocalAssetTransactor;754	type OriginConverter = XcmOriginToTransactDispatchOrigin;755	type IsReserve = NativeAsset;756	type IsTeleporter = (); // Teleportation is disabled757	type LocationInverter = LocationInverter<Ancestry>;758	type Barrier = Barrier;759	type Weigher = FixedWeightBounds<UnitWeightCost, Call, MaxInstructions>;760	type Trader = UsingOnlySelfCurrencyComponents<761		IdentityFee<Balance>,762		RelayLocation,763		AccountId,764		Balances,765		(),766	>;767	type ResponseHandler = (); // Don't handle responses for now.768	type SubscriptionService = PolkadotXcm;769770	type AssetTrap = PolkadotXcm;771	type AssetClaims = PolkadotXcm;772}773774// parameter_types! {775// 	pub const MaxDownwardMessageWeight: Weight = MAXIMUM_BLOCK_WEIGHT / 10;776// }777778/// No local origins on this chain are allowed to dispatch XCM sends/executions.779pub type LocalOriginToLocation = (SignedToAccountId32<Origin, AccountId, RelayNetwork>,);780781/// The means for routing XCM messages which are not for local execution into the right message782/// queues.783pub type XcmRouter = (784	// Two routers - use UMP to communicate with the relay chain:785	cumulus_primitives_utility::ParentAsUmp<ParachainSystem, ()>,786	// ..and XCMP to communicate with the sibling chains.787	XcmpQueue,788);789790impl pallet_evm_coder_substrate::Config for Runtime {791	type EthereumTransactionSender = pallet_ethereum::Pallet<Self>;792	type GasWeightMapping = FixedGasWeightMapping;793}794795impl pallet_xcm::Config for Runtime {796	type Event = Event;797	type SendXcmOrigin = EnsureXcmOrigin<Origin, LocalOriginToLocation>;798	type XcmRouter = XcmRouter;799	type ExecuteXcmOrigin = EnsureXcmOrigin<Origin, LocalOriginToLocation>;800	type XcmExecuteFilter = Everything;801	type XcmExecutor = XcmExecutor<XcmConfig>;802	type XcmTeleportFilter = Everything;803	type XcmReserveTransferFilter = Everything;804	type Weigher = FixedWeightBounds<UnitWeightCost, Call, MaxInstructions>;805	type LocationInverter = LocationInverter<Ancestry>;806	type Origin = Origin;807	type Call = Call;808	const VERSION_DISCOVERY_QUEUE_SIZE: u32 = 100;809	type AdvertisedXcmVersion = pallet_xcm::CurrentXcmVersion;810}811812impl cumulus_pallet_xcm::Config for Runtime {813	type Event = Event;814	type XcmExecutor = XcmExecutor<XcmConfig>;815}816817impl cumulus_pallet_xcmp_queue::Config for Runtime {818	type WeightInfo = ();819	type Event = Event;820	type XcmExecutor = XcmExecutor<XcmConfig>;821	type ChannelInfo = ParachainSystem;822	type VersionWrapper = ();823	type ExecuteOverweightOrigin = frame_system::EnsureRoot<AccountId>;824	type ControllerOrigin = EnsureRoot<AccountId>;825	type ControllerOriginConverter = XcmOriginToTransactDispatchOrigin;826}827828impl cumulus_pallet_dmp_queue::Config for Runtime {829	type Event = Event;830	type XcmExecutor = XcmExecutor<XcmConfig>;831	type ExecuteOverweightOrigin = frame_system::EnsureRoot<AccountId>;832}833834impl pallet_aura::Config for Runtime {835	type AuthorityId = AuraId;836	type DisabledValidators = ();837	type MaxAuthorities = MaxAuthorities;838}839840parameter_types! {841	pub TreasuryAccountId: AccountId = TreasuryModuleId::get().into_account();842	pub const CollectionCreationPrice: Balance = 2 * UNIQUE;843}844845impl pallet_common::Config for Runtime {846	type Event = Event;847848	type Currency = Balances;849	type CollectionCreationPrice = CollectionCreationPrice;850	type TreasuryAccountId = TreasuryAccountId;851}852853impl pallet_evm::account::Config for Runtime {854	type CrossAccountId = pallet_evm::account::BasicCrossAccountId<Self>;855	type EvmAddressMapping = HashedAddressMapping<Self::Hashing>;856	type EvmBackwardsAddressMapping = fp_evm_mapping::MapBackwardsAddressTruncated;857}858859impl pallet_fungible::Config for Runtime {860	type WeightInfo = pallet_fungible::weights::SubstrateWeight<Self>;861}862impl pallet_refungible::Config for Runtime {863	type WeightInfo = pallet_refungible::weights::SubstrateWeight<Self>;864}865impl pallet_nonfungible::Config for Runtime {866	type WeightInfo = pallet_nonfungible::weights::SubstrateWeight<Self>;867}868869impl pallet_unique::Config for Runtime {870	type Event = Event;871	type WeightInfo = pallet_unique::weights::SubstrateWeight<Self>;872}873874parameter_types! {875	pub const InflationBlockInterval: BlockNumber = 100; // every time per how many blocks inflation is applied876}877878/// Used for the pallet inflation879impl pallet_inflation::Config for Runtime {880	type Currency = Balances;881	type TreasuryAccountId = TreasuryAccountId;882	type InflationBlockInterval = InflationBlockInterval;883	type BlockNumberProvider = RelayChainBlockNumberProvider<Runtime>;884}885886// parameter_types! {887// 	pub MaximumSchedulerWeight: Weight = Perbill::from_percent(50) *888// 		RuntimeBlockWeights::get().max_block;889// 	pub const MaxScheduledPerBlock: u32 = 50;890// }891892type EvmSponsorshipHandler = (893	pallet_unique::UniqueEthSponsorshipHandler<Runtime>,894	pallet_evm_contract_helpers::HelpersContractSponsoring<Runtime>,895);896type SponsorshipHandler = (897	pallet_unique::UniqueSponsorshipHandler<Runtime>,898	//pallet_contract_helpers::ContractSponsorshipHandler<Runtime>,899	pallet_evm_transaction_payment::BridgeSponsorshipHandler<Runtime>,900);901902// impl pallet_unq_scheduler::Config for Runtime {903// 	type Event = Event;904// 	type Origin = Origin;905// 	type PalletsOrigin = OriginCaller;906// 	type Call = Call;907// 	type MaximumWeight = MaximumSchedulerWeight;908// 	type ScheduleOrigin = EnsureSigned<AccountId>;909// 	type MaxScheduledPerBlock = MaxScheduledPerBlock;910// 	type SponsorshipHandler = SponsorshipHandler;911// 	type WeightInfo = ();912// }913914impl pallet_evm_transaction_payment::Config for Runtime {915	type EvmSponsorshipHandler = EvmSponsorshipHandler;916	type Currency = Balances;917}918919impl pallet_charge_transaction::Config for Runtime {920	type SponsorshipHandler = SponsorshipHandler;921}922923// impl pallet_contract_helpers::Config for Runtime {924//	 type DefaultSponsoringRateLimit = DefaultSponsoringRateLimit;925// }926927parameter_types! {928	// 0x842899ECF380553E8a4de75bF534cdf6fBF64049929	pub const HelpersContractAddress: H160 = H160([930		0x84, 0x28, 0x99, 0xec, 0xf3, 0x80, 0x55, 0x3e, 0x8a, 0x4d, 0xe7, 0x5b, 0xf5, 0x34, 0xcd, 0xf6, 0xfb, 0xf6, 0x40, 0x49,931	]);932}933934impl pallet_evm_contract_helpers::Config for Runtime {935	type ContractAddress = HelpersContractAddress;936	type DefaultSponsoringRateLimit = DefaultSponsoringRateLimit;937}938939construct_runtime!(940	pub enum Runtime where941		Block = Block,942		NodeBlock = opaque::Block,943		UncheckedExtrinsic = UncheckedExtrinsic944	{945		ParachainSystem: cumulus_pallet_parachain_system::{Pallet, Call, Config, Storage, Inherent, Event<T>, ValidateUnsigned} = 20,946		ParachainInfo: parachain_info::{Pallet, Storage, Config} = 21,947948		Aura: pallet_aura::{Pallet, Config<T>} = 22,949		AuraExt: cumulus_pallet_aura_ext::{Pallet, Config} = 23,950951		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>} = 30,952		RandomnessCollectiveFlip: pallet_randomness_collective_flip::{Pallet, Storage} = 31,953		Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent} = 32,954		TransactionPayment: pallet_transaction_payment::{Pallet, Storage} = 33,955		Treasury: pallet_treasury::{Pallet, Call, Storage, Config, Event<T>} = 34,956		Sudo: pallet_sudo::{Pallet, Call, Storage, Config<T>, Event<T>} = 35,957		System: frame_system::{Pallet, Call, Storage, Config, Event<T>} = 36,958		Vesting: orml_vesting::{Pallet, Storage, Call, Event<T>, Config<T>} = 37,959		// Vesting: pallet_vesting::{Pallet, Call, Config<T>, Storage, Event<T>} = 37,960		// Contracts: pallet_contracts::{Pallet, Call, Storage, Event<T>} = 38,961962		// XCM helpers.963		XcmpQueue: cumulus_pallet_xcmp_queue::{Pallet, Call, Storage, Event<T>} = 50,964		PolkadotXcm: pallet_xcm::{Pallet, Call, Event<T>, Origin} = 51,965		CumulusXcm: cumulus_pallet_xcm::{Pallet, Call, Event<T>, Origin} = 52,966		DmpQueue: cumulus_pallet_dmp_queue::{Pallet, Call, Storage, Event<T>} = 53,967968		// Unique Pallets969		Inflation: pallet_inflation::{Pallet, Call, Storage} = 60,970		Unique: pallet_unique::{Pallet, Call, Storage, Event<T>} = 61,971		// Scheduler: pallet_unq_scheduler::{Pallet, Call, Storage, Event<T>} = 62,972		// free = 63973		Charging: pallet_charge_transaction::{Pallet, Call, Storage } = 64,974		// ContractHelpers: pallet_contract_helpers::{Pallet, Call, Storage} = 65,975		Common: pallet_common::{Pallet, Storage, Event<T>} = 66,976		Fungible: pallet_fungible::{Pallet, Storage} = 67,977		Refungible: pallet_refungible::{Pallet, Storage} = 68,978		Nonfungible: pallet_nonfungible::{Pallet, Storage} = 69,979980		// Frontier981		EVM: pallet_evm::{Pallet, Config, Call, Storage, Event<T>} = 100,982		Ethereum: pallet_ethereum::{Pallet, Config, Call, Storage, Event, Origin} = 101,983984		EvmCoderSubstrate: pallet_evm_coder_substrate::{Pallet, Storage} = 150,985		EvmContractHelpers: pallet_evm_contract_helpers::{Pallet, Storage} = 151,986		EvmTransactionPayment: pallet_evm_transaction_payment::{Pallet} = 152,987		EvmMigration: pallet_evm_migration::{Pallet, Call, Storage} = 153,988	}989);990991pub struct TransactionConverter;992993impl fp_rpc::ConvertTransaction<UncheckedExtrinsic> for TransactionConverter {994	fn convert_transaction(&self, transaction: pallet_ethereum::Transaction) -> UncheckedExtrinsic {995		UncheckedExtrinsic::new_unsigned(996			pallet_ethereum::Call::<Runtime>::transact { transaction }.into(),997		)998	}999}10001001impl fp_rpc::ConvertTransaction<opaque::UncheckedExtrinsic> for TransactionConverter {1002	fn convert_transaction(1003		&self,1004		transaction: pallet_ethereum::Transaction,1005	) -> opaque::UncheckedExtrinsic {1006		let extrinsic = UncheckedExtrinsic::new_unsigned(1007			pallet_ethereum::Call::<Runtime>::transact { transaction }.into(),1008		);1009		let encoded = extrinsic.encode();1010		opaque::UncheckedExtrinsic::decode(&mut &encoded[..])1011			.expect("Encoded extrinsic is always valid")1012	}1013}10141015/// The address format for describing accounts.1016pub type Address = sp_runtime::MultiAddress<AccountId, ()>;1017/// Block header type as expected by this runtime.1018pub type Header = generic::Header<BlockNumber, BlakeTwo256>;1019/// Block type as expected by this runtime.1020pub type Block = generic::Block<Header, UncheckedExtrinsic>;1021/// A Block signed with a Justification1022pub type SignedBlock = generic::SignedBlock<Block>;1023/// BlockId type as expected by this runtime.1024pub type BlockId = generic::BlockId<Block>;1025/// The SignedExtension to the basic transaction logic.1026pub type SignedExtra = (1027	frame_system::CheckSpecVersion<Runtime>,1028	// system::CheckTxVersion<Runtime>,1029	frame_system::CheckGenesis<Runtime>,1030	frame_system::CheckEra<Runtime>,1031	frame_system::CheckNonce<Runtime>,1032	frame_system::CheckWeight<Runtime>,1033	pallet_charge_transaction::ChargeTransactionPayment<Runtime>,1034	//pallet_contract_helpers::ContractHelpersExtension<Runtime>,1035);1036/// Unchecked extrinsic type as expected by this runtime.1037pub type UncheckedExtrinsic =1038	fp_self_contained::UncheckedExtrinsic<Address, Call, Signature, SignedExtra>;1039/// Extrinsic type that has already been checked.1040pub type CheckedExtrinsic = fp_self_contained::CheckedExtrinsic<AccountId, Call, SignedExtra, H160>;1041/// Executive: handles dispatch to the various modules.1042pub type Executive = frame_executive::Executive<1043	Runtime,1044	Block,1045	frame_system::ChainContext<Runtime>,1046	Runtime,1047	AllPalletsReversedWithSystemFirst,1048>;10491050impl_opaque_keys! {1051	pub struct SessionKeys {1052		pub aura: Aura,1053	}1054}10551056impl fp_self_contained::SelfContainedCall for Call {1057	type SignedInfo = H160;10581059	fn is_self_contained(&self) -> bool {1060		match self {1061			Call::Ethereum(call) => call.is_self_contained(),1062			_ => false,1063		}1064	}10651066	fn check_self_contained(&self) -> Option<Result<Self::SignedInfo, TransactionValidityError>> {1067		match self {1068			Call::Ethereum(call) => call.check_self_contained(),1069			_ => None,1070		}1071	}10721073	fn validate_self_contained(&self, info: &Self::SignedInfo) -> Option<TransactionValidity> {1074		match self {1075			Call::Ethereum(call) => call.validate_self_contained(info),1076			_ => None,1077		}1078	}10791080	fn pre_dispatch_self_contained(1081		&self,1082		info: &Self::SignedInfo,1083	) -> Option<Result<(), TransactionValidityError>> {1084		match self {1085			Call::Ethereum(call) => call.pre_dispatch_self_contained(info),1086			_ => None,1087		}1088	}10891090	fn apply_self_contained(1091		self,1092		info: Self::SignedInfo,1093	) -> Option<sp_runtime::DispatchResultWithInfo<PostDispatchInfoOf<Self>>> {1094		match self {1095			call @ Call::Ethereum(pallet_ethereum::Call::transact { .. }) => Some(call.dispatch(1096				Origin::from(pallet_ethereum::RawOrigin::EthereumTransaction(info)),1097			)),1098			_ => None,1099		}1100	}1101}11021103macro_rules! dispatch_unique_runtime {1104	($collection:ident.$method:ident($($name:ident),*)) => {{1105		use pallet_unique::dispatch::Dispatched;11061107		let collection = Dispatched::dispatch(<pallet_common::CollectionHandle<Runtime>>::try_get($collection)?);1108		let dispatch = collection.as_dyn();11091110		Ok(dispatch.$method($($name),*))1111	}};1112}11131114impl_common_runtime_apis!();11151116struct CheckInherents;11171118impl cumulus_pallet_parachain_system::CheckInherents<Block> for CheckInherents {1119	fn check_inherents(1120		block: &Block,1121		relay_state_proof: &cumulus_pallet_parachain_system::RelayChainStateProof,1122	) -> sp_inherents::CheckInherentsResult {1123		let relay_chain_slot = relay_state_proof1124			.read_slot()1125			.expect("Could not read the relay chain slot from the proof");11261127		let inherent_data =1128			cumulus_primitives_timestamp::InherentDataProvider::from_relay_chain_slot_and_duration(1129				relay_chain_slot,1130				sp_std::time::Duration::from_secs(6),1131			)1132			.create_inherent_data()1133			.expect("Could not create the timestamp inherent data");11341135		inherent_data.check_extrinsics(block)1136	}1137}11381139cumulus_pallet_parachain_system::register_validate_block!(1140	Runtime = Runtime,1141	BlockExecutor = cumulus_pallet_aura_ext::BlockExecutor::<Runtime, Executive>,1142	CheckInherents = CheckInherents,1143);
after · runtime/quartz/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::{EnsureAddressTruncated, HashedAddressMapping, Runner, account::CrossAccountId as _};52pub use frame_support::{53	construct_runtime, match_type,54	dispatch::DispatchResult,55	PalletId, parameter_types, StorageValue, ConsensusEngineId,56	traits::{57		tokens::currency::Currency as CurrencyT, OnUnbalanced as OnUnbalancedT, Everything,58		Currency, ExistenceRequirement, Get, IsInVec, KeyOwnerProofSystem, LockIdentifier,59		OnUnbalanced, Randomness, FindAuthor,60	},61	weights::{62		constants::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, WEIGHT_PER_SECOND},63		DispatchClass, DispatchInfo, GetDispatchInfo, IdentityFee, Pays, PostDispatchInfo, Weight,64		WeightToFeePolynomial, WeightToFeeCoefficient, WeightToFeeCoefficients,65	},66};67use up_data_structs::*;68// use pallet_contracts::weights::WeightInfo;69// #[cfg(any(feature = "std", test))]70use frame_system::{71	self as frame_system, EnsureRoot, EnsureSigned,72	limits::{BlockWeights, BlockLength},73};74use sp_arithmetic::{75	traits::{BaseArithmetic, Unsigned},76};77use smallvec::smallvec;78use codec::{Encode, Decode};79use pallet_evm::{Account as EVMAccount, FeeCalculator, GasWeightMapping, OnMethodCall};80use fp_rpc::TransactionStatus;81use sp_runtime::{82	traits::{BlockNumberProvider, Dispatchable, PostDispatchInfoOf, Saturating},83	transaction_validity::TransactionValidityError,84	SaturatedConversion,85};8687// pub use pallet_timestamp::Call as TimestampCall;88pub use sp_consensus_aura::sr25519::AuthorityId as AuraId;8990// Polkadot imports91use pallet_xcm::XcmPassthrough;92use polkadot_parachain::primitives::Sibling;93use xcm::v1::{BodyId, Junction::*, MultiLocation, NetworkId, Junctions::*};94use xcm_builder::{95	AccountId32Aliases, AllowTopLevelPaidExecutionFrom, AllowUnpaidExecutionFrom, CurrencyAdapter,96	EnsureXcmOrigin, FixedWeightBounds, LocationInverter, NativeAsset, ParentAsSuperuser,97	RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia,98	SignedAccountId32AsNative, SignedToAccountId32, SovereignSignedViaLocation, TakeWeightCredit,99	ParentIsPreset,100};101use xcm_executor::{Config, XcmExecutor, Assets};102use sp_std::{marker::PhantomData};103104use xcm::latest::{105	//	Xcm,106	AssetId::{Concrete},107	Fungibility::Fungible as XcmFungible,108	MultiAsset,109	Error as XcmError,110};111use xcm_executor::traits::{MatchesFungible, WeightTrader};112//use xcm_executor::traits::MatchesFungible;113use sp_runtime::traits::CheckedConversion;114115use unique_runtime_common::{impl_common_runtime_apis, types::*, constants::*};116117pub const RUNTIME_NAME: &str = "Quartz";118119type CrossAccountId = pallet_evm::account::BasicCrossAccountId<Runtime>;120121impl RuntimeInstance for Runtime {122	type CrossAccountId = self::CrossAccountId;123124	type TransactionConverter = self::TransactionConverter;125126	fn get_transaction_converter() -> TransactionConverter {127		TransactionConverter128	}129}130131/// Opaque types. These are used by the CLI to instantiate machinery that don't need to know132/// the specifics of the runtime. They can then be made to be agnostic over specific formats133/// of data like extrinsics, allowing for them to continue syncing the network through upgrades134/// to even the core data structures.135pub mod opaque {136	use sp_std::prelude::*;137	use sp_runtime::impl_opaque_keys;138	use super::Aura;139140	pub use unique_runtime_common::types::*;141142	impl_opaque_keys! {143		pub struct SessionKeys {144			pub aura: Aura,145		}146	}147}148149/// This runtime version.150pub const VERSION: RuntimeVersion = RuntimeVersion {151	spec_name: create_runtime_str!(RUNTIME_NAME),152	impl_name: create_runtime_str!(RUNTIME_NAME),153	authoring_version: 1,154	spec_version: 917004,155	impl_version: 0,156	apis: RUNTIME_API_VERSIONS,157	transaction_version: 1,158	state_version: 0,159};160161#[derive(codec::Encode, codec::Decode)]162pub enum XCMPMessage<XAccountId, XBalance> {163	/// Transfer tokens to the given account from the Parachain account.164	TransferToken(XAccountId, XBalance),165}166167/// The version information used to identify this runtime when compiled natively.168#[cfg(feature = "std")]169pub fn native_version() -> NativeVersion {170	NativeVersion {171		runtime_version: VERSION,172		can_author_with: Default::default(),173	}174}175176type NegativeImbalance = <Balances as Currency<AccountId>>::NegativeImbalance;177178pub struct DealWithFees;179impl OnUnbalanced<NegativeImbalance> for DealWithFees {180	fn on_unbalanceds<B>(mut fees_then_tips: impl Iterator<Item = NegativeImbalance>) {181		if let Some(fees) = fees_then_tips.next() {182			// for fees, 100% to treasury183			let mut split = fees.ration(100, 0);184			if let Some(tips) = fees_then_tips.next() {185				// for tips, if any, 100% to treasury186				tips.ration_merge_into(100, 0, &mut split);187			}188			Treasury::on_unbalanced(split.0);189			// Author::on_unbalanced(split.1);190		}191	}192}193194parameter_types! {195	pub const BlockHashCount: BlockNumber = 2400;196	pub RuntimeBlockLength: BlockLength =197		BlockLength::max_with_normal_ratio(5 * 1024 * 1024, NORMAL_DISPATCH_RATIO);198	pub const AvailableBlockRatio: Perbill = Perbill::from_percent(75);199	pub const MaximumBlockLength: u32 = 5 * 1024 * 1024;200	pub RuntimeBlockWeights: BlockWeights = BlockWeights::builder()201		.base_block(BlockExecutionWeight::get())202		.for_class(DispatchClass::all(), |weights| {203			weights.base_extrinsic = ExtrinsicBaseWeight::get();204		})205		.for_class(DispatchClass::Normal, |weights| {206			weights.max_total = Some(NORMAL_DISPATCH_RATIO * MAXIMUM_BLOCK_WEIGHT);207		})208		.for_class(DispatchClass::Operational, |weights| {209			weights.max_total = Some(MAXIMUM_BLOCK_WEIGHT);210			// Operational transactions have some extra reserved space, so that they211			// are included even if block reached `MAXIMUM_BLOCK_WEIGHT`.212			weights.reserved = Some(213				MAXIMUM_BLOCK_WEIGHT - NORMAL_DISPATCH_RATIO * MAXIMUM_BLOCK_WEIGHT214			);215		})216		.avg_block_initialization(AVERAGE_ON_INITIALIZE_RATIO)217		.build_or_panic();218	pub const Version: RuntimeVersion = VERSION;219	pub const SS58Prefix: u8 = 255;220}221222parameter_types! {223	pub const ChainId: u64 = 8881;224}225226pub struct FixedFee;227impl FeeCalculator for FixedFee {228	fn min_gas_price() -> U256 {229		MIN_GAS_PRICE.into()230	}231}232233// Assuming slowest ethereum opcode is SSTORE, with gas price of 20000 as our worst case234// (contract, which only writes a lot of data),235// approximating on top of our real store write weight236parameter_types! {237	pub const WritesPerSecond: u64 = WEIGHT_PER_SECOND / <Runtime as frame_system::Config>::DbWeight::get().write;238	pub const GasPerSecond: u64 = WritesPerSecond::get() * 20000;239	pub const WeightPerGas: u64 = WEIGHT_PER_SECOND / GasPerSecond::get();240}241242/// Limiting EVM execution to 50% of block for substrate users and management tasks243/// EVM transaction consumes more weight than substrate's, so we can't rely on them being244/// scheduled fairly245const EVM_DISPATCH_RATIO: Perbill = Perbill::from_percent(50);246parameter_types! {247	pub BlockGasLimit: U256 = U256::from(NORMAL_DISPATCH_RATIO * EVM_DISPATCH_RATIO * MAXIMUM_BLOCK_WEIGHT / WeightPerGas::get());248}249250pub enum FixedGasWeightMapping {}251impl GasWeightMapping for FixedGasWeightMapping {252	fn gas_to_weight(gas: u64) -> Weight {253		gas.saturating_mul(WeightPerGas::get())254	}255	fn weight_to_gas(weight: Weight) -> u64 {256		weight / WeightPerGas::get()257	}258}259260impl pallet_evm::Config for Runtime {261	type BlockGasLimit = BlockGasLimit;262	type FeeCalculator = FixedFee;263	type GasWeightMapping = FixedGasWeightMapping;264	type BlockHashMapping = pallet_ethereum::EthereumBlockHashMapping<Self>;265	type CallOrigin = EnsureAddressTruncated;266	type WithdrawOrigin = EnsureAddressTruncated;267	type AddressMapping = HashedAddressMapping<Self::Hashing>;268	type PrecompilesType = ();269	type PrecompilesValue = ();270	type Currency = Balances;271	type Event = Event;272	type OnMethodCall = (273		pallet_evm_migration::OnMethodCall<Self>,274		pallet_unique::UniqueErcSupport<Self>,275		pallet_evm_contract_helpers::HelpersOnMethodCall<Self>,276	);277	type OnCreate = pallet_evm_contract_helpers::HelpersOnCreate<Self>;278	type ChainId = ChainId;279	type Runner = pallet_evm::runner::stack::Runner<Self>;280	type OnChargeTransaction = pallet_evm_transaction_payment::OnChargeTransaction<Self>;281	type TransactionValidityHack = pallet_evm_transaction_payment::TransactionValidityHack<Self>;282	type FindAuthor = EthereumFindAuthor<Aura>;283}284285impl pallet_evm_migration::Config for Runtime {286	type WeightInfo = pallet_evm_migration::weights::SubstrateWeight<Self>;287}288289pub struct EthereumFindAuthor<F>(core::marker::PhantomData<F>);290impl<F: FindAuthor<u32>> FindAuthor<H160> for EthereumFindAuthor<F> {291	fn find_author<'a, I>(digests: I) -> Option<H160>292	where293		I: 'a + IntoIterator<Item = (ConsensusEngineId, &'a [u8])>,294	{295		if let Some(author_index) = F::find_author(digests) {296			let authority_id = Aura::authorities()[author_index as usize].clone();297			return Some(H160::from_slice(&authority_id.to_raw_vec()[4..24]));298		}299		None300	}301}302303impl pallet_ethereum::Config for Runtime {304	type Event = Event;305	type StateRoot = pallet_ethereum::IntermediateStateRoot;306}307308impl pallet_randomness_collective_flip::Config for Runtime {}309310impl frame_system::Config for Runtime {311	/// The data to be stored in an account.312	type AccountData = pallet_balances::AccountData<Balance>;313	/// The identifier used to distinguish between accounts.314	type AccountId = AccountId;315	/// The basic call filter to use in dispatchable.316	type BaseCallFilter = Everything;317	/// Maximum number of block number to block hash mappings to keep (oldest pruned first).318	type BlockHashCount = BlockHashCount;319	/// The maximum length of a block (in bytes).320	type BlockLength = RuntimeBlockLength;321	/// The index type for blocks.322	type BlockNumber = BlockNumber;323	/// The weight of the overhead invoked on the block import process, independent of the extrinsics included in that block.324	type BlockWeights = RuntimeBlockWeights;325	/// The aggregated dispatch type that is available for extrinsics.326	type Call = Call;327	/// The weight of database operations that the runtime can invoke.328	type DbWeight = RocksDbWeight;329	/// The ubiquitous event type.330	type Event = Event;331	/// The type for hashing blocks and tries.332	type Hash = Hash;333	/// The hashing algorithm used.334	type Hashing = BlakeTwo256;335	/// The header type.336	type Header = generic::Header<BlockNumber, BlakeTwo256>;337	/// The index type for storing how many extrinsics an account has signed.338	type Index = Index;339	/// The lookup mechanism to get account ID from whatever is passed in dispatchers.340	type Lookup = AccountIdLookup<AccountId, ()>;341	/// What to do if an account is fully reaped from the system.342	type OnKilledAccount = ();343	/// What to do if a new account is created.344	type OnNewAccount = ();345	type OnSetCode = cumulus_pallet_parachain_system::ParachainSetCode<Self>;346	/// The ubiquitous origin type.347	type Origin = Origin;348	/// This type is being generated by `construct_runtime!`.349	type PalletInfo = PalletInfo;350	/// This is used as an identifier of the chain. 42 is the generic substrate prefix.351	type SS58Prefix = SS58Prefix;352	/// Weight information for the extrinsics of this pallet.353	type SystemWeightInfo = frame_system::weights::SubstrateWeight<Self>;354	/// Version of the runtime.355	type Version = Version;356	type MaxConsumers = ConstU32<16>;357}358359parameter_types! {360	pub const MinimumPeriod: u64 = SLOT_DURATION / 2;361}362363impl pallet_timestamp::Config for Runtime {364	/// A timestamp: milliseconds since the unix epoch.365	type Moment = u64;366	type OnTimestampSet = ();367	type MinimumPeriod = MinimumPeriod;368	type WeightInfo = ();369}370371parameter_types! {372	// pub const ExistentialDeposit: u128 = 500;373	pub const ExistentialDeposit: u128 = 0;374	pub const MaxLocks: u32 = 50;375}376377impl pallet_balances::Config for Runtime {378	type MaxLocks = MaxLocks;379	type MaxReserves = ();380	type ReserveIdentifier = [u8; 8];381	/// The type for recording an account's balance.382	type Balance = Balance;383	/// The ubiquitous event type.384	type Event = Event;385	type DustRemoval = Treasury;386	type ExistentialDeposit = ExistentialDeposit;387	type AccountStore = System;388	type WeightInfo = pallet_balances::weights::SubstrateWeight<Self>;389}390391pub const fn deposit(items: u32, bytes: u32) -> Balance {392	items as Balance * 15 * CENTIUNIQUE + (bytes as Balance) * 6 * CENTIUNIQUE393}394395/*396parameter_types! {397	pub TombstoneDeposit: Balance = deposit(398		1,399		sp_std::mem::size_of::<pallet_contracts::Pallet<Runtime>> as u32,400	);401	pub DepositPerContract: Balance = TombstoneDeposit::get();402	pub const DepositPerStorageByte: Balance = deposit(0, 1);403	pub const DepositPerStorageItem: Balance = deposit(1, 0);404	pub RentFraction: Perbill = Perbill::from_rational(1u32, 30 * DAYS);405	pub const SurchargeReward: Balance = 150 * MILLIUNIQUE;406	pub const SignedClaimHandicap: u32 = 2;407	pub const MaxDepth: u32 = 32;408	pub const MaxValueSize: u32 = 16 * 1024;409	pub const MaxCodeSize: u32 = 1024 * 1024 * 25; // 25 Mb410	// The lazy deletion runs inside on_initialize.411	pub DeletionWeightLimit: Weight = AVERAGE_ON_INITIALIZE_RATIO *412		RuntimeBlockWeights::get().max_block;413	// The weight needed for decoding the queue should be less or equal than a fifth414	// of the overall weight dedicated to the lazy deletion.415	pub DeletionQueueDepth: u32 = ((DeletionWeightLimit::get() / (416			<Runtime as pallet_contracts::Config>::WeightInfo::on_initialize_per_queue_item(1) -417			<Runtime as pallet_contracts::Config>::WeightInfo::on_initialize_per_queue_item(0)418		)) / 5) as u32;419	pub Schedule: pallet_contracts::Schedule<Runtime> = Default::default();420}421422impl pallet_contracts::Config for Runtime {423	type Time = Timestamp;424	type Randomness = RandomnessCollectiveFlip;425	type Currency = Balances;426	type Event = Event;427	type RentPayment = ();428	type SignedClaimHandicap = SignedClaimHandicap;429	type TombstoneDeposit = TombstoneDeposit;430	type DepositPerContract = DepositPerContract;431	type DepositPerStorageByte = DepositPerStorageByte;432	type DepositPerStorageItem = DepositPerStorageItem;433	type RentFraction = RentFraction;434	type SurchargeReward = SurchargeReward;435	type WeightPrice = pallet_transaction_payment::Pallet<Self>;436	type WeightInfo = pallet_contracts::weights::SubstrateWeight<Self>;437	type ChainExtension = NFTExtension;438	type DeletionQueueDepth = DeletionQueueDepth;439	type DeletionWeightLimit = DeletionWeightLimit;440	type Schedule = Schedule;441	type CallStack = [pallet_contracts::Frame<Self>; 31];442}443*/444445parameter_types! {446	/// This value increases the priority of `Operational` transactions by adding447	/// a "virtual tip" that's equal to the `OperationalFeeMultiplier * final_fee`.448	pub const OperationalFeeMultiplier: u8 = 5;449}450451/// Linear implementor of `WeightToFeePolynomial`452pub struct LinearFee<T>(sp_std::marker::PhantomData<T>);453454impl<T> WeightToFeePolynomial for LinearFee<T>455where456	T: BaseArithmetic + From<u32> + Copy + Unsigned,457{458	type Balance = T;459460	fn polynomial() -> WeightToFeeCoefficients<Self::Balance> {461		smallvec!(WeightToFeeCoefficient {462			// Targeting 0.1 Unique per NFT transfer463			coeff_integer: WEIGHT_TO_FEE_COEFF.into(),464			coeff_frac: Perbill::zero(),465			negative: false,466			degree: 1,467		})468	}469}470471impl pallet_transaction_payment::Config for Runtime {472	type OnChargeTransaction = pallet_transaction_payment::CurrencyAdapter<Balances, DealWithFees>;473	type TransactionByteFee = TransactionByteFee;474	type OperationalFeeMultiplier = OperationalFeeMultiplier;475	type WeightToFee = LinearFee<Balance>;476	type FeeMultiplierUpdate = ();477}478479parameter_types! {480	pub const ProposalBond: Permill = Permill::from_percent(5);481	pub const ProposalBondMinimum: Balance = 1 * UNIQUE;482	pub const ProposalBondMaximum: Balance = 1000 * UNIQUE;483	pub const SpendPeriod: BlockNumber = 5 * MINUTES;484	pub const Burn: Permill = Permill::from_percent(0);485	pub const TipCountdown: BlockNumber = 1 * DAYS;486	pub const TipFindersFee: Percent = Percent::from_percent(20);487	pub const TipReportDepositBase: Balance = 1 * UNIQUE;488	pub const DataDepositPerByte: Balance = 1 * CENTIUNIQUE;489	pub const BountyDepositBase: Balance = 1 * UNIQUE;490	pub const BountyDepositPayoutDelay: BlockNumber = 1 * DAYS;491	pub const TreasuryModuleId: PalletId = PalletId(*b"py/trsry");492	pub const BountyUpdatePeriod: BlockNumber = 14 * DAYS;493	pub const MaximumReasonLength: u32 = 16384;494	pub const BountyCuratorDeposit: Permill = Permill::from_percent(50);495	pub const BountyValueMinimum: Balance = 5 * UNIQUE;496	pub const MaxApprovals: u32 = 100;497}498499impl pallet_treasury::Config for Runtime {500	type PalletId = TreasuryModuleId;501	type Currency = Balances;502	type ApproveOrigin = EnsureRoot<AccountId>;503	type RejectOrigin = EnsureRoot<AccountId>;504	type Event = Event;505	type OnSlash = ();506	type ProposalBond = ProposalBond;507	type ProposalBondMinimum = ProposalBondMinimum;508	type ProposalBondMaximum = ProposalBondMaximum;509	type SpendPeriod = SpendPeriod;510	type Burn = Burn;511	type BurnDestination = ();512	type SpendFunds = ();513	type WeightInfo = pallet_treasury::weights::SubstrateWeight<Self>;514	type MaxApprovals = MaxApprovals;515}516517impl pallet_sudo::Config for Runtime {518	type Event = Event;519	type Call = Call;520}521522pub struct RelayChainBlockNumberProvider<T>(sp_std::marker::PhantomData<T>);523524impl<T: cumulus_pallet_parachain_system::Config> BlockNumberProvider525	for RelayChainBlockNumberProvider<T>526{527	type BlockNumber = BlockNumber;528529	fn current_block_number() -> Self::BlockNumber {530		cumulus_pallet_parachain_system::Pallet::<T>::validation_data()531			.map(|d| d.relay_parent_number)532			.unwrap_or_default()533	}534}535536parameter_types! {537	pub const MinVestedTransfer: Balance = 10 * UNIQUE;538	pub const MaxVestingSchedules: u32 = 28;539}540541impl orml_vesting::Config for Runtime {542	type Event = Event;543	type Currency = pallet_balances::Pallet<Runtime>;544	type MinVestedTransfer = MinVestedTransfer;545	type VestedTransferOrigin = EnsureSigned<AccountId>;546	type WeightInfo = ();547	type MaxVestingSchedules = MaxVestingSchedules;548	type BlockNumberProvider = RelayChainBlockNumberProvider<Runtime>;549}550551parameter_types! {552	pub const ReservedDmpWeight: Weight = MAXIMUM_BLOCK_WEIGHT / 4;553	pub const ReservedXcmpWeight: Weight = MAXIMUM_BLOCK_WEIGHT / 4;554}555556impl cumulus_pallet_parachain_system::Config for Runtime {557	type Event = Event;558	type SelfParaId = parachain_info::Pallet<Self>;559	type OnSystemEvent = ();560	// type DownwardMessageHandlers = cumulus_primitives_utility::UnqueuedDmpAsParent<561	// 	MaxDownwardMessageWeight,562	// 	XcmExecutor<XcmConfig>,563	// 	Call,564	// >;565	type OutboundXcmpMessageSource = XcmpQueue;566	type DmpMessageHandler = DmpQueue;567	type ReservedDmpWeight = ReservedDmpWeight;568	type ReservedXcmpWeight = ReservedXcmpWeight;569	type XcmpMessageHandler = XcmpQueue;570}571572impl parachain_info::Config for Runtime {}573574impl cumulus_pallet_aura_ext::Config for Runtime {}575576parameter_types! {577	pub const RelayLocation: MultiLocation = MultiLocation::parent();578	pub const RelayNetwork: NetworkId = NetworkId::Polkadot;579	pub RelayOrigin: Origin = cumulus_pallet_xcm::Origin::Relay.into();580	pub Ancestry: MultiLocation = Parachain(ParachainInfo::parachain_id().into()).into();581}582583/// Type for specifying how a `MultiLocation` can be converted into an `AccountId`. This is used584/// when determining ownership of accounts for asset transacting and when attempting to use XCM585/// `Transact` in order to determine the dispatch Origin.586pub type LocationToAccountId = (587	// The parent (Relay-chain) origin converts to the default `AccountId`.588	ParentIsPreset<AccountId>,589	// Sibling parachain origins convert to AccountId via the `ParaId::into`.590	SiblingParachainConvertsVia<Sibling, AccountId>,591	// Straight up local `AccountId32` origins just alias directly to `AccountId`.592	AccountId32Aliases<RelayNetwork, AccountId>,593);594595pub struct OnlySelfCurrency;596impl<B: TryFrom<u128>> MatchesFungible<B> for OnlySelfCurrency {597	fn matches_fungible(a: &MultiAsset) -> Option<B> {598		match (&a.id, &a.fun) {599			(Concrete(_), XcmFungible(ref amount)) => CheckedConversion::checked_from(*amount),600			_ => None,601		}602	}603}604605/// Means for transacting assets on this chain.606pub type LocalAssetTransactor = CurrencyAdapter<607	// Use this currency:608	Balances,609	// Use this currency when it is a fungible asset matching the given location or name:610	OnlySelfCurrency,611	// Do a simple punn to convert an AccountId32 MultiLocation into a native chain account ID:612	LocationToAccountId,613	// Our chain's account ID type (we can't get away without mentioning it explicitly):614	AccountId,615	// We don't track any teleports.616	(),617>;618619/// This is the type we use to convert an (incoming) XCM origin into a local `Origin` instance,620/// ready for dispatching a transaction with Xcm's `Transact`. There is an `OriginKind` which can621/// biases the kind of local `Origin` it will become.622pub type XcmOriginToTransactDispatchOrigin = (623	// Sovereign account converter; this attempts to derive an `AccountId` from the origin location624	// using `LocationToAccountId` and then turn that into the usual `Signed` origin. Useful for625	// foreign chains who want to have a local sovereign account on this chain which they control.626	SovereignSignedViaLocation<LocationToAccountId, Origin>,627	// Native converter for Relay-chain (Parent) location; will converts to a `Relay` origin when628	// recognised.629	RelayChainAsNative<RelayOrigin, Origin>,630	// Native converter for sibling Parachains; will convert to a `SiblingPara` origin when631	// recognised.632	SiblingParachainAsNative<cumulus_pallet_xcm::Origin, Origin>,633	// Superuser converter for the Relay-chain (Parent) location. This will allow it to issue a634	// transaction from the Root origin.635	ParentAsSuperuser<Origin>,636	// Native signed account converter; this just converts an `AccountId32` origin into a normal637	// `Origin::Signed` origin of the same 32-byte value.638	SignedAccountId32AsNative<RelayNetwork, Origin>,639	// Xcm origins can be represented natively under the Xcm pallet's Xcm origin.640	XcmPassthrough<Origin>,641);642643parameter_types! {644	// One XCM operation is 1_000_000 weight - almost certainly a conservative estimate.645	pub UnitWeightCost: Weight = 1_000_000;646	// 1200 UNIQUEs buy 1 second of weight.647	pub const WeightPrice: (MultiLocation, u128) = (MultiLocation::parent(), 1_200 * UNIQUE);648	pub const MaxInstructions: u32 = 100;649	pub const MaxAuthorities: u32 = 100_000;650}651652match_type! {653	pub type ParentOrParentsUnitPlurality: impl Contains<MultiLocation> = {654		MultiLocation { parents: 1, interior: Here } |655		MultiLocation { parents: 1, interior: X1(Plurality { id: BodyId::Unit, .. }) }656	};657}658659pub type Barrier = (660	TakeWeightCredit,661	AllowTopLevelPaidExecutionFrom<Everything>,662	AllowUnpaidExecutionFrom<ParentOrParentsUnitPlurality>,663	// ^^^ Parent & its unit plurality gets free execution664);665666pub struct UsingOnlySelfCurrencyComponents<667	WeightToFee: WeightToFeePolynomial<Balance = Currency::Balance>,668	AssetId: Get<MultiLocation>,669	AccountId,670	Currency: CurrencyT<AccountId>,671	OnUnbalanced: OnUnbalancedT<Currency::NegativeImbalance>,672>(673	Weight,674	Currency::Balance,675	PhantomData<(WeightToFee, AssetId, AccountId, Currency, OnUnbalanced)>,676);677impl<678		WeightToFee: WeightToFeePolynomial<Balance = Currency::Balance>,679		AssetId: Get<MultiLocation>,680		AccountId,681		Currency: CurrencyT<AccountId>,682		OnUnbalanced: OnUnbalancedT<Currency::NegativeImbalance>,683	> WeightTrader684	for UsingOnlySelfCurrencyComponents<WeightToFee, AssetId, AccountId, Currency, OnUnbalanced>685{686	fn new() -> Self {687		Self(0, Zero::zero(), PhantomData)688	}689690	fn buy_weight(&mut self, weight: Weight, payment: Assets) -> Result<Assets, XcmError> {691		let amount = WeightToFee::calc(&weight);692		let u128_amount: u128 = amount.try_into().map_err(|_| XcmError::Overflow)?;693694		// location to this parachain through relay chain695		let option1: xcm::v1::AssetId = Concrete(MultiLocation {696			parents: 1,697			interior: X1(Parachain(ParachainInfo::parachain_id().into())),698		});699		// direct location700		let option2: xcm::v1::AssetId = Concrete(MultiLocation {701			parents: 0,702			interior: Here,703		});704705		let required = if payment.fungible.contains_key(&option1) {706			(option1, u128_amount).into()707		} else if payment.fungible.contains_key(&option2) {708			(option2, u128_amount).into()709		} else {710			(Concrete(MultiLocation::default()), u128_amount).into()711		};712713		let unused = payment714			.checked_sub(required)715			.map_err(|_| XcmError::TooExpensive)?;716		self.0 = self.0.saturating_add(weight);717		self.1 = self.1.saturating_add(amount);718		Ok(unused)719	}720721	fn refund_weight(&mut self, weight: Weight) -> Option<MultiAsset> {722		let weight = weight.min(self.0);723		let amount = WeightToFee::calc(&weight);724		self.0 -= weight;725		self.1 = self.1.saturating_sub(amount);726		let amount: u128 = amount.saturated_into();727		if amount > 0 {728			Some((AssetId::get(), amount).into())729		} else {730			None731		}732	}733}734impl<735		WeightToFee: WeightToFeePolynomial<Balance = Currency::Balance>,736		AssetId: Get<MultiLocation>,737		AccountId,738		Currency: CurrencyT<AccountId>,739		OnUnbalanced: OnUnbalancedT<Currency::NegativeImbalance>,740	> Drop741	for UsingOnlySelfCurrencyComponents<WeightToFee, AssetId, AccountId, Currency, OnUnbalanced>742{743	fn drop(&mut self) {744		OnUnbalanced::on_unbalanced(Currency::issue(self.1));745	}746}747748pub struct XcmConfig;749impl Config for XcmConfig {750	type Call = Call;751	type XcmSender = XcmRouter;752	// How to withdraw and deposit an asset.753	type AssetTransactor = LocalAssetTransactor;754	type OriginConverter = XcmOriginToTransactDispatchOrigin;755	type IsReserve = NativeAsset;756	type IsTeleporter = (); // Teleportation is disabled757	type LocationInverter = LocationInverter<Ancestry>;758	type Barrier = Barrier;759	type Weigher = FixedWeightBounds<UnitWeightCost, Call, MaxInstructions>;760	type Trader = UsingOnlySelfCurrencyComponents<761		IdentityFee<Balance>,762		RelayLocation,763		AccountId,764		Balances,765		(),766	>;767	type ResponseHandler = (); // Don't handle responses for now.768	type SubscriptionService = PolkadotXcm;769770	type AssetTrap = PolkadotXcm;771	type AssetClaims = PolkadotXcm;772}773774// parameter_types! {775// 	pub const MaxDownwardMessageWeight: Weight = MAXIMUM_BLOCK_WEIGHT / 10;776// }777778/// No local origins on this chain are allowed to dispatch XCM sends/executions.779pub type LocalOriginToLocation = (SignedToAccountId32<Origin, AccountId, RelayNetwork>,);780781/// The means for routing XCM messages which are not for local execution into the right message782/// queues.783pub type XcmRouter = (784	// Two routers - use UMP to communicate with the relay chain:785	cumulus_primitives_utility::ParentAsUmp<ParachainSystem, ()>,786	// ..and XCMP to communicate with the sibling chains.787	XcmpQueue,788);789790impl pallet_evm_coder_substrate::Config for Runtime {791	type EthereumTransactionSender = pallet_ethereum::Pallet<Self>;792	type GasWeightMapping = FixedGasWeightMapping;793}794795impl pallet_xcm::Config for Runtime {796	type Event = Event;797	type SendXcmOrigin = EnsureXcmOrigin<Origin, LocalOriginToLocation>;798	type XcmRouter = XcmRouter;799	type ExecuteXcmOrigin = EnsureXcmOrigin<Origin, LocalOriginToLocation>;800	type XcmExecuteFilter = Everything;801	type XcmExecutor = XcmExecutor<XcmConfig>;802	type XcmTeleportFilter = Everything;803	type XcmReserveTransferFilter = Everything;804	type Weigher = FixedWeightBounds<UnitWeightCost, Call, MaxInstructions>;805	type LocationInverter = LocationInverter<Ancestry>;806	type Origin = Origin;807	type Call = Call;808	const VERSION_DISCOVERY_QUEUE_SIZE: u32 = 100;809	type AdvertisedXcmVersion = pallet_xcm::CurrentXcmVersion;810}811812impl cumulus_pallet_xcm::Config for Runtime {813	type Event = Event;814	type XcmExecutor = XcmExecutor<XcmConfig>;815}816817impl cumulus_pallet_xcmp_queue::Config for Runtime {818	type WeightInfo = ();819	type Event = Event;820	type XcmExecutor = XcmExecutor<XcmConfig>;821	type ChannelInfo = ParachainSystem;822	type VersionWrapper = ();823	type ExecuteOverweightOrigin = frame_system::EnsureRoot<AccountId>;824	type ControllerOrigin = EnsureRoot<AccountId>;825	type ControllerOriginConverter = XcmOriginToTransactDispatchOrigin;826}827828impl cumulus_pallet_dmp_queue::Config for Runtime {829	type Event = Event;830	type XcmExecutor = XcmExecutor<XcmConfig>;831	type ExecuteOverweightOrigin = frame_system::EnsureRoot<AccountId>;832}833834impl pallet_aura::Config for Runtime {835	type AuthorityId = AuraId;836	type DisabledValidators = ();837	type MaxAuthorities = MaxAuthorities;838}839840parameter_types! {841	pub TreasuryAccountId: AccountId = TreasuryModuleId::get().into_account();842	pub const CollectionCreationPrice: Balance = 2 * UNIQUE;843}844845impl pallet_common::Config for Runtime {846	type Event = Event;847848	type Currency = Balances;849	type CollectionCreationPrice = CollectionCreationPrice;850	type TreasuryAccountId = TreasuryAccountId;851}852853impl pallet_evm::account::Config for Runtime {854	type CrossAccountId = pallet_evm::account::BasicCrossAccountId<Self>;855	type EvmAddressMapping = HashedAddressMapping<Self::Hashing>;856	type EvmBackwardsAddressMapping = fp_evm_mapping::MapBackwardsAddressTruncated;857}858859impl pallet_fungible::Config for Runtime {860	type WeightInfo = pallet_fungible::weights::SubstrateWeight<Self>;861}862impl pallet_refungible::Config for Runtime {863	type WeightInfo = pallet_refungible::weights::SubstrateWeight<Self>;864}865impl pallet_nonfungible::Config for Runtime {866	type WeightInfo = pallet_nonfungible::weights::SubstrateWeight<Self>;867}868869impl pallet_unique::Config for Runtime {870	type Event = Event;871	type WeightInfo = pallet_unique::weights::SubstrateWeight<Self>;872}873874parameter_types! {875	pub const InflationBlockInterval: BlockNumber = 100; // every time per how many blocks inflation is applied876}877878/// Used for the pallet inflation879impl pallet_inflation::Config for Runtime {880	type Currency = Balances;881	type TreasuryAccountId = TreasuryAccountId;882	type InflationBlockInterval = InflationBlockInterval;883	type BlockNumberProvider = RelayChainBlockNumberProvider<Runtime>;884}885886// parameter_types! {887// 	pub MaximumSchedulerWeight: Weight = Perbill::from_percent(50) *888// 		RuntimeBlockWeights::get().max_block;889// 	pub const MaxScheduledPerBlock: u32 = 50;890// }891892type EvmSponsorshipHandler = (893	pallet_unique::UniqueEthSponsorshipHandler<Runtime>,894	pallet_evm_contract_helpers::HelpersContractSponsoring<Runtime>,895);896type SponsorshipHandler = (897	pallet_unique::UniqueSponsorshipHandler<Runtime>,898	//pallet_contract_helpers::ContractSponsorshipHandler<Runtime>,899	pallet_evm_transaction_payment::BridgeSponsorshipHandler<Runtime>,900);901902// impl pallet_unq_scheduler::Config for Runtime {903// 	type Event = Event;904// 	type Origin = Origin;905// 	type PalletsOrigin = OriginCaller;906// 	type Call = Call;907// 	type MaximumWeight = MaximumSchedulerWeight;908// 	type ScheduleOrigin = EnsureSigned<AccountId>;909// 	type MaxScheduledPerBlock = MaxScheduledPerBlock;910// 	type SponsorshipHandler = SponsorshipHandler;911// 	type WeightInfo = ();912// }913914impl pallet_evm_transaction_payment::Config for Runtime {915	type EvmSponsorshipHandler = EvmSponsorshipHandler;916	type Currency = Balances;917}918919impl pallet_charge_transaction::Config for Runtime {920	type SponsorshipHandler = SponsorshipHandler;921}922923// impl pallet_contract_helpers::Config for Runtime {924//	 type DefaultSponsoringRateLimit = DefaultSponsoringRateLimit;925// }926927parameter_types! {928	// 0x842899ECF380553E8a4de75bF534cdf6fBF64049929	pub const HelpersContractAddress: H160 = H160([930		0x84, 0x28, 0x99, 0xec, 0xf3, 0x80, 0x55, 0x3e, 0x8a, 0x4d, 0xe7, 0x5b, 0xf5, 0x34, 0xcd, 0xf6, 0xfb, 0xf6, 0x40, 0x49,931	]);932}933934impl pallet_evm_contract_helpers::Config for Runtime {935	type ContractAddress = HelpersContractAddress;936	type DefaultSponsoringRateLimit = DefaultSponsoringRateLimit;937}938939construct_runtime!(940	pub enum Runtime where941		Block = Block,942		NodeBlock = opaque::Block,943		UncheckedExtrinsic = UncheckedExtrinsic944	{945		ParachainSystem: cumulus_pallet_parachain_system::{Pallet, Call, Config, Storage, Inherent, Event<T>, ValidateUnsigned} = 20,946		ParachainInfo: parachain_info::{Pallet, Storage, Config} = 21,947948		Aura: pallet_aura::{Pallet, Config<T>} = 22,949		AuraExt: cumulus_pallet_aura_ext::{Pallet, Config} = 23,950951		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>} = 30,952		RandomnessCollectiveFlip: pallet_randomness_collective_flip::{Pallet, Storage} = 31,953		Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent} = 32,954		TransactionPayment: pallet_transaction_payment::{Pallet, Storage} = 33,955		Treasury: pallet_treasury::{Pallet, Call, Storage, Config, Event<T>} = 34,956		Sudo: pallet_sudo::{Pallet, Call, Storage, Config<T>, Event<T>} = 35,957		System: frame_system::{Pallet, Call, Storage, Config, Event<T>} = 36,958		Vesting: orml_vesting::{Pallet, Storage, Call, Event<T>, Config<T>} = 37,959		// Vesting: pallet_vesting::{Pallet, Call, Config<T>, Storage, Event<T>} = 37,960		// Contracts: pallet_contracts::{Pallet, Call, Storage, Event<T>} = 38,961962		// XCM helpers.963		XcmpQueue: cumulus_pallet_xcmp_queue::{Pallet, Call, Storage, Event<T>} = 50,964		PolkadotXcm: pallet_xcm::{Pallet, Call, Event<T>, Origin} = 51,965		CumulusXcm: cumulus_pallet_xcm::{Pallet, Call, Event<T>, Origin} = 52,966		DmpQueue: cumulus_pallet_dmp_queue::{Pallet, Call, Storage, Event<T>} = 53,967968		// Unique Pallets969		Inflation: pallet_inflation::{Pallet, Call, Storage} = 60,970		Unique: pallet_unique::{Pallet, Call, Storage, Event<T>} = 61,971		// Scheduler: pallet_unq_scheduler::{Pallet, Call, Storage, Event<T>} = 62,972		// free = 63973		Charging: pallet_charge_transaction::{Pallet, Call, Storage } = 64,974		// ContractHelpers: pallet_contract_helpers::{Pallet, Call, Storage} = 65,975		Common: pallet_common::{Pallet, Storage, Event<T>} = 66,976		Fungible: pallet_fungible::{Pallet, Storage} = 67,977		Refungible: pallet_refungible::{Pallet, Storage} = 68,978		Nonfungible: pallet_nonfungible::{Pallet, Storage} = 69,979980		// Frontier981		EVM: pallet_evm::{Pallet, Config, Call, Storage, Event<T>} = 100,982		Ethereum: pallet_ethereum::{Pallet, Config, Call, Storage, Event, Origin} = 101,983984		EvmCoderSubstrate: pallet_evm_coder_substrate::{Pallet, Storage} = 150,985		EvmContractHelpers: pallet_evm_contract_helpers::{Pallet, Storage} = 151,986		EvmTransactionPayment: pallet_evm_transaction_payment::{Pallet} = 152,987		EvmMigration: pallet_evm_migration::{Pallet, Call, Storage} = 153,988	}989);990991pub struct TransactionConverter;992993impl fp_rpc::ConvertTransaction<UncheckedExtrinsic> for TransactionConverter {994	fn convert_transaction(&self, transaction: pallet_ethereum::Transaction) -> UncheckedExtrinsic {995		UncheckedExtrinsic::new_unsigned(996			pallet_ethereum::Call::<Runtime>::transact { transaction }.into(),997		)998	}999}10001001impl fp_rpc::ConvertTransaction<opaque::UncheckedExtrinsic> for TransactionConverter {1002	fn convert_transaction(1003		&self,1004		transaction: pallet_ethereum::Transaction,1005	) -> opaque::UncheckedExtrinsic {1006		let extrinsic = UncheckedExtrinsic::new_unsigned(1007			pallet_ethereum::Call::<Runtime>::transact { transaction }.into(),1008		);1009		let encoded = extrinsic.encode();1010		opaque::UncheckedExtrinsic::decode(&mut &encoded[..])1011			.expect("Encoded extrinsic is always valid")1012	}1013}10141015/// The address format for describing accounts.1016pub type Address = sp_runtime::MultiAddress<AccountId, ()>;1017/// Block header type as expected by this runtime.1018pub type Header = generic::Header<BlockNumber, BlakeTwo256>;1019/// Block type as expected by this runtime.1020pub type Block = generic::Block<Header, UncheckedExtrinsic>;1021/// A Block signed with a Justification1022pub type SignedBlock = generic::SignedBlock<Block>;1023/// BlockId type as expected by this runtime.1024pub type BlockId = generic::BlockId<Block>;1025/// The SignedExtension to the basic transaction logic.1026pub type SignedExtra = (1027	frame_system::CheckSpecVersion<Runtime>,1028	// system::CheckTxVersion<Runtime>,1029	frame_system::CheckGenesis<Runtime>,1030	frame_system::CheckEra<Runtime>,1031	frame_system::CheckNonce<Runtime>,1032	frame_system::CheckWeight<Runtime>,1033	pallet_charge_transaction::ChargeTransactionPayment<Runtime>,1034	//pallet_contract_helpers::ContractHelpersExtension<Runtime>,1035);1036/// Unchecked extrinsic type as expected by this runtime.1037pub type UncheckedExtrinsic =1038	fp_self_contained::UncheckedExtrinsic<Address, Call, Signature, SignedExtra>;1039/// Extrinsic type that has already been checked.1040pub type CheckedExtrinsic = fp_self_contained::CheckedExtrinsic<AccountId, Call, SignedExtra, H160>;1041/// Executive: handles dispatch to the various modules.1042pub type Executive = frame_executive::Executive<1043	Runtime,1044	Block,1045	frame_system::ChainContext<Runtime>,1046	Runtime,1047	AllPalletsReversedWithSystemFirst,1048>;10491050impl_opaque_keys! {1051	pub struct SessionKeys {1052		pub aura: Aura,1053	}1054}10551056impl fp_self_contained::SelfContainedCall for Call {1057	type SignedInfo = H160;10581059	fn is_self_contained(&self) -> bool {1060		match self {1061			Call::Ethereum(call) => call.is_self_contained(),1062			_ => false,1063		}1064	}10651066	fn check_self_contained(&self) -> Option<Result<Self::SignedInfo, TransactionValidityError>> {1067		match self {1068			Call::Ethereum(call) => call.check_self_contained(),1069			_ => None,1070		}1071	}10721073	fn validate_self_contained(&self, info: &Self::SignedInfo) -> Option<TransactionValidity> {1074		match self {1075			Call::Ethereum(call) => call.validate_self_contained(info),1076			_ => None,1077		}1078	}10791080	fn pre_dispatch_self_contained(1081		&self,1082		info: &Self::SignedInfo,1083	) -> Option<Result<(), TransactionValidityError>> {1084		match self {1085			Call::Ethereum(call) => call.pre_dispatch_self_contained(info),1086			_ => None,1087		}1088	}10891090	fn apply_self_contained(1091		self,1092		info: Self::SignedInfo,1093	) -> Option<sp_runtime::DispatchResultWithInfo<PostDispatchInfoOf<Self>>> {1094		match self {1095			call @ Call::Ethereum(pallet_ethereum::Call::transact { .. }) => Some(call.dispatch(1096				Origin::from(pallet_ethereum::RawOrigin::EthereumTransaction(info)),1097			)),1098			_ => None,1099		}1100	}1101}11021103macro_rules! dispatch_unique_runtime {1104	($collection:ident.$method:ident($($name:ident),*)) => {{1105		use pallet_unique::dispatch::Dispatched;11061107		let collection = Dispatched::dispatch(<pallet_common::CollectionHandle<Runtime>>::try_get($collection)?);1108		let dispatch = collection.as_dyn();11091110		Ok(dispatch.$method($($name),*))1111	}};1112}11131114impl_common_runtime_apis!();11151116struct CheckInherents;11171118impl cumulus_pallet_parachain_system::CheckInherents<Block> for CheckInherents {1119	fn check_inherents(1120		block: &Block,1121		relay_state_proof: &cumulus_pallet_parachain_system::RelayChainStateProof,1122	) -> sp_inherents::CheckInherentsResult {1123		let relay_chain_slot = relay_state_proof1124			.read_slot()1125			.expect("Could not read the relay chain slot from the proof");11261127		let inherent_data =1128			cumulus_primitives_timestamp::InherentDataProvider::from_relay_chain_slot_and_duration(1129				relay_chain_slot,1130				sp_std::time::Duration::from_secs(6),1131			)1132			.create_inherent_data()1133			.expect("Could not create the timestamp inherent data");11341135		inherent_data.check_extrinsics(block)1136	}1137}11381139cumulus_pallet_parachain_system::register_validate_block!(1140	Runtime = Runtime,1141	BlockExecutor = cumulus_pallet_aura_ext::BlockExecutor::<Runtime, Executive>,1142	CheckInherents = CheckInherents,1143);
modifiedruntime/unique/src/lib.rsdiffbeforeafterboth
--- a/runtime/unique/src/lib.rs
+++ b/runtime/unique/src/lib.rs
@@ -48,7 +48,7 @@
 };
 // A few exports that help ease life for downstream crates.
 pub use pallet_balances::Call as BalancesCall;
-pub use pallet_evm::{EnsureAddressTruncated, HashedAddressMapping, Runner};
+pub use pallet_evm::{EnsureAddressTruncated, HashedAddressMapping, Runner, account::CrossAccountId as _};
 pub use frame_support::{
 	construct_runtime, match_type,
 	dispatch::DispatchResult,
modifiedtests/src/eth/contractSponsoring.test.tsdiffbeforeafterboth
--- a/tests/src/eth/contractSponsoring.test.ts
+++ b/tests/src/eth/contractSponsoring.test.ts
@@ -27,10 +27,14 @@
   collectionIdToAddress,
   GAS_ARGS,
   normalizeEvents,
+  subToEth,
+  executeEthTxOnSub,
 } from './util/helpers';
 import {
+  addCollectionAdminExpectSuccess,
   createCollectionExpectSuccess,
   getCreateCollectionResult,
+  transferBalanceTo,
 } from '../util/helpers';
 import nonFungibleAbi from './nonFungibleAbi.json';
 import {
@@ -293,4 +297,34 @@
     const [alicesBalanceAfter] = await getBalance(api, [alicesPublicKey]);
     expect(alicesBalanceAfter < alicesBalanceBefore).to.be.true;
   });
+
+
+  itWeb3('Check that transaction via EVM spend money from substrate address', async ({api, web3}) => {
+    const owner = privateKey('//Alice');
+    const user = privateKey(`//User/${Date.now()}`);
+    const userEth = subToEth(user.address);
+    const collectionId = await createCollectionExpectSuccess();
+    await addCollectionAdminExpectSuccess(owner, collectionId, {Ethereum: userEth});
+    await transferBalanceTo(api, owner, user.address);
+
+    const address = collectionIdToAddress(collectionId);
+    const contract = new web3.eth.Contract(nonFungibleAbi as any, address, {from: userEth, ...GAS_ARGS});
+
+    const [userBalanceBefore] = await getBalance(api, [user.address]);
+
+    {
+      const nextTokenId = await contract.methods.nextTokenId().call();
+      expect(nextTokenId).to.be.equal('1');
+      await executeEthTxOnSub(web3, api, user, contract, m => m.mintWithTokenURI(
+        userEth,
+        nextTokenId,
+        'Test URI',
+      ));
+
+      expect(await contract.methods.tokenURI(nextTokenId).call()).to.be.equal('Test URI');
+    }
+
+    const [userBalanceAfter] = await getBalance(api, [user.address]);
+    expect(userBalanceAfter < userBalanceBefore).to.be.true;
+  });
 });
modifiedtests/src/eth/marketplace/marketplace.test.tsdiffbeforeafterboth
--- a/tests/src/eth/marketplace/marketplace.test.ts
+++ b/tests/src/eth/marketplace/marketplace.test.ts
@@ -15,18 +15,29 @@
 // along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
 
 import {readFile} from 'fs/promises';
-import {getBalanceSingle, transferBalanceExpectSuccess} from '../../substrate/get-balance';
+import {getBalanceSingle} from '../../substrate/get-balance';
 import privateKey from '../../substrate/privateKey';
-import {addToAllowListExpectSuccess, confirmSponsorshipExpectSuccess, createCollectionExpectSuccess, createFungibleItemExpectSuccess, createItemExpectSuccess, getTokenOwner, setCollectionLimitsExpectSuccess, setCollectionSponsorExpectSuccess, transferExpectSuccess, transferFromExpectSuccess} from '../../util/helpers';
+import {
+  addToAllowListExpectSuccess, 
+  confirmSponsorshipExpectSuccess, 
+  createCollectionExpectSuccess, 
+  createItemExpectSuccess, 
+  getTokenOwner,
+  setCollectionLimitsExpectSuccess, 
+  setCollectionSponsorExpectSuccess, 
+  transferExpectSuccess, 
+  transferFromExpectSuccess,
+  transferBalanceTo,
+} from '../../util/helpers';
 import {collectionIdToAddress, contractHelpers, createEthAccountWithBalance, executeEthTxOnSub, GAS_ARGS, itWeb3, SponsoringMode, subToEth, subToEthLowercase, transferBalanceToEth} from '../util/helpers';
 import {evmToAddress} from '@polkadot/util-crypto';
 import nonFungibleAbi from '../nonFungibleAbi.json';
-import fungibleAbi from '../fungibleAbi.json';
+
 import {expect} from 'chai';
 
 const PRICE = 2000n;
 
-describe('Matcher contract usage', () => {
+describe.only('Matcher contract usage', () => {
   itWeb3('With UNQ', async ({api, web3}) => {
     const alice = privateKey('//Alice');
     const matcherOwner = await createEthAccountWithBalance(api, web3);
@@ -87,32 +98,39 @@
     expect(await getTokenOwner(api, collectionId, tokenId)).to.be.deep.equal({Substrate: alice.address});
   });
 
-  // selling for custom tokens excluded from release
-  itWeb3.skip('With custom ERC20', async ({api, web3}) => {
+
+  itWeb3('With escrow', async ({api, web3}) => {
     const alice = privateKey('//Alice');
     const matcherOwner = await createEthAccountWithBalance(api, web3);
+    const escrow = await createEthAccountWithBalance(api, web3);
     const matcherContract = new web3.eth.Contract(JSON.parse((await readFile(`${__dirname}/MarketPlace.abi`)).toString()), undefined, {
       from: matcherOwner,
       ...GAS_ARGS,
     });
-    const matcher = await matcherContract.deploy({data: (await readFile(`${__dirname}/MarketPlace.bin`)).toString(), arguments: [matcherOwner]}).send({from: matcherOwner});
+    const matcher = await matcherContract.deploy({data: (await readFile(`${__dirname}/MarketPlace.bin`)).toString(), arguments: [matcherOwner]}).send({from: matcherOwner, gas: 10000000});
+    await matcher.methods.setEscrow(escrow).send({from: matcherOwner});
+    const helpers = contractHelpers(web3, matcherOwner);
+    await helpers.methods.setSponsoringMode(matcher.options.address, SponsoringMode.Allowlisted).send({from: matcherOwner});
+    await helpers.methods.setSponsoringRateLimit(matcher.options.address, 1).send({from: matcherOwner});
+    await transferBalanceToEth(api, alice, matcher.options.address);
 
     const collectionId = await createCollectionExpectSuccess({mode: {type: 'NFT'}});
+    await setCollectionLimitsExpectSuccess(alice, collectionId, {sponsorApproveTimeout: 1});
     const evmCollection = new web3.eth.Contract(nonFungibleAbi as any, collectionIdToAddress(collectionId), {from: matcherOwner});
+    await setCollectionSponsorExpectSuccess(collectionId, alice.address);
+    await transferBalanceToEth(api, alice, subToEth(alice.address));
+    await confirmSponsorshipExpectSuccess(collectionId);
 
-    const fungibleId = await createCollectionExpectSuccess({mode: {type: 'Fungible', decimalPoints: 0}});
-    const evmFungible = new web3.eth.Contract(fungibleAbi as any, collectionIdToAddress(fungibleId), {from: matcherOwner, ...GAS_ARGS});
-    await createFungibleItemExpectSuccess(alice, fungibleId, {Value: PRICE}, {Ethereum: subToEth(alice.address)});
+    await helpers.methods.toggleAllowed(matcher.options.address, subToEth(alice.address), true).send({from: matcherOwner});
+    await addToAllowListExpectSuccess(alice, collectionId, evmToAddress(subToEth(alice.address)));
 
-    const seller = privateKey('//Bob');
+    const seller = privateKey(`//Seller/${Date.now()}`);
+    await helpers.methods.toggleAllowed(matcher.options.address, subToEth(seller.address), true).send({from: matcherOwner});
 
     const tokenId = await createItemExpectSuccess(alice, collectionId, 'NFT', seller.address);
 
     // To transfer item to matcher it first needs to be transfered to EVM account of bob
     await transferExpectSuccess(collectionId, tokenId, seller, {Ethereum: subToEth(seller.address)});
-    // Fees will be paid from EVM account, so we should have some balance here
-    await transferBalanceExpectSuccess(api, seller, evmToAddress(subToEth(seller.address)), 10n ** 18n);
-    await transferBalanceExpectSuccess(api, alice, evmToAddress(subToEth(alice.address)), 10n ** 18n);
 
     // Token is owned by seller initially
     expect(await getTokenOwner(api, collectionId, tokenId)).to.be.deep.equal({Ethereum: subToEthLowercase(seller.address)});
@@ -120,66 +138,55 @@
     // Ask
     {
       await executeEthTxOnSub(web3, api, seller, evmCollection, m => m.approve(matcher.options.address, tokenId));
-      await executeEthTxOnSub(web3, api, seller, matcher, m => m.addAsk(PRICE, evmFungible.options.address, evmCollection.options.address, tokenId, 1));
+      await executeEthTxOnSub(web3, api, seller, matcher, m => m.addAsk(PRICE, '0x0000000000000000000000000000000000000001', evmCollection.options.address, tokenId));
     }
 
     // Token is transferred to matcher
     expect(await getTokenOwner(api, collectionId, tokenId)).to.be.deep.equal({Ethereum: matcher.options.address.toLowerCase()});
 
+    // Give buyer KSM
+    await matcher.methods.depositKSM(PRICE, subToEth(alice.address)).send({from: escrow});
+
     // Buy
     {
-      const sellerBalanceBeforePurchase = BigInt(await evmFungible.methods.balanceOf(subToEth(seller.address)).call());
-      const buyerBalanceBeforePurchase = BigInt(await evmFungible.methods.balanceOf(subToEth(alice.address)).call());
+      expect(await matcher.methods.balanceKSM(subToEth(seller.address)).call()).to.be.equal('0');
+      expect(await matcher.methods.balanceKSM(subToEth(alice.address)).call()).to.be.equal(PRICE.toString());
 
-      await executeEthTxOnSub(web3, api, alice, evmFungible, m => m.approve(matcher.options.address, PRICE));
-      // There is two functions named 'buy', so we should provide full signature
-      await executeEthTxOnSub(web3, api, alice, matcher, m =>
-        m['buy(address,uint256,address,uint256)'](evmCollection.options.address, tokenId, evmFungible.options.address, PRICE));
+      await executeEthTxOnSub(web3, api, alice, matcher, m => m.buyKSM(evmCollection.options.address, tokenId, subToEth(alice.address), subToEth(alice.address)));
 
-      // Approved price is removed from buyer balance, and added to seller
-      expect(BigInt(await evmFungible.methods.balanceOf(subToEth(seller.address)).call()) - sellerBalanceBeforePurchase === PRICE);
-      expect(buyerBalanceBeforePurchase - BigInt(await evmFungible.methods.balanceOf(subToEth(alice.address)).call()) === PRICE);
+      // Price is removed from buyer balance, and added to seller
+      expect(await matcher.methods.balanceKSM(subToEth(alice.address)).call()).to.be.equal('0');
+      expect(await matcher.methods.balanceKSM(subToEth(seller.address)).call()).to.be.equal(PRICE.toString());
     }
 
     // Token is transferred to evm account of alice
     expect(await getTokenOwner(api, collectionId, tokenId)).to.be.deep.equal({Ethereum: subToEthLowercase(alice.address)});
-
 
     // Transfer token to substrate side of alice
     await transferFromExpectSuccess(collectionId, tokenId, alice, {Ethereum: subToEth(alice.address)}, {Substrate: alice.address});
 
-    // Token is transferred to substrate account of alice
+    // Token is transferred to substrate account of alice, seller received funds
     expect(await getTokenOwner(api, collectionId, tokenId)).to.be.deep.equal({Substrate: alice.address});
   });
 
-  itWeb3('With escrow', async ({api, web3}) => {
+
+  itWeb3('Sell tokens from substrate user via EVM contract', async ({api, web3}) => {
     const alice = privateKey('//Alice');
     const matcherOwner = await createEthAccountWithBalance(api, web3);
-    const escrow = await createEthAccountWithBalance(api, web3);
     const matcherContract = new web3.eth.Contract(JSON.parse((await readFile(`${__dirname}/MarketPlace.abi`)).toString()), undefined, {
       from: matcherOwner,
       ...GAS_ARGS,
     });
-    const matcher = await matcherContract.deploy({data: (await readFile(`${__dirname}/MarketPlace.bin`)).toString(), arguments: [matcherOwner]}).send({from: matcherOwner, gas: 10000000});
-    await matcher.methods.setEscrow(escrow).send({from: matcherOwner});
-    const helpers = contractHelpers(web3, matcherOwner);
-    await helpers.methods.setSponsoringMode(matcher.options.address, SponsoringMode.Allowlisted).send({from: matcherOwner});
-    await helpers.methods.setSponsoringRateLimit(matcher.options.address, 1).send({from: matcherOwner});
+    const matcher = await matcherContract.deploy({data: (await readFile(`${__dirname}/MarketPlace.bin`)).toString(), arguments:[matcherOwner]}).send({from: matcherOwner});
     await transferBalanceToEth(api, alice, matcher.options.address);
 
     const collectionId = await createCollectionExpectSuccess({mode: {type: 'NFT'}});
     await setCollectionLimitsExpectSuccess(alice, collectionId, {sponsorApproveTimeout: 1});
     const evmCollection = new web3.eth.Contract(nonFungibleAbi as any, collectionIdToAddress(collectionId), {from: matcherOwner});
-    await setCollectionSponsorExpectSuccess(collectionId, alice.address);
-    await transferBalanceToEth(api, alice, subToEth(alice.address));
-    await confirmSponsorshipExpectSuccess(collectionId);
-
-    await helpers.methods.toggleAllowed(matcher.options.address, subToEth(alice.address), true).send({from: matcherOwner});
-    await addToAllowListExpectSuccess(alice, collectionId, evmToAddress(subToEth(alice.address)));
 
     const seller = privateKey(`//Seller/${Date.now()}`);
-    await helpers.methods.toggleAllowed(matcher.options.address, subToEth(seller.address), true).send({from: matcherOwner});
-
+    await transferBalanceTo(api, alice, seller.address);
+    
     const tokenId = await createItemExpectSuccess(alice, collectionId, 'NFT', seller.address);
 
     // To transfer item to matcher it first needs to be transfered to EVM account of bob
@@ -197,19 +204,11 @@
     // Token is transferred to matcher
     expect(await getTokenOwner(api, collectionId, tokenId)).to.be.deep.equal({Ethereum: matcher.options.address.toLowerCase()});
 
-    // Give buyer KSM
-    await matcher.methods.depositKSM(PRICE, subToEth(alice.address)).send({from: escrow});
-
     // Buy
     {
-      expect(await matcher.methods.balanceKSM(subToEth(seller.address)).call()).to.be.equal('0');
-      expect(await matcher.methods.balanceKSM(subToEth(alice.address)).call()).to.be.equal(PRICE.toString());
-
-      await executeEthTxOnSub(web3, api, alice, matcher, m => m.buyKSM(evmCollection.options.address, tokenId, subToEth(alice.address), subToEth(alice.address)));
-
-      // Price is removed from buyer balance, and added to seller
-      expect(await matcher.methods.balanceKSM(subToEth(alice.address)).call()).to.be.equal('0');
-      expect(await matcher.methods.balanceKSM(subToEth(seller.address)).call()).to.be.equal(PRICE.toString());
+      const sellerBalanceBeforePurchase = await getBalanceSingle(api, seller.address);
+      await executeEthTxOnSub(web3, api, alice, matcher, m => m.buy(evmCollection.options.address, tokenId), {value: PRICE});
+      expect(await getBalanceSingle(api, seller.address) - sellerBalanceBeforePurchase === PRICE);
     }
 
     // Token is transferred to evm account of alice
modifiedtests/src/interfaces/augment-api-errors.tsdiffbeforeafterboth
--- a/tests/src/interfaces/augment-api-errors.ts
+++ b/tests/src/interfaces/augment-api-errors.ts
@@ -105,6 +105,10 @@
        **/
       NoPermission: AugmentedError<ApiType>;
       /**
+       * Not sufficient founds to perform action
+       **/
+      NotSufficientFounds: AugmentedError<ApiType>;
+      /**
        * Tried to enable permissions which are only permitted to be disabled
        **/
       OwnerPermissionsCantBeReverted: AugmentedError<ApiType>;
modifiedtests/src/interfaces/augment-api-events.tsdiffbeforeafterboth
--- a/tests/src/interfaces/augment-api-events.ts
+++ b/tests/src/interfaces/augment-api-events.ts
@@ -4,7 +4,7 @@
 import type { ApiTypes } from '@polkadot/api-base/types';
 import type { Null, Option, Result, U256, U8aFixed, u128, u32, u64, u8 } from '@polkadot/types-codec';
 import type { AccountId32, H160, H256 } from '@polkadot/types/interfaces/runtime';
-import type { EthereumLog, EvmCoreErrorExitReason, FrameSupportTokensMiscBalanceStatus, FrameSupportWeightsDispatchInfo, OrmlVestingVestingSchedule, PalletCommonAccountBasicCrossAccountIdRepr, SpRuntimeDispatchError, UpDataStructsAccessMode, XcmV1MultiLocation, XcmV2Response, XcmV2TraitsError, XcmV2TraitsOutcome, XcmV2Xcm, XcmVersionedMultiAssets, XcmVersionedMultiLocation } from '@polkadot/types/lookup';
+import type { EthereumLog, EvmCoreErrorExitReason, FrameSupportTokensMiscBalanceStatus, FrameSupportWeightsDispatchInfo, OrmlVestingVestingSchedule, PalletEvmAccountBasicCrossAccountIdRepr, SpRuntimeDispatchError, UpDataStructsAccessMode, XcmV1MultiLocation, XcmV2Response, XcmV2TraitsError, XcmV2TraitsOutcome, XcmV2Xcm, XcmVersionedMultiAssets, XcmVersionedMultiLocation } from '@polkadot/types/lookup';
 
 declare module '@polkadot/api-base/types/events' {
   export interface AugmentedEvents<ApiType extends ApiTypes> {
@@ -68,7 +68,7 @@
        * 
        * * amount
        **/
-      Approved: AugmentedEvent<ApiType, [u32, u32, PalletCommonAccountBasicCrossAccountIdRepr, PalletCommonAccountBasicCrossAccountIdRepr, u128]>;
+      Approved: AugmentedEvent<ApiType, [u32, u32, PalletEvmAccountBasicCrossAccountIdRepr, PalletEvmAccountBasicCrossAccountIdRepr, u128]>;
       /**
        * New collection was created
        * 
@@ -102,7 +102,7 @@
        * 
        * * amount: Always 1 for NFT
        **/
-      ItemCreated: AugmentedEvent<ApiType, [u32, u32, PalletCommonAccountBasicCrossAccountIdRepr, u128]>;
+      ItemCreated: AugmentedEvent<ApiType, [u32, u32, PalletEvmAccountBasicCrossAccountIdRepr, u128]>;
       /**
        * Collection item was burned.
        * 
@@ -116,7 +116,7 @@
        * 
        * * amount: Always 1 for NFT
        **/
-      ItemDestroyed: AugmentedEvent<ApiType, [u32, u32, PalletCommonAccountBasicCrossAccountIdRepr, u128]>;
+      ItemDestroyed: AugmentedEvent<ApiType, [u32, u32, PalletEvmAccountBasicCrossAccountIdRepr, u128]>;
       /**
        * Item was transferred
        * 
@@ -130,7 +130,7 @@
        * 
        * * amount: Always 1 for NFT
        **/
-      Transfer: AugmentedEvent<ApiType, [u32, u32, PalletCommonAccountBasicCrossAccountIdRepr, PalletCommonAccountBasicCrossAccountIdRepr, u128]>;
+      Transfer: AugmentedEvent<ApiType, [u32, u32, PalletEvmAccountBasicCrossAccountIdRepr, PalletEvmAccountBasicCrossAccountIdRepr, u128]>;
       /**
        * Generic event
        **/
@@ -483,7 +483,7 @@
        * 
        * * user:  Address.
        **/
-      AllowListAddressAdded: AugmentedEvent<ApiType, [u32, PalletCommonAccountBasicCrossAccountIdRepr]>;
+      AllowListAddressAdded: AugmentedEvent<ApiType, [u32, PalletEvmAccountBasicCrossAccountIdRepr]>;
       /**
        * Address was remove from allow list
        * 
@@ -493,7 +493,7 @@
        * 
        * * user:  Address.
        **/
-      AllowListAddressRemoved: AugmentedEvent<ApiType, [u32, PalletCommonAccountBasicCrossAccountIdRepr]>;
+      AllowListAddressRemoved: AugmentedEvent<ApiType, [u32, PalletEvmAccountBasicCrossAccountIdRepr]>;
       /**
        * Collection admin was added
        * 
@@ -503,7 +503,7 @@
        * 
        * * admin:  Admin address.
        **/
-      CollectionAdminAdded: AugmentedEvent<ApiType, [u32, PalletCommonAccountBasicCrossAccountIdRepr]>;
+      CollectionAdminAdded: AugmentedEvent<ApiType, [u32, PalletEvmAccountBasicCrossAccountIdRepr]>;
       /**
        * Collection admin was removed
        * 
@@ -513,7 +513,7 @@
        * 
        * * admin:  Admin address.
        **/
-      CollectionAdminRemoved: AugmentedEvent<ApiType, [u32, PalletCommonAccountBasicCrossAccountIdRepr]>;
+      CollectionAdminRemoved: AugmentedEvent<ApiType, [u32, PalletEvmAccountBasicCrossAccountIdRepr]>;
       /**
        * Collection limits was set
        * 
modifiedtests/src/interfaces/augment-api-query.tsdiffbeforeafterboth
--- a/tests/src/interfaces/augment-api-query.ts
+++ b/tests/src/interfaces/augment-api-query.ts
@@ -5,7 +5,7 @@
 import type { BTreeMap, Bytes, Option, U256, Vec, bool, u128, u16, u32, u64 } from '@polkadot/types-codec';
 import type { AnyNumber, ITuple } from '@polkadot/types-codec/types';
 import type { AccountId32, H160, H256 } from '@polkadot/types/interfaces/runtime';
-import type { CumulusPalletDmpQueueConfigData, CumulusPalletDmpQueuePageIndexData, CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot, CumulusPalletXcmpQueueInboundChannelDetails, CumulusPalletXcmpQueueOutboundChannelDetails, CumulusPalletXcmpQueueQueueConfigData, EthereumBlock, EthereumReceiptReceiptV3, EthereumTransactionTransactionV2, FpRpcTransactionStatus, FrameSupportWeightsPerDispatchClassU64, FrameSystemAccountInfo, FrameSystemEventRecord, FrameSystemLastRuntimeUpgradeInfo, FrameSystemPhase, OrmlVestingVestingSchedule, PalletBalancesAccountData, PalletBalancesBalanceLock, PalletBalancesReleases, PalletBalancesReserveData, PalletCommonAccountBasicCrossAccountIdRepr, PalletEvmContractHelpersSponsoringModeT, PalletNonfungibleItemData, PalletRefungibleItemData, PalletTransactionPaymentReleases, PalletTreasuryProposal, PolkadotCorePrimitivesOutboundHrmpMessage, PolkadotPrimitivesV1AbridgedHostConfiguration, PolkadotPrimitivesV1PersistedValidationData, PolkadotPrimitivesV1UpgradeRestriction, SpRuntimeDigest, UpDataStructsCollection, UpDataStructsCollectionStats } from '@polkadot/types/lookup';
+import type { CumulusPalletDmpQueueConfigData, CumulusPalletDmpQueuePageIndexData, CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot, CumulusPalletXcmpQueueInboundChannelDetails, CumulusPalletXcmpQueueOutboundChannelDetails, CumulusPalletXcmpQueueQueueConfigData, EthereumBlock, EthereumReceiptReceiptV3, EthereumTransactionTransactionV2, FpRpcTransactionStatus, FrameSupportWeightsPerDispatchClassU64, FrameSystemAccountInfo, FrameSystemEventRecord, FrameSystemLastRuntimeUpgradeInfo, FrameSystemPhase, OrmlVestingVestingSchedule, PalletBalancesAccountData, PalletBalancesBalanceLock, PalletBalancesReleases, PalletBalancesReserveData, PalletEvmAccountBasicCrossAccountIdRepr, PalletEvmContractHelpersSponsoringModeT, PalletNonfungibleItemData, PalletRefungibleItemData, PalletTransactionPaymentReleases, PalletTreasuryProposal, PolkadotCorePrimitivesOutboundHrmpMessage, PolkadotPrimitivesV1AbridgedHostConfiguration, PolkadotPrimitivesV1PersistedValidationData, PolkadotPrimitivesV1UpgradeRestriction, SpRuntimeDigest, UpDataStructsCollection, UpDataStructsCollectionStats } from '@polkadot/types/lookup';
 import type { Observable } from '@polkadot/types/types';
 
 declare module '@polkadot/api-base/types/storage' {
@@ -73,7 +73,7 @@
       /**
        * Allowlisted collection users
        **/
-      allowlist: AugmentedQuery<ApiType, (arg1: u32 | AnyNumber | Uint8Array, arg2: PalletCommonAccountBasicCrossAccountIdRepr | { Substrate: any } | { Ethereum: any } | string | Uint8Array) => Observable<bool>, [u32, PalletCommonAccountBasicCrossAccountIdRepr]> & QueryableStorageEntry<ApiType, [u32, PalletCommonAccountBasicCrossAccountIdRepr]>;
+      allowlist: AugmentedQuery<ApiType, (arg1: u32 | AnyNumber | Uint8Array, arg2: PalletEvmAccountBasicCrossAccountIdRepr | { Substrate: any } | { Ethereum: any } | string | Uint8Array) => Observable<bool>, [u32, PalletEvmAccountBasicCrossAccountIdRepr]> & QueryableStorageEntry<ApiType, [u32, PalletEvmAccountBasicCrossAccountIdRepr]>;
       /**
        * Collection info
        **/
@@ -87,7 +87,7 @@
       /**
        * List of collection admins
        **/
-      isAdmin: AugmentedQuery<ApiType, (arg1: u32 | AnyNumber | Uint8Array, arg2: PalletCommonAccountBasicCrossAccountIdRepr | { Substrate: any } | { Ethereum: any } | string | Uint8Array) => Observable<bool>, [u32, PalletCommonAccountBasicCrossAccountIdRepr]> & QueryableStorageEntry<ApiType, [u32, PalletCommonAccountBasicCrossAccountIdRepr]>;
+      isAdmin: AugmentedQuery<ApiType, (arg1: u32 | AnyNumber | Uint8Array, arg2: PalletEvmAccountBasicCrossAccountIdRepr | { Substrate: any } | { Ethereum: any } | string | Uint8Array) => Observable<bool>, [u32, PalletEvmAccountBasicCrossAccountIdRepr]> & QueryableStorageEntry<ApiType, [u32, PalletEvmAccountBasicCrossAccountIdRepr]>;
       /**
        * Generic query
        **/
@@ -173,8 +173,8 @@
       [key: string]: QueryableStorageEntry<ApiType>;
     };
     fungible: {
-      allowance: AugmentedQuery<ApiType, (arg1: u32 | AnyNumber | Uint8Array, arg2: PalletCommonAccountBasicCrossAccountIdRepr | { Substrate: any } | { Ethereum: any } | string | Uint8Array, arg3: PalletCommonAccountBasicCrossAccountIdRepr | { Substrate: any } | { Ethereum: any } | string | Uint8Array) => Observable<u128>, [u32, PalletCommonAccountBasicCrossAccountIdRepr, PalletCommonAccountBasicCrossAccountIdRepr]> & QueryableStorageEntry<ApiType, [u32, PalletCommonAccountBasicCrossAccountIdRepr, PalletCommonAccountBasicCrossAccountIdRepr]>;
-      balance: AugmentedQuery<ApiType, (arg1: u32 | AnyNumber | Uint8Array, arg2: PalletCommonAccountBasicCrossAccountIdRepr | { Substrate: any } | { Ethereum: any } | string | Uint8Array) => Observable<u128>, [u32, PalletCommonAccountBasicCrossAccountIdRepr]> & QueryableStorageEntry<ApiType, [u32, PalletCommonAccountBasicCrossAccountIdRepr]>;
+      allowance: AugmentedQuery<ApiType, (arg1: u32 | AnyNumber | Uint8Array, arg2: PalletEvmAccountBasicCrossAccountIdRepr | { Substrate: any } | { Ethereum: any } | string | Uint8Array, arg3: PalletEvmAccountBasicCrossAccountIdRepr | { Substrate: any } | { Ethereum: any } | string | Uint8Array) => Observable<u128>, [u32, PalletEvmAccountBasicCrossAccountIdRepr, PalletEvmAccountBasicCrossAccountIdRepr]> & QueryableStorageEntry<ApiType, [u32, PalletEvmAccountBasicCrossAccountIdRepr, PalletEvmAccountBasicCrossAccountIdRepr]>;
+      balance: AugmentedQuery<ApiType, (arg1: u32 | AnyNumber | Uint8Array, arg2: PalletEvmAccountBasicCrossAccountIdRepr | { Substrate: any } | { Ethereum: any } | string | Uint8Array) => Observable<u128>, [u32, PalletEvmAccountBasicCrossAccountIdRepr]> & QueryableStorageEntry<ApiType, [u32, PalletEvmAccountBasicCrossAccountIdRepr]>;
       totalSupply: AugmentedQuery<ApiType, (arg: u32 | AnyNumber | Uint8Array) => Observable<u128>, [u32]> & QueryableStorageEntry<ApiType, [u32]>;
       /**
        * Generic query
@@ -208,12 +208,12 @@
       [key: string]: QueryableStorageEntry<ApiType>;
     };
     nonfungible: {
-      accountBalance: AugmentedQuery<ApiType, (arg1: u32 | AnyNumber | Uint8Array, arg2: PalletCommonAccountBasicCrossAccountIdRepr | { Substrate: any } | { Ethereum: any } | string | Uint8Array) => Observable<u32>, [u32, PalletCommonAccountBasicCrossAccountIdRepr]> & QueryableStorageEntry<ApiType, [u32, PalletCommonAccountBasicCrossAccountIdRepr]>;
-      allowance: AugmentedQuery<ApiType, (arg1: u32 | AnyNumber | Uint8Array, arg2: u32 | AnyNumber | Uint8Array) => Observable<Option<PalletCommonAccountBasicCrossAccountIdRepr>>, [u32, u32]> & QueryableStorageEntry<ApiType, [u32, u32]>;
+      accountBalance: AugmentedQuery<ApiType, (arg1: u32 | AnyNumber | Uint8Array, arg2: PalletEvmAccountBasicCrossAccountIdRepr | { Substrate: any } | { Ethereum: any } | string | Uint8Array) => Observable<u32>, [u32, PalletEvmAccountBasicCrossAccountIdRepr]> & QueryableStorageEntry<ApiType, [u32, PalletEvmAccountBasicCrossAccountIdRepr]>;
+      allowance: AugmentedQuery<ApiType, (arg1: u32 | AnyNumber | Uint8Array, arg2: u32 | AnyNumber | Uint8Array) => Observable<Option<PalletEvmAccountBasicCrossAccountIdRepr>>, [u32, u32]> & QueryableStorageEntry<ApiType, [u32, u32]>;
       /**
        * Used to enumerate tokens owned by account
        **/
-      owned: AugmentedQuery<ApiType, (arg1: u32 | AnyNumber | Uint8Array, arg2: PalletCommonAccountBasicCrossAccountIdRepr | { Substrate: any } | { Ethereum: any } | string | Uint8Array, arg3: u32 | AnyNumber | Uint8Array) => Observable<bool>, [u32, PalletCommonAccountBasicCrossAccountIdRepr, u32]> & QueryableStorageEntry<ApiType, [u32, PalletCommonAccountBasicCrossAccountIdRepr, u32]>;
+      owned: AugmentedQuery<ApiType, (arg1: u32 | AnyNumber | Uint8Array, arg2: PalletEvmAccountBasicCrossAccountIdRepr | { Substrate: any } | { Ethereum: any } | string | Uint8Array, arg3: u32 | AnyNumber | Uint8Array) => Observable<bool>, [u32, PalletEvmAccountBasicCrossAccountIdRepr, u32]> & QueryableStorageEntry<ApiType, [u32, PalletEvmAccountBasicCrossAccountIdRepr, u32]>;
       tokenData: AugmentedQuery<ApiType, (arg1: u32 | AnyNumber | Uint8Array, arg2: u32 | AnyNumber | Uint8Array) => Observable<Option<PalletNonfungibleItemData>>, [u32, u32]> & QueryableStorageEntry<ApiType, [u32, u32]>;
       tokensBurnt: AugmentedQuery<ApiType, (arg: u32 | AnyNumber | Uint8Array) => Observable<u32>, [u32]> & QueryableStorageEntry<ApiType, [u32]>;
       tokensMinted: AugmentedQuery<ApiType, (arg: u32 | AnyNumber | Uint8Array) => Observable<u32>, [u32]> & QueryableStorageEntry<ApiType, [u32]>;
@@ -371,13 +371,13 @@
       [key: string]: QueryableStorageEntry<ApiType>;
     };
     refungible: {
-      accountBalance: AugmentedQuery<ApiType, (arg1: u32 | AnyNumber | Uint8Array, arg2: PalletCommonAccountBasicCrossAccountIdRepr | { Substrate: any } | { Ethereum: any } | string | Uint8Array) => Observable<u32>, [u32, PalletCommonAccountBasicCrossAccountIdRepr]> & QueryableStorageEntry<ApiType, [u32, PalletCommonAccountBasicCrossAccountIdRepr]>;
-      allowance: AugmentedQuery<ApiType, (arg1: u32 | AnyNumber | Uint8Array, arg2: u32 | AnyNumber | Uint8Array, arg3: PalletCommonAccountBasicCrossAccountIdRepr | { Substrate: any } | { Ethereum: any } | string | Uint8Array, arg4: PalletCommonAccountBasicCrossAccountIdRepr | { Substrate: any } | { Ethereum: any } | string | Uint8Array) => Observable<u128>, [u32, u32, PalletCommonAccountBasicCrossAccountIdRepr, PalletCommonAccountBasicCrossAccountIdRepr]> & QueryableStorageEntry<ApiType, [u32, u32, PalletCommonAccountBasicCrossAccountIdRepr, PalletCommonAccountBasicCrossAccountIdRepr]>;
-      balance: AugmentedQuery<ApiType, (arg1: u32 | AnyNumber | Uint8Array, arg2: u32 | AnyNumber | Uint8Array, arg3: PalletCommonAccountBasicCrossAccountIdRepr | { Substrate: any } | { Ethereum: any } | string | Uint8Array) => Observable<u128>, [u32, u32, PalletCommonAccountBasicCrossAccountIdRepr]> & QueryableStorageEntry<ApiType, [u32, u32, PalletCommonAccountBasicCrossAccountIdRepr]>;
+      accountBalance: AugmentedQuery<ApiType, (arg1: u32 | AnyNumber | Uint8Array, arg2: PalletEvmAccountBasicCrossAccountIdRepr | { Substrate: any } | { Ethereum: any } | string | Uint8Array) => Observable<u32>, [u32, PalletEvmAccountBasicCrossAccountIdRepr]> & QueryableStorageEntry<ApiType, [u32, PalletEvmAccountBasicCrossAccountIdRepr]>;
+      allowance: AugmentedQuery<ApiType, (arg1: u32 | AnyNumber | Uint8Array, arg2: u32 | AnyNumber | Uint8Array, arg3: PalletEvmAccountBasicCrossAccountIdRepr | { Substrate: any } | { Ethereum: any } | string | Uint8Array, arg4: PalletEvmAccountBasicCrossAccountIdRepr | { Substrate: any } | { Ethereum: any } | string | Uint8Array) => Observable<u128>, [u32, u32, PalletEvmAccountBasicCrossAccountIdRepr, PalletEvmAccountBasicCrossAccountIdRepr]> & QueryableStorageEntry<ApiType, [u32, u32, PalletEvmAccountBasicCrossAccountIdRepr, PalletEvmAccountBasicCrossAccountIdRepr]>;
+      balance: AugmentedQuery<ApiType, (arg1: u32 | AnyNumber | Uint8Array, arg2: u32 | AnyNumber | Uint8Array, arg3: PalletEvmAccountBasicCrossAccountIdRepr | { Substrate: any } | { Ethereum: any } | string | Uint8Array) => Observable<u128>, [u32, u32, PalletEvmAccountBasicCrossAccountIdRepr]> & QueryableStorageEntry<ApiType, [u32, u32, PalletEvmAccountBasicCrossAccountIdRepr]>;
       /**
        * Used to enumerate tokens owned by account
        **/
-      owned: AugmentedQuery<ApiType, (arg1: u32 | AnyNumber | Uint8Array, arg2: PalletCommonAccountBasicCrossAccountIdRepr | { Substrate: any } | { Ethereum: any } | string | Uint8Array, arg3: u32 | AnyNumber | Uint8Array) => Observable<bool>, [u32, PalletCommonAccountBasicCrossAccountIdRepr, u32]> & QueryableStorageEntry<ApiType, [u32, PalletCommonAccountBasicCrossAccountIdRepr, u32]>;
+      owned: AugmentedQuery<ApiType, (arg1: u32 | AnyNumber | Uint8Array, arg2: PalletEvmAccountBasicCrossAccountIdRepr | { Substrate: any } | { Ethereum: any } | string | Uint8Array, arg3: u32 | AnyNumber | Uint8Array) => Observable<bool>, [u32, PalletEvmAccountBasicCrossAccountIdRepr, u32]> & QueryableStorageEntry<ApiType, [u32, PalletEvmAccountBasicCrossAccountIdRepr, u32]>;
       tokenData: AugmentedQuery<ApiType, (arg1: u32 | AnyNumber | Uint8Array, arg2: u32 | AnyNumber | Uint8Array) => Observable<PalletRefungibleItemData>, [u32, u32]> & QueryableStorageEntry<ApiType, [u32, u32]>;
       tokensBurnt: AugmentedQuery<ApiType, (arg: u32 | AnyNumber | Uint8Array) => Observable<u32>, [u32]> & QueryableStorageEntry<ApiType, [u32]>;
       tokensMinted: AugmentedQuery<ApiType, (arg: u32 | AnyNumber | Uint8Array) => Observable<u32>, [u32]> & QueryableStorageEntry<ApiType, [u32]>;
modifiedtests/src/interfaces/augment-api-rpc.tsdiffbeforeafterboth
--- a/tests/src/interfaces/augment-api-rpc.ts
+++ b/tests/src/interfaces/augment-api-rpc.ts
@@ -1,7 +1,7 @@
 // Auto-generated via `yarn polkadot-types-from-chain`, do not edit
 /* eslint-disable */
 
-import type { PalletCommonAccountBasicCrossAccountIdRepr, UpDataStructsCollection, UpDataStructsCollectionStats } from './unique';
+import type { PalletEvmAccountBasicCrossAccountIdRepr, UpDataStructsCollection, UpDataStructsCollectionStats } from './unique';
 import type { AugmentedRpc } from '@polkadot/rpc-core/types';
 import type { Metadata, StorageKey } from '@polkadot/types';
 import type { Bytes, HashMap, Json, Null, Option, Text, U256, U64, Vec, bool, u128, u32, u64 } from '@polkadot/types-codec';
@@ -562,31 +562,31 @@
       /**
        * Get amount of different user tokens
        **/
-      accountBalance: AugmentedRpc<(collection: u32 | AnyNumber | Uint8Array, account: PalletCommonAccountBasicCrossAccountIdRepr | { Substrate: any } | { Ethereum: any } | string | Uint8Array, at?: Hash | string | Uint8Array) => Observable<u32>>;
+      accountBalance: AugmentedRpc<(collection: u32 | AnyNumber | Uint8Array, account: PalletEvmAccountBasicCrossAccountIdRepr | { Substrate: any } | { Ethereum: any } | string | Uint8Array, at?: Hash | string | Uint8Array) => Observable<u32>>;
       /**
        * Get tokens owned by account
        **/
-      accountTokens: AugmentedRpc<(collection: u32 | AnyNumber | Uint8Array, account: PalletCommonAccountBasicCrossAccountIdRepr | { Substrate: any } | { Ethereum: any } | string | Uint8Array, at?: Hash | string | Uint8Array) => Observable<Vec<u32>>>;
+      accountTokens: AugmentedRpc<(collection: u32 | AnyNumber | Uint8Array, account: PalletEvmAccountBasicCrossAccountIdRepr | { Substrate: any } | { Ethereum: any } | string | Uint8Array, at?: Hash | string | Uint8Array) => Observable<Vec<u32>>>;
       /**
        * Get admin list
        **/
-      adminlist: AugmentedRpc<(collection: u32 | AnyNumber | Uint8Array, at?: Hash | string | Uint8Array) => Observable<Vec<PalletCommonAccountBasicCrossAccountIdRepr>>>;
+      adminlist: AugmentedRpc<(collection: u32 | AnyNumber | Uint8Array, at?: Hash | string | Uint8Array) => Observable<Vec<PalletEvmAccountBasicCrossAccountIdRepr>>>;
       /**
        * Get allowed amount
        **/
-      allowance: AugmentedRpc<(collection: u32 | AnyNumber | Uint8Array, sender: PalletCommonAccountBasicCrossAccountIdRepr | { Substrate: any } | { Ethereum: any } | string | Uint8Array, spender: PalletCommonAccountBasicCrossAccountIdRepr | { Substrate: any } | { Ethereum: any } | string | Uint8Array, tokenId: u32 | AnyNumber | Uint8Array, at?: Hash | string | Uint8Array) => Observable<u128>>;
+      allowance: AugmentedRpc<(collection: u32 | AnyNumber | Uint8Array, sender: PalletEvmAccountBasicCrossAccountIdRepr | { Substrate: any } | { Ethereum: any } | string | Uint8Array, spender: PalletEvmAccountBasicCrossAccountIdRepr | { Substrate: any } | { Ethereum: any } | string | Uint8Array, tokenId: u32 | AnyNumber | Uint8Array, at?: Hash | string | Uint8Array) => Observable<u128>>;
       /**
        * Check if user is allowed to use collection
        **/
-      allowed: AugmentedRpc<(collection: u32 | AnyNumber | Uint8Array, account: PalletCommonAccountBasicCrossAccountIdRepr | { Substrate: any } | { Ethereum: any } | string | Uint8Array, at?: Hash | string | Uint8Array) => Observable<bool>>;
+      allowed: AugmentedRpc<(collection: u32 | AnyNumber | Uint8Array, account: PalletEvmAccountBasicCrossAccountIdRepr | { Substrate: any } | { Ethereum: any } | string | Uint8Array, at?: Hash | string | Uint8Array) => Observable<bool>>;
       /**
        * Get allowlist
        **/
-      allowlist: AugmentedRpc<(collection: u32 | AnyNumber | Uint8Array, at?: Hash | string | Uint8Array) => Observable<Vec<PalletCommonAccountBasicCrossAccountIdRepr>>>;
+      allowlist: AugmentedRpc<(collection: u32 | AnyNumber | Uint8Array, at?: Hash | string | Uint8Array) => Observable<Vec<PalletEvmAccountBasicCrossAccountIdRepr>>>;
       /**
        * Get amount of specific account token
        **/
-      balance: AugmentedRpc<(collection: u32 | AnyNumber | Uint8Array, account: PalletCommonAccountBasicCrossAccountIdRepr | { Substrate: any } | { Ethereum: any } | string | Uint8Array, tokenId: u32 | AnyNumber | Uint8Array, at?: Hash | string | Uint8Array) => Observable<u128>>;
+      balance: AugmentedRpc<(collection: u32 | AnyNumber | Uint8Array, account: PalletEvmAccountBasicCrossAccountIdRepr | { Substrate: any } | { Ethereum: any } | string | Uint8Array, tokenId: u32 | AnyNumber | Uint8Array, at?: Hash | string | Uint8Array) => Observable<u128>>;
       /**
        * Get collection by specified id
        **/
@@ -614,7 +614,7 @@
       /**
        * Get token owner
        **/
-      tokenOwner: AugmentedRpc<(collection: u32 | AnyNumber | Uint8Array, tokenId: u32 | AnyNumber | Uint8Array, at?: Hash | string | Uint8Array) => Observable<PalletCommonAccountBasicCrossAccountIdRepr>>;
+      tokenOwner: AugmentedRpc<(collection: u32 | AnyNumber | Uint8Array, tokenId: u32 | AnyNumber | Uint8Array, at?: Hash | string | Uint8Array) => Observable<PalletEvmAccountBasicCrossAccountIdRepr>>;
       /**
        * Get token variable metadata
        **/
modifiedtests/src/interfaces/augment-api-tx.tsdiffbeforeafterboth
--- a/tests/src/interfaces/augment-api-tx.ts
+++ b/tests/src/interfaces/augment-api-tx.ts
@@ -5,7 +5,7 @@
 import type { Bytes, Compact, Option, U256, Vec, bool, u128, u16, u32, u64 } from '@polkadot/types-codec';
 import type { AnyNumber, ITuple } from '@polkadot/types-codec/types';
 import type { AccountId32, Call, H160, H256, MultiAddress, Perbill } from '@polkadot/types/interfaces/runtime';
-import type { CumulusPrimitivesParachainInherentParachainInherentData, EthereumTransactionTransactionV2, OrmlVestingVestingSchedule, PalletCommonAccountBasicCrossAccountIdRepr, UpDataStructsAccessMode, UpDataStructsCollectionLimits, UpDataStructsCollectionMode, UpDataStructsCreateCollectionData, UpDataStructsCreateItemData, UpDataStructsCreateItemExData, UpDataStructsMetaUpdatePermission, UpDataStructsSchemaVersion, XcmV1MultiLocation, XcmV2WeightLimit, XcmVersionedMultiAssets, XcmVersionedMultiLocation, XcmVersionedXcm } from '@polkadot/types/lookup';
+import type { CumulusPrimitivesParachainInherentParachainInherentData, EthereumTransactionTransactionV2, OrmlVestingVestingSchedule, PalletEvmAccountBasicCrossAccountIdRepr, UpDataStructsAccessMode, UpDataStructsCollectionLimits, UpDataStructsCollectionMode, UpDataStructsCreateCollectionData, UpDataStructsCreateItemData, UpDataStructsCreateItemExData, UpDataStructsMetaUpdatePermission, UpDataStructsSchemaVersion, XcmV1MultiLocation, XcmV2WeightLimit, XcmVersionedMultiAssets, XcmVersionedMultiLocation, XcmVersionedXcm } from '@polkadot/types/lookup';
 
 declare module '@polkadot/api-base/types/submittable' {
   export interface AugmentedSubmittables<ApiType extends ApiTypes> {
@@ -551,7 +551,7 @@
        * 
        * * new_admin_id: Address of new admin to add.
        **/
-      addCollectionAdmin: AugmentedSubmittable<(collectionId: u32 | AnyNumber | Uint8Array, newAdminId: PalletCommonAccountBasicCrossAccountIdRepr | { Substrate: any } | { Ethereum: any } | string | Uint8Array) => SubmittableExtrinsic<ApiType>, [u32, PalletCommonAccountBasicCrossAccountIdRepr]>;
+      addCollectionAdmin: AugmentedSubmittable<(collectionId: u32 | AnyNumber | Uint8Array, newAdminId: PalletEvmAccountBasicCrossAccountIdRepr | { Substrate: any } | { Ethereum: any } | string | Uint8Array) => SubmittableExtrinsic<ApiType>, [u32, PalletEvmAccountBasicCrossAccountIdRepr]>;
       /**
        * Add an address to allow list.
        * 
@@ -566,7 +566,7 @@
        * 
        * * address.
        **/
-      addToAllowList: AugmentedSubmittable<(collectionId: u32 | AnyNumber | Uint8Array, address: PalletCommonAccountBasicCrossAccountIdRepr | { Substrate: any } | { Ethereum: any } | string | Uint8Array) => SubmittableExtrinsic<ApiType>, [u32, PalletCommonAccountBasicCrossAccountIdRepr]>;
+      addToAllowList: AugmentedSubmittable<(collectionId: u32 | AnyNumber | Uint8Array, address: PalletEvmAccountBasicCrossAccountIdRepr | { Substrate: any } | { Ethereum: any } | string | Uint8Array) => SubmittableExtrinsic<ApiType>, [u32, PalletEvmAccountBasicCrossAccountIdRepr]>;
       /**
        * Set, change, or remove approved address to transfer the ownership of the NFT.
        * 
@@ -584,7 +584,7 @@
        * 
        * * item_id: ID of the item.
        **/
-      approve: AugmentedSubmittable<(spender: PalletCommonAccountBasicCrossAccountIdRepr | { Substrate: any } | { Ethereum: any } | string | Uint8Array, collectionId: u32 | AnyNumber | Uint8Array, itemId: u32 | AnyNumber | Uint8Array, amount: u128 | AnyNumber | Uint8Array) => SubmittableExtrinsic<ApiType>, [PalletCommonAccountBasicCrossAccountIdRepr, u32, u32, u128]>;
+      approve: AugmentedSubmittable<(spender: PalletEvmAccountBasicCrossAccountIdRepr | { Substrate: any } | { Ethereum: any } | string | Uint8Array, collectionId: u32 | AnyNumber | Uint8Array, itemId: u32 | AnyNumber | Uint8Array, amount: u128 | AnyNumber | Uint8Array) => SubmittableExtrinsic<ApiType>, [PalletEvmAccountBasicCrossAccountIdRepr, u32, u32, u128]>;
       /**
        * Destroys a concrete instance of NFT on behalf of the owner
        * See also: [`approve`]
@@ -603,7 +603,7 @@
        * 
        * * from: owner of item
        **/
-      burnFrom: AugmentedSubmittable<(collectionId: u32 | AnyNumber | Uint8Array, from: PalletCommonAccountBasicCrossAccountIdRepr | { Substrate: any } | { Ethereum: any } | string | Uint8Array, itemId: u32 | AnyNumber | Uint8Array, value: u128 | AnyNumber | Uint8Array) => SubmittableExtrinsic<ApiType>, [u32, PalletCommonAccountBasicCrossAccountIdRepr, u32, u128]>;
+      burnFrom: AugmentedSubmittable<(collectionId: u32 | AnyNumber | Uint8Array, from: PalletEvmAccountBasicCrossAccountIdRepr | { Substrate: any } | { Ethereum: any } | string | Uint8Array, itemId: u32 | AnyNumber | Uint8Array, value: u128 | AnyNumber | Uint8Array) => SubmittableExtrinsic<ApiType>, [u32, PalletEvmAccountBasicCrossAccountIdRepr, u32, u128]>;
       /**
        * Destroys a concrete instance of NFT.
        * 
@@ -688,7 +688,7 @@
        * 
        * * data: Token data to store on chain.
        **/
-      createItem: AugmentedSubmittable<(collectionId: u32 | AnyNumber | Uint8Array, owner: PalletCommonAccountBasicCrossAccountIdRepr | { Substrate: any } | { Ethereum: any } | string | Uint8Array, data: UpDataStructsCreateItemData | { NFT: any } | { Fungible: any } | { ReFungible: any } | string | Uint8Array) => SubmittableExtrinsic<ApiType>, [u32, PalletCommonAccountBasicCrossAccountIdRepr, UpDataStructsCreateItemData]>;
+      createItem: AugmentedSubmittable<(collectionId: u32 | AnyNumber | Uint8Array, owner: PalletEvmAccountBasicCrossAccountIdRepr | { Substrate: any } | { Ethereum: any } | string | Uint8Array, data: UpDataStructsCreateItemData | { NFT: any } | { Fungible: any } | { ReFungible: any } | string | Uint8Array) => SubmittableExtrinsic<ApiType>, [u32, PalletEvmAccountBasicCrossAccountIdRepr, UpDataStructsCreateItemData]>;
       /**
        * This method creates multiple items in a collection created with CreateCollection method.
        * 
@@ -709,7 +709,7 @@
        * 
        * * owner: Address, initial owner of the NFT.
        **/
-      createMultipleItems: AugmentedSubmittable<(collectionId: u32 | AnyNumber | Uint8Array, owner: PalletCommonAccountBasicCrossAccountIdRepr | { Substrate: any } | { Ethereum: any } | string | Uint8Array, itemsData: Vec<UpDataStructsCreateItemData> | (UpDataStructsCreateItemData | { NFT: any } | { Fungible: any } | { ReFungible: any } | string | Uint8Array)[]) => SubmittableExtrinsic<ApiType>, [u32, PalletCommonAccountBasicCrossAccountIdRepr, Vec<UpDataStructsCreateItemData>]>;
+      createMultipleItems: AugmentedSubmittable<(collectionId: u32 | AnyNumber | Uint8Array, owner: PalletEvmAccountBasicCrossAccountIdRepr | { Substrate: any } | { Ethereum: any } | string | Uint8Array, itemsData: Vec<UpDataStructsCreateItemData> | (UpDataStructsCreateItemData | { NFT: any } | { Fungible: any } | { ReFungible: any } | string | Uint8Array)[]) => SubmittableExtrinsic<ApiType>, [u32, PalletEvmAccountBasicCrossAccountIdRepr, Vec<UpDataStructsCreateItemData>]>;
       createMultipleItemsEx: AugmentedSubmittable<(collectionId: u32 | AnyNumber | Uint8Array, data: UpDataStructsCreateItemExData | { NFT: any } | { Fungible: any } | { RefungibleMultipleItems: any } | { RefungibleMultipleOwners: any } | string | Uint8Array) => SubmittableExtrinsic<ApiType>, [u32, UpDataStructsCreateItemExData]>;
       /**
        * **DANGEROUS**: Destroys collection and all NFTs within this collection. Users irrecoverably lose their assets and may lose real money.
@@ -737,7 +737,7 @@
        * 
        * * account_id: Address of admin to remove.
        **/
-      removeCollectionAdmin: AugmentedSubmittable<(collectionId: u32 | AnyNumber | Uint8Array, accountId: PalletCommonAccountBasicCrossAccountIdRepr | { Substrate: any } | { Ethereum: any } | string | Uint8Array) => SubmittableExtrinsic<ApiType>, [u32, PalletCommonAccountBasicCrossAccountIdRepr]>;
+      removeCollectionAdmin: AugmentedSubmittable<(collectionId: u32 | AnyNumber | Uint8Array, accountId: PalletEvmAccountBasicCrossAccountIdRepr | { Substrate: any } | { Ethereum: any } | string | Uint8Array) => SubmittableExtrinsic<ApiType>, [u32, PalletEvmAccountBasicCrossAccountIdRepr]>;
       /**
        * Switch back to pay-per-own-transaction model.
        * 
@@ -764,7 +764,7 @@
        * 
        * * address.
        **/
-      removeFromAllowList: AugmentedSubmittable<(collectionId: u32 | AnyNumber | Uint8Array, address: PalletCommonAccountBasicCrossAccountIdRepr | { Substrate: any } | { Ethereum: any } | string | Uint8Array) => SubmittableExtrinsic<ApiType>, [u32, PalletCommonAccountBasicCrossAccountIdRepr]>;
+      removeFromAllowList: AugmentedSubmittable<(collectionId: u32 | AnyNumber | Uint8Array, address: PalletEvmAccountBasicCrossAccountIdRepr | { Substrate: any } | { Ethereum: any } | string | Uint8Array) => SubmittableExtrinsic<ApiType>, [u32, PalletEvmAccountBasicCrossAccountIdRepr]>;
       setCollectionLimits: AugmentedSubmittable<(collectionId: u32 | AnyNumber | Uint8Array, newLimit: UpDataStructsCollectionLimits | { accountTokenOwnershipLimit?: any; sponsoredDataSize?: any; sponsoredDataRateLimit?: any; tokenLimit?: any; sponsorTransferTimeout?: any; sponsorApproveTimeout?: any; ownerCanTransfer?: any; ownerCanDestroy?: any; transfersEnabled?: any } | string | Uint8Array) => SubmittableExtrinsic<ApiType>, [u32, UpDataStructsCollectionLimits]>;
       /**
        * # Permissions
@@ -938,7 +938,7 @@
        * * Fungible Mode: Must specify transferred amount
        * * Re-Fungible Mode: Must specify transferred portion (between 0 and 1)
        **/
-      transfer: AugmentedSubmittable<(recipient: PalletCommonAccountBasicCrossAccountIdRepr | { Substrate: any } | { Ethereum: any } | string | Uint8Array, collectionId: u32 | AnyNumber | Uint8Array, itemId: u32 | AnyNumber | Uint8Array, value: u128 | AnyNumber | Uint8Array) => SubmittableExtrinsic<ApiType>, [PalletCommonAccountBasicCrossAccountIdRepr, u32, u32, u128]>;
+      transfer: AugmentedSubmittable<(recipient: PalletEvmAccountBasicCrossAccountIdRepr | { Substrate: any } | { Ethereum: any } | string | Uint8Array, collectionId: u32 | AnyNumber | Uint8Array, itemId: u32 | AnyNumber | Uint8Array, value: u128 | AnyNumber | Uint8Array) => SubmittableExtrinsic<ApiType>, [PalletEvmAccountBasicCrossAccountIdRepr, u32, u32, u128]>;
       /**
        * Change ownership of a NFT on behalf of the owner. See Approve method for additional information. After this method executes, the approval is removed so that the approved address will not be able to transfer this NFT again from this owner.
        * 
@@ -960,7 +960,7 @@
        * 
        * * value: Amount to transfer.
        **/
-      transferFrom: AugmentedSubmittable<(from: PalletCommonAccountBasicCrossAccountIdRepr | { Substrate: any } | { Ethereum: any } | string | Uint8Array, recipient: PalletCommonAccountBasicCrossAccountIdRepr | { Substrate: any } | { Ethereum: any } | string | Uint8Array, collectionId: u32 | AnyNumber | Uint8Array, itemId: u32 | AnyNumber | Uint8Array, value: u128 | AnyNumber | Uint8Array) => SubmittableExtrinsic<ApiType>, [PalletCommonAccountBasicCrossAccountIdRepr, PalletCommonAccountBasicCrossAccountIdRepr, u32, u32, u128]>;
+      transferFrom: AugmentedSubmittable<(from: PalletEvmAccountBasicCrossAccountIdRepr | { Substrate: any } | { Ethereum: any } | string | Uint8Array, recipient: PalletEvmAccountBasicCrossAccountIdRepr | { Substrate: any } | { Ethereum: any } | string | Uint8Array, collectionId: u32 | AnyNumber | Uint8Array, itemId: u32 | AnyNumber | Uint8Array, value: u128 | AnyNumber | Uint8Array) => SubmittableExtrinsic<ApiType>, [PalletEvmAccountBasicCrossAccountIdRepr, PalletEvmAccountBasicCrossAccountIdRepr, u32, u32, u128]>;
       /**
        * Generic tx
        **/
modifiedtests/src/interfaces/augment-types.tsdiffbeforeafterboth
--- a/tests/src/interfaces/augment-types.ts
+++ b/tests/src/interfaces/augment-types.ts
@@ -1,7 +1,7 @@
 // Auto-generated via `yarn polkadot-types-from-defs`, do not edit
 /* eslint-disable */
 
-import type { CumulusPalletDmpQueueCall, CumulusPalletDmpQueueConfigData, CumulusPalletDmpQueueError, CumulusPalletDmpQueueEvent, CumulusPalletDmpQueuePageIndexData, CumulusPalletParachainSystemCall, CumulusPalletParachainSystemError, CumulusPalletParachainSystemEvent, CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot, CumulusPalletXcmCall, CumulusPalletXcmError, CumulusPalletXcmEvent, CumulusPalletXcmpQueueCall, CumulusPalletXcmpQueueError, CumulusPalletXcmpQueueEvent, CumulusPalletXcmpQueueInboundChannelDetails, CumulusPalletXcmpQueueInboundState, CumulusPalletXcmpQueueOutboundChannelDetails, CumulusPalletXcmpQueueOutboundState, CumulusPalletXcmpQueueQueueConfigData, CumulusPrimitivesParachainInherentParachainInherentData, EthbloomBloom, EthereumBlock, EthereumHeader, EthereumLog, EthereumReceiptEip658ReceiptData, EthereumReceiptReceiptV3, EthereumTransactionAccessListItem, EthereumTransactionEip1559Transaction, EthereumTransactionEip2930Transaction, EthereumTransactionLegacyTransaction, EthereumTransactionTransactionAction, EthereumTransactionTransactionSignature, EthereumTransactionTransactionV2, EthereumTypesHashH64, EvmCoreErrorExitError, EvmCoreErrorExitFatal, EvmCoreErrorExitReason, EvmCoreErrorExitRevert, EvmCoreErrorExitSucceed, FpRpcTransactionStatus, FrameSupportPalletId, FrameSupportTokensMiscBalanceStatus, FrameSupportWeightsDispatchClass, FrameSupportWeightsDispatchInfo, FrameSupportWeightsPays, FrameSupportWeightsPerDispatchClassU32, FrameSupportWeightsPerDispatchClassU64, FrameSupportWeightsPerDispatchClassWeightsPerClass, FrameSupportWeightsRuntimeDbWeight, FrameSupportWeightsWeightToFeeCoefficient, FrameSystemAccountInfo, FrameSystemCall, FrameSystemError, FrameSystemEvent, FrameSystemEventRecord, FrameSystemExtensionsCheckGenesis, FrameSystemExtensionsCheckNonce, FrameSystemExtensionsCheckSpecVersion, FrameSystemExtensionsCheckWeight, FrameSystemLastRuntimeUpgradeInfo, FrameSystemLimitsBlockLength, FrameSystemLimitsBlockWeights, FrameSystemLimitsWeightsPerClass, FrameSystemPhase, OrmlVestingModuleCall, OrmlVestingModuleError, OrmlVestingModuleEvent, OrmlVestingVestingSchedule, PalletBalancesAccountData, PalletBalancesBalanceLock, PalletBalancesCall, PalletBalancesError, PalletBalancesEvent, PalletBalancesReasons, PalletBalancesReleases, PalletBalancesReserveData, PalletCommonAccountBasicCrossAccountIdRepr, PalletCommonError, PalletCommonEvent, PalletEthereumCall, PalletEthereumError, PalletEthereumEvent, PalletEvmCall, PalletEvmCoderSubstrateError, PalletEvmContractHelpersError, PalletEvmContractHelpersSponsoringModeT, PalletEvmError, PalletEvmEvent, PalletEvmMigrationCall, PalletEvmMigrationError, PalletFungibleError, PalletInflationCall, PalletNonfungibleError, PalletNonfungibleItemData, PalletRefungibleError, PalletRefungibleItemData, PalletSudoCall, PalletSudoError, PalletSudoEvent, PalletTemplateTransactionPaymentCall, PalletTemplateTransactionPaymentChargeTransactionPayment, PalletTimestampCall, PalletTransactionPaymentReleases, PalletTreasuryCall, PalletTreasuryError, PalletTreasuryEvent, PalletTreasuryProposal, PalletUniqueCall, PalletUniqueError, PalletUniqueRawEvent, PalletXcmCall, PalletXcmError, PalletXcmEvent, PolkadotCorePrimitivesInboundDownwardMessage, PolkadotCorePrimitivesInboundHrmpMessage, PolkadotCorePrimitivesOutboundHrmpMessage, PolkadotParachainPrimitivesXcmpMessageFormat, PolkadotPrimitivesV1AbridgedHostConfiguration, PolkadotPrimitivesV1AbridgedHrmpChannel, PolkadotPrimitivesV1PersistedValidationData, PolkadotPrimitivesV1UpgradeRestriction, SpCoreEcdsaSignature, SpCoreEd25519Signature, SpCoreSr25519Signature, SpRuntimeArithmeticError, SpRuntimeDigest, SpRuntimeDigestDigestItem, SpRuntimeDispatchError, SpRuntimeModuleError, SpRuntimeMultiSignature, SpRuntimeTokenError, SpTrieStorageProof, SpVersionRuntimeVersion, UniqueRuntimeRuntime, UpDataStructsAccessMode, UpDataStructsCollection, UpDataStructsCollectionLimits, UpDataStructsCollectionMode, UpDataStructsCollectionStats, UpDataStructsCreateCollectionData, UpDataStructsCreateFungibleData, UpDataStructsCreateItemData, UpDataStructsCreateItemExData, UpDataStructsCreateNftData, UpDataStructsCreateNftExData, UpDataStructsCreateReFungibleData, UpDataStructsCreateRefungibleExData, UpDataStructsMetaUpdatePermission, UpDataStructsSchemaVersion, UpDataStructsSponsoringRateLimit, UpDataStructsSponsorshipState, XcmDoubleEncoded, XcmV0Junction, XcmV0JunctionBodyId, XcmV0JunctionBodyPart, XcmV0JunctionNetworkId, XcmV0MultiAsset, XcmV0MultiLocation, XcmV0Order, XcmV0OriginKind, XcmV0Response, XcmV0Xcm, XcmV1Junction, XcmV1MultiAsset, XcmV1MultiLocation, XcmV1MultiassetAssetId, XcmV1MultiassetAssetInstance, XcmV1MultiassetFungibility, XcmV1MultiassetMultiAssetFilter, XcmV1MultiassetMultiAssets, XcmV1MultiassetWildFungibility, XcmV1MultiassetWildMultiAsset, XcmV1MultilocationJunctions, XcmV1Order, XcmV1Response, XcmV1Xcm, XcmV2Instruction, XcmV2Response, XcmV2TraitsError, XcmV2TraitsOutcome, XcmV2WeightLimit, XcmV2Xcm, XcmVersionedMultiAssets, XcmVersionedMultiLocation, XcmVersionedXcm } from './unique';
+import type { CumulusPalletDmpQueueCall, CumulusPalletDmpQueueConfigData, CumulusPalletDmpQueueError, CumulusPalletDmpQueueEvent, CumulusPalletDmpQueuePageIndexData, CumulusPalletParachainSystemCall, CumulusPalletParachainSystemError, CumulusPalletParachainSystemEvent, CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot, CumulusPalletXcmCall, CumulusPalletXcmError, CumulusPalletXcmEvent, CumulusPalletXcmpQueueCall, CumulusPalletXcmpQueueError, CumulusPalletXcmpQueueEvent, CumulusPalletXcmpQueueInboundChannelDetails, CumulusPalletXcmpQueueInboundState, CumulusPalletXcmpQueueOutboundChannelDetails, CumulusPalletXcmpQueueOutboundState, CumulusPalletXcmpQueueQueueConfigData, CumulusPrimitivesParachainInherentParachainInherentData, EthbloomBloom, EthereumBlock, EthereumHeader, EthereumLog, EthereumReceiptEip658ReceiptData, EthereumReceiptReceiptV3, EthereumTransactionAccessListItem, EthereumTransactionEip1559Transaction, EthereumTransactionEip2930Transaction, EthereumTransactionLegacyTransaction, EthereumTransactionTransactionAction, EthereumTransactionTransactionSignature, EthereumTransactionTransactionV2, EthereumTypesHashH64, EvmCoreErrorExitError, EvmCoreErrorExitFatal, EvmCoreErrorExitReason, EvmCoreErrorExitRevert, EvmCoreErrorExitSucceed, FpRpcTransactionStatus, FrameSupportPalletId, FrameSupportTokensMiscBalanceStatus, FrameSupportWeightsDispatchClass, FrameSupportWeightsDispatchInfo, FrameSupportWeightsPays, FrameSupportWeightsPerDispatchClassU32, FrameSupportWeightsPerDispatchClassU64, FrameSupportWeightsPerDispatchClassWeightsPerClass, FrameSupportWeightsRuntimeDbWeight, FrameSupportWeightsWeightToFeeCoefficient, FrameSystemAccountInfo, FrameSystemCall, FrameSystemError, FrameSystemEvent, FrameSystemEventRecord, FrameSystemExtensionsCheckGenesis, FrameSystemExtensionsCheckNonce, FrameSystemExtensionsCheckSpecVersion, FrameSystemExtensionsCheckWeight, FrameSystemLastRuntimeUpgradeInfo, FrameSystemLimitsBlockLength, FrameSystemLimitsBlockWeights, FrameSystemLimitsWeightsPerClass, FrameSystemPhase, OpalRuntimeRuntime, OrmlVestingModuleCall, OrmlVestingModuleError, OrmlVestingModuleEvent, OrmlVestingVestingSchedule, PalletBalancesAccountData, PalletBalancesBalanceLock, PalletBalancesCall, PalletBalancesError, PalletBalancesEvent, PalletBalancesReasons, PalletBalancesReleases, PalletBalancesReserveData, PalletCommonError, PalletCommonEvent, PalletEthereumCall, PalletEthereumError, PalletEthereumEvent, PalletEvmAccountBasicCrossAccountIdRepr, PalletEvmCall, PalletEvmCoderSubstrateError, PalletEvmContractHelpersError, PalletEvmContractHelpersSponsoringModeT, PalletEvmError, PalletEvmEvent, PalletEvmMigrationCall, PalletEvmMigrationError, PalletFungibleError, PalletInflationCall, PalletNonfungibleError, PalletNonfungibleItemData, PalletRefungibleError, PalletRefungibleItemData, PalletSudoCall, PalletSudoError, PalletSudoEvent, PalletTemplateTransactionPaymentCall, PalletTemplateTransactionPaymentChargeTransactionPayment, PalletTimestampCall, PalletTransactionPaymentReleases, PalletTreasuryCall, PalletTreasuryError, PalletTreasuryEvent, PalletTreasuryProposal, PalletUniqueCall, PalletUniqueError, PalletUniqueRawEvent, PalletXcmCall, PalletXcmError, PalletXcmEvent, PolkadotCorePrimitivesInboundDownwardMessage, PolkadotCorePrimitivesInboundHrmpMessage, PolkadotCorePrimitivesOutboundHrmpMessage, PolkadotParachainPrimitivesXcmpMessageFormat, PolkadotPrimitivesV1AbridgedHostConfiguration, PolkadotPrimitivesV1AbridgedHrmpChannel, PolkadotPrimitivesV1PersistedValidationData, PolkadotPrimitivesV1UpgradeRestriction, SpCoreEcdsaSignature, SpCoreEd25519Signature, SpCoreSr25519Signature, SpRuntimeArithmeticError, SpRuntimeDigest, SpRuntimeDigestDigestItem, SpRuntimeDispatchError, SpRuntimeModuleError, SpRuntimeMultiSignature, SpRuntimeTokenError, SpTrieStorageProof, SpVersionRuntimeVersion, UpDataStructsAccessMode, UpDataStructsCollection, UpDataStructsCollectionLimits, UpDataStructsCollectionMode, UpDataStructsCollectionStats, UpDataStructsCreateCollectionData, UpDataStructsCreateFungibleData, UpDataStructsCreateItemData, UpDataStructsCreateItemExData, UpDataStructsCreateNftData, UpDataStructsCreateNftExData, UpDataStructsCreateReFungibleData, UpDataStructsCreateRefungibleExData, UpDataStructsMetaUpdatePermission, UpDataStructsSchemaVersion, UpDataStructsSponsoringRateLimit, UpDataStructsSponsorshipState, XcmDoubleEncoded, XcmV0Junction, XcmV0JunctionBodyId, XcmV0JunctionBodyPart, XcmV0JunctionNetworkId, XcmV0MultiAsset, XcmV0MultiLocation, XcmV0Order, XcmV0OriginKind, XcmV0Response, XcmV0Xcm, XcmV1Junction, XcmV1MultiAsset, XcmV1MultiLocation, XcmV1MultiassetAssetId, XcmV1MultiassetAssetInstance, XcmV1MultiassetFungibility, XcmV1MultiassetMultiAssetFilter, XcmV1MultiassetMultiAssets, XcmV1MultiassetWildFungibility, XcmV1MultiassetWildMultiAsset, XcmV1MultilocationJunctions, XcmV1Order, XcmV1Response, XcmV1Xcm, XcmV2Instruction, XcmV2Response, XcmV2TraitsError, XcmV2TraitsOutcome, XcmV2WeightLimit, XcmV2Xcm, XcmVersionedMultiAssets, XcmVersionedMultiLocation, XcmVersionedXcm } from './unique';
 import type { Data, StorageKey } from '@polkadot/types';
 import type { BitVec, Bool, Bytes, I128, I16, I256, I32, I64, I8, Json, Null, Raw, Text, Type, U128, U16, U256, U32, U64, U8, USize, bool, i128, i16, i256, i32, i64, i8, u128, u16, u256, u32, u64, u8, usize } from '@polkadot/types-codec';
 import type { AssetApproval, AssetApprovalKey, AssetBalance, AssetDestroyWitness, AssetDetails, AssetMetadata, TAssetBalance, TAssetDepositBalance } from '@polkadot/types/interfaces/assets';
@@ -18,7 +18,7 @@
 import type { StatementKind } from '@polkadot/types/interfaces/claims';
 import type { CollectiveOrigin, MemberCount, ProposalIndex, Votes, VotesTo230 } from '@polkadot/types/interfaces/collective';
 import type { AuthorityId, RawVRFOutput } from '@polkadot/types/interfaces/consensus';
-import type { AliveContractInfo, CodeHash, CodeUploadRequest, CodeUploadResult, CodeUploadResultValue, ContractCallFlags, ContractCallRequest, ContractExecResult, ContractExecResultErr, ContractExecResultErrModule, ContractExecResultOk, ContractExecResultResult, ContractExecResultSuccessTo255, ContractExecResultSuccessTo260, ContractExecResultTo255, ContractExecResultTo260, ContractExecResultTo267, ContractInfo, ContractInstantiateResult, ContractInstantiateResultTo267, ContractReturnFlags, ContractStorageKey, DeletedContract, ExecReturnValue, Gas, HostFnWeights, HostFnWeightsTo264, InstantiateRequest, InstantiateReturnValue, InstantiateReturnValueTo267, InstructionWeights, Limits, LimitsTo264, PrefabWasmModule, RentProjection, Schedule, ScheduleTo212, ScheduleTo258, ScheduleTo264, SeedOf, StorageDeposit, TombstoneContractInfo, TrieId } from '@polkadot/types/interfaces/contracts';
+import type { AliveContractInfo, CodeHash, CodeSource, CodeUploadRequest, CodeUploadResult, CodeUploadResultValue, ContractCallFlags, ContractCallRequest, ContractExecResult, ContractExecResultErr, ContractExecResultErrModule, ContractExecResultOk, ContractExecResultResult, ContractExecResultSuccessTo255, ContractExecResultSuccessTo260, ContractExecResultTo255, ContractExecResultTo260, ContractExecResultTo267, ContractInfo, ContractInstantiateResult, ContractInstantiateResultTo267, ContractInstantiateResultTo299, ContractReturnFlags, ContractStorageKey, DeletedContract, ExecReturnValue, Gas, HostFnWeights, HostFnWeightsTo264, InstantiateRequest, InstantiateRequestV1, InstantiateRequestV2, InstantiateReturnValue, InstantiateReturnValueOk, InstantiateReturnValueTo267, InstructionWeights, Limits, LimitsTo264, PrefabWasmModule, RentProjection, Schedule, ScheduleTo212, ScheduleTo258, ScheduleTo264, SeedOf, StorageDeposit, TombstoneContractInfo, TrieId } from '@polkadot/types/interfaces/contracts';
 import type { ContractConstructorSpecLatest, ContractConstructorSpecV0, ContractConstructorSpecV1, ContractConstructorSpecV2, ContractConstructorSpecV3, ContractContractSpecV0, ContractContractSpecV1, ContractContractSpecV2, ContractContractSpecV3, ContractCryptoHasher, ContractDiscriminant, ContractDisplayName, ContractEventParamSpecLatest, ContractEventParamSpecV0, ContractEventParamSpecV2, ContractEventSpecLatest, ContractEventSpecV0, ContractEventSpecV1, ContractEventSpecV2, ContractLayoutArray, ContractLayoutCell, ContractLayoutEnum, ContractLayoutHash, ContractLayoutHashingStrategy, ContractLayoutKey, ContractLayoutStruct, ContractLayoutStructField, ContractMessageParamSpecLatest, ContractMessageParamSpecV0, ContractMessageParamSpecV2, ContractMessageSpecLatest, ContractMessageSpecV0, ContractMessageSpecV1, ContractMessageSpecV2, ContractMetadata, ContractMetadataLatest, ContractMetadataV0, ContractMetadataV1, ContractMetadataV2, ContractMetadataV3, ContractProject, ContractProjectContract, ContractProjectInfo, ContractProjectSource, ContractProjectV0, ContractSelector, ContractStorageLayout, ContractTypeSpec } from '@polkadot/types/interfaces/contractsAbi';
 import type { FundIndex, FundInfo, LastContribution, TrieIndex } from '@polkadot/types/interfaces/crowdloan';
 import type { ConfigData, MessageId, OverweightIndex, PageCounter, PageIndexData } from '@polkadot/types/interfaces/cumulus';
@@ -198,6 +198,7 @@
     ClassMetadata: ClassMetadata;
     CodecHash: CodecHash;
     CodeHash: CodeHash;
+    CodeSource: CodeSource;
     CodeUploadRequest: CodeUploadRequest;
     CodeUploadResult: CodeUploadResult;
     CodeUploadResultValue: CodeUploadResultValue;
@@ -250,6 +251,7 @@
     ContractInfo: ContractInfo;
     ContractInstantiateResult: ContractInstantiateResult;
     ContractInstantiateResultTo267: ContractInstantiateResultTo267;
+    ContractInstantiateResultTo299: ContractInstantiateResultTo299;
     ContractLayoutArray: ContractLayoutArray;
     ContractLayoutCell: ContractLayoutCell;
     ContractLayoutEnum: ContractLayoutEnum;
@@ -591,7 +593,10 @@
     InstanceId: InstanceId;
     InstanceMetadata: InstanceMetadata;
     InstantiateRequest: InstantiateRequest;
+    InstantiateRequestV1: InstantiateRequestV1;
+    InstantiateRequestV2: InstantiateRequestV2;
     InstantiateReturnValue: InstantiateReturnValue;
+    InstantiateReturnValueOk: InstantiateReturnValueOk;
     InstantiateReturnValueTo267: InstantiateReturnValueTo267;
     InstructionV2: InstructionV2;
     InstructionWeights: InstructionWeights;
@@ -707,6 +712,7 @@
     OffchainAccuracyCompact: OffchainAccuracyCompact;
     OffenceDetails: OffenceDetails;
     Offender: Offender;
+    OpalRuntimeRuntime: OpalRuntimeRuntime;
     OpaqueCall: OpaqueCall;
     OpaqueMultiaddr: OpaqueMultiaddr;
     OpaqueNetworkState: OpaqueNetworkState;
@@ -746,7 +752,6 @@
     PalletBalancesReserveData: PalletBalancesReserveData;
     PalletCallMetadataLatest: PalletCallMetadataLatest;
     PalletCallMetadataV14: PalletCallMetadataV14;
-    PalletCommonAccountBasicCrossAccountIdRepr: PalletCommonAccountBasicCrossAccountIdRepr;
     PalletCommonError: PalletCommonError;
     PalletCommonEvent: PalletCommonEvent;
     PalletConstantMetadataLatest: PalletConstantMetadataLatest;
@@ -758,6 +763,7 @@
     PalletEthereumEvent: PalletEthereumEvent;
     PalletEventMetadataLatest: PalletEventMetadataLatest;
     PalletEventMetadataV14: PalletEventMetadataV14;
+    PalletEvmAccountBasicCrossAccountIdRepr: PalletEvmAccountBasicCrossAccountIdRepr;
     PalletEvmCall: PalletEvmCall;
     PalletEvmCoderSubstrateError: PalletEvmCoderSubstrateError;
     PalletEvmContractHelpersError: PalletEvmContractHelpersError;
@@ -1146,7 +1152,6 @@
     UnappliedSlash: UnappliedSlash;
     UnappliedSlashOther: UnappliedSlashOther;
     UncleEntryItem: UncleEntryItem;
-    UniqueRuntimeRuntime: UniqueRuntimeRuntime;
     UnknownTransaction: UnknownTransaction;
     UnlockChunk: UnlockChunk;
     UnrewardedRelayer: UnrewardedRelayer;
modifiedtests/src/interfaces/lookup.tsdiffbeforeafterboth
--- a/tests/src/interfaces/lookup.ts
+++ b/tests/src/interfaces/lookup.ts
@@ -1254,11 +1254,11 @@
       },
       add_to_allow_list: {
         collectionId: 'u32',
-        address: 'PalletCommonAccountBasicCrossAccountIdRepr',
+        address: 'PalletEvmAccountBasicCrossAccountIdRepr',
       },
       remove_from_allow_list: {
         collectionId: 'u32',
-        address: 'PalletCommonAccountBasicCrossAccountIdRepr',
+        address: 'PalletEvmAccountBasicCrossAccountIdRepr',
       },
       set_public_access_mode: {
         collectionId: 'u32',
@@ -1274,11 +1274,11 @@
       },
       add_collection_admin: {
         collectionId: 'u32',
-        newAdminId: 'PalletCommonAccountBasicCrossAccountIdRepr',
+        newAdminId: 'PalletEvmAccountBasicCrossAccountIdRepr',
       },
       remove_collection_admin: {
         collectionId: 'u32',
-        accountId: 'PalletCommonAccountBasicCrossAccountIdRepr',
+        accountId: 'PalletEvmAccountBasicCrossAccountIdRepr',
       },
       set_collection_sponsor: {
         collectionId: 'u32',
@@ -1292,12 +1292,12 @@
       },
       create_item: {
         collectionId: 'u32',
-        owner: 'PalletCommonAccountBasicCrossAccountIdRepr',
+        owner: 'PalletEvmAccountBasicCrossAccountIdRepr',
         data: 'UpDataStructsCreateItemData',
       },
       create_multiple_items: {
         collectionId: 'u32',
-        owner: 'PalletCommonAccountBasicCrossAccountIdRepr',
+        owner: 'PalletEvmAccountBasicCrossAccountIdRepr',
         itemsData: 'Vec<UpDataStructsCreateItemData>',
       },
       create_multiple_items_ex: {
@@ -1315,25 +1315,25 @@
       },
       burn_from: {
         collectionId: 'u32',
-        from: 'PalletCommonAccountBasicCrossAccountIdRepr',
+        from: 'PalletEvmAccountBasicCrossAccountIdRepr',
         itemId: 'u32',
         value: 'u128',
       },
       transfer: {
-        recipient: 'PalletCommonAccountBasicCrossAccountIdRepr',
+        recipient: 'PalletEvmAccountBasicCrossAccountIdRepr',
         collectionId: 'u32',
         itemId: 'u32',
         value: 'u128',
       },
       approve: {
-        spender: 'PalletCommonAccountBasicCrossAccountIdRepr',
+        spender: 'PalletEvmAccountBasicCrossAccountIdRepr',
         collectionId: 'u32',
         itemId: 'u32',
         amount: 'u128',
       },
       transfer_from: {
-        from: 'PalletCommonAccountBasicCrossAccountIdRepr',
-        recipient: 'PalletCommonAccountBasicCrossAccountIdRepr',
+        from: 'PalletEvmAccountBasicCrossAccountIdRepr',
+        recipient: 'PalletEvmAccountBasicCrossAccountIdRepr',
         collectionId: 'u32',
         itemId: 'u32',
         value: 'u128',
@@ -1438,9 +1438,9 @@
     _enum: ['ItemOwner', 'Admin', 'None']
   },
   /**
-   * Lookup172: pallet_common::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>
+   * Lookup172: pallet_evm::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>
    **/
-  PalletCommonAccountBasicCrossAccountIdRepr: {
+  PalletEvmAccountBasicCrossAccountIdRepr: {
     _enum: {
       Substrate: 'AccountId32',
       Ethereum: 'H160'
@@ -1478,31 +1478,31 @@
     pieces: 'u128'
   },
   /**
-   * Lookup180: up_data_structs::CreateItemExData<pallet_common::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
+   * Lookup180: up_data_structs::CreateItemExData<pallet_evm::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
    **/
   UpDataStructsCreateItemExData: {
     _enum: {
       NFT: 'Vec<UpDataStructsCreateNftExData>',
-      Fungible: 'BTreeMap<PalletCommonAccountBasicCrossAccountIdRepr, u128>',
+      Fungible: 'BTreeMap<PalletEvmAccountBasicCrossAccountIdRepr, u128>',
       RefungibleMultipleItems: 'Vec<UpDataStructsCreateRefungibleExData>',
       RefungibleMultipleOwners: 'UpDataStructsCreateRefungibleExData'
     }
   },
   /**
-   * Lookup182: up_data_structs::CreateNftExData<pallet_common::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
+   * Lookup182: up_data_structs::CreateNftExData<pallet_evm::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
    **/
   UpDataStructsCreateNftExData: {
     constData: 'Bytes',
     variableData: 'Bytes',
-    owner: 'PalletCommonAccountBasicCrossAccountIdRepr'
+    owner: 'PalletEvmAccountBasicCrossAccountIdRepr'
   },
   /**
-   * Lookup189: up_data_structs::CreateRefungibleExData<pallet_common::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
+   * Lookup189: up_data_structs::CreateRefungibleExData<pallet_evm::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
    **/
   UpDataStructsCreateRefungibleExData: {
     constData: 'Bytes',
     variableData: 'Bytes',
-    users: 'BTreeMap<PalletCommonAccountBasicCrossAccountIdRepr, u128>'
+    users: 'BTreeMap<PalletEvmAccountBasicCrossAccountIdRepr, u128>'
   },
   /**
    * Lookup192: pallet_template_transaction_payment::Call<T>
@@ -1756,7 +1756,7 @@
     }
   },
   /**
-   * Lookup225: frame_system::EventRecord<unique_runtime::Event, primitive_types::H256>
+   * Lookup225: frame_system::EventRecord<opal_runtime::Event, primitive_types::H256>
    **/
   FrameSystemEventRecord: {
     phase: 'FrameSystemPhase',
@@ -1902,19 +1902,19 @@
     }
   },
   /**
-   * Lookup238: pallet_unique::RawEvent<sp_core::crypto::AccountId32, pallet_common::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
+   * Lookup238: pallet_unique::RawEvent<sp_core::crypto::AccountId32, pallet_evm::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
    **/
   PalletUniqueRawEvent: {
     _enum: {
       CollectionSponsorRemoved: 'u32',
-      CollectionAdminAdded: '(u32,PalletCommonAccountBasicCrossAccountIdRepr)',
+      CollectionAdminAdded: '(u32,PalletEvmAccountBasicCrossAccountIdRepr)',
       CollectionOwnedChanged: '(u32,AccountId32)',
       CollectionSponsorSet: '(u32,AccountId32)',
       ConstOnChainSchemaSet: 'u32',
       SponsorshipConfirmed: '(u32,AccountId32)',
-      CollectionAdminRemoved: '(u32,PalletCommonAccountBasicCrossAccountIdRepr)',
-      AllowListAddressRemoved: '(u32,PalletCommonAccountBasicCrossAccountIdRepr)',
-      AllowListAddressAdded: '(u32,PalletCommonAccountBasicCrossAccountIdRepr)',
+      CollectionAdminRemoved: '(u32,PalletEvmAccountBasicCrossAccountIdRepr)',
+      AllowListAddressRemoved: '(u32,PalletEvmAccountBasicCrossAccountIdRepr)',
+      AllowListAddressAdded: '(u32,PalletEvmAccountBasicCrossAccountIdRepr)',
       CollectionLimitSet: 'u32',
       MintPermissionSet: 'u32',
       OffchainSchemaSet: 'u32',
@@ -1930,10 +1930,10 @@
     _enum: {
       CollectionCreated: '(u32,u8,AccountId32)',
       CollectionDestroyed: 'u32',
-      ItemCreated: '(u32,u32,PalletCommonAccountBasicCrossAccountIdRepr,u128)',
-      ItemDestroyed: '(u32,u32,PalletCommonAccountBasicCrossAccountIdRepr,u128)',
-      Transfer: '(u32,u32,PalletCommonAccountBasicCrossAccountIdRepr,PalletCommonAccountBasicCrossAccountIdRepr,u128)',
-      Approved: '(u32,u32,PalletCommonAccountBasicCrossAccountIdRepr,PalletCommonAccountBasicCrossAccountIdRepr,u128)'
+      ItemCreated: '(u32,u32,PalletEvmAccountBasicCrossAccountIdRepr,u128)',
+      ItemDestroyed: '(u32,u32,PalletEvmAccountBasicCrossAccountIdRepr,u128)',
+      Transfer: '(u32,u32,PalletEvmAccountBasicCrossAccountIdRepr,PalletEvmAccountBasicCrossAccountIdRepr,u128)',
+      Approved: '(u32,u32,PalletEvmAccountBasicCrossAccountIdRepr,PalletEvmAccountBasicCrossAccountIdRepr,u128)'
     }
   },
   /**
@@ -2240,7 +2240,7 @@
    * Lookup297: pallet_common::pallet::Error<T>
    **/
   PalletCommonError: {
-    _enum: ['CollectionNotFound', 'MustBeTokenOwner', 'NoPermission', 'PublicMintingNotAllowed', 'AddressNotInAllowlist', 'CollectionNameLimitExceeded', 'CollectionDescriptionLimitExceeded', 'CollectionTokenPrefixLimitExceeded', 'TotalCollectionsLimitExceeded', 'TokenVariableDataLimitExceeded', 'CollectionAdminCountExceeded', 'CollectionLimitBoundsExceeded', 'OwnerPermissionsCantBeReverted', 'TransferNotAllowed', 'AccountTokenLimitExceeded', 'CollectionTokenLimitExceeded', 'MetadataFlagFrozen', 'TokenNotFound', 'TokenValueTooLow', 'ApprovedValueTooLow', 'CantApproveMoreThanOwned', 'AddressIsZero', 'UnsupportedOperation']
+    _enum: ['CollectionNotFound', 'MustBeTokenOwner', 'NoPermission', 'PublicMintingNotAllowed', 'AddressNotInAllowlist', 'CollectionNameLimitExceeded', 'CollectionDescriptionLimitExceeded', 'CollectionTokenPrefixLimitExceeded', 'TotalCollectionsLimitExceeded', 'TokenVariableDataLimitExceeded', 'CollectionAdminCountExceeded', 'CollectionLimitBoundsExceeded', 'OwnerPermissionsCantBeReverted', 'TransferNotAllowed', 'AccountTokenLimitExceeded', 'CollectionTokenLimitExceeded', 'MetadataFlagFrozen', 'TokenNotFound', 'TokenValueTooLow', 'ApprovedValueTooLow', 'CantApproveMoreThanOwned', 'AddressIsZero', 'UnsupportedOperation', 'NotSufficientFounds']
   },
   /**
    * Lookup299: pallet_fungible::pallet::Error<T>
@@ -2262,12 +2262,12 @@
     _enum: ['NotRefungibleDataUsedToMintFungibleCollectionToken', 'WrongRefungiblePieces']
   },
   /**
-   * Lookup305: pallet_nonfungible::ItemData<pallet_common::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
+   * Lookup305: pallet_nonfungible::ItemData<pallet_evm::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
    **/
   PalletNonfungibleItemData: {
     constData: 'Bytes',
     variableData: 'Bytes',
-    owner: 'PalletCommonAccountBasicCrossAccountIdRepr'
+    owner: 'PalletEvmAccountBasicCrossAccountIdRepr'
   },
   /**
    * Lookup306: pallet_nonfungible::pallet::Error<T>
@@ -2417,11 +2417,11 @@
    **/
   FrameSystemExtensionsCheckWeight: 'Null',
   /**
-   * Lookup345: pallet_template_transaction_payment::ChargeTransactionPayment<unique_runtime::Runtime>
+   * Lookup345: pallet_template_transaction_payment::ChargeTransactionPayment<opal_runtime::Runtime>
    **/
   PalletTemplateTransactionPaymentChargeTransactionPayment: 'Compact<u128>',
   /**
-   * Lookup346: unique_runtime::Runtime
+   * Lookup346: opal_runtime::Runtime
    **/
-  UniqueRuntimeRuntime: 'Null'
+  OpalRuntimeRuntime: 'Null'
 };
modifiedtests/src/interfaces/types-lookup.tsdiffbeforeafterboth
--- a/tests/src/interfaces/types-lookup.ts
+++ b/tests/src/interfaces/types-lookup.ts
@@ -1364,12 +1364,12 @@
     readonly isAddToAllowList: boolean;
     readonly asAddToAllowList: {
       readonly collectionId: u32;
-      readonly address: PalletCommonAccountBasicCrossAccountIdRepr;
+      readonly address: PalletEvmAccountBasicCrossAccountIdRepr;
     } & Struct;
     readonly isRemoveFromAllowList: boolean;
     readonly asRemoveFromAllowList: {
       readonly collectionId: u32;
-      readonly address: PalletCommonAccountBasicCrossAccountIdRepr;
+      readonly address: PalletEvmAccountBasicCrossAccountIdRepr;
     } & Struct;
     readonly isSetPublicAccessMode: boolean;
     readonly asSetPublicAccessMode: {
@@ -1389,12 +1389,12 @@
     readonly isAddCollectionAdmin: boolean;
     readonly asAddCollectionAdmin: {
       readonly collectionId: u32;
-      readonly newAdminId: PalletCommonAccountBasicCrossAccountIdRepr;
+      readonly newAdminId: PalletEvmAccountBasicCrossAccountIdRepr;
     } & Struct;
     readonly isRemoveCollectionAdmin: boolean;
     readonly asRemoveCollectionAdmin: {
       readonly collectionId: u32;
-      readonly accountId: PalletCommonAccountBasicCrossAccountIdRepr;
+      readonly accountId: PalletEvmAccountBasicCrossAccountIdRepr;
     } & Struct;
     readonly isSetCollectionSponsor: boolean;
     readonly asSetCollectionSponsor: {
@@ -1412,13 +1412,13 @@
     readonly isCreateItem: boolean;
     readonly asCreateItem: {
       readonly collectionId: u32;
-      readonly owner: PalletCommonAccountBasicCrossAccountIdRepr;
+      readonly owner: PalletEvmAccountBasicCrossAccountIdRepr;
       readonly data: UpDataStructsCreateItemData;
     } & Struct;
     readonly isCreateMultipleItems: boolean;
     readonly asCreateMultipleItems: {
       readonly collectionId: u32;
-      readonly owner: PalletCommonAccountBasicCrossAccountIdRepr;
+      readonly owner: PalletEvmAccountBasicCrossAccountIdRepr;
       readonly itemsData: Vec<UpDataStructsCreateItemData>;
     } & Struct;
     readonly isCreateMultipleItemsEx: boolean;
@@ -1440,28 +1440,28 @@
     readonly isBurnFrom: boolean;
     readonly asBurnFrom: {
       readonly collectionId: u32;
-      readonly from: PalletCommonAccountBasicCrossAccountIdRepr;
+      readonly from: PalletEvmAccountBasicCrossAccountIdRepr;
       readonly itemId: u32;
       readonly value: u128;
     } & Struct;
     readonly isTransfer: boolean;
     readonly asTransfer: {
-      readonly recipient: PalletCommonAccountBasicCrossAccountIdRepr;
+      readonly recipient: PalletEvmAccountBasicCrossAccountIdRepr;
       readonly collectionId: u32;
       readonly itemId: u32;
       readonly value: u128;
     } & Struct;
     readonly isApprove: boolean;
     readonly asApprove: {
-      readonly spender: PalletCommonAccountBasicCrossAccountIdRepr;
+      readonly spender: PalletEvmAccountBasicCrossAccountIdRepr;
       readonly collectionId: u32;
       readonly itemId: u32;
       readonly amount: u128;
     } & Struct;
     readonly isTransferFrom: boolean;
     readonly asTransferFrom: {
-      readonly from: PalletCommonAccountBasicCrossAccountIdRepr;
-      readonly recipient: PalletCommonAccountBasicCrossAccountIdRepr;
+      readonly from: PalletEvmAccountBasicCrossAccountIdRepr;
+      readonly recipient: PalletEvmAccountBasicCrossAccountIdRepr;
       readonly collectionId: u32;
       readonly itemId: u32;
       readonly value: u128;
@@ -1573,8 +1573,8 @@
     readonly type: 'ItemOwner' | 'Admin' | 'None';
   }
 
-  /** @name PalletCommonAccountBasicCrossAccountIdRepr (172) */
-  export interface PalletCommonAccountBasicCrossAccountIdRepr extends Enum {
+  /** @name PalletEvmAccountBasicCrossAccountIdRepr (172) */
+  export interface PalletEvmAccountBasicCrossAccountIdRepr extends Enum {
     readonly isSubstrate: boolean;
     readonly asSubstrate: AccountId32;
     readonly isEthereum: boolean;
@@ -1616,7 +1616,7 @@
     readonly isNft: boolean;
     readonly asNft: Vec<UpDataStructsCreateNftExData>;
     readonly isFungible: boolean;
-    readonly asFungible: BTreeMap<PalletCommonAccountBasicCrossAccountIdRepr, u128>;
+    readonly asFungible: BTreeMap<PalletEvmAccountBasicCrossAccountIdRepr, u128>;
     readonly isRefungibleMultipleItems: boolean;
     readonly asRefungibleMultipleItems: Vec<UpDataStructsCreateRefungibleExData>;
     readonly isRefungibleMultipleOwners: boolean;
@@ -1628,14 +1628,14 @@
   export interface UpDataStructsCreateNftExData extends Struct {
     readonly constData: Bytes;
     readonly variableData: Bytes;
-    readonly owner: PalletCommonAccountBasicCrossAccountIdRepr;
+    readonly owner: PalletEvmAccountBasicCrossAccountIdRepr;
   }
 
   /** @name UpDataStructsCreateRefungibleExData (189) */
   export interface UpDataStructsCreateRefungibleExData extends Struct {
     readonly constData: Bytes;
     readonly variableData: Bytes;
-    readonly users: BTreeMap<PalletCommonAccountBasicCrossAccountIdRepr, u128>;
+    readonly users: BTreeMap<PalletEvmAccountBasicCrossAccountIdRepr, u128>;
   }
 
   /** @name PalletTemplateTransactionPaymentCall (192) */
@@ -2068,7 +2068,7 @@
     readonly isCollectionSponsorRemoved: boolean;
     readonly asCollectionSponsorRemoved: u32;
     readonly isCollectionAdminAdded: boolean;
-    readonly asCollectionAdminAdded: ITuple<[u32, PalletCommonAccountBasicCrossAccountIdRepr]>;
+    readonly asCollectionAdminAdded: ITuple<[u32, PalletEvmAccountBasicCrossAccountIdRepr]>;
     readonly isCollectionOwnedChanged: boolean;
     readonly asCollectionOwnedChanged: ITuple<[u32, AccountId32]>;
     readonly isCollectionSponsorSet: boolean;
@@ -2078,11 +2078,11 @@
     readonly isSponsorshipConfirmed: boolean;
     readonly asSponsorshipConfirmed: ITuple<[u32, AccountId32]>;
     readonly isCollectionAdminRemoved: boolean;
-    readonly asCollectionAdminRemoved: ITuple<[u32, PalletCommonAccountBasicCrossAccountIdRepr]>;
+    readonly asCollectionAdminRemoved: ITuple<[u32, PalletEvmAccountBasicCrossAccountIdRepr]>;
     readonly isAllowListAddressRemoved: boolean;
-    readonly asAllowListAddressRemoved: ITuple<[u32, PalletCommonAccountBasicCrossAccountIdRepr]>;
+    readonly asAllowListAddressRemoved: ITuple<[u32, PalletEvmAccountBasicCrossAccountIdRepr]>;
     readonly isAllowListAddressAdded: boolean;
-    readonly asAllowListAddressAdded: ITuple<[u32, PalletCommonAccountBasicCrossAccountIdRepr]>;
+    readonly asAllowListAddressAdded: ITuple<[u32, PalletEvmAccountBasicCrossAccountIdRepr]>;
     readonly isCollectionLimitSet: boolean;
     readonly asCollectionLimitSet: u32;
     readonly isMintPermissionSet: boolean;
@@ -2105,13 +2105,13 @@
     readonly isCollectionDestroyed: boolean;
     readonly asCollectionDestroyed: u32;
     readonly isItemCreated: boolean;
-    readonly asItemCreated: ITuple<[u32, u32, PalletCommonAccountBasicCrossAccountIdRepr, u128]>;
+    readonly asItemCreated: ITuple<[u32, u32, PalletEvmAccountBasicCrossAccountIdRepr, u128]>;
     readonly isItemDestroyed: boolean;
-    readonly asItemDestroyed: ITuple<[u32, u32, PalletCommonAccountBasicCrossAccountIdRepr, u128]>;
+    readonly asItemDestroyed: ITuple<[u32, u32, PalletEvmAccountBasicCrossAccountIdRepr, u128]>;
     readonly isTransfer: boolean;
-    readonly asTransfer: ITuple<[u32, u32, PalletCommonAccountBasicCrossAccountIdRepr, PalletCommonAccountBasicCrossAccountIdRepr, u128]>;
+    readonly asTransfer: ITuple<[u32, u32, PalletEvmAccountBasicCrossAccountIdRepr, PalletEvmAccountBasicCrossAccountIdRepr, u128]>;
     readonly isApproved: boolean;
-    readonly asApproved: ITuple<[u32, u32, PalletCommonAccountBasicCrossAccountIdRepr, PalletCommonAccountBasicCrossAccountIdRepr, u128]>;
+    readonly asApproved: ITuple<[u32, u32, PalletEvmAccountBasicCrossAccountIdRepr, PalletEvmAccountBasicCrossAccountIdRepr, u128]>;
     readonly type: 'CollectionCreated' | 'CollectionDestroyed' | 'ItemCreated' | 'ItemDestroyed' | 'Transfer' | 'Approved';
   }
 
@@ -2462,7 +2462,8 @@
     readonly isCantApproveMoreThanOwned: boolean;
     readonly isAddressIsZero: boolean;
     readonly isUnsupportedOperation: boolean;
-    readonly type: 'CollectionNotFound' | 'MustBeTokenOwner' | 'NoPermission' | 'PublicMintingNotAllowed' | 'AddressNotInAllowlist' | 'CollectionNameLimitExceeded' | 'CollectionDescriptionLimitExceeded' | 'CollectionTokenPrefixLimitExceeded' | 'TotalCollectionsLimitExceeded' | 'TokenVariableDataLimitExceeded' | 'CollectionAdminCountExceeded' | 'CollectionLimitBoundsExceeded' | 'OwnerPermissionsCantBeReverted' | 'TransferNotAllowed' | 'AccountTokenLimitExceeded' | 'CollectionTokenLimitExceeded' | 'MetadataFlagFrozen' | 'TokenNotFound' | 'TokenValueTooLow' | 'ApprovedValueTooLow' | 'CantApproveMoreThanOwned' | 'AddressIsZero' | 'UnsupportedOperation';
+    readonly isNotSufficientFounds: boolean;
+    readonly type: 'CollectionNotFound' | 'MustBeTokenOwner' | 'NoPermission' | 'PublicMintingNotAllowed' | 'AddressNotInAllowlist' | 'CollectionNameLimitExceeded' | 'CollectionDescriptionLimitExceeded' | 'CollectionTokenPrefixLimitExceeded' | 'TotalCollectionsLimitExceeded' | 'TokenVariableDataLimitExceeded' | 'CollectionAdminCountExceeded' | 'CollectionLimitBoundsExceeded' | 'OwnerPermissionsCantBeReverted' | 'TransferNotAllowed' | 'AccountTokenLimitExceeded' | 'CollectionTokenLimitExceeded' | 'MetadataFlagFrozen' | 'TokenNotFound' | 'TokenValueTooLow' | 'ApprovedValueTooLow' | 'CantApproveMoreThanOwned' | 'AddressIsZero' | 'UnsupportedOperation' | 'NotSufficientFounds';
   }
 
   /** @name PalletFungibleError (299) */
@@ -2490,7 +2491,7 @@
   export interface PalletNonfungibleItemData extends Struct {
     readonly constData: Bytes;
     readonly variableData: Bytes;
-    readonly owner: PalletCommonAccountBasicCrossAccountIdRepr;
+    readonly owner: PalletEvmAccountBasicCrossAccountIdRepr;
   }
 
   /** @name PalletNonfungibleError (306) */
@@ -2643,7 +2644,7 @@
   /** @name PalletTemplateTransactionPaymentChargeTransactionPayment (345) */
   export interface PalletTemplateTransactionPaymentChargeTransactionPayment extends Compact<u128> {}
 
-  /** @name UniqueRuntimeRuntime (346) */
-  export type UniqueRuntimeRuntime = Null;
+  /** @name OpalRuntimeRuntime (346) */
+  export type OpalRuntimeRuntime = Null;
 
 } // declare module
modifiedtests/src/interfaces/unique/definitions.tsdiffbeforeafterboth
--- a/tests/src/interfaces/unique/definitions.ts
+++ b/tests/src/interfaces/unique/definitions.ts
@@ -22,7 +22,7 @@
   isOptional?: true;
 };
 
-const CROSS_ACCOUNT_ID_TYPE = 'PalletCommonAccountBasicCrossAccountIdRepr';
+const CROSS_ACCOUNT_ID_TYPE = 'PalletEvmAccountBasicCrossAccountIdRepr';
 
 const collectionParam = {name: 'collection', type: 'u32'};
 const tokenParam = {name: 'tokenId', type: 'u32'};
@@ -38,8 +38,8 @@
 export default {
   types,
   rpc: {
-    adminlist: fun('Get admin list', [collectionParam], 'Vec<PalletCommonAccountBasicCrossAccountIdRepr>'),
-    allowlist: fun('Get allowlist', [collectionParam], 'Vec<PalletCommonAccountBasicCrossAccountIdRepr>'),
+    adminlist: fun('Get admin list', [collectionParam], 'Vec<PalletEvmAccountBasicCrossAccountIdRepr>'),
+    allowlist: fun('Get allowlist', [collectionParam], 'Vec<PalletEvmAccountBasicCrossAccountIdRepr>'),
 
     accountTokens: fun('Get tokens owned by account', [collectionParam, crossAccountParam()], 'Vec<u32>'),
     collectionTokens: fun('Get tokens contained in collection', [collectionParam], 'Vec<u32>'),
modifiedtests/src/interfaces/unique/types.tsdiffbeforeafterboth
--- a/tests/src/interfaces/unique/types.ts
+++ b/tests/src/interfaces/unique/types.ts
@@ -654,6 +654,9 @@
   readonly type: 'ApplyExtrinsic' | 'Finalization' | 'Initialization';
 }
 
+/** @name OpalRuntimeRuntime */
+export interface OpalRuntimeRuntime extends Null {}
+
 /** @name OrmlVestingModuleCall */
 export interface OrmlVestingModuleCall extends Enum {
   readonly isClaim: boolean;
@@ -858,15 +861,6 @@
   readonly amount: u128;
 }
 
-/** @name PalletCommonAccountBasicCrossAccountIdRepr */
-export interface PalletCommonAccountBasicCrossAccountIdRepr extends Enum {
-  readonly isSubstrate: boolean;
-  readonly asSubstrate: AccountId32;
-  readonly isEthereum: boolean;
-  readonly asEthereum: H160;
-  readonly type: 'Substrate' | 'Ethereum';
-}
-
 /** @name PalletCommonError */
 export interface PalletCommonError extends Enum {
   readonly isCollectionNotFound: boolean;
@@ -892,7 +886,8 @@
   readonly isCantApproveMoreThanOwned: boolean;
   readonly isAddressIsZero: boolean;
   readonly isUnsupportedOperation: boolean;
-  readonly type: 'CollectionNotFound' | 'MustBeTokenOwner' | 'NoPermission' | 'PublicMintingNotAllowed' | 'AddressNotInAllowlist' | 'CollectionNameLimitExceeded' | 'CollectionDescriptionLimitExceeded' | 'CollectionTokenPrefixLimitExceeded' | 'TotalCollectionsLimitExceeded' | 'TokenVariableDataLimitExceeded' | 'CollectionAdminCountExceeded' | 'CollectionLimitBoundsExceeded' | 'OwnerPermissionsCantBeReverted' | 'TransferNotAllowed' | 'AccountTokenLimitExceeded' | 'CollectionTokenLimitExceeded' | 'MetadataFlagFrozen' | 'TokenNotFound' | 'TokenValueTooLow' | 'ApprovedValueTooLow' | 'CantApproveMoreThanOwned' | 'AddressIsZero' | 'UnsupportedOperation';
+  readonly isNotSufficientFounds: boolean;
+  readonly type: 'CollectionNotFound' | 'MustBeTokenOwner' | 'NoPermission' | 'PublicMintingNotAllowed' | 'AddressNotInAllowlist' | 'CollectionNameLimitExceeded' | 'CollectionDescriptionLimitExceeded' | 'CollectionTokenPrefixLimitExceeded' | 'TotalCollectionsLimitExceeded' | 'TokenVariableDataLimitExceeded' | 'CollectionAdminCountExceeded' | 'CollectionLimitBoundsExceeded' | 'OwnerPermissionsCantBeReverted' | 'TransferNotAllowed' | 'AccountTokenLimitExceeded' | 'CollectionTokenLimitExceeded' | 'MetadataFlagFrozen' | 'TokenNotFound' | 'TokenValueTooLow' | 'ApprovedValueTooLow' | 'CantApproveMoreThanOwned' | 'AddressIsZero' | 'UnsupportedOperation' | 'NotSufficientFounds';
 }
 
 /** @name PalletCommonEvent */
@@ -902,13 +897,13 @@
   readonly isCollectionDestroyed: boolean;
   readonly asCollectionDestroyed: u32;
   readonly isItemCreated: boolean;
-  readonly asItemCreated: ITuple<[u32, u32, PalletCommonAccountBasicCrossAccountIdRepr, u128]>;
+  readonly asItemCreated: ITuple<[u32, u32, PalletEvmAccountBasicCrossAccountIdRepr, u128]>;
   readonly isItemDestroyed: boolean;
-  readonly asItemDestroyed: ITuple<[u32, u32, PalletCommonAccountBasicCrossAccountIdRepr, u128]>;
+  readonly asItemDestroyed: ITuple<[u32, u32, PalletEvmAccountBasicCrossAccountIdRepr, u128]>;
   readonly isTransfer: boolean;
-  readonly asTransfer: ITuple<[u32, u32, PalletCommonAccountBasicCrossAccountIdRepr, PalletCommonAccountBasicCrossAccountIdRepr, u128]>;
+  readonly asTransfer: ITuple<[u32, u32, PalletEvmAccountBasicCrossAccountIdRepr, PalletEvmAccountBasicCrossAccountIdRepr, u128]>;
   readonly isApproved: boolean;
-  readonly asApproved: ITuple<[u32, u32, PalletCommonAccountBasicCrossAccountIdRepr, PalletCommonAccountBasicCrossAccountIdRepr, u128]>;
+  readonly asApproved: ITuple<[u32, u32, PalletEvmAccountBasicCrossAccountIdRepr, PalletEvmAccountBasicCrossAccountIdRepr, u128]>;
   readonly type: 'CollectionCreated' | 'CollectionDestroyed' | 'ItemCreated' | 'ItemDestroyed' | 'Transfer' | 'Approved';
 }
 
@@ -935,6 +930,15 @@
   readonly type: 'Executed';
 }
 
+/** @name PalletEvmAccountBasicCrossAccountIdRepr */
+export interface PalletEvmAccountBasicCrossAccountIdRepr extends Enum {
+  readonly isSubstrate: boolean;
+  readonly asSubstrate: AccountId32;
+  readonly isEthereum: boolean;
+  readonly asEthereum: H160;
+  readonly type: 'Substrate' | 'Ethereum';
+}
+
 /** @name PalletEvmCall */
 export interface PalletEvmCall extends Enum {
   readonly isWithdraw: boolean;
@@ -1085,7 +1089,7 @@
 export interface PalletNonfungibleItemData extends Struct {
   readonly constData: Bytes;
   readonly variableData: Bytes;
-  readonly owner: PalletCommonAccountBasicCrossAccountIdRepr;
+  readonly owner: PalletEvmAccountBasicCrossAccountIdRepr;
 }
 
 /** @name PalletRefungibleError */
@@ -1259,12 +1263,12 @@
   readonly isAddToAllowList: boolean;
   readonly asAddToAllowList: {
     readonly collectionId: u32;
-    readonly address: PalletCommonAccountBasicCrossAccountIdRepr;
+    readonly address: PalletEvmAccountBasicCrossAccountIdRepr;
   } & Struct;
   readonly isRemoveFromAllowList: boolean;
   readonly asRemoveFromAllowList: {
     readonly collectionId: u32;
-    readonly address: PalletCommonAccountBasicCrossAccountIdRepr;
+    readonly address: PalletEvmAccountBasicCrossAccountIdRepr;
   } & Struct;
   readonly isSetPublicAccessMode: boolean;
   readonly asSetPublicAccessMode: {
@@ -1284,12 +1288,12 @@
   readonly isAddCollectionAdmin: boolean;
   readonly asAddCollectionAdmin: {
     readonly collectionId: u32;
-    readonly newAdminId: PalletCommonAccountBasicCrossAccountIdRepr;
+    readonly newAdminId: PalletEvmAccountBasicCrossAccountIdRepr;
   } & Struct;
   readonly isRemoveCollectionAdmin: boolean;
   readonly asRemoveCollectionAdmin: {
     readonly collectionId: u32;
-    readonly accountId: PalletCommonAccountBasicCrossAccountIdRepr;
+    readonly accountId: PalletEvmAccountBasicCrossAccountIdRepr;
   } & Struct;
   readonly isSetCollectionSponsor: boolean;
   readonly asSetCollectionSponsor: {
@@ -1307,13 +1311,13 @@
   readonly isCreateItem: boolean;
   readonly asCreateItem: {
     readonly collectionId: u32;
-    readonly owner: PalletCommonAccountBasicCrossAccountIdRepr;
+    readonly owner: PalletEvmAccountBasicCrossAccountIdRepr;
     readonly data: UpDataStructsCreateItemData;
   } & Struct;
   readonly isCreateMultipleItems: boolean;
   readonly asCreateMultipleItems: {
     readonly collectionId: u32;
-    readonly owner: PalletCommonAccountBasicCrossAccountIdRepr;
+    readonly owner: PalletEvmAccountBasicCrossAccountIdRepr;
     readonly itemsData: Vec<UpDataStructsCreateItemData>;
   } & Struct;
   readonly isCreateMultipleItemsEx: boolean;
@@ -1335,28 +1339,28 @@
   readonly isBurnFrom: boolean;
   readonly asBurnFrom: {
     readonly collectionId: u32;
-    readonly from: PalletCommonAccountBasicCrossAccountIdRepr;
+    readonly from: PalletEvmAccountBasicCrossAccountIdRepr;
     readonly itemId: u32;
     readonly value: u128;
   } & Struct;
   readonly isTransfer: boolean;
   readonly asTransfer: {
-    readonly recipient: PalletCommonAccountBasicCrossAccountIdRepr;
+    readonly recipient: PalletEvmAccountBasicCrossAccountIdRepr;
     readonly collectionId: u32;
     readonly itemId: u32;
     readonly value: u128;
   } & Struct;
   readonly isApprove: boolean;
   readonly asApprove: {
-    readonly spender: PalletCommonAccountBasicCrossAccountIdRepr;
+    readonly spender: PalletEvmAccountBasicCrossAccountIdRepr;
     readonly collectionId: u32;
     readonly itemId: u32;
     readonly amount: u128;
   } & Struct;
   readonly isTransferFrom: boolean;
   readonly asTransferFrom: {
-    readonly from: PalletCommonAccountBasicCrossAccountIdRepr;
-    readonly recipient: PalletCommonAccountBasicCrossAccountIdRepr;
+    readonly from: PalletEvmAccountBasicCrossAccountIdRepr;
+    readonly recipient: PalletEvmAccountBasicCrossAccountIdRepr;
     readonly collectionId: u32;
     readonly itemId: u32;
     readonly value: u128;
@@ -1413,7 +1417,7 @@
   readonly isCollectionSponsorRemoved: boolean;
   readonly asCollectionSponsorRemoved: u32;
   readonly isCollectionAdminAdded: boolean;
-  readonly asCollectionAdminAdded: ITuple<[u32, PalletCommonAccountBasicCrossAccountIdRepr]>;
+  readonly asCollectionAdminAdded: ITuple<[u32, PalletEvmAccountBasicCrossAccountIdRepr]>;
   readonly isCollectionOwnedChanged: boolean;
   readonly asCollectionOwnedChanged: ITuple<[u32, AccountId32]>;
   readonly isCollectionSponsorSet: boolean;
@@ -1423,11 +1427,11 @@
   readonly isSponsorshipConfirmed: boolean;
   readonly asSponsorshipConfirmed: ITuple<[u32, AccountId32]>;
   readonly isCollectionAdminRemoved: boolean;
-  readonly asCollectionAdminRemoved: ITuple<[u32, PalletCommonAccountBasicCrossAccountIdRepr]>;
+  readonly asCollectionAdminRemoved: ITuple<[u32, PalletEvmAccountBasicCrossAccountIdRepr]>;
   readonly isAllowListAddressRemoved: boolean;
-  readonly asAllowListAddressRemoved: ITuple<[u32, PalletCommonAccountBasicCrossAccountIdRepr]>;
+  readonly asAllowListAddressRemoved: ITuple<[u32, PalletEvmAccountBasicCrossAccountIdRepr]>;
   readonly isAllowListAddressAdded: boolean;
-  readonly asAllowListAddressAdded: ITuple<[u32, PalletCommonAccountBasicCrossAccountIdRepr]>;
+  readonly asAllowListAddressAdded: ITuple<[u32, PalletEvmAccountBasicCrossAccountIdRepr]>;
   readonly isCollectionLimitSet: boolean;
   readonly asCollectionLimitSet: u32;
   readonly isMintPermissionSet: boolean;
@@ -1722,9 +1726,6 @@
   readonly stateVersion: u8;
 }
 
-/** @name UniqueRuntimeRuntime */
-export interface UniqueRuntimeRuntime extends Null {}
-
 /** @name UpDataStructsAccessMode */
 export interface UpDataStructsAccessMode extends Enum {
   readonly isNormal: boolean;
@@ -1816,7 +1817,7 @@
   readonly isNft: boolean;
   readonly asNft: Vec<UpDataStructsCreateNftExData>;
   readonly isFungible: boolean;
-  readonly asFungible: BTreeMap<PalletCommonAccountBasicCrossAccountIdRepr,u128>;
+  readonly asFungible: BTreeMap<PalletEvmAccountBasicCrossAccountIdRepr,u128>;
   readonly isRefungibleMultipleItems: boolean;
   readonly asRefungibleMultipleItems: Vec<UpDataStructsCreateRefungibleExData>;
   readonly isRefungibleMultipleOwners: boolean;
@@ -1834,7 +1835,7 @@
 export interface UpDataStructsCreateNftExData extends Struct {
   readonly constData: Bytes;
   readonly variableData: Bytes;
-  readonly owner: PalletCommonAccountBasicCrossAccountIdRepr;
+  readonly owner: PalletEvmAccountBasicCrossAccountIdRepr;
 }
 
 /** @name UpDataStructsCreateReFungibleData */
@@ -1848,7 +1849,7 @@
 export interface UpDataStructsCreateRefungibleExData extends Struct {
   readonly constData: Bytes;
   readonly variableData: Bytes;
-  readonly users: BTreeMap<PalletCommonAccountBasicCrossAccountIdRepr, u128>;
+  readonly users: BTreeMap<PalletEvmAccountBasicCrossAccountIdRepr, u128>;
 }
 
 /** @name UpDataStructsMetaUpdatePermission */
modifiedtests/src/util/helpers.tsdiffbeforeafterboth
--- a/tests/src/util/helpers.ts
+++ b/tests/src/util/helpers.ts
@@ -839,6 +839,13 @@
   return balance;
 }
 
+export async function transferBalanceTo(api: ApiPromise, source: IKeyringPair, target: string, amount = 1000n * UNIQUE) {
+  const tx = api.tx.balances.transfer(target, amount);
+  const events = await submitTransactionAsync(source, tx);
+  const result = getGenericResult(events);
+  expect(result.success).to.be.true;
+}
+
 export async function
 scheduleTransferExpectSuccess(
   collectionId: number,