Add support for delegatable precompile in transactions

Cargo.toml

@@ -26,3 +26,9 @@ members = [
 	"template/runtime",
 ]
 resolver = "2"
+
+[patch.crates-io]
+evm = { git = "https://github.com/rust-blockchain/evm", branch = "sp-transact-delegatecall" }
+evm-core = { git = "https://github.com/rust-blockchain/evm", branch = "sp-transact-delegatecall" }
+evm-runtime = { git = "https://github.com/rust-blockchain/evm", branch = "sp-transact-delegatecall" }
+evm-gasometer = { git = "https://github.com/rust-blockchain/evm", branch = "sp-transact-delegatecall" }

frame/evm/src/lib.rs

@@ -84,7 +84,7 @@ pub use evm::{
 use fp_evm::GenesisAccount;
 pub use fp_evm::{
 	Account, CallInfo, CreateInfo, ExecutionInfo, FeeCalculator, LinearCostPrecompile, Log,
-	Precompile, PrecompileFailure, PrecompileOutput, PrecompileResult, PrecompileSet, Vicinity,
+	Precompile, PrecompileFailure, PrecompileOutput, PrecompileResult, DelegatablePrecompileSet, Vicinity,
 };
 
 pub use self::{pallet::*, runner::Runner};
@@ -124,8 +124,7 @@ pub mod pallet {
 		/// The overarching event type.
 		type Event: From<Event<Self>> + IsType<<Self as frame_system::Config>::Event>;
 		/// Precompiles associated with this EVM engine.
-		type PrecompilesType: PrecompileSet;
-		type PrecompilesValue: Get<Self::PrecompilesType>;
+		type Precompiles: DelegatablePrecompileSet + Default;
 		/// Chain ID of EVM.
 		type ChainId: Get<u64>;
 		/// The block gas limit. Can be a simple constant, or an adjustment algorithm in another pallet.

frame/evm/src/runner/stack.rs

@@ -26,7 +26,7 @@ use evm::{
 	executor::stack::{Accessed, StackExecutor, StackState as StackStateT, StackSubstateMetadata},
 	ExitError, ExitReason, Transfer,
 };
-use fp_evm::{CallInfo, CreateInfo, ExecutionInfo, Log, Vicinity};
+use fp_evm::{CallInfo, CreateInfo, ExecutionInfo, Log, Vicinity, DelegatablePrecompileSet};
 use frame_support::{
 	ensure,
 	traits::{Currency, ExistenceRequirement, Get},
@@ -51,7 +51,7 @@ impl<T: Config> Runner<T> {
 		max_priority_fee_per_gas: Option<U256>,
 		nonce: Option<U256>,
 		config: &'config evm::Config,
-		precompiles: &'precompiles T::PrecompilesType,
+		precompiles: &'precompiles T::Precompiles,
 		f: F,
 	) -> Result<ExecutionInfo<R>, Error<T>>
 	where
@@ -60,7 +60,7 @@ impl<T: Config> Runner<T> {
 				'config,
 				'precompiles,
 				SubstrateStackState<'_, 'config, T>,
-				T::PrecompilesType,
+				T::Precompiles,
 			>,
 		) -> (ExitReason, R),
 	{
@@ -218,7 +218,7 @@ impl<T: Config> RunnerT<T> for Runner<T> {
 		access_list: Vec<(H160, Vec<H256>)>,
 		config: &evm::Config,
 	) -> Result<CallInfo, Self::Error> {
-		let precompiles = T::PrecompilesValue::get();
+		let precompiles = T::Precompiles::default();
 		Self::execute(
 			source,
 			value,
@@ -228,7 +228,11 @@ impl<T: Config> RunnerT<T> for Runner<T> {
 			nonce,
 			config,
 			&precompiles,
-			|executor| executor.transact_call(source, target, value, input, gas_limit, access_list),
+			|executor| if precompiles.is_delegatable_precompile(target) {
+				executor.transact_delegatecall(source, target, value, input, gas_limit, access_list)
+			} else {
+				executor.transact_call(source, target, value, input, gas_limit, access_list)
+			},
 		)
 	}
 
@@ -243,7 +247,7 @@ impl<T: Config> RunnerT<T> for Runner<T> {
 		access_list: Vec<(H160, Vec<H256>)>,
 		config: &evm::Config,
 	) -> Result<CreateInfo, Self::Error> {
-		let precompiles = T::PrecompilesValue::get();
+		let precompiles = T::Precompiles::default();
 		Self::execute(
 			source,
 			value,
@@ -274,7 +278,7 @@ impl<T: Config> RunnerT<T> for Runner<T> {
 		access_list: Vec<(H160, Vec<H256>)>,
 		config: &evm::Config,
 	) -> Result<CreateInfo, Self::Error> {
-		let precompiles = T::PrecompilesValue::get();
+		let precompiles = T::Precompiles::default();
 		let code_hash = H256::from_slice(Keccak256::digest(&init).as_slice());
 		Self::execute(
 			source,

primitives/evm/Cargo.toml

@@ -16,6 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 evm = { version = "0.35.0", default-features = false, features = ["with-codec"] }
 serde = { version = "1.0.101", features = ["derive"], optional = true }
 
+primitive-types = { version = "0.11.1", default-features = false, features = ["rlp", "byteorder"] }
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false }
 sp-core = { version = "6.0.0", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 sp-std = { version = "4.0.0", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
@@ -27,6 +28,7 @@ std = [
 	"evm/with-serde",
 	"serde",
 
+	"primitive-types/std",
 	"codec/std",
 	"sp-core/std",
 	"sp-std/std",

primitives/evm/src/lib.rs

@@ -30,7 +30,7 @@ pub use evm::backend::{Basic as Account, Log};
 
 pub use self::precompile::{
 	Context, ExitError, ExitRevert, ExitSucceed, LinearCostPrecompile, Precompile,
-	PrecompileFailure, PrecompileOutput, PrecompileResult, PrecompileSet,
+	PrecompileFailure, PrecompileOutput, PrecompileResult, PrecompileSet, DelegatablePrecompileSet,
 };
 
 #[derive(Clone, Eq, PartialEq, Encode, Decode, Default)]

primitives/evm/src/precompile.rs

@@ -20,6 +20,7 @@ pub use evm::{
 	Context, ExitError, ExitRevert, ExitSucceed,
 };
 use sp_std::vec::Vec;
+use primitive_types::H160;
 
 pub type PrecompileResult = Result<PrecompileOutput, PrecompileFailure>;
 
@@ -36,6 +37,10 @@ pub trait Precompile {
 	) -> PrecompileResult;
 }
 
+pub trait DelegatablePrecompileSet: PrecompileSet {
+	fn is_delegatable_precompile(&self, address: H160) -> bool;
+}
+
 pub trait LinearCostPrecompile {
 	const BASE: u64;
 	const WORD: u64;

template/runtime/src/lib.rs

@@ -315,8 +315,7 @@ impl pallet_evm::Config for Runtime {
 	type Currency = Balances;
 	type Event = Event;
 	type Runner = pallet_evm::runner::stack::Runner<Self>;
-	type PrecompilesType = FrontierPrecompiles<Self>;
-	type PrecompilesValue = PrecompilesValue;
+	type Precompiles = FrontierPrecompiles<Self>;
 	type ChainId = ChainId;
 	type BlockGasLimit = BlockGasLimit;
 	type OnChargeTransaction = ();

template/runtime/src/precompiles.rs

@@ -1,11 +1,12 @@
-use pallet_evm::{Context, Precompile, PrecompileResult, PrecompileSet};
+use pallet_evm::{Context, Precompile, PrecompileResult, PrecompileSet, DelegatablePrecompileSet};
 use sp_core::H160;
 use sp_std::marker::PhantomData;
 
 use pallet_evm_precompile_modexp::Modexp;
 use pallet_evm_precompile_sha3fips::Sha3FIPS256;
 use pallet_evm_precompile_simple::{ECRecover, ECRecoverPublicKey, Identity, Ripemd160, Sha256};
 
+#[derive(Default)]
 pub struct FrontierPrecompiles<R>(PhantomData<R>);
 
 impl<R> FrontierPrecompiles<R>
@@ -15,13 +16,15 @@ where
 	pub fn new() -> Self {
 		Self(Default::default())
 	}
+
 	pub fn used_addresses() -> sp_std::vec::Vec<H160> {
 		sp_std::vec![1, 2, 3, 4, 5, 1024, 1025]
 			.into_iter()
 			.map(|x| hash(x))
 			.collect()
 	}
 }
+
 impl<R> PrecompileSet for FrontierPrecompiles<R>
 where
 	R: pallet_evm::Config,
@@ -57,6 +60,14 @@ where
 	}
 }
 
+impl<R> DelegatablePrecompileSet for FrontierPrecompiles<R>
+where
+	R: pallet_evm::Config,
+{
+	fn is_delegatable_precompile(&self, address: H160) -> bool {
+		false
+	}
+
 fn hash(a: u64) -> H160 {
 	H160::from_low_u64_be(a)
 }