evm frontier at stable2506

Author: cl0w5

Cargo.lock

@@ -361,7 +361,7 @@ evm-runtime = { git = "https://github.com/moonbeam-foundation/evm", branch = "mo
 
 # EVM from acala
 module-evm-utility-macro = { path = "runtime/hydradx/src/evm/evm-utility/macro", default-features = false }
-ethereum = { version = "0.18.2", default-features = false, features = [
+ethereum = { git = "https://github.com/moonbeam-foundation/ethereum", branch = "moonbeam-polkadot-stable2603", default-features = false, features = [
     "with-scale",
 ] }
 ethereum-types = { version = "0.15.1", default-features = false }

Cargo.toml

@@ -44,7 +44,7 @@ where
 		let config = <T as Config>::config();
 		let precompiles = T::PrecompilesValue::get();
 		let metadata = StackSubstateMetadata::new(gas, config);
-		let state = SubstrateStackState::new(&vicinity, metadata, None, None);
+		let state = SubstrateStackState::new(&vicinity, metadata, None, None, None);
 		let account = T::AddressMapping::into_account_id(origin);
 		let nonce = T::AccountProvider::account_nonce(&account.clone().into());
 		let mut executor = StackExecutor::new_with_precompiles(state, config, &precompiles);
@@ -88,6 +88,7 @@ where
 			false, // validate
 			None,  // weight_limit
 			None,  // proof_size_base_cost
+			None,  // state_override
 			evm_config,
 		);
 

runtime/hydradx/src/evm/executor.rs

@@ -35,7 +35,7 @@ use frame_support::{
 	dispatch::RawOrigin,
 	parameter_types,
 	sp_runtime::traits::One,
-	traits::{Defensive, EitherOf, FindAuthor},
+	traits::{ConstBool, Defensive, EitherOf, FindAuthor},
 	weights::{constants::WEIGHT_REF_TIME_PER_SECOND, Weight},
 	ConsensusEngineId,
 };
@@ -87,6 +87,8 @@ pub const DEFAULT_BASE_FEE_PER_GAS: u128 = 15_000_000;
 parameter_types! {
 	// We allow for a 75% fullness of a 0.5s block
 	pub BlockGasLimit: U256 = U256::from(NORMAL_DISPATCH_RATIO * MAXIMUM_BLOCK_WEIGHT.ref_time() / WEIGHT_PER_GAS);
+	// Fallback to BlockGasLimit
+	pub TransactionGasLimit: Option<U256> = None;
 
 	pub PrecompilesValue: precompiles::HydraDXPrecompiles<Runtime> = precompiles::HydraDXPrecompiles::<_>::new();
 	pub WeightPerGas: Weight = Weight::from_parts(WEIGHT_PER_GAS, 0);
@@ -189,6 +191,7 @@ impl pallet_evm::Config for Runtime {
 	type PrecompilesValue = PrecompilesValue;
 	type ChainId = crate::EVMChainId;
 	type BlockGasLimit = BlockGasLimit;
+	type TransactionGasLimit = TransactionGasLimit;
 	type Runner = WrapRunner<
 		Self,
 		pallet_evm::runner::stack::Runner<Self>, // Evm runner that we wrap
@@ -225,6 +228,7 @@ impl pallet_ethereum::Config for Runtime {
 	type StateRoot = pallet_ethereum::IntermediateStateRoot<Self::Version>;
 	type PostLogContent = PostLogContent;
 	type ExtraDataLength = sp_core::ConstU32<1>;
+	type AllowUnprotectedTxs = ConstBool<false>;
 }
 
 pub struct EvmNonceProvider;

runtime/hydradx/src/evm/mod.rs

@@ -115,6 +115,7 @@ where
 			validate,
 			None,
 			None,
+			None,
 			<R as pallet_evm::Config>::config(),
 		) {
 			Ok(info) => info,

runtime/hydradx/src/evm/permit.rs

@@ -26,7 +26,7 @@
 use crate::evm::evm_fee::evm_fee_payer;
 use crate::evm::WethAssetId;
 use ethereum::AuthorizationList;
-use fp_evm::{Account, TransactionValidationError};
+use fp_evm::{Account, StateOverride, TransactionValidationError};
 use frame_support::traits::Get;
 use hydradx_traits::AccountFeeCurrencyBalanceInCurrency;
 use pallet_evm::runner::Runner;
@@ -89,9 +89,11 @@ where
 			fp_evm::CheckEvmTransactionConfig {
 				evm_config,
 				block_gas_limit: T::BlockGasLimit::get(),
+				transaction_gas_limit: T::TransactionGasLimit::get(),
 				base_fee,
 				chain_id: T::ChainId::get(),
 				is_transactional,
+				allow_unprotected_txs: false,
 			},
 			fp_evm::CheckEvmTransactionInput {
 				chain_id: Some(T::ChainId::get()),
@@ -131,6 +133,7 @@ where
 		validate: bool,
 		weight_limit: Option<Weight>,
 		proof_size_base_cost: Option<u64>,
+		state_override: StateOverride,
 		config: &evm::Config,
 	) -> Result<CallInfo, RunnerError<Self::Error>> {
 		if validate {
@@ -171,6 +174,7 @@ where
 			false,
 			weight_limit,
 			proof_size_base_cost,
+			state_override,
 			config,
 		)?;
 

runtime/hydradx/src/evm/runner.rs

@@ -781,6 +781,7 @@ impl_runtime_apis! {
 			estimate: bool,
 			access_list: Option<Vec<(H160, Vec<H256>)>>,
 			authorization_list: Option<AuthorizationList>,
+			state_override: fp_evm::StateOverride,
 		) -> Result<pallet_evm::CallInfo, sp_runtime::DispatchError> {
 			let mut config = <Runtime as pallet_evm::Config>::config().clone();
 			config.estimate = estimate;
@@ -839,6 +840,7 @@ impl_runtime_apis! {
 				validate,
 				weight_limit,
 				proof_size_base_cost,
+				state_override,
 				&config,
 			)
 			.map_err(|err| err.error.into())