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

More correct / fasterer GetSectorsForWinningPoSt

Browse Source
This commit is contained in:
Łukasz Magiera 2020-09-20 23:04:45 +02:00
parent 7c3f638f68
commit b25dd2a00d
2 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
chain/actors/builtin/miner/v0.go
View File

@ -163,9 +163,9 @@ func (s *state0) LoadSectorsFromSet(filter *bitfield.BitField, filterOut bool) (
return nil, err return nil, err
} }
var v cbg.Deferred if filter != nil {
if err := a.ForEach(&v, func(i int64) error { var v cbg.Deferred
if filter != nil { if err := a.ForEach(&v, func(i int64) error {
set, err := filter.IsSet(uint64(i)) set, err := filter.IsSet(uint64(i))
if err != nil { if err != nil {
return xerrors.Errorf("filter check error: %w", err) return xerrors.Errorf("filter check error: %w", err)
@ -176,10 +176,10 @@ func (s *state0) LoadSectorsFromSet(filter *bitfield.BitField, filterOut bool) (
return xerrors.Errorf("filtering error: %w", err) return xerrors.Errorf("filtering error: %w", err)
} }
} }
return nil
}); err != nil {
return nil, err
} }
return nil
}); err != nil {
return nil, err
} }
return a, nil return a, nil

20
chain/stmgr/utils.go
View File

@ -197,12 +197,21 @@ func GetSectorsForWinningPoSt(ctx context.Context, pv ffiwrapper.Verifier, sm *S
return nil, xerrors.Errorf("failed to load miner actor state: %w", err) return nil, xerrors.Errorf("failed to load miner actor state: %w", err)
} }
// TODO (!!): This was partition.Sectors-partition.Faults originally, which was likely very wrong, and will need to be an upgrade // TODO (!!): Actor Update: Make this active sectors
// ^ THE CURRENT THING HERE WON'T SYNC v
provingSectors, err := miner.AllPartSectors(mas, miner.Partition.ActiveSectors) allSectors, err := miner.AllPartSectors(mas, miner.Partition.AllSectors)
if err != nil { if err != nil {
return nil, xerrors.Errorf("merge partition proving sets: %w", err) return nil, xerrors.Errorf("get all sectors: %w", err)
}
faultySectors, err := miner.AllPartSectors(mas, miner.Partition.FaultySectors)
if err != nil {
return nil, xerrors.Errorf("get faulty sectors: %w", err)
}
provingSectors, err := bitfield.SubtractBitField(allSectors, faultySectors) // TODO: This is wrong, as it can contain faaults, change to just ActiveSectors in an upgrade
if err != nil {
return nil, xerrors.Errorf("calc proving sectors: %w", err)
} }
numProvSect, err := provingSectors.Count() numProvSect, err := provingSectors.Count()
@ -240,7 +249,8 @@ func GetSectorsForWinningPoSt(ctx context.Context, pv ffiwrapper.Verifier, sm *S
return nil, xerrors.Errorf("generating winning post challenges: %w", err) return nil, xerrors.Errorf("generating winning post challenges: %w", err)
} }
sectors, err := mas.LoadSectorsFromSet(&provingSectors, false) // we don't need to filter here (and it's **very** slow)
sectors, err := mas.LoadSectorsFromSet(nil, false)
if err != nil { if err != nil {
return nil, xerrors.Errorf("loading proving sectors: %w", err) return nil, xerrors.Errorf("loading proving sectors: %w", err)
} }