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

add SealProof in SectorBuilder #6815

Merged
merged 2 commits into from
Jul 22, 2021
Merged

add SealProof in SectorBuilder #6815

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9ad408a
add SealProof in sector builder
nonsense Jul 21, 2021
e7f39a3
Merge branch 'master' into nonsense/add-sealproof-in-sectorbuilder-ma…
magik6k Jul 22, 2021
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
2 changes: 1 addition & 1 deletion markets/retrievaladapter/provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ func (rpn *retrievalProviderNode) GetMinerWorkerAddress(ctx context.Context, min

func (rpn *retrievalProviderNode) UnsealSector(ctx context.Context, sectorID abi.SectorNumber, offset abi.UnpaddedPieceSize, length abi.UnpaddedPieceSize) (io.ReadCloser, error) {
log.Debugf("get sector %d, offset %d, length %d", sectorID, offset, length)
si, err := rpn.sectorsStatus(ctx, sectorID, true)
si, err := rpn.sectorsStatus(ctx, sectorID, false)
if err != nil {
return nil, err
}
Expand Down
2 changes: 1 addition & 1 deletion storage/miner_sealing.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ func (m *Miner) SectorsStatus(ctx context.Context, sid abi.SectorNumber, showOnC
LastErr: info.LastErr,
Log: log,
// on chain info
SealProof: 0,
Copy link
Member Author

@nonsense nonsense Jul 21, 2021 •
edited
Loading

Choose a reason for hiding this comment

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

We really need SealProof to be set based on the proof type of the sector from the local store, for when we need information on a sector that is not yet on chain. (i.e. lotus-miner is doing a PreCommit1 on a sector, and markets receives a retrieval request for a deal in that sector -- the SealProof is stored in the local store, and we need it to know the expected size of the sector).

SealProof: info.SectorType,
Activation: 0,
Expiration: 0,
DealWeight: big.Zero(),
Expand Down