extend ethereum api param

Author: helin6

client/cli/src/frontier_db_cmd/mapping_db.rs

@@ -23,6 +23,7 @@ use serde::Deserialize;
 // Substrate
 use sp_api::ProvideRuntimeApi;
 use sp_blockchain::HeaderBackend;
+use sp_runtime::SaturatedConversion;
 use sp_runtime::traits::Block as BlockT;
 // Frontier
 use fp_rpc::EthereumRuntimeRPCApi;
@@ -83,10 +84,15 @@ where
 						.block_hash(ethereum_block_hash)?
 						.is_none()
 					{
+						let substrate_block_num = self
+							.client
+							.number(*substrate_block_hash)
+							.map_err(|e| format!("{:?}", e))?
+							.ok_or(format!("substrate block hash: {substrate_block_hash:?} query block number return none"))?;
 						let existing_transaction_hashes: Vec<H256> = if let Some(statuses) = self
 							.client
 							.runtime_api()
-							.current_transaction_statuses(*substrate_block_hash)
+							.current_transaction_statuses(*substrate_block_hash, substrate_block_num.saturated_into::<u128>().into())
 							.map_err(|e| format!("{:?}", e))?
 						{
 							statuses
@@ -141,10 +147,15 @@ where
 						.block_hash(ethereum_block_hash)?
 						.is_some()
 					{
+						let substrate_block_num = self
+							.client
+							.number(*substrate_block_hash)
+							.map_err(|e| format!("{:?}", e))?
+							.ok_or(format!("substrate block hash: {substrate_block_hash:?} query block number return none"))?;
 						let existing_transaction_hashes: Vec<H256> = if let Some(statuses) = self
 							.client
 							.runtime_api()
-							.current_transaction_statuses(*substrate_block_hash)
+							.current_transaction_statuses(*substrate_block_hash, substrate_block_num.saturated_into::<u128>().into())
 							.map_err(|e| format!("{:?}", e))?
 						{
 							statuses

client/db/src/sql/mod.rs

@@ -229,7 +229,7 @@ where
 				// Read from the runtime and store the block metadata.
 				let ethereum_block = client
 					.runtime_api()
-					.current_block(substrate_genesis_hash)
+					.current_block(substrate_genesis_hash, Default::default())
 					.expect("runtime api reachable")
 					.expect("ethereum genesis block");
 

client/mapping-sync/src/kv/mod.rs

@@ -29,6 +29,7 @@ use sc_client_api::backend::{Backend, StorageProvider};
 use sp_api::{ApiExt, ProvideRuntimeApi};
 use sp_blockchain::{Backend as _, HeaderBackend};
 use sp_consensus::SyncOracle;
+use sp_runtime::SaturatedConversion;
 use sp_runtime::traits::{Block as BlockT, Header as HeaderT, Zero};
 // Frontier
 use fc_storage::OverrideHandle;
@@ -128,7 +129,7 @@ where
 		let block = if api_version > 1 {
 			client
 				.runtime_api()
-				.current_block(substrate_block_hash)
+				.current_block(substrate_block_hash, (*header.number()).saturated_into::<u128>().into())
 				.map_err(|e| format!("{:?}", e))?
 		} else {
 			#[allow(deprecated)]

client/rpc/src/eth/block.rs

@@ -128,7 +128,7 @@ where
 				let statuses = block_data_cache
 					.current_transaction_statuses(schema, substrate_hash)
 					.await;
-
+				log::warn!("block_by_number: substrate_hash: {substrate_hash:?}, block: {block:?}, statuses: {statuses:?}");
 				let base_fee = client.runtime_api().gas_price(substrate_hash).ok();
 
 				match (block, statuses) {
@@ -187,6 +187,7 @@ where
 					.map_err(|_| internal_err(format!("Runtime access error at {}", best_hash)))?;
 
 				let base_fee = api.gas_price(best_hash).ok();
+				log::warn!("block_by_number: best_hash: {best_hash:?}, block: {block:?}, statuses: {statuses:?}");
 
 				match (block, statuses) {
 					(Some(block), Some(statuses)) => Ok(Some(rich_block_build(
@@ -200,7 +201,10 @@ where
 					_ => Ok(None),
 				}
 			}
-			None => Ok(None),
+			None => {
+				log::warn!("block_by_number: none");
+				Ok(None)
+			},
 		}
 	}
 

client/rpc/src/eth/execute.rs

@@ -25,7 +25,7 @@ use scale_codec::{Decode, Encode};
 // Substrate
 use sc_client_api::backend::{Backend, StorageProvider};
 use sc_transaction_pool::{ChainApi, RCGroup};
-use sp_api::{ApiExt, CallApiAt, CallApiAtParams, ProvideRuntimeApi, StorageTransactionCache};
+use sp_api::{ApiExt, BlockId, CallApiAt, CallApiAtParams, ProvideRuntimeApi, StorageTransactionCache};
 use sp_block_builder::BlockBuilder as BlockBuilderApi;
 use sp_blockchain::HeaderBackend;
 use sp_core::ExecutionContext;
@@ -103,7 +103,7 @@ where
 			)
 		};
 
-		let (substrate_hash, api) = match frontier_backend_client::native_block_id::<B, C>(
+		let (substrate_hash, substrate_block_num, api) = match frontier_backend_client::native_block_id::<B, C>(
 			self.client.as_ref(),
 			self.backend.as_ref(),
 			number,
@@ -115,13 +115,21 @@ where
 					.client
 					.expect_block_hash_from_id(&id)
 					.map_err(|_| crate::err(JSON_RPC_ERROR_DEFAULT, "header not found", None))?;
-				(hash, self.client.runtime_api())
+				let num = match id {
+					BlockId::Hash(hash) => {
+						self.client.number(hash).map_err(|e| crate::err(JSON_RPC_ERROR_DEFAULT, e.to_string(), None))?
+							.ok_or(crate::err(JSON_RPC_ERROR_DEFAULT, "Block number not found", None))?
+					},
+					BlockId::Number(num) => num,
+				};
+				(hash, num, self.client.runtime_api())
 			}
 			None => {
 				// Not mapped in the db, assume pending.
 				let hash = self.client.info().best_hash;
+				let num = self.client.info().best_number;
 				let api = pending_runtime_api(self.client.as_ref(), self.graph.as_ref())?;
-				(hash, api)
+				(hash, num, api)
 			}
 		};
 
@@ -134,7 +142,7 @@ where
 		};
 
 		let block = if api_version > 1 {
-			api.current_block(substrate_hash)
+			api.current_block(substrate_hash, substrate_block_num.saturated_into::<u128>().into())
 				.map_err(|err| internal_err(format!("runtime error: {:?}", err)))?
 		} else {
 			#[allow(deprecated)]

client/rpc/src/eth/submit.rs

@@ -27,7 +27,7 @@ use sp_api::{ApiExt, ProvideRuntimeApi};
 use sp_block_builder::BlockBuilder as BlockBuilderApi;
 use sp_blockchain::HeaderBackend;
 use sp_runtime::{
-	generic::BlockId, traits::Block as BlockT, transaction_validity::TransactionSource,
+	generic::BlockId, traits::Block as BlockT, transaction_validity::TransactionSource, SaturatedConversion,
 };
 // Frontier
 use fc_rpc_core::types::*;
@@ -81,12 +81,13 @@ where
 		};
 
 		let hash = self.client.info().best_hash;
+		let number = self.client.info().best_number;
 
 		let gas_price = request.gas_price;
 		let gas_limit = match request.gas {
 			Some(gas_limit) => gas_limit,
 			None => {
-				let block = self.client.runtime_api().current_block(hash);
+				let block = self.client.runtime_api().current_block(hash, number.saturated_into::<u128>().into());
 				if let Ok(Some(block)) = block {
 					block.header.gas_limit
 				} else {

client/rpc/src/eth/transaction.rs

@@ -376,7 +376,7 @@ where
 						}
 					}
 				};
-
+				log::warn!("");
 				let status = statuses[index].clone();
 				let mut cumulative_receipts = receipts;
 				cumulative_receipts.truncate((status.transaction_index + 1) as usize);

client/storage/src/overrides/mod.rs

@@ -22,8 +22,9 @@ use ethereum::BlockV2 as EthereumBlock;
 use ethereum_types::{H160, H256, U256};
 // Substrate
 use sp_api::{ApiExt, ProvideRuntimeApi};
+use sp_blockchain::HeaderBackend;
 use sp_io::hashing::{blake2_128, twox_128};
-use sp_runtime::{traits::Block as BlockT, Permill};
+use sp_runtime::{traits::Block as BlockT, Permill, SaturatedConversion};
 // Frontier
 use fp_rpc::{EthereumRuntimeRPCApi, TransactionStatus};
 use fp_storage::EthereumStorageSchema;
@@ -96,7 +97,7 @@ impl<B: BlockT, C> RuntimeApiStorageOverride<B, C> {
 impl<Block, C> StorageOverride<Block> for RuntimeApiStorageOverride<Block, C>
 where
 	Block: BlockT,
-	C: ProvideRuntimeApi<Block> + Send + Sync,
+	C: ProvideRuntimeApi<Block> + Send + Sync + HeaderBackend<Block>,
 	C::Api: EthereumRuntimeRPCApi<Block>,
 {
 	/// For a given account address, returns pallet_evm::AccountCodes.
@@ -131,7 +132,8 @@ where
 			let old_block = api.current_block_before_version_2(block_hash).ok()?;
 			old_block.map(|block| block.into())
 		} else {
-			api.current_block(block_hash).ok()?
+			let number = self.client.number(block_hash).ok()??;
+			api.current_block(block_hash, number.saturated_into::<u128>().into()).ok()?
 		}
 	}
 
@@ -163,9 +165,10 @@ where
 					.collect()
 			})
 		} else {
+			let number = self.client.number(block_hash).ok()??;
 			self.client
 				.runtime_api()
-				.current_receipts(block_hash)
+				.current_receipts(block_hash, number.saturated_into::<u128>().into())
 				.ok()?
 		}
 	}
