From f61644c4c645e0955f88751fcea9fcdd481643da Mon Sep 17 00:00:00 2001 From: Trubnikov Sergey Date: Thu, 24 Mar 2022 15:40:55 +0000 Subject: [PATCH] CORE-300 Fix PR --- --- 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]] --- 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", ] --- 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] --- 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", ] --- 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 = [ --- 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; --- 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" } --- 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; type EvmAddressMapping = pallet_evm::HashedAddressMapping; - type EvmBackwardsAddressMapping = up_evm_mapping::MapBackwardsAddressTruncated; + type EvmBackwardsAddressMapping = fp_evm_mapping::MapBackwardsAddressTruncated; } impl pallet_evm::Config for Runtime { --- 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" } --- 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; + type EvmAddressMapping = HashedAddressMapping; + type EvmBackwardsAddressMapping = fp_evm_mapping::MapBackwardsAddressTruncated; +} + impl pallet_fungible::Config for Runtime { type WeightInfo = pallet_fungible::weights::SubstrateWeight; } --- 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" } ################################################################################ --- 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; + type EvmAddressMapping = HashedAddressMapping; + type EvmBackwardsAddressMapping = fp_evm_mapping::MapBackwardsAddressTruncated; +} + impl pallet_fungible::Config for Runtime { type WeightInfo = pallet_fungible::weights::SubstrateWeight; } -- gitstuff