Move account provider interface into fp-em

humanode-network · Jun 16, 2023 · 9c1e007 · 9c1e007
1 parent c2efe7c
commit 9c1e007
Show file tree

Hide file tree

Showing 9 changed files with 40 additions and 26 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/frame/ethereum/src/mock.rs b/frame/ethereum/src/mock.rs
@@ -152,7 +152,7 @@ impl AddressMapping<AccountId32> for HashedAddressMapping {
 }
 
 impl pallet_evm::Config for Test {
-	type AccountProvider = pallet_evm::NativeSystemAccountProvider<Self>;
+	type AccountProvider = fp_evm::NativeSystemAccountProvider<Self>;
 	type FeeCalculator = FixedGasPrice;
 	type GasWeightMapping = pallet_evm::FixedGasWeightMapping<Self>;
 	type WeightPerGas = WeightPerGas;

diff --git a/frame/evm/precompile/dispatch/src/mock.rs b/frame/evm/precompile/dispatch/src/mock.rs
@@ -139,15 +139,17 @@ parameter_types! {
 	pub WeightPerGas: Weight = Weight::from_ref_time(20_000);
 }
 impl pallet_evm::Config for Test {
-	type AccountProvider = pallet_evm::NativeSystemAccountProvider<Self>;
+	type AccountProvider = fp_evm::NativeSystemAccountProvider<Self>;
 	type FeeCalculator = FixedGasPrice;
 	type GasWeightMapping = pallet_evm::FixedGasWeightMapping<Self>;
 	type WeightPerGas = WeightPerGas;
 
 	type BlockHashMapping = pallet_evm::SubstrateBlockHashMapping<Self>;
-	type CallOrigin = EnsureAddressRoot<<Self::AccountProvider as pallet_evm::AccountProvider>::AccountId>;
+	type CallOrigin =
+		EnsureAddressRoot<<Self::AccountProvider as pallet_evm::AccountProvider>::AccountId>;
 
-	type WithdrawOrigin = EnsureAddressNever<<Self::AccountProvider as pallet_evm::AccountProvider>::AccountId>;
+	type WithdrawOrigin =
+		EnsureAddressNever<<Self::AccountProvider as pallet_evm::AccountProvider>::AccountId>;
 	type AddressMapping = IdentityAddressMapping;
 	type Currency = Balances;
 

diff --git a/frame/evm/src/lib.rs b/frame/evm/src/lib.rs
@@ -64,9 +64,6 @@ pub mod runner;
 #[cfg(test)]
 mod tests;
 
-mod account_provider;
-pub use account_provider::{AccountProvider, NativeSystemAccountProvider};
-
 use frame_support::{
 	dispatch::{DispatchResultWithPostInfo, Pays, PostDispatchInfo},
 	traits::{
@@ -79,7 +76,7 @@ use frame_system::RawOrigin;
 use impl_trait_for_tuples::impl_for_tuples;
 use sp_core::{Hasher, H160, H256, U256};
 use sp_runtime::{
-	traits::{BadOrigin, Saturating, UniqueSaturatedInto, AtLeast32Bit, Zero},
+	traits::{BadOrigin, Saturating, UniqueSaturatedInto, Zero},
 	AccountId32, DispatchErrorWithPostInfo,
 };
 use sp_std::{cmp::min, vec::Vec};
@@ -90,9 +87,9 @@ pub use evm::{
 #[cfg(feature = "std")]
 use fp_evm::GenesisAccount;
 pub use fp_evm::{
-	Account, CallInfo, CreateInfo, ExecutionInfo, FeeCalculator, InvalidEvmTransactionError,
-	LinearCostPrecompile, Log, Precompile, PrecompileFailure, PrecompileHandle, PrecompileOutput,
-	PrecompileResult, PrecompileSet, Vicinity,
+	Account, AccountProvider, CallInfo, CreateInfo, ExecutionInfo, FeeCalculator,
+	InvalidEvmTransactionError, LinearCostPrecompile, Log, Precompile, PrecompileFailure,
+	PrecompileHandle, PrecompileOutput, PrecompileResult, PrecompileSet, Vicinity,
 };
 
 pub use self::{
@@ -131,12 +128,16 @@ pub mod pallet {
 		/// Allow the origin to call on behalf of given address.
 		type CallOrigin: EnsureAddressOrigin<Self::RuntimeOrigin>;
 		/// Allow the origin to withdraw on behalf of given address.
-		type WithdrawOrigin: EnsureAddressOrigin<Self::RuntimeOrigin, Success = <Self::AccountProvider as AccountProvider>::AccountId>;
+		type WithdrawOrigin: EnsureAddressOrigin<
+			Self::RuntimeOrigin,
+			Success = <Self::AccountProvider as AccountProvider>::AccountId,
+		>;
 
 		/// Mapping from address to account id.
 		type AddressMapping: AddressMapping<<Self::AccountProvider as AccountProvider>::AccountId>;
 		/// Currency type for withdraw and balance storage.
-		type Currency: Currency<<Self::AccountProvider as AccountProvider>::AccountId> + Inspect<<Self::AccountProvider as AccountProvider>::AccountId>;
+		type Currency: Currency<<Self::AccountProvider as AccountProvider>::AccountId>
+			+ Inspect<<Self::AccountProvider as AccountProvider>::AccountId>;
 
 		/// The overarching event type.
 		type RuntimeEvent: From<Event<Self>> + IsType<<Self as frame_system::Config>::RuntimeEvent>;
@@ -517,12 +518,14 @@ pub mod pallet {
 }
 
 /// Type alias for currency balance.
-pub type BalanceOf<T> =
-	<<T as Config>::Currency as Currency<<<T as Config>::AccountProvider as AccountProvider>::AccountId>>::Balance;
+pub type BalanceOf<T> = <<T as Config>::Currency as Currency<
+	<<T as Config>::AccountProvider as AccountProvider>::AccountId,
+>>::Balance;
 
 /// Type alias for negative imbalance during fees
-type NegativeImbalanceOf<C, T> =
-	<C as Currency<<<T as Config>::AccountProvider as AccountProvider>::AccountId>>::NegativeImbalance;
+type NegativeImbalanceOf<C, T> = <C as Currency<
+	<<T as Config>::AccountProvider as AccountProvider>::AccountId,
+>>::NegativeImbalance;
 
 pub trait EnsureAddressOrigin<OuterOrigin> {
 	/// Success return type.
@@ -788,7 +791,9 @@ where
 		Opposite = C::PositiveImbalance,
 	>,
 	OU: OnUnbalanced<NegativeImbalanceOf<C, T>>,
-	U256: UniqueSaturatedInto<<C as Currency<<<T as Config>::AccountProvider as AccountProvider>::AccountId>>::Balance>,
+	U256: UniqueSaturatedInto<
+		<C as Currency<<<T as Config>::AccountProvider as AccountProvider>::AccountId>>::Balance,
+	>,
 {
 	// Kept type as Option to satisfy bound of Default
 	type LiquidityInfo = Option<NegativeImbalanceOf<C, T>>;

diff --git a/frame/evm/src/mock.rs b/frame/evm/src/mock.rs
@@ -132,15 +132,17 @@ parameter_types! {
 	pub MockPrecompiles: MockPrecompileSet = MockPrecompileSet;
 }
 impl crate::Config for Test {
-	type AccountProvider = crate::NativeSystemAccountProvider<Self>;
+	type AccountProvider = fp_evm::NativeSystemAccountProvider<Self>;
 	type FeeCalculator = FixedGasPrice;
 	type GasWeightMapping = crate::FixedGasWeightMapping<Self>;
 	type WeightPerGas = WeightPerGas;
 
 	type BlockHashMapping = crate::SubstrateBlockHashMapping<Self>;
-	type CallOrigin = EnsureAddressRoot<<Self::AccountProvider as crate::AccountProvider>::AccountId>;
+	type CallOrigin =
+		EnsureAddressRoot<<Self::AccountProvider as crate::AccountProvider>::AccountId>;
 
-	type WithdrawOrigin = EnsureAddressNever<<Self::AccountProvider as crate::AccountProvider>::AccountId>;
+	type WithdrawOrigin =
+		EnsureAddressNever<<Self::AccountProvider as crate::AccountProvider>::AccountId>;
 	type AddressMapping = IdentityAddressMapping;
 	type Currency = Balances;
 

diff --git a/primitives/evm/Cargo.toml b/primitives/evm/Cargo.toml
@@ -16,6 +16,7 @@ scale-codec = { package = "parity-scale-codec", workspace = true }
 serde = { workspace = true, optional = true }
 # Substrate
 frame-support = { workspace = true }
+frame-system = { workspace = true }
 sp-core = { workspace = true }
 sp-runtime = { workspace = true }
 sp-std = { workspace = true }
@@ -29,6 +30,7 @@ std = [
 	"scale-codec/std",
 	# Substrate
 	"frame-support/std",
+	"frame-system/std",
 	"sp-core/std",
 	"sp-runtime/std",
 	"sp-std/std",

diff --git a/frame/evm/src/account_provider.rs → primitives/evm/src/account_provider.rs b/frame/evm/src/account_provider.rs → primitives/evm/src/account_provider.rs
@@ -1,6 +1,6 @@
 //! Custom account provider logic.
 
-use super::*;
+use sp_runtime::traits::AtLeast32Bit;
 
 /// The account provider interface abstraction layer.
 ///
@@ -43,9 +43,9 @@ pub trait AccountProvider {
 /// Native system account provider that `frame_system` provides.
 pub struct NativeSystemAccountProvider<T>(sp_std::marker::PhantomData<T>);
 
-impl<T: Config> AccountProvider for NativeSystemAccountProvider<T> {
-	type AccountId = <T as frame_system::Config>::AccountId;
-	type Index = <T as frame_system::Config>::Index;
+impl<T: frame_system::Config> AccountProvider for NativeSystemAccountProvider<T> {
+	type AccountId = T::AccountId;
+	type Index = T::Index;
 
 	fn account_nonce(who: &Self::AccountId) -> Self::Index {
 		frame_system::Pallet::<T>::account_nonce(&who)

diff --git a/primitives/evm/src/lib.rs b/primitives/evm/src/lib.rs
@@ -17,6 +17,7 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
+mod account_provider;
 mod precompile;
 mod validation;
 
@@ -34,6 +35,7 @@ pub use evm::{
 };
 
 pub use self::{
+	account_provider::{AccountProvider, NativeSystemAccountProvider},
 	precompile::{
 		Context, ExitError, ExitRevert, ExitSucceed, LinearCostPrecompile, Precompile,
 		PrecompileFailure, PrecompileHandle, PrecompileOutput, PrecompileResult, PrecompileSet,

diff --git a/template/runtime/src/lib.rs b/template/runtime/src/lib.rs
@@ -326,7 +326,7 @@ parameter_types! {
 }
 
 impl pallet_evm::Config for Runtime {
-	type AccountProvider = pallet_evm::NativeSystemAccountProvider<Self>;
+	type AccountProvider = fp_evm::NativeSystemAccountProvider<Self>;
 	type FeeCalculator = BaseFee;
 	type GasWeightMapping = pallet_evm::FixedGasWeightMapping<Self>;
 	type WeightPerGas = WeightPerGas;