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

difftreelog

CORE-300 Fix PR

Trubnikov Sergey2022-03-24parent: #77bb9d1.patch.diff
in: master

12 files changed

modifiedCargo.lockdiffbeforeafterboth
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2751,6 +2751,15 @@
 ]
 
 [[package]]
+name = "fp-evm-mapping"
+version = "0.1.0"
+source = "git+https://github.com/uniquenetwork/frontier.git?branch=feature/300#8718bfde84a370f5a6e7642b216dd913ca33db5c"
+dependencies = [
+ "frame-support",
+ "sp-core",
+]
+
+[[package]]
 name = "fp-rpc"
 version = "3.0.0-dev"
 source = "git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.18#7c8ce8f83e0c8a5b57655622b721f8655b161903"
@@ -5576,6 +5585,7 @@
  "cumulus-primitives-timestamp",
  "cumulus-primitives-utility",
  "derivative",
+ "fp-evm-mapping",
  "fp-rpc",
  "fp-self-contained",
  "frame-benchmarking",
@@ -5632,7 +5642,6 @@
  "substrate-wasm-builder",
  "unique-runtime-common",
  "up-data-structs",
- "up-evm-mapping",
  "up-rpc",
  "xcm",
  "xcm-builder",
@@ -5984,6 +5993,7 @@
 version = "0.1.0"
 dependencies = [
  "evm-coder",
+ "fp-evm-mapping",
  "frame-support",
  "frame-system",
  "pallet-evm",
@@ -5995,7 +6005,6 @@
  "sp-runtime",
  "sp-std",
  "up-data-structs",
- "up-evm-mapping",
 ]
 
 [[package]]
@@ -6136,6 +6145,7 @@
 version = "0.1.0"
 dependencies = [
  "evm-coder",
+ "fp-evm-mapping",
  "frame-support",
  "frame-system",
  "log",
@@ -6146,7 +6156,6 @@
  "sp-core",
  "sp-runtime",
  "sp-std",
- "up-evm-mapping",
  "up-sponsorship",
 ]
 
@@ -6182,7 +6191,6 @@
  "sp-io",
  "sp-runtime",
  "sp-std",
- "up-evm-mapping",
  "up-sponsorship",
 ]
 
@@ -6825,7 +6833,6 @@
  "sp-runtime",
  "sp-std",
  "up-data-structs",
- "up-evm-mapping",
  "up-sponsorship",
 ]
 
@@ -8708,6 +8715,7 @@
  "cumulus-primitives-timestamp",
  "cumulus-primitives-utility",
  "derivative",
+ "fp-evm-mapping",
  "fp-rpc",
  "fp-self-contained",
  "frame-benchmarking",
@@ -8764,7 +8772,6 @@
  "substrate-wasm-builder",
  "unique-runtime-common",
  "up-data-structs",
- "up-evm-mapping",
  "up-rpc",
  "xcm",
  "xcm-builder",
@@ -12550,6 +12557,7 @@
  "cumulus-primitives-timestamp",
  "cumulus-primitives-utility",
  "derivative",
+ "fp-evm-mapping",
  "fp-rpc",
  "fp-self-contained",
  "frame-benchmarking",
@@ -12606,7 +12614,6 @@
  "substrate-wasm-builder",
  "unique-runtime-common",
  "up-data-structs",
- "up-evm-mapping",
  "up-rpc",
  "xcm",
  "xcm-builder",
@@ -12687,15 +12694,6 @@
  "sp-core",
  "sp-runtime",
  "sp-std",
-]
-
-[[package]]
-name = "up-evm-mapping"
-version = "0.1.0"
-source = "git+https://github.com/uniquenetwork/frontier.git?branch=feature/300#0a1dc4086cbe971ddf57edf82a61cfce52c8c20b"
-dependencies = [
- "frame-support",
- "sp-core",
 ]
 
 [[package]]
