cerc-io/lotus
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

fix rebase issues

Browse Source
This commit is contained in:
vyzo 2022-04-14 19:38:49 +03:00
parent 1866eebe06
commit 2690b69831
4 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
build/builtin_actors.go
View File

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

2
chain/actors/manifest.go
View File

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

1
chain/stmgr/forks.go
View File

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

2
chain/vm/vmi.go
View File

@ -19,7 +19,7 @@ type Interface interface {
Flush(ctx context.Context) (cid.Cid, error) 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 { if opts.NetworkVersion >= network.Version16 {
return NewFVM(ctx, opts) return NewFVM(ctx, opts)
} }