diff --git a/CHANGELOG.md b/CHANGELOG.md index 2529cb9e3c3..ef335ee45bf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -41,6 +41,8 @@ ### Fixed +- [#7194](https://github.com/ChainSafe/forest/pull/7194): Added `UpgradeXxHeight` placeholder for the NV29 network upgrade. + - [#7211](https://github.com/ChainSafe/forest/pull/7211): Fixed `forest-wallet` to allow using the unencrypted keystore with `--encrypt false` when an encrypted keystore also exists. - [#7129](https://github.com/ChainSafe/forest/pull/7129): Fixed a few inaccurate cache size metrics. diff --git a/docs/openrpc-specs/v0.json b/docs/openrpc-specs/v0.json index 8e0d2461325..f01b7e7ee4a 100644 --- a/docs/openrpc-specs/v0.json +++ b/docs/openrpc-specs/v0.json @@ -10338,6 +10338,10 @@ "UpgradeWatermelonHeight": { "type": "integer", "format": "int64" + }, + "UpgradeXxHeight": { + "type": "integer", + "format": "int64" } }, "required": [ @@ -10373,7 +10377,8 @@ "UpgradeTeepHeight", "UpgradeTockHeight", "UpgradeGoldenWeekHeight", - "UpgradeFireHorseHeight" + "UpgradeFireHorseHeight", + "UpgradeXxHeight" ] }, "GasTrace": { diff --git a/docs/openrpc-specs/v1.json b/docs/openrpc-specs/v1.json index ff91b9b37b2..6f3e534f81b 100644 --- a/docs/openrpc-specs/v1.json +++ b/docs/openrpc-specs/v1.json @@ -10549,6 +10549,10 @@ "UpgradeWatermelonHeight": { "type": "integer", "format": "int64" + }, + "UpgradeXxHeight": { + "type": "integer", + "format": "int64" } }, "required": [ @@ -10584,7 +10588,8 @@ "UpgradeTeepHeight", "UpgradeTockHeight", "UpgradeGoldenWeekHeight", - "UpgradeFireHorseHeight" + "UpgradeFireHorseHeight", + "UpgradeXxHeight" ] }, "GasTrace": { diff --git a/scripts/tests/api_compare/filter-list b/scripts/tests/api_compare/filter-list index 02dc8cafde9..f749dc6fadb 100644 --- a/scripts/tests/api_compare/filter-list +++ b/scripts/tests/api_compare/filter-list @@ -1,7 +1,6 @@ # This list contains potentially broken methods (or tests) that are ignored. # They should be considered bugged, and not used until the root cause is resolved. -!Filecoin.StateGetNetworkParams !Filecoin.EthEstimateGas !Filecoin.EthGetBlockByHash !Filecoin.EthGetBlockByNumber diff --git a/scripts/tests/api_compare/filter-list-gateway b/scripts/tests/api_compare/filter-list-gateway index 24acbdc7b0e..870225d6f8c 100644 --- a/scripts/tests/api_compare/filter-list-gateway +++ b/scripts/tests/api_compare/filter-list-gateway @@ -65,8 +65,6 @@ !Filecoin.StateSearchMsg # https://github.com/filecoin-project/lotus/pull/13562 !Filecoin.EthGetTransactionReceiptLimited -# https://github.com/filecoin-project/lotus/pull/13640 -!Filecoin.StateGetNetworkParams # https://github.com/filecoin-project/lotus/pull/13644 !Filecoin.EthEstimateGas # https://github.com/filecoin-project/lotus/pull/13618 diff --git a/scripts/tests/api_compare/filter-list-offline b/scripts/tests/api_compare/filter-list-offline index b35a2394123..782ee74579f 100644 --- a/scripts/tests/api_compare/filter-list-offline +++ b/scripts/tests/api_compare/filter-list-offline @@ -33,6 +33,5 @@ !Filecoin.ChainSetHead !Filecoin.EthTraceFilter !Filecoin.EthTraceReplayBlockTransactions -!Filecoin.StateGetNetworkParams !Filecoin.EthEstimateGas !Filecoin.EthGetBlockByHash diff --git a/src/rpc/methods/state.rs b/src/rpc/methods/state.rs index 2d517f61b68..b4d7efd8f62 100644 --- a/src/rpc/methods/state.rs +++ b/src/rpc/methods/state.rs @@ -14,7 +14,7 @@ use crate::eth::EthChainId; use crate::interpreter::{MessageCallbackCtx, VMTrace}; use crate::libp2p::NetworkMessage; use crate::lotus_json::{LotusJson, lotus_json_with_self}; -use crate::networks::ChainConfig; +use crate::networks::{ChainConfig, NetworkChain}; use crate::prelude::*; use crate::rpc::registry::actors_reg::load_and_serialize_actor_state; use crate::shim::actors::market::DealState; @@ -3265,7 +3265,8 @@ pub struct ForkUpgradeParams { upgrade_tock_height: ChainEpoch, upgrade_golden_week_height: ChainEpoch, upgrade_fire_horse_height: ChainEpoch, - //upgrade_xxx_height: ChainEpoch, + // placeholder for the next network upgrade + upgrade_xx_height: ChainEpoch, } impl TryFrom<&ChainConfig> for ForkUpgradeParams { @@ -3315,6 +3316,10 @@ impl TryFrom<&ChainConfig> for ForkUpgradeParams { upgrade_tock_height: get_height(Tock)?, upgrade_golden_week_height: get_height(GoldenWeek)?, upgrade_fire_horse_height: get_height(FireHorse)?, + upgrade_xx_height: match config.network { + NetworkChain::Mainnet => 9_999_999_999, + _ => 999_999_999_999_999, + }, }) } } diff --git a/src/rpc/snapshots/forest__rpc__tests__rpc__v0.snap b/src/rpc/snapshots/forest__rpc__tests__rpc__v0.snap index 3c699e5a5fb..95f9e3b280e 100644 --- a/src/rpc/snapshots/forest__rpc__tests__rpc__v0.snap +++ b/src/rpc/snapshots/forest__rpc__tests__rpc__v0.snap @@ -6572,6 +6572,9 @@ components: UpgradeWatermelonHeight: type: integer format: int64 + UpgradeXxHeight: + type: integer + format: int64 required: - UpgradeSmokeHeight - UpgradeBreezeHeight @@ -6606,6 +6609,7 @@ components: - UpgradeTockHeight - UpgradeGoldenWeekHeight - UpgradeFireHorseHeight + - UpgradeXxHeight GasTrace: type: object properties: diff --git a/src/rpc/snapshots/forest__rpc__tests__rpc__v1.snap b/src/rpc/snapshots/forest__rpc__tests__rpc__v1.snap index ab678528596..01a7abe896f 100644 --- a/src/rpc/snapshots/forest__rpc__tests__rpc__v1.snap +++ b/src/rpc/snapshots/forest__rpc__tests__rpc__v1.snap @@ -6688,6 +6688,9 @@ components: UpgradeWatermelonHeight: type: integer format: int64 + UpgradeXxHeight: + type: integer + format: int64 required: - UpgradeSmokeHeight - UpgradeBreezeHeight @@ -6722,6 +6725,7 @@ components: - UpgradeTockHeight - UpgradeGoldenWeekHeight - UpgradeFireHorseHeight + - UpgradeXxHeight GasTrace: type: object properties: diff --git a/src/tool/subcommands/api_cmd/test_snapshots.txt b/src/tool/subcommands/api_cmd/test_snapshots.txt index c7e08f24d96..310ed20b0bc 100644 --- a/src/tool/subcommands/api_cmd/test_snapshots.txt +++ b/src/tool/subcommands/api_cmd/test_snapshots.txt @@ -278,7 +278,7 @@ filecoin_stategetbeaconentry_1737546933208724.rpcsnap.json.zst filecoin_stategetclaim_1737546933208940.rpcsnap.json.zst filecoin_stategetclaims_1737546933208977.rpcsnap.json.zst filecoin_stategetid_1764943126105310.rpcsnap.json.zst -filecoin_stategetnetworkparams_1777517671344321.rpcsnap.json.zst +filecoin_stategetnetworkparams_1781890385127277.rpcsnap.json.zst filecoin_stategetrandomnessdigestfrombeacon_1737546933236534.rpcsnap.json.zst filecoin_stategetrandomnessdigestfromtickets_1737546933236558.rpcsnap.json.zst filecoin_stategetrandomnessfrombeacon_1737546933236581.rpcsnap.json.zst