feat: switch to an FFI-level config

This means we don't construct a v3 config at the top level, then try to
convert it to a v2 config. When we do that, we run into issues if, e.g.,
v3 doesn't define a price-list for a version only supported by v2.

This PR also has a bit of cleanup:

1. Removes the manifest CID.
2. Changes the network version from u64 to u32 (simplifies some code).
3. Deletes all the overlay blockstore logic (was only used if the
   manifest was explicitly passed).

Actor "overrides" should now only be done via "redirects".

Author: Stebalien

cgo/fvm.go

@@ -8,7 +8,7 @@ package cgo
 */
 import "C"
 
-func CreateFvmMachine(fvmVersion FvmRegisteredVersion, chainEpoch, chainTimestamp, chainId, baseFeeHi, baseFeeLo, baseCircSupplyHi, baseCircSupplyLo, networkVersion uint64, stateRoot SliceRefUint8, manifestCid SliceRefUint8, tracing bool, blockstoreId, externsId uint64) (*FvmMachine, error) {
+func CreateFvmMachine(fvmVersion FvmRegisteredVersion, chainEpoch, chainTimestamp, chainId, baseFeeHi, baseFeeLo, baseCircSupplyHi, baseCircSupplyLo, networkVersion uint64, stateRoot SliceRefUint8, tracing bool, blockstoreId, externsId uint64) (*FvmMachine, error) {
 	resp := C.create_fvm_machine(
 		fvmVersion,
 		C.uint64_t(chainEpoch),
@@ -18,9 +18,8 @@ func CreateFvmMachine(fvmVersion FvmRegisteredVersion, chainEpoch, chainTimestam
 		C.uint64_t(baseFeeLo),
 		C.uint64_t(baseCircSupplyHi),
 		C.uint64_t(baseCircSupplyLo),
-		C.uint64_t(networkVersion),
+		C.uint32_t(networkVersion),
 		stateRoot,
-		manifestCid,
 		C.bool(tracing),
 		C.uint64_t(blockstoreId),
 		C.uint64_t(externsId),
@@ -47,7 +46,7 @@ func CreateFvmDebugMachine(fvmVersion FvmRegisteredVersion, chainEpoch, chainTim
 		C.uint64_t(baseFeeLo),
 		C.uint64_t(baseCircSupplyHi),
 		C.uint64_t(baseCircSupplyLo),
-		C.uint64_t(networkVersion),
+		C.uint32_t(networkVersion),
 		stateRoot,
 		actorRedirect,
 		C.bool(tracing),

fvm.go

@@ -1,49 +1,5 @@
-//go:build cgo && (amd64 || arm64 || riscv64)
-// +build cgo
-// +build amd64 arm64 riscv64
-
-package ffi
-
-// #cgo linux LDFLAGS: ${SRCDIR}/libfilcrypto.a -Wl,-unresolved-symbols=ignore-all
-// #cgo darwin LDFLAGS: ${SRCDIR}/libfilcrypto.a -Wl,-undefined,dynamic_lookup
-// #cgo pkg-config: ${SRCDIR}/filcrypto.pc
-// #include "./filcrypto.h"
-import "C"
-import (
-	"context"
-	"fmt"
-	gobig "math/big"
-	"runtime"
-
-	"github.com/filecoin-project/filecoin-ffi/cgo"
-	"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/ipfs/go-cid"
-	"golang.org/x/xerrors"
-)
-
-type FVM struct {
-	executor *cgo.FvmMachine
-}
-
-const (
-	applyExplicit = iota
-	applyImplicit
-)
-
-type FVMOpts struct {
-	FVMVersion uint64
-	Externs    cgo.Externs
-
-	Epoch          abi.ChainEpoch
-	Timestamp      uint64
-	ChainID        uint64
-	BaseFee        abi.TokenAmount
-	BaseCircSupply abi.TokenAmount
-	NetworkVersion network.Version
+//go:build cgo && (amd64 || arm64 || riscv64NetworkVersion network.Version
 	StateBase      cid.Cid
-	Manifest       cid.Cid
 	Tracing        bool
 
 	Debug         bool
@@ -74,7 +30,6 @@ func CreateFVM(opts *FVMOpts) (*FVM, error) {
 			baseCircSupplyLo,
 			uint64(opts.NetworkVersion),
 			cgo.AsSliceRefUint8(opts.StateBase.Bytes()),
-			cgo.AsSliceRefUint8(opts.Manifest.Bytes()),
 			opts.Tracing,
 			exHandle, exHandle,
 		)

rust/src/fvm/blockstore/fake.rs

@@ -1,7 +1,2 @@
 mod cgo;
-mod fake;
-mod overlay;
-
 pub use cgo::*;
-pub use fake::*;
-pub use overlay::*;