feat(fvm): add flush_all_blocks option to also write intermediate blocks

Author: rvagg

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, tracing bool, blockstoreId, externsId uint64) (*FvmMachine, error) {
+func CreateFvmMachine(fvmVersion FvmRegisteredVersion, chainEpoch, chainTimestamp, chainId, baseFeeHi, baseFeeLo, baseCircSupplyHi, baseCircSupplyLo, networkVersion uint64, stateRoot SliceRefUint8, tracing, flushAllBlocks bool, blockstoreId, externsId uint64) (*FvmMachine, error) {
 	resp := (*resultFvmMachine)(C.create_fvm_machine(
 		(C.FvmRegisteredVersion_t)(fvmVersion),
 		C.uint64_t(chainEpoch),
@@ -21,6 +21,7 @@ func CreateFvmMachine(fvmVersion FvmRegisteredVersion, chainEpoch, chainTimestam
 		C.uint32_t(networkVersion),
 		(C.slice_ref_uint8_t)(stateRoot),
 		C.bool(tracing),
+		C.bool(flushAllBlocks),
 		C.uint64_t(blockstoreId),
 		C.uint64_t(externsId),
 	))
@@ -36,7 +37,7 @@ func CreateFvmMachine(fvmVersion FvmRegisteredVersion, chainEpoch, chainTimestam
 	return executor, nil
 }
 
-func CreateFvmDebugMachine(fvmVersion FvmRegisteredVersion, chainEpoch, chainTimestamp, chainId, baseFeeHi, baseFeeLo, baseCircSupplyHi, baseCircSupplyLo, networkVersion uint64, stateRoot SliceRefUint8, actorRedirect SliceRefUint8, tracing bool, blockstoreId, externsId uint64) (*FvmMachine, error) {
+func CreateFvmDebugMachine(fvmVersion FvmRegisteredVersion, chainEpoch, chainTimestamp, chainId, baseFeeHi, baseFeeLo, baseCircSupplyHi, baseCircSupplyLo, networkVersion uint64, stateRoot SliceRefUint8, actorRedirect SliceRefUint8, tracing, flushAllBlocks bool, blockstoreId, externsId uint64) (*FvmMachine, error) {
 	resp := (*resultFvmMachine)(C.create_fvm_debug_machine(
 		(C.FvmRegisteredVersion_t)(fvmVersion),
 		C.uint64_t(chainEpoch),
@@ -50,6 +51,7 @@ func CreateFvmDebugMachine(fvmVersion FvmRegisteredVersion, chainEpoch, chainTim
 		(C.slice_ref_uint8_t)(stateRoot),
 		(C.slice_ref_uint8_t)(actorRedirect),
 		C.bool(tracing),
+		C.bool(flushAllBlocks),
 		C.uint64_t(blockstoreId),
 		C.uint64_t(externsId),
 	))
@@ -90,10 +92,3 @@ func FvmMachineFlush(executor *FvmMachine) ([]byte, error) {
 	}
 	return (SliceBoxedUint8)(resp.value).copy(), nil
 }
-
-func FvmMachineDumpCache(executor *FvmMachine, blockstoreId uint64) error {
-	resp := C.fvm_machine_dump_cache(executor, C.uint64_t(blockstoreId))
-	defer resp.destroy()
-
-	return CheckErr(resp)
-}

fvm.go

@@ -19,7 +19,6 @@ 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/ipfs/boxo/blockstore"
 	"github.com/ipfs/go-cid"
 	"golang.org/x/xerrors"
 )
@@ -45,6 +44,7 @@ type FVMOpts struct {
 	NetworkVersion network.Version
 	StateBase      cid.Cid
 	Tracing        bool
+	FlushAllBlocks bool
 
 	Debug         bool
 	ActorRedirect cid.Cid
@@ -75,6 +75,7 @@ func CreateFVM(opts *FVMOpts) (*FVM, error) {
 			uint64(opts.NetworkVersion),
 			cgo.AsSliceRefUint8(opts.StateBase.Bytes()),
 			opts.Tracing,
+			opts.FlushAllBlocks,
 			exHandle, exHandle,
 		)
 	} else {
@@ -90,6 +91,7 @@ func CreateFVM(opts *FVMOpts) (*FVM, error) {
 			cgo.AsSliceRefUint8(opts.StateBase.Bytes()),
 			cgo.AsSliceRefUint8(opts.ActorRedirect.Bytes()),
 			true,
+			opts.FlushAllBlocks,
 			exHandle, exHandle,
 		)
 	}
@@ -188,14 +190,6 @@ func (f *FVM) Flush() (cid.Cid, error) {
 	return cid.Cast(stateRoot)
 }
 
-// DumpCache dumps the intermediate blockstore cache of the FVM to the provided blockstore.
-func (f *FVM) DumpCache(bs blockstore.Blockstore) error {
-	defer runtime.KeepAlive(f)
-	bsHandle := cgo.Register(context.TODO(), blockStoreAsExterns{Blockstore: bs})
-	defer cgo.Unregister(bsHandle)
-	return cgo.FvmMachineDumpCache(f.executor, bsHandle)
-}
-
 type ApplyRet struct {
 	Return             []byte
 	ExitCode           uint64
@@ -247,32 +241,3 @@ func reformBigInt(hi, lo uint64) big.Int {
 	int.SetBits(words)
 	return big.NewFromGo(int)
 }
-
-// blockStoreAsExterns is a wrapper around a blockstore.Blockstore that implements the cgo.Externs.
-// It is only intended for use strictly as a Blockstore, and does not support any of the other
-// Externs methods.
-type blockStoreAsExterns struct {
-	blockstore.Blockstore
-}
-
-var _ cgo.Externs = blockStoreAsExterns{}
-
-func (b blockStoreAsExterns) GetChainRandomness(ctx context.Context, epoch abi.ChainEpoch) ([32]byte, error) {
-	return [32]byte{}, xerrors.Errorf("GetChainRandomness not supported")
-}
-
-func (b blockStoreAsExterns) GetBeaconRandomness(ctx context.Context, epoch abi.ChainEpoch) ([32]byte, error) {
-	return [32]byte{}, xerrors.Errorf("GetBeaconRandomness not supported")
-}
-
-func (b blockStoreAsExterns) VerifyConsensusFault(ctx context.Context, h1, h2, extra []byte) (*cgo.ConsensusFault, int64) {
-	panic("VerifyConsensusFault not supported")
-}
-
-func (b blockStoreAsExterns) TipsetCid(ctx context.Context, epoch abi.ChainEpoch) (cid.Cid, error) {
-	return cid.Undef, xerrors.Errorf("TipsetCid not supported")
-}
-
-func (b blockStoreAsExterns) View(ctx context.Context, cid cid.Cid, callback func([]byte) error) error {
-	return xerrors.Errorf("View not supported")
-}

rust/Cargo.lock

@@ -51,8 +51,8 @@ filecoin-proofs-api = { version = "18.1", default-features = false }
 yastl = "0.1.2"
 
 [patch.crates-io]
-fvm4 = { package = "fvm", path = "/home/rvagg/git/pl/filecoin-project/ref-fvm/fvm" }
-fvm4_shared = { package = "fvm_shared", path = "/home/rvagg/git/pl/filecoin-project/ref-fvm/shared" }
+fvm = { path = "/home/rvagg/git/pl/filecoin-project/ref-fvm/fvm" }
+fvm_shared = { path = "/home/rvagg/git/pl/filecoin-project/ref-fvm/shared" } 
 fvm_ipld_blockstore = { path = "/home/rvagg/git/pl/filecoin-project/ref-fvm/ipld/blockstore" }
 fvm_ipld_encoding = { path = "/home/rvagg/git/pl/filecoin-project/ref-fvm/ipld/encoding" }
 

rust/Cargo.toml

@@ -26,8 +26,6 @@ pub trait CgoExecutor: Send {
     ) -> anyhow::Result<ApplyRet>;
 
     fn flush(&mut self) -> anyhow::Result<Cid>;
-
-    fn dump_cache(&mut self, bs: CgoBlockstore) -> anyhow::Result<()>;
 }
 
 pub struct Config {
@@ -41,6 +39,7 @@ pub struct Config {
     pub tracing: bool,
     pub actor_debugging: bool,
     pub actor_redirect: Vec<(Cid, Cid)>,
+    pub flush_all_blocks: bool,
 }
 
 // The generic engine interface
@@ -150,11 +149,6 @@ mod v4 {
         fn flush(&mut self) -> anyhow::Result<Cid> {
             fvm4::executor::Executor::flush(self)
         }
-
-        fn dump_cache(&mut self, bs: CgoBlockstore) -> anyhow::Result<()> {
-            log::info!("CgoExecutor4::dump_cache");
-            fvm4::executor::Executor::dump_cache(self, bs)
-        }
     }
 
     impl AbstractMultiEngine for MultiEngine4 {
@@ -185,6 +179,9 @@ mod v4 {
             if cfg.tracing {
                 machine_context.enable_tracing();
             }
+            if cfg.flush_all_blocks {
+                machine_context.enable_flush_all_blocks();
+            }
             let engine = self.get(&network_config)?;
             let machine = CgoMachine4::new(&machine_context, blockstore, externs)?;
             Ok(InnerFvmMachine {
@@ -427,11 +424,6 @@ mod v3 {
         fn flush(&mut self) -> anyhow::Result<Cid> {
             fvm3::executor::Executor::flush(self)
         }
-
-        // dump_cache is only implemented in v4
-        fn dump_cache(&mut self, _: CgoBlockstore) -> anyhow::Result<()> {
-            Err(anyhow::anyhow!("dump_cache not implemented for fvm v3"))
-        }
     }
 
     impl AbstractMultiEngine for MultiEngine3 {
@@ -693,11 +685,6 @@ mod v2 {
         fn flush(&mut self) -> anyhow::Result<Cid> {
             fvm2::executor::Executor::flush(self)
         }
-
-        // dump_cache is only implemented in v4
-        fn dump_cache(&mut self, _: CgoBlockstore) -> anyhow::Result<()> {
-            Err(anyhow::anyhow!("dump_cache not implemented for fvm v2"))
-        }
     }
 
     impl AbstractMultiEngine for MultiEngine2 {