modifiedpallets/common/Cargo.tomldiffbeforeafterboth
--- a/pallets/common/Cargo.toml
+++ b/pallets/common/Cargo.toml
@@ -16,12 +16,12 @@
 sp-runtime = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
 sp-std = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
 sp-core = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
+fp-evm-mapping = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "feature/300" }
 up-data-structs = { default-features = false, path = '../../primitives/data-structs' }
 pallet-evm-coder-substrate = { default-features = false, path = '../../pallets/evm-coder-substrate' }
 evm-coder = { default-features = false, path = '../../crates/evm-coder' }
 pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18" }
 frame-common = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "feature/300" }
-up-evm-mapping = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "feature/300" }
 serde = { version = "1.0.130", default-features = false }
 scale-info = { version = "2.0.1", default-features = false, features = [
     "derive",
@@ -34,7 +34,7 @@
     "frame-system/std",
     "sp-runtime/std",
     "sp-std/std",
-    "up-evm-mapping/std",
+    "fp-evm-mapping/std",
     "up-data-structs/std",
     "pallet-evm/std",
 ]
modifiedpallets/evm-contract-helpers/Cargo.tomldiffbeforeafterboth
--- a/pallets/evm-contract-helpers/Cargo.toml
+++ b/pallets/evm-contract-helpers/Cargo.toml
@@ -17,7 +17,7 @@
 pallet-evm-coder-substrate = { default-features = false, path = '../../pallets/evm-coder-substrate' }
 pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18" }
 up-sponsorship = { version = "0.1.0", default-features = false, git = "https://github.com/UniqueNetwork/pallet-sponsoring", branch = 'polkadot-v0.9.18' }
-up-evm-mapping = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "feature/300" }
+fp-evm-mapping = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "feature/300" }
 log = "0.4.14"
 
 [dependencies.codec]
modifiedpallets/evm-transaction-payment/Cargo.tomldiffbeforeafterboth
--- a/pallets/evm-transaction-payment/Cargo.toml
+++ b/pallets/evm-transaction-payment/Cargo.toml
@@ -18,7 +18,7 @@
 fp-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18" }
 pallet-ethereum = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18" }
 up-sponsorship = { version = "0.1.0", default-features = false, git = "https://github.com/UniqueNetwork/pallet-sponsoring", branch = 'polkadot-v0.9.18' }
-up-evm-mapping = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "feature/300" }
+fp-evm-mapping = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "feature/300" }
 
 [dependencies.codec]
 default-features = false
@@ -39,5 +39,5 @@
     "pallet-ethereum/std",
     "fp-evm/std",
     "up-sponsorship/std",
-    "up-evm-mapping/std",
+    "fp-evm-mapping/std",
 ]
modifiedpallets/unique/Cargo.tomldiffbeforeafterboth
--- a/pallets/unique/Cargo.toml
+++ b/pallets/unique/Cargo.toml
@@ -34,7 +34,7 @@
     'fp-evm/std',
     'up-data-structs/std',
     'up-sponsorship/std',
-    'up-evm-mapping/std',
+    'fp-evm-mapping/std',
     'sp-std/std',
     'sp-api/std',
     'sp-runtime/std',
@@ -132,7 +132,7 @@
 sp-api = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.18" }
 
 up-sponsorship = { version = "0.1.0", default-features = false, git = "https://github.com/UniqueNetwork/pallet-sponsoring", branch = 'polkadot-v0.9.18' }
