fp-account

Cargo.toml

@@ -20,6 +20,7 @@ members = [
 	"client/db",
 	"client/storage",
 	"client/mapping-sync",
+	"primitives/account",
 	"primitives/consensus",
 	"primitives/dynamic-fee",
 	"primitives/evm",
@@ -41,15 +42,18 @@ environmental = { version = "1.1.3", default-features = false }
 ethereum = { version = "0.14.0", default-features = false }
 ethereum-types = { version = "0.14.1", default-features = false }
 evm = { version = "0.37.0", default-features = false }
+impl-serde = { version = "0.3.1", default-features = false }
 jsonrpsee = "0.16.2"
 kvdb-rocksdb = "0.17.0"
-libsecp256k1 = "0.7.1"
+libsecp256k1 = { version = "0.7.1", default-features = false }
+log = { version = "0.4.17", default-features = false }
 parity-db = "0.4.2"
 rlp = { version = "0.5", default-features = false }
 scale-codec = { package = "parity-scale-codec", version = "3.2.1", default-features = false, features = ["derive"] }
 scale-info = { version = "2.3.1", default-features = false, features = ["derive"] }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
+sha3 = { version = "0.10", default-features = false }
 # Substrate Client
 sc-basic-authorship = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", branch = "master" }
 sc-block-builder = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", branch = "master" }
@@ -124,6 +128,7 @@ fc-rpc = { version = "2.0.0-dev", path = "client/rpc" }
 fc-rpc-core = { version = "1.1.0-dev", path = "client/rpc-core" }
 fc-storage = { version = "1.0.0-dev", path = "client/storage" }
 # Frontier Primitive
+fp-account = { version = "1.0.0-dev", path = "primitives/account", default-features = false }
 fp-consensus = { version = "2.0.0-dev", path = "primitives/consensus", default-features = false }
 fp-dynamic-fee = { version = "1.0.0", path = "primitives/dynamic-fee", default-features = false }
 fp-ethereum = { version = "1.0.0-dev", path = "primitives/ethereum", default-features = false }

frame/evm/Cargo.toml

@@ -16,7 +16,7 @@ environmental = { workspace = true, optional = true }
 evm = { workspace = true, features = ["with-codec"] }
 hex = { version = "0.4.3", default-features = false, features = ["alloc"] }
 impl-trait-for-tuples = "0.2.2"
-log = { version = "0.4.17", default-features = false }
+log = { workspace = true }
 rlp = { workspace = true }
 scale-codec = { package = "parity-scale-codec", workspace = true }
 scale-info = { workspace = true }
@@ -30,6 +30,7 @@ sp-io = { workspace = true }
 sp-runtime = { workspace = true }
 sp-std = { workspace = true }
 # Frontier
+fp-account = { workspace = true }
 fp-evm = { workspace = true }
 
 [dev-dependencies]
@@ -59,6 +60,7 @@ std = [
 	"sp-std/std",
 	# Frontier
 	"fp-evm/std",
+	"fp-account/std",
 ]
 runtime-benchmarks = [
 	"frame-benchmarking/runtime-benchmarks",

frame/evm/src/lib.rs

@@ -84,6 +84,7 @@ use sp_std::{cmp::min, vec::Vec};
 pub use evm::{
 	Config as EvmConfig, Context, ExitError, ExitFatal, ExitReason, ExitRevert, ExitSucceed,
 };
+use fp_account::AccountId20;
 #[cfg(feature = "std")]
 use fp_evm::GenesisAccount;
 pub use fp_evm::{
@@ -603,16 +604,34 @@ where
 	}
 }
 
+/// Ensure that the address is AccountId20.
+pub struct EnsureAccountId20;
+
+impl<OuterOrigin> EnsureAddressOrigin<OuterOrigin> for EnsureAccountId20
+where
+	OuterOrigin: Into<Result<RawOrigin<AccountId20>, OuterOrigin>> + From<RawOrigin<AccountId20>>,
+{
+	type Success = AccountId20;
+
+	fn try_address_origin(address: &H160, origin: OuterOrigin) -> Result<AccountId20, OuterOrigin> {
+		let acc: AccountId20 = AccountId20::from(*address);
+		origin.into().and_then(|o| match o {
+			RawOrigin::Signed(who) if who == acc => Ok(who),
+			r => Err(OuterOrigin::from(r)),
+		})
+	}
+}
+
 pub trait AddressMapping<A> {
 	fn into_account_id(address: H160) -> A;
 }
 
 /// Identity address mapping.
 pub struct IdentityAddressMapping;
 
-impl AddressMapping<H160> for IdentityAddressMapping {
-	fn into_account_id(address: H160) -> H160 {
-		address
+impl<T: From<H160>> AddressMapping<T> for IdentityAddressMapping {
+	fn into_account_id(address: H160) -> T {
+		address.into()
 	}
 }
 

frame/evm/src/tests.rs

@@ -414,8 +414,10 @@ fn handle_sufficient_reference() {
 	new_test_ext().execute_with(|| {
 		let addr = H160::from_str("1230000000000000000000000000000000000001").unwrap();
 		let addr_2 = H160::from_str("1234000000000000000000000000000000000001").unwrap();
-		let substrate_addr = <Test as Config>::AddressMapping::into_account_id(addr);
-		let substrate_addr_2 = <Test as Config>::AddressMapping::into_account_id(addr_2);
+		let substrate_addr: <Test as frame_system::Config>::AccountId =
+			<Test as Config>::AddressMapping::into_account_id(addr);
+		let substrate_addr_2: <Test as frame_system::Config>::AccountId =
+			<Test as Config>::AddressMapping::into_account_id(addr_2);
 
 		// Sufficients should increase when creating EVM accounts.
 		let _ = <crate::AccountCodes<Test>>::insert(addr, &vec![0]);

frame/hotfix-sufficients/src/tests.rs

@@ -62,8 +62,10 @@ fn test_hotfix_inc_account_sufficients_increments_if_nonce_nonzero() {
 		let addr_2 = "1234000000000000000000000000000000000001"
 			.parse::<H160>()
 			.unwrap();
-		let substrate_addr_1 = <Test as Config>::AddressMapping::into_account_id(addr_1);
-		let substrate_addr_2 = <Test as Config>::AddressMapping::into_account_id(addr_2);
+		let substrate_addr_1: <Test as frame_system::Config>::AccountId =
+			<Test as Config>::AddressMapping::into_account_id(addr_1);
+		let substrate_addr_2: <Test as frame_system::Config>::AccountId =
+			<Test as Config>::AddressMapping::into_account_id(addr_2);
 
 		frame_system::Pallet::<Test>::inc_account_nonce(&substrate_addr_1);
 
@@ -95,7 +97,8 @@ fn test_hotfix_inc_account_sufficients_increments_with_saturation_if_nonce_nonze
 		let addr = "1230000000000000000000000000000000000001"
 			.parse::<H160>()
 			.unwrap();
-		let substrate_addr = <Test as Config>::AddressMapping::into_account_id(addr);
+		let substrate_addr: <Test as frame_system::Config>::AccountId =
+			<Test as Config>::AddressMapping::into_account_id(addr);
 
 		frame_system::Account::<Test>::mutate(substrate_addr, |x| {
 			x.nonce = 1;
@@ -125,7 +128,8 @@ fn test_hotfix_inc_account_sufficients_does_not_increment_if_both_nonce_and_refs
 		let addr = "1230000000000000000000000000000000000001"
 			.parse::<H160>()
 			.unwrap();
-		let substrate_addr = <Test as Config>::AddressMapping::into_account_id(addr);
+		let substrate_addr: <Test as frame_system::Config>::AccountId =
+			<Test as Config>::AddressMapping::into_account_id(addr);
 
 		frame_system::Account::<Test>::mutate(substrate_addr, |x| {
 			x.nonce = 1;

primitives/account/Cargo.toml

@@ -0,0 +1,38 @@
+[package]
+name = "fp-account"
+version = "1.0.0-dev"
+license = "Apache-2.0"
+description = "Primitives for Frontier AccountId20."
+authors = { workspace = true }
+edition = { workspace = true }
+repository = { workspace = true }
+
+[dependencies]
+hex = { version = "0.4.3", default-features = false }
+impl-serde = { workspace = true }
+libsecp256k1 = { workspace = true, default-features = false }
+log = { workspace = true }
+scale-codec = { package = "parity-scale-codec", workspace = true }
+scale-info = { workspace = true }
+serde = { workspace = true }
+sha3 = { workspace = true }
+sp-core = { workspace = true }
+sp-io = { workspace = true }
+sp-runtime = { workspace = true }
+
+[dev-dependencies]
+
+[features]
+default = ["std"]
+std = [
+	"impl-serde/std",
+	"hex/std",
+	"libsecp256k1/std",
+	"log/std",
+	"sha3/std",
+	"serde/std",
+	# Substrate
+	"sp-io/std",
+	"sp-core/std",
+	"sp-runtime/std",
+]