Support hydradx user call slpx (#1141)

bifrost-io · Jan 9, 2024 · a97916a · a97916a
1 parent e1f6ea0
commit a97916a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/pallets/slpx/src/lib.rs b/pallets/slpx/src/lib.rs
@@ -854,11 +854,17 @@ impl<T: Config> Pallet<T> {
 				SupportChain::Interlay
 			},
 		};
-		let whitelist_account_ids = WhitelistAccountId::<T>::get(&support_chain);
-		ensure!(
-			whitelist_account_ids.contains(&evm_contract_account_id),
-			Error::<T>::AccountIdNotInWhitelist
-		);
+
+		match target_chain {
+			TargetChain::Hydradx(_) => {},
+			_ => {
+				let whitelist_account_ids = WhitelistAccountId::<T>::get(&support_chain);
+				ensure!(
+					whitelist_account_ids.contains(&evm_contract_account_id),
+					Error::<T>::AccountIdNotInWhitelist
+				);
+			},
+		};
 		Ok((evm_contract_account_id, evm_caller_account_id))
 	}
 

diff --git a/pallets/slpx/src/tests.rs b/pallets/slpx/src/tests.rs
@@ -88,19 +88,14 @@ fn test_whitelist_work() {
 		assert_eq!(evm_contract_account_id, BOB);
 		assert_eq!(evm_caller_account_id, Slpx::h160_to_account_id(evm_caller));
 
-		// Hydradx
-		assert_ok!(Slpx::add_whitelist(RuntimeOrigin::root(), SupportChain::Hydradx, ALICE));
+		// Hydradx No whitelist checking
 		let target_chain = TargetChain::Hydradx(ALICE);
 		let (evm_contract_account_id, evm_caller_account_id) = Slpx::ensure_singer_on_whitelist(
 			RuntimeOrigin::signed(ALICE),
 			evm_caller,
 			&target_chain,
 		)
 		.unwrap();
-		assert_noop!(
-			Slpx::ensure_singer_on_whitelist(RuntimeOrigin::signed(BOB), evm_caller, &target_chain),
-			Error::<Test>::AccountIdNotInWhitelist
-		);
 		assert_eq!(evm_contract_account_id, ALICE);
 		assert_eq!(evm_caller_account_id, ALICE);
 	});