add frame-system-precompiles

node/runtime/Cargo.toml

@@ -101,6 +101,7 @@ pallet-evm-precompile-dispatch = { default-features = false, git = 'https://gith
 pallet-evm-precompile-sha3fips = { default-features = false, git = 'https://github.com/nftt-studio/frontier.git', branch = "moonbeam-polkadot-v0.9.13"}
 pallet-evm-precompile-balances-erc20 = { default-features = false, git = 'https://github.com/nftt-studio/moonbeam.git', branch = "master"}
 
+frame-system-precompiles = { default-features = false, path = "../../precompiles/frame-system" }
 pallet-template-precompiles = { default-features = false, path = "../../precompiles/pallet-template" }
 pallet-nop-precompiles = { default-features = false, path = "../../precompiles/pallet-nop" }
 withdraw-balance-precompiles = { default-features = false, path = "../../precompiles/withdraw-balance" }
@@ -207,6 +208,7 @@ std = [
 	"nftmart-rpc-runtime-api/std",
 	"pallet-deposit/std",
 	"num_enum/std",
+	"frame-system-precompiles/std",
 	"pallet-template/std",
 	"pallet-template-precompiles/std",
 	"pallet-nop/std",

node/runtime/src/precompiles.rs

@@ -25,6 +25,7 @@ use pallet_evm_precompile_sha3fips::Sha3FIPS256;
 use pallet_evm_precompile_simple::{ECRecover, ECRecoverPublicKey, Identity, Ripemd160, Sha256};
 use pallet_template_precompiles::PalletTemplatePrecompile;
 use pallet_nop_precompiles::PalletNopPrecompile;
+use frame_system_precompiles::FrameSystemWrapper;
 use sp_core::{H160, H256};
 use sp_std::marker::PhantomData;
 use withdraw_balance_precompiles::WithdrawBalancePrecompile;
@@ -51,7 +52,7 @@ where
 	/// Return all addresses that contain precompiles. This can be used to populate dummy code
 	/// under the precompile.
 	pub fn used_addresses() -> sp_std::vec::Vec<H160> {
-		sp_std::vec![1, 2, 3, 4, 5, 6, 7, 8, 9, 1024, 1025, 1026, 2048, 2049, 2050, 2051, 2052, 2053, 2054]
+		sp_std::vec![1, 2, 3, 4, 5, 6, 7, 8, 9, 1024, 1025, 1026, 2048, 2049, 2050, 2051, 2052, 2053, 2054, 2057]
 			.into_iter()
 			.map(hash)
 			.collect()
@@ -71,6 +72,7 @@ where
 	Dispatch<R>: Precompile,
 	PalletTemplatePrecompile<R>: Precompile,
 	PalletNopPrecompile<R>: Precompile,
+	FrameSystemWrapper<R>: Precompile,
 	WithdrawBalancePrecompile<R>: Precompile,
 	NftmartNftPrecompile<R>: Precompile,
 	NftmartOrderPrecompile<R>: Precompile,
@@ -126,6 +128,9 @@ where
 			a if a == hash(2054) => Some(<PalletNopPrecompile<R> as Precompile>::execute(
 				input, target_gas, context, is_static,
 			)),
+			a if a == hash(2057) => Some(<FrameSystemWrapper<R> as Precompile>::execute(
+				input, target_gas, context, is_static,
+			)),
 			_ => None,
 		}
 	}

precompiles/frame-system/Cargo.toml

@@ -0,0 +1,55 @@
+[lib]
+path = "lib.rs"
+
+[package]
+name = "frame-system-precompiles"
+authors = [ "NFTMart" ]
+description = "A Precompile to make Substrate's pallet-nop accessible to pallet-evm"
+edition = "2021"
+version = "4.0.0-dev"
+
+[dependencies]
+log = {version = "0.4", default-features = false }
+num_enum = { version = "0.5.3", default-features = false }
+
+# Moonbeam
+precompile-utils = { default-features = false, git = 'https://github.com/nftt-studio/moonbeam.git', branch = "master"}
+
+# Substrate
+codec = { package = "parity-scale-codec", version = "2.2.0", default-features = false }
+fp-evm = { git = "https://github.com/nftt-studio/frontier.git", branch = "moonbeam-polkadot-v0.9.13", default-features = false }
+frame-support = { git = "https://github.com/purestake/substrate.git", branch = "moonbeam-polkadot-v0.9.13", default-features = false }
+frame-system = { git = "https://github.com/purestake/substrate.git", branch = "moonbeam-polkadot-v0.9.13", default-features = false }
+sp-core = { git = "https://github.com/purestake/substrate.git", branch = "moonbeam-polkadot-v0.9.13", default-features = false }
+sp-io = { git = "https://github.com/purestake/substrate.git", branch = "moonbeam-polkadot-v0.9.13", default-features = false }
+sp-std = { git = "https://github.com/purestake/substrate.git", branch = "moonbeam-polkadot-v0.9.13", default-features = false }
+pallet-balances = { git = "https://github.com/purestake/substrate.git", branch = "moonbeam-polkadot-v0.9.13", default-features = false }
+
+
+# Frontier
+pallet-evm = { git = "https://github.com/nftt-studio/frontier.git", branch = "moonbeam-polkadot-v0.9.13", default-features = false }
+
+[dev-dependencies]
+derive_more = "0.99"
+hex-literal = "0.3.4"
+serde = "1.0.100"
+
+# Substrate
+scale-info = { version = "1.0", default-features = false, features = [ "derive" ] }
+sp-runtime = { git = "https://github.com/purestake/substrate.git", branch = "moonbeam-polkadot-v0.9.13" }
+
+[features]
+default = [ "std" ]
+std = [
+	"log/std",
+	"codec/std",
+	"fp-evm/std",
+	"frame-support/std",
+	"frame-system/std",
+	"pallet-balances/std",
+	"pallet-evm/std",
+	"precompile-utils/std",
+	"sp-core/std",
+	"sp-io/std",
+	"sp-std/std",
+]

precompiles/frame-system/IFrameSystem.sol

@@ -0,0 +1,13 @@
+// SPDX-License-Identifier: GPL-3.0-only
+pragma solidity >=0.8.0;
+
+// precompile address: 0x0000000000000000000000000000000000000809 (=2057)
+interface IFrameSystem {
+    function remarkWithEvent(bytes memory remark) external;
+}
+
+contract FrameSystem {
+    function ayyyy(bytes memory remark) external {
+        IFrameSystem(0x0000000000000000000000000000000000000809).remarkWithEvent(remark);
+    }
+}

precompiles/frame-system/lib.rs

@@ -0,0 +1,92 @@
+#![cfg_attr(not(feature = "std"), no_std)]
+#![feature(assert_matches)]
+
+use frame_support::dispatch::{Dispatchable, GetDispatchInfo, PostDispatchInfo};
+use pallet_evm::{AddressMapping, ExitSucceed, Precompile};
+use precompile_utils::{Bytes, EvmDataReader, EvmResult, Gasometer, RuntimeHelper};
+
+use fp_evm::{Context, PrecompileOutput};
+
+use sp_std::{fmt::Debug, if_std, marker::PhantomData, prelude::*};
+
+/// Each variant represents a method that is exposed in the public Solidity interface
+/// The function selectors will be automatically generated at compile-time by the macros
+#[precompile_utils::generate_function_selector]
+#[derive(Debug, PartialEq)]
+enum Action {
+	RemarkWithEvent = "remarkWithEvent(bytes)",
+}
+
+pub struct FrameSystemWrapper<T>(PhantomData<T>);
+
+impl<T> Precompile for FrameSystemWrapper<T>
+where
+	T: frame_system::Config + pallet_evm::Config,
+	T::Call: Dispatchable<PostInfo = PostDispatchInfo> + GetDispatchInfo,
+	<T::Call as Dispatchable>::Origin: From<Option<T::AccountId>>,
+	T::Call: From<frame_system::Call<T>>,
+{
+	fn execute(
+		input: &[u8], //Reminder this is big-endian
+		target_gas: Option<u64>,
+		context: &Context,
+		_is_static: bool,
+	) -> EvmResult<PrecompileOutput> {
+		let mut gasometer = Gasometer::new(target_gas);
+		let gasometer = &mut gasometer;
+
+		let (mut input, selector) = match EvmDataReader::new_with_selector(gasometer, input) {
+			Ok((input, selector)) => (input, selector),
+			Err(e) => return Err(e),
+		};
+		let input = &mut input;
+
+		match selector {
+			// Check for accessor methods first. These return results immediately
+			Action::RemarkWithEvent => Self::remark_with_event(input, gasometer, context),
+		}
+	}
+}
+
+impl<T> FrameSystemWrapper<T>
+where
+	T: frame_system::Config + pallet_evm::Config,
+	T::Call: Dispatchable<PostInfo = PostDispatchInfo> + GetDispatchInfo,
+	<T::Call as Dispatchable>::Origin: From<Option<T::AccountId>>,
+	T::Call: From<frame_system::Call<T>>,
+{
+	fn remark_with_event(
+		input: &mut EvmDataReader,
+		gasometer: &mut Gasometer,
+		context: &Context,
+	) -> EvmResult<PrecompileOutput> {
+		// Bound check. We expect a single argument passed in.
+		input.expect_arguments(gasometer, 1)?;
+
+		// Use pallet-evm's account mapping to determine what AccountId to dispatch from.
+		let origin = T::AddressMapping::into_account_id(context.caller);
+		let remark: Vec<u8> = input.read::<Bytes>(gasometer)?.into();
+		let call = frame_system::Call::<T>::remark_with_event { remark: remark.clone() };
+
+		if_std! {
+				// This code is only being compiled and executed when the `std` feature is enabled.
+				println!("The caller account is: {:#?}", context.caller);
+				println!("The caller origin is: {:#?}", origin);
+				println!("The remark is: {:#?}", remark);
+				println!("The call is: {:#?}", call);
+		}
+
+		RuntimeHelper::<T>::try_dispatch(Some(origin).into(), call, gasometer)?;
+
+		let used_gas = gasometer.used_gas();
+		// Record the gas used in the gasometer
+		gasometer.record_cost(used_gas)?;
+
+		Ok(PrecompileOutput {
+			exit_status: ExitSucceed::Stopped,
+			cost: gasometer.used_gas(),
+			output: Default::default(),
+			logs: Default::default(),
+		})
+	}
+}