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
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2554,7 +2554,7 @@
  "fc-db",
  "fc-rpc-core",
  "fp-consensus",
- "fp-evm",
+ "fp-evm 3.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
  "fp-rpc",
  "fp-storage",
  "futures 0.3.21",
@@ -2565,7 +2565,7 @@
  "log",
  "lru 0.6.6",
  "pallet-ethereum",
- "pallet-evm",
+ "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
  "parity-scale-codec",
  "parking_lot 0.11.2",
  "rand 0.7.3",
@@ -2766,7 +2766,7 @@
 dependencies = [
  "ethereum",
  "ethereum-types",
- "fp-evm",
+ "fp-evm 3.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
  "parity-scale-codec",
  "scale-info",
  "sp-api",
@@ -2862,6 +2862,21 @@
 ]
 
 [[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"
@@ -5845,7 +5860,7 @@
 dependencies = [
  "frame-support",
  "frame-system",
- "pallet-evm",
+ "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
  "parity-scale-codec",
  "scale-info",
  "serde",
@@ -5997,7 +6012,7 @@
  "fp-evm-mapping",
  "frame-support",
  "frame-system",
- "pallet-evm",
+ "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
  "pallet-evm-coder-substrate",
  "parity-scale-codec",
  "scale-info",
@@ -6083,7 +6098,7 @@
  "frame-system",
  "log",
  "pallet-balances",
- "pallet-evm",
+ "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
  "pallet-timestamp",
  "parity-scale-codec",
  "rlp",
@@ -6136,7 +6151,7 @@
  "frame-support",
  "frame-system",
  "pallet-ethereum",
- "pallet-evm",
+ "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
  "parity-scale-codec",
  "scale-info",
  "sp-core",
@@ -6152,7 +6167,7 @@
  "frame-support",
  "frame-system",
  "log",
- "pallet-evm",
+ "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
  "pallet-evm-coder-substrate",
  "parity-scale-codec",
  "scale-info",
@@ -6166,11 +6181,11 @@
 name = "pallet-evm-migration"
 version = "0.1.0"
 dependencies = [
- "fp-evm",
+ "fp-evm 3.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
  "frame-benchmarking",
  "frame-support",
  "frame-system",
- "pallet-evm",
+ "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
  "parity-scale-codec",
  "scale-info",
  "sp-core",
@@ -6188,7 +6203,7 @@
  "frame-support",
  "frame-system",
  "pallet-ethereum",
- "pallet-evm",
+ "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
  "parity-scale-codec",
  "scale-info",
  "sp-core",
@@ -6205,6 +6220,7 @@
  "ethereum",
  "evm-coder",
  "frame-benchmarking",
+ "frame-common",
  "frame-support",
  "frame-system",
  "pallet-common",
@@ -6432,6 +6448,7 @@
  "ethereum",
  "evm-coder",
  "frame-benchmarking",
+ "frame-common",
  "frame-support",
  "frame-system",
  "pallet-common",
@@ -6549,6 +6566,7 @@
 version = "0.1.0"
 dependencies = [
  "frame-benchmarking",
+ "frame-common",
  "frame-support",
  "frame-system",
  "pallet-common",
@@ -6813,13 +6831,14 @@
  "fp-evm",
  "fp-evm-mapping",
  "frame-benchmarking",
+ "frame-common",
  "frame-support",
  "frame-system",
  "hex-literal",
  "pallet-balances",
  "pallet-common",
  "pallet-ethereum",
- "pallet-evm",
+ "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
  "pallet-evm-coder-substrate",
  "pallet-fungible",
  "pallet-nonfungible",
@@ -12201,7 +12220,7 @@
  "chrono",
  "lazy_static",
  "matchers",
- "parking_lot 0.11.2",
+ "parking_lot 0.10.2",
  "regex",
  "serde",
  "serde_json",
@@ -12348,6 +12367,7 @@
 name = "uc-rpc"
 version = "0.1.0"
 dependencies = [
+ "frame-common",
  "jsonrpc-core",
  "jsonrpc-core-client",
  "jsonrpc-derive",
@@ -12566,6 +12586,7 @@
  "fp-rpc",
  "fp-self-contained",
  "frame-benchmarking",
+ "frame-common",
  "frame-executive",
  "frame-support",
  "frame-system",
@@ -12578,7 +12599,7 @@
  "pallet-base-fee",
  "pallet-common",
  "pallet-ethereum",
- "pallet-evm",
+ "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
  "pallet-evm-coder-substrate",
  "pallet-evm-contract-helpers",
  "pallet-evm-migration",
@@ -12706,6 +12727,7 @@
 name = "up-rpc"
 version = "0.1.0"
 dependencies = [
+ "frame-common",
  "pallet-common",
  "pallet-evm",
  "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
before · pallets/unique/src/mock.rs
1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617#![allow(clippy::from_over_into)]1819use crate as pallet_template;20use sp_core::{H160, H256};21use frame_support::{parameter_types, traits::Everything, weights::IdentityFee};22use sp_runtime::{23	traits::{BlakeTwo256, IdentityLookup},24	testing::Header,25};26use pallet_transaction_payment::{CurrencyAdapter};27use frame_system as system;28use pallet_evm::{AddressMapping, runner::stack::MaybeMirroredLog};29use fp_evm_mapping::EvmBackwardsAddressMapping;30use pallet_evm::account::CrossAccountId;31use codec::{Encode, Decode, MaxEncodedLen};32use scale_info::TypeInfo;33use up_data_structs::ConstU32;3435type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;36type Block = frame_system::mocking::MockBlock<Test>;3738// Configure a mock runtime to test the pallet.39frame_support::construct_runtime!(40	pub enum Test where41		Block = Block,42		NodeBlock = Block,43		UncheckedExtrinsic = UncheckedExtrinsic,44	{45		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},46		TemplateModule: pallet_template::{Pallet, Call, Storage},47		Balances: pallet_balances::{Pallet, Call, Storage},48		Common: pallet_common::{Pallet, Storage, Event<T>},49		Fungible: pallet_fungible::{Pallet, Storage},50		Refungible: pallet_refungible::{Pallet, Storage},51		Nonfungible: pallet_nonfungible::{Pallet, Storage},52	}53);5455parameter_types! {56	pub const BlockHashCount: u64 = 250;57	pub const SS58Prefix: u8 = 42;58}5960impl system::Config for Test {61	type BaseCallFilter = Everything;62	type BlockWeights = ();63	type BlockLength = ();64	type DbWeight = ();65	type Origin = Origin;66	type Call = Call;67	type Index = u64;68	type BlockNumber = u64;69	type Hash = H256;70	type Hashing = BlakeTwo256;71	type AccountId = u64;72	type Lookup = IdentityLookup<Self::AccountId>;73	type Header = Header;74	type Event = ();75	type BlockHashCount = BlockHashCount;76	type Version = ();77	type PalletInfo = PalletInfo;78	type AccountData = pallet_balances::AccountData<u64>;79	type OnNewAccount = ();80	type OnKilledAccount = ();81	type SystemWeightInfo = ();82	type SS58Prefix = SS58Prefix;83	type OnSetCode = ();84	type MaxConsumers = ConstU32<16>;85}8687parameter_types! {88	pub const ExistentialDeposit: u64 = 1;89	pub const MaxLocks: u32 = 50;90}91//frame_system::Module<Test>;92impl pallet_balances::Config for Test {93	type AccountStore = System;94	type Balance = u64;95	type DustRemoval = ();96	type Event = ();97	type ExistentialDeposit = ExistentialDeposit;98	type WeightInfo = ();99	type MaxLocks = MaxLocks;100	type MaxReserves = ();101	type ReserveIdentifier = [u8; 8];102}103104parameter_types! {105	pub const TransactionByteFee: u64 = 1;106	pub const OperationalFeeMultiplier: u8 = 5;107}108109impl pallet_transaction_payment::Config for Test {110	type OnChargeTransaction = CurrencyAdapter<pallet_balances::Pallet<Test>, ()>;111	type TransactionByteFee = TransactionByteFee;112	type WeightToFee = IdentityFee<u64>;113	type FeeMultiplierUpdate = ();114	type OperationalFeeMultiplier = OperationalFeeMultiplier;115}116117parameter_types! {118	pub const MinimumPeriod: u64 = 1;119}120impl pallet_timestamp::Config for Test {121	type Moment = u64;122	type OnTimestampSet = ();123	type MinimumPeriod = MinimumPeriod;124	type WeightInfo = ();125}126127parameter_types! {128	pub const CollectionCreationPrice: u32 = 100;129	pub TreasuryAccountId: u64 = 1234;130	pub EthereumChainId: u32 = 1111;131}132133pub struct TestEvmAddressMapping;134impl AddressMapping<u64> for TestEvmAddressMapping {135	fn into_account_id(_addr: sp_core::H160) -> u64 {136		unimplemented!()137	}138}139140pub struct TestEvmBackwardsAddressMapping;141impl EvmBackwardsAddressMapping<u64> for TestEvmBackwardsAddressMapping {142	fn from_account_id(_account_id: u64) -> sp_core::H160 {143		unimplemented!()144	}145}146147#[derive(Encode, Decode, Clone, PartialEq, Eq, PartialOrd, Ord, Debug, TypeInfo, MaxEncodedLen)]148pub struct TestCrossAccountId(u64, sp_core::H160);149impl CrossAccountId<u64> for TestCrossAccountId {150	fn as_sub(&self) -> &u64 {151		&self.0152	}153	fn as_eth(&self) -> &sp_core::H160 {154		&self.1155	}156	fn from_sub(sub: u64) -> Self {157		let mut eth = [0; 20];158		eth[12..20].copy_from_slice(&sub.to_be_bytes());159		Self(sub, sp_core::H160(eth))160	}161	fn from_eth(eth: sp_core::H160) -> Self {162		let mut sub_raw = [0; 8];163		sub_raw.copy_from_slice(&eth.0[0..8]);164		let sub = u64::from_be_bytes(sub_raw);165		Self(sub, eth)166	}167	fn conv_eq(&self, other: &Self) -> bool {168		self.as_sub() == other.as_sub()169	}170}171172impl Default for TestCrossAccountId {173	fn default() -> Self {174		Self::from_sub(0)175	}176}177178pub struct TestEtheremTransactionSender;179impl pallet_ethereum::EthereumTransactionSender for TestEtheremTransactionSender {180	fn submit_logs_transaction(181		_source: H160,182		_tx: pallet_ethereum::Transaction,183		_logs: Vec<MaybeMirroredLog>,184	) {185	}186}187188impl pallet_evm_coder_substrate::Config for Test {189	type EthereumTransactionSender = TestEtheremTransactionSender;190	type GasWeightMapping = ();191}192193impl pallet_common::Config for Test {194	type Event = ();195	type Currency = Balances;196	type CollectionCreationPrice = CollectionCreationPrice;197	type TreasuryAccountId = TreasuryAccountId;198}199200impl pallet_evm::account::Config for Test {201	type CrossAccountId = TestCrossAccountId;202	type EvmAddressMapping = TestEvmAddressMapping;203	type EvmBackwardsAddressMapping = TestEvmBackwardsAddressMapping;204}205206impl pallet_fungible::Config for Test {207	type WeightInfo = ();208}209impl pallet_refungible::Config for Test {210	type WeightInfo = ();211}212impl pallet_nonfungible::Config for Test {213	type WeightInfo = ();214}215216impl pallet_template::Config for Test {217	type Event = ();218	type WeightInfo = ();219}220221// Build genesis storage according to the mock runtime.222pub fn new_test_ext() -> sp_io::TestExternalities {223	system::GenesisConfig::default()224		.build_storage::<Test>()225		.unwrap()226		.into()227}
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>