Update to FVM 3.0.0-alpha.17, actors dev/20221219-fvm-m2

chain/vm/fvm.go

@@ -329,20 +329,6 @@ func NewFVM(ctx context.Context, opts *VMOpts) (*FVM, error) {
 		return nil, xerrors.Errorf("creating fvm opts: %w", err)
 	}
 
-	if os.Getenv("LOTUS_USE_FVM_CUSTOM_BUNDLE") == "1" {
-		av, err := actorstypes.VersionForNetwork(opts.NetworkVersion)
-		if err != nil {
-			return nil, xerrors.Errorf("mapping network version to actors version: %w", err)
-		}
-
-		c, ok := actors.GetManifest(av)
-		if !ok {
-			return nil, xerrors.Errorf("no manifest for custom bundle (actors version %d)", av)
-		}
-
-		fvmOpts.Manifest = c
-	}
-
 	fvm, err := ffi.CreateFVM(fvmOpts)
 
 	if err != nil {

chain/vm/vm.go

@@ -57,10 +57,10 @@ func ResolveToKeyAddr(state types.StateTree, cst cbor.IpldStore, addr address.Ad
 	}
 
 	if state.Version() >= types.StateTreeVersion5 {
-		if act.Address == nil {
-			return address.Undef, xerrors.Errorf("actor at %s doesn't have a predictable address", addr)
+		if act.Address != nil {
+			// If there _is_ an f4 address, return it as "key" address
+			return *act.Address, nil
 		}
-		return *act.Address, nil
 	}
 
 	aast, err := account.Load(adt.WrapStore(context.TODO(), cst), act)