v1.27.0-a #10

Closed
jonathanface wants to merge 473 commits from v1.27.0-a into master
6 changed files with 45 additions and 5 deletions
Showing only changes of commit 25b228c2f6 - Show all commits

View File

@ -2,9 +2,10 @@
package api package api
import ( import (
"github.com/gorilla/mux"
"github.com/filecoin-project/lotus/cmd/lotus-provider/deps" "github.com/filecoin-project/lotus/cmd/lotus-provider/deps"
"github.com/filecoin-project/lotus/cmd/lotus-provider/web/api/debug" "github.com/filecoin-project/lotus/cmd/lotus-provider/web/api/debug"
"github.com/gorilla/mux"
) )
func Routes(r *mux.Router, deps *deps.Deps) { func Routes(r *mux.Router, deps *deps.Deps) {

View File

@ -4,11 +4,11 @@ import (
"embed" "embed"
"html/template" "html/template"
"github.com/gorilla/mux"
logging "github.com/ipfs/go-log/v2" logging "github.com/ipfs/go-log/v2"
"golang.org/x/xerrors"
"github.com/filecoin-project/lotus/cmd/lotus-provider/deps" "github.com/filecoin-project/lotus/cmd/lotus-provider/deps"
"github.com/gorilla/mux"
"golang.org/x/xerrors"
) )
//go:embed web/* //go:embed web/*

View File

@ -8,12 +8,13 @@ import (
"net/http" "net/http"
"strings" "strings"
"github.com/gorilla/mux"
"go.opencensus.io/tag"
"github.com/filecoin-project/lotus/cmd/lotus-provider/deps" "github.com/filecoin-project/lotus/cmd/lotus-provider/deps"
"github.com/filecoin-project/lotus/cmd/lotus-provider/web/api" "github.com/filecoin-project/lotus/cmd/lotus-provider/web/api"
"github.com/filecoin-project/lotus/cmd/lotus-provider/web/hapi" "github.com/filecoin-project/lotus/cmd/lotus-provider/web/hapi"
"github.com/filecoin-project/lotus/metrics" "github.com/filecoin-project/lotus/metrics"
"github.com/gorilla/mux"
"go.opencensus.io/tag"
) )
// go:embed static // go:embed static

View File

@ -14,6 +14,7 @@ COMMANDS:
stop Stop a running lotus provider stop Stop a running lotus provider
config Manage node config by layers. The layer 'base' will always be applied. config Manage node config by layers. The layer 'base' will always be applied.
test Utility functions for testing test Utility functions for testing
web Start lotus provider web interface
version Print version version Print version
help, h Shows a list of commands or help for one command help, h Shows a list of commands or help for one command
DEVELOPER: DEVELOPER:
@ -247,6 +248,23 @@ OPTIONS:
--help, -h show help --help, -h show help
``` ```
## lotus-provider web
```
NAME:
lotus-provider web - Start lotus provider web interface
USAGE:
lotus-provider web [command options] [arguments...]
DESCRIPTION:
Start an instance of lotus provider web interface.
This creates the 'web' layer if it does not exist, then calls run with that layer.
OPTIONS:
--listen value Address to listen on (default: "127.0.0.1:4701")
--help, -h show help
```
## lotus-provider version ## lotus-provider version
``` ```
NAME: NAME:

View File

@ -11,6 +11,14 @@
# type: int # type: int
#WinningPostMaxTasks = 0 #WinningPostMaxTasks = 0
# type: bool
#EnableWebGui = false
# The address that should listen for Web GUI requests.
#
# type: string
#GuiAddress = ":4701"
[Fees] [Fees]
# type: types.FIL # type: types.FIL

View File

@ -1013,6 +1013,18 @@ block rewards will be missed!`,
Comment: ``, Comment: ``,
}, },
{
Name: "EnableWebGui",
Type: "bool",
Comment: ``,
},
{
Name: "GuiAddress",
Type: "string",
Comment: `The address that should listen for Web GUI requests.`,
},
}, },
"ProvingConfig": { "ProvingConfig": {
{ {