-up-evm-mapping = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "feature/300" }
+fp-evm-mapping = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "feature/300" }
 evm-coder = { default-features = false, path = "../../crates/evm-coder" }
 pallet-evm-coder-substrate = { default-features = false, path = "../../pallets/evm-coder-substrate" }
 primitive-types = { version = "0.11.1", default-features = false, features = [
modifiedpallets/unique/src/mock.rsdiffbeforeafterboth
before · pallets/unique/src/mock.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#![allow(clippy::from_over_into)]1819use crate as pallet_template;20use sp_core::{H160, H256};21use frame_support::{parameter_types, traits::Everything, weights::IdentityFee};22use sp_runtime::{23	traits::{BlakeTwo256, IdentityLookup},24	testing::Header,25};26use pallet_transaction_payment::{CurrencyAdapter};27use frame_system as system;28use pallet_evm::{AddressMapping, runner::stack::MaybeMirroredLog};29use up_evm_mapping::EvmBackwardsAddressMapping;30use pallet_evm::account::CrossAccountId;31use codec::{Encode, Decode, MaxEncodedLen};32use scale_info::TypeInfo;33use up_data_structs::ConstU32;3435type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;36type Block = frame_system::mocking::MockBlock<Test>;3738// Configure a mock runtime to test the pallet.39frame_support::construct_runtime!(40	pub enum Test where41		Block = Block,42		NodeBlock = Block,43		UncheckedExtrinsic = UncheckedExtrinsic,44	{45		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},46		TemplateModule: pallet_template::{Pallet, Call, Storage},47		Balances: pallet_balances::{Pallet, Call, Storage},48		Common: pallet_common::{Pallet, Storage, Event<T>},49		Fungible: pallet_fungible::{Pallet, Storage},50		Refungible: pallet_refungible::{Pallet, Storage},51		Nonfungible: pallet_nonfungible::{Pallet, Storage},52	}53);5455parameter_types! {56	pub const BlockHashCount: u64 = 250;57	pub const SS58Prefix: u8 = 42;58}5960impl system::Config for Test {61	type BaseCallFilter = Everything;62	type BlockWeights = ();63	type BlockLength = ();64	type DbWeight = ();65	type Origin = Origin;66	type Call = Call;67	type Index = u64;68	type BlockNumber = u64;69	type Hash = H256;70	type Hashing = BlakeTwo256;71	type AccountId = u64;72	type Lookup = IdentityLookup<Self::AccountId>;73	type Header = Header;74	type Event = ();75	type BlockHashCount = BlockHashCount;76	type Version = ();77	type PalletInfo = PalletInfo;78	type AccountData = pallet_balances::AccountData<u64>;79	type OnNewAccount = ();80	type OnKilledAccount = ();81	type SystemWeightInfo = ();82	type SS58Prefix = SS58Prefix;83	type OnSetCode = ();84	type MaxConsumers = ConstU32<16>;85}8687parameter_types! {88	pub const ExistentialDeposit: u64 = 1;89	pub const MaxLocks: u32 = 50;90}91//frame_system::Module<Test>;92impl pallet_balances::Config for Test {93	type AccountStore = System;94	type Balance = u64;95	type DustRemoval = ();96	type Event = ();97	type ExistentialDeposit = ExistentialDeposit;98	type WeightInfo = ();99	type MaxLocks = MaxLocks;100	type MaxReserves = ();101	type ReserveIdentifier = [u8; 8];102}103104parameter_types! {105	pub const TransactionByteFee: u64 = 1;106	pub const OperationalFeeMultiplier: u8 = 5;107}108109impl pallet_transaction_payment::Config for Test {110	type OnChargeTransaction = CurrencyAdapter<pallet_balances::Pallet<Test>, ()>;111	type TransactionByteFee = TransactionByteFee;112	type WeightToFee = IdentityFee<u64>;113	type FeeMultiplierUpdate = ();114	type OperationalFeeMultiplier = OperationalFeeMultiplier;115}116117parameter_types! {118	pub const MinimumPeriod: u64 = 1;119}120impl pallet_timestamp::Config for Test {121	type Moment = u64;122	type OnTimestampSet = ();123	type MinimumPeriod = MinimumPeriod;124	type WeightInfo = ();125}126127parameter_types! {128	pub const CollectionCreationPrice: u32 = 100;129	pub TreasuryAccountId: u64 = 1234;130	pub EthereumChainId: u32 = 1111;131}132133pub struct TestEvmAddressMapping;134impl AddressMapping<u64> for TestEvmAddressMapping {135	fn into_account_id(_addr: sp_core::H160) -> u64 {136		unimplemented!()137	}138}139140pub struct TestEvmBackwardsAddressMapping;141impl EvmBackwardsAddressMapping<u64> for TestEvmBackwardsAddressMapping {142	fn from_account_id(_account_id: u64) -> sp_core::H160 {143		unimplemented!()144	}145}146147#[derive(Encode, Decode, Clone, PartialEq, Eq, PartialOrd, Ord, Debug, TypeInfo, MaxEncodedLen)]148pub struct TestCrossAccountId(u64, sp_core::H160);149impl CrossAccountId<u64> for TestCrossAccountId {150	fn as_sub(&self) -> &u64 {151		&self.0152	}153	fn as_eth(&self) -> &sp_core::H160 {154		&self.1155	}156	fn from_sub(sub: u64) -> Self {157		let mut eth = [0; 20];158		eth[12..20].copy_from_slice(&sub.to_be_bytes());159		Self(sub, sp_core::H160(eth))160	}161	fn from_eth(eth: sp_core::H160) -> Self {162		let mut sub_raw = [0; 8];163		sub_raw.copy_from_slice(&eth.0[0..8]);164		let sub = u64::from_be_bytes(sub_raw);165		Self(sub, eth)166	}167	fn conv_eq(&self, other: &Self) -> bool {168		self.as_sub() == other.as_sub()169	}170}171172impl Default for TestCrossAccountId {173	fn default() -> Self {174		Self::from_sub(0)175	}176}177178pub struct TestEtheremTransactionSender;179impl pallet_ethereum::EthereumTransactionSender for TestEtheremTransactionSender {180	fn submit_logs_transaction(181		_source: H160,182		_tx: pallet_ethereum::Transaction,183		_logs: Vec<MaybeMirroredLog>,184	) {185	}186}187188impl pallet_evm_coder_substrate::Config for Test {189	type EthereumTransactionSender = TestEtheremTransactionSender;190	type GasWeightMapping = ();191}192193impl pallet_common::Config for Test {194	type Event = ();195	type Currency = Balances;196	type CollectionCreationPrice = CollectionCreationPrice;197	type TreasuryAccountId = TreasuryAccountId;198}199200impl pallet_evm::account::Config for Test {201	type CrossAccountId = TestCrossAccountId;202	type EvmAddressMapping = TestEvmAddressMapping;203	type EvmBackwardsAddressMapping = TestEvmBackwardsAddressMapping;204}205206impl pallet_fungible::Config for Test {207	type WeightInfo = ();208}209impl pallet_refungible::Config for Test {210	type WeightInfo = ();211}212impl pallet_nonfungible::Config for Test {213	type WeightInfo = ();214}215216impl pallet_template::Config for Test {217	type Event = ();218	type WeightInfo = ();219}220221// Build genesis storage according to the mock runtime.222pub fn new_test_ext() -> sp_io::TestExternalities {223	system::GenesisConfig::default()224		.build_storage::<Test>()225		.unwrap()226		.into()227}
after · pallets/unique/src/mock.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#![allow(clippy::from_over_into)]1819use crate as pallet_template;20use sp_core::{H160, H256};21use frame_support::{parameter_types, traits::Everything, weights::IdentityFee};22use sp_runtime::{23	traits::{BlakeTwo256, IdentityLookup},24	testing::Header,25};26use pallet_transaction_payment::{CurrencyAdapter};27use frame_system as system;28use pallet_evm::{AddressMapping, runner::stack::MaybeMirroredLog};29use fp_evm_mapping::EvmBackwardsAddressMapping;30use pallet_evm::account::CrossAccountId;31use codec::{Encode, Decode, MaxEncodedLen};32use scale_info::TypeInfo;33use up_data_structs::ConstU32;3435type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;36type Block = frame_system::mocking::MockBlock<Test>;3738// Configure a mock runtime to test the pallet.39frame_support::construct_runtime!(40	pub enum Test where41		Block = Block,42		NodeBlock = Block,43		UncheckedExtrinsic = UncheckedExtrinsic,44	{45		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},46		TemplateModule: pallet_template::{Pallet, Call, Storage},47		Balances: pallet_balances::{Pallet, Call, Storage},48		Common: pallet_common::{Pallet, Storage, Event<T>},49		Fungible: pallet_fungible::{Pallet, Storage},50		Refungible: pallet_refungible::{Pallet, Storage},51		Nonfungible: pallet_nonfungible::{Pallet, Storage},52	}53);5455parameter_types! {56	pub const BlockHashCount: u64 = 250;57	pub const SS58Prefix: u8 = 42;58}5960impl system::Config for Test {61	type BaseCallFilter = Everything;62	type BlockWeights = ();63	type BlockLength = ();64	type DbWeight = ();65	type Origin = Origin;66	type Call = Call;67	type Index = u64;68	type BlockNumber = u64;69	type Hash = H256;70	type Hashing = BlakeTwo256;71	type AccountId = u64;72	type Lookup = IdentityLookup<Self::AccountId>;73	type Header = Header;74	type Event = ();75	type BlockHashCount = BlockHashCount;76	type Version = ();77	type PalletInfo = PalletInfo;78	type AccountData = pallet_balances::AccountData<u64>;79	type OnNewAccount = ();80	type OnKilledAccount = ();81	type SystemWeightInfo = ();82	type SS58Prefix = SS58Prefix;83	type OnSetCode = ();84	type MaxConsumers = ConstU32<16>;85}8687parameter_types! {88	pub const ExistentialDeposit: u64 = 1;89	pub const MaxLocks: u32 = 50;90}91//frame_system::Module<Test>;92impl pallet_balances::Config for Test {93	type AccountStore = System;94	type Balance = u64;95	type DustRemoval = ();96	type Event = ();97	type ExistentialDeposit = ExistentialDeposit;98	type WeightInfo = ();99	type MaxLocks = MaxLocks;100	type MaxReserves = ();101	type ReserveIdentifier = [u8; 8];102}103104parameter_types! {105	pub const TransactionByteFee: u64 = 1;106	pub const OperationalFeeMultiplier: u8 = 5;107}108109impl pallet_transaction_payment::Config for Test {110	type OnChargeTransaction = CurrencyAdapter<pallet_balances::Pallet<Test>, ()>;111	type TransactionByteFee = TransactionByteFee;112	type WeightToFee = IdentityFee<u64>;113	type FeeMultiplierUpdate = ();114	type OperationalFeeMultiplier = OperationalFeeMultiplier;115}116117parameter_types! {118	pub const MinimumPeriod: u64 = 1;119}120impl pallet_timestamp::Config for Test {121	type Moment = u64;122	type OnTimestampSet = ();123	type MinimumPeriod = MinimumPeriod;124	type WeightInfo = ();125}126127parameter_types! {128	pub const CollectionCreationPrice: u32 = 100;129	pub TreasuryAccountId: u64 = 1234;130	pub EthereumChainId: u32 = 1111;131}132133pub struct TestEvmAddressMapping;134impl AddressMapping<u64> for TestEvmAddressMapping {135	fn into_account_id(_addr: sp_core::H160) -> u64 {136		unimplemented!()137	}138}139140pub struct TestEvmBackwardsAddressMapping;141impl EvmBackwardsAddressMapping<u64> for TestEvmBackwardsAddressMapping {142	fn from_account_id(_account_id: u64) -> sp_core::H160 {143		unimplemented!()144	}145}146147#[derive(Encode, Decode, Clone, PartialEq, Eq, PartialOrd, Ord, Debug, TypeInfo, MaxEncodedLen)]148pub struct TestCrossAccountId(u64, sp_core::H160);149impl CrossAccountId<u64> for TestCrossAccountId {150	fn as_sub(&self) -> &u64 {151		&self.0152	}153	fn as_eth(&self) -> &sp_core::H160 {154		&self.1155	}156	fn from_sub(sub: u64) -> Self {157		let mut eth = [0; 20];158		eth[12..20].copy_from_slice(&sub.to_be_bytes());159		Self(sub, sp_core::H160(eth))160	}161	fn from_eth(eth: sp_core::H160) -> Self {162		let mut sub_raw = [0; 8];163		sub_raw.copy_from_slice(&eth.0[0..8]);164		let sub = u64::from_be_bytes(sub_raw);165		Self(sub, eth)166	}167	fn conv_eq(&self, other: &Self) -> bool {168		self.as_sub() == other.as_sub()169	}170}171172impl Default for TestCrossAccountId {173	fn default() -> Self {174		Self::from_sub(0)175	}176}177178pub struct TestEtheremTransactionSender;179impl pallet_ethereum::EthereumTransactionSender for TestEtheremTransactionSender {180	fn submit_logs_transaction(181		_source: H160,182		_tx: pallet_ethereum::Transaction,183		_logs: Vec<MaybeMirroredLog>,184	) {185	}186}187188impl pallet_evm_coder_substrate::Config for Test {189	type EthereumTransactionSender = TestEtheremTransactionSender;190	type GasWeightMapping = ();191}192193impl pallet_common::Config for Test {194	type Event = ();195	type Currency = Balances;196	type CollectionCreationPrice = CollectionCreationPrice;197	type TreasuryAccountId = TreasuryAccountId;198}199200impl pallet_evm::account::Config for Test {201	type CrossAccountId = TestCrossAccountId;202	type EvmAddressMapping = TestEvmAddressMapping;203	type EvmBackwardsAddressMapping = TestEvmBackwardsAddressMapping;204}205206impl pallet_fungible::Config for Test {207	type WeightInfo = ();208}209impl pallet_refungible::Config for Test {210	type WeightInfo = ();211}212impl pallet_nonfungible::Config for Test {213	type WeightInfo = ();214}215216impl pallet_template::Config for Test {217	type Event = ();218	type WeightInfo = ();219}220221// Build genesis storage according to the mock runtime.222pub fn new_test_ext() -> sp_io::TestExternalities {223	system::GenesisConfig::default()224		.build_storage::<Test>()225		.unwrap()226		.into()227}
modifiedruntime/opal/Cargo.tomldiffbeforeafterboth
--- a/runtime/opal/Cargo.toml
+++ b/runtime/opal/Cargo.toml
@@ -72,7 +72,7 @@
     'pallet-base-fee/std',
     'fp-rpc/std',
     'up-rpc/std',
-    'up-evm-mapping/std',
+    'fp-evm-mapping/std',
     'fp-self-contained/std',
     'parachain-info/std',
     'serde',
@@ -382,7 +382,7 @@
 derivative = "2.2.0"
 pallet-unique = { path = '../../pallets/unique', default-features = false }
 up-rpc = { path = "../../primitives/rpc", default-features = false }
-up-evm-mapping = { path = "../../primitives/evm-mapping", default-features = false }
+fp-evm-mapping = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "feature/300" }
 pallet-inflation = { path = '../../pallets/inflation', default-features = false }
 up-data-structs = { path = '../../primitives/data-structs', default-features = false }
 pallet-common = { default-features = false, path = "../../pallets/common" }
modifiedruntime/opal/src/lib.rsdiffbeforeafterboth
--- a/runtime/opal/src/lib.rs
+++ b/runtime/opal/src/lib.rs
@@ -275,7 +275,7 @@
 impl pallet_evm::account::Config for Runtime {
 	type CrossAccountId = pallet_evm::account::BasicCrossAccountId<Self>;
 	type EvmAddressMapping = pallet_evm::HashedAddressMapping<Self::Hashing>;
-	type EvmBackwardsAddressMapping = up_evm_mapping::MapBackwardsAddressTruncated;
+	type EvmBackwardsAddressMapping = fp_evm_mapping::MapBackwardsAddressTruncated;
 }
 
 impl pallet_evm::Config for Runtime {
modifiedruntime/quartz/Cargo.tomldiffbeforeafterboth
--- a/runtime/quartz/Cargo.toml
+++ b/runtime/quartz/Cargo.toml
@@ -72,7 +72,7 @@
     'pallet-base-fee/std',
     'fp-rpc/std',
     'up-rpc/std',
-    'up-evm-mapping/std',
+    'fp-evm-mapping/std',
     'fp-self-contained/std',
     'parachain-info/std',
     'serde',
@@ -382,7 +382,7 @@
 derivative = "2.2.0"
 pallet-unique = { path = '../../pallets/unique', default-features = false }
 up-rpc = { path = "../../primitives/rpc", default-features = false }
-up-evm-mapping = { path = "../../primitives/evm-mapping", default-features = false }
+fp-evm-mapping = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "feature/300" }
 pallet-inflation = { path = '../../pallets/inflation', default-features = false }
 up-data-structs = { path = '../../primitives/data-structs', default-features = false }
 pallet-common = { default-features = false, path = "../../pallets/common" }
modifiedruntime/quartz/src/lib.rsdiffbeforeafterboth
--- a/runtime/quartz/src/lib.rs
+++ b/runtime/quartz/src/lib.rs
@@ -853,6 +853,12 @@
 	type TreasuryAccountId = TreasuryAccountId;
 }
 
