From bc99cf4c90c2a78259d40139553a228238fdf6d9 Mon Sep 17 00:00:00 2001
From: Trubnikov Sergey <strubnikov@usetech.com>
Date: Tue, 15 Mar 2022 14:29:01 +0000
Subject: [PATCH] CORE-300 Adapt to CrossAccountId


---
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2554,7 +2554,7 @@
  "fc-db",
  "fc-rpc-core",
  "fp-consensus",
- "fp-evm 3.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
+ "fp-evm",
  "fp-rpc",
  "fp-storage",
  "futures 0.3.21",
@@ -2565,7 +2565,7 @@
  "log",
  "lru 0.6.6",
  "pallet-ethereum",
- "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
+ "pallet-evm",
  "parity-scale-codec",
  "parking_lot 0.11.2",
  "rand 0.7.3",
@@ -2766,7 +2766,7 @@
 dependencies = [
  "ethereum",
  "ethereum-types",
- "fp-evm 3.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
+ "fp-evm",
  "parity-scale-codec",
  "scale-info",
  "sp-api",
@@ -2862,21 +2862,6 @@
 ]
 
 [[package]]
-name = "frame-common"
-version = "0.1.0"
-source = "git+https://github.com/uniquenetwork/frontier.git?branch=feature/300#0a1dc4086cbe971ddf57edf82a61cfce52c8c20b"
-dependencies = [
- "frame-system",
- "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=feature/300)",
- "parity-scale-codec",
- "scale-info",
- "serde",
- "sp-core",
- "sp-std",
- "up-evm-mapping",
-]
-
-[[package]]
 name = "frame-election-provider-support"
 version = "4.0.0-dev"
 source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65"
@@ -5860,7 +5845,7 @@
 dependencies = [
  "frame-support",
  "frame-system",
- "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
+ "pallet-evm",
  "parity-scale-codec",
  "scale-info",
  "serde",
@@ -6012,7 +5997,7 @@
  "fp-evm-mapping",
  "frame-support",
  "frame-system",
- "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
+ "pallet-evm",
  "pallet-evm-coder-substrate",
  "parity-scale-codec",
  "scale-info",
@@ -6098,7 +6083,7 @@
  "frame-system",
  "log",
  "pallet-balances",
- "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
+ "pallet-evm",
  "pallet-timestamp",
  "parity-scale-codec",
  "rlp",
@@ -6151,7 +6136,7 @@
  "frame-support",
  "frame-system",
  "pallet-ethereum",
- "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
+ "pallet-evm",
  "parity-scale-codec",
  "scale-info",
  "sp-core",
@@ -6167,7 +6152,7 @@
  "frame-support",
  "frame-system",
  "log",
- "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
+ "pallet-evm",
  "pallet-evm-coder-substrate",
  "parity-scale-codec",
  "scale-info",
@@ -6181,11 +6166,11 @@
 name = "pallet-evm-migration"
 version = "0.1.0"
 dependencies = [
- "fp-evm 3.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
+ "fp-evm",
  "frame-benchmarking",
  "frame-support",
  "frame-system",
- "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
+ "pallet-evm",
  "parity-scale-codec",
  "scale-info",
  "sp-core",
@@ -6203,7 +6188,7 @@
  "frame-support",
  "frame-system",
  "pallet-ethereum",
- "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
+ "pallet-evm",
  "parity-scale-codec",
  "scale-info",
  "sp-core",
@@ -6220,7 +6205,6 @@
  "ethereum",
  "evm-coder",
  "frame-benchmarking",
- "frame-common",
  "frame-support",
  "frame-system",
  "pallet-common",
@@ -6448,7 +6432,6 @@
  "ethereum",
  "evm-coder",
  "frame-benchmarking",
- "frame-common",
  "frame-support",
  "frame-system",
  "pallet-common",
@@ -6566,7 +6549,6 @@
 version = "0.1.0"
 dependencies = [
  "frame-benchmarking",
- "frame-common",
  "frame-support",
  "frame-system",
  "pallet-common",
@@ -6831,14 +6813,13 @@
  "fp-evm",
  "fp-evm-mapping",
  "frame-benchmarking",
- "frame-common",
  "frame-support",
  "frame-system",
  "hex-literal",
  "pallet-balances",
  "pallet-common",
  "pallet-ethereum",
- "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
+ "pallet-evm",
  "pallet-evm-coder-substrate",
  "pallet-fungible",
  "pallet-nonfungible",
@@ -12220,7 +12201,7 @@
  "chrono",
  "lazy_static",
  "matchers",
- "parking_lot 0.10.2",
+ "parking_lot 0.11.2",
  "regex",
  "serde",
  "serde_json",
@@ -12367,7 +12348,6 @@
 name = "uc-rpc"
 version = "0.1.0"
 dependencies = [
- "frame-common",
  "jsonrpc-core",
  "jsonrpc-core-client",
  "jsonrpc-derive",
@@ -12586,7 +12566,6 @@
  "fp-rpc",
  "fp-self-contained",
  "frame-benchmarking",
- "frame-common",
  "frame-executive",
  "frame-support",
  "frame-system",
@@ -12599,7 +12578,7 @@
  "pallet-base-fee",
  "pallet-common",
  "pallet-ethereum",
- "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
+ "pallet-evm",
  "pallet-evm-coder-substrate",
  "pallet-evm-contract-helpers",
  "pallet-evm-migration",
@@ -12727,7 +12706,6 @@
 name = "up-rpc"
 version = "0.1.0"
 dependencies = [
- "frame-common",
  "pallet-common",
  "pallet-evm",
  "parity-scale-codec",
--- a/pallets/fungible/Cargo.toml
+++ b/pallets/fungible/Cargo.toml
@@ -26,7 +26,6 @@
 scale-info = { version = "2.0.1", default-features = false, features = [
     "derive",
 ] }
-frame-common = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "feature/300" }
 
 [features]
 default = ["std"]
--- a/pallets/nonfungible/Cargo.toml
+++ b/pallets/nonfungible/Cargo.toml
@@ -26,7 +26,6 @@
 scale-info = { version = "2.0.1", default-features = false, features = [
     "derive",
 ] }
-frame-common = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "feature/300" }
 
 [features]
 default = ["std"]
--- a/pallets/refungible/Cargo.toml
+++ b/pallets/refungible/Cargo.toml
@@ -23,7 +23,6 @@
 scale-info = { version = "2.0.1", default-features = false, features = [
     "derive",
 ] }
-frame-common = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "feature/300" }
 
 [features]
 default = ["std"]
--- a/runtime/opal/src/lib.rs
+++ b/runtime/opal/src/lib.rs
@@ -307,11 +307,6 @@
 	type WeightInfo = pallet_evm_migration::weights::SubstrateWeight<Self>;
 }
 
-impl frame_common::account::Config for Runtime {
-	type EvmAddressMapping = pallet_evm::HashedAddressMapping<Self::Hashing>;
-	type EvmBackwardsAddressMapping = up_evm_mapping::MapBackwardsAddressTruncated;
-}
-
 pub struct EthereumFindAuthor<F>(core::marker::PhantomData<F>);
 impl<F: FindAuthor<u32>> FindAuthor<H160> for EthereumFindAuthor<F> {
 	fn find_author<'a, I>(digests: I) -> Option<H160>

-- 
gitstuff