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

chore: master into sturdypost #11451

Merged
merged 111 commits into from
Nov 22, 2023
Merged

chore: master into sturdypost #11451

merged 111 commits into from
Nov 22, 2023

Conversation

magik6k
Copy link
Contributor

@magik6k magik6k commented Nov 22, 2023

Related Issues

Proposed Changes

Additional Info

Checklist

Before you mark the PR ready for review, please make sure that:

  • Commits have a clear commit message.
  • PR title is in the form of of <PR type>: <area>: <change being made>
    • example: fix: mempool: Introduce a cache for valid signatures
    • PR type: fix, feat, build, chore, ci, docs, perf, refactor, revert, style, test
    • area, e.g. api, chain, state, market, mempool, multisig, networking, paych, proving, sealing, wallet, deps
  • If the PR affects users (e.g., new feature, bug fix, system requirements change), update the CHANGELOG.md and add details to the UNRELEASED section.
  • New features have usage guidelines and / or documentation updates in
  • Tests exist for new functionality or change in behavior
  • CI is green

arajasek and others added 30 commits October 31, 2023 20:06
* refactor: make GetEmbeddedBuiltinActorsBundle take network bundle name

* update calibnet actor bundle to v12.0.0-rc.2, but include v12.0.0-rc.1 as calibrationnet-buggy.car

* wip: calibnet unbork migration

* calibnet: add buggy miner actor CID to actorMeta

* fix incorrect buggy calibnet manifest

* make UpgradeWatermelonFixHeight a build param

* calibnet patch: check whether network is calibration from init actor state

* add sanity checks to the v12 calibnet patch upgrade

* address review
Bump version and changelog
We were computing this based on the max block gas, but this is
incorrect. The new value isn't entirely correct either (we should
probably compute an average of the gas used in each block in the
tipset?), but it's good enough.

fixes #10515
feat: sealing: load SectorsSummary from sealing SectorStats instead of calling API each time
Move premigration to 90 minutes before upgrade epoch.
fix: migration: set premigration to 90 minutes
Move premigration to 90 minutes before upgrade epoch.
…gain

fix: nv21fix migration: correctly upgrade system actor
jennijuju and others added 25 commits November 22, 2023 16:39
Co-authored-by: Phi-rjan <orjan.roren@gmail.com>
add venus node boostrap
Update changelog
Co-authored-by: Jiaying Wang <42981373+jennijuju@users.noreply.github.com>
…nto-master

chore: releases :merge releases into master
chore: build: bump master to v1.25.1-dev
@magik6k magik6k requested a review from a team as a code owner November 22, 2023 16:37
m.stats.lk.Lock()
defer m.stats.lk.Unlock()

out := make(map[api.SectorState]int)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

out := make(map[api.SectorState]int, len(m.stats.byState))

@snadrus snadrus merged commit 18f6907 into feat/sturdypost Nov 22, 2023
86 of 89 checks passed
@snadrus snadrus deleted the chore/master-into-sturdy branch November 22, 2023 18:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.