add rpc api initialize_pending_block

client/rpc/src/eth/pending.rs

@@ -37,6 +37,7 @@ use sp_runtime::{
 use sp_timestamp::TimestampInherentData;
 
 use crate::eth::{Eth, EthConfig};
+use fp_rpc::EthereumRuntimeRPCApi;
 
 const LOG_TARGET: &str = "eth-pending";
 
@@ -60,6 +61,7 @@ where
 	B: BlockT,
 	C: ProvideRuntimeApi<B>,
 	C::Api: BlockBuilderApi<B>,
+	C::Api: EthereumRuntimeRPCApi<B>,
 	C: HeaderBackend<B> + StorageProvider<B, BE> + 'static,
 	BE: Backend<B>,
 	A: ChainApi<Block = B>,
@@ -100,7 +102,12 @@ where
 		);
 
 		// Initialize the pending block header
-		api.initialize_block(best_hash, &pending_header)?;
+		match api.api_version::<dyn EthereumRuntimeRPCApi<B>>(best_hash)? {
+			Some(version) if version >= 6 => {
+				api.initialize_pending_block(best_hash, &pending_header)?
+			}
+			_ => api.initialize_block(best_hash, &pending_header)?,
+		}
 
 		// Apply inherents to the pending block.
 		let inherents = api.execute_in_transaction(move |api| {

primitives/rpc/src/lib.rs

@@ -88,7 +88,7 @@ impl<B: BlockT, C> RuntimeStorageOverride<B, C> for () {
 
 sp_api::decl_runtime_apis! {
 	/// API necessary for Ethereum-compatibility layer.
-	#[api_version(5)]
+	#[api_version(6)]
 	pub trait EthereumRuntimeRPCApi {
 		/// Returns runtime defined pallet_evm::ChainId.
 		fn chain_id() -> u64;
@@ -245,6 +245,8 @@ sp_api::decl_runtime_apis! {
 		fn pending_block(
 			xts: Vec<<Block as BlockT>::Extrinsic>,
 		) -> (Option<ethereum::BlockV2>, Option<Vec<TransactionStatus>>);
+		/// initialize the pending block
+		fn initialize_pending_block(header: &<Block as BlockT>::Header);
 	}
 
 	#[api_version(2)]

template/runtime/src/lib.rs

@@ -876,6 +876,10 @@ impl_runtime_apis! {
 				pallet_ethereum::CurrentTransactionStatuses::<Runtime>::get()
 			)
 		}
+
+		fn initialize_pending_block(header: &<Block as BlockT>::Header) {
+			Executive::initialize_block(header)
+		}
 	}
 
 	impl fp_rpc::ConvertTransactionRuntimeApi<Block> for Runtime {