Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

NV22 dragon state migration #3955

Merged
merged 7 commits into from
Mar 7, 2024
Merged

NV22 dragon state migration #3955

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3006fda
dragon state migration
LesnyRumcajs Feb 5, 2024
b1130ac
plumbing
LesnyRumcajs Feb 29, 2024
cf53246
new bundle
LesnyRumcajs Mar 5, 2024
515753f
Butterflynet nv22 (#4028)
LesnyRumcajs Mar 7, 2024
46a0d04
fix bitwidth nv17 bug
LesnyRumcajs Mar 7, 2024
0754f35
self-review
LesnyRumcajs Mar 7, 2024
d88ca42
force at least 3 threads for migrations + test fix
LesnyRumcajs Mar 7, 2024
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
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
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
View file
Open in desktop

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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
Loading