extend ethereum api param

Author: helin6

Cargo.lock

@@ -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/cli/src/frontier_db_cmd/mapping_db.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/db/src/sql/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/mapping-sync/src/kv/mod.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/block.rs

@@ -47,6 +47,7 @@ use self::lru_cache::LRUCacheByteLimited;
 
 type WaitList<Hash, T> = HashMap<Hash, Vec<oneshot::Sender<Option<T>>>>;
 
+#[derive(Debug)]
 enum EthBlockDataCacheMessage<B: BlockT> {
 	RequestCurrentBlock {
 		block_hash: B::Hash,
@@ -201,13 +202,16 @@ impl<B: BlockT> EthBlockDataCacheTask<B> {
 			return;
 		}
 
+		log::warn!("request_current: not find in cache");
+
 		// Another request already triggered caching but the
 		// response is not known yet, we add the sender to the waiting
 		// list.
 		if let Some(waiting) = wait_list.get_mut(&block_hash) {
 			waiting.push(response_tx);
 			return;
 		}
+		log::warn!("request_current: not find in wait_list");
 
 		// Data is neither cached nor already requested, so we start fetching
 		// the data.
@@ -220,6 +224,8 @@ impl<B: BlockT> EthBlockDataCacheTask<B> {
 				.unwrap_or(&overrides.fallback);
 
 			let message = handler_call(handler);
+			log::warn!("request_current: send message: {message:?}");
+
 			let _ = task_tx.send(message).await;
 		});
 	}

client/rpc/src/eth/cache/mod.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/execute.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/submit.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/rpc/src/eth/transaction.rs

@@ -14,6 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 ethereum = { workspace = true, features = ["with-codec"] }
 ethereum-types = { workspace = true }
 scale-codec = { package = "parity-scale-codec", workspace = true }
+log = { workspace = true }
 
 # Substrate
 sc-client-api = { workspace = true }