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
--- a/pallets/unique/src/mock.rs
+++ b/pallets/unique/src/mock.rs
@@ -26,7 +26,7 @@
 use pallet_transaction_payment::{CurrencyAdapter};
 use frame_system as system;
 use pallet_evm::{AddressMapping, runner::stack::MaybeMirroredLog};
-use up_evm_mapping::EvmBackwardsAddressMapping;
+use fp_evm_mapping::EvmBackwardsAddressMapping;
 use pallet_evm::account::CrossAccountId;
 use codec::{Encode, Decode, MaxEncodedLen};
 use scale_info::TypeInfo;
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
before · runtime/quartz/Cargo.toml
1################################################################################2# Package34[package]5authors = ['Unique Network <support@uniquenetwork.io>']6build = 'build.rs'7description = 'Quartz Runtime'8edition = '2021'9homepage = 'https://unique.network'10license = 'GPLv3'11name = 'quartz-runtime'12repository = 'https://github.com/UniqueNetwork/unique-chain'13version = '0.1.0'1415[package.metadata.docs.rs]16targets = ['x86_64-unknown-linux-gnu']1718[features]19default = ['std']20runtime-benchmarks = [21    'hex-literal',22    'frame-benchmarking',23    'frame-support/runtime-benchmarks',24    'frame-system-benchmarking',25    'frame-system/runtime-benchmarks',26    'pallet-ethereum/runtime-benchmarks',27    'pallet-evm-migration/runtime-benchmarks',28    'pallet-evm-coder-substrate/runtime-benchmarks',29    'pallet-balances/runtime-benchmarks',30    'pallet-timestamp/runtime-benchmarks',31    'pallet-common/runtime-benchmarks',32    'pallet-fungible/runtime-benchmarks',33    'pallet-refungible/runtime-benchmarks',34    'pallet-nonfungible/runtime-benchmarks',35    'pallet-unique/runtime-benchmarks',36    'pallet-inflation/runtime-benchmarks',37    'pallet-xcm/runtime-benchmarks',38    'sp-runtime/runtime-benchmarks',39    'xcm-builder/runtime-benchmarks',40]41std = [42    'codec/std',43    'cumulus-pallet-aura-ext/std',44    'cumulus-pallet-parachain-system/std',45    'cumulus-pallet-xcm/std',46    'cumulus-pallet-xcmp-queue/std',47    'cumulus-primitives-core/std',48    'cumulus-primitives-utility/std',49    'frame-executive/std',50    'frame-support/std',51    'frame-system/std',52    'frame-system-rpc-runtime-api/std',53    'pallet-aura/std',54    'pallet-balances/std',55    # 'pallet-contracts/std',56    # 'pallet-contracts-primitives/std',57    # 'pallet-contracts-rpc-runtime-api/std',58    # 'pallet-contract-helpers/std',59    'pallet-randomness-collective-flip/std',60    'pallet-sudo/std',61    'pallet-timestamp/std',62    'pallet-transaction-payment/std',63    'pallet-transaction-payment-rpc-runtime-api/std',64    'pallet-treasury/std',65    # 'pallet-vesting/std',66    'pallet-evm/std',67    'pallet-evm-migration/std',68    'pallet-evm-contract-helpers/std',69    'pallet-evm-transaction-payment/std',70    'pallet-evm-coder-substrate/std',71    'pallet-ethereum/std',72    'pallet-base-fee/std',73    'fp-rpc/std',74    'up-rpc/std',75    'up-evm-mapping/std',76    'fp-self-contained/std',77    'parachain-info/std',78    'serde',79    'pallet-inflation/std',80    'pallet-common/std',81    'pallet-fungible/std',82    'pallet-refungible/std',83    'pallet-nonfungible/std',84    'pallet-unique/std',85    'pallet-unq-scheduler/std',86    'pallet-charge-transaction/std',87    'up-data-structs/std',88    'sp-api/std',89    'sp-block-builder/std',90    "sp-consensus-aura/std",91    'sp-core/std',92    'sp-inherents/std',93    'sp-io/std',94    'sp-offchain/std',95    'sp-runtime/std',96    'sp-session/std',97    'sp-std/std',98    'sp-transaction-pool/std',99    'sp-version/std',100    'xcm/std',101    'xcm-builder/std',102    'xcm-executor/std',103    'unique-runtime-common/std',104105    "orml-vesting/std",106]107limit-testing = ['pallet-unique/limit-testing', 'up-data-structs/limit-testing']108109################################################################################110# Substrate Dependencies111112[dependencies.codec]113default-features = false114features = ['derive']115package = 'parity-scale-codec'116version = '3.1.2'117118[dependencies.frame-benchmarking]119default-features = false120git = 'https://github.com/paritytech/substrate.git'121optional = true122branch = 'polkadot-v0.9.18'123124[dependencies.frame-executive]125default-features = false126git = 'https://github.com/paritytech/substrate.git'127branch = 'polkadot-v0.9.18'128129[dependencies.frame-support]130default-features = false131git = 'https://github.com/paritytech/substrate.git'132branch = 'polkadot-v0.9.18'133134[dependencies.frame-system]135default-features = false136git = 'https://github.com/paritytech/substrate.git'137branch = 'polkadot-v0.9.18'138139[dependencies.frame-system-benchmarking]140default-features = false141git = 'https://github.com/paritytech/substrate.git'142optional = true143branch = 'polkadot-v0.9.18'144145[dependencies.frame-system-rpc-runtime-api]146default-features = false147git = 'https://github.com/paritytech/substrate.git'148branch = 'polkadot-v0.9.18'149150[dependencies.hex-literal]151optional = true152version = '0.3.3'153154[dependencies.serde]155default-features = false156features = ['derive']157optional = true158version = '1.0.130'159160[dependencies.pallet-aura]161default-features = false162git = 'https://github.com/paritytech/substrate.git'163branch = 'polkadot-v0.9.18'164165[dependencies.pallet-balances]166default-features = false167git = 'https://github.com/paritytech/substrate.git'168branch = 'polkadot-v0.9.18'169170# Contracts specific packages171# [dependencies.pallet-contracts]172# git = 'https://github.com/paritytech/substrate.git'173# default-features = false174# branch = 'polkadot-v0.9.18'175# version = '4.0.0-dev'176177# [dependencies.pallet-contracts-primitives]178# git = 'https://github.com/paritytech/substrate.git'179# default-features = false180# branch = 'polkadot-v0.9.18'181# version = '4.0.0-dev'182183# [dependencies.pallet-contracts-rpc-runtime-api]184# git = 'https://github.com/paritytech/substrate.git'185# default-features = false186# branch = 'polkadot-v0.9.18'187# version = '4.0.0-dev'188189[dependencies.pallet-randomness-collective-flip]190default-features = false191git = 'https://github.com/paritytech/substrate.git'192branch = 'polkadot-v0.9.18'193194[dependencies.pallet-sudo]195default-features = false196git = 'https://github.com/paritytech/substrate.git'197branch = 'polkadot-v0.9.18'198199[dependencies.pallet-timestamp]200default-features = false201git = 'https://github.com/paritytech/substrate.git'202branch = 'polkadot-v0.9.18'203204[dependencies.pallet-transaction-payment]205default-features = false206git = 'https://github.com/paritytech/substrate.git'207branch = 'polkadot-v0.9.18'208209[dependencies.pallet-transaction-payment-rpc-runtime-api]210default-features = false211git = 'https://github.com/paritytech/substrate.git'212branch = 'polkadot-v0.9.18'213214[dependencies.pallet-treasury]215default-features = false216git = 'https://github.com/paritytech/substrate.git'217branch = 'polkadot-v0.9.18'218219# [dependencies.pallet-vesting]220# default-features = false221# git = 'https://github.com/paritytech/substrate.git'222# branch = 'polkadot-v0.9.18'223224[dependencies.sp-arithmetic]225default-features = false226git = 'https://github.com/paritytech/substrate.git'227branch = 'polkadot-v0.9.18'228229[dependencies.sp-api]230default-features = false231git = 'https://github.com/paritytech/substrate.git'232branch = 'polkadot-v0.9.18'233234[dependencies.sp-block-builder]235default-features = false236git = 'https://github.com/paritytech/substrate.git'237branch = 'polkadot-v0.9.18'238239[dependencies.sp-core]240default-features = false241git = 'https://github.com/paritytech/substrate.git'242branch = 'polkadot-v0.9.18'243244[dependencies.sp-consensus-aura]245default-features = false246git = 'https://github.com/paritytech/substrate.git'247branch = 'polkadot-v0.9.18'248249[dependencies.sp-inherents]250default-features = false251git = 'https://github.com/paritytech/substrate.git'252branch = 'polkadot-v0.9.18'253254[dependencies.sp-io]255default-features = false256git = 'https://github.com/paritytech/substrate.git'257branch = 'polkadot-v0.9.18'258259[dependencies.sp-offchain]260default-features = false261git = 'https://github.com/paritytech/substrate.git'262branch = 'polkadot-v0.9.18'263264[dependencies.sp-runtime]265default-features = false266git = 'https://github.com/paritytech/substrate.git'267branch = 'polkadot-v0.9.18'268269[dependencies.sp-session]270default-features = false271git = 'https://github.com/paritytech/substrate.git'272branch = 'polkadot-v0.9.18'273274[dependencies.sp-std]275default-features = false276git = 'https://github.com/paritytech/substrate.git'277branch = 'polkadot-v0.9.18'278279[dependencies.sp-transaction-pool]280default-features = false281git = 'https://github.com/paritytech/substrate.git'282branch = 'polkadot-v0.9.18'283284[dependencies.sp-version]285default-features = false286git = 'https://github.com/paritytech/substrate.git'287branch = 'polkadot-v0.9.18'288289[dependencies.smallvec]290version = '1.6.1'291292################################################################################293# Cumulus dependencies294295[dependencies.parachain-info]296default-features = false297git = 'https://github.com/paritytech/cumulus.git'298branch = 'polkadot-v0.9.18'299300[dependencies.cumulus-pallet-aura-ext]301git = 'https://github.com/paritytech/cumulus.git'302branch = 'polkadot-v0.9.18'303default-features = false304305[dependencies.cumulus-pallet-parachain-system]306git = 'https://github.com/paritytech/cumulus.git'307branch = 'polkadot-v0.9.18'308default-features = false309310[dependencies.cumulus-primitives-core]311git = 'https://github.com/paritytech/cumulus.git'312branch = 'polkadot-v0.9.18'313default-features = false314315[dependencies.cumulus-pallet-xcm]316git = 'https://github.com/paritytech/cumulus.git'317branch = 'polkadot-v0.9.18'318default-features = false319320[dependencies.cumulus-pallet-dmp-queue]321git = 'https://github.com/paritytech/cumulus.git'322branch = 'polkadot-v0.9.18'323default-features = false324325[dependencies.cumulus-pallet-xcmp-queue]326git = 'https://github.com/paritytech/cumulus.git'327branch = 'polkadot-v0.9.18'328default-features = false329330[dependencies.cumulus-primitives-utility]331git = 'https://github.com/paritytech/cumulus.git'332branch = 'polkadot-v0.9.18'333default-features = false334335[dependencies.cumulus-primitives-timestamp]336git = 'https://github.com/paritytech/cumulus.git'337branch = 'polkadot-v0.9.18'338default-features = false339340################################################################################341# Polkadot dependencies342343[dependencies.polkadot-parachain]344git = 'https://github.com/paritytech/polkadot'345branch = 'release-v0.9.18'346default-features = false347348[dependencies.xcm]349git = 'https://github.com/paritytech/polkadot'350branch = 'release-v0.9.18'351default-features = false352353[dependencies.xcm-builder]354git = 'https://github.com/paritytech/polkadot'355branch = 'release-v0.9.18'356default-features = false357358[dependencies.xcm-executor]359git = 'https://github.com/paritytech/polkadot'360branch = 'release-v0.9.18'361default-features = false362363[dependencies.pallet-xcm]364git = 'https://github.com/paritytech/polkadot'365branch = 'release-v0.9.18'366default-features = false367368[dependencies.orml-vesting]369git = 'https://github.com/UniqueNetwork/open-runtime-module-library'370branch = 'unique-polkadot-v0.9.18'371version = "0.4.1-dev"372default-features = false373374################################################################################375# local dependencies376377[dependencies]378unique-runtime-common = { path = "../common", default-features = false }379scale-info = { version = "2.0.1", default-features = false, features = [380    "derive",381] }382derivative = "2.2.0"383pallet-unique = { path = '../../pallets/unique', default-features = false }384up-rpc = { path = "../../primitives/rpc", default-features = false }385up-evm-mapping = { path = "../../primitives/evm-mapping", default-features = false }386pallet-inflation = { path = '../../pallets/inflation', default-features = false }387up-data-structs = { path = '../../primitives/data-structs', default-features = false }388pallet-common = { default-features = false, path = "../../pallets/common" }389pallet-fungible = { default-features = false, path = "../../pallets/fungible" }390pallet-refungible = { default-features = false, path = "../../pallets/refungible" }391pallet-nonfungible = { default-features = false, path = "../../pallets/nonfungible" }392pallet-unq-scheduler = { path = '../../pallets/scheduler', default-features = false }393# pallet-contract-helpers = { path = '../pallets/contract-helpers', default-features = false, version = '0.1.0' }394pallet-charge-transaction = { git = "https://github.com/UniqueNetwork/pallet-sponsoring", branch = 'polkadot-v0.9.18', package = "pallet-template-transaction-payment", default-features = false, version = '3.0.0' }395pallet-evm-migration = { path = '../../pallets/evm-migration', default-features = false }396pallet-evm-contract-helpers = { path = '../../pallets/evm-contract-helpers', default-features = false }397pallet-evm-transaction-payment = { path = '../../pallets/evm-transaction-payment', default-features = false }398pallet-evm-coder-substrate = { default-features = false, path = "../../pallets/evm-coder-substrate" }399pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18" }400pallet-ethereum = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18" }401pallet-base-fee = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18" }402fp-rpc = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18" }403fp-self-contained = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18" }404405################################################################################406# Build Dependencies407408[build-dependencies.substrate-wasm-builder]409git = 'https://github.com/paritytech/substrate.git'410branch = 'polkadot-v0.9.18'
after · runtime/quartz/Cargo.toml
1################################################################################2# Package34[package]5authors = ['Unique Network <support@uniquenetwork.io>']6build = 'build.rs'7description = 'Quartz Runtime'8edition = '2021'9homepage = 'https://unique.network'10license = 'GPLv3'11name = 'quartz-runtime'12repository = 'https://github.com/UniqueNetwork/unique-chain'13version = '0.1.0'1415[package.metadata.docs.rs]16targets = ['x86_64-unknown-linux-gnu']1718[features]19default = ['std']20runtime-benchmarks = [21    'hex-literal',22    'frame-benchmarking',23    'frame-support/runtime-benchmarks',24    'frame-system-benchmarking',25    'frame-system/runtime-benchmarks',26    'pallet-ethereum/runtime-benchmarks',27    'pallet-evm-migration/runtime-benchmarks',28    'pallet-evm-coder-substrate/runtime-benchmarks',29    'pallet-balances/runtime-benchmarks',30    'pallet-timestamp/runtime-benchmarks',31    'pallet-common/runtime-benchmarks',32    'pallet-fungible/runtime-benchmarks',33    'pallet-refungible/runtime-benchmarks',34    'pallet-nonfungible/runtime-benchmarks',35    'pallet-unique/runtime-benchmarks',36    'pallet-inflation/runtime-benchmarks',37    'pallet-xcm/runtime-benchmarks',38    'sp-runtime/runtime-benchmarks',39    'xcm-builder/runtime-benchmarks',40]41std = [42    'codec/std',43    'cumulus-pallet-aura-ext/std',44    'cumulus-pallet-parachain-system/std',45    'cumulus-pallet-xcm/std',46    'cumulus-pallet-xcmp-queue/std',47    'cumulus-primitives-core/std',48    'cumulus-primitives-utility/std',49    'frame-executive/std',50    'frame-support/std',51    'frame-system/std',52    'frame-system-rpc-runtime-api/std',53    'pallet-aura/std',54    'pallet-balances/std',55    # 'pallet-contracts/std',56    # 'pallet-contracts-primitives/std',57    # 'pallet-contracts-rpc-runtime-api/std',58    # 'pallet-contract-helpers/std',59    'pallet-randomness-collective-flip/std',60    'pallet-sudo/std',61    'pallet-timestamp/std',62    'pallet-transaction-payment/std',63    'pallet-transaction-payment-rpc-runtime-api/std',64    'pallet-treasury/std',65    # 'pallet-vesting/std',66    'pallet-evm/std',67    'pallet-evm-migration/std',68    'pallet-evm-contract-helpers/std',69    'pallet-evm-transaction-payment/std',70    'pallet-evm-coder-substrate/std',71    'pallet-ethereum/std',72    'pallet-base-fee/std',73    'fp-rpc/std',74    'up-rpc/std',75    'fp-evm-mapping/std',76    'fp-self-contained/std',77    'parachain-info/std',78    'serde',79    'pallet-inflation/std',80    'pallet-common/std',81    'pallet-fungible/std',82    'pallet-refungible/std',83    'pallet-nonfungible/std',84    'pallet-unique/std',85    'pallet-unq-scheduler/std',86    'pallet-charge-transaction/std',87    'up-data-structs/std',88    'sp-api/std',89    'sp-block-builder/std',90    "sp-consensus-aura/std",91    'sp-core/std',92    'sp-inherents/std',93    'sp-io/std',94    'sp-offchain/std',95    'sp-runtime/std',96    'sp-session/std',97    'sp-std/std',98    'sp-transaction-pool/std',99    'sp-version/std',100    'xcm/std',101    'xcm-builder/std',102    'xcm-executor/std',103    'unique-runtime-common/std',104105    "orml-vesting/std",106]107limit-testing = ['pallet-unique/limit-testing', 'up-data-structs/limit-testing']108109################################################################################110# Substrate Dependencies111112[dependencies.codec]113default-features = false114features = ['derive']115package = 'parity-scale-codec'116version = '3.1.2'117118[dependencies.frame-benchmarking]119default-features = false120git = 'https://github.com/paritytech/substrate.git'121optional = true122branch = 'polkadot-v0.9.18'123124[dependencies.frame-executive]125default-features = false126git = 'https://github.com/paritytech/substrate.git'127branch = 'polkadot-v0.9.18'128129[dependencies.frame-support]130default-features = false131git = 'https://github.com/paritytech/substrate.git'132branch = 'polkadot-v0.9.18'133134[dependencies.frame-system]135default-features = false136git = 'https://github.com/paritytech/substrate.git'137branch = 'polkadot-v0.9.18'138139[dependencies.frame-system-benchmarking]140default-features = false141git = 'https://github.com/paritytech/substrate.git'142optional = true143branch = 'polkadot-v0.9.18'144145[dependencies.frame-system-rpc-runtime-api]146default-features = false147git = 'https://github.com/paritytech/substrate.git'148branch = 'polkadot-v0.9.18'149150[dependencies.hex-literal]151optional = true152version = '0.3.3'153154[dependencies.serde]155default-features = false156features = ['derive']157optional = true158version = '1.0.130'159160[dependencies.pallet-aura]161default-features = false162git = 'https://github.com/paritytech/substrate.git'163branch = 'polkadot-v0.9.18'164165[dependencies.pallet-balances]166default-features = false167git = 'https://github.com/paritytech/substrate.git'168branch = 'polkadot-v0.9.18'169170# Contracts specific packages171# [dependencies.pallet-contracts]172# git = 'https://github.com/paritytech/substrate.git'173# default-features = false174# branch = 'polkadot-v0.9.18'175# version = '4.0.0-dev'176177# [dependencies.pallet-contracts-primitives]178# git = 'https://github.com/paritytech/substrate.git'179# default-features = false180# branch = 'polkadot-v0.9.18'181# version = '4.0.0-dev'182183# [dependencies.pallet-contracts-rpc-runtime-api]184# git = 'https://github.com/paritytech/substrate.git'185# default-features = false186# branch = 'polkadot-v0.9.18'187# version = '4.0.0-dev'188189[dependencies.pallet-randomness-collective-flip]190default-features = false191git = 'https://github.com/paritytech/substrate.git'192branch = 'polkadot-v0.9.18'193194[dependencies.pallet-sudo]195default-features = false196git = 'https://github.com/paritytech/substrate.git'197branch = 'polkadot-v0.9.18'198199[dependencies.pallet-timestamp]200default-features = false201git = 'https://github.com/paritytech/substrate.git'202branch = 'polkadot-v0.9.18'203204[dependencies.pallet-transaction-payment]205default-features = false206git = 'https://github.com/paritytech/substrate.git'207branch = 'polkadot-v0.9.18'208209[dependencies.pallet-transaction-payment-rpc-runtime-api]210default-features = false211git = 'https://github.com/paritytech/substrate.git'212branch = 'polkadot-v0.9.18'213214[dependencies.pallet-treasury]215default-features = false216git = 'https://github.com/paritytech/substrate.git'217branch = 'polkadot-v0.9.18'218219# [dependencies.pallet-vesting]220# default-features = false221# git = 'https://github.com/paritytech/substrate.git'222# branch = 'polkadot-v0.9.18'223224[dependencies.sp-arithmetic]225default-features = false226git = 'https://github.com/paritytech/substrate.git'227branch = 'polkadot-v0.9.18'228229[dependencies.sp-api]230default-features = false231git = 'https://github.com/paritytech/substrate.git'232branch = 'polkadot-v0.9.18'233234[dependencies.sp-block-builder]235default-features = false236git = 'https://github.com/paritytech/substrate.git'237branch = 'polkadot-v0.9.18'238239[dependencies.sp-core]240default-features = false241git = 'https://github.com/paritytech/substrate.git'242branch = 'polkadot-v0.9.18'243244[dependencies.sp-consensus-aura]245default-features = false246git = 'https://github.com/paritytech/substrate.git'247branch = 'polkadot-v0.9.18'248249[dependencies.sp-inherents]250default-features = false251git = 'https://github.com/paritytech/substrate.git'252branch = 'polkadot-v0.9.18'253254[dependencies.sp-io]255default-features = false256git = 'https://github.com/paritytech/substrate.git'257branch = 'polkadot-v0.9.18'258259[dependencies.sp-offchain]260default-features = false261git = 'https://github.com/paritytech/substrate.git'262branch = 'polkadot-v0.9.18'263264[dependencies.sp-runtime]265default-features = false266git = 'https://github.com/paritytech/substrate.git'267branch = 'polkadot-v0.9.18'268269[dependencies.sp-session]270default-features = false271git = 'https://github.com/paritytech/substrate.git'272branch = 'polkadot-v0.9.18'273274[dependencies.sp-std]275default-features = false276git = 'https://github.com/paritytech/substrate.git'277branch = 'polkadot-v0.9.18'278279[dependencies.sp-transaction-pool]280default-features = false281git = 'https://github.com/paritytech/substrate.git'282branch = 'polkadot-v0.9.18'283284[dependencies.sp-version]285default-features = false286git = 'https://github.com/paritytech/substrate.git'287branch = 'polkadot-v0.9.18'288289[dependencies.smallvec]290version = '1.6.1'291292################################################################################293# Cumulus dependencies294295[dependencies.parachain-info]296default-features = false297git = 'https://github.com/paritytech/cumulus.git'298branch = 'polkadot-v0.9.18'299300[dependencies.cumulus-pallet-aura-ext]301git = 'https://github.com/paritytech/cumulus.git'302branch = 'polkadot-v0.9.18'303default-features = false304305[dependencies.cumulus-pallet-parachain-system]306git = 'https://github.com/paritytech/cumulus.git'307branch = 'polkadot-v0.9.18'308default-features = false309310[dependencies.cumulus-primitives-core]311git = 'https://github.com/paritytech/cumulus.git'312branch = 'polkadot-v0.9.18'313default-features = false314315[dependencies.cumulus-pallet-xcm]316git = 'https://github.com/paritytech/cumulus.git'317branch = 'polkadot-v0.9.18'318default-features = false319320[dependencies.cumulus-pallet-dmp-queue]321git = 'https://github.com/paritytech/cumulus.git'322branch = 'polkadot-v0.9.18'323default-features = false324325[dependencies.cumulus-pallet-xcmp-queue]326git = 'https://github.com/paritytech/cumulus.git'327branch = 'polkadot-v0.9.18'328default-features = false329330[dependencies.cumulus-primitives-utility]331git = 'https://github.com/paritytech/cumulus.git'332branch = 'polkadot-v0.9.18'333default-features = false334335[dependencies.cumulus-primitives-timestamp]336git = 'https://github.com/paritytech/cumulus.git'337branch = 'polkadot-v0.9.18'338default-features = false339340################################################################################341# Polkadot dependencies342343[dependencies.polkadot-parachain]344git = 'https://github.com/paritytech/polkadot'345branch = 'release-v0.9.18'346default-features = false347348[dependencies.xcm]349git = 'https://github.com/paritytech/polkadot'350branch = 'release-v0.9.18'351default-features = false352353[dependencies.xcm-builder]354git = 'https://github.com/paritytech/polkadot'355branch = 'release-v0.9.18'356default-features = false357358[dependencies.xcm-executor]359git = 'https://github.com/paritytech/polkadot'360branch = 'release-v0.9.18'361default-features = false362363[dependencies.pallet-xcm]364git = 'https://github.com/paritytech/polkadot'365branch = 'release-v0.9.18'366default-features = false367368[dependencies.orml-vesting]369git = 'https://github.com/UniqueNetwork/open-runtime-module-library'370branch = 'unique-polkadot-v0.9.18'371version = "0.4.1-dev"372default-features = false373374################################################################################375# local dependencies376377[dependencies]378unique-runtime-common = { path = "../common", default-features = false }379scale-info = { version = "2.0.1", default-features = false, features = [380    "derive",381] }382derivative = "2.2.0"383pallet-unique = { path = '../../pallets/unique', default-features = false }384up-rpc = { path = "../../primitives/rpc", default-features = false }385fp-evm-mapping = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "feature/300" }386pallet-inflation = { path = '../../pallets/inflation', default-features = false }387up-data-structs = { path = '../../primitives/data-structs', default-features = false }388pallet-common = { default-features = false, path = "../../pallets/common" }389pallet-fungible = { default-features = false, path = "../../pallets/fungible" }390pallet-refungible = { default-features = false, path = "../../pallets/refungible" }391pallet-nonfungible = { default-features = false, path = "../../pallets/nonfungible" }392pallet-unq-scheduler = { path = '../../pallets/scheduler', default-features = false }393# pallet-contract-helpers = { path = '../pallets/contract-helpers', default-features = false, version = '0.1.0' }394pallet-charge-transaction = { git = "https://github.com/UniqueNetwork/pallet-sponsoring", branch = 'polkadot-v0.9.18', package = "pallet-template-transaction-payment", default-features = false, version = '3.0.0' }395pallet-evm-migration = { path = '../../pallets/evm-migration', default-features = false }396pallet-evm-contract-helpers = { path = '../../pallets/evm-contract-helpers', default-features = false }397pallet-evm-transaction-payment = { path = '../../pallets/evm-transaction-payment', default-features = false }398pallet-evm-coder-substrate = { default-features = false, path = "../../pallets/evm-coder-substrate" }399pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18" }400pallet-ethereum = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18" }401pallet-base-fee = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18" }402fp-rpc = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18" }403fp-self-contained = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18" }404405################################################################################406# Build Dependencies407408[build-dependencies.substrate-wasm-builder]409git = 'https://github.com/paritytech/substrate.git'410branch = 'polkadot-v0.9.18'
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>;
 }