Release/v1.6.0

.circleci/config.yml

@@ -118,7 +118,7 @@ jobs:
         description: gotestsum format. https://github.com/gotestyourself/gotestsum#format
       coverage:
         type: string
-        default: -coverprofile=coverage.txt -coverpkg=github.com/filecoin-project/venus-miner/...
+        default: -coverprofile=coverage.txt -coverpkg=./...
         description: Coverage flag. Set to the empty string to disable.
       codecov-upload:
         type: boolean
@@ -131,7 +131,7 @@ jobs:
       - install-deps
       - prepare
       - run:
-          command: make deps miner
+          command: make deps
           no_output_timeout: 30m
       - run:
           name: go test
@@ -175,7 +175,7 @@ jobs:
           name: Install go
           command: |
             curl -O https://dl.google.com/go/go1.17.9.darwin-amd64.pkg && \
-            sudo installer -pkg go1.16.4.darwin-amd64.pkg -target /
+            sudo installer -pkg go1.17.9.darwin-amd64.pkg -target /
       - run:
           name: Install pkg-config
           command: HOMEBREW_NO_AUTO_UPDATE=1 brew install pkg-config
@@ -196,7 +196,6 @@ jobs:
       - restore_cache:
           name: restore cargo cache
           key: v3-go-deps-{{ arch }}-{{ checksum "~/go/src/github.com/filecoin-project/venus-miner/go.sum" }}
-      - install-deps
       - run:
           command: make miner
           no_output_timeout: 30m
@@ -228,8 +227,9 @@ jobs:
       - install-deps
       - prepare
       - run: make deps
-      - run: go install golang.org/x/tools/cmd/goimports
       - run: go generate -x ./...
+      - run: go install golang.org/x/tools/cmd/goimports
+      - run: make gen
       - run: git --no-pager diff
       - run: git --no-pager diff --quiet
 

Makefile

@@ -4,9 +4,9 @@ all: build
 .PHONY: all docker
 
 GOVERSION:=$(shell go version | cut -d' ' -f 3 | cut -d. -f 2)
-ifeq ($(shell expr $(GOVERSION) \< 15), 1)
+ifeq ($(shell expr $(GOVERSION) \< 17), 1)
 $(warning Your Golang version is go 1.$(GOVERSION))
-$(error Update Golang to version to at least 1.15.5)
+$(error Update Golang to version to at least 1.17.9)
 endif
 
 # git modules that need to be loaded
@@ -63,7 +63,6 @@ deps: $(BUILD_DEPS)
 miner: $(BUILD_DEPS)
 	rm -f venus-miner
 	go build $(GOFLAGS) -o venus-miner ./cmd/
-	go run github.com/GeertJohan/go.rice/rice append --exec venus-miner -i ./build
 
 .PHONY: miner
 BINS+=venus-miner
@@ -82,6 +81,11 @@ dist-clean:
 	git submodule deinit --all -f
 .PHONY: dist-clean
 
+gen:
+	go run ./gen/api
+	goimports -w api
+.PHONY: gen
+
 print-%:
 	@echo $*=$($*)
 

README.md

@@ -2,7 +2,7 @@
 
 <p align="center">
   <a href="https://circleci.com/gh/filecoin-project/venus-miner"><img src="https://circleci.com/gh/filecoin-project/venus.svg?style=svg"></a>
-  <a href=""><img src="https://img.shields.io/badge/golang-%3E%3D1.16-blue.svg" /></a>
+  <a href=""><img src="https://img.shields.io/badge/golang-%3E%3D1.17-blue.svg" /></a>
   <br>
 </p>
 

api/api_common.go

@@ -42,11 +42,6 @@ type APIVersion struct {
 	//
 	// See APIVersion in build/version.go
 	APIVersion api.Version
-
-	// TODO: git commit / os / genesis cid?
-
-	// Seconds
-	BlockDelay uint64
 }
 
 func (v APIVersion) String() string {

api/api_miner.go

@@ -0,0 +1,20 @@
+package api
+
+import (
+	"context"
+	"github.com/filecoin-project/venus-miner/types"
+
+	"github.com/filecoin-project/go-address"
+	"github.com/filecoin-project/go-state-types/abi"
+)
+
+type MinerAPI interface {
+	Common
+
+	UpdateAddress(context.Context, int64, int64) ([]types.MinerInfo, error)                                        //perm:write
+	ListAddress(context.Context) ([]types.MinerInfo, error)                                                        //perm:read
+	StatesForMining(context.Context, []address.Address) ([]types.MinerState, error)                                //perm:read
+	CountWinners(context.Context, []address.Address, abi.ChainEpoch, abi.ChainEpoch) ([]types.CountWinners, error) //perm:read
+	Start(context.Context, []address.Address) error                                                                //perm:admin
+	Stop(context.Context, []address.Address) error                                                                 //perm:admin
+}

api/client/client.go

@@ -24,7 +24,7 @@ func NewCommonRPC(ctx context.Context, addr string, requestHeader http.Header) (
 
 // NewMinerRPC creates a new http jsonrpc client for miner
 func NewMinerRPC(ctx context.Context, addr string, requestHeader http.Header, opts ...jsonrpc.Option) (api.MinerAPI, jsonrpc.ClientCloser, error) {
-	var res api.MinerStruct
+	var res api.MinerAPIStruct
 	closer, err := jsonrpc.NewMergeClient(ctx, addr, "Filecoin",
 		[]interface{}{
 			&res.CommonStruct.Internal,

api/client/gateway_client.go

@@ -11,7 +11,7 @@ import (
 	gateway "github.com/filecoin-project/venus/venus-shared/api/gateway/v1"
 )
 
-func NewGatewayRPC(cfg *config.GatewayNode) (gateway.IGateway, jsonrpc.ClientCloser, error) {
+func NewGatewayRPC(ctx context.Context, cfg *config.GatewayNode) (gateway.IGateway, jsonrpc.ClientCloser, error) {
 	var err error
 	addrs, err := cfg.DialArgs()
 	if err != nil {
@@ -21,7 +21,7 @@ func NewGatewayRPC(cfg *config.GatewayNode) (gateway.IGateway, jsonrpc.ClientClo
 	var gatewayAPI gateway.IGateway = nil
 	var closer jsonrpc.ClientCloser
 	for _, addr := range addrs {
-		gatewayAPI, closer, err = gateway.NewIGatewayRPC(context.Background(), addr, cfg.AuthHeader())
+		gatewayAPI, closer, err = gateway.NewIGatewayRPC(ctx, addr, cfg.AuthHeader())
 		if err == nil {
 			return gatewayAPI, closer, err
 		}

api/permissioned.go

@@ -17,7 +17,7 @@ var AllPermissions = []auth.Permission{PermRead, PermWrite, PermSign, PermAdmin}
 var DefaultPerms = []auth.Permission{PermRead}
 
 func PermissionedMinerAPI(a MinerAPI) MinerAPI {
-	var out MinerStruct
+	var out MinerAPIStruct
 	auth.PermissionedProxy(AllPermissions, DefaultPerms, a, &out.Internal)
 	auth.PermissionedProxy(AllPermissions, DefaultPerms, a, &out.CommonStruct.Internal)
 	return &out