Skip to content
Merged
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 @@ -39,6 +39,8 @@

### Changed

- [#7850](https://github.com/ChainSafe/forest/pull/7850): `Filecoin.StateGetNetworkParams` now reports `UpgradeXxHeight` (NV30), matching Lotus v1.39.0. The upgrade is not scheduled on any network yet.

- [#7833](https://github.com/ChainSafe/forest/pull/7833): Big integers in JSON-RPC parameters must fit the 1016-bit limit of their CBOR encoding. Larger values are rejected when the request is decoded.

- [#7805](https://github.com/ChainSafe/forest/pull/7805): Devnet defaults match Lotus v1.38.0 2k builds: the genesis network version defaults to 28, the upgrade heights follow Lotus, and the minimum consensus power is 2048. An enabled upgrade below genesis keeps its own version.
Expand Down
50 changes: 25 additions & 25 deletions Cargo.lock

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

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ fvm_ipld_encoding = "0.5.3"
fvm_ipld_kamt = "0.4.5"
fvm_shared2 = { package = "fvm_shared", version = "~2.12.2" }
fvm_shared3 = { package = "fvm_shared", version = "~3.14.2", features = ["proofs"] }
fvm_shared4 = { package = "fvm_shared", version = "~4.8.3", features = ["proofs"] }
fvm_shared4 = { package = "fvm_shared", version = "~4.8.4", features = ["proofs"] }
get-size2 = { workspace = true }
gethostname = "1"
git-version = "0.3"
Expand Down Expand Up @@ -255,7 +255,7 @@ cs_serde_bytes = "0.12"
derive-quickcheck-arbitrary = "0.1"
fickle = "0.3"
fvm_shared3 = { package = "fvm_shared", version = "~3.14.2", features = ["arb", "proofs", "testing"] }
fvm_shared4 = { package = "fvm_shared", version = "~4.8.3", features = ["arb", "proofs", "testing"] }
fvm_shared4 = { package = "fvm_shared", version = "~4.8.4", features = ["arb", "proofs", "testing"] }
hex = { version = "0.4", features = ["serde"] }
http-range-header = "0.4"
insta = { version = "1", features = ["yaml"] }
Expand Down
4 changes: 3 additions & 1 deletion scripts/devnet-forest-miner/.env
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
LOTUS_IMAGE=filecoin/lotus-all-in-one:v1.38.3-2k
LOTUS_IMAGE=filecoin/lotus-all-in-one:v1.39.0-2k
# Genesis network name. Lotus stamps it into the genesis block; Forest joins the
# same network via `--chain ${NETWORK_NAME}`, so the two must agree (this is what
# makes the `/fil/blocks/${NETWORK_NAME}` gossip topic line up).
Expand Down Expand Up @@ -26,4 +26,6 @@ TOCK_HEIGHT=24
GOLDEN_WEEK_HEIGHT=26
FIREHORSE_HEIGHT=28
SOLSTICE_HEIGHT=30
# Forest cannot run NV30 yet, so Lotus must not activate it.
XX_HEIGHT=999999999999999
TARGET_HEIGHT=34
1 change: 1 addition & 0 deletions scripts/devnet-forest-miner/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ x-lotus-heights: &lotus-heights
LOTUS_GOLDENWEEK_HEIGHT: ${GOLDEN_WEEK_HEIGHT}
LOTUS_FIREHORSE_HEIGHT: ${FIREHORSE_HEIGHT}
LOTUS_SOLSTICE_HEIGHT: ${SOLSTICE_HEIGHT}
LOTUS_XX_HEIGHT: ${XX_HEIGHT}

x-forest-heights: &forest-heights
FOREST_GENESIS_NETWORK_VERSION: ${GENESIS_NETWORK_VERSION}
Expand Down
4 changes: 3 additions & 1 deletion scripts/devnet/.env
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
LOTUS_IMAGE=filecoin/lotus-all-in-one:v1.38.3-2k
LOTUS_IMAGE=filecoin/lotus-all-in-one:v1.39.0-2k
# The genesis network name. Lotus stamps it into the genesis block, and both Forest nodes must agree.
NETWORK_NAME=devnet
FOREST_DATA_DIR=/forest_data
Expand Down Expand Up @@ -27,4 +27,6 @@ TOCK_HEIGHT=24
GOLDEN_WEEK_HEIGHT=26
FIREHORSE_HEIGHT=28
SOLSTICE_HEIGHT=30
# Forest cannot run NV30 yet, so Lotus must not activate it.
XX_HEIGHT=999999999999999
TARGET_HEIGHT=34
4 changes: 4 additions & 0 deletions scripts/devnet/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ services:
- LOTUS_GOLDENWEEK_HEIGHT=${GOLDEN_WEEK_HEIGHT}
- LOTUS_FIREHORSE_HEIGHT=${FIREHORSE_HEIGHT}
- LOTUS_SOLSTICE_HEIGHT=${SOLSTICE_HEIGHT}
- LOTUS_XX_HEIGHT=${XX_HEIGHT}
env_file:
- lotus.env
entrypoint: ["/bin/bash", "-c"]
Expand Down Expand Up @@ -81,6 +82,7 @@ services:
- LOTUS_GOLDENWEEK_HEIGHT=${GOLDEN_WEEK_HEIGHT}
- LOTUS_FIREHORSE_HEIGHT=${FIREHORSE_HEIGHT}
- LOTUS_SOLSTICE_HEIGHT=${SOLSTICE_HEIGHT}
- LOTUS_XX_HEIGHT=${XX_HEIGHT}
ports:
- ${LOTUS_RPC_PORT}:${LOTUS_RPC_PORT}
- ${LOTUS_P2P_PORT}:${LOTUS_P2P_PORT}
Expand Down Expand Up @@ -127,6 +129,7 @@ services:
- LOTUS_GOLDENWEEK_HEIGHT=${GOLDEN_WEEK_HEIGHT}
- LOTUS_FIREHORSE_HEIGHT=${FIREHORSE_HEIGHT}
- LOTUS_SOLSTICE_HEIGHT=${SOLSTICE_HEIGHT}
- LOTUS_XX_HEIGHT=${XX_HEIGHT}
ports:
- ${MINER_RPC_PORT}:${MINER_RPC_PORT}
env_file:
Expand Down Expand Up @@ -168,6 +171,7 @@ services:
- LOTUS_GOLDENWEEK_HEIGHT=${GOLDEN_WEEK_HEIGHT}
- LOTUS_FIREHORSE_HEIGHT=${FIREHORSE_HEIGHT}
- LOTUS_SOLSTICE_HEIGHT=${SOLSTICE_HEIGHT}
- LOTUS_XX_HEIGHT=${XX_HEIGHT}
entrypoint: ["/bin/bash", "-c"]
env_file:
- lotus.env
Expand Down
2 changes: 1 addition & 1 deletion scripts/tests/api_compare/.env
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Note: this should be a `fat` image so that it contains the pre-downloaded filecoin proof parameters
FOREST_IMAGE=ghcr.io/chainsafe/forest:edge-fat
LOTUS_IMAGE=filecoin/lotus-all-in-one:v1.38.3-calibnet
LOTUS_IMAGE=filecoin/lotus-all-in-one:v1.39.0-calibnet
FIL_PROOFS_PARAMETER_CACHE=/var/tmp/filecoin-proof-parameters
LOTUS_RPC_PORT=1234
LOTUS_VIA_GATEWAY_RPC_PORT=4568
Expand Down
2 changes: 1 addition & 1 deletion scripts/tests/bootstrapper/.env
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Note: this should be a `fat` image so that it contains the pre-downloaded filecoin proof parameters
LOTUS_IMAGE=filecoin/lotus-all-in-one:v1.38.3-calibnet
LOTUS_IMAGE=filecoin/lotus-all-in-one:v1.39.0-calibnet
FIL_PROOFS_PARAMETER_CACHE=/var/tmp/filecoin-proof-parameters
LOTUS_RPC_PORT=1234
FOREST_RPC_PORT=2345
Expand Down
2 changes: 1 addition & 1 deletion scripts/tests/snapshot_parity/.env
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
LOTUS_IMAGE=filecoin/lotus-all-in-one:v1.38.3-calibnet
LOTUS_IMAGE=filecoin/lotus-all-in-one:v1.39.0-calibnet
FIL_PROOFS_PARAMETER_CACHE=/var/tmp/filecoin-proof-parameters
LOTUS_RPC_PORT=1234
FOREST_RPC_PORT=2345
Expand Down
5 changes: 3 additions & 2 deletions src/networks/butterflynet/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ use crate::{
};

use super::{
DrandPoint, Height, HeightInfo, NetworkChain, actors_bundle::ACTOR_BUNDLES_METADATA,
drand::DRAND_QUICKNET, parse_bootstrap_peers,
DrandPoint, Height, HeightInfo, NetworkChain, UPGRADE_HEIGHT_UNSCHEDULED,
actors_bundle::ACTOR_BUNDLES_METADATA, drand::DRAND_QUICKNET, parse_bootstrap_peers,
};

/// Well-known network names.
Expand Down Expand Up @@ -109,6 +109,7 @@ pub static HEIGHT_INFOS: LazyLock<IndexMap<Height, HeightInfo>> = LazyLock::new(
make_height!(GoldenWeek, -30),
make_height!(FireHorse, -31),
make_height!(Solstice, 5220, get_bundle_cid("v19.0.1")),
make_height!(Xx, UPGRADE_HEIGHT_UNSCHEDULED),
])
});

