Merge pull request #5585 from filecoin-project/chore/gen-builtin-actors

chore: generate builtin actors
filecoin-project · Dec 19, 2022 · b4112a0 · b4112a0
2 parents a8d8d23 + 856ef52
commit b4112a0
Show file tree

Hide file tree

Showing 191 changed files with 613 additions and 475 deletions.
diff --git a/app/submodule/chain/chaininfo_api.go b/app/submodule/chain/chaininfo_api.go
@@ -14,6 +14,7 @@ import (
 	"github.com/filecoin-project/go-state-types/abi"
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
 	acrypto "github.com/filecoin-project/go-state-types/crypto"
+	"github.com/filecoin-project/go-state-types/manifest"
 	"github.com/filecoin-project/go-state-types/network"
 	miner0 "github.com/filecoin-project/specs-actors/actors/builtin/miner"
 	"github.com/ipfs/go-cid"
@@ -735,7 +736,7 @@ func (cia *chainInfoAPI) StateActorCodeCIDs(ctx context.Context, nv network.Vers
 
 	cids["_manifest"] = manifestCid
 
-	actorKeys := actors.GetBuiltinActorsKeys(actorVersion)
+	actorKeys := manifest.GetBuiltinActorsKeys(actorVersion)
 	for _, name := range actorKeys {
 		actorCID, ok := actors.GetActorCodeID(actorVersion, name)
 		if !ok {

diff --git a/cmd/miner_actor.go b/cmd/miner_actor.go
@@ -848,7 +848,7 @@ var actorConfirmChangeWorker = &cmds.Command{
 		smsg, err := env.(*node.Env).MessagePoolAPI.MpoolPushMessage(ctx, &types.Message{
 			From:   mi.Owner,
 			To:     maddr,
-			Method: builtintypes.MethodsMiner.ConfirmUpdateWorkerKey,
+			Method: builtintypes.MethodsMiner.ConfirmChangeWorkerAddress,
 			Value:  big.Zero(),
 		}, nil)
 		if err != nil {

diff --git a/extern/filecoin-ffi b/extern/filecoin-ffi
diff --git a/go.mod b/go.mod
@@ -30,7 +30,7 @@ require (
 	github.com/filecoin-project/go-fil-markets v1.25.2
 	github.com/filecoin-project/go-jsonrpc v0.1.5
 	github.com/filecoin-project/go-paramfetch v0.0.4
-	github.com/filecoin-project/go-state-types v0.10.0-alpha-2
+	github.com/filecoin-project/go-state-types v0.10.0-alpha-5
 	github.com/filecoin-project/pubsub v1.0.0
 	github.com/filecoin-project/specs-actors v0.9.15
 	github.com/filecoin-project/specs-actors/v2 v2.3.6

diff --git a/go.sum b/go.sum
@@ -345,8 +345,8 @@ github.com/filecoin-project/go-state-types v0.1.4/go.mod h1:xCA/WfKlC2zcn3fUmDv4
 github.com/filecoin-project/go-state-types v0.1.6/go.mod h1:UwGVoMsULoCK+bWjEdd/xLCvLAQFBC7EDT477SKml+Q=
 github.com/filecoin-project/go-state-types v0.1.8/go.mod h1:UwGVoMsULoCK+bWjEdd/xLCvLAQFBC7EDT477SKml+Q=
 github.com/filecoin-project/go-state-types v0.1.10/go.mod h1:UwGVoMsULoCK+bWjEdd/xLCvLAQFBC7EDT477SKml+Q=
-github.com/filecoin-project/go-state-types v0.10.0-alpha-2 h1:xz8+sXAuCMane7SkEYCtQjD/zYJ4n1d5bxwYNL8Thf0=
-github.com/filecoin-project/go-state-types v0.10.0-alpha-2/go.mod h1:7ty480tvttEAqWKywhAaDCElk7ksTqEXtXWAzTSdEKo=
+github.com/filecoin-project/go-state-types v0.10.0-alpha-5 h1:k5yLpgqTns8OFjPwMWfDCmSDd+BqpFhsQEQKIquM3cM=
+github.com/filecoin-project/go-state-types v0.10.0-alpha-5/go.mod h1:FPgQE05BFwZxKw/vCuIaIrzfJKo4RPQQMMPGd43dAFI=
 github.com/filecoin-project/go-statemachine v0.0.0-20200925024713-05bd7c71fbfe/go.mod h1:FGwQgZAt2Gh5mjlwJUlVB62JeYdo+if0xWxSEfBD9ig=
 github.com/filecoin-project/go-statemachine v1.0.2 h1:421SSWBk8GIoCoWYYTE/d+qCWccgmRH0uXotXRDjUbc=
 github.com/filecoin-project/go-statemachine v1.0.2/go.mod h1:jZdXXiHa61n4NmgWFG4w8tnqgvZVHYbJ3yW7+y8bF54=

diff --git a/pkg/fork/fork.go b/pkg/fork/fork.go
@@ -2354,10 +2354,10 @@ func LiteMigration(ctx context.Context, bstore blockstoreutil.Blockstore, newAct
 		return cid.Undef, fmt.Errorf("error loading new manifest data: %w", err)
 	}
 
-	if len(oldManifestData.Entries) != len(actors.GetBuiltinActorsKeys(oldAv)) {
+	if len(oldManifestData.Entries) != len(manifest.GetBuiltinActorsKeys(oldAv)) {
 		return cid.Undef, fmt.Errorf("incomplete old manifest with %d code CIDs", len(oldManifestData.Entries))
 	}
-	if len(newManifestData.Entries) != len(actors.GetBuiltinActorsKeys(newAv)) {
+	if len(newManifestData.Entries) != len(manifest.GetBuiltinActorsKeys(newAv)) {
 		return cid.Undef, fmt.Errorf("incomplete new manifest with %d code CIDs", len(newManifestData.Entries))
 	}
 

diff --git a/pkg/fvm/fvm.go b/pkg/fvm/fvm.go
@@ -18,6 +18,7 @@ import (
 	"github.com/filecoin-project/go-state-types/abi"
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
 	"github.com/filecoin-project/go-state-types/exitcode"
+	"github.com/filecoin-project/go-state-types/manifest"
 	"github.com/filecoin-project/go-state-types/network"
 	"github.com/filecoin-project/venus/pkg/constants"
 	"github.com/filecoin-project/venus/pkg/crypto"
@@ -352,6 +353,7 @@ func defaultFVMOpts(ctx context.Context, opts *vm.VmOption) (*ffi.FVMOpts, error
 			base:       opts.PRoot, gasPriceSchedule: opts.GasPriceSchedule,
 		},
 		Epoch:          opts.Epoch,
+		ChainID:        uint64(types.Eip155ChainID),
 		BaseFee:        opts.BaseFee,
 		BaseCircSupply: circToReport,
 		NetworkVersion: opts.NetworkVersion,
@@ -441,7 +443,7 @@ func NewDebugFVM(ctx context.Context, opts *vm.VmOption) (*FVM, error) {
 
 		// create actor redirect mapping
 		actorRedirect := make(map[cid.Cid]cid.Cid)
-		for _, key := range actors.GetBuiltinActorsKeys(av) {
+		for _, key := range manifest.GetBuiltinActorsKeys(av) {
 			from, ok := actors.GetActorCodeID(av, key)
 			if !ok {
 				fvmLog.Warnf("actor missing in the from manifest %s", key)

diff --git a/pkg/gen/genesis/f00_system.go b/pkg/gen/genesis/f00_system.go
@@ -4,9 +4,8 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/filecoin-project/go-state-types/big"
-
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
+	"github.com/filecoin-project/go-state-types/big"
 	systemtypes "github.com/filecoin-project/go-state-types/builtin/v8/system"
 
 	"github.com/filecoin-project/go-state-types/manifest"
@@ -52,7 +51,7 @@ func SetupSystemActor(ctx context.Context, bs bstore.Blockstore, av actorstypes.
 		return nil, err
 	}
 
-	actcid, found := actors.GetActorCodeID(av, actors.SystemKey)
+	actcid, found := actors.GetActorCodeID(av, manifest.SystemKey)
 	if !found {
 		return nil, fmt.Errorf("failed to get system actor code ID for actors version %d", av)
 	}

diff --git a/pkg/gen/genesis/f01_init.go b/pkg/gen/genesis/f01_init.go
@@ -10,6 +10,7 @@ import (
 	"github.com/filecoin-project/go-state-types/abi"
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
 	"github.com/filecoin-project/go-state-types/big"
+	"github.com/filecoin-project/go-state-types/manifest"
 
 	"github.com/filecoin-project/specs-actors/actors/util/adt"
 
@@ -174,7 +175,7 @@ func SetupInitActor(ctx context.Context, bs bstore.Blockstore, netname string, i
 		return 0, nil, nil, err
 	}
 
-	actcid, found := actors.GetActorCodeID(av, actors.InitKey)
+	actcid, found := actors.GetActorCodeID(av, manifest.InitKey)
 	if !found {
 		return 0, nil, nil, fmt.Errorf("failed to get init actor code ID for actors version %d", av)
 	}

diff --git a/pkg/gen/genesis/f02_reward.go b/pkg/gen/genesis/f02_reward.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 
+	"github.com/filecoin-project/go-state-types/manifest"
 	"github.com/filecoin-project/venus/pkg/constants"
 	"github.com/filecoin-project/venus/venus-shared/actors"
 	"github.com/filecoin-project/venus/venus-shared/actors/adt"
@@ -29,7 +30,7 @@ func SetupRewardActor(ctx context.Context, bs bstore.Blockstore, qaPower big.Int
 		return nil, err
 	}
 
-	actcid, found := actors.GetActorCodeID(av, actors.RewardKey)
+	actcid, found := actors.GetActorCodeID(av, manifest.RewardKey)
 	if !found {
 		return nil, fmt.Errorf("failed to get reward actor code ID for actors version %d", av)
 	}

diff --git a/pkg/gen/genesis/f03_cron.go b/pkg/gen/genesis/f03_cron.go
@@ -6,11 +6,11 @@ import (
 
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
 	"github.com/filecoin-project/go-state-types/big"
-	cbor "github.com/ipfs/go-ipld-cbor"
-
+	"github.com/filecoin-project/go-state-types/manifest"
 	"github.com/filecoin-project/venus/venus-shared/actors"
 	"github.com/filecoin-project/venus/venus-shared/actors/adt"
 	"github.com/filecoin-project/venus/venus-shared/actors/builtin/cron"
+	cbor "github.com/ipfs/go-ipld-cbor"
 
 	bstore "github.com/filecoin-project/venus/venus-shared/blockstore"
 	"github.com/filecoin-project/venus/venus-shared/types"
@@ -28,7 +28,7 @@ func SetupCronActor(ctx context.Context, bs bstore.Blockstore, av actorstypes.Ve
 		return nil, err
 	}
 
-	actcid, found := actors.GetActorCodeID(av, actors.CronKey)
+	actcid, found := actors.GetActorCodeID(av, manifest.CronKey)
 	if !found {
 		return nil, fmt.Errorf("failed to get cron actor code ID for actors version %d", av)
 	}

diff --git a/pkg/gen/genesis/f04_power.go b/pkg/gen/genesis/f04_power.go
@@ -4,12 +4,12 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/filecoin-project/venus/venus-shared/actors"
-	"github.com/filecoin-project/venus/venus-shared/actors/builtin/power"
-
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
 	"github.com/filecoin-project/go-state-types/big"
+	"github.com/filecoin-project/go-state-types/manifest"
 	"github.com/filecoin-project/specs-actors/actors/util/adt"
+	"github.com/filecoin-project/venus/venus-shared/actors"
+	"github.com/filecoin-project/venus/venus-shared/actors/builtin/power"
 
 	cbor "github.com/ipfs/go-ipld-cbor"
 
@@ -29,7 +29,7 @@ func SetupStoragePowerActor(ctx context.Context, bs bstore.Blockstore, av actors
 		return nil, err
 	}
 
-	actcid, found := actors.GetActorCodeID(av, actors.PowerKey)
+	actcid, found := actors.GetActorCodeID(av, manifest.PowerKey)
 	if !found {
 		return nil, fmt.Errorf("failed to get power actor code ID for actors version %d", av)
 	}

diff --git a/pkg/gen/genesis/f05_market.go b/pkg/gen/genesis/f05_market.go
@@ -6,11 +6,11 @@ import (
 
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
 	"github.com/filecoin-project/go-state-types/big"
-	cbor "github.com/ipfs/go-ipld-cbor"
-
+	"github.com/filecoin-project/go-state-types/manifest"
 	"github.com/filecoin-project/venus/venus-shared/actors"
 	"github.com/filecoin-project/venus/venus-shared/actors/adt"
 	"github.com/filecoin-project/venus/venus-shared/actors/builtin/market"
+	cbor "github.com/ipfs/go-ipld-cbor"
 
 	bstore "github.com/filecoin-project/venus/venus-shared/blockstore"
 	"github.com/filecoin-project/venus/venus-shared/types"
@@ -28,7 +28,7 @@ func SetupStorageMarketActor(ctx context.Context, bs bstore.Blockstore, av actor
 		return nil, err
 	}
 
-	actcid, found := actors.GetActorCodeID(av, actors.MarketKey)
+	actcid, found := actors.GetActorCodeID(av, manifest.MarketKey)
 	if !found {
 		return nil, fmt.Errorf("failed to get market actor code ID for actors version %d", av)
 	}

diff --git a/pkg/gen/genesis/f06_vreg.go b/pkg/gen/genesis/f06_vreg.go
@@ -4,10 +4,10 @@ import (
 	"context"
 	"fmt"
 
+	"github.com/filecoin-project/go-address"
+	"github.com/filecoin-project/go-state-types/manifest"
 	"github.com/filecoin-project/venus/venus-shared/actors"
 	"github.com/filecoin-project/venus/venus-shared/actors/builtin/verifreg"
-
-	"github.com/filecoin-project/go-address"
 	cbor "github.com/ipfs/go-ipld-cbor"
 
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
@@ -42,7 +42,7 @@ func SetupVerifiedRegistryActor(ctx context.Context, bs bstore.Blockstore, av ac
 		return nil, err
 	}
 
-	actcid, found := actors.GetActorCodeID(av, actors.VerifregKey)
+	actcid, found := actors.GetActorCodeID(av, manifest.VerifregKey)
 	if !found {
 		return nil, fmt.Errorf("failed to get verifreg actor code ID for actors version %d", av)
 	}

diff --git a/pkg/gen/genesis/f07_dcap.go b/pkg/gen/genesis/f07_dcap.go
@@ -10,6 +10,7 @@ import (
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
 	"github.com/filecoin-project/go-state-types/big"
 	"github.com/filecoin-project/go-state-types/builtin"
+	"github.com/filecoin-project/go-state-types/manifest"
 	"github.com/filecoin-project/specs-actors/actors/util/adt"
 
 	"github.com/filecoin-project/venus/venus-shared/actors"
@@ -41,7 +42,7 @@ func SetupDatacapActor(ctx context.Context, bs bstore.Blockstore, av actorstypes
 		return nil, err
 	}
 
-	actcid, ok := actors.GetActorCodeID(av, actors.DatacapKey)
+	actcid, ok := actors.GetActorCodeID(av, manifest.DatacapKey)
 	if !ok {
 		return nil, xerrors.Errorf("failed to get datacap actor code ID for actors version %d", av)
 	}

diff --git a/pkg/gen/genesis/fevm.go b/pkg/gen/genesis/fevm.go
@@ -13,6 +13,7 @@ import (
 	builtintypes "github.com/filecoin-project/go-state-types/builtin"
 	evm10 "github.com/filecoin-project/go-state-types/builtin/v10/evm"
 	init10 "github.com/filecoin-project/go-state-types/builtin/v10/init"
+	"github.com/filecoin-project/go-state-types/manifest"
 	"github.com/filecoin-project/go-state-types/network"
 	"github.com/filecoin-project/venus/pkg/chain"
 	"github.com/filecoin-project/venus/pkg/config"
@@ -69,7 +70,7 @@ func SetupFEVM(ctx context.Context, cs *chain.Store, sroot cid.Cid, nv network.V
 	}
 
 	// The ETH0 address is occupied by an empty contract EVM actor
-	evmCodeCid, ok := actors.GetActorCodeID(av, actors.EvmKey)
+	evmCodeCid, ok := actors.GetActorCodeID(av, manifest.EvmKey)
 	if !ok {
 		return cid.Undef, fmt.Errorf("failed to get CodeCID for EVM during genesis")
 	}

diff --git a/pkg/gen/genesis/genesis.go b/pkg/gen/genesis/genesis.go
@@ -49,6 +49,7 @@ import (
 
 	"github.com/filecoin-project/venus/venus-shared/actors/builtin/system"
 
+	"github.com/filecoin-project/go-state-types/manifest"
 	"github.com/filecoin-project/venus/venus-shared/actors/builtin"
 
 	"github.com/ipfs/go-cid"
@@ -399,7 +400,7 @@ func makeAccountActor(ctx context.Context, cst cbor.IpldStore, av actorstypes.Ve
 		return nil, err
 	}
 
-	actcid, found := actors.GetActorCodeID(av, actors.AccountKey)
+	actcid, found := actors.GetActorCodeID(av, manifest.AccountKey)
 	if !found {
 		return nil, fmt.Errorf("failed to get account actor code ID for actors version %d", av)
 	}
@@ -482,7 +483,7 @@ func createMultisigAccount(ctx context.Context, cst cbor.IpldStore, state *tree.
 		return err
 	}
 
-	actcid, found := actors.GetActorCodeID(av, actors.MultisigKey)
+	actcid, found := actors.GetActorCodeID(av, manifest.MultisigKey)
 	if !found {
 		return fmt.Errorf("failed to get multisig actor code ID for actors version %d", av)
 	}
@@ -710,7 +711,7 @@ func SetupEAM(ctx context.Context, nst tree.Tree, nv network.Version) error {
 		return nil
 	}
 
-	codecid, ok := actors.GetActorCodeID(av, actors.EamKey)
+	codecid, ok := actors.GetActorCodeID(av, manifest.EamKey)
 	if !ok {
 		return fmt.Errorf("failed to get CodeCID for EAM during genesis")
 	}

diff --git a/pkg/vm/dispatch/dispatch.go b/pkg/vm/dispatch/dispatch.go
@@ -135,7 +135,7 @@ func (d *actorDispatcher) signature(methodID abi.MethodNum) (*methodSignature, *
 	exports := d.actor.Exports()
 
 	// get method
-	method := exports[(uint64)(methodID)].Method
+	method := exports[methodID].Method
 	if method == nil {
 		return nil, NewExcuteError(exitcode.SysErrInvalidMethod, "Method undefined. method: %d, code: %s", methodID, d.code)
 	}

diff --git a/pkg/vm/vmcontext/invocation_context.go b/pkg/vm/vmcontext/invocation_context.go
@@ -11,6 +11,7 @@ import (
 	"github.com/filecoin-project/go-state-types/big"
 	"github.com/filecoin-project/go-state-types/cbor"
 	"github.com/filecoin-project/go-state-types/exitcode"
+	"github.com/filecoin-project/go-state-types/manifest"
 	"github.com/filecoin-project/go-state-types/network"
 	rt5 "github.com/filecoin-project/specs-actors/v5/actors/runtime"
 	"github.com/ipfs/go-cid"
@@ -329,7 +330,7 @@ func (ctx *invocationContext) resolveTarget(target address.Address) (*types.Acto
 		if err != nil {
 			panic(err)
 		}
-		actorCode, found := actors.GetActorCodeID(ver, actors.AccountKey)
+		actorCode, found := actors.GetActorCodeID(ver, manifest.AccountKey)
 		if !found {
 			panic(fmt.Errorf("failed to get account actor code ID for actors version %d", ver))
 		}

diff --git a/venus-devtool/go.mod b/venus-devtool/go.mod
@@ -7,9 +7,9 @@ require (
 	github.com/filecoin-project/go-bitfield v0.2.4
 	github.com/filecoin-project/go-data-transfer v1.15.2
 	github.com/filecoin-project/go-fil-markets v1.25.2
-	github.com/filecoin-project/go-jsonrpc v0.1.8
-	github.com/filecoin-project/go-state-types v0.10.0-alpha-2
-	github.com/filecoin-project/lotus v1.18.2-0.20221210235158-ab2580963c20
+	github.com/filecoin-project/go-jsonrpc v0.1.9
+	github.com/filecoin-project/go-state-types v0.10.0-alpha-5
+	github.com/filecoin-project/lotus v1.18.2-0.20221215215610-d574eda147ed
 	github.com/filecoin-project/venus v0.0.0-00010101000000-000000000000
 	github.com/google/uuid v1.3.0
 	github.com/ipfs/go-block-format v0.0.3

diff --git a/venus-devtool/go.sum b/venus-devtool/go.sum
@@ -319,8 +319,8 @@ github.com/filecoin-project/go-hamt-ipld/v2 v2.0.0/go.mod h1:7aWZdaQ1b16BVoQUYR+
 github.com/filecoin-project/go-hamt-ipld/v3 v3.0.1/go.mod h1:gXpNmr3oQx8l3o7qkGyDjJjYSRX7hp/FGOStdqrWyDI=
 github.com/filecoin-project/go-hamt-ipld/v3 v3.1.0 h1:rVVNq0x6RGQIzCo1iiJlGFm9AGIZzeifggxtKMU7zmI=
 github.com/filecoin-project/go-hamt-ipld/v3 v3.1.0/go.mod h1:bxmzgT8tmeVQA1/gvBwFmYdT8SOFUwB3ovSUfG1Ux0g=
-github.com/filecoin-project/go-jsonrpc v0.1.8 h1:uXX/ikAk3Q4f/k8DRd9Zw+fWnfiYb5I+UI1tzlQgHog=
-github.com/filecoin-project/go-jsonrpc v0.1.8/go.mod h1:XBBpuKIMaXIIzeqzO1iucq4GvbF8CxmXRFoezRh+Cx4=
+github.com/filecoin-project/go-jsonrpc v0.1.9 h1:HRWLxo7HAWzI3xZGeFG4LZJoYpms+Q+8kwmMTLnyS3A=
+github.com/filecoin-project/go-jsonrpc v0.1.9/go.mod h1:XBBpuKIMaXIIzeqzO1iucq4GvbF8CxmXRFoezRh+Cx4=
 github.com/filecoin-project/go-padreader v0.0.0-20200903213702-ed5fae088b20/go.mod h1:mPn+LRRd5gEKNAtc+r3ScpW2JRU/pj4NBKdADYWHiak=
 github.com/filecoin-project/go-padreader v0.0.1 h1:8h2tVy5HpoNbr2gBRr+WD6zV6VD6XHig+ynSGJg8ZOs=
 github.com/filecoin-project/go-padreader v0.0.1/go.mod h1:VYVPJqwpsfmtoHnAmPx6MUwmrK6HIcDqZJiuZhtmfLQ=
@@ -332,14 +332,14 @@ github.com/filecoin-project/go-state-types v0.1.4/go.mod h1:xCA/WfKlC2zcn3fUmDv4
 github.com/filecoin-project/go-state-types v0.1.6/go.mod h1:UwGVoMsULoCK+bWjEdd/xLCvLAQFBC7EDT477SKml+Q=
 github.com/filecoin-project/go-state-types v0.1.8/go.mod h1:UwGVoMsULoCK+bWjEdd/xLCvLAQFBC7EDT477SKml+Q=
 github.com/filecoin-project/go-state-types v0.1.10/go.mod h1:UwGVoMsULoCK+bWjEdd/xLCvLAQFBC7EDT477SKml+Q=
-github.com/filecoin-project/go-state-types v0.10.0-alpha-2 h1:xz8+sXAuCMane7SkEYCtQjD/zYJ4n1d5bxwYNL8Thf0=
-github.com/filecoin-project/go-state-types v0.10.0-alpha-2/go.mod h1:7ty480tvttEAqWKywhAaDCElk7ksTqEXtXWAzTSdEKo=
+github.com/filecoin-project/go-state-types v0.10.0-alpha-5 h1:k5yLpgqTns8OFjPwMWfDCmSDd+BqpFhsQEQKIquM3cM=
+github.com/filecoin-project/go-state-types v0.10.0-alpha-5/go.mod h1:FPgQE05BFwZxKw/vCuIaIrzfJKo4RPQQMMPGd43dAFI=
 github.com/filecoin-project/go-statemachine v1.0.2 h1:421SSWBk8GIoCoWYYTE/d+qCWccgmRH0uXotXRDjUbc=
 github.com/filecoin-project/go-statestore v0.2.0 h1:cRRO0aPLrxKQCZ2UOQbzFGn4WDNdofHZoGPjfNaAo5Q=
 github.com/filecoin-project/go-statestore v0.2.0/go.mod h1:8sjBYbS35HwPzct7iT4lIXjLlYyPor80aU7t7a/Kspo=
 github.com/filecoin-project/index-provider v0.9.1 h1:Jnh9dviIHvQxZ2baNoYu3n8z6F9O62ksnVlyREgPyyM=
-github.com/filecoin-project/lotus v1.18.2-0.20221210235158-ab2580963c20 h1:ykV/hYgyocift7kNOGC6eMPUMj5wnRsqxF4okfhfSe4=
-github.com/filecoin-project/lotus v1.18.2-0.20221210235158-ab2580963c20/go.mod h1:0FPtk145wrzd6DocFX2mqbul3eiBHxEVoA5NDu1YLbU=
+github.com/filecoin-project/lotus v1.18.2-0.20221215215610-d574eda147ed h1:NiMBCcyejzzcY4qvW/CK9dAlEN5p5qy9/j6573Gi9HI=
+github.com/filecoin-project/lotus v1.18.2-0.20221215215610-d574eda147ed/go.mod h1:mYznBAFEEfBGY4c081A0UiyX0GxHn0F9528JJ0r5mVw=
 github.com/filecoin-project/pubsub v1.0.0 h1:ZTmT27U07e54qV1mMiQo4HDr0buo8I1LDHBYLXlsNXM=
 github.com/filecoin-project/pubsub v1.0.0/go.mod h1:GkpB33CcUtUNrLPhJgfdy4FDx4OMNR9k+46DHx/Lqrg=
 github.com/filecoin-project/specs-actors v0.9.13/go.mod h1:TS1AW/7LbG+615j4NsjMK1qlpAwaFsG9w0V2tg2gSao=
+4 −2		cgo/fvm.go
+3 −0		fvm.go
+300 −156		rust/Cargo.lock
+2 −2		rust/Cargo.toml
+18 −12		rust/src/fvm/engine.rs
+8 −0		rust/src/fvm/machine.rs