Skip to content

Commit

Permalink
NV22 dragon state migration (#3955)
Browse files Browse the repository at this point in the history
  • Loading branch information
LesnyRumcajs authored Mar 7, 2024
1 parent a18e27e commit 2f625fb
Show file tree
Hide file tree
Showing 22 changed files with 726 additions and 89 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,9 @@
`Filecoin.NetAgentVersion` and `--agent` flag to the `forest-cli net peers`
subcommand, that will list the agent version of the connected peers.

- [#3995](https://github.com/ChainSafe/forest/pull/3955) Added support for the
NV22 _Dragon_ network upgrade, together with the required state migration.

### Changed

### Removed
Expand Down
142 changes: 110 additions & 32 deletions Cargo.lock

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

25 changes: 13 additions & 12 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -52,20 +52,21 @@ dialoguer = "0.11"
digest = "0.10.5"
directories = "5"
ethereum-types = "0.14.1"
fil_actor_account_state = { version = "9.4.0" }
fil_actor_cron_state = { version = "9.4.0" }
fil_actor_datacap_state = { version = "9.4.0" }
fil_actor_init_state = { version = "9.4.0" }
fil_actor_interface = { version = "9.4.0" }
fil_actor_market_state = { version = "9.4.0" }
fil_actor_miner_state = { version = "9.4.0" }
fil_actor_power_state = { version = "9.4.0" }
fil_actor_reward_state = { version = "9.4.0" }
fil_actor_system_state = { version = "9.4.0" }
fil_actor_verifreg_state = { version = "9.4.0" }
fil_actors_shared = { version = "9.4.0", features = ["json"] }
fil_actor_account_state = { version = "10.0.0-dev.4" }
fil_actor_cron_state = { version = "10.0.0-dev.4" }
fil_actor_datacap_state = { version = "10.0.0-dev.4" }
fil_actor_init_state = { version = "10.0.0-dev.4" }
fil_actor_interface = { version = "10.0.0-dev.4" }
fil_actor_market_state = { version = "10.0.0-dev.4" }
fil_actor_miner_state = { version = "10.0.0-dev.4" }
fil_actor_power_state = { version = "10.0.0-dev.4" }
fil_actor_reward_state = { version = "10.0.0-dev.4" }
fil_actor_system_state = { version = "10.0.0-dev.4" }
fil_actor_verifreg_state = { version = "10.0.0-dev.4" }
fil_actors_shared = { version = "10.0.0-dev.4", features = ["json"] }
filecoin-proofs-api = { version = "16.0", default-features = false }
flume = "0.11"
frc46_token = "10.0.0"
fs_extra = "1.2"
futures = "0.3"
fvm2 = { package = "fvm", version = "~2.7", default-features = false }
Expand Down
4 changes: 2 additions & 2 deletions build/bootstrap/butterflynet
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
/dns4/bootstrap-0.butterfly.fildev.network/tcp/1347/p2p/12D3KooWFbgk3NSUv7u3kYqLUfVi5ycmzkVoCMA6DFWNJScazsh1
/dns4/bootstrap-1.butterfly.fildev.network/tcp/1347/p2p/12D3KooWLsnUi7HD2camXmvhmfHke53krsbFfFf5eHh6g2G3m2Nt
/dns4/bootstrap-0.butterfly.fildev.network/tcp/1347/p2p/12D3KooWQDmegAZg23vAgxoGzRsYb8Ma4oW2p759QrGyC9Y6Bszu
/dns4/bootstrap-1.butterfly.fildev.network/tcp/1347/p2p/12D3KooWNi7kCgFSNDKMuKu1ng8LCZtB1rWVy4yZG8UDWyUdLaDM
8 changes: 4 additions & 4 deletions scripts/devnet/.env
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
LOTUS_IMAGE=ghcr.io/chainsafe/lotus-devnet:2024-02-29-a2919fe
LOTUS_IMAGE=ghcr.io/chainsafe/lotus-devnet:2024-03-07-b74be0f
FOREST_DATA_DIR=/forest_data
LOTUS_DATA_DIR=/lotus_data
FIL_PROOFS_PARAMETER_CACHE=/var/tmp/filecoin-proof-parameters
Expand All @@ -12,6 +12,6 @@ HYGGE_HEIGHT=-9
LIGHTNING_HEIGHT=3
THUNDER_HEIGHT=6
WATERMELON_HEIGHT=9
DRAGON_HEIGHT=1000
DRAND_QUICKNET_HEIGHT=12
TARGET_HEIGHT=15
DRAGON_HEIGHT=12
DRAND_QUICKNET_HEIGHT=15
TARGET_HEIGHT=20
2 changes: 1 addition & 1 deletion scripts/devnet/lotus.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ RUN apt-get update && apt-get install -y ca-certificates build-essential clang o

WORKDIR /lotus

RUN git clone --depth 1 --branch v1.25.2 https://github.com/filecoin-project/lotus.git .
RUN git clone --depth 1 --branch v1.26.0-rc2 https://github.com/filecoin-project/lotus.git .

RUN CGO_CFLAGS_ALLOW="-D__BLST_PORTABLE__" \
CGO_CFLAGS="-D__BLST_PORTABLE__" \
Expand Down
Loading

0 comments on commit 2f625fb

Please sign in to comment.