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

fix: restore ConfirmSectorProofsValid #1553

Merged
merged 3 commits into from
Jun 24, 2024

Conversation

rvagg
Copy link
Member

@rvagg rvagg commented Jun 18, 2024

Removed in #1540 but I believe it's still needed to activate preseals; unless there's an alternative route to this?

Ref: https://github.com/filecoin-project/lotus/blob/b73d4e0481517b395a0e9aa9af5dab8bedc18285/chain/gen/genesis/miners.go#L494-L509

Tests for this were tangled up in the prove commit + cron stuff that was removed, this probably needs new tests if it's going back, but I'm not sure yet what that would entail.

removed in #1540
but still needed to activate preseals
@rvagg rvagg requested review from anorth and ZenGround0 June 18, 2024 03:23
Copy link
Contributor

@ZenGround0 ZenGround0 left a comment

Choose a reason for hiding this comment

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

It's fine to keep this up for local devent testing this week but we have to remove whatever eldrichian horror relied on this for the preseal workflow. I really don't want to keep this live for the sake of awful hacks in the lotus testing setup.

Copy link
Contributor

@ZenGround0 ZenGround0 left a comment

Choose a reason for hiding this comment

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

@aarshkshah1992 has looked into the lotus seed usage and found that we will need significant FVM work to move away from CSPV for preseal activation. For expediancy we can keep a simplified version of CSPV. I'll file an issue to do the correct thing and get rid of this code in the future.

actors/miner/src/lib.rs Outdated Show resolved Hide resolved
actors/miner/src/lib.rs Outdated Show resolved Hide resolved
actors/miner/src/lib.rs Outdated Show resolved Hide resolved
actors/miner/src/types.rs Outdated Show resolved Hide resolved
actors/power/src/ext.rs Outdated Show resolved Hide resolved
actors/power/src/ext.rs Outdated Show resolved Hide resolved
@aarshkshah1992
Copy link
Contributor

@ZenGround0 @rvagg Should we merging this to the release/v14 branch instead ?

@ZenGround0
Copy link
Contributor

I haven't been so involved in the v14 release but the typical thing we've done here is merge changes to master first and then cherrypick them to the release branch.

@BigLep
Copy link
Member

BigLep commented Jun 21, 2024

I'll file an issue to do the correct thing and get rid of this code in the future.

@ZenGround0 : please paste a link to that issue when you have it - thanks.

@ZenGround0
Copy link
Contributor

#1556

Copy link
Member Author

@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.

👍 approving my own PR

@BigLep
Copy link
Member

BigLep commented Jun 24, 2024

@aarshkshah1992 or @ZenGround0 : as part of filecoin-project/lotus#12132, can we get an approval on this change?

@BigLep
Copy link
Member

BigLep commented Jun 24, 2024

Oh sorry, I realize @ZenGround0 alraedy gave an approval. @aarshkshah1992 : are you ok to merge?

@aarshkshah1992 aarshkshah1992 added this pull request to the merge queue Jun 24, 2024
Merged via the queue into master with commit 75fd61e Jun 24, 2024
14 checks passed
@aarshkshah1992 aarshkshah1992 deleted the rvagg/ConfirmSectorProofsValid branch June 24, 2024 17:49
@rvagg rvagg mentioned this pull request Jun 25, 2024
ZenGround0 pushed a commit that referenced this pull request Jun 25, 2024
* fix: restore ConfirmSectorProofsValid

removed in #1540
but still needed to activate preseals

* changes as per review

* make rustfmt

---------

Co-authored-by: aarshkshah1992 <aarshkshah1992@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
No open projects
Status: ✅ Done
Development

Successfully merging this pull request may close these issues.

4 participants