From 627410d204447486c6ff57d168e32a2112676c25 Mon Sep 17 00:00:00 2001 From: Agusrodri Date: Fri, 17 May 2024 10:00:13 -0700 Subject: [PATCH] apply changes to Erc20Match --- Cargo.lock | 30 ++++++++++++++--------------- runtime/moonbase/src/precompiles.rs | 6 +++--- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9bf173d2b0..7b8a2cf561 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -629,7 +629,7 @@ checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9" [[package]] name = "async-backing-primitives" version = "0.9.0" -source = "git+https://github.com/Moonsong-Labs/moonkit?branch=moonbeam-polkadot-v1.7.2#fff47d85dcd1e3b2becb342f368ae6ffdcb44b0c" +source = "git+https://github.com/Moonsong-Labs/moonkit?branch=moonbeam-polkadot-v1.7.2#04d420f376a1445c6636926c87485519a1db3fe1" dependencies = [ "sp-api", "sp-consensus-slots", @@ -7455,7 +7455,7 @@ dependencies = [ [[package]] name = "nimbus-consensus" version = "0.9.0" -source = "git+https://github.com/Moonsong-Labs/moonkit?branch=moonbeam-polkadot-v1.7.2#fff47d85dcd1e3b2becb342f368ae6ffdcb44b0c" +source = "git+https://github.com/Moonsong-Labs/moonkit?branch=moonbeam-polkadot-v1.7.2#04d420f376a1445c6636926c87485519a1db3fe1" dependencies = [ "async-backing-primitives", "async-trait", @@ -7495,7 +7495,7 @@ dependencies = [ [[package]] name = "nimbus-primitives" version = "0.9.0" -source = "git+https://github.com/Moonsong-Labs/moonkit?branch=moonbeam-polkadot-v1.7.2#fff47d85dcd1e3b2becb342f368ae6ffdcb44b0c" +source = "git+https://github.com/Moonsong-Labs/moonkit?branch=moonbeam-polkadot-v1.7.2#04d420f376a1445c6636926c87485519a1db3fe1" dependencies = [ "async-trait", "frame-benchmarking", @@ -8028,7 +8028,7 @@ dependencies = [ [[package]] name = "pallet-async-backing" version = "0.9.0" -source = "git+https://github.com/Moonsong-Labs/moonkit?branch=moonbeam-polkadot-v1.7.2#fff47d85dcd1e3b2becb342f368ae6ffdcb44b0c" +source = "git+https://github.com/Moonsong-Labs/moonkit?branch=moonbeam-polkadot-v1.7.2#04d420f376a1445c6636926c87485519a1db3fe1" dependencies = [ "cumulus-pallet-parachain-system", "cumulus-primitives-core", @@ -8048,7 +8048,7 @@ dependencies = [ [[package]] name = "pallet-author-inherent" version = "0.9.0" -source = "git+https://github.com/Moonsong-Labs/moonkit?branch=moonbeam-polkadot-v1.7.2#fff47d85dcd1e3b2becb342f368ae6ffdcb44b0c" +source = "git+https://github.com/Moonsong-Labs/moonkit?branch=moonbeam-polkadot-v1.7.2#04d420f376a1445c6636926c87485519a1db3fe1" dependencies = [ "frame-benchmarking", "frame-support", @@ -8067,7 +8067,7 @@ dependencies = [ [[package]] name = "pallet-author-mapping" version = "2.0.5" -source = "git+https://github.com/Moonsong-Labs/moonkit?branch=moonbeam-polkadot-v1.7.2#fff47d85dcd1e3b2becb342f368ae6ffdcb44b0c" +source = "git+https://github.com/Moonsong-Labs/moonkit?branch=moonbeam-polkadot-v1.7.2#04d420f376a1445c6636926c87485519a1db3fe1" dependencies = [ "frame-benchmarking", "frame-support", @@ -8086,7 +8086,7 @@ dependencies = [ [[package]] name = "pallet-author-slot-filter" version = "0.9.0" -source = "git+https://github.com/Moonsong-Labs/moonkit?branch=moonbeam-polkadot-v1.7.2#fff47d85dcd1e3b2becb342f368ae6ffdcb44b0c" +source = "git+https://github.com/Moonsong-Labs/moonkit?branch=moonbeam-polkadot-v1.7.2#04d420f376a1445c6636926c87485519a1db3fe1" dependencies = [ "frame-benchmarking", "frame-support", @@ -8444,7 +8444,7 @@ dependencies = [ [[package]] name = "pallet-emergency-para-xcm" version = "0.1.0" -source = "git+https://github.com/Moonsong-Labs/moonkit?branch=moonbeam-polkadot-v1.7.2#fff47d85dcd1e3b2becb342f368ae6ffdcb44b0c" +source = "git+https://github.com/Moonsong-Labs/moonkit?branch=moonbeam-polkadot-v1.7.2#04d420f376a1445c6636926c87485519a1db3fe1" dependencies = [ "cumulus-pallet-parachain-system", "cumulus-primitives-core", @@ -9145,7 +9145,7 @@ dependencies = [ [[package]] name = "pallet-evm-precompile-xcm" version = "0.1.0" -source = "git+https://github.com/Moonsong-Labs/moonkit?branch=moonbeam-polkadot-v1.7.2#fff47d85dcd1e3b2becb342f368ae6ffdcb44b0c" +source = "git+https://github.com/Moonsong-Labs/moonkit?branch=moonbeam-polkadot-v1.7.2#04d420f376a1445c6636926c87485519a1db3fe1" dependencies = [ "cumulus-primitives-core", "evm", @@ -9395,7 +9395,7 @@ dependencies = [ [[package]] name = "pallet-maintenance-mode" version = "0.1.0" -source = "git+https://github.com/Moonsong-Labs/moonkit?branch=moonbeam-polkadot-v1.7.2#fff47d85dcd1e3b2becb342f368ae6ffdcb44b0c" +source = "git+https://github.com/Moonsong-Labs/moonkit?branch=moonbeam-polkadot-v1.7.2#04d420f376a1445c6636926c87485519a1db3fe1" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -9448,7 +9448,7 @@ dependencies = [ [[package]] name = "pallet-migrations" version = "0.1.0" -source = "git+https://github.com/Moonsong-Labs/moonkit?branch=moonbeam-polkadot-v1.7.2#fff47d85dcd1e3b2becb342f368ae6ffdcb44b0c" +source = "git+https://github.com/Moonsong-Labs/moonkit?branch=moonbeam-polkadot-v1.7.2#04d420f376a1445c6636926c87485519a1db3fe1" dependencies = [ "frame-benchmarking", "frame-support", @@ -9736,7 +9736,7 @@ dependencies = [ [[package]] name = "pallet-randomness" version = "0.1.0" -source = "git+https://github.com/Moonsong-Labs/moonkit?branch=moonbeam-polkadot-v1.7.2#fff47d85dcd1e3b2becb342f368ae6ffdcb44b0c" +source = "git+https://github.com/Moonsong-Labs/moonkit?branch=moonbeam-polkadot-v1.7.2#04d420f376a1445c6636926c87485519a1db3fe1" dependencies = [ "environmental", "frame-benchmarking", @@ -9814,7 +9814,7 @@ dependencies = [ [[package]] name = "pallet-relay-storage-roots" version = "0.1.0" -source = "git+https://github.com/Moonsong-Labs/moonkit?branch=moonbeam-polkadot-v1.7.2#fff47d85dcd1e3b2becb342f368ae6ffdcb44b0c" +source = "git+https://github.com/Moonsong-Labs/moonkit?branch=moonbeam-polkadot-v1.7.2#04d420f376a1445c6636926c87485519a1db3fe1" dependencies = [ "cumulus-pallet-parachain-system", "cumulus-primitives-core", @@ -14305,7 +14305,7 @@ dependencies = [ [[package]] name = "session-keys-primitives" version = "0.1.0" -source = "git+https://github.com/Moonsong-Labs/moonkit?branch=moonbeam-polkadot-v1.7.2#fff47d85dcd1e3b2becb342f368ae6ffdcb44b0c" +source = "git+https://github.com/Moonsong-Labs/moonkit?branch=moonbeam-polkadot-v1.7.2#04d420f376a1445c6636926c87485519a1db3fe1" dependencies = [ "async-trait", "frame-support", @@ -17932,7 +17932,7 @@ dependencies = [ [[package]] name = "xcm-primitives" version = "0.1.0" -source = "git+https://github.com/Moonsong-Labs/moonkit?branch=moonbeam-polkadot-v1.7.2#fff47d85dcd1e3b2becb342f368ae6ffdcb44b0c" +source = "git+https://github.com/Moonsong-Labs/moonkit?branch=moonbeam-polkadot-v1.7.2#04d420f376a1445c6636926c87485519a1db3fe1" dependencies = [ "frame-support", "impl-trait-for-tuples", diff --git a/runtime/moonbase/src/precompiles.rs b/runtime/moonbase/src/precompiles.rs index 678b0987f6..610adc44f0 100644 --- a/runtime/moonbase/src/precompiles.rs +++ b/runtime/moonbase/src/precompiles.rs @@ -19,7 +19,7 @@ use crate::{ xcm_config::{AssetType, XcmExecutorConfig}, OpenTechCommitteeInstance, TreasuryCouncilInstance, }; -use crate::{AccountId, AssetId, AssetManager, Balances, Runtime, H160}; +use crate::{AccountId, AssetId, AssetManager, Balances, Erc20XcmBridge, Runtime, H160}; use frame_support::parameter_types; use moonkit_xcm_primitives::{ location_matcher::{Erc20PalletMatcher, ForeignAssetMatcher, SingleAddressMatcher}, @@ -112,8 +112,8 @@ type SingleAddressMatch = SingleAddressMatcher; -// Erc20XcmBridge pallet index = 48 -type Erc20Match = Erc20PalletMatcher; +// Erc20XcmBridge pallet is used to match ERC20s +type Erc20Match = Erc20PalletMatcher; #[precompile_utils::precompile_name_from_address] type MoonbasePrecompilesAt = (