v1.27.0-a #10
@ -87,6 +87,10 @@ func StartTasks(ctx context.Context, dependencies *deps.Deps) (*harmonytask.Task
|
|||||||
porepTask := lpseal.NewPoRepTask(db, full, sp, slr, cfg.Subsystems.PoRepProofMaxTasks)
|
porepTask := lpseal.NewPoRepTask(db, full, sp, slr, cfg.Subsystems.PoRepProofMaxTasks)
|
||||||
activeTasks = append(activeTasks, porepTask)
|
activeTasks = append(activeTasks, porepTask)
|
||||||
}
|
}
|
||||||
|
if cfg.Subsystems.EnableSendCommitMsg {
|
||||||
|
commitTask := lpseal.NewSubmitCommitTask(sp, db, full, sender, as, cfg.Fees.MaxCommitGasFee)
|
||||||
|
activeTasks = append(activeTasks, commitTask)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
log.Infow("This lotus_provider instance handles",
|
log.Infow("This lotus_provider instance handles",
|
||||||
"miner_addresses", maddrs,
|
"miner_addresses", maddrs,
|
||||||
|
@ -123,6 +123,10 @@ type ProviderSubsystemsConfig struct {
|
|||||||
// In lotus-miner this was Commit1 / Commit2
|
// In lotus-miner this was Commit1 / Commit2
|
||||||
EnablePoRepProof bool
|
EnablePoRepProof bool
|
||||||
PoRepProofMaxTasks int
|
PoRepProofMaxTasks int
|
||||||
|
|
||||||
|
// EnableSendCommitMsg enables the sending of commit messages to the chain
|
||||||
|
// from this lotus-provider instance.
|
||||||
|
EnableSendCommitMsg bool
|
||||||
}
|
}
|
||||||
|
|
||||||
type DAGStoreConfig struct {
|
type DAGStoreConfig struct {
|
||||||
|
@ -22,6 +22,7 @@ const (
|
|||||||
pollerTrees
|
pollerTrees
|
||||||
pollerPrecommitMsg
|
pollerPrecommitMsg
|
||||||
pollerPoRep
|
pollerPoRep
|
||||||
|
pollerCommitMsg
|
||||||
|
|
||||||
numPollers
|
numPollers
|
||||||
)
|
)
|
||||||
|
175
provider/lpseal/task_submit_commit.go
Normal file
175
provider/lpseal/task_submit_commit.go
Normal file
@ -0,0 +1,175 @@
|
|||||||
|
package lpseal
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bytes"
|
||||||
|
"context"
|
||||||
|
"github.com/filecoin-project/go-address"
|
||||||
|
"github.com/filecoin-project/go-state-types/abi"
|
||||||
|
"github.com/filecoin-project/go-state-types/big"
|
||||||
|
"github.com/filecoin-project/go-state-types/builtin"
|
||||||
|
"github.com/filecoin-project/lotus/api"
|
||||||
|
"github.com/filecoin-project/lotus/chain/actors/builtin/miner"
|
||||||
|
"github.com/filecoin-project/lotus/chain/types"
|
||||||
|
"github.com/filecoin-project/lotus/lib/harmony/harmonydb"
|
||||||
|
"github.com/filecoin-project/lotus/lib/harmony/harmonytask"
|
||||||
|
"github.com/filecoin-project/lotus/lib/harmony/resources"
|
||||||
|
"github.com/filecoin-project/lotus/provider/lpmessage"
|
||||||
|
"github.com/filecoin-project/lotus/storage/ctladdr"
|
||||||
|
sealing "github.com/filecoin-project/lotus/storage/pipeline"
|
||||||
|
"golang.org/x/xerrors"
|
||||||
|
)
|
||||||
|
|
||||||
|
type SubmitCommitAPI interface {
|
||||||
|
ChainHead(context.Context) (*types.TipSet, error)
|
||||||
|
StateMinerInfo(context.Context, address.Address, types.TipSetKey) (api.MinerInfo, error)
|
||||||
|
StateMinerInitialPledgeCollateral(context.Context, address.Address, miner.SectorPreCommitInfo, types.TipSetKey) (big.Int, error)
|
||||||
|
StateSectorPreCommitInfo(context.Context, address.Address, abi.SectorNumber, types.TipSetKey) (*miner.SectorPreCommitOnChainInfo, error)
|
||||||
|
ctladdr.NodeApi
|
||||||
|
}
|
||||||
|
|
||||||
|
type SubmitCommitTask struct {
|
||||||
|
sp *SealPoller
|
||||||
|
db *harmonydb.DB
|
||||||
|
api SubmitCommitAPI
|
||||||
|
|
||||||
|
sender *lpmessage.Sender
|
||||||
|
as sealing.AddressSelector
|
||||||
|
|
||||||
|
maxFee types.FIL
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewSubmitCommitTask(sp *SealPoller, db *harmonydb.DB, api SubmitCommitAPI, sender *lpmessage.Sender, as sealing.AddressSelector, maxFee types.FIL) *SubmitCommitTask {
|
||||||
|
return &SubmitCommitTask{
|
||||||
|
sp: sp,
|
||||||
|
db: db,
|
||||||
|
api: api,
|
||||||
|
sender: sender,
|
||||||
|
as: as,
|
||||||
|
|
||||||
|
maxFee: maxFee,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *SubmitCommitTask) Do(taskID harmonytask.TaskID, stillOwned func() bool) (done bool, err error) {
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
var sectorParamsArr []struct {
|
||||||
|
SpID int64 `db:"sp_id"`
|
||||||
|
SectorNumber int64 `db:"sector_number"`
|
||||||
|
Proof []byte `db:"porep_proof"`
|
||||||
|
}
|
||||||
|
|
||||||
|
err = s.db.Select(ctx, §orParamsArr, `
|
||||||
|
SELECT sp_id, sector_number, porep_proof
|
||||||
|
FROM sectors_sdr_pipeline
|
||||||
|
WHERE task_id_commit_msg = $1`, taskID)
|
||||||
|
if err != nil {
|
||||||
|
return false, xerrors.Errorf("getting sector params: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(sectorParamsArr) != 1 {
|
||||||
|
return false, xerrors.Errorf("expected 1 sector params, got %d", len(sectorParamsArr))
|
||||||
|
}
|
||||||
|
sectorParams := sectorParamsArr[0]
|
||||||
|
|
||||||
|
maddr, err := address.NewIDAddress(uint64(sectorParams.SpID))
|
||||||
|
if err != nil {
|
||||||
|
return false, xerrors.Errorf("getting miner address: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
params := miner.ProveCommitSectorParams{
|
||||||
|
SectorNumber: abi.SectorNumber(sectorParams.SectorNumber),
|
||||||
|
Proof: sectorParams.Proof,
|
||||||
|
}
|
||||||
|
|
||||||
|
enc := new(bytes.Buffer)
|
||||||
|
if err := params.MarshalCBOR(enc); err != nil {
|
||||||
|
return false, xerrors.Errorf("could not serialize commit params: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
ts, err := s.api.ChainHead(ctx)
|
||||||
|
if err != nil {
|
||||||
|
return false, xerrors.Errorf("getting chain head: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
mi, err := s.api.StateMinerInfo(ctx, maddr, types.EmptyTSK)
|
||||||
|
if err != nil {
|
||||||
|
return false, xerrors.Errorf("getting miner info: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
pci, err := s.api.StateSectorPreCommitInfo(ctx, maddr, abi.SectorNumber(sectorParams.SectorNumber), ts.Key())
|
||||||
|
if err != nil {
|
||||||
|
return false, xerrors.Errorf("getting precommit info: %w", err)
|
||||||
|
}
|
||||||
|
if pci == nil {
|
||||||
|
return false, xerrors.Errorf("precommit info not found on chain")
|
||||||
|
}
|
||||||
|
|
||||||
|
collateral, err := s.api.StateMinerInitialPledgeCollateral(ctx, maddr, pci.Info, ts.Key())
|
||||||
|
if err != nil {
|
||||||
|
return false, xerrors.Errorf("getting initial pledge collateral: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
collateral = big.Sub(collateral, pci.PreCommitDeposit)
|
||||||
|
if collateral.LessThan(big.Zero()) {
|
||||||
|
collateral = big.Zero()
|
||||||
|
}
|
||||||
|
|
||||||
|
a, _, err := s.as.AddressFor(ctx, s.api, mi, api.CommitAddr, collateral, big.Zero())
|
||||||
|
if err != nil {
|
||||||
|
return false, xerrors.Errorf("getting address for precommit: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
msg := &types.Message{
|
||||||
|
To: maddr,
|
||||||
|
From: a,
|
||||||
|
Method: builtin.MethodsMiner.ProveCommitSector, // todo ddo provecommit3
|
||||||
|
Params: enc.Bytes(),
|
||||||
|
Value: collateral, // todo config for pulling from miner balance!!
|
||||||
|
}
|
||||||
|
|
||||||
|
mss := &api.MessageSendSpec{
|
||||||
|
MaxFee: abi.TokenAmount(s.maxFee),
|
||||||
|
}
|
||||||
|
|
||||||
|
mcid, err := s.sender.Send(ctx, msg, mss, "commit")
|
||||||
|
if err != nil {
|
||||||
|
return false, xerrors.Errorf("pushing message to mpool: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
_, err = s.db.Exec(ctx, `UPDATE sectors_sdr_pipeline SET commit_msg_cid = $1, after_commit_msg = true WHERE sp_id = $2 AND sector_number = $3`, mcid, sectorParams.SpID, sectorParams.SectorNumber)
|
||||||
|
if err != nil {
|
||||||
|
return false, xerrors.Errorf("updating commit_msg_cid: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
_, err = s.db.Exec(ctx, `INSERT INTO message_waits (signed_message_cid) VALUES ($1)`, mcid)
|
||||||
|
if err != nil {
|
||||||
|
return false, xerrors.Errorf("inserting into message_waits: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
return true, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *SubmitCommitTask) CanAccept(ids []harmonytask.TaskID, engine *harmonytask.TaskEngine) (*harmonytask.TaskID, error) {
|
||||||
|
id := ids[0]
|
||||||
|
return &id, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *SubmitCommitTask) TypeDetails() harmonytask.TaskTypeDetails {
|
||||||
|
return harmonytask.TaskTypeDetails{
|
||||||
|
Max: 128,
|
||||||
|
Name: "CommitSubmit",
|
||||||
|
Cost: resources.Resources{
|
||||||
|
Cpu: 0,
|
||||||
|
Gpu: 0,
|
||||||
|
Ram: 1 << 20,
|
||||||
|
},
|
||||||
|
MaxFailures: 16,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *SubmitCommitTask) Adder(taskFunc harmonytask.AddTaskFunc) {
|
||||||
|
s.sp.pollers[pollerCommitMsg].Set(taskFunc)
|
||||||
|
}
|
||||||
|
|
||||||
|
var _ harmonytask.TaskInterface = &SubmitCommitTask{}
|
Loading…
Reference in New Issue
Block a user