build: bump version to v1.6.0-rc1

.github/workflows/baisc_checks.yml

@@ -26,12 +26,9 @@ jobs:
           sudo apt-get update
           sudo apt-get -o Acquire::Retries=3 install make ncftp mesa-opencl-icd ocl-icd-opencl-dev gcc git bzr jq pkg-config curl clang build-essential hwloc libhwloc-dev wget -y && sudo apt upgrade -y
 
-      - name: dep
-        env:
-          GOPROXY: "https://proxy.golang.org,direct"
-          GO111MODULE: "on"
+      - name: install goimports
         run: |
-          make deps
+          go install golang.org/x/tools/cmd/goimports
 
       - name: Build
         env:

.gitignore

@@ -12,6 +12,8 @@ coverprofile.html
 *.out
 *.so
 
+actor-bundles-v8.*
+
 fixtures/test
 !fixtures/test/.gitkeep
 fixtures/live

Makefile

@@ -42,11 +42,7 @@ build-dep/.update-modules: build-dep;
 	git submodule update --init --recursive
 	touch $@
 
-gen-all: cborgen gogen inline-gen api-gen
-
-gen-asset:
-	go-bindata -pkg=asset -o ./fixtures/asset/asset.go ./fixtures/_assets/car/ ./fixtures/_assets/proof-params/ ./fixtures/_assets/arch-diagram.monopic
-	gofmt -s -l -w ./fixtures/asset/asset.go
+gen-all: cborgen gogen inline-gen api-gen bundle-gen
 
 ### devtool ###
 cborgen:
@@ -61,6 +57,10 @@ inline-gen:
 test-venus-shared:
 	cd venus-shared && go test -covermode=set ./...
 
