Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@

### Fixed

- [#7194](https://github.com/ChainSafe/forest/pull/7194): Added `UpgradeXxHeight` placeholder for the NV29 network upgrade.

- [#7129](https://github.com/ChainSafe/forest/pull/7129): Fixed a few inaccurate cache size metrics.

- [#6974](https://github.com/ChainSafe/forest/issues/6974): Fixed the message pool reporting a still-pending nonce as the next nonce after an applied message was removed.
Expand Down
7 changes: 6 additions & 1 deletion docs/openrpc-specs/v0.json
Original file line number Diff line number Diff line change
Expand Up @@ -10257,6 +10257,10 @@
"UpgradeWatermelonHeight": {
"type": "integer",
"format": "int64"
},
"UpgradeXxHeight": {
"type": "integer",
"format": "int64"
}
},
"required": [
Expand Down Expand Up @@ -10292,7 +10296,8 @@
"UpgradeTeepHeight",
"UpgradeTockHeight",
"UpgradeGoldenWeekHeight",
"UpgradeFireHorseHeight"
"UpgradeFireHorseHeight",
"UpgradeXxHeight"
]
},
"GasTrace": {
Expand Down
7 changes: 6 additions & 1 deletion docs/openrpc-specs/v1.json
Original file line number Diff line number Diff line change
Expand Up @@ -10471,6 +10471,10 @@
"UpgradeWatermelonHeight": {
"type": "integer",
"format": "int64"
},
"UpgradeXxHeight": {
"type": "integer",
"format": "int64"
}
},
"required": [
Expand Down Expand Up @@ -10506,7 +10510,8 @@
"UpgradeTeepHeight",
"UpgradeTockHeight",
"UpgradeGoldenWeekHeight",
"UpgradeFireHorseHeight"
"UpgradeFireHorseHeight",
"UpgradeXxHeight"
]
},
"GasTrace": {
Expand Down
1 change: 0 additions & 1 deletion scripts/tests/api_compare/filter-list
Original file line number Diff line number Diff line change
@@ -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
Comment thread
sudo-shashank marked this conversation as resolved.
2 changes: 0 additions & 2 deletions scripts/tests/api_compare/filter-list-gateway
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion scripts/tests/api_compare/filter-list-offline
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,5 @@
!Filecoin.ChainSetHead
!Filecoin.EthTraceFilter
!Filecoin.EthTraceReplayBlockTransactions
!Filecoin.StateGetNetworkParams
!Filecoin.EthEstimateGas
!Filecoin.EthGetBlockByHash
9 changes: 7 additions & 2 deletions src/rpc/methods/state.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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,
},
})
}
}
Expand Down
4 changes: 4 additions & 0 deletions src/rpc/snapshots/forest__rpc__tests__rpc__v0.snap

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions src/rpc/snapshots/forest__rpc__tests__rpc__v1.snap

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/tool/subcommands/api_cmd/test_snapshots.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading