fix rebase issues

build/builtin_actors.go

@@ -10,3 +10,10 @@ var actorsv8 []byte
 func BuiltinActorsV8Bundle() []byte {
 	return actorsv8
 }
+
+//go:embed builtin-actors/builtin-actors-v7.car
+var actorsv7 []byte
+
+func BuiltinActorsV7Bundle() []byte {
+	return actorsv7
+}

chain/actors/manifest.go

@@ -27,6 +27,8 @@ var actorMeta map[cid.Cid]actorEntry
 var (
 	loadOnce  sync.Once
 	loadError error
+
+	manifestMx sync.Mutex
 )
 
 type actorEntry struct {

chain/stmgr/forks.go

@@ -17,6 +17,7 @@ import (
 	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/filecoin-project/go-state-types/big"
 	"github.com/filecoin-project/go-state-types/network"
+	"github.com/filecoin-project/lotus/build"
 	"github.com/filecoin-project/lotus/chain/actors/adt"
 	"github.com/filecoin-project/lotus/chain/actors/builtin"
 	init_ "github.com/filecoin-project/lotus/chain/actors/builtin/init"

chain/vm/vmi.go

@@ -19,7 +19,7 @@ type Interface interface {
 	Flush(ctx context.Context) (cid.Cid, error)
 }
 
-func NewVM(ctx context.Context, opts *VMOpts) (VMI, error) {
+func NewVM(ctx context.Context, opts *VMOpts) (Interface, error) {
 	if opts.NetworkVersion >= network.Version16 {
 		return NewFVM(ctx, opts)
 	}