Merge pull request #347 from filecoin-project/asr/chain-id

FVM: Set chain ID when creating machine

Author: arajasek

cgo/fvm.go

@@ -8,11 +8,12 @@ package cgo
 */
 import "C"
 
-func CreateFvmMachine(fvmVersion FvmRegisteredVersion, chainEpoch, chainTimestamp, 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, manifestCid SliceRefUint8, tracing bool, blockstoreId, externsId uint64) (*FvmMachine, error) {
 	resp := C.create_fvm_machine(
 		fvmVersion,
 		C.uint64_t(chainEpoch),
 		C.uint64_t(chainTimestamp),
+		C.uint64_t(chainId),
 		C.uint64_t(baseFeeHi),
 		C.uint64_t(baseFeeLo),
 		C.uint64_t(baseCircSupplyHi),
@@ -36,11 +37,12 @@ func CreateFvmMachine(fvmVersion FvmRegisteredVersion, chainEpoch, chainTimestam
 	return executor, nil
 }
 
-func CreateFvmDebugMachine(fvmVersion FvmRegisteredVersion, chainEpoch, chainTimestamp, 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 bool, blockstoreId, externsId uint64) (*FvmMachine, error) {
 	resp := C.create_fvm_debug_machine(
 		fvmVersion,
 		C.uint64_t(chainEpoch),
 		C.uint64_t(chainTimestamp),
+		C.uint64_t(chainId),
 		C.uint64_t(baseFeeHi),
 		C.uint64_t(baseFeeLo),
 		C.uint64_t(baseCircSupplyHi),

fvm.go

@@ -38,6 +38,7 @@ type FVMOpts struct {
 
 	Epoch          abi.ChainEpoch
 	Timestamp      uint64
+	ChainID        uint64
 	BaseFee        abi.TokenAmount
 	BaseCircSupply abi.TokenAmount
 	NetworkVersion network.Version
@@ -66,6 +67,7 @@ func CreateFVM(opts *FVMOpts) (*FVM, error) {
 		executor, err = cgo.CreateFvmMachine(cgo.FvmRegisteredVersion(opts.FVMVersion),
 			uint64(opts.Epoch),
 			opts.Timestamp,
+			opts.ChainID,
 			baseFeeHi,
 			baseFeeLo,
 			baseCircSupplyHi,
@@ -80,6 +82,7 @@ func CreateFVM(opts *FVMOpts) (*FVM, error) {
 		executor, err = cgo.CreateFvmDebugMachine(cgo.FvmRegisteredVersion(opts.FVMVersion),
 			uint64(opts.Epoch),
 			opts.Timestamp,
+			opts.ChainID,
 			baseFeeHi,
 			baseFeeLo,
 			baseCircSupplyHi,