feat: rebase

Author: karlem

Cargo.toml

@@ -184,6 +184,8 @@ tracing-appender = "0.2.3"
 text-tables = "0.3.1"
 url = { version = "2.4.1", features = ["serde"] }
 zeroize = "1.6"
+parking_lot = "0.12"
+humantime-serde = "1.1"
 
 # Vendored for cross-compilation, see https://github.com/cross-rs/cross/wiki/Recipes#openssl
 # Make sure every top level build target actually imports this dependency, and don't end up

fendermint/actors-custom-car/src/manifest.rs

@@ -4,7 +4,7 @@ use anyhow::{anyhow, Context};
 use cid::Cid;
 use fendermint_actor_chainmetadata::CHAINMETADATA_ACTOR_NAME;
 use fendermint_actor_eam::IPC_EAM_ACTOR_NAME;
-use fendermint_actor_f3_cert_manager::F3_CERT_MANAGER_ACTOR_NAME;
+use fendermint_actor_f3_light_client::F3_LIGHT_CLIENT_ACTOR_NAME;
 use fendermint_actor_gas_market_eip1559::ACTOR_NAME as GAS_MARKET_EIP1559_ACTOR_NAME;
 use fvm_ipld_blockstore::Blockstore;
 use fvm_ipld_encoding::CborStore;
@@ -13,7 +13,7 @@ use std::collections::HashMap;
 // array of required actors
 pub const REQUIRED_ACTORS: &[&str] = &[
     CHAINMETADATA_ACTOR_NAME,
-    F3_CERT_MANAGER_ACTOR_NAME,
+    F3_LIGHT_CLIENT_ACTOR_NAME,
     IPC_EAM_ACTOR_NAME,
     GAS_MARKET_EIP1559_ACTOR_NAME,
 ];

fendermint/app/options/src/genesis.rs

@@ -227,9 +227,9 @@ pub struct GenesisFromParentArgs {
 
     /// Filecoin/Lotus RPC endpoint for fetching F3 certificate data (parent finality proofs).
     /// This is separate from parent_endpoint which is the EVM/Ethereum API.
-    /// Optional - if not provided, F3 data will not be fetched (e.g., when parent is not Filecoin).
+    /// Required for proof-based parent finality.
     #[arg(long)]
-    pub parent_filecoin_rpc: Option<url::Url>,
+    pub parent_filecoin_rpc: url::Url,
 
     /// Auth token for the Filecoin RPC endpoint.
     #[arg(long)]

fendermint/app/src/cmd/genesis.rs

@@ -4,6 +4,8 @@
 use anyhow::{anyhow, Context};
 use fendermint_actor_f3_light_client::types;
 use fendermint_crypto::PublicKey;
+// Temporarily disabled due to [email protected] compatibility issues
+// use filecoin_f3_lightclient::F3Client;
 use fvm_shared::address::Address;
 use ipc_api::subnet_id::SubnetID;
 use ipc_provider::config::subnet::{EVMSubnet, SubnetConfig};
@@ -350,13 +352,15 @@ pub async fn seal_genesis(genesis_file: &PathBuf, args: &SealGenesisArgs) -> any
     builder.write_to(args.output_path.clone()).await
 }
 
