Fix tests

Author: arajasek

chain/actors/builtin/builtin.go

@@ -20,6 +20,7 @@ import (
 	builtin7 "github.com/filecoin-project/specs-actors/v7/actors/builtin"
 
 	builtin8 "github.com/filecoin-project/go-state-types/builtin"
+	builtin8sa "github.com/filecoin-project/specs-actors/v8/actors/builtin"
 
 	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/filecoin-project/go-state-types/proof"
@@ -92,6 +93,9 @@ func ActorNameByCode(c cid.Cid) string {
 	case builtin7.IsBuiltinActor(c):
 		return builtin7.ActorNameByCode(c)
 
+	case builtin8sa.IsBuiltinActor(c):
+		return builtin8sa.ActorNameByCode(c)
+
 	default:
 		return "<unknown>"
 	}

chain/actors/builtin/builtin.go.template

@@ -10,6 +10,7 @@ import (
 	    builtin{{.}} "github.com/filecoin-project/specs-actors{{import .}}actors/builtin"
 	{{else}}
         builtin{{.}} "github.com/filecoin-project/go-state-types/builtin"
+        builtin{{.}}sa "github.com/filecoin-project/specs-actors{{import .}}actors/builtin"
     {{end}}
 {{end}}
 
@@ -62,12 +63,15 @@ func ActorNameByCode(c cid.Cid) string {
 	}
 
 	switch {
-		{{range .versions}}
-		    {{if (le . 7)}}
+	    {{range .versions}}
+            {{if (le . 7)}}
                 case builtin{{.}}.IsBuiltinActor(c):
                 return builtin{{.}}.ActorNameByCode(c)
-		    {{end}}
-		{{end}}
+            {{else}}
+                case builtin{{.}}sa.IsBuiltinActor(c):
+                return builtin{{.}}sa.ActorNameByCode(c)
+            {{end}}
+        {{end}}
 	default:
 		return "<unknown>"
 	}

chain/consensus/filcns/compute_state.go

@@ -24,6 +24,7 @@ import (
 	exported5 "github.com/filecoin-project/specs-actors/v5/actors/builtin/exported"
 	exported6 "github.com/filecoin-project/specs-actors/v6/actors/builtin/exported"
 	exported7 "github.com/filecoin-project/specs-actors/v7/actors/builtin/exported"
+	exported8 "github.com/filecoin-project/specs-actors/v8/actors/builtin/exported"
 
 	"github.com/filecoin-project/lotus/blockstore"
 	"github.com/filecoin-project/lotus/build"
@@ -48,6 +49,7 @@ func NewActorRegistry() *vm.ActorRegistry {
 	inv.Register(actors.Version5, vm.ActorsVersionPredicate(actors.Version5), exported5.BuiltinActors()...)
 	inv.Register(actors.Version6, vm.ActorsVersionPredicate(actors.Version6), exported6.BuiltinActors()...)
 	inv.Register(actors.Version7, vm.ActorsVersionPredicate(actors.Version7), exported7.BuiltinActors()...)
+	inv.Register(actors.Version8, vm.ActorsVersionPredicate(actors.Version8), exported8.BuiltinActors()...)
 
 	return inv
 }

chain/gen/genesis/genesis.go

@@ -495,7 +495,7 @@ func VerifyPreSealedData(ctx context.Context, cs *store.ChainStore, sys vm.Sysca
 		NetworkVersion: nv,
 		BaseFee:        big.Zero(),
 	}
-	vm, err := vm.NewLegacyVM(ctx, &vmopt)
+	vm, err := vm.NewVM(ctx, &vmopt)
 	if err != nil {
 		return cid.Undef, xerrors.Errorf("failed to create NewLegacyVM: %w", err)
 	}
@@ -580,23 +580,6 @@ func MakeGenesisBlock(ctx context.Context, j journal.Journal, bs bstore.Blocksto
 		return nil, xerrors.Errorf("setup miners failed: %w", err)
 	}
 
-	if template.NetworkVersion >= network.Version16 {
-		st, err := state.LoadStateTree(cbor.NewCborStore(bs), stateroot)
-		if err != nil {
-			return nil, xerrors.Errorf("error loading state tree")
-		}
-
-		err = patchManifestCodeCids(st, template.NetworkVersion)
-		if err != nil {
-			return nil, xerrors.Errorf("error patching state tree: %w", err)
-		}
-
-		stateroot, err = st.Flush(ctx)
-		if err != nil {
-			return nil, xerrors.Errorf("flush state tree failed: %w", err)
-		}
-	}
-
 	store := adt.WrapStore(ctx, cbor.NewCborStore(bs))
 	emptyroot, err := adt0.MakeEmptyArray(store).Root()
 	if err != nil {