cerc-io/lotus
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

v1.27.0-a #10

Closed
jonathanface wants to merge 473 commits from v1.27.0-a into master
pull from: v1.27.0-a
merge into: cerc-io:master
Conversation 0 Commits 473 Files Changed 452 +10 -7
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5eccc03fee - Show all commits

17
provider/lpseal/task_sdr.go
View File

@ -107,7 +107,7 @@ func (s *SDRTask) Do(taskID harmonytask.TaskID, stillOwned func() bool) (done bo
return false, xerrors.Errorf("getting miner address: %w", err) return false, xerrors.Errorf("getting miner address: %w", err)
} }
ticket, err := s.getTicket(ctx, maddr) ticket, ticketEpoch, err := s.getTicket(ctx, maddr)
if err != nil { if err != nil {
return false, xerrors.Errorf("getting ticket: %w", err) return false, xerrors.Errorf("getting ticket: %w", err)
} }
@ -120,7 +120,10 @@ func (s *SDRTask) Do(taskID harmonytask.TaskID, stillOwned func() bool) (done bo
} }
// store success! // store success!
n, err := s.db.Exec(ctx, `UPDATE sectors_sdr_pipeline SET after_sdr = true WHERE sp_id = $1 AND sector_number = $2`, sectorParams.SpID, sectorParams.SectorNumber) n, err := s.db.Exec(ctx, `UPDATE sectors_sdr_pipeline
SET after_sdr = true, ticket_epoch = $3, ticket_value = $4
WHERE sp_id = $1 AND sector_number = $2`,
sectorParams.SpID, sectorParams.SectorNumber, ticketEpoch, ticket)
if err != nil { if err != nil {
return false, xerrors.Errorf("store sdr success: updating pipeline: %w", err) return false, xerrors.Errorf("store sdr success: updating pipeline: %w", err)
} }
@ -131,24 +134,24 @@ func (s *SDRTask) Do(taskID harmonytask.TaskID, stillOwned func() bool) (done bo
return true, nil return true, nil
} }
func (s *SDRTask) getTicket(ctx context.Context, maddr address.Address) (abi.SealRandomness, error) { func (s *SDRTask) getTicket(ctx context.Context, maddr address.Address) (abi.SealRandomness, abi.ChainEpoch, error) {
ts, err := s.api.ChainHead(ctx) ts, err := s.api.ChainHead(ctx)
if err != nil { if err != nil {
return nil, xerrors.Errorf("getting chain head: %w", err) return nil, 0, xerrors.Errorf("getting chain head: %w", err)
} }
ticketEpoch := ts.Height() - policy.SealRandomnessLookback ticketEpoch := ts.Height() - policy.SealRandomnessLookback
buf := new(bytes.Buffer) buf := new(bytes.Buffer)
if err := maddr.MarshalCBOR(buf); err != nil { if err := maddr.MarshalCBOR(buf); err != nil {
return nil, xerrors.Errorf("marshaling miner address: %w", err) return nil, 0, xerrors.Errorf("marshaling miner address: %w", err)
} }
rand, err := s.api.StateGetRandomnessFromTickets(ctx, crypto.DomainSeparationTag_SealRandomness, ticketEpoch, buf.Bytes(), ts.Key()) rand, err := s.api.StateGetRandomnessFromTickets(ctx, crypto.DomainSeparationTag_SealRandomness, ticketEpoch, buf.Bytes(), ts.Key())
if err != nil { if err != nil {
return nil, xerrors.Errorf("getting randomness from tickets: %w", err) return nil, 0, xerrors.Errorf("getting randomness from tickets: %w", err)
} }
return abi.SealRandomness(rand), nil return abi.SealRandomness(rand), ticketEpoch, nil
} }
func (s *SDRTask) CanAccept(ids []harmonytask.TaskID, engine *harmonytask.TaskEngine) (*harmonytask.TaskID, error) { func (s *SDRTask) CanAccept(ids []harmonytask.TaskID, engine *harmonytask.TaskEngine) (*harmonytask.TaskID, error) {