-/// Fetches F3 parameters from the parent Filecoin chain
+/// Fetches F3 certificate data from the parent Filecoin chain
 async fn fetch_f3_params_from_parent(
     parent_endpoint: &url::Url,
     parent_auth_token: Option<&String>,
 ) -> anyhow::Result<Option<ipc::F3Params>> {
+    use std::convert::TryFrom;
+
     tracing::info!(
-        "Fetching F3 parameters from parent chain at {}",
+        "Fetching F3 certificate data from parent chain at {}",
         parent_endpoint
     );
 
@@ -368,28 +372,11 @@ async fn fetch_f3_params_from_parent(
     // We use a dummy subnet ID here since F3 data is at the chain level, not subnet-specific
     let lotus_client = LotusJsonRPCClient::new(jsonrpc_client, SubnetID::default());
 
-    // Fetch F3 certificate which contains instance ID and finalized epochs
-    let certificate = lotus_client.f3_get_certificate().await?;
-
-    match certificate {
-        Some(cert) => {
-            let instance_id = cert.gpbft_instance;
+    // Fetch F3 data using the Lotus client
+    match lotus_client.f3_get_instance_id().await {
+        Ok(instance_id) => {
             tracing::info!("Found F3 instance ID: {}", instance_id);
 
-            // Extract finalized epochs from the EC chain
-            let finalized_epochs: Vec<i64> =
-                cert.ec_chain.iter().map(|entry| entry.epoch).collect();
-
-            if finalized_epochs.is_empty() {
-                return Err(anyhow::anyhow!("F3 certificate has empty EC chain"));
-            }
-
-            tracing::info!(
-                "Found {} finalized epochs, latest: {}",
-                finalized_epochs.len(),
-                finalized_epochs.iter().max().unwrap_or(&0)
-            );
-
             // Get power table for this instance
             let power_table_response = lotus_client.f3_get_power_table(instance_id).await?;
 
@@ -412,15 +399,36 @@ async fn fetch_f3_params_from_parent(
                 .collect();
             let power_table = power_table?;
 
-            tracing::info!("Successfully fetched F3 parameters from parent chain");
+            // Get latest certificate to extract finalized epochs
+            let certificate = lotus_client.f3_get_certificate().await?;
+            let finalized_epochs = if let Some(cert_response) = certificate {
+                // Collect all finalized epochs from the EC chain
+                let epochs: Vec<i64> = cert_response
+                    .ec_chain
+                    .iter()
+                    .map(|entry| entry.epoch)
+                    .collect();
+
+                if epochs.is_empty() {
+                    return Err(anyhow::anyhow!("F3 certificate has empty EC chain"));
+                }
+
+                epochs
+            } else {
+                // No certificate yet - start with empty finalized chain
+                Vec::new()
+            };
+
+            tracing::info!("Successfully fetched F3 certificate data from parent chain");
             Ok(Some(ipc::F3Params {
                 instance_id,
                 power_table,
                 finalized_epochs,
             }))
         }
-        None => Err(anyhow::anyhow!(
-            "No F3 certificate available - F3 might not be running on the parent chain"
+        Err(e) => Err(anyhow::anyhow!(
+            "Failed to fetch F3 certificate data from parent chain: {}",
+            e
         )),
     }
 }
@@ -450,20 +458,13 @@ pub async fn new_genesis_from_parent(
 
     let genesis_info = parent_provider.get_genesis_info(&args.subnet_id).await?;
 
-    // Fetch F3 certificate data from parent chain if Filecoin RPC endpoint is provided.
-    // If not provided, it means the parent is not Filecoin (e.g., a Fendermint subnet)
-    // and F3 data is not available.
-    let f3_params = if let Some(ref parent_filecoin_rpc) = args.parent_filecoin_rpc {
-        tracing::info!("Fetching F3 data from parent Filecoin chain");
-        fetch_f3_params_from_parent(
-            parent_filecoin_rpc,
-            args.parent_filecoin_auth_token.as_ref(),
-        )
-        .await?
-    } else {
-        tracing::info!("Skipping F3 data fetch - parent is not Filecoin");
-        None
-    };
+    // Fetch F3 certificate data from parent chain using Lotus client directly
+    // This requires the Filecoin/Lotus RPC endpoint, not the EVM endpoint
+    let f3_params = fetch_f3_params_from_parent(
+        &args.parent_filecoin_rpc,
+        args.parent_filecoin_auth_token.as_ref(),
+    )
+    .await?;
 
     tracing::debug!("F3 params: {:?}", f3_params);
 

fendermint/vm/interpreter/Cargo.toml

@@ -18,7 +18,6 @@ fendermint_vm_genesis = { path = "../genesis" }
 fendermint_vm_message = { path = "../message" }
 fendermint_vm_resolver = { path = "../resolver" }
 fendermint_vm_topdown = { path = "../topdown" }
-fendermint_vm_topdown_proof_service = { path = "../topdown/proof-service" }
 fendermint_crypto = { path = "../../crypto" }
 fendermint_eth_hardhat = { path = "../../eth/hardhat" }
 fendermint_eth_deployer = { path = "../../eth/deployer" }

fendermint/vm/interpreter/src/genesis.rs

@@ -534,6 +534,16 @@ struct DeployConfig<'a> {
     deployer_addr: ethers::types::Address,
 }
 
+/// Get the commit SHA for genesis contract deployment.
+/// For genesis, we use a default value as genesis is typically built at compile time.
+fn get_genesis_commit_sha() -> [u8; 32] {
+    // Use default value for genesis (matches test default)
+    let default_sha = b"c7d8f53f";
+    let mut result = [0u8; 32];
+    result[..default_sha.len()].copy_from_slice(default_sha);
+    result
+}
+
 fn deploy_contracts(
     ipc_contracts: Vec<ContractSourceAndName>,
     top_level_contracts: &EthContractMap,
@@ -564,7 +574,9 @@ fn deploy_contracts(
             GatewayParams::new(SubnetID::new(config.chain_id.into(), vec![]))
         };
 
-        let params = ConstructorParameters::new(ipc_params, validators)
+        // Get commit SHA for genesis deployment
+        let commit_sha = get_genesis_commit_sha();
+        let params = ConstructorParameters::new(ipc_params, validators, commit_sha)
             .context("failed to create gateway constructor")?;
 
         let facets = deployer

fendermint/vm/topdown/proof-service/Cargo.toml

@@ -24,7 +24,7 @@ rocksdb = { version = "0.21", features = ["multi-threaded-cf"] }
 futures = { workspace = true }
 
 # Fendermint
-fendermint_actor_f3_cert_manager = { path = "../../../actors/f3-cert-manager" }
+fendermint_actor_f3_light_client = { path = "../../../actors/f3-light-client" }
 fendermint_vm_genesis = { path = "../../genesis" }
 
 # IPC

ipc/cli/src/commands/subnet/create_genesis.rs

@@ -168,10 +168,9 @@ pub(crate) async fn create_genesis(
             subnet_id: subnet_id.clone(),
             parent_endpoint: parent.rpc_http().clone(),
             parent_auth_token: parent.auth_token(),
-            // For F3 data, use the same endpoint as parent_endpoint by default.
-            // In practice, for Filecoin/Calibration, both EVM and Lotus APIs are on the same endpoint.
-            // When using ipc-cli, the parent is typically Filecoin, so F3 is available.
-            parent_filecoin_rpc: Some(parent.rpc_http().clone()),
+            // For F3 data, use the same endpoint as parent_endpoint by default
+            // In practice, for Filecoin/Calibration, both EVM and Lotus APIs are on the same endpoint
+            parent_filecoin_rpc: parent.rpc_http().clone(),
             parent_filecoin_auth_token: parent.auth_token(),
             parent_gateway: parent.gateway_addr(),
             parent_registry: parent.registry_addr(),

ipc/provider/Cargo.toml

@@ -58,10 +58,6 @@ tendermint-rpc  = { workspace = true }
 tendermint  = { workspace = true }
 fendermint_rpc = { path = "../../fendermint/rpc" }
 
-fendermint_actor_f3_light_client = { path = "../../fendermint/actors/f3-light-client" }
-fendermint_vm_genesis = { path = "../../fendermint/vm/genesis" }
-
-
 fendermint_actor_f3_light_client = { path = "../../fendermint/actors/f3-light-client" }
 fendermint_vm_genesis = { path = "../../fendermint/vm/genesis" }
 

ipc/provider/src/lotus/client.rs

@@ -374,6 +374,18 @@ impl<T: JsonRpcClient + Send + Sync> LotusClient for LotusJsonRPCClient<T> {
         tracing::debug!("received f3_get_power_table_by_instance response: {r:?}");
         Ok(r)
     }
+
+    async fn f3_get_instance_id(&self) -> Result<u64> {
+        // Get the latest certificate which contains the instance ID
+        // There's no direct F3GetInstanceID method in Lotus
+        let cert = self.f3_get_certificate().await?;
+        match cert {
+            Some(cert_response) => Ok(cert_response.gpbft_instance),
+            None => Err(anyhow!(
+                "No F3 certificate available - F3 might not be running on this chain"
+            )),
+        }
+    }
 }
 
 impl<T: JsonRpcClient + Send + Sync> LotusJsonRPCClient<T> {