git.delta.rocks / unique-network / refs/commits / 7192bb86e2c3

difftreelog

fix dependency versions after rebase

Yaroslav Bolyukin2022-04-07parent: #dee9f7d.patch.diff
in: master

12 files changed

modifiedCargo.lockdiffbeforeafterboth
2484[[package]]2484[[package]]
2485name = "fc-consensus"2485name = "fc-consensus"
2486version = "2.0.0-dev"2486version = "2.0.0-dev"
2487source = "git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.18#7c8ce8f83e0c8a5b57655622b721f8655b161903"2487source = "git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.18-2#82310d1dd3189f34bd901a9ac894ad33eca5cf89"
2488dependencies = [2488dependencies = [
2489 "async-trait",2489 "async-trait",
2490 "derive_more",2490 "derive_more",
2511[[package]]2511[[package]]
2512name = "fc-db"2512name = "fc-db"
2513version = "2.0.0-dev"2513version = "2.0.0-dev"
2514source = "git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.18#7c8ce8f83e0c8a5b57655622b721f8655b161903"2514source = "git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.18-2#82310d1dd3189f34bd901a9ac894ad33eca5cf89"
2515dependencies = [2515dependencies = [
2516 "fp-storage",2516 "fp-storage",
2517 "kvdb",2517 "kvdb",
2527[[package]]2527[[package]]
2528name = "fc-mapping-sync"2528name = "fc-mapping-sync"
2529version = "2.0.0-dev"2529version = "2.0.0-dev"
2530source = "git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.18#7c8ce8f83e0c8a5b57655622b721f8655b161903"2530source = "git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.18-2#82310d1dd3189f34bd901a9ac894ad33eca5cf89"
2531dependencies = [2531dependencies = [
2532 "fc-consensus",2532 "fc-consensus",
2533 "fc-db",2533 "fc-db",
2545[[package]]2545[[package]]
2546name = "fc-rpc"2546name = "fc-rpc"
2547version = "2.0.0-dev"2547version = "2.0.0-dev"
2548source = "git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.18#7c8ce8f83e0c8a5b57655622b721f8655b161903"2548source = "git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.18-2#82310d1dd3189f34bd901a9ac894ad33eca5cf89"
2549dependencies = [2549dependencies = [
2550 "ethereum",2550 "ethereum",
2551 "ethereum-types",2551 "ethereum-types",
2591[[package]]2591[[package]]
2592name = "fc-rpc-core"2592name = "fc-rpc-core"
2593version = "1.1.0-dev"2593version = "1.1.0-dev"
2594source = "git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.18#7c8ce8f83e0c8a5b57655622b721f8655b161903"2594source = "git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.18-2#82310d1dd3189f34bd901a9ac894ad33eca5cf89"
2595dependencies = [2595dependencies = [
2596 "ethereum",2596 "ethereum",
2597 "ethereum-types",2597 "ethereum-types",
2725[[package]]2725[[package]]
2726name = "fp-consensus"2726name = "fp-consensus"
2727version = "2.0.0-dev"2727version = "2.0.0-dev"
2728source = "git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.18#7c8ce8f83e0c8a5b57655622b721f8655b161903"2728source = "git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.18-2#82310d1dd3189f34bd901a9ac894ad33eca5cf89"
2729dependencies = [2729dependencies = [
2730 "ethereum",2730 "ethereum",
2731 "parity-scale-codec",2731 "parity-scale-codec",
2739[[package]]2739[[package]]
2740name = "fp-evm"2740name = "fp-evm"
2741version = "3.0.0-dev"2741version = "3.0.0-dev"
2742source = "git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.18#7c8ce8f83e0c8a5b57655622b721f8655b161903"2742source = "git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.18-2#82310d1dd3189f34bd901a9ac894ad33eca5cf89"
2743dependencies = [2743dependencies = [
2744 "evm",2744 "evm",
2745 "impl-trait-for-tuples",2745 "impl-trait-for-tuples",
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=unique-polkadot-v0.9.18-2#82310d1dd3189f34bd901a9ac894ad33eca5cf89"
2757dependencies = [
2758 "frame-support",
2759 "sp-core",
2760]
27522761
2753[[package]]2762[[package]]
2754name = "fp-rpc"2763name = "fp-rpc"
2755version = "3.0.0-dev"2764version = "3.0.0-dev"
2756source = "git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.18#7c8ce8f83e0c8a5b57655622b721f8655b161903"2765source = "git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.18-2#82310d1dd3189f34bd901a9ac894ad33eca5cf89"
2757dependencies = [2766dependencies = [
2758 "ethereum",2767 "ethereum",
2759 "ethereum-types",2768 "ethereum-types",
2770[[package]]2779[[package]]
2771name = "fp-self-contained"2780name = "fp-self-contained"
2772version = "1.0.0-dev"2781version = "1.0.0-dev"
2773source = "git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.18#7c8ce8f83e0c8a5b57655622b721f8655b161903"2782source = "git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.18-2#82310d1dd3189f34bd901a9ac894ad33eca5cf89"
2774dependencies = [2783dependencies = [
2775 "ethereum",2784 "ethereum",
2776 "frame-support",2785 "frame-support",
2787[[package]]2796[[package]]
2788name = "fp-storage"2797name = "fp-storage"
2789version = "2.0.0"2798version = "2.0.0"
2790source = "git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.18#7c8ce8f83e0c8a5b57655622b721f8655b161903"2799source = "git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.18-2#82310d1dd3189f34bd901a9ac894ad33eca5cf89"
27912800
2792[[package]]2801[[package]]
2793name = "frame-benchmarking"2802name = "frame-benchmarking"
5577 "cumulus-primitives-timestamp",5586 "cumulus-primitives-timestamp",
5578 "cumulus-primitives-utility",5587 "cumulus-primitives-utility",
5579 "derivative",5588 "derivative",
5589 "fp-evm-mapping",
5580 "fp-rpc",5590 "fp-rpc",
5581 "fp-self-contained",5591 "fp-self-contained",
5582 "frame-benchmarking",5592 "frame-benchmarking",
5636 "substrate-wasm-builder",5646 "substrate-wasm-builder",
5637 "unique-runtime-common",5647 "unique-runtime-common",
5638 "up-data-structs",5648 "up-data-structs",
5639 "up-evm-mapping",
5640 "up-rpc",5649 "up-rpc",
5641 "xcm",5650 "xcm",
5642 "xcm-builder",5651 "xcm-builder",
5835[[package]]5844[[package]]
5836name = "pallet-base-fee"5845name = "pallet-base-fee"
5837version = "1.0.0"5846version = "1.0.0"
5838source = "git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.18#7c8ce8f83e0c8a5b57655622b721f8655b161903"5847source = "git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.18-2#82310d1dd3189f34bd901a9ac894ad33eca5cf89"
5839dependencies = [5848dependencies = [
5840 "frame-support",5849 "frame-support",
5841 "frame-system",5850 "frame-system",
5988version = "0.1.0"5997version = "0.1.0"
5989dependencies = [5998dependencies = [
5990 "evm-coder",5999 "evm-coder",
6000 "fp-evm-mapping",
5991 "frame-support",6001 "frame-support",
5992 "frame-system",6002 "frame-system",
5993 "pallet-evm",6003 "pallet-evm",
5999 "sp-runtime",6009 "sp-runtime",
6000 "sp-std",6010 "sp-std",
6001 "up-data-structs",6011 "up-data-structs",
6002 "up-evm-mapping",
6003]6012]
60046013
6005[[package]]6014[[package]]
6062[[package]]6071[[package]]
6063name = "pallet-ethereum"6072name = "pallet-ethereum"
6064version = "4.0.0-dev"6073version = "4.0.0-dev"
6065source = "git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.18#7c8ce8f83e0c8a5b57655622b721f8655b161903"6074source = "git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.18-2#82310d1dd3189f34bd901a9ac894ad33eca5cf89"
6066dependencies = [6075dependencies = [
6067 "ethereum",6076 "ethereum",
6068 "ethereum-types",6077 "ethereum-types",
6069 "evm",6078 "evm",
6070 "fp-consensus",6079 "fp-consensus",
6071 "fp-evm",6080 "fp-evm",
6081 "fp-evm-mapping",
6072 "fp-rpc",6082 "fp-rpc",
6073 "fp-self-contained",6083 "fp-self-contained",
6074 "fp-storage",6084 "fp-storage",
6092[[package]]6102[[package]]
6093name = "pallet-evm"6103name = "pallet-evm"
6094version = "6.0.0-dev"6104version = "6.0.0-dev"
6095source = "git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.18#7c8ce8f83e0c8a5b57655622b721f8655b161903"6105source = "git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.18-2#82310d1dd3189f34bd901a9ac894ad33eca5cf89"
6096dependencies = [6106dependencies = [
6097 "evm",6107 "evm",
6098 "evm-gasometer",6108 "evm-gasometer",
6099 "evm-runtime",6109 "evm-runtime",
6100 "fp-evm",6110 "fp-evm",
6111 "fp-evm-mapping",
6101 "frame-benchmarking",6112 "frame-benchmarking",
6102 "frame-support",6113 "frame-support",
6103 "frame-system",6114 "frame-system",
6141version = "0.1.0"6152version = "0.1.0"
6142dependencies = [6153dependencies = [
6143 "evm-coder",6154 "evm-coder",
6155 "fp-evm-mapping",
6144 "frame-support",6156 "frame-support",
6145 "frame-system",6157 "frame-system",
6146 "log",6158 "log",
6176version = "0.1.0"6188version = "0.1.0"
6177dependencies = [6189dependencies = [
6178 "fp-evm",6190 "fp-evm",
6191 "fp-evm-mapping",
6179 "frame-support",6192 "frame-support",
6180 "frame-system",6193 "frame-system",
6181 "pallet-ethereum",6194 "pallet-ethereum",
6186 "sp-io",6199 "sp-io",
6187 "sp-runtime",6200 "sp-runtime",
6188 "sp-std",6201 "sp-std",
6189 "up-evm-mapping",
6190 "up-sponsorship",6202 "up-sponsorship",
6191]6203]
61926204
6200 "frame-support",6212 "frame-support",
6201 "frame-system",6213 "frame-system",
6202 "pallet-common",6214 "pallet-common",
6215 "pallet-evm",
6203 "pallet-evm-coder-substrate",6216 "pallet-evm-coder-substrate",
6204 "pallet-structure",6217 "pallet-structure",
6205 "parity-scale-codec",6218 "parity-scale-codec",
6427 "frame-support",6440 "frame-support",
6428 "frame-system",6441 "frame-system",
6429 "pallet-common",6442 "pallet-common",
6443 "pallet-evm",
6430 "pallet-evm-coder-substrate",6444 "pallet-evm-coder-substrate",
6431 "pallet-structure",6445 "pallet-structure",
6432 "parity-scale-codec",6446 "parity-scale-codec",
6544 "frame-support",6558 "frame-support",
6545 "frame-system",6559 "frame-system",
6546 "pallet-common",6560 "pallet-common",
6561 "pallet-evm",
6547 "pallet-structure",6562 "pallet-structure",
6548 "parity-scale-codec",6563 "parity-scale-codec",
6549 "scale-info",6564 "scale-info",
6817 "ethereum",6832 "ethereum",
6818 "evm-coder",6833 "evm-coder",
6819 "fp-evm",6834 "fp-evm",
6835 "fp-evm-mapping",
6820 "frame-benchmarking",6836 "frame-benchmarking",
6821 "frame-support",6837 "frame-support",
6822 "frame-system",6838 "frame-system",
6843 "sp-runtime",6859 "sp-runtime",
6844 "sp-std",6860 "sp-std",
6845 "up-data-structs",6861 "up-data-structs",
6846 "up-evm-mapping",
6847 "up-sponsorship",6862 "up-sponsorship",
6848]6863]
68496864
8726 "cumulus-primitives-timestamp",8741 "cumulus-primitives-timestamp",
8727 "cumulus-primitives-utility",8742 "cumulus-primitives-utility",
8728 "derivative",8743 "derivative",
8744 "fp-evm-mapping",
8729 "fp-rpc",8745 "fp-rpc",
8730 "fp-self-contained",8746 "fp-self-contained",
8731 "frame-executive",8747 "frame-executive",
8782 "substrate-wasm-builder",8798 "substrate-wasm-builder",
8783 "unique-runtime-common",8799 "unique-runtime-common",
8784 "up-data-structs",8800 "up-data-structs",
8785 "up-evm-mapping",
8786 "up-rpc",8801 "up-rpc",
8787 "xcm",8802 "xcm",
8788 "xcm-builder",8803 "xcm-builder",
12380 "jsonrpc-core-client",12395 "jsonrpc-core-client",
12381 "jsonrpc-derive",12396 "jsonrpc-derive",
12382 "pallet-common",12397 "pallet-common",
12398 "pallet-evm",
12383 "parity-scale-codec",12399 "parity-scale-codec",
12384 "sp-api",12400 "sp-api",
12385 "sp-blockchain",12401 "sp-blockchain",
12591 "cumulus-primitives-timestamp",12607 "cumulus-primitives-timestamp",
12592 "cumulus-primitives-utility",12608 "cumulus-primitives-utility",
12593 "derivative",12609 "derivative",
12610 "fp-evm-mapping",
12594 "fp-rpc",12611 "fp-rpc",
12595 "fp-self-contained",12612 "fp-self-contained",
12596 "frame-benchmarking",12613 "frame-benchmarking",
12650 "substrate-wasm-builder",12667 "substrate-wasm-builder",
12651 "unique-runtime-common",12668 "unique-runtime-common",
12652 "up-data-structs",12669 "up-data-structs",
12653 "up-evm-mapping",
12654 "up-rpc",12670 "up-rpc",
12655 "xcm",12671 "xcm",
12656 "xcm-builder",12672 "xcm-builder",
12732 "derivative",12748 "derivative",
12733 "frame-support",12749 "frame-support",
12734 "frame-system",12750 "frame-system",
12751 "pallet-evm",
12735 "parity-scale-codec",12752 "parity-scale-codec",
12736 "scale-info",12753 "scale-info",
12737 "serde",12754 "serde",
12738 "sp-core",12755 "sp-core",
12739 "sp-runtime",12756 "sp-runtime",
12740 "sp-std",12757 "sp-std",
12741 "struct-versioning",12758 "struct-versioning",
12742 "up-evm-mapping",
12743]12759]
12744
12745[[package]]
12746name = "up-evm-mapping"
12747version = "0.1.0"
12748dependencies = [
12749 "frame-support",
12750 "parity-scale-codec",
12751 "scale-info",
12752 "sp-core",
12753]
1275412760
12755[[package]]12761[[package]]
12756name = "up-rpc"12762name = "up-rpc"
12757version = "0.1.0"12763version = "0.1.0"
12758dependencies = [12764dependencies = [
12759 "pallet-common",12765 "pallet-common",
12766 "pallet-evm",
12760 "parity-scale-codec",12767 "parity-scale-codec",
12761 "sp-api",12768 "sp-api",
12762 "sp-core",12769 "sp-core",
modifiedclient/rpc/src/lib.rsdiffbeforeafterboth
--- a/client/rpc/src/lib.rs
+++ b/client/rpc/src/lib.rs
@@ -19,7 +19,7 @@
 use codec::Decode;
 use jsonrpc_core::{Error as RpcError, ErrorCode, Result};
 use jsonrpc_derive::rpc;
-use up_data_structs::{RpcCollection, Collection, CollectionId, CollectionStats, CollectionLimits, TokenId};
+use up_data_structs::{RpcCollection, CollectionId, CollectionStats, CollectionLimits, TokenId};
 use sp_api::{BlockId, BlockT, ProvideRuntimeApi, ApiExt};
 use sp_blockchain::HeaderBackend;
 use up_rpc::UniqueApi as UniqueRuntimeApi;
modifiedpallets/common/src/lib.rsdiffbeforeafterboth
--- a/pallets/common/src/lib.rs
+++ b/pallets/common/src/lib.rs
@@ -29,11 +29,13 @@
 };
 use pallet_evm::GasWeightMapping;
 use up_data_structs::{
-	COLLECTION_NUMBER_LIMIT, Collection, RpcCollection, CollectionId, CreateItemData, MAX_TOKEN_PREFIX_LENGTH,
-	COLLECTION_ADMINS_LIMIT, MetaUpdatePermission, TokenId, CollectionStats, MAX_TOKEN_OWNERSHIP,
-	CollectionMode, NFT_SPONSOR_TRANSFER_TIMEOUT, FUNGIBLE_SPONSOR_TRANSFER_TIMEOUT,
-	REFUNGIBLE_SPONSOR_TRANSFER_TIMEOUT, MAX_SPONSOR_TIMEOUT, CUSTOM_DATA_LIMIT, CollectionLimits,
-	CustomDataLimit, CreateCollectionData, SponsorshipState, CreateItemExData, SponsoringRateLimit, budget::Budget, COLLECTION_FIELD_LIMIT, CollectionField, PhantomType,
+	COLLECTION_NUMBER_LIMIT, Collection, RpcCollection, CollectionId, CreateItemData,
+	MAX_TOKEN_PREFIX_LENGTH, COLLECTION_ADMINS_LIMIT, MetaUpdatePermission, TokenId,
+	CollectionStats, MAX_TOKEN_OWNERSHIP, CollectionMode, NFT_SPONSOR_TRANSFER_TIMEOUT,
+	FUNGIBLE_SPONSOR_TRANSFER_TIMEOUT, REFUNGIBLE_SPONSOR_TRANSFER_TIMEOUT, MAX_SPONSOR_TIMEOUT,
+	CUSTOM_DATA_LIMIT, CollectionLimits, CustomDataLimit, CreateCollectionData, SponsorshipState,
+	CreateItemExData, SponsoringRateLimit, budget::Budget, COLLECTION_FIELD_LIMIT, CollectionField,
+	PhantomType,
 };
 pub use pallet::*;
 use sp_core::H160;
@@ -162,7 +164,6 @@
 #[frame_support::pallet]
 pub mod pallet {
 	use super::*;
-	use frame_support::{Blake2_128Concat, pallet_prelude::*, storage::Key};
 	use pallet_evm::account;
 	use dispatch::CollectionDispatch;
 	use frame_support::{Blake2_128Concat, pallet_prelude::*, storage::Key, traits::StorageVersion};
@@ -170,7 +171,6 @@
 	use frame_support::traits::Currency;
 	use up_data_structs::{TokenId, mapping::TokenAddressMapping};
 	use scale_info::TypeInfo;
-	use up_evm_mapping::CrossAccountId;
 
 	#[pallet::config]
 	pub trait Config:
@@ -519,6 +519,7 @@
 			owner_can_transfer: Some(limits.owner_can_transfer()),
 			owner_can_destroy: Some(limits.owner_can_destroy()),
 			transfers_enabled: Some(limits.transfers_enabled()),
+			nesting_rule: Some(limits.nesting_rule().clone()),
 		};
 
 		Some(effective_limits)
modifiedpallets/fungible/src/lib.rsdiffbeforeafterboth
--- a/pallets/fungible/src/lib.rs
+++ b/pallets/fungible/src/lib.rs
@@ -24,8 +24,8 @@
 	budget::Budget,
 };
 use pallet_common::{
-	Error as CommonError, Event as CommonEvent, Pallet as PalletCommon,
-	CollectionHandle, dispatch::CollectionDispatch,
+	Error as CommonError, Event as CommonEvent, Pallet as PalletCommon, CollectionHandle,
+	dispatch::CollectionDispatch,
 };
 use pallet_structure::Pallet as PalletStructure;
 use pallet_evm_coder_substrate::WithRecorder;
modifiedpallets/nonfungible/src/lib.rsdiffbeforeafterboth
--- a/pallets/nonfungible/src/lib.rs
+++ b/pallets/nonfungible/src/lib.rs
@@ -24,8 +24,8 @@
 };
 use pallet_evm::account::CrossAccountId;
 use pallet_common::{
-	Error as CommonError, Pallet as PalletCommon, Event as CommonEvent,
-	CollectionHandle, dispatch::CollectionDispatch,
+	Error as CommonError, Pallet as PalletCommon, Event as CommonEvent, CollectionHandle,
+	dispatch::CollectionDispatch,
 };
 use pallet_structure::Pallet as PalletStructure;
 use pallet_evm_coder_substrate::{SubstrateRecorder, WithRecorder};
modifiedpallets/refungible/src/lib.rsdiffbeforeafterboth
--- a/pallets/refungible/src/lib.rs
+++ b/pallets/refungible/src/lib.rs
@@ -23,8 +23,8 @@
 };
 use pallet_evm::account::CrossAccountId;
 use pallet_common::{
-	Error as CommonError, Event as CommonEvent, Pallet as PalletCommon,
-	CollectionHandle, dispatch::CollectionDispatch,
+	Error as CommonError, Event as CommonEvent, Pallet as PalletCommon, CollectionHandle,
+	dispatch::CollectionDispatch,
 };
 use pallet_structure::Pallet as PalletStructure;
 use sp_runtime::{ArithmeticError, DispatchError, DispatchResult};
modifiedpallets/unique/src/eth/sponsoring.rsdiffbeforeafterboth
--- a/pallets/unique/src/eth/sponsoring.rs
+++ b/pallets/unique/src/eth/sponsoring.rs
@@ -31,7 +31,6 @@
 	UniqueNFTCall, ERC721UniqueExtensionsCall, ERC721MintableCall, ERC721Call,
 };
 use pallet_fungible::erc::{UniqueFungibleCall, ERC20Call};
-use up_data_structs::{TokenId, CreateItemData, CreateNftData};
 
 pub struct UniqueEthSponsorshipHandler<T: Config>(PhantomData<*const T>);
 impl<T: Config> SponsorshipHandler<T::CrossAccountId, (H160, Vec<u8>)>
modifiedprimitives/data-structs/Cargo.tomldiffbeforeafterboth
--- a/primitives/data-structs/Cargo.toml
+++ b/primitives/data-structs/Cargo.toml
@@ -25,6 +25,7 @@
 sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" }
 derivative = "2.2.0"
 struct-versioning = { path = "../../crates/struct-versioning" }
+pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18-2" }
 
 [features]
 default = ["std"]
@@ -37,6 +38,7 @@
   "sp-runtime/std",
   "sp-core/std",
   "sp-std/std",
+  "pallet-evm/std",
 ]
 serde1 = ["serde"]
 limit-testing = []
modifiedprimitives/data-structs/src/mapping.rsdiffbeforeafterboth
--- a/primitives/data-structs/src/mapping.rs
+++ b/primitives/data-structs/src/mapping.rs
@@ -3,7 +3,7 @@
 use sp_core::H160;
 
 use crate::{CollectionId, TokenId};
-use up_evm_mapping::CrossAccountId;
+use pallet_evm::account::CrossAccountId;
 
 pub trait TokenAddressMapping<Address> {
 	fn token_to_address(collection: CollectionId, token: TokenId) -> Address;
modifiedprimitives/rpc/src/lib.rsdiffbeforeafterboth
--- a/primitives/rpc/src/lib.rs
+++ b/primitives/rpc/src/lib.rs
@@ -16,7 +16,7 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
-use up_data_structs::{CollectionId, TokenId, RpcCollection, Collection, CollectionStats, CollectionLimits};
+use up_data_structs::{CollectionId, TokenId, RpcCollection, CollectionStats, CollectionLimits};
 use sp_std::vec::Vec;
 use codec::Decode;
 use sp_runtime::DispatchError;
modifiedruntime/common/Cargo.tomldiffbeforeafterboth
--- a/runtime/common/Cargo.toml
+++ b/runtime/common/Cargo.toml
@@ -93,11 +93,6 @@
 default-features = false
 path = "../../primitives/data-structs"
 
-[dependencies.pallet-evm]
-default-features = false
-git = "https://github.com/uniquenetwork/frontier.git"
-branch = "unique-polkadot-v0.9.18"
-
 [dependencies.sp-consensus-aura]
 default-features = false
 git = "https://github.com/paritytech/substrate"
modifiedruntime/opal/src/lib.rsdiffbeforeafterboth
--- a/runtime/opal/src/lib.rs
+++ b/runtime/opal/src/lib.rs
@@ -67,7 +67,7 @@
 	},
 };
 use up_data_structs::mapping::{EvmTokenAddressMapping, CrossTokenAddressMapping};
-use up_data_structs::{CollectionId, TokenId, CollectionStats, RpcCollection};
+use up_data_structs::{CollectionId, TokenId, CollectionStats, CollectionLimits, RpcCollection};
 // use pallet_contracts::weights::WeightInfo;
 // #[cfg(any(feature = "std", test))]
 use frame_system::{