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: deps: update FFI, FVM, and actors #11604

Closed
wants to merge 2 commits into from
Closed

Conversation

rjan90
Copy link
Contributor

@rjan90 rjan90 commented Jan 30, 2024

Related Issues

Towards nv22/lotus v1.26.0-rc1 release

Proposed Changes

Updates:

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

@Stebalien
Copy link
Member

Stebalien commented Jan 31, 2024

I have a branch (https://github.com/filecoin-project/lotus/tree/steb/update-fvm) that updates the FVM and addresses the breaking changes to the tracing API. That branch is currently based on master, but should I move it to feat/nv22?

@rjan90
Copy link
Contributor Author

rjan90 commented Feb 1, 2024

I have a branch (https://github.com/filecoin-project/lotus/tree/steb/update-fvm) that updates the FVM and addresses the breaking changes to the tracing API. That branch is currently based on master, but should I move it to feat/nv22?

Yeah, that would be ideal. Once feat/nv22 branch is more complete we will merge it back to master #11600.

@Stebalien
Copy link
Member

Hm. That's not ideal as I want to make PRs that depend on these changes, and these PRs are not a part of nv22. I didn't realize the diff was that big.

Is there any reason not to make the PR against master then back merge? Do we not do back-merging to integration branches?

@rjan90
Copy link
Contributor Author

rjan90 commented Feb 1, 2024

Is there any reason not to make the PR against master then back merge? Do we not do back-merging to integration branches?

Oh, I see. Yeah, feel free to go with the path of PR against master then back merge

@rjan90 rjan90 marked this pull request as ready for review February 2, 2024 09:11
@rjan90 rjan90 requested a review from a team as a code owner February 2, 2024 09:11
@rjan90 rjan90 requested review from snadrus and aarshkshah1992 and removed request for a team February 2, 2024 09:11
@aarshkshah1992
Copy link
Contributor

@rjan90 PR looks good to me but we will need @Stebalien's changes from here before CI can be green.

Update actors to v13.0.0-rc.1
@rjan90 rjan90 force-pushed the phi-update-deps-nv22 branch from 44218ca to 98d4a46 Compare February 8, 2024 09:06
Update to v13.0.0-rc.2 bundle
Copy link
Member

@rvagg rvagg left a comment

Choose a reason for hiding this comment

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

If I cherry-pick this in to feat/built-in-actor-events-api which requires the actor events work, and I add in #11611, and I run against filecoin-project/go-state-types#236 then it's all 👍. And I even get the right "balance" encoded form out of events which was that thing I fixed in actors yesterday:

Event<height=772, msg=bafy2bzacebadnt32yvrwugww64tymuv4zdpwl26hnv5et6js5oxxj3sokjjnq, emitter=f06, reverted=false, $type="verifier-balance", verifier=100, balance={"/":{"bytes":"ABdIdsDw"}}>

@rvagg
Copy link
Member

rvagg commented Feb 9, 2024

Pulled in the v13.0.0-rc.2 commit to #11611 where, by the powers of both branches combined, we get 💚 . Merged that one in to feat/nv22 so we're all good now.

@rvagg rvagg closed this Feb 9, 2024
@rvagg rvagg deleted the phi-update-deps-nv22 branch February 9, 2024 01:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: ☑️ Done (Archive)
Development

Successfully merging this pull request may close these issues.

4 participants