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.

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

[WIP] chore: update wasmtime #12449

Draft
wants to merge 22 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
1c44e18
chore: update ffi
kamuik16 Aug 28, 2024
5985e28
chore: update go-state-types
kamuik16 Aug 28, 2024
7248fea
chore: update actors bundle
kamuik16 Aug 28, 2024
e59780c
chore: update build constants
kamuik16 Aug 28, 2024
12de475
chore: make actors-gen
kamuik16 Aug 28, 2024
888130d
chore: update chain/consensus/filcns/upgrades.go
kamuik16 Aug 28, 2024
8d37a84
chore: remaining steps
kamuik16 Aug 28, 2024
2e9b1f2
chore: run `make gen` and `make docsgen-cli`
rjan90 Aug 29, 2024
5532bde
fix(test): Add OpenCL deps to CI workflow
rjan90 Aug 30, 2024
b28cbaf
fix(test): Configure OpenCL for Lotus build in CI
rjan90 Aug 30, 2024
55d4cbb
Revert "fix(test): Configure OpenCL for Lotus build in CI"
rjan90 Sep 2, 2024
790fe85
Revert "fix(test): Add OpenCL deps to CI workflow"
rjan90 Sep 2, 2024
9dcc85e
fix(CI): ensure dependencies are installed before build
rjan90 Sep 2, 2024
db53573
chore(ci): build portable blst
rvagg Sep 4, 2024
53bab69
chore(ci): build from source
rjan90 Sep 9, 2024
ab97e25
chore(ci): capture build logging and CPU flags
rjan90 Sep 9, 2024
ac54fea
chore(ci): maximally portable ffi (#12440)
rvagg Sep 10, 2024
742635a
fix: update account.State import in migration test
rjan90 Sep 11, 2024
9425188
chore(deps): use new FFI_PORTABLE flag for filecoin-ffi builds (#12446)
rvagg Sep 11, 2024
da09bd5
chore: tests: `cp --recursive` does not exist on bsd/darwin
ribasushi Sep 8, 2024
e13b444
docs: fix command for getting latest release tag in LOTUS_RELEASE_FLO…
BigLep Sep 11, 2024
70b53e4
[WIP] chore: update wasmtime
Stebalien Sep 11, 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
8 changes: 4 additions & 4 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ jobs:
echo -e "path<<EOF\n$CACHE_PATH\nEOF" | tee -a $GITHUB_OUTPUT
- id: make_deps
env:
CACHE_KEY: ${{ runner.os }}-${{ runner.arch }}-make-deps-${{ hashFiles('./.git/modules/extern/filecoin-ffi/HEAD') }}
CACHE_KEY: ${{ runner.os }}-${{ runner.arch }}-make-deps-${{ hashFiles('./.git/modules/extern/filecoin-ffi/HEAD') }}-p
CACHE_PATH: |
./extern/filecoin-ffi/filcrypto.h
./extern/filecoin-ffi/libfilcrypto.a
Expand All @@ -206,14 +206,14 @@ jobs:
key: ${{ steps.make_deps.outputs.key }}
path: ${{ steps.make_deps.outputs.path }}
lookup-only: true
- if: steps.restore_fetch_params.outputs.cache-hit != 'true'
- if: steps.restore_fetch_params.outputs.cache-hit != 'true' || steps.restore_make_deps.outputs.cache-hit != 'true'
uses: ./.github/actions/install-system-dependencies
- if: steps.restore_fetch_params.outputs.cache-hit != 'true'
- if: steps.restore_fetch_params.outputs.cache-hit != 'true' || steps.restore_make_deps.outputs.cache-hit != 'true'
uses: ./.github/actions/install-go
- if: steps.restore_fetch_params.outputs.cache-hit != 'true' || steps.restore_make_deps.outputs.cache-hit != 'true'
env:
GITHUB_TOKEN: ${{ github.token }}
run: make deps
run: FFI_PORTABLE=1 make deps
- if: steps.restore_fetch_params.outputs.cache-hit != 'true'
run: make lotus
- if: steps.restore_fetch_params.outputs.cache-hit != 'true'
Expand Down
4 changes: 2 additions & 2 deletions LOTUS_RELEASE_FLOW.md
Original file line number Diff line number Diff line change
Expand Up @@ -150,8 +150,8 @@ Given Lotus Miner is being actively replaced by [Curio](https://github.com/filec
`releases` goal was to point to the latest stable tagged release of Lotus software for convenience and script. This worked when Lotus Node and Miner were released together, but with the [2024Q3 split of releasing Lotus Node and Miner separately](https://github.com/filecoin-project/lotus/issues/12010), there isn't necessarily a single commit to track for the latest released software of both. Rather than having ambiguity by tracking Lotus Node or Lotus Miner releases, we [decided it was clearer to deprecate the branch](https://github.com/filecoin-project/lotus/issues/12374).

That said, one can still programmatically get the latest release based on the [Branch and Tag Strategy](#branch-and-tag-strategy) with:
* Lotus Node: `git tag -l 'v*' | sort -V -r | head -n 1`
* Lotus Miner: `git tag -l 'miner/v*' | sort -V -r | head -n 1`
* Lotus Node: `git tag -l 'v*' | grep -v "-" | sort -V -r | head -n 1`
* Lotus Miner: `git tag -l 'miner/v*' | grep -v "-" | sort -V -r | head -n 1`

## Related Items

Expand Down
1 change: 1 addition & 0 deletions api/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,7 @@ type ForkUpgradeParams struct {
UpgradeDragonHeight abi.ChainEpoch
UpgradePhoenixHeight abi.ChainEpoch
UpgradeWaffleHeight abi.ChainEpoch
UpgradeOmenHeight abi.ChainEpoch
}

// ChainExportConfig holds configuration for chain ranged exports.
Expand Down
Binary file added build/actors/v15.tar.zst
Binary file not shown.
2 changes: 1 addition & 1 deletion build/buildconstants/params.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,6 @@ var Devnet = true
/* inline-gen template
const TestNetworkVersion = network.Version{{.latestNetworkVersion}}
/* inline-gen start */
const TestNetworkVersion = network.Version23
const TestNetworkVersion = network.Version24

/* inline-gen end */
9 changes: 6 additions & 3 deletions build/buildconstants/params_2k.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ const GenesisFile = ""
var NetworkBundle = "devnet"
var ActorDebugging = true

var GenesisNetworkVersion = network.Version22
var GenesisNetworkVersion = network.Version23

var UpgradeBreezeHeight = abi.ChainEpoch(-1)

Expand Down Expand Up @@ -68,7 +68,9 @@ var UpgradeDragonHeight = abi.ChainEpoch(-24)

var UpgradePhoenixHeight = abi.ChainEpoch(-25)

var UpgradeWaffleHeight = abi.ChainEpoch(200)
var UpgradeWaffleHeight = abi.ChainEpoch(-26)

var UpgradeOmenHeight = abi.ChainEpoch(200)

// This fix upgrade only ran on calibrationnet
const UpgradeWatermelonFixHeight = -100
Expand Down Expand Up @@ -156,8 +158,9 @@ func init() {
UpgradeWatermelonHeight = getUpgradeHeight("LOTUS_WATERMELON_HEIGHT", UpgradeWatermelonHeight)
UpgradeDragonHeight = getUpgradeHeight("LOTUS_DRAGON_HEIGHT", UpgradeDragonHeight)
UpgradeWaffleHeight = getUpgradeHeight("LOTUS_WAFFLE_HEIGHT", UpgradeWaffleHeight)

UpgradePhoenixHeight = getUpgradeHeight("LOTUS_PHOENIX_HEIGHT", UpgradePhoenixHeight)
UpgradeOmenHeight = getUpgradeHeight("LOTUS_OMEN_HEIGHT", UpgradeOmenHeight)

DrandSchedule = map[abi.ChainEpoch]DrandEnum{
0: DrandQuicknet,
}
Expand Down
4 changes: 3 additions & 1 deletion build/buildconstants/params_butterfly.go
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,10 @@ const UpgradeThunderHeight = -23
const UpgradeWatermelonHeight = -24
const UpgradeDragonHeight = -25
const UpgradePhoenixHeight = -26
const UpgradeWaffleHeight = -27

const UpgradeWaffleHeight = 100
// ??????
const UpgradeOmenHeight = 999999999999999

// This fix upgrade only ran on calibrationnet
const UpgradeWatermelonFixHeight = -100
Expand Down
3 changes: 3 additions & 0 deletions build/buildconstants/params_calibnet.go
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,9 @@ const UpgradeCalibrationDragonFixHeight = 1493854
// 2024-07-11T12:00:00Z
const UpgradeWaffleHeight = 1779094

// ??????
const UpgradeOmenHeight = 999999999999999

var SupportedProofTypes = []abi.RegisteredSealProof{
abi.RegisteredSealProof_StackedDrg32GiBV1,
abi.RegisteredSealProof_StackedDrg64GiBV1,
Expand Down
3 changes: 2 additions & 1 deletion build/buildconstants/params_interop.go
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,9 @@ var UpgradeThunderHeight = abi.ChainEpoch(-23)
var UpgradeWatermelonHeight = abi.ChainEpoch(-24)
var UpgradeDragonHeight = abi.ChainEpoch(-25)
var UpgradePhoenixHeight = abi.ChainEpoch(-26)
var UpgradeWaffleHeight = abi.ChainEpoch(-27)

const UpgradeWaffleHeight = 50
const UpgradeOmenHeight = 50

// This fix upgrade only ran on calibrationnet
const UpgradeWatermelonFixHeight = -1
Expand Down
9 changes: 6 additions & 3 deletions build/buildconstants/params_mainnet.go
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,10 @@ const UpgradeDragonHeight abi.ChainEpoch = 3855360
const UpgradePhoenixHeight abi.ChainEpoch = UpgradeDragonHeight + 120

// 2024-08-06T12:00:00Z
var UpgradeWaffleHeight abi.ChainEpoch = 4154640
const UpgradeWaffleHeight abi.ChainEpoch = 4154640

// ??????
var UpgradeOmenHeight = abi.ChainEpoch(9999999999)

// This fix upgrade only ran on calibrationnet
const UpgradeWatermelonFixHeight abi.ChainEpoch = -1
Expand All @@ -131,8 +134,8 @@ func init() {
SetAddressNetwork(address.Mainnet)
}

if os.Getenv("LOTUS_DISABLE_WAFFLE") == "1" {
UpgradeWaffleHeight = math.MaxInt64 - 1
if os.Getenv("LOTUS_DISABLE_OMEN") == "1" {
UpgradeOmenHeight = math.MaxInt64 - 1
}

// NOTE: DO NOT change this unless you REALLY know what you're doing. This is not consensus critical, however,
Expand Down
1 change: 1 addition & 0 deletions build/buildconstants/params_testground.go
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ var (
UpgradePhoenixHeight abi.ChainEpoch = -27
UpgradeCalibrationDragonFixHeight abi.ChainEpoch = -28
UpgradeWaffleHeight abi.ChainEpoch = -29
UpgradeOmenHeight abi.ChainEpoch = -30

DrandSchedule = map[abi.ChainEpoch]DrandEnum{
0: DrandMainnet,
Expand Down
Loading