fix: Fix the GasEstimateMessageGas API (#6109)

Author: akaladarshi

src/chain/store/chain_store.rs

@@ -661,7 +661,7 @@ where
 
             for message in unsigned_box.chain(signed_box) {
                 let from_address = &message.from();
-                if applied.contains_key(from_address) {
+                if !applied.contains_key(from_address) {
                     let actor_state = state
                         .get_actor(from_address)?
                         .ok_or_else(|| Error::Other("Actor state not found".to_string()))?;

src/cli_shared/cli/config.rs

@@ -1,16 +1,16 @@
 // Copyright 2019-2025 ChainSafe Systems
 // SPDX-License-Identifier: Apache-2.0, MIT
 
+use super::client::Client;
 use crate::db::db_engine::DbConfig;
 use crate::libp2p::Libp2pConfig;
 use crate::shim::clock::ChainEpoch;
+use crate::shim::econ::TokenAmount;
 use crate::utils::misc::env::is_env_set_and_truthy;
 use crate::{chain_sync::SyncConfig, networks::NetworkChain};
 use serde::{Deserialize, Serialize};
 use std::path::PathBuf;
 
-use super::client::Client;
-
 const FOREST_CHAIN_INDEXER_ENABLED: &str = "FOREST_CHAIN_INDEXER_ENABLED";
 
 /// Structure that defines daemon configuration when process is detached
@@ -92,6 +92,23 @@ impl Default for ChainIndexerConfig {
     }
 }
 
+#[derive(Deserialize, Serialize, PartialEq, Eq, Debug, Clone)]
+#[cfg_attr(test, derive(derive_quickcheck_arbitrary::Arbitrary))]
+pub struct FeeConfig {
+    /// Indicates the default max fee for a message
+    #[serde(with = "crate::lotus_json")]
+    pub max_fee: TokenAmount,
+}
+
+impl Default for FeeConfig {
+    fn default() -> Self {
+        // The code is taken from https://github.com/filecoin-project/lotus/blob/release/v1.34.1/node/config/def.go#L39
+        Self {
+            max_fee: TokenAmount::from_atto(70_000_000_000_000_000u64), // 0.07 FIL
+        }
+    }
+}
+
 #[derive(Serialize, Deserialize, PartialEq, Default, Debug, Clone)]
 #[cfg_attr(test, derive(derive_quickcheck_arbitrary::Arbitrary))]
 #[serde(default)]
@@ -104,6 +121,7 @@ pub struct Config {
     pub daemon: DaemonConfig,
     pub events: EventsConfig,
     pub fevm: FevmConfig,
+    pub fee: FeeConfig,
     pub chain_indexer: ChainIndexerConfig,
 }
 

src/daemon/context.rs

@@ -79,6 +79,7 @@ fn get_chain_config_and_set_network(config: &Config) -> Arc<ChainConfig> {
     Arc::new(ChainConfig {
         enable_indexer: config.chain_indexer.enable_indexer,
         enable_receipt_event_caching: config.client.enable_rpc,
+        default_max_fee: config.fee.max_fee.clone(),
         ..chain_config
     })
 }

src/lotus_json/signed_message.rs

@@ -59,8 +59,8 @@ impl HasLotusJson for SignedMessage {
                 },
             }),
             SignedMessage {
-                message: crate::shim::message::Message::default(),
-                signature: crate::shim::crypto::Signature {
+                message: Message::default(),
+                signature: Signature {
                     sig_type: crate::shim::crypto::SignatureType::Bls,
                     bytes: Vec::from_iter(*b"hello world!"),
                 },

src/networks/mod.rs

@@ -10,6 +10,7 @@ use fil_actors_shared::v13::runtime::Policy;
 use fvm_ipld_blockstore::Blockstore;
 use itertools::Itertools;
 use libp2p::Multiaddr;
+use num_traits::Zero;
 use serde::{Deserialize, Serialize};
 use strum::IntoEnumIterator;
 use strum_macros::Display;
@@ -283,6 +284,7 @@ pub struct ChainConfig {
     pub f3_initial_power_table: Option<Cid>,
     pub enable_indexer: bool,
     pub enable_receipt_event_caching: bool,
+    pub default_max_fee: TokenAmount,
 }
 
 impl ChainConfig {
@@ -316,6 +318,7 @@ impl ChainConfig {
             ),
             enable_indexer: false,
             enable_receipt_event_caching: true,
+            default_max_fee: TokenAmount::zero(),
         }
     }
 
@@ -352,6 +355,7 @@ impl ChainConfig {
             ),
             enable_indexer: false,
             enable_receipt_event_caching: true,
+            default_max_fee: TokenAmount::zero(),
         }
     }
 