+impl pallet_evm::account::Config for Runtime {
+	type CrossAccountId = pallet_evm::account::BasicCrossAccountId<Self>;
+	type EvmAddressMapping = HashedAddressMapping<Self::Hashing>;
+	type EvmBackwardsAddressMapping = fp_evm_mapping::MapBackwardsAddressTruncated;
+}
+
 impl pallet_fungible::Config for Runtime {
 	type WeightInfo = pallet_fungible::weights::SubstrateWeight<Self>;
 }
modifiedruntime/unique/Cargo.tomldiffbeforeafterboth
--- a/runtime/unique/Cargo.toml
+++ b/runtime/unique/Cargo.toml
@@ -72,7 +72,7 @@
     'pallet-base-fee/std',
     'fp-rpc/std',
     'up-rpc/std',
-    'up-evm-mapping/std',
+    'fp-evm-mapping/std',
     'fp-self-contained/std',
     'parachain-info/std',
     'serde',
@@ -400,7 +400,7 @@
 pallet-base-fee = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18" }
 fp-rpc = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18" }
 fp-self-contained = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18" }
-up-evm-mapping = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "feature/300" }
+fp-evm-mapping = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "feature/300" }
 frame-common = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "feature/300" }
 
 ################################################################################
modifiedruntime/unique/src/lib.rsdiffbeforeafterboth
--- a/runtime/unique/src/lib.rs
+++ b/runtime/unique/src/lib.rs
@@ -852,6 +852,12 @@
 	type TreasuryAccountId = TreasuryAccountId;
 }
 
+impl pallet_evm::account::Config for Runtime {
+	type CrossAccountId = pallet_evm::account::BasicCrossAccountId<Self>;
+	type EvmAddressMapping = HashedAddressMapping<Self::Hashing>;
+	type EvmBackwardsAddressMapping = fp_evm_mapping::MapBackwardsAddressTruncated;
+}
+
 impl pallet_fungible::Config for Runtime {
 	type WeightInfo = pallet_fungible::weights::SubstrateWeight<Self>;
 }