From 4e0cf1644f62aff09cb93ccf0ed6f721431a1cec Mon Sep 17 00:00:00 2001 From: Travis Person Date: Fri, 3 Jul 2020 19:01:56 +0000 Subject: [PATCH] fountain: populate miner sector dropdown from specs-actors --- cmd/lotus-fountain/main.go | 71 +++++++++++++++++++ .../site/{miner.html => _miner.html} | 5 +- 2 files changed, 74 insertions(+), 2 deletions(-) rename cmd/lotus-fountain/site/{miner.html => _miner.html} (90%) diff --git a/cmd/lotus-fountain/main.go b/cmd/lotus-fountain/main.go index c5c6d5857..9743f209f 100644 --- a/cmd/lotus-fountain/main.go +++ b/cmd/lotus-fountain/main.go @@ -4,9 +4,13 @@ import ( "bytes" "context" "fmt" + "html/template" + "io" + "io/ioutil" "net" "net/http" "os" + "sort" "strconv" "time" @@ -28,12 +32,47 @@ import ( "github.com/filecoin-project/lotus/chain/actors" "github.com/filecoin-project/lotus/chain/types" lcli "github.com/filecoin-project/lotus/cli" + "github.com/filecoin-project/specs-actors/actors/builtin/miner" ) var log = logging.Logger("main") var sendPerRequest, _ = types.ParseFIL("50") +var supportedSectors struct { + SectorSizes []struct { + Name string + Value uint64 + Default bool + } +} + +func init() { + for supportedSector, _ := range miner.SupportedProofTypes { + sectorSize, err := supportedSector.SectorSize() + if err != nil { + panic(err) + } + + supportedSectors.SectorSizes = append(supportedSectors.SectorSizes, struct { + Name string + Value uint64 + Default bool + }{ + Name: sectorSize.ShortString(), + Value: uint64(sectorSize), + Default: false, + }) + + } + + sort.Slice(supportedSectors.SectorSizes[:], func(i, j int) bool { + return supportedSectors.SectorSizes[i].Value < supportedSectors.SectorSizes[j].Value + }) + + supportedSectors.SectorSizes[0].Default = true +} + func main() { logging.SetLogLevel("*", "INFO") @@ -125,6 +164,7 @@ var runCmd = &cli.Command{ } http.Handle("/", http.FileServer(rice.MustFindBox("site").HTTPBox())) + http.HandleFunc("/miner.html", h.minerhtml) http.HandleFunc("/send", h.send) http.HandleFunc("/mkminer", h.mkminer) http.HandleFunc("/msgwait", h.msgwait) @@ -153,6 +193,37 @@ type handler struct { defaultMinerPeer peer.ID } +func (h *handler) minerhtml(w http.ResponseWriter, r *http.Request) { + f, err := rice.MustFindBox("site").Open("_miner.html") + if err != nil { + w.WriteHeader(500) + _, _ = w.Write([]byte(err.Error())) + return + } + + tmpl, err := ioutil.ReadAll(f) + if err != nil { + w.WriteHeader(500) + _, _ = w.Write([]byte(err.Error())) + return + } + + var executedTmpl bytes.Buffer + + t, err := template.New("miner.html").Parse(string(tmpl)) + if err := t.Execute(&executedTmpl, supportedSectors); err != nil { + w.WriteHeader(500) + _, _ = w.Write([]byte(err.Error())) + return + } + + if _, err := io.Copy(w, &executedTmpl); err != nil { + log.Errorf("failed to write template to string %s", err) + } + + return +} + func (h *handler) send(w http.ResponseWriter, r *http.Request) { to, err := address.NewFromString(r.FormValue("address")) if err != nil { diff --git a/cmd/lotus-fountain/site/miner.html b/cmd/lotus-fountain/site/_miner.html similarity index 90% rename from cmd/lotus-fountain/site/miner.html rename to cmd/lotus-fountain/site/_miner.html index b8d6a1edd..d83f90d72 100644 --- a/cmd/lotus-fountain/site/miner.html +++ b/cmd/lotus-fountain/site/_miner.html @@ -15,8 +15,9 @@ Enter owner/worker address: