Use u16 to bypass the polkadot-js/apps#8591

pallet/deposit/src/lib.rs

@@ -32,10 +32,7 @@ pub use weights::WeightInfo;
 // core
 use core::{
 	cmp::Ordering::{Equal, Greater, Less},
-	ops::{
-		ControlFlow::{Break, Continue},
-		Deref,
-	},
+	ops::ControlFlow::{Break, Continue},
 };
 // crates.io
 use codec::FullCodec;
@@ -73,20 +70,7 @@ pub trait Minting {
 /// It's only used for distinguishing the deposits under a specific account.
 // https://github.com/polkadot-js/apps/issues/8591
 // pub type DepositId = u8;
-#[derive(Clone, Copy, PartialEq, Eq, Encode, Decode, MaxEncodedLen, TypeInfo, RuntimeDebug)]
-pub struct DepositId(pub u8);
-impl From<u8> for DepositId {
-	fn from(id: u8) -> Self {
-		Self(id)
-	}
-}
-impl Deref for DepositId {
-	type Target = u8;
-
-	fn deref(&self) -> &Self::Target {
-		&self.0
-	}
-}
+pub type DepositId = u16;
 
 /// Deposit.
 #[derive(PartialEq, Eq, Encode, Decode, MaxEncodedLen, TypeInfo, RuntimeDebug)]
@@ -210,7 +194,7 @@ pub mod pallet {
 				ds.try_insert(
 					id as _,
 					Deposit {
-						id: DepositId(id),
+						id,
 						value: amount,
 						expired_time: T::UnixTime::now().as_millis()
 							+ MILLISECS_PER_MONTH * months as Moment,

precompile/staking/Cargo.toml

@@ -32,6 +32,9 @@ sp-std        = { default-features = false, git = "https://github.com/paritytech
 codec      = { package = "parity-scale-codec", version = "3.2" }
 scale-info = { version = "2.3", features = ["derive"] }
 
+# darwinia
+darwinia-deposit = { path = "../../pallet/deposit" }
+
 # moonbeam
 precompile-utils = { git = "https://github.com/darwinia-network/moonbeam.git", branch = "polkadot-v0.9.30", features = ["testing"] }
 

precompile/staking/src/lib.rs

@@ -50,14 +50,14 @@ where
 	<Runtime::RuntimeCall as Dispatchable>::RuntimeOrigin: From<Option<Runtime::AccountId>>,
 	<Runtime as frame_system::Config>::AccountId: From<H160>,
 	<<Runtime as frame_system::Config>::RuntimeCall as Dispatchable>::RuntimeOrigin: OriginTrait,
-	<<Runtime as darwinia_staking::Config>::Deposit as Stake>::Item: From<u8>,
+	<<Runtime as darwinia_staking::Config>::Deposit as Stake>::Item: From<u16>,
 {
 	#[precompile::public("stake(uint256,uint256,uint8[])")]
 	fn stake(
 		handle: &mut impl PrecompileHandle,
 		ring_amount: U256,
 		kton_amount: U256,
-		deposits: Vec<u8>,
+		deposits: Vec<u16>,
 	) -> EvmResult<bool> {
 		let origin = handle.context().caller.into();
 		let deposits = deposits.into_iter().map(|i| i.into()).collect();
@@ -79,7 +79,7 @@ where
 		handle: &mut impl PrecompileHandle,
 		ring_amount: U256,
 		kton_amount: U256,
-		deposits: Vec<u8>,
+		deposits: Vec<u16>,
 	) -> EvmResult<bool> {
 		let origin = handle.context().caller.into();
 		let deposits = deposits.into_iter().map(|i| i.into()).collect();