git.delta.rocks / unique-network / refs/commits / f61644c4c645

2750 "sp-std",2750 "sp-std",
2751]2751]
2752
2753[[package]]
2754name = "fp-evm-mapping"
2755version = "0.1.0"
2756source = "git+https://github.com/uniquenetwork/frontier.git?branch=feature/300#8718bfde84a370f5a6e7642b216dd913ca33db5c"
2757dependencies = [
2758 "frame-support",
2759 "sp-core",
2760]
27522761
2753[[package]]2762[[package]]
2754name = "fp-rpc"2763name = "fp-rpc"
5576 "cumulus-primitives-timestamp",5585 "cumulus-primitives-timestamp",
5577 "cumulus-primitives-utility",5586 "cumulus-primitives-utility",
5578 "derivative",5587 "derivative",
5588 "fp-evm-mapping",
5579 "fp-rpc",5589 "fp-rpc",
5580 "fp-self-contained",5590 "fp-self-contained",
5581 "frame-benchmarking",5591 "frame-benchmarking",
5632 "substrate-wasm-builder",5642 "substrate-wasm-builder",
5633 "unique-runtime-common",5643 "unique-runtime-common",
5634 "up-data-structs",5644 "up-data-structs",
5635 "up-evm-mapping",
5636 "up-rpc",5645 "up-rpc",
5637 "xcm",5646 "xcm",
5638 "xcm-builder",5647 "xcm-builder",
5984version = "0.1.0"5993version = "0.1.0"
5985dependencies = [5994dependencies = [
5986 "evm-coder",5995 "evm-coder",
5996 "fp-evm-mapping",
5987 "frame-support",5997 "frame-support",
5988 "frame-system",5998 "frame-system",
5989 "pallet-evm",5999 "pallet-evm",
5995 "sp-runtime",6005 "sp-runtime",
5996 "sp-std",6006 "sp-std",
5997 "up-data-structs",6007 "up-data-structs",
5998 "up-evm-mapping",
5999]6008]
60006009
6001[[package]]6010[[package]]
6136version = "0.1.0"6145version = "0.1.0"
6137dependencies = [6146dependencies = [
6138 "evm-coder",6147 "evm-coder",
6148 "fp-evm-mapping",
6139 "frame-support",6149 "frame-support",
6140 "frame-system",6150 "frame-system",
6141 "log",6151 "log",
6146 "sp-core",6156 "sp-core",
6147 "sp-runtime",6157 "sp-runtime",
6148 "sp-std",6158 "sp-std",
6149 "up-evm-mapping",
6150 "up-sponsorship",6159 "up-sponsorship",
6151]6160]
61526161
6182 "sp-io",6191 "sp-io",
6183 "sp-runtime",6192 "sp-runtime",
6184 "sp-std",6193 "sp-std",
6185 "up-evm-mapping",
6186 "up-sponsorship",6194 "up-sponsorship",
6187]6195]
61886196
6825 "sp-runtime",6833 "sp-runtime",
6826 "sp-std",6834 "sp-std",
6827 "up-data-structs",6835 "up-data-structs",
6828 "up-evm-mapping",
6829 "up-sponsorship",6836 "up-sponsorship",
6830]6837]
68316838
8708 "cumulus-primitives-timestamp",8715 "cumulus-primitives-timestamp",
8709 "cumulus-primitives-utility",8716 "cumulus-primitives-utility",
8710 "derivative",8717 "derivative",
8718 "fp-evm-mapping",
8711 "fp-rpc",8719 "fp-rpc",
8712 "fp-self-contained",8720 "fp-self-contained",
8713 "frame-benchmarking",8721 "frame-benchmarking",
8764 "substrate-wasm-builder",8772 "substrate-wasm-builder",
8765 "unique-runtime-common",8773 "unique-runtime-common",
8766 "up-data-structs",8774 "up-data-structs",
8767 "up-evm-mapping",
8768 "up-rpc",8775 "up-rpc",
8769 "xcm",8776 "xcm",
8770 "xcm-builder",8777 "xcm-builder",
12550 "cumulus-primitives-timestamp",12557 "cumulus-primitives-timestamp",
12551 "cumulus-primitives-utility",12558 "cumulus-primitives-utility",
12552 "derivative",12559 "derivative",
12560 "fp-evm-mapping",
12553 "fp-rpc",12561 "fp-rpc",
12554 "fp-self-contained",12562 "fp-self-contained",
12555 "frame-benchmarking",12563 "frame-benchmarking",
12606 "substrate-wasm-builder",12614 "substrate-wasm-builder",
12607 "unique-runtime-common",12615 "unique-runtime-common",
12608 "up-data-structs",12616 "up-data-structs",
12609 "up-evm-mapping",
12610 "up-rpc",12617 "up-rpc",
12611 "xcm",12618 "xcm",
12612 "xcm-builder",12619 "xcm-builder",
12689 "sp-std",12696 "sp-std",
12690]12697]
12691
12692[[package]]
12693name = "up-evm-mapping"
12694version = "0.1.0"
12695source = "git+https://github.com/uniquenetwork/frontier.git?branch=feature/300#0a1dc4086cbe971ddf57edf82a61cfce52c8c20b"
12696dependencies = [
12697 "frame-support",
12698 "sp-core",
12699]
1270012698
12701[[package]]12699[[package]]
12702name = "up-rpc"12700name = "up-rpc"

--- 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<Self>;
 	type EvmAddressMapping = pallet_evm::HashedAddressMapping<Self::Hashing>;
-	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<Self>;
+	type EvmAddressMapping = HashedAddressMapping<Self::Hashing>;
+	type EvmBackwardsAddressMapping = fp_evm_mapping::MapBackwardsAddressTruncated;
+}
+
 impl pallet_fungible::Config for Runtime {
 	type WeightInfo = pallet_fungible::weights::SubstrateWeight<Self>;
 }

--- 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<Self>;
+	type EvmAddressMapping = HashedAddressMapping<Self::Hashing>;
+	type EvmBackwardsAddressMapping = fp_evm_mapping::MapBackwardsAddressTruncated;
+}
+
 impl pallet_fungible::Config for Runtime {
 	type WeightInfo = pallet_fungible::weights::SubstrateWeight<Self>;
 }