git.delta.rocks / unique-network / refs/commits / 0193ff70af11

difftreelog

CORE-300 Fix PR

Trubnikov Sergey2022-03-30parent: #f61644c.patch.diff
in: master

12 files changed

modifiedCargo.lockdiffbeforeafterboth
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -68,7 +68,7 @@
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
 dependencies = [
- "getrandom 0.2.5",
+ "getrandom 0.2.6",
  "once_cell",
  "version_check",
 ]
@@ -306,9 +306,9 @@
 
 [[package]]
 name = "async-trait"
-version = "0.1.52"
+version = "0.1.53"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "061a7acccaa286c011ddc30970520b98fa40e00c9d644633fb26b5fc63a265e3"
+checksum = "ed6aa3524a2dfcf9fe180c51eae2b58738348d819517ceadf95789c51fff7600"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -392,7 +392,7 @@
 checksum = "b62ddb9cb1ec0a098ad4bbf9344d0713fa193ae1a80af55febcff2627b6a00c1"
 dependencies = [
  "futures-core",
- "getrandom 0.2.5",
+ "getrandom 0.2.6",
  "instant",
  "pin-project-lite 0.2.8",
  "rand 0.8.5",
@@ -440,9 +440,9 @@
 
 [[package]]
 name = "base64ct"
-version = "1.4.1"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71acf5509fc522cce1b100ac0121c635129bfd4d91cdf036bcc9b9935f97ccf5"
+checksum = "dea908e7347a8c64e378c17e30ef880ad73e3b4498346b055c2c00ea342f3179"
 
 [[package]]
 name = "beef"
@@ -990,7 +990,7 @@
 dependencies = [
  "camino",
  "cargo-platform",
- "semver 1.0.6",
+ "semver 1.0.7",
  "serde",
  "serde_json",
 ]
@@ -2753,7 +2753,7 @@
 [[package]]
 name = "fp-evm-mapping"
 version = "0.1.0"
-source = "git+https://github.com/uniquenetwork/frontier.git?branch=feature/300#8718bfde84a370f5a6e7642b216dd913ca33db5c"
+source = "git+https://github.com/uniquenetwork/frontier.git?branch=feature/300#28e11d419537bde416bc84b1604b4d0f3da879e0"
 dependencies = [
  "frame-support",
  "sp-core",
@@ -3243,9 +3243,9 @@
 
 [[package]]
 name = "getrandom"
-version = "0.2.5"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d39cd93900197114fa1fcb7ae84ca742095eed9442088988ae74fa744e930e77"
+checksum = "9be70c98951c83b8d2f8f60d7065fa6d5146873094452a1008da8c2f1e4205ad"
 dependencies = [
  "cfg-if 1.0.0",
  "libc",
@@ -3688,9 +3688,9 @@
 
 [[package]]
 name = "indexmap"
-version = "1.8.0"
+version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "282a6247722caba404c065016bbfa522806e51714c34f5dfc3e4a3a46fcb4223"
+checksum = "0f647032dfaa1f8b6dc29bd3edb7bbef4861b8b8007ebb118d6db284fd59f6ee"
 dependencies = [
  "autocfg",
  "hashbrown 0.11.2",
@@ -6181,6 +6181,7 @@
 version = "0.1.0"
 dependencies = [
  "fp-evm",
+ "fp-evm-mapping",
  "frame-support",
  "frame-system",
  "pallet-ethereum",
@@ -6807,6 +6808,7 @@
  "ethereum",
  "evm-coder",
  "fp-evm",
+ "fp-evm-mapping",
  "frame-benchmarking",
  "frame-support",
  "frame-system",
@@ -7117,9 +7119,9 @@
 
 [[package]]
 name = "paste"
-version = "1.0.6"
+version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0744126afe1a6dd7f394cb50a716dbe086cb06e255e53d8d0185d82828358fb5"
+checksum = "0c520e05135d6e763148b6426a837e239041653ba7becd2e538c076c738025fc"
 
 [[package]]
 name = "pbkdf2"
@@ -8803,9 +8805,9 @@
 
 [[package]]
 name = "quote"
-version = "1.0.16"
+version = "1.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4af2ec4714533fcdf07e886f17025ace8b997b9ce51204ee69b6da831c3da57"
+checksum = "632d02bff7f874a36f33ea8bb416cd484b90cc66c1194b1a1110d067a7013f58"
 dependencies = [
  "proc-macro2",
 ]
@@ -8876,7 +8878,7 @@
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7"
 dependencies = [
- "getrandom 0.2.5",
+ "getrandom 0.2.6",
 ]
 
 [[package]]
@@ -8940,9 +8942,9 @@
 
 [[package]]
 name = "redox_syscall"
-version = "0.2.11"
+version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8380fe0152551244f0747b1bf41737e0f8a74f97a14ccefd1148187271634f3c"
+checksum = "8ae183fc1b06c149f0c1793e1eb447c8b04bfe46d48e9e48bfb8d2d7ed64ecf0"
 dependencies = [
  "bitflags",
 ]
@@ -8953,7 +8955,7 @@
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7776223e2696f1aa4c6b0170e83212f47296a00424305117d013dfe86fb0fe55"
 dependencies = [
- "getrandom 0.2.5",
+ "getrandom 0.2.6",
  "redox_syscall",
  "thiserror",
 ]
@@ -9267,7 +9269,7 @@
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
 dependencies = [
- "semver 1.0.6",
+ "semver 1.0.7",
 ]
 
 [[package]]
@@ -10546,9 +10548,9 @@
 
 [[package]]
 name = "semver"
-version = "1.0.6"
+version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4a3381e03edd24287172047536f20cabde766e2cd3e65e6b00fb3af51c4f38d"
+checksum = "d65bd28f48be7196d222d95b9243287f48d27aca604e08497513019ff0502cc4"
 dependencies = [
  "serde",
 ]
@@ -11815,9 +11817,9 @@
 
 [[package]]
 name = "syn"
-version = "1.0.89"
+version = "1.0.90"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea297be220d52398dcc07ce15a209fce436d361735ac1db700cab3b6cdfb9f54"
+checksum = "704df27628939572cd88d33f171cd6f896f4eaca85252c6e0a72d8d8287ee86f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -12196,7 +12198,7 @@
  "chrono",
  "lazy_static",
  "matchers",
- "parking_lot 0.10.2",
+ "parking_lot 0.11.2",
  "regex",
  "serde",
  "serde_json",
@@ -12414,7 +12416,7 @@
 
 [[package]]
 name = "unique-node"
-version = "0.9.17"
+version = "0.9.18"
 dependencies = [
  "clap",
  "cumulus-client-cli",
@@ -12628,6 +12630,7 @@
  "frame-support",
  "frame-system",
  "pallet-common",
+ "pallet-evm",
  "parity-scale-codec",
  "scale-info",
  "sp-consensus-aura",
modifiedclient/rpc/Cargo.tomldiffbeforeafterboth
--- a/client/rpc/Cargo.toml
+++ b/client/rpc/Cargo.toml
@@ -19,4 +19,3 @@
 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" }
modifiednode/cli/Cargo.tomldiffbeforeafterboth
--- a/node/cli/Cargo.toml
+++ b/node/cli/Cargo.toml
@@ -283,7 +283,7 @@
 license = 'GPLv3'
 name = 'unique-node'
 repository = 'https://github.com/UniqueNetwork/unique-chain'
-version = '0.9.17'
+version = '0.9.18'
 
 [[bin]]
 name = 'unique-collator'
modifiedpallets/common/Cargo.tomldiffbeforeafterboth
--- a/pallets/common/Cargo.toml
+++ b/pallets/common/Cargo.toml
@@ -21,7 +21,6 @@
 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" }
 serde = { version = "1.0.130", default-features = false }
 scale-info = { version = "2.0.1", default-features = false, features = [
     "derive",
modifiedprimitives/rpc/Cargo.tomldiffbeforeafterboth
--- a/primitives/rpc/Cargo.toml
+++ b/primitives/rpc/Cargo.toml
@@ -14,7 +14,7 @@
 sp-std = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
 sp-api = { 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' }
-frame-common = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "feature/300" }
+pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18" }
 
 [features]
 default = ["std"]
modifiedruntime/common/Cargo.tomldiffbeforeafterboth
--- a/runtime/common/Cargo.toml
+++ b/runtime/common/Cargo.toml
@@ -70,3 +70,6 @@
 default-features = false
 git = "https://github.com/uniquenetwork/frontier.git"
 branch = "unique-polkadot-v0.9.18"
+
+[dependencies]
+pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18" }
\ No newline at end of file
modifiedruntime/common/src/types.rsdiffbeforeafterboth
--- a/runtime/common/src/types.rs
+++ b/runtime/common/src/types.rs
@@ -42,7 +42,7 @@
 pub use sp_consensus_aura::sr25519::AuthorityId as AuraId;
 
 pub trait RuntimeInstance {
-	type CrossAccountId: pallet_common::account::CrossAccountId<sp_runtime::AccountId32>
+	type CrossAccountId: pallet_evm::account::CrossAccountId<sp_runtime::AccountId32>
 		+ Send
 		+ Sync
 		+ 'static;
modifiedruntime/opal/src/lib.rsdiffbeforeafterboth
--- a/runtime/opal/src/lib.rs
+++ b/runtime/opal/src/lib.rs
@@ -116,7 +116,7 @@
 
 pub const RUNTIME_NAME: &str = "Opal";
 
-type CrossAccountId = frame_common::account::BasicCrossAccountId<Runtime>;
+type CrossAccountId = pallet_evm::account::BasicCrossAccountId<Runtime>;
 
 impl RuntimeInstance for Runtime {
 	type CrossAccountId = self::CrossAccountId;
modifiedruntime/quartz/src/lib.rsdiffbeforeafterboth
--- a/runtime/quartz/src/lib.rs
+++ b/runtime/quartz/src/lib.rs
@@ -116,7 +116,7 @@
 
 pub const RUNTIME_NAME: &str = "Quartz";
 
-type CrossAccountId = pallet_common::account::BasicCrossAccountId<Runtime>;
+type CrossAccountId = pallet_evm::account::BasicCrossAccountId<Runtime>;
 
 impl RuntimeInstance for Runtime {
 	type CrossAccountId = self::CrossAccountId;
@@ -844,9 +844,6 @@
 
 impl pallet_common::Config for Runtime {
 	type Event = Event;
-	type EvmBackwardsAddressMapping = up_evm_mapping::MapBackwardsAddressTruncated;
-	type EvmAddressMapping = HashedAddressMapping<Self::Hashing>;
-	type CrossAccountId = pallet_common::account::BasicCrossAccountId<Self>;
 
 	type Currency = Balances;
 	type CollectionCreationPrice = CollectionCreationPrice;
@@ -917,8 +914,6 @@
 impl pallet_evm_transaction_payment::Config for Runtime {
 	type EvmSponsorshipHandler = EvmSponsorshipHandler;
 	type Currency = Balances;
-	type EvmAddressMapping = HashedAddressMapping<Self::Hashing>;
-	type EvmBackwardsAddressMapping = up_evm_mapping::MapBackwardsAddressTruncated;
 }
 
 impl pallet_charge_transaction::Config for Runtime {
modifiedruntime/unique/Cargo.tomldiffbeforeafterboth
before · runtime/unique/Cargo.toml
1################################################################################2# Package34[package]5authors = ['Unique Network <support@uniquenetwork.io>']6build = 'build.rs'7description = 'Unique Runtime'8edition = '2021'9homepage = 'https://unique.network'10license = 'GPLv3'11name = 'unique-runtime'12repository = 'https://github.com/UniqueNetwork/unique-chain'13version = '0.9.17'1415[package.metadata.docs.rs]16targets = ['x86_64-unknown-linux-gnu']1718[features]19default = ['std']20runtime-benchmarks = [21    'hex-literal',22    'frame-benchmarking',23    'frame-support/runtime-benchmarks',24    'frame-system-benchmarking',25    'frame-system/runtime-benchmarks',26    'pallet-ethereum/runtime-benchmarks',27    'pallet-evm-migration/runtime-benchmarks',28    'pallet-evm-coder-substrate/runtime-benchmarks',29    'pallet-balances/runtime-benchmarks',30    'pallet-timestamp/runtime-benchmarks',31    'pallet-common/runtime-benchmarks',32    'pallet-fungible/runtime-benchmarks',33    'pallet-refungible/runtime-benchmarks',34    'pallet-nonfungible/runtime-benchmarks',35    'pallet-unique/runtime-benchmarks',36    'pallet-inflation/runtime-benchmarks',37    'pallet-xcm/runtime-benchmarks',38    'sp-runtime/runtime-benchmarks',39    'xcm-builder/runtime-benchmarks',40]41std = [42    'codec/std',43    'cumulus-pallet-aura-ext/std',44    'cumulus-pallet-parachain-system/std',45    'cumulus-pallet-xcm/std',46    'cumulus-pallet-xcmp-queue/std',47    'cumulus-primitives-core/std',48    'cumulus-primitives-utility/std',49    'frame-executive/std',50    'frame-support/std',51    'frame-system/std',52    'frame-system-rpc-runtime-api/std',53    'pallet-aura/std',54    'pallet-balances/std',55    # 'pallet-contracts/std',56    # 'pallet-contracts-primitives/std',57    # 'pallet-contracts-rpc-runtime-api/std',58    # 'pallet-contract-helpers/std',59    'pallet-randomness-collective-flip/std',60    'pallet-sudo/std',61    'pallet-timestamp/std',62    'pallet-transaction-payment/std',63    'pallet-transaction-payment-rpc-runtime-api/std',64    'pallet-treasury/std',65    # 'pallet-vesting/std',66    'pallet-evm/std',67    'pallet-evm-migration/std',68    'pallet-evm-contract-helpers/std',69    'pallet-evm-transaction-payment/std',70    'pallet-evm-coder-substrate/std',71    'pallet-ethereum/std',72    'pallet-base-fee/std',73    'fp-rpc/std',74    'up-rpc/std',75    'fp-evm-mapping/std',76    'fp-self-contained/std',77    'parachain-info/std',78    'serde',79    'pallet-inflation/std',80    'pallet-common/std',81    'pallet-fungible/std',82    'pallet-refungible/std',83    'pallet-nonfungible/std',84    'pallet-unique/std',85    'pallet-unq-scheduler/std',86    'pallet-charge-transaction/std',87    'up-data-structs/std',88    'sp-api/std',89    'sp-block-builder/std',90    "sp-consensus-aura/std",91    'sp-core/std',92    'sp-inherents/std',93    'sp-io/std',94    'sp-offchain/std',95    'sp-runtime/std',96    'sp-session/std',97    'sp-std/std',98    'sp-transaction-pool/std',99    'sp-version/std',100    'xcm/std',101    'xcm-builder/std',102    'xcm-executor/std',103    'unique-runtime-common/std',104105    "orml-vesting/std",106]107limit-testing = ['pallet-unique/limit-testing', 'up-data-structs/limit-testing']108109################################################################################110# Substrate Dependencies111112[dependencies.codec]113default-features = false114features = ['derive']115package = 'parity-scale-codec'116version = '3.1.2'117118[dependencies.frame-benchmarking]119default-features = false120git = 'https://github.com/paritytech/substrate.git'121optional = true122branch = 'polkadot-v0.9.18'123124[dependencies.frame-executive]125default-features = false126git = 'https://github.com/paritytech/substrate.git'127branch = 'polkadot-v0.9.18'128129[dependencies.frame-support]130default-features = false131git = 'https://github.com/paritytech/substrate.git'132branch = 'polkadot-v0.9.18'133134[dependencies.frame-system]135default-features = false136git = 'https://github.com/paritytech/substrate.git'137branch = 'polkadot-v0.9.18'138139[dependencies.frame-system-benchmarking]140default-features = false141git = 'https://github.com/paritytech/substrate.git'142optional = true143branch = 'polkadot-v0.9.18'144145[dependencies.frame-system-rpc-runtime-api]146default-features = false147git = 'https://github.com/paritytech/substrate.git'148branch = 'polkadot-v0.9.18'149150[dependencies.hex-literal]151optional = true152version = '0.3.3'153154[dependencies.serde]155default-features = false156features = ['derive']157optional = true158version = '1.0.130'159160[dependencies.pallet-aura]161default-features = false162git = 'https://github.com/paritytech/substrate.git'163branch = 'polkadot-v0.9.18'164165[dependencies.pallet-balances]166default-features = false167git = 'https://github.com/paritytech/substrate.git'168branch = 'polkadot-v0.9.18'169170# Contracts specific packages171# [dependencies.pallet-contracts]172# git = 'https://github.com/paritytech/substrate.git'173# default-features = false174# branch = 'polkadot-v0.9.18'175# version = '4.0.0-dev'176177# [dependencies.pallet-contracts-primitives]178# git = 'https://github.com/paritytech/substrate.git'179# default-features = false180# branch = 'polkadot-v0.9.18'181# version = '4.0.0-dev'182183# [dependencies.pallet-contracts-rpc-runtime-api]184# git = 'https://github.com/paritytech/substrate.git'185# default-features = false186# branch = 'polkadot-v0.9.18'187# version = '4.0.0-dev'188189[dependencies.pallet-randomness-collective-flip]190default-features = false191git = 'https://github.com/paritytech/substrate.git'192branch = 'polkadot-v0.9.18'193194[dependencies.pallet-sudo]195default-features = false196git = 'https://github.com/paritytech/substrate.git'197branch = 'polkadot-v0.9.18'198199[dependencies.pallet-timestamp]200default-features = false201git = 'https://github.com/paritytech/substrate.git'202branch = 'polkadot-v0.9.18'203204[dependencies.pallet-transaction-payment]205default-features = false206git = 'https://github.com/paritytech/substrate.git'207branch = 'polkadot-v0.9.18'208209[dependencies.pallet-transaction-payment-rpc-runtime-api]210default-features = false211git = 'https://github.com/paritytech/substrate.git'212branch = 'polkadot-v0.9.18'213214[dependencies.pallet-treasury]215default-features = false216git = 'https://github.com/paritytech/substrate.git'217branch = 'polkadot-v0.9.18'218219# [dependencies.pallet-vesting]220# default-features = false221# git = 'https://github.com/paritytech/substrate.git'222# branch = 'polkadot-v0.9.18'223224[dependencies.sp-arithmetic]225default-features = false226git = 'https://github.com/paritytech/substrate.git'227branch = 'polkadot-v0.9.18'228229[dependencies.sp-api]230default-features = false231git = 'https://github.com/paritytech/substrate.git'232branch = 'polkadot-v0.9.18'233234[dependencies.sp-block-builder]235default-features = false236git = 'https://github.com/paritytech/substrate.git'237branch = 'polkadot-v0.9.18'238239[dependencies.sp-core]240default-features = false241git = 'https://github.com/paritytech/substrate.git'242branch = 'polkadot-v0.9.18'243244[dependencies.sp-consensus-aura]245default-features = false246git = 'https://github.com/paritytech/substrate.git'247branch = 'polkadot-v0.9.18'248249[dependencies.sp-inherents]250default-features = false251git = 'https://github.com/paritytech/substrate.git'252branch = 'polkadot-v0.9.18'253254[dependencies.sp-io]255default-features = false256git = 'https://github.com/paritytech/substrate.git'257branch = 'polkadot-v0.9.18'258259[dependencies.sp-offchain]260default-features = false261git = 'https://github.com/paritytech/substrate.git'262branch = 'polkadot-v0.9.18'263264[dependencies.sp-runtime]265default-features = false266git = 'https://github.com/paritytech/substrate.git'267branch = 'polkadot-v0.9.18'268269[dependencies.sp-session]270default-features = false271git = 'https://github.com/paritytech/substrate.git'272branch = 'polkadot-v0.9.18'273274[dependencies.sp-std]275default-features = false276git = 'https://github.com/paritytech/substrate.git'277branch = 'polkadot-v0.9.18'278279[dependencies.sp-transaction-pool]280default-features = false281git = 'https://github.com/paritytech/substrate.git'282branch = 'polkadot-v0.9.18'283284[dependencies.sp-version]285default-features = false286git = 'https://github.com/paritytech/substrate.git'287branch = 'polkadot-v0.9.18'288289[dependencies.smallvec]290version = '1.6.1'291292################################################################################293# Cumulus dependencies294295[dependencies.parachain-info]296default-features = false297git = 'https://github.com/paritytech/cumulus.git'298branch = 'polkadot-v0.9.18'299300[dependencies.cumulus-pallet-aura-ext]301git = 'https://github.com/paritytech/cumulus.git'302branch = 'polkadot-v0.9.18'303default-features = false304305[dependencies.cumulus-pallet-parachain-system]306git = 'https://github.com/paritytech/cumulus.git'307branch = 'polkadot-v0.9.18'308default-features = false309310[dependencies.cumulus-primitives-core]311git = 'https://github.com/paritytech/cumulus.git'312branch = 'polkadot-v0.9.18'313default-features = false314315[dependencies.cumulus-pallet-xcm]316git = 'https://github.com/paritytech/cumulus.git'317branch = 'polkadot-v0.9.18'318default-features = false319320[dependencies.cumulus-pallet-dmp-queue]321git = 'https://github.com/paritytech/cumulus.git'322branch = 'polkadot-v0.9.18'323default-features = false324325[dependencies.cumulus-pallet-xcmp-queue]326git = 'https://github.com/paritytech/cumulus.git'327branch = 'polkadot-v0.9.18'328default-features = false329330[dependencies.cumulus-primitives-utility]331git = 'https://github.com/paritytech/cumulus.git'332branch = 'polkadot-v0.9.18'333default-features = false334335[dependencies.cumulus-primitives-timestamp]336git = 'https://github.com/paritytech/cumulus.git'337branch = 'polkadot-v0.9.18'338default-features = false339340################################################################################341# Polkadot dependencies342343[dependencies.polkadot-parachain]344git = 'https://github.com/paritytech/polkadot'345branch = 'release-v0.9.18'346default-features = false347348[dependencies.xcm]349git = 'https://github.com/paritytech/polkadot'350branch = 'release-v0.9.18'351default-features = false352353[dependencies.xcm-builder]354git = 'https://github.com/paritytech/polkadot'355branch = 'release-v0.9.18'356default-features = false357358[dependencies.xcm-executor]359git = 'https://github.com/paritytech/polkadot'360branch = 'release-v0.9.18'361default-features = false362363[dependencies.pallet-xcm]364git = 'https://github.com/paritytech/polkadot'365branch = 'release-v0.9.18'366default-features = false367368[dependencies.orml-vesting]369git = 'https://github.com/UniqueNetwork/open-runtime-module-library'370branch = 'unique-polkadot-v0.9.18'371version = "0.4.1-dev"372default-features = false373374################################################################################375# local dependencies376377[dependencies]378unique-runtime-common = { path = "../common", default-features = false }379scale-info = { version = "2.0.1", default-features = false, features = [380    "derive",381] }382derivative = "2.2.0"383pallet-unique = { path = '../../pallets/unique', default-features = false }384up-rpc = { path = "../../primitives/rpc", default-features = false }385pallet-inflation = { path = '../../pallets/inflation', default-features = false }386up-data-structs = { path = '../../primitives/data-structs', default-features = false }387pallet-common = { default-features = false, path = "../../pallets/common" }388pallet-fungible = { default-features = false, path = "../../pallets/fungible" }389pallet-refungible = { default-features = false, path = "../../pallets/refungible" }390pallet-nonfungible = { default-features = false, path = "../../pallets/nonfungible" }391pallet-unq-scheduler = { path = '../../pallets/scheduler', default-features = false }392# pallet-contract-helpers = { path = '../pallets/contract-helpers', default-features = false, version = '0.1.0' }393pallet-charge-transaction = { git = "https://github.com/UniqueNetwork/pallet-sponsoring", branch = 'polkadot-v0.9.18', package = "pallet-template-transaction-payment", default-features = false, version = '3.0.0' }394pallet-evm-migration = { path = '../../pallets/evm-migration', default-features = false }395pallet-evm-contract-helpers = { path = '../../pallets/evm-contract-helpers', default-features = false }396pallet-evm-transaction-payment = { path = '../../pallets/evm-transaction-payment', default-features = false }397pallet-evm-coder-substrate = { default-features = false, path = "../../pallets/evm-coder-substrate" }398pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18" }399pallet-ethereum = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18" }400pallet-base-fee = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18" }401fp-rpc = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18" }402fp-self-contained = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18" }403fp-evm-mapping = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "feature/300" }404frame-common = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "feature/300" }405406################################################################################407# Build Dependencies408409[build-dependencies.substrate-wasm-builder]410git = 'https://github.com/paritytech/substrate.git'411branch = 'polkadot-v0.9.18'
after · runtime/unique/Cargo.toml
1################################################################################2# Package34[package]5authors = ['Unique Network <support@uniquenetwork.io>']6build = 'build.rs'7description = 'Unique Runtime'8edition = '2021'9homepage = 'https://unique.network'10license = 'GPLv3'11name = 'unique-runtime'12repository = 'https://github.com/UniqueNetwork/unique-chain'13version = '0.9.17'1415[package.metadata.docs.rs]16targets = ['x86_64-unknown-linux-gnu']1718[features]19default = ['std']20runtime-benchmarks = [21    'hex-literal',22    'frame-benchmarking',23    'frame-support/runtime-benchmarks',24    'frame-system-benchmarking',25    'frame-system/runtime-benchmarks',26    'pallet-ethereum/runtime-benchmarks',27    'pallet-evm-migration/runtime-benchmarks',28    'pallet-evm-coder-substrate/runtime-benchmarks',29    'pallet-balances/runtime-benchmarks',30    'pallet-timestamp/runtime-benchmarks',31    'pallet-common/runtime-benchmarks',32    'pallet-fungible/runtime-benchmarks',33    'pallet-refungible/runtime-benchmarks',34    'pallet-nonfungible/runtime-benchmarks',35    'pallet-unique/runtime-benchmarks',36    'pallet-inflation/runtime-benchmarks',37    'pallet-xcm/runtime-benchmarks',38    'sp-runtime/runtime-benchmarks',39    'xcm-builder/runtime-benchmarks',40]41std = [42    'codec/std',43    'cumulus-pallet-aura-ext/std',44    'cumulus-pallet-parachain-system/std',45    'cumulus-pallet-xcm/std',46    'cumulus-pallet-xcmp-queue/std',47    'cumulus-primitives-core/std',48    'cumulus-primitives-utility/std',49    'frame-executive/std',50    'frame-support/std',51    'frame-system/std',52    'frame-system-rpc-runtime-api/std',53    'pallet-aura/std',54    'pallet-balances/std',55    # 'pallet-contracts/std',56    # 'pallet-contracts-primitives/std',57    # 'pallet-contracts-rpc-runtime-api/std',58    # 'pallet-contract-helpers/std',59    'pallet-randomness-collective-flip/std',60    'pallet-sudo/std',61    'pallet-timestamp/std',62    'pallet-transaction-payment/std',63    'pallet-transaction-payment-rpc-runtime-api/std',64    'pallet-treasury/std',65    # 'pallet-vesting/std',66    'pallet-evm/std',67    'pallet-evm-migration/std',68    'pallet-evm-contract-helpers/std',69    'pallet-evm-transaction-payment/std',70    'pallet-evm-coder-substrate/std',71    'pallet-ethereum/std',72    'pallet-base-fee/std',73    'fp-rpc/std',74    'up-rpc/std',75    'fp-evm-mapping/std',76    'fp-self-contained/std',77    'parachain-info/std',78    'serde',79    'pallet-inflation/std',80    'pallet-common/std',81    'pallet-fungible/std',82    'pallet-refungible/std',83    'pallet-nonfungible/std',84    'pallet-unique/std',85    'pallet-unq-scheduler/std',86    'pallet-charge-transaction/std',87    'up-data-structs/std',88    'sp-api/std',89    'sp-block-builder/std',90    "sp-consensus-aura/std",91    'sp-core/std',92    'sp-inherents/std',93    'sp-io/std',94    'sp-offchain/std',95    'sp-runtime/std',96    'sp-session/std',97    'sp-std/std',98    'sp-transaction-pool/std',99    'sp-version/std',100    'xcm/std',101    'xcm-builder/std',102    'xcm-executor/std',103    'unique-runtime-common/std',104105    "orml-vesting/std",106]107limit-testing = ['pallet-unique/limit-testing', 'up-data-structs/limit-testing']108109################################################################################110# Substrate Dependencies111112[dependencies.codec]113default-features = false114features = ['derive']115package = 'parity-scale-codec'116version = '3.1.2'117118[dependencies.frame-benchmarking]119default-features = false120git = 'https://github.com/paritytech/substrate.git'121optional = true122branch = 'polkadot-v0.9.18'123124[dependencies.frame-executive]125default-features = false126git = 'https://github.com/paritytech/substrate.git'127branch = 'polkadot-v0.9.18'128129[dependencies.frame-support]130default-features = false131git = 'https://github.com/paritytech/substrate.git'132branch = 'polkadot-v0.9.18'133134[dependencies.frame-system]135default-features = false136git = 'https://github.com/paritytech/substrate.git'137branch = 'polkadot-v0.9.18'138139[dependencies.frame-system-benchmarking]140default-features = false141git = 'https://github.com/paritytech/substrate.git'142optional = true143branch = 'polkadot-v0.9.18'144145[dependencies.frame-system-rpc-runtime-api]146default-features = false147git = 'https://github.com/paritytech/substrate.git'148branch = 'polkadot-v0.9.18'149150[dependencies.hex-literal]151optional = true152version = '0.3.3'153154[dependencies.serde]155default-features = false156features = ['derive']157optional = true158version = '1.0.130'159160[dependencies.pallet-aura]161default-features = false162git = 'https://github.com/paritytech/substrate.git'163branch = 'polkadot-v0.9.18'164165[dependencies.pallet-balances]166default-features = false167git = 'https://github.com/paritytech/substrate.git'168branch = 'polkadot-v0.9.18'169170# Contracts specific packages171# [dependencies.pallet-contracts]172# git = 'https://github.com/paritytech/substrate.git'173# default-features = false174# branch = 'polkadot-v0.9.18'175# version = '4.0.0-dev'176177# [dependencies.pallet-contracts-primitives]178# git = 'https://github.com/paritytech/substrate.git'179# default-features = false180# branch = 'polkadot-v0.9.18'181# version = '4.0.0-dev'182183# [dependencies.pallet-contracts-rpc-runtime-api]184# git = 'https://github.com/paritytech/substrate.git'185# default-features = false186# branch = 'polkadot-v0.9.18'187# version = '4.0.0-dev'188189[dependencies.pallet-randomness-collective-flip]190default-features = false191git = 'https://github.com/paritytech/substrate.git'192branch = 'polkadot-v0.9.18'193194[dependencies.pallet-sudo]195default-features = false196git = 'https://github.com/paritytech/substrate.git'197branch = 'polkadot-v0.9.18'198199[dependencies.pallet-timestamp]200default-features = false201git = 'https://github.com/paritytech/substrate.git'202branch = 'polkadot-v0.9.18'203204[dependencies.pallet-transaction-payment]205default-features = false206git = 'https://github.com/paritytech/substrate.git'207branch = 'polkadot-v0.9.18'208209[dependencies.pallet-transaction-payment-rpc-runtime-api]210default-features = false211git = 'https://github.com/paritytech/substrate.git'212branch = 'polkadot-v0.9.18'213214[dependencies.pallet-treasury]215default-features = false216git = 'https://github.com/paritytech/substrate.git'217branch = 'polkadot-v0.9.18'218219# [dependencies.pallet-vesting]220# default-features = false221# git = 'https://github.com/paritytech/substrate.git'222# branch = 'polkadot-v0.9.18'223224[dependencies.sp-arithmetic]225default-features = false226git = 'https://github.com/paritytech/substrate.git'227branch = 'polkadot-v0.9.18'228229[dependencies.sp-api]230default-features = false231git = 'https://github.com/paritytech/substrate.git'232branch = 'polkadot-v0.9.18'233234[dependencies.sp-block-builder]235default-features = false236git = 'https://github.com/paritytech/substrate.git'237branch = 'polkadot-v0.9.18'238239[dependencies.sp-core]240default-features = false241git = 'https://github.com/paritytech/substrate.git'242branch = 'polkadot-v0.9.18'243244[dependencies.sp-consensus-aura]245default-features = false246git = 'https://github.com/paritytech/substrate.git'247branch = 'polkadot-v0.9.18'248249[dependencies.sp-inherents]250default-features = false251git = 'https://github.com/paritytech/substrate.git'252branch = 'polkadot-v0.9.18'253254[dependencies.sp-io]255default-features = false256git = 'https://github.com/paritytech/substrate.git'257branch = 'polkadot-v0.9.18'258259[dependencies.sp-offchain]260default-features = false261git = 'https://github.com/paritytech/substrate.git'262branch = 'polkadot-v0.9.18'263264[dependencies.sp-runtime]265default-features = false266git = 'https://github.com/paritytech/substrate.git'267branch = 'polkadot-v0.9.18'268269[dependencies.sp-session]270default-features = false271git = 'https://github.com/paritytech/substrate.git'272branch = 'polkadot-v0.9.18'273274[dependencies.sp-std]275default-features = false276git = 'https://github.com/paritytech/substrate.git'277branch = 'polkadot-v0.9.18'278279[dependencies.sp-transaction-pool]280default-features = false281git = 'https://github.com/paritytech/substrate.git'282branch = 'polkadot-v0.9.18'283284[dependencies.sp-version]285default-features = false286git = 'https://github.com/paritytech/substrate.git'287branch = 'polkadot-v0.9.18'288289[dependencies.smallvec]290version = '1.6.1'291292################################################################################293# Cumulus dependencies294295[dependencies.parachain-info]296default-features = false297git = 'https://github.com/paritytech/cumulus.git'298branch = 'polkadot-v0.9.18'299300[dependencies.cumulus-pallet-aura-ext]301git = 'https://github.com/paritytech/cumulus.git'302branch = 'polkadot-v0.9.18'303default-features = false304305[dependencies.cumulus-pallet-parachain-system]306git = 'https://github.com/paritytech/cumulus.git'307branch = 'polkadot-v0.9.18'308default-features = false309310[dependencies.cumulus-primitives-core]311git = 'https://github.com/paritytech/cumulus.git'312branch = 'polkadot-v0.9.18'313default-features = false314315[dependencies.cumulus-pallet-xcm]316git = 'https://github.com/paritytech/cumulus.git'317branch = 'polkadot-v0.9.18'318default-features = false319320[dependencies.cumulus-pallet-dmp-queue]321git = 'https://github.com/paritytech/cumulus.git'322branch = 'polkadot-v0.9.18'323default-features = false324325[dependencies.cumulus-pallet-xcmp-queue]326git = 'https://github.com/paritytech/cumulus.git'327branch = 'polkadot-v0.9.18'328default-features = false329330[dependencies.cumulus-primitives-utility]331git = 'https://github.com/paritytech/cumulus.git'332branch = 'polkadot-v0.9.18'333default-features = false334335[dependencies.cumulus-primitives-timestamp]336git = 'https://github.com/paritytech/cumulus.git'337branch = 'polkadot-v0.9.18'338default-features = false339340################################################################################341# Polkadot dependencies342343[dependencies.polkadot-parachain]344git = 'https://github.com/paritytech/polkadot'345branch = 'release-v0.9.18'346default-features = false347348[dependencies.xcm]349git = 'https://github.com/paritytech/polkadot'350branch = 'release-v0.9.18'351default-features = false352353[dependencies.xcm-builder]354git = 'https://github.com/paritytech/polkadot'355branch = 'release-v0.9.18'356default-features = false357358[dependencies.xcm-executor]359git = 'https://github.com/paritytech/polkadot'360branch = 'release-v0.9.18'361default-features = false362363[dependencies.pallet-xcm]364git = 'https://github.com/paritytech/polkadot'365branch = 'release-v0.9.18'366default-features = false367368[dependencies.orml-vesting]369git = 'https://github.com/UniqueNetwork/open-runtime-module-library'370branch = 'unique-polkadot-v0.9.18'371version = "0.4.1-dev"372default-features = false373374################################################################################375# local dependencies376377[dependencies]378unique-runtime-common = { path = "../common", default-features = false }379scale-info = { version = "2.0.1", default-features = false, features = [380    "derive",381] }382derivative = "2.2.0"383pallet-unique = { path = '../../pallets/unique', default-features = false }384up-rpc = { path = "../../primitives/rpc", default-features = false }385pallet-inflation = { path = '../../pallets/inflation', default-features = false }386up-data-structs = { path = '../../primitives/data-structs', default-features = false }387pallet-common = { default-features = false, path = "../../pallets/common" }388pallet-fungible = { default-features = false, path = "../../pallets/fungible" }389pallet-refungible = { default-features = false, path = "../../pallets/refungible" }390pallet-nonfungible = { default-features = false, path = "../../pallets/nonfungible" }391pallet-unq-scheduler = { path = '../../pallets/scheduler', default-features = false }392# pallet-contract-helpers = { path = '../pallets/contract-helpers', default-features = false, version = '0.1.0' }393pallet-charge-transaction = { git = "https://github.com/UniqueNetwork/pallet-sponsoring", branch = 'polkadot-v0.9.18', package = "pallet-template-transaction-payment", default-features = false, version = '3.0.0' }394pallet-evm-migration = { path = '../../pallets/evm-migration', default-features = false }395pallet-evm-contract-helpers = { path = '../../pallets/evm-contract-helpers', default-features = false }396pallet-evm-transaction-payment = { path = '../../pallets/evm-transaction-payment', default-features = false }397pallet-evm-coder-substrate = { default-features = false, path = "../../pallets/evm-coder-substrate" }398pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18" }399pallet-ethereum = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18" }400pallet-base-fee = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18" }401fp-rpc = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18" }402fp-self-contained = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18" }403fp-evm-mapping = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "feature/300" }404405################################################################################406# Build Dependencies407408[build-dependencies.substrate-wasm-builder]409git = 'https://github.com/paritytech/substrate.git'410branch = 'polkadot-v0.9.18'
modifiedruntime/unique/src/lib.rsdiffbeforeafterboth
--- a/runtime/unique/src/lib.rs
+++ b/runtime/unique/src/lib.rs
@@ -115,7 +115,7 @@
 
 pub const RUNTIME_NAME: &str = "Unique";
 
-type CrossAccountId = pallet_common::account::BasicCrossAccountId<Runtime>;
+type CrossAccountId = pallet_evm::account::BasicCrossAccountId<Runtime>;
 
 impl RuntimeInstance for Runtime {
 	type CrossAccountId = self::CrossAccountId;
@@ -843,10 +843,6 @@
 
 impl pallet_common::Config for Runtime {
 	type Event = Event;
-	type EvmBackwardsAddressMapping = up_evm_mapping::MapBackwardsAddressTruncated;
-	type EvmAddressMapping = HashedAddressMapping<Self::Hashing>;
-	type CrossAccountId = pallet_common::account::BasicCrossAccountId<Self>;
-
 	type Currency = Balances;
 	type CollectionCreationPrice = CollectionCreationPrice;
 	type TreasuryAccountId = TreasuryAccountId;
@@ -916,8 +912,6 @@
 impl pallet_evm_transaction_payment::Config for Runtime {
 	type EvmSponsorshipHandler = EvmSponsorshipHandler;
 	type Currency = Balances;
-	type EvmAddressMapping = HashedAddressMapping<Self::Hashing>;
-	type EvmBackwardsAddressMapping = up_evm_mapping::MapBackwardsAddressTruncated;
 }
 
 impl pallet_charge_transaction::Config for Runtime {
modifiedtests/src/eth/contractSponsoring.test.tsdiffbeforeafterboth
--- a/tests/src/eth/contractSponsoring.test.ts
+++ b/tests/src/eth/contractSponsoring.test.ts
@@ -213,7 +213,7 @@
     expect(await helpers.methods.getSponsoringRateLimit(flipper.options.address).call()).to.be.equals('7200');
   });
 
-  itWeb3.only('Sponsoring evm address from substrate collection', async ({api, web3}) => {
+  itWeb3('Sponsoring evm address from substrate collection', async ({api, web3}) => {
     const owner = privateKey('//Alice');
     const userEth = createEthAccount(web3);
     const collectionId = await createCollectionExpectSuccess();