@@ -175,9 +178,10 @@ where
 		&self,
 		block_hash: Block::Hash,
 	) -> Option<Vec<TransactionStatus>> {
+		let number = self.client.number(block_hash).ok()??;
 		self.client
 			.runtime_api()
-			.current_transaction_statuses(block_hash)
+			.current_transaction_statuses(block_hash, number.saturated_into::<u128>().into())
 			.ok()?
 	}
 

frame/ethereum/src/lib.rs

@@ -332,15 +332,15 @@ pub mod pallet {
 
 	/// The current Ethereum block.
 	#[pallet::storage]
-	pub type CurrentBlock<T: Config> = StorageValue<_, ethereum::BlockV2>;
+	pub type CurrentBlock<T: Config> = StorageMap<_, Twox64Concat, U256, ethereum::BlockV2>;
 
 	/// The current Ethereum receipts.
 	#[pallet::storage]
-	pub type CurrentReceipts<T: Config> = StorageValue<_, Vec<Receipt>>;
+	pub type CurrentReceipts<T: Config> = StorageMap<_, Twox64Concat, U256, Vec<Receipt>>;
 
 	/// The current transaction statuses.
 	#[pallet::storage]
-	pub type CurrentTransactionStatuses<T: Config> = StorageValue<_, Vec<TransactionStatus>>;
+	pub type CurrentTransactionStatuses<T: Config> = StorageMap<_, Twox64Concat, U256, Vec<TransactionStatus>>;
 
 	// Mapping for block number and hashes.
 	#[pallet::storage]
@@ -488,9 +488,9 @@ impl<T: Config> Pallet<T> {
 
 		#[cfg(feature = "std")]
 		let block_time = block_timer.elapsed().as_micros();
-		CurrentBlock::<T>::put(block.clone());
-		CurrentReceipts::<T>::put(receipts.clone());
-		CurrentTransactionStatuses::<T>::put(statuses.clone());
+		CurrentBlock::<T>::insert(&block_number, block.clone());
+		CurrentReceipts::<T>::insert(&block_number, receipts.clone());
+		CurrentTransactionStatuses::<T>::insert(&block_number, statuses.clone());
 		BlockHash::<T>::insert(block_number, block.header.hash());
 
 		match post_log {
@@ -766,8 +766,8 @@ impl<T: Config> Pallet<T> {
 	}
 
 	/// Get current block hash
-	pub fn current_block_hash() -> Option<H256> {
-		<CurrentBlock<T>>::get().map(|block| block.header.hash())
+	pub fn current_block_hash(number: &U256) -> Option<H256> {
+		<CurrentBlock<T>>::get(number).map(|block| block.header.hash())
 	}
 
 	/// Execute an Ethereum transaction.

primitives/rpc/src/lib.rs

@@ -197,14 +197,14 @@ sp_api::decl_runtime_apis! {
 		#[changed_in(2)]
 		fn current_block() -> Option<ethereum::BlockV0>;
 		/// Return the current block.
-		fn current_block() -> Option<ethereum::BlockV2>;
+		fn current_block(block_number: U256) -> Option<ethereum::BlockV2>;
 		/// Return the current receipt.
 		#[changed_in(4)]
 		fn current_receipts() -> Option<Vec<ethereum::ReceiptV0>>;
 		/// Return the current receipt.
-		fn current_receipts() -> Option<Vec<ethereum::ReceiptV3>>;
+		fn current_receipts(block_number: U256) -> Option<Vec<ethereum::ReceiptV3>>;
 		/// Return the current transaction status.
-		fn current_transaction_statuses() -> Option<Vec<TransactionStatus>>;
+		fn current_transaction_statuses(block_number: U256) -> Option<Vec<TransactionStatus>>;
 		/// Return all the current data for a block in a single runtime call. Legacy.
 		#[changed_in(2)]
 		fn current_all() -> (
@@ -219,7 +219,7 @@ sp_api::decl_runtime_apis! {
 			Option<Vec<ethereum::ReceiptV0>>,
 			Option<Vec<TransactionStatus>>
 		);
-		fn current_all() -> (
+		fn current_all(block_number: U256) -> (
 			Option<ethereum::BlockV2>,
 			Option<Vec<ethereum::ReceiptV3>>,
 			Option<Vec<TransactionStatus>>