@@ -5,7 +5,6 @@ mod types;
55use crate :: shim:: actors:: init;
66use crate :: shim:: actors:: miner:: ext:: DeadlineExt ;
77use fil_actors_shared:: fvm_ipld_amt:: Amt ;
8- use fvm_shared3:: sector:: RegisteredSealProof ;
98use schemars:: JsonSchema ;
109use serde:: { Deserialize , Serialize } ;
1110pub use types:: * ;
@@ -17,7 +16,7 @@ use crate::eth::EthChainId;
1716use crate :: interpreter:: VMEvent ;
1817use crate :: libp2p:: NetworkMessage ;
1918use crate :: lotus_json:: lotus_json_with_self;
20- use crate :: networks:: { ChainConfig , NetworkChain } ;
19+ use crate :: networks:: ChainConfig ;
2120use crate :: shim:: actors:: market:: ext:: MarketStateExt as _;
2221use crate :: shim:: actors:: market:: DealState ;
2322use crate :: shim:: actors:: state_load:: * ;
@@ -2760,36 +2759,10 @@ impl RpcMethod<0> for StateGetNetworkParams {
27602759 let config = ctx. chain_config ( ) . as_ref ( ) ;
27612760 let policy = & config. policy ;
27622761
2763- // This is the correct implementation, but for conformance with Lotus,
2764- // until resolved there, we have to use a workaround. Replace this
2765- // once a version of Lotus is released with the correct implementation.
2766- // The change is already in the Lotus master branch.
2767- //let supported_proof_types = policy
2768- // .valid_pre_commit_proof_type
2769- // .iter()
2770- // .map(|p| i64::from(*p))
2771- // .sorted()
2772- // .map(|p| p.into())
2773- // .collect();
2774-
2775- use crate :: shim:: sector:: RegisteredSealProofV3 :: * ;
2776- let supported_proof_types = match config. network {
2777- NetworkChain :: Mainnet | NetworkChain :: Calibnet => {
2778- vec ! [ StackedDRG32GiBV1 , StackedDRG64GiBV1 ]
2779- }
2780- NetworkChain :: Butterflynet => {
2781- vec ! [ StackedDRG512MiBV1 , StackedDRG32GiBV1 , StackedDRG64GiBV1 ]
2782- }
2783- NetworkChain :: Devnet ( _) => {
2784- vec ! [ StackedDRG2KiBV1 , StackedDRG8MiBV1 ]
2785- }
2786- } ;
2787-
27882762 let params = NetworkParams {
27892763 network_name : ctx. network_name . clone ( ) ,
27902764 block_delay_secs : config. block_delay_secs as u64 ,
27912765 consensus_miner_min_power : policy. minimum_consensus_power . clone ( ) ,
2792- supported_proof_types,
27932766 pre_commit_challenge_delay : policy. pre_commit_challenge_delay ,
27942767 fork_upgrade_params : ForkUpgradeParams :: try_from ( config)
27952768 . context ( "Failed to get fork upgrade params" ) ?,
@@ -2808,8 +2781,6 @@ pub struct NetworkParams {
28082781 #[ schemars( with = "crate::lotus_json::LotusJson<BigInt>" ) ]
28092782 #[ serde( with = "crate::lotus_json" ) ]
28102783 consensus_miner_min_power : BigInt ,
2811- #[ schemars( with = "crate::lotus_json::LotusJson<i64>" ) ]
2812- supported_proof_types : Vec < RegisteredSealProof > ,
28132784 pre_commit_challenge_delay : ChainEpoch ,
28142785 fork_upgrade_params : ForkUpgradeParams ,
28152786 #[ serde( rename = "Eip155ChainID" ) ]
0 commit comments