Expand Down
3 changes: 2 additions & 1 deletion src/networks/calibnet/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ use crate::{
};

use super::{
DrandPoint, Height, HeightInfo, NetworkChain,
DrandPoint, Height, HeightInfo, NetworkChain, UPGRADE_HEIGHT_UNSCHEDULED,
actors_bundle::ACTOR_BUNDLES_METADATA,
drand::{DRAND_MAINNET, DRAND_QUICKNET},
parse_bootstrap_peers,
Expand Down Expand Up @@ -100,6 +100,7 @@ pub static HEIGHT_INFOS: LazyLock<IndexMap<Height, HeightInfo>> = LazyLock::new(
make_height!(FireHorse, 3_694_534, get_bundle_cid("v18.0.0")),
// 2026-09-28T12:59:30Z
make_height!(Solstice, 4_109_133, get_bundle_cid("v19.0.1")),
make_height!(Xx, UPGRADE_HEIGHT_UNSCHEDULED),
])
});

Expand Down
5 changes: 3 additions & 2 deletions src/networks/devnet/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ use strum::IntoEnumIterator as _;
use crate::{eth::EthChainId, make_height, shim::version::NetworkVersion};

use super::{
DrandPoint, Height, HeightInfo, NetworkChain, actors_bundle::ACTOR_BUNDLES_METADATA,
drand::DRAND_QUICKNET, get_upgrade_height_from_env,
DrandPoint, Height, HeightInfo, NetworkChain, UPGRADE_HEIGHT_UNSCHEDULED,
actors_bundle::ACTOR_BUNDLES_METADATA, drand::DRAND_QUICKNET, get_upgrade_height_from_env,
};

// https://github.com/ethereum-lists/chains/blob/6b1e3ccad1cfcaae5aa1ab917960258f0ef1a6b6/_data/chains/eip155-31415926.json
Expand Down Expand Up @@ -179,6 +179,7 @@ pub static HEIGHT_INFOS: LazyLock<IndexMap<Height, HeightInfo>> = LazyLock::new(
get_upgrade_height_from_env("FOREST_SOLSTICE_HEIGHT").unwrap_or(200),
get_bundle_cid("v19.0.1")
),
make_height!(Xx, UPGRADE_HEIGHT_UNSCHEDULED),
Comment thread
LesnyRumcajs marked this conversation as resolved.
Resolved
]);
for ((prev, prev_info), (next, next_info)) in Height::iter()
.filter_map(|height| Some((height, height_infos.get(&height)?)))
Expand Down
Loading
Loading