fix(*): fix hybrid-vm and port for different AccountId

frame/hybrid-vm-port/Cargo.toml

@@ -32,6 +32,7 @@ pallet-evm = { workspace = true }
 ink_env = { workspace = true }
 #local
 pallet-hybrid-vm = { path = "../hybrid-vm" }
+hp-system = { path = "../../primitives/system" }
 
 [dev-dependencies]
 hex = { workspace = true }

frame/hybrid-vm-port/src/lib.rs

@@ -63,7 +63,7 @@ use sp_runtime::{
 	transaction_validity::{
 		InvalidTransaction, TransactionValidity, TransactionValidityError, ValidTransactionBuilder,
 	},
-	AccountId32, DispatchError, RuntimeDebug, SaturatedConversion,
+	DispatchError, RuntimeDebug, SaturatedConversion,
 };
 // Frontier
 use fp_consensus::{PostLog, PreLog, FRONTIER_ENGINE_ID};
@@ -75,6 +75,7 @@ use fp_evm::{
 };
 pub use fp_rpc::TransactionStatus;
 use fp_storage::{EthereumStorageSchema, PALLET_ETHEREUM_SCHEMA};
+use hp_system::U256BalanceMapping;
 use ink_env::call::{ExecutionInput, Selector};
 use pallet_contracts::chain_extension::SysConfig;
 use pallet_contracts::{CollectEvents, DebugInfo, Determinism};
@@ -680,7 +681,8 @@ impl<T: Config> Pallet<T> {
 					);
 
 				let origin = <T as pallet_evm::Config>::AddressMapping::into_account_id(source);
-				let balance_result = <T as pallet_hybrid_vm::Config>::U256BalanceMapping::u256_to_balance(value);
+				let balance_result =
+					<T as pallet_hybrid_vm::Config>::U256BalanceMapping::u256_to_balance(value);
 				let balance = match balance_result {
 					Some(t) => t,
 					None => {

frame/hybrid-vm/Cargo.toml

@@ -36,6 +36,8 @@ pallet-contracts = { workspace = true, default-features = false}
 pallet-evm = { workspace = true, default-features = false}
 fp-evm = { workspace = true, default-features = false}
 
+# local
+hp-system = { version = "0.1.0", path = "../../primitives/system" }
 
 [dev-dependencies]
 assert_matches = { workspace = true }
@@ -54,7 +56,6 @@ pallet-evm-precompile-simple = { workspace = true, default-features = false}
 ink_env = { workspace = true }
 
 pallet-evm-precompile-call-hybrid-vm = { version = "0.1.0", path = "../evm-precompile/call-hybrid-vm" }
-hp-system = { version = "0.1.0", path = "../../primitives/system" }
 
 [features]
 default = ["std"]

frame/hybrid-vm/src/interoperate/mod.rs

@@ -36,7 +36,6 @@ use sp_runtime::DispatchError;
 
 use serde::{Deserialize, Serialize};
 
-use byte_slice_cast::AsByteSlice;
 use fp_evm::ExecutionInfoV2;
 use frame_support::sp_runtime::AccountId32;
 use pallet_evm::Runner;
@@ -141,7 +140,7 @@ impl<C: Config> InterCall<C> {
 		}
 
 		let caller = env.ext().caller();
-		let source = T::AccountIdMapping::into_address(caller.account_id()?);
+		let source = C::AccountIdMapping::into_address(caller.account_id()?.clone());
 
 		let mut envbuf = env.buf_in_buf_out();
 		let input0: Vec<u8> = envbuf.read_as_unbounded(envbuf.in_len())?;

frame/hybrid-vm/src/lib.rs

@@ -23,14 +23,15 @@ mod tests;
 mod interoperate;
 
 use self::interoperate::InterCall;
-use byte_slice_cast::*;
 use ethereum::TransactionV2 as Transaction;
 use frame_support::traits::{tokens::fungible::Inspect, Currency, Get};
+use frame_support::RuntimeDebugNoBound;
 use pallet_contracts::chain_extension::{Environment, Ext, InitState, RetVal};
 use sp_core::{H160, U256};
 use sp_runtime::{AccountId32, DispatchError};
 use sp_std::vec::Vec;
-use hp_system::{AccountIdMapping, AccountId32Mapping, U256BalanceMapping};
+//use sp_std::fmt::Debug;
+use hp_system::{AccountId32Mapping, AccountIdMapping, U256BalanceMapping};
 
 pub use self::pallet::*;
 
@@ -42,7 +43,8 @@ pub mod pallet {
 
 	type Result<T> = sp_std::result::Result<T, DispatchError>;
 
-	#[derive(Encode, Decode, MaxEncodedLen, TypeInfo, Clone, Debug, PartialEq)]
+	#[derive(Encode, Decode, MaxEncodedLen, TypeInfo, Clone, RuntimeDebugNoBound, PartialEq)]
+	#[scale_info(skip_type_params(T))]
 	pub enum UnifiedAddress<T: Config> {
 		WasmVM(T::AccountId),
 	}
@@ -53,11 +55,11 @@ pub mod pallet {
 
 		// Currency type for balance storage.
 		type Currency: Currency<Self::AccountId> + Inspect<Self::AccountId>;
-		
-		type U256BalanceMapping: U256BalanceMapping<Self>;
-		
+
+		type U256BalanceMapping: U256BalanceMapping<Balance = <<Self as pallet_contracts::Config>::Currency as Inspect<Self::AccountId>>::Balance>;
+
 		type AccountIdMapping: AccountIdMapping<Self>;
-		
+
 		type AccountId32Mapping: AccountId32Mapping<Self>;
 
 		#[pallet::constant]
@@ -80,15 +82,15 @@ pub mod pallet {
 	#[pallet::storage]
 	#[pallet::getter(fn hvm_contracts)]
 	pub type HvmContracts<T: Config> =
-		StorageMap<_, Twox64Concat, H160, UnifiedAddress, OptionQuery>;
+		StorageMap<_, Twox64Concat, H160, UnifiedAddress<T>, OptionQuery>;
 
 	#[pallet::event]
 	#[pallet::generate_deposit(pub(super) fn deposit_event)]
 	pub enum Event<T: Config> {
 		EVMExecuted(H160),
 		WasmVMExecuted(T::AccountId),
 		HybridVMCalled(T::AccountId),
-		RegistContract(H160, UnifiedAddress, T::AccountId),
+		RegistContract(H160, UnifiedAddress<T>, T::AccountId),
 	}
 
 	#[pallet::error]
@@ -123,14 +125,13 @@ pub mod pallet {
 		#[pallet::weight(Weight::from_parts(10_000, 0) + T::DbWeight::get().writes(1))]
 		pub fn regist_contract(
 			origin: OriginFor<T>,
-			unified_address: UnifiedAddress,
+			unified_address: UnifiedAddress<T>,
 		) -> DispatchResultWithPostInfo {
 			let who = ensure_signed(origin)?;
 
 			match unified_address.clone() {
 				UnifiedAddress::<T>::WasmVM(account) => {
-					let value =
-						pallet_contracts::Pallet::<T>::get_storage(account.clone(), vec![]);
+					let value = pallet_contracts::Pallet::<T>::get_storage(account.clone(), vec![]);
 					match value {
 						Err(t) => {
 							if t == pallet_contracts::ContractAccessError::DoesntExist {
@@ -140,7 +141,7 @@ pub mod pallet {
 						_ => {},
 					}
 					let address = T::AccountIdMapping::into_address(account);
-	
+
 					HvmContracts::<T>::insert(address, unified_address.clone());
 
 					Self::deposit_event(Event::RegistContract(address, unified_address, who));

primitives/system/src/lib.rs

@@ -15,11 +15,11 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
-use frame_system::pallet_prelude::*;
 use frame_support::traits::tokens::Balance;
-use sp_std::vec::Vec;
+use frame_system::pallet_prelude::*;
 use sp_core::{H160, U256};
 use sp_runtime::AccountId32;
+use sp_std::vec::Vec;
 
 pub trait EvmHybridVMExtension<C: frame_system::Config> {
 	fn call_hybrid_vm(
@@ -28,7 +28,7 @@ pub trait EvmHybridVMExtension<C: frame_system::Config> {
 		target_gas: Option<u64>,
 	) -> Result<(Vec<u8>, u64), sp_runtime::DispatchError>;
 }
-	
+
 pub trait U256BalanceMapping {
 	type Balance: Balance;
 	fn u256_to_balance(value: U256) -> Option<Self::Balance>;
@@ -41,4 +41,4 @@ pub trait AccountIdMapping<C: frame_system::Config> {
 pub trait AccountId32Mapping<C: frame_system::Config> {
 	fn id32_to_id(id32: AccountId32) -> C::AccountId;
 	fn id_to_id32(account_id: C::AccountId) -> AccountId32;
-}
+}