Load files from binary / json dynamically

rvgo/cmd/run.go

@@ -64,7 +64,7 @@ func Run(ctx *cli.Context) error {
 		defer profile.Start(profile.NoShutdownHook, profile.ProfilePath("."), profile.CPUProfile).Stop()
 	}
 
-	state, err := jsonutil.LoadJSON[fast.VMState](ctx.Path(cannon.RunInputFlag.Name))
+	state, err := fast.LoadVMStateFromFile(ctx.Path(cannon.RunInputFlag.Name))
 	if err != nil {
 		return err
 	}

rvgo/cmd/witness.go

@@ -7,7 +7,6 @@ import (
 
 	"github.com/ethereum-optimism/asterisc/rvgo/fast"
 	cannon "github.com/ethereum-optimism/optimism/cannon/cmd"
-	"github.com/ethereum-optimism/optimism/cannon/serialize"
 	"github.com/ethereum-optimism/optimism/op-service/ioutil"
 	"github.com/ethereum-optimism/optimism/op-service/jsonutil"
 )
@@ -20,7 +19,7 @@ type WitnessOutput struct {
 func Witness(ctx *cli.Context) error {
 	input := ctx.Path(cannon.WitnessInputFlag.Name)
 	output := ctx.Path(cannon.WitnessOutputFlag.Name)
-	state, err := serialize.LoadSerializedBinary[fast.VMState](input)
+	state, err := fast.LoadVMStateFromFile(input)
 	if err != nil {
 		return fmt.Errorf("invalid input state (%v): %w", input, err)
 	}

rvgo/fast/state.go

@@ -5,6 +5,8 @@ import (
 	"fmt"
 	"io"
 
+	"github.com/ethereum-optimism/optimism/op-service/jsonutil"
+
 	"github.com/ethereum-optimism/optimism/cannon/serialize"
 
 	"github.com/ethereum/go-ethereum/common"
@@ -260,3 +262,10 @@ func (s *VMState) Deserialize(in io.Reader) error {
 
 	return nil
 }
+
+func LoadVMStateFromFile(path string) (*VMState, error) {
+	if !serialize.IsBinaryFile(path) {
+		return jsonutil.LoadJSON[VMState](path)
+	}
+	return serialize.LoadSerializedBinary[VMState](path)
+}