wip
This commit is contained in:
Shrenuj Bansal
parent
5562c7cd79
commit
9cc5e84677
18
lib/harmony/harmonydb/sql/20230823.sql
Normal file
18
lib/harmony/harmonydb/sql/20230823.sql
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
create table wdpost_tasks
|
||||||
|
(
|
||||||
|
task_id int not null,
|
||||||
|
tskey varchar,
|
||||||
|
current_epoch bigint,
|
||||||
|
period_start bigint,
|
||||||
|
index bigint,
|
||||||
|
open bigint,
|
||||||
|
close bigint,
|
||||||
|
challenge bigint,
|
||||||
|
fault_cutoff bigint,
|
||||||
|
wpost_period_deadlines bigint,
|
||||||
|
wpost_proving_period bigint,
|
||||||
|
wpost_challenge_window bigint,
|
||||||
|
wpost_challenge_lookback bigint,
|
||||||
|
fault_declaration_cutoff bigint
|
||||||
|
);
|
||||||
|
|
||||||
@ -6,7 +6,6 @@ import (
|
|||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
"github.com/filecoin-project/lotus/lib/harmony/harmonydb"
|
"github.com/filecoin-project/lotus/lib/harmony/harmonydb"
|
||||||
"github.com/filecoin-project/lotus/lib/harmony/harmonytask"
|
|
||||||
"net/http"
|
"net/http"
|
||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
@ -323,17 +322,16 @@ func WindowPostScheduler(fc config.MinerFeeConfig, pc config.ProvingConfig) func
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
wdPostTask := wdpost.NewWdPostTask(db)
|
//wdPostTask := wdpost.NewWdPostTask(db)
|
||||||
tasks := []harmonytask.TaskInterface{wdPostTask}
|
//
|
||||||
|
//taskEngine, err := harmonytask.New(db, []harmonytask.TaskInterface{wdPostTask}, "localhost:12300")
|
||||||
taskEngine, err := harmonytask.New(db, []harmonytask.TaskInterface{wdPostTask}, "localhost:12300")
|
//if err != nil {
|
||||||
if err != nil {
|
// return nil, xerrors.Errorf("failed to create task engine: %w", err)
|
||||||
return nil, xerrors.Errorf("failed to create task engine: %w", err)
|
//}
|
||||||
}
|
|
||||||
//handler := gin.New()
|
//handler := gin.New()
|
||||||
//
|
//
|
||||||
//taskEngine.ApplyHttpHandlers(handler.Group("/"))
|
//taskEngine.ApplyHttpHandlers(handler.Group("/"))
|
||||||
defer taskEngine.GracefullyTerminate(time.Hour)
|
//defer taskEngine.GracefullyTerminate(time.Hour)
|
||||||
|
|
||||||
lc.Append(fx.Hook{
|
lc.Append(fx.Hook{
|
||||||
OnStart: func(context.Context) error {
|
OnStart: func(context.Context) error {
|
||||||
|
|||||||
562
storage/wdpost/wdpost_changehandler_2.go
Normal file
562
storage/wdpost/wdpost_changehandler_2.go
Normal file
@ -0,0 +1,562 @@
|
|||||||
|
package wdpost
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"github.com/filecoin-project/go-address"
|
||||||
|
"github.com/filecoin-project/go-state-types/dline"
|
||||||
|
"github.com/filecoin-project/lotus/lib/harmony/harmonydb"
|
||||||
|
|
||||||
|
"github.com/filecoin-project/lotus/chain/types"
|
||||||
|
)
|
||||||
|
|
||||||
|
//const (
|
||||||
|
// SubmitConfidence = 4
|
||||||
|
// ChallengeConfidence = 1
|
||||||
|
//)
|
||||||
|
//
|
||||||
|
//type CompleteGeneratePoSTCb func(posts []miner.SubmitWindowedPoStParams, err error)
|
||||||
|
//type CompleteSubmitPoSTCb func(err error)
|
||||||
|
//
|
||||||
|
//// wdPoStCommands is the subset of the WindowPoStScheduler + full node APIs used
|
||||||
|
//// by the changeHandler to execute actions and query state.
|
||||||
|
//type wdPoStCommands interface {
|
||||||
|
// StateMinerProvingDeadline(context.Context, address.Address, types.TipSetKey) (*dline.Info, error)
|
||||||
|
//
|
||||||
|
// startGeneratePoST(ctx context.Context, ts *types.TipSet, deadline *dline.Info, onComplete CompleteGeneratePoSTCb) context.CancelFunc
|
||||||
|
// startSubmitPoST(ctx context.Context, ts *types.TipSet, deadline *dline.Info, posts []miner.SubmitWindowedPoStParams, onComplete CompleteSubmitPoSTCb) context.CancelFunc
|
||||||
|
// onAbort(ts *types.TipSet, deadline *dline.Info)
|
||||||
|
// recordPoStFailure(err error, ts *types.TipSet, deadline *dline.Info)
|
||||||
|
//}
|
||||||
|
|
||||||
|
var _ changeHandlerIface = &changeHandler2{}
|
||||||
|
|
||||||
|
type changeHandler2 struct {
|
||||||
|
api wdPoStCommands
|
||||||
|
actor address.Address
|
||||||
|
proveHdlr *proveHandler2
|
||||||
|
//submitHdlr *submitHandler
|
||||||
|
|
||||||
|
db *harmonydb.DB
|
||||||
|
}
|
||||||
|
|
||||||
|
func (ch *changeHandler2) currentTSDI() (*types.TipSet, *dline.Info) {
|
||||||
|
//TODO implement me
|
||||||
|
panic("implement me")
|
||||||
|
}
|
||||||
|
|
||||||
|
func newChangeHandler2(api wdPoStCommands, actor address.Address, db *harmonydb.DB) *changeHandler2 {
|
||||||
|
log.Errorf("newChangeHandler2() called with api: %v, actor: %v", api, actor)
|
||||||
|
//posts := newPostsCache()
|
||||||
|
p := newProver2(api, db)
|
||||||
|
//s := newSubmitter(api, posts)
|
||||||
|
return &changeHandler2{api: api, actor: actor, proveHdlr: p}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (ch *changeHandler2) start() {
|
||||||
|
go ch.proveHdlr.run()
|
||||||
|
//go ch.submitHdlr.run()
|
||||||
|
}
|
||||||
|
|
||||||
|
func (ch *changeHandler2) update(ctx context.Context, revert *types.TipSet, advance *types.TipSet) error {
|
||||||
|
log.Errorf("changeHandler2.update() called with revert: %v, advance: %v", revert, advance)
|
||||||
|
// Get the current deadline period
|
||||||
|
di, err := ch.api.StateMinerProvingDeadline(ctx, ch.actor, advance.Key())
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
if !di.PeriodStarted() {
|
||||||
|
return nil // not proving anything yet
|
||||||
|
}
|
||||||
|
|
||||||
|
hc := &headChange{
|
||||||
|
ctx: ctx,
|
||||||
|
revert: revert,
|
||||||
|
advance: advance,
|
||||||
|
di: di,
|
||||||
|
}
|
||||||
|
|
||||||
|
select {
|
||||||
|
case ch.proveHdlr.hcs <- hc:
|
||||||
|
case <-ch.proveHdlr.shutdownCtx.Done():
|
||||||
|
case <-ctx.Done():
|
||||||
|
}
|
||||||
|
|
||||||
|
//select {
|
||||||
|
//case ch.submitHdlr.hcs <- hc:
|
||||||
|
//case <-ch.submitHdlr.shutdownCtx.Done():
|
||||||
|
//case <-ctx.Done():
|
||||||
|
//}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (ch *changeHandler2) shutdown() {
|
||||||
|
ch.proveHdlr.shutdown()
|
||||||
|
//ch.submitHdlr.shutdown()
|
||||||
|
}
|
||||||
|
|
||||||
|
//func (ch *changeHandler2) currentTSDI() (*types.TipSet, *dline.Info) {
|
||||||
|
// return ch.submitHdlr.currentTSDI()
|
||||||
|
//}
|
||||||
|
|
||||||
|
// postsCache keeps a cache of PoSTs for each proving window
|
||||||
|
//type postsCache struct {
|
||||||
|
// added chan *postInfo
|
||||||
|
// lk sync.RWMutex
|
||||||
|
// cache map[abi.ChainEpoch][]miner.SubmitWindowedPoStParams
|
||||||
|
//}
|
||||||
|
|
||||||
|
//func newPostsCache() *postsCache {
|
||||||
|
// return &postsCache{
|
||||||
|
// added: make(chan *postInfo, 16),
|
||||||
|
// cache: make(map[abi.ChainEpoch][]miner.SubmitWindowedPoStParams),
|
||||||
|
// }
|
||||||
|
//}
|
||||||
|
|
||||||
|
//func (c *postsCache) add(di *dline.Info, posts []miner.SubmitWindowedPoStParams) {
|
||||||
|
// c.lk.Lock()
|
||||||
|
// defer c.lk.Unlock()
|
||||||
|
//
|
||||||
|
// // TODO: clear cache entries older than chain finality
|
||||||
|
// c.cache[di.Open] = posts
|
||||||
|
//
|
||||||
|
// c.added <- &postInfo{
|
||||||
|
// di: di,
|
||||||
|
// posts: posts,
|
||||||
|
// }
|
||||||
|
//}
|
||||||
|
//
|
||||||
|
//func (c *postsCache) get(di *dline.Info) ([]miner.SubmitWindowedPoStParams, bool) {
|
||||||
|
// c.lk.RLock()
|
||||||
|
// defer c.lk.RUnlock()
|
||||||
|
//
|
||||||
|
// posts, ok := c.cache[di.Open]
|
||||||
|
// return posts, ok
|
||||||
|
//}
|
||||||
|
|
||||||
|
//type headChange struct {
|
||||||
|
// ctx context.Context
|
||||||
|
// revert *types.TipSet
|
||||||
|
// advance *types.TipSet
|
||||||
|
// di *dline.Info
|
||||||
|
//}
|
||||||
|
//
|
||||||
|
//type currentPost struct {
|
||||||
|
// di *dline.Info
|
||||||
|
// abort context.CancelFunc
|
||||||
|
//}
|
||||||
|
//
|
||||||
|
//type postResult struct {
|
||||||
|
// ts *types.TipSet
|
||||||
|
// currPost *currentPost
|
||||||
|
// posts []miner.SubmitWindowedPoStParams
|
||||||
|
// err error
|
||||||
|
//}
|
||||||
|
|
||||||
|
// proveHandler generates proofs
|
||||||
|
type proveHandler2 struct {
|
||||||
|
api wdPoStCommands
|
||||||
|
//posts *postsCache
|
||||||
|
|
||||||
|
//postResults chan *postResult
|
||||||
|
hcs chan *headChange
|
||||||
|
|
||||||
|
current *currentPost
|
||||||
|
|
||||||
|
shutdownCtx context.Context
|
||||||
|
shutdown context.CancelFunc
|
||||||
|
|
||||||
|
// Used for testing
|
||||||
|
processedHeadChanges chan *headChange
|
||||||
|
processedPostResults chan *postResult
|
||||||
|
|
||||||
|
wdPostTask *WdPostTask
|
||||||
|
}
|
||||||
|
|
||||||
|
func newProver2(
|
||||||
|
api wdPoStCommands,
|
||||||
|
//posts *postsCache,
|
||||||
|
db *harmonydb.DB,
|
||||||
|
) *proveHandler2 {
|
||||||
|
ctx, cancel := context.WithCancel(context.Background())
|
||||||
|
return &proveHandler2{
|
||||||
|
api: api,
|
||||||
|
//posts: posts,
|
||||||
|
//postResults: make(chan *postResult),
|
||||||
|
hcs: make(chan *headChange),
|
||||||
|
shutdownCtx: ctx,
|
||||||
|
shutdown: cancel,
|
||||||
|
wdPostTask: NewWdPostTask(db),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (p *proveHandler2) run() {
|
||||||
|
// Abort proving on shutdown
|
||||||
|
defer func() {
|
||||||
|
if p.current != nil {
|
||||||
|
p.current.abort()
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
|
||||||
|
for p.shutdownCtx.Err() == nil {
|
||||||
|
select {
|
||||||
|
case <-p.shutdownCtx.Done():
|
||||||
|
return
|
||||||
|
|
||||||
|
case hc := <-p.hcs:
|
||||||
|
log.Errorf("--------------------WINDOW POST PROVE HANDLER RECEIVE CHAN----------------------")
|
||||||
|
// Head changed
|
||||||
|
p.processHeadChange(hc.ctx, hc.advance, hc.di)
|
||||||
|
if p.processedHeadChanges != nil {
|
||||||
|
p.processedHeadChanges <- hc
|
||||||
|
}
|
||||||
|
|
||||||
|
//case res := <-p.postResults:
|
||||||
|
// // Proof generation complete
|
||||||
|
// p.processPostResult(res)
|
||||||
|
// if p.processedPostResults != nil {
|
||||||
|
// p.processedPostResults <- res
|
||||||
|
// }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (p *proveHandler2) processHeadChange(ctx context.Context, newTS *types.TipSet, di *dline.Info) {
|
||||||
|
// If the post window has expired, abort the current proof
|
||||||
|
log.Errorf("--------------------WINDOW POST PROVE HANDLER PROCESS HC----------------------")
|
||||||
|
|
||||||
|
if p.current != nil && newTS.Height() >= p.current.di.Close {
|
||||||
|
// Cancel the context on the current proof
|
||||||
|
p.current.abort()
|
||||||
|
|
||||||
|
// Clear out the reference to the proof so that we can immediately
|
||||||
|
// start generating a new proof, without having to worry about state
|
||||||
|
// getting clobbered when the abort completes
|
||||||
|
p.current = nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// Only generate one proof at a time
|
||||||
|
if p.current != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// If the proof for the current post window has been generated, check the
|
||||||
|
// next post window
|
||||||
|
//_, complete := p.posts.get(di)
|
||||||
|
//for complete {
|
||||||
|
// di = nextDeadline(di)
|
||||||
|
// _, complete = p.posts.get(di)
|
||||||
|
//}
|
||||||
|
|
||||||
|
err := p.wdPostTask.AddTask(ctx, newTS, di)
|
||||||
|
if err != nil {
|
||||||
|
log.Errorf("AddTask failed: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
//// Check if the chain is above the Challenge height for the post window
|
||||||
|
//if newTS.Height() < di.Challenge+ChallengeConfidence {
|
||||||
|
// return
|
||||||
|
//}
|
||||||
|
//
|
||||||
|
//p.current = ¤tPost{di: di}
|
||||||
|
//curr := p.current
|
||||||
|
//p.current.abort = p.api.startGeneratePoST(ctx, newTS, di, func(posts []miner.SubmitWindowedPoStParams, err error) {
|
||||||
|
// p.postResults <- &postResult{ts: newTS, currPost: curr, posts: posts, err: err}
|
||||||
|
//})
|
||||||
|
}
|
||||||
|
|
||||||
|
//func (p *proveHandler) processPostResult(res *postResult) {
|
||||||
|
// di := res.currPost.di
|
||||||
|
// if res.err != nil {
|
||||||
|
// // Proving failed so inform the API
|
||||||
|
// p.api.recordPoStFailure(res.err, res.ts, di)
|
||||||
|
// log.Warnf("Aborted window post Proving (Deadline: %+v)", di)
|
||||||
|
// p.api.onAbort(res.ts, di)
|
||||||
|
//
|
||||||
|
// // Check if the current post has already been aborted
|
||||||
|
// if p.current == res.currPost {
|
||||||
|
// // If the current post was not already aborted, setting it to nil
|
||||||
|
// // marks it as complete so that a new post can be started
|
||||||
|
// p.current = nil
|
||||||
|
// }
|
||||||
|
// return
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// // Completed processing this proving window
|
||||||
|
// p.current = nil
|
||||||
|
//
|
||||||
|
// // Add the proofs to the cache
|
||||||
|
// p.posts.add(di, res.posts)
|
||||||
|
//}
|
||||||
|
//
|
||||||
|
//type submitResult struct {
|
||||||
|
// pw *postWindow
|
||||||
|
// err error
|
||||||
|
//}
|
||||||
|
//
|
||||||
|
//type SubmitState string
|
||||||
|
//
|
||||||
|
//const (
|
||||||
|
// SubmitStateStart SubmitState = "SubmitStateStart"
|
||||||
|
// SubmitStateSubmitting SubmitState = "SubmitStateSubmitting"
|
||||||
|
// SubmitStateComplete SubmitState = "SubmitStateComplete"
|
||||||
|
//)
|
||||||
|
//
|
||||||
|
//type postWindow struct {
|
||||||
|
// ts *types.TipSet
|
||||||
|
// di *dline.Info
|
||||||
|
// submitState SubmitState
|
||||||
|
// abort context.CancelFunc
|
||||||
|
//}
|
||||||
|
//
|
||||||
|
//type postInfo struct {
|
||||||
|
// di *dline.Info
|
||||||
|
// posts []miner.SubmitWindowedPoStParams
|
||||||
|
//}
|
||||||
|
//
|
||||||
|
//// submitHandler submits proofs on-chain
|
||||||
|
//type submitHandler struct {
|
||||||
|
// api wdPoStCommands
|
||||||
|
// posts *postsCache
|
||||||
|
//
|
||||||
|
// submitResults chan *submitResult
|
||||||
|
// hcs chan *headChange
|
||||||
|
//
|
||||||
|
// postWindows map[abi.ChainEpoch]*postWindow
|
||||||
|
// getPostWindowReqs chan *getPWReq
|
||||||
|
//
|
||||||
|
// shutdownCtx context.Context
|
||||||
|
// shutdown context.CancelFunc
|
||||||
|
//
|
||||||
|
// currentCtx context.Context
|
||||||
|
// currentTS *types.TipSet
|
||||||
|
// currentDI *dline.Info
|
||||||
|
// getTSDIReq chan chan *tsdi
|
||||||
|
//
|
||||||
|
// // Used for testing
|
||||||
|
// processedHeadChanges chan *headChange
|
||||||
|
// processedSubmitResults chan *submitResult
|
||||||
|
// processedPostReady chan *postInfo
|
||||||
|
//}
|
||||||
|
//
|
||||||
|
//func newSubmitter(
|
||||||
|
// api wdPoStCommands,
|
||||||
|
// posts *postsCache,
|
||||||
|
//) *submitHandler {
|
||||||
|
// ctx, cancel := context.WithCancel(context.Background())
|
||||||
|
// return &submitHandler{
|
||||||
|
// api: api,
|
||||||
|
// posts: posts,
|
||||||
|
// submitResults: make(chan *submitResult),
|
||||||
|
// hcs: make(chan *headChange),
|
||||||
|
// postWindows: make(map[abi.ChainEpoch]*postWindow),
|
||||||
|
// getPostWindowReqs: make(chan *getPWReq),
|
||||||
|
// getTSDIReq: make(chan chan *tsdi),
|
||||||
|
// shutdownCtx: ctx,
|
||||||
|
// shutdown: cancel,
|
||||||
|
// }
|
||||||
|
//}
|
||||||
|
//
|
||||||
|
//func (s *submitHandler) run() {
|
||||||
|
// // On shutdown, abort in-progress submits
|
||||||
|
// defer func() {
|
||||||
|
// for _, pw := range s.postWindows {
|
||||||
|
// if pw.abort != nil {
|
||||||
|
// pw.abort()
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
// }()
|
||||||
|
//
|
||||||
|
// for s.shutdownCtx.Err() == nil {
|
||||||
|
// select {
|
||||||
|
// case <-s.shutdownCtx.Done():
|
||||||
|
// return
|
||||||
|
//
|
||||||
|
// case hc := <-s.hcs:
|
||||||
|
// // Head change
|
||||||
|
// s.processHeadChange(hc.ctx, hc.revert, hc.advance, hc.di)
|
||||||
|
// if s.processedHeadChanges != nil {
|
||||||
|
// s.processedHeadChanges <- hc
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// case pi := <-s.posts.added:
|
||||||
|
// // Proof generated
|
||||||
|
// s.processPostReady(pi)
|
||||||
|
// if s.processedPostReady != nil {
|
||||||
|
// s.processedPostReady <- pi
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// case res := <-s.submitResults:
|
||||||
|
// // Submit complete
|
||||||
|
// s.processSubmitResult(res)
|
||||||
|
// if s.processedSubmitResults != nil {
|
||||||
|
// s.processedSubmitResults <- res
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// case pwreq := <-s.getPostWindowReqs:
|
||||||
|
// // used by getPostWindow() to sync with run loop
|
||||||
|
// pwreq.out <- s.postWindows[pwreq.di.Open]
|
||||||
|
//
|
||||||
|
// case out := <-s.getTSDIReq:
|
||||||
|
// // used by currentTSDI() to sync with run loop
|
||||||
|
// out <- &tsdi{ts: s.currentTS, di: s.currentDI}
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
//}
|
||||||
|
//
|
||||||
|
//// processHeadChange is called when the chain head changes
|
||||||
|
//func (s *submitHandler) processHeadChange(ctx context.Context, revert *types.TipSet, advance *types.TipSet, di *dline.Info) {
|
||||||
|
// s.currentCtx = ctx
|
||||||
|
// s.currentTS = advance
|
||||||
|
// s.currentDI = di
|
||||||
|
//
|
||||||
|
// // Start tracking the current post window if we're not already
|
||||||
|
// // TODO: clear post windows older than chain finality
|
||||||
|
// if _, ok := s.postWindows[di.Open]; !ok {
|
||||||
|
// s.postWindows[di.Open] = &postWindow{
|
||||||
|
// di: di,
|
||||||
|
// ts: advance,
|
||||||
|
// submitState: SubmitStateStart,
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// // Apply the change to all post windows
|
||||||
|
// for _, pw := range s.postWindows {
|
||||||
|
// s.processHeadChangeForPW(ctx, revert, advance, pw)
|
||||||
|
// }
|
||||||
|
//}
|
||||||
|
//
|
||||||
|
//func (s *submitHandler) processHeadChangeForPW(ctx context.Context, revert *types.TipSet, advance *types.TipSet, pw *postWindow) {
|
||||||
|
// revertedToPrevDL := revert != nil && revert.Height() < pw.di.Open
|
||||||
|
// expired := advance.Height() >= pw.di.Close
|
||||||
|
//
|
||||||
|
// // If the chain was reverted back to the previous deadline, or if the post
|
||||||
|
// // window has expired, abort submit
|
||||||
|
// if pw.submitState == SubmitStateSubmitting && (revertedToPrevDL || expired) {
|
||||||
|
// // Replace the aborted postWindow with a new one so that we can
|
||||||
|
// // submit again at any time without the state getting clobbered
|
||||||
|
// // when the abort completes
|
||||||
|
// abort := pw.abort
|
||||||
|
// if abort != nil {
|
||||||
|
// pw = &postWindow{
|
||||||
|
// di: pw.di,
|
||||||
|
// ts: advance,
|
||||||
|
// submitState: SubmitStateStart,
|
||||||
|
// }
|
||||||
|
// s.postWindows[pw.di.Open] = pw
|
||||||
|
//
|
||||||
|
// // Abort the current submit
|
||||||
|
// abort()
|
||||||
|
// }
|
||||||
|
// } else if pw.submitState == SubmitStateComplete && revertedToPrevDL {
|
||||||
|
// // If submit for this deadline has completed, but the chain was
|
||||||
|
// // reverted back to the previous deadline, reset the submit state to the
|
||||||
|
// // starting state, so that it can be resubmitted
|
||||||
|
// pw.submitState = SubmitStateStart
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// // Submit the proof to chain if the proof has been generated and the chain
|
||||||
|
// // height is above confidence
|
||||||
|
// s.submitIfReady(ctx, advance, pw)
|
||||||
|
//}
|
||||||
|
//
|
||||||
|
//// processPostReady is called when a proof generation completes
|
||||||
|
//func (s *submitHandler) processPostReady(pi *postInfo) {
|
||||||
|
// pw, ok := s.postWindows[pi.di.Open]
|
||||||
|
// if ok {
|
||||||
|
// s.submitIfReady(s.currentCtx, s.currentTS, pw)
|
||||||
|
// }
|
||||||
|
//}
|
||||||
|
//
|
||||||
|
//// submitIfReady submits a proof if the chain is high enough and the proof
|
||||||
|
//// has been generated for this deadline
|
||||||
|
//func (s *submitHandler) submitIfReady(ctx context.Context, advance *types.TipSet, pw *postWindow) {
|
||||||
|
// // If the window has expired, there's nothing more to do.
|
||||||
|
// if advance.Height() >= pw.di.Close {
|
||||||
|
// return
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// // Check if we're already submitting, or already completed submit
|
||||||
|
// if pw.submitState != SubmitStateStart {
|
||||||
|
// return
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// // Check if we've reached the confidence height to submit
|
||||||
|
// if advance.Height() < pw.di.Open+SubmitConfidence {
|
||||||
|
// return
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// // Check if the proofs have been generated for this deadline
|
||||||
|
// posts, ok := s.posts.get(pw.di)
|
||||||
|
// if !ok {
|
||||||
|
// return
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// // If there was nothing to prove, move straight to the complete state
|
||||||
|
// if len(posts) == 0 {
|
||||||
|
// pw.submitState = SubmitStateComplete
|
||||||
|
// return
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// // Start submitting post
|
||||||
|
// pw.submitState = SubmitStateSubmitting
|
||||||
|
// pw.abort = s.api.startSubmitPoST(ctx, advance, pw.di, posts, func(err error) {
|
||||||
|
// s.submitResults <- &submitResult{pw: pw, err: err}
|
||||||
|
// })
|
||||||
|
//}
|
||||||
|
//
|
||||||
|
//// processSubmitResult is called with the response to a submit
|
||||||
|
//func (s *submitHandler) processSubmitResult(res *submitResult) {
|
||||||
|
// if res.err != nil {
|
||||||
|
// // Submit failed so inform the API and go back to the start state
|
||||||
|
// s.api.recordPoStFailure(res.err, res.pw.ts, res.pw.di)
|
||||||
|
// log.Warnf("Aborted window post Submitting (Deadline: %+v)", res.pw.di)
|
||||||
|
// s.api.onAbort(res.pw.ts, res.pw.di)
|
||||||
|
//
|
||||||
|
// res.pw.submitState = SubmitStateStart
|
||||||
|
// return
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// // Submit succeeded so move to complete state
|
||||||
|
// res.pw.submitState = SubmitStateComplete
|
||||||
|
//}
|
||||||
|
//
|
||||||
|
//type tsdi struct {
|
||||||
|
// ts *types.TipSet
|
||||||
|
// di *dline.Info
|
||||||
|
//}
|
||||||
|
//
|
||||||
|
//func (s *submitHandler) currentTSDI() (*types.TipSet, *dline.Info) {
|
||||||
|
// out := make(chan *tsdi)
|
||||||
|
// s.getTSDIReq <- out
|
||||||
|
// res := <-out
|
||||||
|
// return res.ts, res.di
|
||||||
|
//}
|
||||||
|
//
|
||||||
|
//type getPWReq struct {
|
||||||
|
// di *dline.Info
|
||||||
|
// out chan *postWindow
|
||||||
|
//}
|
||||||
|
//
|
||||||
|
//func (s *submitHandler) getPostWindow(di *dline.Info) *postWindow {
|
||||||
|
// out := make(chan *postWindow)
|
||||||
|
// s.getPostWindowReqs <- &getPWReq{di: di, out: out}
|
||||||
|
// return <-out
|
||||||
|
//}
|
||||||
|
//
|
||||||
|
//// nextDeadline gets deadline info for the subsequent deadline
|
||||||
|
//func nextDeadline(currentDeadline *dline.Info) *dline.Info {
|
||||||
|
// periodStart := currentDeadline.PeriodStart
|
||||||
|
// newDeadline := currentDeadline.Index + 1
|
||||||
|
// if newDeadline == miner.WPoStPeriodDeadlines {
|
||||||
|
// newDeadline = 0
|
||||||
|
// periodStart = periodStart + miner.WPoStProvingPeriod
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// return NewDeadlineInfo(periodStart, newDeadline, currentDeadline.CurrentEpoch)
|
||||||
|
//}
|
||||||
|
//
|
||||||
|
//func NewDeadlineInfo(periodStart abi.ChainEpoch, deadlineIdx uint64, currEpoch abi.ChainEpoch) *dline.Info {
|
||||||
|
// return dline.NewInfo(periodStart, deadlineIdx, currEpoch, miner.WPoStPeriodDeadlines, miner.WPoStProvingPeriod, miner.WPoStChallengeWindow, miner.WPoStChallengeLookback, miner.FaultDeclarationCutoff)
|
||||||
|
//}
|
||||||
155
storage/wdpost/wdpost_task.go
Normal file
155
storage/wdpost/wdpost_task.go
Normal file
@ -0,0 +1,155 @@
|
|||||||
|
package wdpost
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"github.com/filecoin-project/go-state-types/dline"
|
||||||
|
"github.com/filecoin-project/lotus/chain/types"
|
||||||
|
"github.com/filecoin-project/lotus/lib/harmony/harmonydb"
|
||||||
|
"github.com/filecoin-project/lotus/lib/harmony/harmonytask"
|
||||||
|
)
|
||||||
|
|
||||||
|
type WdPostTaskDetails struct {
|
||||||
|
Ts *types.TipSet
|
||||||
|
Deadline *dline.Info
|
||||||
|
}
|
||||||
|
|
||||||
|
type WdPostTask struct {
|
||||||
|
tasks chan *WdPostTaskDetails
|
||||||
|
db *harmonydb.DB
|
||||||
|
}
|
||||||
|
|
||||||
|
func (t *WdPostTask) Do(taskID harmonytask.TaskID, stillOwned func() bool) (done bool, err error) {
|
||||||
|
|
||||||
|
log.Errorf("WdPostTask.Do() called with taskID: %v", taskID)
|
||||||
|
return true, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (t *WdPostTask) CanAccept(ids []harmonytask.TaskID) (*harmonytask.TaskID, error) {
|
||||||
|
return &ids[0], nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (t *WdPostTask) TypeDetails() harmonytask.TaskTypeDetails {
|
||||||
|
return harmonytask.TaskTypeDetails{
|
||||||
|
Name: "WdPostGeneration",
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (t *WdPostTask) Adder(taskFunc harmonytask.AddTaskFunc) {
|
||||||
|
|
||||||
|
// wait for any channels on t.tasks and call taskFunc on them
|
||||||
|
for taskDetails := range t.tasks {
|
||||||
|
//taskDetails := <-ch
|
||||||
|
|
||||||
|
log.Errorf("WdPostTask.Adder() received taskDetails: %v", taskDetails)
|
||||||
|
|
||||||
|
taskFunc(func(tID harmonytask.TaskID, tx *harmonydb.Tx) (bool, error) {
|
||||||
|
return t.addTaskToDB(taskDetails.Ts, taskDetails.Deadline, tID, tx)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewWdPostTask(db *harmonydb.DB) *WdPostTask {
|
||||||
|
return &WdPostTask{
|
||||||
|
tasks: make(chan *WdPostTaskDetails, 2),
|
||||||
|
db: db,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (t *WdPostTask) AddTask(ctx context.Context, ts *types.TipSet, deadline *dline.Info) error {
|
||||||
|
|
||||||
|
//ch := make(chan *WdPostTaskDetails)
|
||||||
|
//t.tasks = append(t.tasks, ch)
|
||||||
|
t.tasks <- &WdPostTaskDetails{
|
||||||
|
Ts: ts,
|
||||||
|
Deadline: deadline,
|
||||||
|
}
|
||||||
|
|
||||||
|
log.Errorf("WdPostTask.AddTask() called with ts: %v, deadline: %v, taskList: %v", ts, deadline, t.tasks)
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (t *WdPostTask) addTaskToDB(ts *types.TipSet, deadline *dline.Info, taskId harmonytask.TaskID, tx *harmonydb.Tx) (bool, error) {
|
||||||
|
tsKey := ts.Key()
|
||||||
|
_, err := tx.Exec(
|
||||||
|
`INSERT INTO wdpost_tasks (
|
||||||
|
task_id,
|
||||||
|
tskey,
|
||||||
|
current_epoch,
|
||||||
|
period_start,
|
||||||
|
index,
|
||||||
|
open,
|
||||||
|
close,
|
||||||
|
challenge,
|
||||||
|
fault_cutoff,
|
||||||
|
wpost_period_deadlines,
|
||||||
|
wpost_proving_period,
|
||||||
|
wpost_challenge_window,
|
||||||
|
wpost_challenge_lookback,
|
||||||
|
fault_declaration_cutoff
|
||||||
|
) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10 , $11, $12, $13, $14)`,
|
||||||
|
taskId,
|
||||||
|
tsKey.String(),
|
||||||
|
deadline.CurrentEpoch,
|
||||||
|
deadline.PeriodStart,
|
||||||
|
deadline.Index,
|
||||||
|
deadline.Open,
|
||||||
|
deadline.Close,
|
||||||
|
deadline.Challenge,
|
||||||
|
deadline.FaultCutoff,
|
||||||
|
deadline.WPoStPeriodDeadlines,
|
||||||
|
deadline.WPoStProvingPeriod,
|
||||||
|
deadline.WPoStChallengeWindow,
|
||||||
|
deadline.WPoStChallengeLookback,
|
||||||
|
deadline.FaultDeclarationCutoff,
|
||||||
|
)
|
||||||
|
if err != nil {
|
||||||
|
return false, err
|
||||||
|
}
|
||||||
|
|
||||||
|
return true, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (t *WdPostTask) AddTaskOld(ctx context.Context, ts *types.TipSet, deadline *dline.Info, taskId harmonytask.TaskID) error {
|
||||||
|
|
||||||
|
tsKey := ts.Key()
|
||||||
|
_, err := t.db.Exec(ctx,
|
||||||
|
`INSERT INTO wdpost_tasks (
|
||||||
|
task_id,
|
||||||
|
tskey,
|
||||||
|
current_epoch,
|
||||||
|
period_start,
|
||||||
|
index,
|
||||||
|
open,
|
||||||
|
close,
|
||||||
|
challenge,
|
||||||
|
fault_cutoff,
|
||||||
|
wpost_period_deadlines,
|
||||||
|
wpost_proving_period,
|
||||||
|
wpost_challenge_window,
|
||||||
|
wpost_challenge_lookback,
|
||||||
|
fault_declaration_cutoff
|
||||||
|
) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10 , $11, $12, $13, $14)`,
|
||||||
|
taskId,
|
||||||
|
tsKey.String(),
|
||||||
|
deadline.CurrentEpoch,
|
||||||
|
deadline.PeriodStart,
|
||||||
|
deadline.Index,
|
||||||
|
deadline.Open,
|
||||||
|
deadline.Close,
|
||||||
|
deadline.Challenge,
|
||||||
|
deadline.FaultCutoff,
|
||||||
|
deadline.WPoStPeriodDeadlines,
|
||||||
|
deadline.WPoStProvingPeriod,
|
||||||
|
deadline.WPoStChallengeWindow,
|
||||||
|
deadline.WPoStChallengeLookback,
|
||||||
|
deadline.FaultDeclarationCutoff,
|
||||||
|
)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
var _ harmonytask.TaskInterface = &WdPostTask{}
|
||||||
Loading…
Reference in New Issue
Block a user