git.delta.rocks / unique-network / refs/commits / 20be67e26dbe

difftreelog

CORE-300 Move CrossAccountId to frontier

Trubnikov Sergey2022-03-14parent: #cb7dd0f.patch.diff
in: master

7 files changed

modifiedCargo.lockdiffbeforeafterboth
2554 "fc-db",2554 "fc-db",
2555 "fc-rpc-core",2555 "fc-rpc-core",
2556 "fp-consensus",2556 "fp-consensus",
2557 "fp-evm",2557 "fp-evm 3.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
2558 "fp-rpc",2558 "fp-rpc",
2559 "fp-storage",2559 "fp-storage",
2560 "futures 0.3.21",2560 "futures 0.3.21",
2565 "log",2565 "log",
2566 "lru 0.6.6",2566 "lru 0.6.6",
2567 "pallet-ethereum",2567 "pallet-ethereum",
2568 "pallet-evm",2568 "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
2569 "parity-scale-codec",2569 "parity-scale-codec",
2570 "parking_lot 0.11.2",2570 "parking_lot 0.11.2",
2571 "rand 0.7.3",2571 "rand 0.7.3",
2766dependencies = [2766dependencies = [
2767 "ethereum",2767 "ethereum",
2768 "ethereum-types",2768 "ethereum-types",
2769 "fp-evm",2769 "fp-evm 3.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
2770 "parity-scale-codec",2770 "parity-scale-codec",
2771 "scale-info",2771 "scale-info",
2772 "sp-api",2772 "sp-api",
2861 "sp-trie",2861 "sp-trie",
2862]2862]
2863
2864[[package]]
2865name = "frame-common"
2866version = "0.1.0"
2867source = "git+https://github.com/uniquenetwork/frontier.git?branch=feature/300#0a1dc4086cbe971ddf57edf82a61cfce52c8c20b"
2868dependencies = [
2869 "frame-system",
2870 "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=feature/300)",
2871 "parity-scale-codec",
2872 "scale-info",
2873 "serde",
2874 "sp-core",
2875 "sp-std",
2876 "up-evm-mapping",
2877]
28632878
2864[[package]]2879[[package]]
2865name = "frame-election-provider-support"2880name = "frame-election-provider-support"
5845dependencies = [5860dependencies = [
5846 "frame-support",5861 "frame-support",
5847 "frame-system",5862 "frame-system",
5848 "pallet-evm",5863 "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
5849 "parity-scale-codec",5864 "parity-scale-codec",
5850 "scale-info",5865 "scale-info",
5851 "serde",5866 "serde",
5997 "fp-evm-mapping",6012 "fp-evm-mapping",
5998 "frame-support",6013 "frame-support",
5999 "frame-system",6014 "frame-system",
6000 "pallet-evm",6015 "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
6001 "pallet-evm-coder-substrate",6016 "pallet-evm-coder-substrate",
6002 "parity-scale-codec",6017 "parity-scale-codec",
6003 "scale-info",6018 "scale-info",
6083 "frame-system",6098 "frame-system",
6084 "log",6099 "log",
6085 "pallet-balances",6100 "pallet-balances",
6086 "pallet-evm",6101 "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
6087 "pallet-timestamp",6102 "pallet-timestamp",
6088 "parity-scale-codec",6103 "parity-scale-codec",
6089 "rlp",6104 "rlp",
6136 "frame-support",6151 "frame-support",
6137 "frame-system",6152 "frame-system",
6138 "pallet-ethereum",6153 "pallet-ethereum",
6139 "pallet-evm",6154 "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
6140 "parity-scale-codec",6155 "parity-scale-codec",
6141 "scale-info",6156 "scale-info",
6142 "sp-core",6157 "sp-core",
6152 "frame-support",6167 "frame-support",
6153 "frame-system",6168 "frame-system",
6154 "log",6169 "log",
6155 "pallet-evm",6170 "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
6156 "pallet-evm-coder-substrate",6171 "pallet-evm-coder-substrate",
6157 "parity-scale-codec",6172 "parity-scale-codec",
6158 "scale-info",6173 "scale-info",
6166name = "pallet-evm-migration"6181name = "pallet-evm-migration"
6167version = "0.1.0"6182version = "0.1.0"
6168dependencies = [6183dependencies = [
6169 "fp-evm",6184 "fp-evm 3.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
6170 "frame-benchmarking",6185 "frame-benchmarking",
6171 "frame-support",6186 "frame-support",
6172 "frame-system",6187 "frame-system",
6173 "pallet-evm",6188 "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
6174 "parity-scale-codec",6189 "parity-scale-codec",
6175 "scale-info",6190 "scale-info",
6176 "sp-core",6191 "sp-core",
6188 "frame-support",6203 "frame-support",
6189 "frame-system",6204 "frame-system",
6190 "pallet-ethereum",6205 "pallet-ethereum",
6191 "pallet-evm",6206 "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
6192 "parity-scale-codec",6207 "parity-scale-codec",
6193 "scale-info",6208 "scale-info",
6194 "sp-core",6209 "sp-core",
6205 "ethereum",6220 "ethereum",
6206 "evm-coder",6221 "evm-coder",
6207 "frame-benchmarking",6222 "frame-benchmarking",
6223 "frame-common",
6208 "frame-support",6224 "frame-support",
6209 "frame-system",6225 "frame-system",
6210 "pallet-common",6226 "pallet-common",
6432 "ethereum",6448 "ethereum",
6433 "evm-coder",6449 "evm-coder",
6434 "frame-benchmarking",6450 "frame-benchmarking",
6451 "frame-common",
6435 "frame-support",6452 "frame-support",
6436 "frame-system",6453 "frame-system",
6437 "pallet-common",6454 "pallet-common",
6549version = "0.1.0"6566version = "0.1.0"
6550dependencies = [6567dependencies = [
6551 "frame-benchmarking",6568 "frame-benchmarking",
6569 "frame-common",
6552 "frame-support",6570 "frame-support",
6553 "frame-system",6571 "frame-system",
6554 "pallet-common",6572 "pallet-common",
6813 "fp-evm",6831 "fp-evm",
6814 "fp-evm-mapping",6832 "fp-evm-mapping",
6815 "frame-benchmarking",6833 "frame-benchmarking",
6834 "frame-common",
6816 "frame-support",6835 "frame-support",
6817 "frame-system",6836 "frame-system",
6818 "hex-literal",6837 "hex-literal",
6819 "pallet-balances",6838 "pallet-balances",
6820 "pallet-common",6839 "pallet-common",
6821 "pallet-ethereum",6840 "pallet-ethereum",
6822 "pallet-evm",6841 "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
6823 "pallet-evm-coder-substrate",6842 "pallet-evm-coder-substrate",
6824 "pallet-fungible",6843 "pallet-fungible",
6825 "pallet-nonfungible",6844 "pallet-nonfungible",
12201 "chrono",12220 "chrono",
12202 "lazy_static",12221 "lazy_static",
12203 "matchers",12222 "matchers",
12204 "parking_lot 0.11.2",12223 "parking_lot 0.10.2",
12205 "regex",12224 "regex",
12206 "serde",12225 "serde",
12207 "serde_json",12226 "serde_json",
12348name = "uc-rpc"12367name = "uc-rpc"
12349version = "0.1.0"12368version = "0.1.0"
12350dependencies = [12369dependencies = [
12370 "frame-common",
12351 "jsonrpc-core",12371 "jsonrpc-core",
12352 "jsonrpc-core-client",12372 "jsonrpc-core-client",
12353 "jsonrpc-derive",12373 "jsonrpc-derive",
12566 "fp-rpc",12586 "fp-rpc",
12567 "fp-self-contained",12587 "fp-self-contained",
12568 "frame-benchmarking",12588 "frame-benchmarking",
12589 "frame-common",
12569 "frame-executive",12590 "frame-executive",
12570 "frame-support",12591 "frame-support",
12571 "frame-system",12592 "frame-system",
12578 "pallet-base-fee",12599 "pallet-base-fee",
12579 "pallet-common",12600 "pallet-common",
12580 "pallet-ethereum",12601 "pallet-ethereum",
12581 "pallet-evm",12602 "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
12582 "pallet-evm-coder-substrate",12603 "pallet-evm-coder-substrate",
12583 "pallet-evm-contract-helpers",12604 "pallet-evm-contract-helpers",
12584 "pallet-evm-migration",12605 "pallet-evm-migration",
12706name = "up-rpc"12727name = "up-rpc"
12707version = "0.1.0"12728version = "0.1.0"
12708dependencies = [12729dependencies = [
12730 "frame-common",
12709 "pallet-common",12731 "pallet-common",
12710 "pallet-evm",12732 "pallet-evm",
12711 "parity-scale-codec",12733 "parity-scale-codec",
modifiedpallets/evm-contract-helpers/Cargo.tomldiffbeforeafterboth
--- a/pallets/evm-contract-helpers/Cargo.toml
+++ b/pallets/evm-contract-helpers/Cargo.toml
@@ -16,8 +16,8 @@
 evm-coder = { default-features = false, path = '../../crates/evm-coder' }
 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-2" }
+fp-evm-mapping = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18-2" }
 up-sponsorship = { version = "0.1.0", default-features = false, git = "https://github.com/UniqueNetwork/pallet-sponsoring", branch = 'polkadot-v0.9.18' }
-fp-evm-mapping = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18-2" }
 log = "0.4.14"
 
 [dependencies.codec]
modifiedpallets/fungible/Cargo.tomldiffbeforeafterboth
--- a/pallets/fungible/Cargo.toml
+++ b/pallets/fungible/Cargo.toml
@@ -26,6 +26,7 @@
 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"]
modifiedpallets/nonfungible/Cargo.tomldiffbeforeafterboth
--- a/pallets/nonfungible/Cargo.toml
+++ b/pallets/nonfungible/Cargo.toml
@@ -26,6 +26,7 @@
 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"]
modifiedpallets/refungible/Cargo.tomldiffbeforeafterboth
--- a/pallets/refungible/Cargo.toml
+++ b/pallets/refungible/Cargo.toml
@@ -23,6 +23,7 @@
 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"]
modifiedpallets/unique/src/mock.rsdiffbeforeafterboth
--- a/pallets/unique/src/mock.rs
+++ b/pallets/unique/src/mock.rs
@@ -25,9 +25,8 @@
 };
 use pallet_transaction_payment::{CurrencyAdapter};
 use frame_system as system;
-use pallet_evm::{AddressMapping, runner::stack::MaybeMirroredLog};
+use pallet_evm::{AddressMapping, runner::stack::MaybeMirroredLog, account::CrossAccountId};
 use fp_evm_mapping::EvmBackwardsAddressMapping;
-use pallet_evm::account::CrossAccountId;
 use codec::{Encode, Decode, MaxEncodedLen};
 use scale_info::TypeInfo;
 use up_data_structs::ConstU32;
modifiedruntime/opal/src/lib.rsdiffbeforeafterboth
--- a/runtime/opal/src/lib.rs
+++ b/runtime/opal/src/lib.rs
@@ -307,6 +307,11 @@
 	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>