feat: Change generalIndex to generalKey in extract dest data method (#62)

Author: Freddy Li

bridge/src/lib.rs

@@ -1136,7 +1136,7 @@ pub mod pallet {
 							GeneralKey(
 								WeakBoundedVec::try_from(b"ethereum recipient".to_vec()).unwrap()
 							),
-							GeneralIndex(1)
+							GeneralKey(WeakBoundedVec::try_from(vec![1]).unwrap())
 						)
 					)
 						.into(),
@@ -1245,7 +1245,7 @@ pub mod pallet {
 							GeneralKey(
 								WeakBoundedVec::try_from(b"ethereum recipient".to_vec()).unwrap()
 							),
-							GeneralIndex(1)
+							GeneralKey(WeakBoundedVec::try_from(vec![1]).unwrap())
 						)
 					)
 						.into(),
@@ -1302,7 +1302,7 @@ pub mod pallet {
 									WeakBoundedVec::try_from(b"ethereum recipient".to_vec())
 										.unwrap()
 								),
-								GeneralIndex(1)
+								GeneralKey(WeakBoundedVec::try_from(vec![1]).unwrap())
 							)
 						)
 							.into(),
@@ -1374,7 +1374,7 @@ pub mod pallet {
 									WeakBoundedVec::try_from(b"ethereum recipient".to_vec())
 										.unwrap()
 								),
-								GeneralIndex(1)
+								GeneralKey(WeakBoundedVec::try_from(vec![1]).unwrap())
 							)
 						)
 							.into(),
@@ -1414,7 +1414,7 @@ pub mod pallet {
 									WeakBoundedVec::try_from(b"ethereum recipient".to_vec())
 										.unwrap()
 								),
-								GeneralIndex(1)
+								GeneralKey(WeakBoundedVec::try_from(vec![1]).unwrap())
 							)
 						)
 							.into(),
@@ -1459,7 +1459,7 @@ pub mod pallet {
 									WeakBoundedVec::try_from(b"ethereum recipient".to_vec())
 										.unwrap()
 								),
-								GeneralIndex(1)
+								GeneralKey(WeakBoundedVec::try_from(vec![1]).unwrap())
 							)
 						)
 							.into(),
@@ -1478,7 +1478,7 @@ pub mod pallet {
 							GeneralKey(
 								WeakBoundedVec::try_from(b"ethereum recipient".to_vec()).unwrap()
 							),
-							GeneralIndex(1)
+							GeneralKey(WeakBoundedVec::try_from(vec![1]).unwrap())
 						)
 					)
 						.into(),
@@ -1509,7 +1509,7 @@ pub mod pallet {
 									WeakBoundedVec::try_from(b"ethereum recipient".to_vec())
 										.unwrap()
 								),
-								GeneralIndex(1)
+								GeneralKey(WeakBoundedVec::try_from(vec![1]).unwrap())
 							)
 						)
 							.into(),
@@ -1613,7 +1613,7 @@ pub mod pallet {
 							GeneralKey(
 								WeakBoundedVec::try_from(b"ethereum recipient".to_vec()).unwrap()
 							),
-							GeneralIndex(1)
+							GeneralKey(WeakBoundedVec::try_from(vec![1]).unwrap())
 						)
 					)
 						.into(),

bridge/src/mock.rs

@@ -10,7 +10,6 @@ use frame_support::{
 	PalletId,
 };
 use frame_system::{self as system, EnsureSigned};
-use funty::Fundamental;
 use polkadot_parachain::primitives::Sibling;
 use sp_core::hash::H256;
 use sp_runtime::{
@@ -348,8 +347,14 @@ pub struct DestinationDataParser;
 impl ExtractDestinationData for DestinationDataParser {
 	fn extract_dest(dest: &MultiLocation) -> Option<(Vec<u8>, DomainID)> {
 		match (dest.parents, &dest.interior) {
-			(0, Junctions::X2(GeneralKey(recipient), GeneralIndex(dest_domain_id))) =>
-				Some((recipient.to_vec(), dest_domain_id.as_u8())),
+			(0, Junctions::X2(GeneralKey(recipient), GeneralKey(dest_domain_id))) => {
+				let d = u8::default();
+				let domain_id = dest_domain_id.as_slice().first().unwrap_or(&d);
+				if *domain_id == d {
+					return None
+				}
+				Some((recipient.to_vec(), *domain_id))
+			},
 			_ => None,
 		}
 	}

substrate-node/runtime/src/lib.rs

@@ -10,7 +10,6 @@
 include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));
 
 use frame_support::{pallet_prelude::*, PalletId};
-use funty::Fundamental;
 use pallet_grandpa::{
 	fg_primitives, AuthorityId as GrandpaId, AuthorityList as GrandpaAuthorityList,
 };
@@ -415,7 +414,7 @@ parameter_types! {
 	// NativeResourceId is the resourceID that mapping with the current parachain native asset
 	pub NativeResourceId: ResourceId = hex_literal::hex!("0000000000000000000000000000000000000000000000000000000000000001");
 	// UsdcResourceId is the resourceID that mapping with the foreign asset USDC
-	pub UsdcResourceId: ResourceId = hex_literal::hex!("0000000000000000000000000000000000000000000000000000000000000000");
+	pub UsdcResourceId: ResourceId = hex_literal::hex!("0000000000000000000000000000000000000000000000000000000000000300");
 	// UsdcAssetId is the substrate assetID of USDC
 	pub UsdcAssetId: AssetId = 2000;
 	// ResourcePairs is where all supported assets and their associated resourceID are binding
@@ -568,8 +567,14 @@ pub struct DestinationDataParser;
 impl ExtractDestinationData for DestinationDataParser {
 	fn extract_dest(dest: &MultiLocation) -> Option<(Vec<u8>, DomainID)> {
 		match (dest.parents, &dest.interior) {
-			(0, Junctions::X2(GeneralKey(recipient), GeneralIndex(dest_domain_id))) =>
-				Some((recipient.to_vec(), dest_domain_id.as_u8())),
+			(0, Junctions::X2(GeneralKey(recipient), GeneralKey(dest_domain_id))) => {
+				let d = u8::default();
+				let domain_id = dest_domain_id.as_slice().first().unwrap_or(&d);
+				if *domain_id == d {
+					return None
+				}
+				Some((recipient.to_vec(), *domain_id))
+			},
 			_ => None,
 		}
 	}