--- 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", @@ -2757,7 +2757,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", @@ -2853,21 +2853,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" @@ -5850,7 +5835,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", @@ -5999,10 +5984,9 @@ version = "0.1.0" dependencies = [ "evm-coder", - "frame-common", "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", @@ -6080,7 +6064,7 @@ "ethereum-types", "evm", "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-self-contained", "fp-storage", @@ -6088,7 +6072,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", @@ -6109,7 +6093,7 @@ "evm", "evm-gasometer", "evm-runtime", - "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", @@ -6140,7 +6124,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", @@ -6155,7 +6139,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", @@ -6170,11 +6154,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", @@ -6187,11 +6171,11 @@ name = "pallet-evm-transaction-payment" 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-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", @@ -6209,10 +6193,10 @@ "ethereum", "evm-coder", "frame-benchmarking", - "frame-common", "frame-support", "frame-system", "pallet-common", + "pallet-evm", "pallet-evm-coder-substrate", "parity-scale-codec", "scale-info", @@ -6436,10 +6420,10 @@ "ethereum", "evm-coder", "frame-benchmarking", - "frame-common", "frame-support", "frame-system", "pallet-common", + "pallet-evm", "pallet-evm-coder-substrate", "parity-scale-codec", "scale-info", @@ -6553,10 +6537,10 @@ version = "0.1.0" dependencies = [ "frame-benchmarking", - "frame-common", "frame-support", "frame-system", "pallet-common", + "pallet-evm", "parity-scale-codec", "scale-info", "sp-core", @@ -6814,16 +6798,15 @@ dependencies = [ "ethereum", "evm-coder", - "fp-evm 3.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)", + "fp-evm", "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", @@ -12353,11 +12336,11 @@ name = "uc-rpc" version = "0.1.0" dependencies = [ - "frame-common", "jsonrpc-core", "jsonrpc-core-client", "jsonrpc-derive", "pallet-common", + "pallet-evm", "parity-scale-codec", "sp-api", "sp-blockchain", @@ -12570,7 +12553,6 @@ "fp-rpc", "fp-self-contained", "frame-benchmarking", - "frame-common", "frame-executive", "frame-support", "frame-system", @@ -12583,7 +12565,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", @@ -12720,8 +12702,8 @@ name = "up-rpc" version = "0.1.0" dependencies = [ - "frame-common", "pallet-common", + "pallet-evm", "parity-scale-codec", "sp-api", "sp-core", --- a/client/rpc/Cargo.toml +++ b/client/rpc/Cargo.toml @@ -18,4 +18,5 @@ sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.18" } sp-rpc = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.18" } sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.18" } +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" } --- a/client/rpc/src/lib.rs +++ b/client/rpc/src/lib.rs @@ -201,7 +201,7 @@ AccountId: Decode, C: 'static + ProvideRuntimeApi + HeaderBackend, C::Api: UniqueRuntimeApi, - CrossAccountId: frame_common::account::CrossAccountId, + CrossAccountId: pallet_evm::account::CrossAccountId, { pass_method!(account_tokens(collection: CollectionId, account: CrossAccountId) -> Vec); pass_method!(token_exists(collection: CollectionId, token: TokenId) -> bool); --- a/pallets/common/src/lib.rs +++ b/pallets/common/src/lib.rs @@ -19,7 +19,7 @@ use core::ops::{Deref, DerefMut}; use pallet_evm_coder_substrate::{SubstrateRecorder, WithRecorder}; use sp_std::vec::Vec; -use frame_common::account::CrossAccountId; +use pallet_evm::account::CrossAccountId; use frame_support::{ dispatch::{DispatchErrorWithPostInfo, DispatchResultWithPostInfo}, ensure, fail, @@ -162,19 +162,14 @@ pub mod pallet { use super::*; use frame_support::{Blake2_128Concat, pallet_prelude::*, storage::Key}; - use frame_common::account::CrossAccountId; + use pallet_evm::account; use frame_support::traits::Currency; use up_data_structs::TokenId; use scale_info::TypeInfo; #[pallet::config] - pub trait Config: frame_system::Config + pallet_evm_coder_substrate::Config + TypeInfo { + pub trait Config: frame_system::Config + pallet_evm_coder_substrate::Config + TypeInfo + account::Config { type Event: IsType<::Event> + From>; - - type CrossAccountId: CrossAccountId; - - type EvmAddressMapping: pallet_evm::AddressMapping; - type EvmBackwardsAddressMapping: up_evm_mapping::EvmBackwardsAddressMapping; type Currency: Currency; --- a/pallets/evm-transaction-payment/src/lib.rs +++ b/pallets/evm-transaction-payment/src/lib.rs @@ -20,7 +20,7 @@ use fp_evm::WithdrawReason; use frame_support::traits::{Currency, IsSubType}; pub use pallet::*; -use pallet_evm::{EVMCurrencyAdapter, EnsureAddressOrigin}; +use pallet_evm::{EVMCurrencyAdapter, EnsureAddressOrigin, account::CrossAccountId}; use sp_core::{H160, U256}; use sp_runtime::TransactionOutcome; use up_sponsorship::SponsorshipHandler; @@ -35,11 +35,9 @@ use sp_std::vec::Vec; #[pallet::config] - pub trait Config: frame_system::Config { + pub trait Config: frame_system::Config + pallet_evm::account::Config { type EvmSponsorshipHandler: SponsorshipHandler)>; type Currency: Currency; - type EvmBackwardsAddressMapping: EvmBackwardsAddressMapping; - type EvmAddressMapping: AddressMapping; } #[pallet::pallet] @@ -86,14 +84,16 @@ type LiquidityInfo = Option>; fn withdraw_fee( - who: &T::AccountId, + who: &T::CrossAccountId, reason: WithdrawReason, fee: U256, ) -> core::result::Result> { - let mut who_pays_fee = who.clone(); + let who_pays_fee; if let WithdrawReason::Call { target, input } = &reason { - who_pays_fee = T::EvmSponsorshipHandler::get_sponsor(who, &(*target, input.clone())) - .unwrap_or(who_pays_fee); + who_pays_fee = ::CrossAccountId::from_sub(T::EvmSponsorshipHandler::get_sponsor(&who.as_sub(), &(*target, input.clone())) + .unwrap_or(who.as_sub().clone())); + } else { + who_pays_fee = who.clone(); } let negative_imbalance = EVMCurrencyAdapter::<::Currency, ()>::withdraw_fee( @@ -102,20 +102,19 @@ fee, )?; - let who_pays_fee_eth = T::EvmBackwardsAddressMapping::from_account_id(who_pays_fee); Ok(negative_imbalance.map(|i| ChargeEvmLiquidityInfo { - who: who_pays_fee_eth, + who: who_pays_fee.as_eth().clone(), negative_imbalance: i, })) } fn correct_and_deposit_fee( - who: &T::AccountId, + who: &T::CrossAccountId, corrected_fee: U256, already_withdrawn: Self::LiquidityInfo, ) { ::Currency, ()> as pallet_evm::OnChargeEVMTransaction>::correct_and_deposit_fee( - &already_withdrawn.as_ref().map(|e| T::EvmAddressMapping::into_account_id(e.who)).unwrap_or(who.clone()), + &already_withdrawn.as_ref().map(|e| T::CrossAccountId::from_eth(e.who)).unwrap_or(who.clone()), corrected_fee, already_withdrawn.map(|e| e.negative_imbalance), ) --- a/pallets/fungible/Cargo.toml +++ b/pallets/fungible/Cargo.toml @@ -22,10 +22,10 @@ pallet-evm-coder-substrate = { default-features = false, path = '../evm-coder-substrate' } ethereum = { version = "0.12.0", default-features = false } frame-benchmarking = { default-features = false, optional = true, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' } +pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18" } 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"] @@ -40,5 +40,6 @@ "ethereum/std", "pallet-evm-coder-substrate/std", 'frame-benchmarking/std', + "pallet-evm/std" ] runtime-benchmarks = ['frame-benchmarking', 'pallet-common/runtime-benchmarks'] --- a/pallets/fungible/src/erc.rs +++ b/pallets/fungible/src/erc.rs @@ -21,7 +21,7 @@ use pallet_common::erc::{CommonEvmHandler, PrecompileResult}; use sp_core::{H160, U256}; use sp_std::vec::Vec; -use frame_common::account::CrossAccountId; +use pallet_evm::account::CrossAccountId; use pallet_evm_coder_substrate::{call, dispatch_to_evm}; use crate::{ --- a/pallets/fungible/src/lib.rs +++ b/pallets/fungible/src/lib.rs @@ -22,7 +22,7 @@ use pallet_common::{ Error as CommonError, Event as CommonEvent, Pallet as PalletCommon, }; -use frame_common::account::CrossAccountId; +use pallet_evm::account::CrossAccountId; use pallet_evm_coder_substrate::WithRecorder; use sp_core::H160; use sp_runtime::{ArithmeticError, DispatchError, DispatchResult}; @@ -37,7 +37,7 @@ pub mod erc; pub mod weights; -pub type CreateItemData = (::CrossAccountId, u128); +pub type CreateItemData = (::CrossAccountId, u128); pub(crate) type SelfWeightOf = ::WeightInfo; #[frame_support::pallet] --- a/pallets/nonfungible/Cargo.toml +++ b/pallets/nonfungible/Cargo.toml @@ -16,6 +16,7 @@ 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' } +pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18" } pallet-common = { default-features = false, path = '../common' } up-data-structs = { default-features = false, path = '../../primitives/data-structs' } evm-coder = { default-features = false, path = '../../crates/evm-coder' } @@ -25,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"] @@ -40,6 +40,7 @@ "ethereum/std", "pallet-evm-coder-substrate/std", 'frame-benchmarking/std', + "pallet-evm/std" ] runtime-benchmarks = [ 'frame-benchmarking', --- a/pallets/nonfungible/src/erc.rs +++ b/pallets/nonfungible/src/erc.rs @@ -27,7 +27,7 @@ use pallet_common::{ erc::{CommonEvmHandler, PrecompileResult}, }; -use frame_common::account::CrossAccountId; +use pallet_evm::account::CrossAccountId; use pallet_evm_coder_substrate::call; use crate::{ --- a/pallets/nonfungible/src/lib.rs +++ b/pallets/nonfungible/src/lib.rs @@ -24,7 +24,7 @@ use pallet_common::{ Error as CommonError, Pallet as PalletCommon, Event as CommonEvent, }; -use frame_common::account::CrossAccountId; +use pallet_evm::account::CrossAccountId; use pallet_evm_coder_substrate::{SubstrateRecorder, WithRecorder}; use sp_core::H160; use sp_runtime::{ArithmeticError, DispatchError, DispatchResult}; @@ -41,7 +41,7 @@ pub mod erc; pub mod weights; -pub type CreateItemData = CreateNftExData<::CrossAccountId>; +pub type CreateItemData = CreateNftExData<::CrossAccountId>; pub(crate) type SelfWeightOf = ::WeightInfo; #[derive(Encode, Decode, TypeInfo, MaxEncodedLen)] --- a/pallets/refungible/Cargo.toml +++ b/pallets/refungible/Cargo.toml @@ -16,13 +16,13 @@ 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' } +pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18" } pallet-common = { default-features = false, path = '../common' } up-data-structs = { default-features = false, path = '../../primitives/data-structs' } frame-benchmarking = { default-features = false, optional = true, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' } 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"] @@ -34,6 +34,7 @@ "up-data-structs/std", "pallet-common/std", 'frame-benchmarking/std', + "pallet-evm/std", ] runtime-benchmarks = [ 'frame-benchmarking', --- a/pallets/refungible/src/lib.rs +++ b/pallets/refungible/src/lib.rs @@ -24,7 +24,7 @@ use pallet_common::{ Error as CommonError, Event as CommonEvent, Pallet as PalletCommon, }; -use frame_common::account::CrossAccountId; +use pallet_evm::account::CrossAccountId; use sp_runtime::{ArithmeticError, DispatchError, DispatchResult}; use sp_std::{vec::Vec, vec, collections::btree_map::BTreeMap}; use core::ops::Deref; --- a/pallets/unique/Cargo.toml +++ b/pallets/unique/Cargo.toml @@ -133,7 +133,6 @@ 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" } -frame-common = { 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/eth/sponsoring.rs +++ b/pallets/unique/src/eth/sponsoring.rs @@ -25,7 +25,7 @@ use core::marker::PhantomData; use core::convert::TryInto; use up_data_structs::TokenId; -use frame_common::account::CrossAccountId; +use pallet_evm::account::CrossAccountId; use pallet_nonfungible::erc::{UniqueNFTCall, ERC721UniqueExtensionsCall, ERC721Call}; use pallet_fungible::erc::{UniqueFungibleCall, ERC20Call}; --- a/pallets/unique/src/lib.rs +++ b/pallets/unique/src/lib.rs @@ -57,7 +57,7 @@ CollectionHandle, Pallet as PalletCommon, Error as CommonError, CommonWeightInfo, }; -use frame_common::account::CrossAccountId; +use pallet_evm::account::CrossAccountId; use pallet_refungible::{Pallet as PalletRefungible, RefungibleHandle}; use pallet_fungible::{Pallet as PalletFungible, FungibleHandle}; use pallet_nonfungible::{Pallet as PalletNonfungible, NonfungibleHandle}; @@ -117,7 +117,7 @@ pub enum Event where ::AccountId, - ::CrossAccountId, + ::CrossAccountId, { /// Collection sponsor was removed /// --- a/pallets/unique/src/mock.rs +++ b/pallets/unique/src/mock.rs @@ -27,7 +27,7 @@ use frame_system as system; use pallet_evm::{AddressMapping, runner::stack::MaybeMirroredLog}; use up_evm_mapping::EvmBackwardsAddressMapping; -use frame_common::account::CrossAccountId; +use pallet_evm::account::CrossAccountId; use codec::{Encode, Decode, MaxEncodedLen}; use scale_info::TypeInfo; use up_data_structs::ConstU32; @@ -192,15 +192,17 @@ impl pallet_common::Config for Test { type Event = (); - type EvmBackwardsAddressMapping = TestEvmBackwardsAddressMapping; - type EvmAddressMapping = TestEvmAddressMapping; - type CrossAccountId = TestCrossAccountId; - type Currency = Balances; type CollectionCreationPrice = CollectionCreationPrice; type TreasuryAccountId = TreasuryAccountId; } +impl pallet_evm::account::Config for Test { + type CrossAccountId = TestCrossAccountId; + type EvmAddressMapping = TestEvmAddressMapping; + type EvmBackwardsAddressMapping = TestEvmBackwardsAddressMapping; +} + impl pallet_fungible::Config for Test { type WeightInfo = (); } --- a/pallets/unique/src/sponsorship.rs +++ b/pallets/unique/src/sponsorship.rs @@ -30,7 +30,7 @@ NFT_SPONSOR_TRANSFER_TIMEOUT, REFUNGIBLE_SPONSOR_TRANSFER_TIMEOUT, TokenId, }; use pallet_common::{CollectionHandle}; -use frame_common::account::CrossAccountId; +use pallet_evm::account::CrossAccountId; pub fn withdraw_transfer( collection: &CollectionHandle, --- a/primitives/rpc/src/lib.rs +++ b/primitives/rpc/src/lib.rs @@ -28,7 +28,7 @@ #[api_version(2)] pub trait UniqueApi where AccountId: Decode, - CrossAccountId: frame_common::account::CrossAccountId, + CrossAccountId: pallet_evm::account::CrossAccountId, { #[changed_in(2)] fn token_owner(collection: CollectionId, token: TokenId) -> Result; --- a/runtime/opal/src/lib.rs +++ b/runtime/opal/src/lib.rs @@ -127,6 +127,22 @@ } } +/// The type for looking up accounts. We don't expect more than 4 billion of them, but you +/// never know... +pub type AccountIndex = u32; + +/// Balance of an account. +pub type Balance = u128; + +/// Index of a transaction in the chain. +pub type Index = u32; + +/// A hash of some data used by the chain. +pub type Hash = sp_core::H256; + +/// Digest item type. +pub type DigestItem = generic::DigestItem; + /// Opaque types. These are used by the CLI to instantiate machinery that don't need to know /// the specifics of the runtime. They can then be made to be agnostic over specific formats /// of data like extrinsics, allowing for them to continue syncing the network through upgrades @@ -256,6 +272,12 @@ } } +impl pallet_evm::account::Config for Runtime { + type CrossAccountId = pallet_evm::account::BasicCrossAccountId; + type EvmAddressMapping = pallet_evm::HashedAddressMapping; + type EvmBackwardsAddressMapping = up_evm_mapping::MapBackwardsAddressTruncated; +} + impl pallet_evm::Config for Runtime { type BlockGasLimit = BlockGasLimit; type FeeCalculator = FixedFee; @@ -283,11 +305,6 @@ impl pallet_evm_migration::Config for Runtime { type WeightInfo = pallet_evm_migration::weights::SubstrateWeight; -} - -impl frame_common::account::Config for Runtime { - type EvmAddressMapping = pallet_evm::HashedAddressMapping; - type EvmBackwardsAddressMapping = up_evm_mapping::MapBackwardsAddressTruncated; } pub struct EthereumFindAuthor(core::marker::PhantomData); @@ -848,10 +865,6 @@ impl pallet_common::Config for Runtime { type Event = Event; - type EvmBackwardsAddressMapping = up_evm_mapping::MapBackwardsAddressTruncated; - type EvmAddressMapping = HashedAddressMapping; - type CrossAccountId = frame_common::account::BasicCrossAccountId; - type Currency = Balances; type CollectionCreationPrice = CollectionCreationPrice; type TreasuryAccountId = TreasuryAccountId; @@ -915,8 +928,6 @@ impl pallet_evm_transaction_payment::Config for Runtime { type EvmSponsorshipHandler = EvmSponsorshipHandler; type Currency = Balances; - type EvmAddressMapping = HashedAddressMapping; - type EvmBackwardsAddressMapping = up_evm_mapping::MapBackwardsAddressTruncated; } impl pallet_charge_transaction::Config for Runtime {