--- 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", --- 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 + type CrossAccountId: pallet_evm::account::CrossAccountId + 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; +type CrossAccountId = pallet_evm::account::BasicCrossAccountId; 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; +type CrossAccountId = pallet_evm::account::BasicCrossAccountId; 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; - type CrossAccountId = pallet_common::account::BasicCrossAccountId; 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; - 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; +type CrossAccountId = pallet_evm::account::BasicCrossAccountId; 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; - type CrossAccountId = pallet_common::account::BasicCrossAccountId; - 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; - 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();