+bundle-gen:
+	cd venus-devtool && go run ./bundle-gen/*.go  --dst ./../venus-shared/builtin-actors/builtin_actors_gen.go
+	goimports -w venus-shared/builtin-actors/builtin_actors_gen.go
+
 api-gen:
 	cd ./venus-devtool/ && go run ./api-gen/ proxy
 	cd ./venus-devtool/ && go run ./api-gen/ client
@@ -81,6 +81,7 @@ api-perm:
 	cd venus-devtool && go run ./compatible/apis/*.go perm > ../venus-shared/compatible-checks/api-perm.txt
 
 compatible-actor: actor-templates actor-sources actor-render
+	goimports -w -format-only venus-shared/actors/*
 
 actor-templates:
 	cd venus-devtool && go run ./compatible/actors/*.go templates --dst ../venus-shared/actors/ > ../venus-shared/compatible-checks/actor-templates.txt
@@ -115,8 +116,6 @@ build: $(BUILD_DEPS)
 	go build -o ./venus $(GOFLAGS) .
 
 
-
-
 .PHONY: docker
 
 

app/node/builder.go

@@ -2,14 +2,12 @@ package node
 
 import (
 	"context"
+	"fmt"
 	"time"
 
 	logging "github.com/ipfs/go-log"
 	"github.com/libp2p/go-libp2p"
 	"github.com/pkg/errors"
-	"golang.org/x/xerrors"
-
-	"github.com/ipfs-force-community/metrics/ratelimit"
 
 	"github.com/filecoin-project/venus/app/submodule/blockstore"
 	"github.com/filecoin-project/venus/app/submodule/chain"
@@ -33,7 +31,9 @@ import (
 	"github.com/filecoin-project/venus/pkg/repo"
 	"github.com/filecoin-project/venus/pkg/util/ffiwrapper"
 	"github.com/filecoin-project/venus/pkg/util/ffiwrapper/impl"
+	builtin_actors "github.com/filecoin-project/venus/venus-shared/builtin-actors"
 	"github.com/filecoin-project/venus/venus-shared/types"
+	"github.com/ipfs-force-community/metrics/ratelimit"
 )
 
 // Builder is a helper to aid in the construction of a filecoin node.
@@ -102,6 +102,10 @@ func (b *Builder) build(ctx context.Context) (*Node, error) {
 		chainClock:  b.chainClock,
 	}
 
+	if err := builtin_actors.SetNetworkBundle(b.repo.Config().NetworkParams.NetworkType); err != nil {
+		return nil, err
+	}
+
 	//modules
 	nd.circulatiingSupplyCalculator = chain2.NewCirculatingSupplyCalculator(b.repo.Datastore(), b.genBlk.ParentStateRoot, b.repo.Config().NetworkParams.ForkUpgradeParam)
 
@@ -198,7 +202,7 @@ func (b *Builder) build(ctx context.Context) (*Node, error) {
 	if nd.remoteAuth != nil && cfg.RateLimitCfg.Enable {
 		if ratelimiter, err = ratelimit.NewRateLimitHandler(cfg.RateLimitCfg.Endpoint,
 			nil, &jwtauth.ValueFromCtx{}, nd.remoteAuth, logging.Logger("rate-limit")); err != nil {
-			return nil, xerrors.Errorf("request rate-limit is enabled, but create rate-limit handler failed:%w", err)
+			return nil, fmt.Errorf("request rate-limit is enabled, but create rate-limit handler failed:%w", err)
 		}
 		_ = logging.SetLogLevel("rate-limit", "warn")
 	}

app/node/node.go

@@ -275,8 +275,7 @@ func (node *Node) RunRPCAndWait(ctx context.Context, rootCmdDaemon *cmds.Command
 		return err
 	}
 
-	authMux := jwtclient.NewAuthMux(localVerifer,
-		node.remoteAuth, mux, logging.Logger("venus-auth"))
+	authMux := jwtclient.NewAuthMux(localVerifer, node.remoteAuth, mux)
 	authMux.TrustHandle("/debug/pprof/", http.DefaultServeMux)
 
 	// todo:

app/node/rpc.go

@@ -1,14 +1,14 @@
 package node
 
 import (
+	"errors"
 	"reflect"
 
 	"github.com/filecoin-project/go-jsonrpc"
 	v0api "github.com/filecoin-project/venus/venus-shared/api/chain/v0"
 	v1api "github.com/filecoin-project/venus/venus-shared/api/chain/v1"
 	"github.com/filecoin-project/venus/venus-shared/api/permission"
 	"github.com/ipfs-force-community/metrics/ratelimit"
-	"golang.org/x/xerrors"
 )
 
 type RPCService interface {
@@ -43,7 +43,7 @@ func (builder *RPCBuilder) AddService(service RPCService) error {
 	serviceV := reflect.ValueOf(service)
 	apiMethod := serviceV.MethodByName(methodName)
 	if !apiMethod.IsValid() {
-		return xerrors.New("expect API function")
+		return errors.New("expect API function")
 	}
 
 	apiImpls := apiMethod.Call([]reflect.Value{})
@@ -68,7 +68,7 @@ func (builder *RPCBuilder) AddService(service RPCService) error {
 	serviceV = reflect.ValueOf(service)
 	apiMethod = serviceV.MethodByName(methodName)
 	if !apiMethod.IsValid() {
-		return xerrors.New("expect API function")
+		return errors.New("expect API function")
 	}
 
 	apiImpls = apiMethod.Call([]reflect.Value{})

app/node/test/node.go

@@ -29,7 +29,7 @@ import (
 // ChainSeed is a generalized struct for configuring node
 type ChainSeed struct {
 	info   *gengen.RenderedGenInfo
-	bstore blockstore.Blockstore
+	bstore blockstoreutil.Blockstore
 }
 
 // MakeChainSeed creates a chain seed struct (see above) from a given
@@ -38,7 +38,7 @@ func MakeChainSeed(t *testing.T, cfg *gengen.GenesisCfg) *ChainSeed {
 	t.Helper()
 
 	mds := ds.NewMapDatastore()
-	bstore := blockstore.NewBlockstore(mds)
+	bstore := blockstoreutil.Adapt(blockstore.NewBlockstore(mds))
 	info, err := gengen.GenGen(context.TODO(), cfg, bstore)
 	require.NoError(t, err)
 	return &ChainSeed{
@@ -48,7 +48,7 @@ func MakeChainSeed(t *testing.T, cfg *gengen.GenesisCfg) *ChainSeed {
 }
 
 // GenesisInitFunc is a th.GenesisInitFunc using the chain seed
-func (cs *ChainSeed) GenesisInitFunc(cst cbor.IpldStore, bs blockstore.Blockstore) (*types.BlockHeader, error) {
+func (cs *ChainSeed) GenesisInitFunc(cst cbor.IpldStore, bs blockstoreutil.Blockstore) (*types.BlockHeader, error) {
 	err := blockstoreutil.CopyBlockstore(context.TODO(), cs.bstore, bs)
 	if err != nil {
 		return nil, err

app/submodule/blockstore/blockstore_api.go

@@ -2,6 +2,7 @@ package blockstore
 
 import (
 	"context"
+	"fmt"
 	"sync"
 
 	"github.com/filecoin-project/venus/venus-shared/types"
@@ -11,7 +12,6 @@ import (
 	offline "github.com/ipfs/go-ipfs-exchange-offline"
 	ipld "github.com/ipfs/go-ipld-format"
 	"github.com/ipfs/go-merkledag"
-	"golang.org/x/xerrors"
 
 	v1api "github.com/filecoin-project/venus/venus-shared/api/chain/v1"
 )
@@ -25,7 +25,7 @@ type blockstoreAPI struct { //nolint
 func (blockstoreAPI *blockstoreAPI) ChainReadObj(ctx context.Context, ocid cid.Cid) ([]byte, error) {
 	blk, err := blockstoreAPI.blockstore.Blockstore.Get(ctx, ocid)
 	if err != nil {
-		return nil, xerrors.Errorf("blockstore get: %w", err)
+		return nil, fmt.Errorf("blockstore get: %w", err)
 	}
 
 	return blk.RawData(), nil

app/submodule/blockstore/blockstore_submodule.go

@@ -4,8 +4,8 @@ import (
 	"context"
 
 	"github.com/filecoin-project/venus/pkg/repo"
+	"github.com/filecoin-project/venus/pkg/util/blockstoreutil"
 	v0api "github.com/filecoin-project/venus/venus-shared/api/chain/v0"
-	bstore "github.com/ipfs/go-ipfs-blockstore"
 )
 
 // BlockstoreSubmodule enhances the `Node` with local key/value storing capabilities.
@@ -14,7 +14,7 @@ import (
 // - `cborStore` is used for chain state and shared with piece data exchange for deals at the moment.
 type BlockstoreSubmodule struct { //nolint
 	// blockstore is the un-networked blocks interface
-	Blockstore bstore.Blockstore
+	Blockstore blockstoreutil.Blockstore
 }
 
 type blockstoreRepo interface {

app/submodule/chain/account_api.go

@@ -2,12 +2,12 @@ package chain
 
 import (
 	"context"
+	"fmt"
 
 	v1api "github.com/filecoin-project/venus/venus-shared/api/chain/v1"
 	"github.com/filecoin-project/venus/venus-shared/types"
 
 	"github.com/filecoin-project/go-address"
-	"golang.org/x/xerrors"
 )
 
 var _ v1api.IAccount = &accountAPI{}
@@ -25,7 +25,7 @@ func NewAccountAPI(chain *ChainSubmodule) v1api.IAccount {
 func (accountAPI *accountAPI) StateAccountKey(ctx context.Context, addr address.Address, tsk types.TipSetKey) (address.Address, error) {
 	ts, err := accountAPI.chain.ChainReader.GetTipSet(ctx, tsk)
 	if err != nil {
-		return address.Undef, xerrors.Errorf("loading tipset %s: %w", tsk, err)
+		return address.Undef, fmt.Errorf("loading tipset %s: %w", tsk, err)
 	}
 	return accountAPI.chain.Stmgr.ResolveToKeyAddress(ctx, addr, ts)
 }

app/submodule/chain/apibstore.go

@@ -2,11 +2,12 @@ package chain
 
 import (
 	"context"
+	"errors"
 
+	"github.com/filecoin-project/venus/pkg/util/blockstoreutil"
 	blocks "github.com/ipfs/go-block-format"
 	"github.com/ipfs/go-cid"
 	blockstore "github.com/ipfs/go-ipfs-blockstore"
-	"golang.org/x/xerrors"
 )
 
 type ChainIO interface { //nolint
@@ -19,15 +20,13 @@ type apiBStore struct {
 }
 
 // NewAPIBlockstore create new blockstore api
-func NewAPIBlockstore(cio ChainIO) blockstore.Blockstore {
-	return &apiBStore{
-		api: cio,
-	}
+func NewAPIBlockstore(cio ChainIO) blockstoreutil.Blockstore {
+	return blockstoreutil.Adapt(&apiBStore{api: cio})
 }
 
 // DeleteBlock implements Blockstore.DeleteBlock.
 func (a *apiBStore) DeleteBlock(context.Context, cid.Cid) error {
-	return xerrors.New("not supported")
+	return errors.New("not supported")
 }
 
 // Has implements Blockstore.Has.
@@ -55,17 +54,17 @@ func (a *apiBStore) GetSize(ctx context.Context, c cid.Cid) (int, error) {
 
 // Put implements Blockstore.Put.
 func (a *apiBStore) Put(context.Context, blocks.Block) error {
-	return xerrors.New("not supported")
+	return errors.New("not supported")
 }
 
 // PutMany implements Blockstore.PutMany.
 func (a *apiBStore) PutMany(context.Context, []blocks.Block) error {
-	return xerrors.New("not supported")
+	return errors.New("not supported")
 }
 
 // AllKeysChan implements Blockstore.AllKeysChan.
 func (a *apiBStore) AllKeysChan(ctx context.Context) (<-chan cid.Cid, error) {
-	return nil, xerrors.New("not supported")
+	return nil, errors.New("not supported")
 }
 
 // HashOnRead implements Blockstore.HashOnRead.

app/submodule/chain/chain_api.go

@@ -7,7 +7,6 @@ import (
 type chainAPI struct { // nolint: golint
 	v1api.IAccount
 	v1api.IActor
-	v1api.IBeacon
 	v1api.IMinerState
 	v1api.IChainInfo
 }

app/submodule/chain/chain_submodule.go

@@ -74,7 +74,7 @@ func NewChainSubmodule(ctx context.Context,
 	}
 	faultChecker := consensusfault.NewFaultChecker(chainStore, fork)
 	syscalls := vmsupport.NewSyscalls(faultChecker, config.Verifier())
-	processor := consensus.NewDefaultProcessor(syscalls)
+	processor := consensus.NewDefaultProcessor(syscalls, circulatiingSupplyCalculator)
 
 	waiter := chain.NewWaiter(chainStore, messageStore, config.Repo().Datastore(), cbor.NewCborStore(config.Repo().Datastore()))
 
@@ -111,7 +111,6 @@ func (chain *ChainSubmodule) API() v1api.IChain {
 	return &chainAPI{
 		IAccount:    NewAccountAPI(chain),
 		IActor:      NewActorAPI(chain),
-		IBeacon:     NewBeaconAPI(chain),
 		IChainInfo:  NewChainInfoAPI(chain),
 		IMinerState: NewMinerStateAPI(chain),
 	}