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

68source = "registry+https://github.com/rust-lang/crates.io-index"68source = "registry+https://github.com/rust-lang/crates.io-index"
69checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"69checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
70dependencies = [70dependencies = [
71 "getrandom 0.2.5",71 "getrandom 0.2.6",
72 "once_cell",72 "once_cell",
73 "version_check",73 "version_check",
74]74]
306306
307[[package]]307[[package]]
308name = "async-trait"308name = "async-trait"
309version = "0.1.52"309version = "0.1.53"
310source = "registry+https://github.com/rust-lang/crates.io-index"310source = "registry+https://github.com/rust-lang/crates.io-index"
311checksum = "061a7acccaa286c011ddc30970520b98fa40e00c9d644633fb26b5fc63a265e3"311checksum = "ed6aa3524a2dfcf9fe180c51eae2b58738348d819517ceadf95789c51fff7600"
312dependencies = [312dependencies = [
313 "proc-macro2",313 "proc-macro2",
314 "quote",314 "quote",
392checksum = "b62ddb9cb1ec0a098ad4bbf9344d0713fa193ae1a80af55febcff2627b6a00c1"392checksum = "b62ddb9cb1ec0a098ad4bbf9344d0713fa193ae1a80af55febcff2627b6a00c1"
393dependencies = [393dependencies = [
394 "futures-core",394 "futures-core",
395 "getrandom 0.2.5",395 "getrandom 0.2.6",
396 "instant",396 "instant",
397 "pin-project-lite 0.2.8",397 "pin-project-lite 0.2.8",
398 "rand 0.8.5",398 "rand 0.8.5",
440440
441[[package]]441[[package]]
442name = "base64ct"442name = "base64ct"
443version = "1.4.1"443version = "1.5.0"
444source = "registry+https://github.com/rust-lang/crates.io-index"444source = "registry+https://github.com/rust-lang/crates.io-index"
445checksum = "71acf5509fc522cce1b100ac0121c635129bfd4d91cdf036bcc9b9935f97ccf5"445checksum = "dea908e7347a8c64e378c17e30ef880ad73e3b4498346b055c2c00ea342f3179"
446446
447[[package]]447[[package]]
448name = "beef"448name = "beef"
990dependencies = [990dependencies = [
991 "camino",991 "camino",
992 "cargo-platform",992 "cargo-platform",
993 "semver 1.0.6",993 "semver 1.0.7",
994 "serde",994 "serde",
995 "serde_json",995 "serde_json",
996]996]
2753[[package]]2753[[package]]
2754name = "fp-evm-mapping"2754name = "fp-evm-mapping"
2755version = "0.1.0"2755version = "0.1.0"
2756source = "git+https://github.com/uniquenetwork/frontier.git?branch=feature/300#8718bfde84a370f5a6e7642b216dd913ca33db5c"2756source = "git+https://github.com/uniquenetwork/frontier.git?branch=feature/300#28e11d419537bde416bc84b1604b4d0f3da879e0"
2757dependencies = [2757dependencies = [
2758 "frame-support",2758 "frame-support",
2759 "sp-core",2759 "sp-core",
32433243
3244[[package]]3244[[package]]
3245name = "getrandom"3245name = "getrandom"
3246version = "0.2.5"3246version = "0.2.6"
3247source = "registry+https://github.com/rust-lang/crates.io-index"3247source = "registry+https://github.com/rust-lang/crates.io-index"
3248checksum = "d39cd93900197114fa1fcb7ae84ca742095eed9442088988ae74fa744e930e77"3248checksum = "9be70c98951c83b8d2f8f60d7065fa6d5146873094452a1008da8c2f1e4205ad"
3249dependencies = [3249dependencies = [
3250 "cfg-if 1.0.0",3250 "cfg-if 1.0.0",
3251 "libc",3251 "libc",
36883688
3689[[package]]3689[[package]]
3690name = "indexmap"3690name = "indexmap"
3691version = "1.8.0"3691version = "1.8.1"
3692source = "registry+https://github.com/rust-lang/crates.io-index"3692source = "registry+https://github.com/rust-lang/crates.io-index"
3693checksum = "282a6247722caba404c065016bbfa522806e51714c34f5dfc3e4a3a46fcb4223"3693checksum = "0f647032dfaa1f8b6dc29bd3edb7bbef4861b8b8007ebb118d6db284fd59f6ee"
3694dependencies = [3694dependencies = [
3695 "autocfg",3695 "autocfg",
3696 "hashbrown 0.11.2",3696 "hashbrown 0.11.2",
6181version = "0.1.0"6181version = "0.1.0"
6182dependencies = [6182dependencies = [
6183 "fp-evm",6183 "fp-evm",
6184 "fp-evm-mapping",
6184 "frame-support",6185 "frame-support",
6185 "frame-system",6186 "frame-system",
6186 "pallet-ethereum",6187 "pallet-ethereum",
6807 "ethereum",6808 "ethereum",
6808 "evm-coder",6809 "evm-coder",
6809 "fp-evm",6810 "fp-evm",
6811 "fp-evm-mapping",
6810 "frame-benchmarking",6812 "frame-benchmarking",
6811 "frame-support",6813 "frame-support",
6812 "frame-system",6814 "frame-system",
71177119
7118[[package]]7120[[package]]
7119name = "paste"7121name = "paste"
7120version = "1.0.6"7122version = "1.0.7"
7121source = "registry+https://github.com/rust-lang/crates.io-index"7123source = "registry+https://github.com/rust-lang/crates.io-index"
7122checksum = "0744126afe1a6dd7f394cb50a716dbe086cb06e255e53d8d0185d82828358fb5"7124checksum = "0c520e05135d6e763148b6426a837e239041653ba7becd2e538c076c738025fc"
71237125
7124[[package]]7126[[package]]
7125name = "pbkdf2"7127name = "pbkdf2"
88038805
8804[[package]]8806[[package]]
8805name = "quote"8807name = "quote"
8806version = "1.0.16"8808version = "1.0.17"
8807source = "registry+https://github.com/rust-lang/crates.io-index"8809source = "registry+https://github.com/rust-lang/crates.io-index"
8808checksum = "b4af2ec4714533fcdf07e886f17025ace8b997b9ce51204ee69b6da831c3da57"8810checksum = "632d02bff7f874a36f33ea8bb416cd484b90cc66c1194b1a1110d067a7013f58"
8809dependencies = [8811dependencies = [
8810 "proc-macro2",8812 "proc-macro2",
8811]8813]
8876source = "registry+https://github.com/rust-lang/crates.io-index"8878source = "registry+https://github.com/rust-lang/crates.io-index"
8877checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7"8879checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7"
8878dependencies = [8880dependencies = [
8879 "getrandom 0.2.5",8881 "getrandom 0.2.6",
8880]8882]
88818883
8882[[package]]8884[[package]]
89408942
8941[[package]]8943[[package]]
8942name = "redox_syscall"8944name = "redox_syscall"
8943version = "0.2.11"8945version = "0.2.12"
8944source = "registry+https://github.com/rust-lang/crates.io-index"8946source = "registry+https://github.com/rust-lang/crates.io-index"
8945checksum = "8380fe0152551244f0747b1bf41737e0f8a74f97a14ccefd1148187271634f3c"8947checksum = "8ae183fc1b06c149f0c1793e1eb447c8b04bfe46d48e9e48bfb8d2d7ed64ecf0"
8946dependencies = [8948dependencies = [
8947 "bitflags",8949 "bitflags",
8948]8950]
8953source = "registry+https://github.com/rust-lang/crates.io-index"8955source = "registry+https://github.com/rust-lang/crates.io-index"
8954checksum = "7776223e2696f1aa4c6b0170e83212f47296a00424305117d013dfe86fb0fe55"8956checksum = "7776223e2696f1aa4c6b0170e83212f47296a00424305117d013dfe86fb0fe55"
8955dependencies = [8957dependencies = [
8956 "getrandom 0.2.5",8958 "getrandom 0.2.6",
8957 "redox_syscall",8959 "redox_syscall",
8958 "thiserror",8960 "thiserror",
8959]8961]
9267source = "registry+https://github.com/rust-lang/crates.io-index"9269source = "registry+https://github.com/rust-lang/crates.io-index"
9268checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"9270checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
9269dependencies = [9271dependencies = [
9270 "semver 1.0.6",9272 "semver 1.0.7",
9271]9273]
92729274
9273[[package]]9275[[package]]
1054610548
10547[[package]]10549[[package]]
10548name = "semver"10550name = "semver"
10549version = "1.0.6"10551version = "1.0.7"
10550source = "registry+https://github.com/rust-lang/crates.io-index"10552source = "registry+https://github.com/rust-lang/crates.io-index"
10551checksum = "a4a3381e03edd24287172047536f20cabde766e2cd3e65e6b00fb3af51c4f38d"10553checksum = "d65bd28f48be7196d222d95b9243287f48d27aca604e08497513019ff0502cc4"
10552dependencies = [10554dependencies = [
10553 "serde",10555 "serde",
10554]10556]
1181511817
11816[[package]]11818[[package]]
11817name = "syn"11819name = "syn"
11818version = "1.0.89"11820version = "1.0.90"
11819source = "registry+https://github.com/rust-lang/crates.io-index"11821source = "registry+https://github.com/rust-lang/crates.io-index"
11820checksum = "ea297be220d52398dcc07ce15a209fce436d361735ac1db700cab3b6cdfb9f54"11822checksum = "704df27628939572cd88d33f171cd6f896f4eaca85252c6e0a72d8d8287ee86f"
11821dependencies = [11823dependencies = [
11822 "proc-macro2",11824 "proc-macro2",
11823 "quote",11825 "quote",
12196 "chrono",12198 "chrono",
12197 "lazy_static",12199 "lazy_static",
12198 "matchers",12200 "matchers",
12199 "parking_lot 0.10.2",12201 "parking_lot 0.11.2",
12200 "regex",12202 "regex",
12201 "serde",12203 "serde",
12202 "serde_json",12204 "serde_json",
1241412416
12415[[package]]12417[[package]]
12416name = "unique-node"12418name = "unique-node"
12417version = "0.9.17"12419version = "0.9.18"
12418dependencies = [12420dependencies = [
12419 "clap",12421 "clap",
12420 "cumulus-client-cli",12422 "cumulus-client-cli",
12628 "frame-support",12630 "frame-support",
12629 "frame-system",12631 "frame-system",
12630 "pallet-common",12632 "pallet-common",
12633 "pallet-evm",
12631 "parity-scale-codec",12634 "parity-scale-codec",
12632 "scale-info",12635 "scale-info",
12633 "sp-consensus-aura",12636 "sp-consensus-aura",

--- 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" }

--- 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'

--- 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",

--- 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"]

--- 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

--- 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;

--- 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;

--- 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 {

--- a/runtime/unique/Cargo.toml
+++ b/runtime/unique/Cargo.toml
@@ -401,7 +401,6 @@
 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" }
 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" }
 
 ################################################################################
 # Build Dependencies

--- 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 {

--- 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();