Merge pull request #133 from claravanstaden/release/testnet

Fix IsForeignConcreteAssetFrom and add more logging

Author: Mihajlo-Pavlovic

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "neuroweb-runtime"
-version = "143.0.0"
+version = "144.0.0"
 authors = ["TraceLabs"]
 description = "NeuroWeb Runtime - Cumulus FRAME-based Substrate Runtime"
 license = "GPL-3.0-only"

runtime/Cargo.toml

@@ -152,7 +152,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
     spec_name: create_runtime_str!("origintrail-parachain"),
     impl_name: create_runtime_str!("neuroweb"),
     authoring_version: 1,
-    spec_version: 143,
+    spec_version: 144,
     impl_version: 0,
     apis: RUNTIME_API_VERSIONS,
     transaction_version: 1,

runtime/src/lib.rs

@@ -209,23 +209,28 @@ impl DropAssets for DealWithForeignFees {
                 if let Fungible(amount) = asset.fun {
                     if amount > 0 {
                         // Credit Treasury account in pallet-assets (asset_id = Location)
-                        if ForeignAssets::mint_into(
+                        match ForeignAssets::mint_into(
                             RelayLocation::get(), // directly use Location as ID
                             &crate::Treasury::account_id(),
                             amount,
-                        )
-                        .is_ok()
-                        {
-                            log::info!(
-                                target: "xcm::fees",
-                                "Credited {} DOT into Treasury account",
-                                amount
-                            );
-                        } else {
-                            log::warn!(
-                                target: "xcm::fees",
-                                "Failed to credit DOT fees into Treasury"
-                            );
+                        ) {
+                            Ok(_) => {
+                                log::info!(
+                                    target: "xcm::fees",
+                                    "Credited {} DOT into Treasury account ({:?})",
+                                    amount,
+                                     &crate::Treasury::account_id(),
+                                );
+                            }
+                            Err(e) => {
+                                log::warn!(
+                                    target: "xcm::fees",
+                                    "Failed to credit DOT fees ({}) into Treasury ({:?}): {:?}",
+                                    amount,
+                                    &crate::Treasury::account_id(),
+                                    e
+                                );
+                            }
                         }
                     }
                 }
@@ -329,13 +334,28 @@ where
     Origin: Get<Location>,
 {
     fn matches_fungibles(asset: &Asset) -> Result<(Location, u128), MatchError> {
-        let loc = Origin::get();
+        let expected_origin = Origin::get();
+
+        let AssetId(asset_location) = &asset.id;
+
+        // Ensure DOT comes from Asset Hub
+        if *asset_location == RelayLocation::get() && expected_origin == AssetHubLocation::get() {
+            if let Fungible(amount) = asset.fun {
+                return Ok((asset_location.clone(), amount));
+            }
+        }
 
-        if asset.id == AssetId(loc.clone()) {
-            if let Fungibility::Fungible(amount) = asset.fun {
-                return Ok((loc, amount));
+        // Handle assets from Ethereum
+        if expected_origin == AssetHubLocation::get() && asset_location.parents == 2 {
+            if let Some(first_junction) = asset_location.interior.first() {
+                if matches!(first_junction, GlobalConsensus(Ethereum { .. })) {
+                    if let Fungible(amount) = asset.fun {
+                        return Ok((asset_location.clone(), amount));
+                    }
+                }
             }
         }
+
         Err(MatchError::AssetNotHandled)
     }
 }