M2.1: Update FVM for Selenium (r02)

build/openrpc_test.go

@@ -1,4 +1,4 @@
-//stm: #unit
+// stm: #unit
 package build
 
 import (

build/params_2k.go

@@ -22,6 +22,7 @@ const GenesisFile = ""
 // VERY experimental! Should not be merged into master / any release branch yet!
 var NetworkBundle = "devnet-wasm"
 var BundleOverrides map[actors.Version]string
+var ActorDebugging = false
 
 const GenesisNetworkVersion = network.Version16
 

build/params_butterfly.go

@@ -23,6 +23,7 @@ const GenesisNetworkVersion = network.Version15
 
 var NetworkBundle = "butterflynet"
 var BundleOverrides map[actors.Version]string
+var ActorDebugging = false
 
 const BootstrappersFile = "butterflynet.pi"
 const GenesisFile = "butterflynet.car"

build/params_calibnet.go

@@ -23,6 +23,7 @@ const GenesisNetworkVersion = network.Version0
 
 var NetworkBundle = "calibrationnet"
 var BundleOverrides map[actors.Version]string
+var ActorDebugging = false
 
 const BootstrappersFile = "calibnet.pi"
 const GenesisFile = "calibnet.car"

build/params_interop.go

@@ -20,6 +20,7 @@ import (
 
 var NetworkBundle = "caterpillarnet"
 var BundleOverrides map[actors.Version]string
+var ActorDebugging = false
 
 const BootstrappersFile = "interopnet.pi"
 const GenesisFile = "interopnet.car"

build/params_mainnet.go

@@ -25,6 +25,9 @@ var NetworkBundle = "mainnet"
 // NOTE: DO NOT change this unless you REALLY know what you're doing. This is consensus critical.
 var BundleOverrides map[actors.Version]string
 
+// NOTE: DO NOT change this unless you REALLY know what you're doing. This is consensus critical.
+const ActorDebugging = false
+
 const GenesisNetworkVersion = network.Version0
 
 const BootstrappersFile = "mainnet.pi"

build/params_testground.go

@@ -5,7 +5,6 @@
 //
 // Its purpose is to unlock various degrees of flexibility and parametrization
 // when writing Testground plans for Lotus.
-//
 package build
 
 import (
@@ -116,6 +115,7 @@ var (
 	GenesisNetworkVersion = network.Version0
 	NetworkBundle         = "devnet"
 	BundleOverrides       map[actors.Version]string
+	ActorDebugging        = true
 
 	NewestNetworkVersion       = network.Version15
 	ActorUpgradeNetworkVersion = network.Version15

build/params_wallaby.go

@@ -17,6 +17,7 @@ import (
 
 var NetworkBundle = "wallaby"
 var BundleOverrides map[actors.Version]string
+var ActorDebugging = true
 
 const BootstrappersFile = "wallabynet.pi"
 const GenesisFile = "wallabynet.car"

chain/vm/fvm.go

@@ -48,13 +48,21 @@ type FvmExtern struct {
 	base    cid.Cid
 }
 
+type FvmGasCharge struct {
+	Name       string
+	TotalGas   int64
+	ComputeGas int64
+	StorageGas int64
+}
+
 // This may eventually become identical to ExecutionTrace, but we can make incremental progress towards that
 type FvmExecutionTrace struct {
-	Msg    *types.Message
-	MsgRct *types.MessageReceipt
-	Error  string
+	Msg        *types.Message
+	MsgRct     *types.MessageReceipt
+	Error      string
+	GasCharges []FvmGasCharge `cborgen:"maxlen=1000000000"`
 
-	Subcalls []FvmExecutionTrace
+	Subcalls []FvmExecutionTrace `cborgen:"maxlen=1000000000"`
 }
 
 func (t *FvmExecutionTrace) ToExecutionTrace() types.ExecutionTrace {
@@ -69,6 +77,18 @@ func (t *FvmExecutionTrace) ToExecutionTrace() types.ExecutionTrace {
 		Subcalls: nil, // Should be nil when there are no subcalls for backwards compatibility
 	}
 
+	if len(t.GasCharges) > 0 {
+		ret.GasCharges = make([]*types.GasTrace, len(t.GasCharges))
+		for i, v := range t.GasCharges {
+			ret.GasCharges[i] = &types.GasTrace{
+				Name:       v.Name,
+				TotalGas:   v.TotalGas,
+				ComputeGas: v.ComputeGas,
+				StorageGas: v.StorageGas,
+			}
+		}
+	}
+
 	if len(t.Subcalls) > 0 {
 		ret.Subcalls = make([]types.ExecutionTrace, len(t.Subcalls))
 
@@ -284,6 +304,7 @@ func defaultFVMOpts(ctx context.Context, opts *VMOpts) (*ffi.FVMOpts, error) {
 		NetworkVersion: opts.NetworkVersion,
 		StateBase:      opts.StateBase,
 		Tracing:        opts.Tracing || EnableDetailedTracing,
+		Debug:          build.ActorDebugging,
 	}, nil
 
 }

gen/main.go

@@ -41,6 +41,7 @@ func main() {
 
 	err = gen.WriteTupleEncodersToFile("./chain/vm/cbor_gen.go", "vm",
 		vm.FvmExecutionTrace{},
+		vm.FvmGasCharge{},
 	)
 	if err != nil {
 		fmt.Println(err)