@@ -378,6 +382,7 @@ impl ChainConfig {
             f3_initial_power_table: None,
             enable_indexer: false,
             enable_receipt_event_caching: true,
+            default_max_fee: TokenAmount::zero(),
         }
     }
 
@@ -410,6 +415,7 @@ impl ChainConfig {
             f3_initial_power_table: None,
             enable_indexer: false,
             enable_receipt_event_caching: true,
+            default_max_fee: TokenAmount::zero(),
         }
     }
 

src/rpc/methods/chain.rs

@@ -219,7 +219,7 @@ impl RpcMethod<1> for ChainGetMessage {
     const DESCRIPTION: Option<&'static str> = Some("Returns the message with the specified CID.");
 
     type Params = (Cid,);
-    type Ok = Message;
+    type Ok = FlattenedApiMessage;
 
     async fn handle(
         ctx: Ctx<impl Blockstore>,
@@ -229,10 +229,13 @@ impl RpcMethod<1> for ChainGetMessage {
             .store()
             .get_cbor(&message_cid)?
             .with_context(|| format!("can't find message with cid {message_cid}"))?;
-        Ok(match chain_message {
+        let message = match chain_message {
             ChainMessage::Signed(m) => m.into_message(),
             ChainMessage::Unsigned(m) => m,
-        })
+        };
+
+        let cid = message.cid();
+        Ok(FlattenedApiMessage { message, cid })
     }
 }
 
@@ -1357,6 +1360,18 @@ pub struct ApiMessage {
 
 lotus_json_with_self!(ApiMessage);
 
+#[derive(Serialize, Deserialize, JsonSchema, Clone, Debug, Eq, PartialEq)]
+pub struct FlattenedApiMessage {
+    #[serde(flatten, with = "crate::lotus_json")]
+    #[schemars(with = "LotusJson<Message>")]
+    pub message: Message,
+    #[serde(rename = "CID", with = "crate::lotus_json")]
+    #[schemars(with = "LotusJson<Cid>")]
+    pub cid: Cid,
+}
+
+lotus_json_with_self!(FlattenedApiMessage);
+
 #[derive(Debug, Clone, Serialize, Deserialize, JsonSchema)]
 pub struct ForestChainExportParams {
     pub version: FilecoinSnapshotVersion,

src/rpc/methods/eth.rs

@@ -848,7 +848,7 @@ impl RpcMethod<0> for EthGasPrice {
         let ts = ctx.chain_store().heaviest_tipset();
         let block0 = ts.block_headers().first();
         let base_fee = block0.parent_base_fee.atto();
-        let tip = crate::rpc::gas::estimate_gas_premium(&ctx, 0)
+        let tip = crate::rpc::gas::estimate_gas_premium(&ctx, 0, &ApiTipsetKey(None))
             .await
             .map(|gas_premium| gas_premium.atto().to_owned())
             .unwrap_or_default();
@@ -2321,7 +2321,7 @@ impl RpcMethod<0> for EthMaxPriorityFeePerGas {
         ctx: Ctx<impl Blockstore + Send + Sync + 'static>,
         (): Self::Params,
     ) -> Result<Self::Ok, ServerError> {
-        match crate::rpc::gas::estimate_gas_premium(&ctx, 0).await {
+        match gas::estimate_gas_premium(&ctx, 0, &ApiTipsetKey(None)).await {
             Ok(gas_premium) => Ok(EthBigInt(gas_premium.atto().clone())),
             Err(_) => Ok(EthBigInt(num_bigint::BigInt::zero())),
         }