diff --git a/app/submodule/chain/chaininfo_api.go b/app/submodule/chain/chaininfo_api.go index e55f34acf2..0eb3af7cbe 100644 --- 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 index dc219aa4ac..453791d705 100644 --- 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 index 02ebb2d616..21217875e4 160000 --- a/extern/filecoin-ffi +++ b/extern/filecoin-ffi @@ -1 +1 @@ -Subproject commit 02ebb2d6169131cfe489e1063e896f14982c463d +Subproject commit 21217875e44f50c3851615de3ced674a6fdc386c diff --git a/go.mod b/go.mod index db085bb766..647e837126 100644 --- 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 index 97b7dbc625..0fce2cf56c 100644 --- 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 index 934060db66..64055e9f5a 100644 --- 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 index 4712cd8c8a..742e47d906 100644 --- 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 index 16fb563e32..cb4067011d 100644 --- 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 index bf92a20e9f..c51e730ffb 100644 --- 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 index 1da5891b3a..c9cbadc30c 100644 --- 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 index c72c0aeb67..301e0c3894 100644 --- 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 index cc47a783dc..3793d761a8 100644 --- 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 index f0800900ff..0e9f60e74f 100644 --- 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 index e17262cd64..8da7c003ab 100644 --- 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 index 1d4377e098..e684d51dda 100644 --- 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 index afb3707290..6fc51fece5 100644 --- 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 index b39fbf247a..4d2f524b47 100644 --- 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 index 4c5f7cdfb1..2d90ec66cd 100644 --- 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 index f97b543899..97d135a3f9 100644 --- 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 index 5001afddaa..1a83e3c80e 100644 --- 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 index 87a4e0baae..dc10d68bcf 100644 --- 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= diff --git a/venus-shared/actors/actor_cids.go b/venus-shared/actors/actor_cids.go index 4be79b6eab..4a136f75fb 100644 --- a/venus-shared/actors/actor_cids.go +++ b/venus-shared/actors/actor_cids.go @@ -6,6 +6,7 @@ import ( "github.com/ipfs/go-cid" actorstypes "github.com/filecoin-project/go-state-types/actors" + "github.com/filecoin-project/go-state-types/manifest" builtin0 "github.com/filecoin-project/specs-actors/actors/builtin" builtin2 "github.com/filecoin-project/specs-actors/v2/actors/builtin" builtin3 "github.com/filecoin-project/specs-actors/v3/actors/builtin" @@ -29,7 +30,7 @@ func GetActorCodeID(av actorstypes.Version, name string) (cid.Cid, bool) { // Actors V7 and lower switch name { - case AccountKey: + case manifest.AccountKey: switch av { case actorstypes.Version0: @@ -54,7 +55,7 @@ func GetActorCodeID(av actorstypes.Version, name string) (cid.Cid, bool) { return builtin7.AccountActorCodeID, true } - case CronKey: + case manifest.CronKey: switch av { case actorstypes.Version0: @@ -79,7 +80,7 @@ func GetActorCodeID(av actorstypes.Version, name string) (cid.Cid, bool) { return builtin7.CronActorCodeID, true } - case InitKey: + case manifest.InitKey: switch av { case actorstypes.Version0: @@ -104,7 +105,7 @@ func GetActorCodeID(av actorstypes.Version, name string) (cid.Cid, bool) { return builtin7.InitActorCodeID, true } - case MarketKey: + case manifest.MarketKey: switch av { case actorstypes.Version0: @@ -129,7 +130,7 @@ func GetActorCodeID(av actorstypes.Version, name string) (cid.Cid, bool) { return builtin7.StorageMarketActorCodeID, true } - case MinerKey: + case manifest.MinerKey: switch av { case actorstypes.Version0: @@ -154,7 +155,7 @@ func GetActorCodeID(av actorstypes.Version, name string) (cid.Cid, bool) { return builtin7.StorageMinerActorCodeID, true } - case MultisigKey: + case manifest.MultisigKey: switch av { case actorstypes.Version0: @@ -179,7 +180,7 @@ func GetActorCodeID(av actorstypes.Version, name string) (cid.Cid, bool) { return builtin7.MultisigActorCodeID, true } - case PaychKey: + case manifest.PaychKey: switch av { case actorstypes.Version0: @@ -204,7 +205,7 @@ func GetActorCodeID(av actorstypes.Version, name string) (cid.Cid, bool) { return builtin7.PaymentChannelActorCodeID, true } - case PowerKey: + case manifest.PowerKey: switch av { case actorstypes.Version0: @@ -229,7 +230,7 @@ func GetActorCodeID(av actorstypes.Version, name string) (cid.Cid, bool) { return builtin7.StoragePowerActorCodeID, true } - case RewardKey: + case manifest.RewardKey: switch av { case actorstypes.Version0: @@ -254,7 +255,7 @@ func GetActorCodeID(av actorstypes.Version, name string) (cid.Cid, bool) { return builtin7.RewardActorCodeID, true } - case SystemKey: + case manifest.SystemKey: switch av { case actorstypes.Version0: @@ -279,7 +280,7 @@ func GetActorCodeID(av actorstypes.Version, name string) (cid.Cid, bool) { return builtin7.SystemActorCodeID, true } - case VerifregKey: + case manifest.VerifregKey: switch av { case actorstypes.Version0: @@ -315,7 +316,7 @@ func GetActorCodeIDs(av actorstypes.Version) (map[string]cid.Cid, error) { return cids, nil } - actorsKeys := GetBuiltinActorsKeys(av) + actorsKeys := manifest.GetBuiltinActorsKeys(av) synthCids := make(map[string]cid.Cid) for _, key := range actorsKeys { diff --git a/venus-shared/actors/builtin-actors-code/v10.tar.zst b/venus-shared/actors/builtin-actors-code/v10.tar.zst index f5644f4749..4e25522d38 100644 Binary files a/venus-shared/actors/builtin-actors-code/v10.tar.zst and b/venus-shared/actors/builtin-actors-code/v10.tar.zst differ diff --git a/venus-shared/actors/builtin/account/actor.go b/venus-shared/actors/builtin/account/actor.go index 53dc9dd96d..893332034c 100644 --- a/venus-shared/actors/builtin/account/actor.go +++ b/venus-shared/actors/builtin/account/actor.go @@ -12,6 +12,7 @@ import ( "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/cbor" + "github.com/filecoin-project/go-state-types/manifest" "github.com/filecoin-project/venus/venus-shared/actors/adt" types "github.com/filecoin-project/venus/venus-shared/internal" @@ -36,7 +37,7 @@ var Methods = builtin10.MethodsAccount func Load(store adt.Store, act *types.Actor) (State, error) { if name, av, ok := actors.GetActorMetaByCode(act.Code); ok { - if name != actors.AccountKey { + if name != manifest.AccountKey { return nil, fmt.Errorf("actor code is not account: %s", name) } diff --git a/venus-shared/actors/builtin/account/actor.go.template b/venus-shared/actors/builtin/account/actor.go.template index 9774c779ca..8921acdf4b 100644 --- a/venus-shared/actors/builtin/account/actor.go.template +++ b/venus-shared/actors/builtin/account/actor.go.template @@ -13,6 +13,7 @@ import ( "github.com/filecoin-project/venus/venus-shared/actors/adt" types "github.com/filecoin-project/venus/venus-shared/internal" + "github.com/filecoin-project/go-state-types/manifest" {{range .versions}} {{if (le . 7)}} @@ -26,7 +27,7 @@ var Methods = builtin{{.latestVersion}}.MethodsAccount func Load(store adt.Store, act *types.Actor) (State, error) { if name, av, ok := actors.GetActorMetaByCode(act.Code); ok { - if name != actors.AccountKey { + if name != manifest.AccountKey { return nil, fmt.Errorf("actor code is not account: %s", name) } diff --git a/venus-shared/actors/builtin/account/state.sep.go.template b/venus-shared/actors/builtin/account/state.sep.go.template index 9ffba4ad1c..98acbacaaa 100644 --- a/venus-shared/actors/builtin/account/state.sep.go.template +++ b/venus-shared/actors/builtin/account/state.sep.go.template @@ -11,6 +11,7 @@ import ( "github.com/filecoin-project/venus/venus-shared/actors/adt" "github.com/filecoin-project/venus/venus-shared/actors" + "github.com/filecoin-project/go-state-types/manifest" {{if (le .v 7)}} account{{.v}} "github.com/filecoin-project/specs-actors{{.import}}actors/builtin/account" @@ -50,7 +51,7 @@ func (s *state{{.v}}) GetState() interface{} { } func (s *state{{.v}}) ActorKey() string { - return actors.AccountKey + return manifest.AccountKey } func (s *state{{.v}}) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/account/state.v0.go b/venus-shared/actors/builtin/account/state.v0.go index 3b9677b8aa..f66e48414b 100644 --- a/venus-shared/actors/builtin/account/state.v0.go +++ b/venus-shared/actors/builtin/account/state.v0.go @@ -10,6 +10,7 @@ import ( "github.com/filecoin-project/go-address" "github.com/ipfs/go-cid" + "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" @@ -47,7 +48,7 @@ func (s *state0) GetState() interface{} { } func (s *state0) ActorKey() string { - return actors.AccountKey + return manifest.AccountKey } func (s *state0) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/account/state.v10.go b/venus-shared/actors/builtin/account/state.v10.go index de1898b4ae..c9b854a318 100644 --- a/venus-shared/actors/builtin/account/state.v10.go +++ b/venus-shared/actors/builtin/account/state.v10.go @@ -10,6 +10,7 @@ import ( "github.com/filecoin-project/go-address" "github.com/ipfs/go-cid" + "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" @@ -47,7 +48,7 @@ func (s *state10) GetState() interface{} { } func (s *state10) ActorKey() string { - return actors.AccountKey + return manifest.AccountKey } func (s *state10) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/account/state.v2.go b/venus-shared/actors/builtin/account/state.v2.go index 6a35bc343e..ecc5b33d4d 100644 --- a/venus-shared/actors/builtin/account/state.v2.go +++ b/venus-shared/actors/builtin/account/state.v2.go @@ -10,6 +10,7 @@ import ( "github.com/filecoin-project/go-address" "github.com/ipfs/go-cid" + "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" @@ -47,7 +48,7 @@ func (s *state2) GetState() interface{} { } func (s *state2) ActorKey() string { - return actors.AccountKey + return manifest.AccountKey } func (s *state2) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/account/state.v3.go b/venus-shared/actors/builtin/account/state.v3.go index 688b845e48..7f9e6d6f75 100644 --- a/venus-shared/actors/builtin/account/state.v3.go +++ b/venus-shared/actors/builtin/account/state.v3.go @@ -10,6 +10,7 @@ import ( "github.com/filecoin-project/go-address" "github.com/ipfs/go-cid" + "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" @@ -47,7 +48,7 @@ func (s *state3) GetState() interface{} { } func (s *state3) ActorKey() string { - return actors.AccountKey + return manifest.AccountKey } func (s *state3) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/account/state.v4.go b/venus-shared/actors/builtin/account/state.v4.go index 1802f00644..0a598dacc8 100644 --- a/venus-shared/actors/builtin/account/state.v4.go +++ b/venus-shared/actors/builtin/account/state.v4.go @@ -10,6 +10,7 @@ import ( "github.com/filecoin-project/go-address" "github.com/ipfs/go-cid" + "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" @@ -47,7 +48,7 @@ func (s *state4) GetState() interface{} { } func (s *state4) ActorKey() string { - return actors.AccountKey + return manifest.AccountKey } func (s *state4) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/account/state.v5.go b/venus-shared/actors/builtin/account/state.v5.go index c2b88434e1..2efcfa0558 100644 --- a/venus-shared/actors/builtin/account/state.v5.go +++ b/venus-shared/actors/builtin/account/state.v5.go @@ -10,6 +10,7 @@ import ( "github.com/filecoin-project/go-address" "github.com/ipfs/go-cid" + "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" @@ -47,7 +48,7 @@ func (s *state5) GetState() interface{} { } func (s *state5) ActorKey() string { - return actors.AccountKey + return manifest.AccountKey } func (s *state5) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/account/state.v6.go b/venus-shared/actors/builtin/account/state.v6.go index bf4b8934f4..96c24a8726 100644 --- a/venus-shared/actors/builtin/account/state.v6.go +++ b/venus-shared/actors/builtin/account/state.v6.go @@ -10,6 +10,7 @@ import ( "github.com/filecoin-project/go-address" "github.com/ipfs/go-cid" + "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" @@ -47,7 +48,7 @@ func (s *state6) GetState() interface{} { } func (s *state6) ActorKey() string { - return actors.AccountKey + return manifest.AccountKey } func (s *state6) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/account/state.v7.go b/venus-shared/actors/builtin/account/state.v7.go index b992beabf9..d1cf0b2398 100644 --- a/venus-shared/actors/builtin/account/state.v7.go +++ b/venus-shared/actors/builtin/account/state.v7.go @@ -10,6 +10,7 @@ import ( "github.com/filecoin-project/go-address" "github.com/ipfs/go-cid" + "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" @@ -47,7 +48,7 @@ func (s *state7) GetState() interface{} { } func (s *state7) ActorKey() string { - return actors.AccountKey + return manifest.AccountKey } func (s *state7) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/account/state.v8.go b/venus-shared/actors/builtin/account/state.v8.go index f03ac76540..1a8b9e4963 100644 --- a/venus-shared/actors/builtin/account/state.v8.go +++ b/venus-shared/actors/builtin/account/state.v8.go @@ -10,6 +10,7 @@ import ( "github.com/filecoin-project/go-address" "github.com/ipfs/go-cid" + "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" @@ -47,7 +48,7 @@ func (s *state8) GetState() interface{} { } func (s *state8) ActorKey() string { - return actors.AccountKey + return manifest.AccountKey } func (s *state8) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/account/state.v9.go b/venus-shared/actors/builtin/account/state.v9.go index da35b314fb..e0737cb3b5 100644 --- a/venus-shared/actors/builtin/account/state.v9.go +++ b/venus-shared/actors/builtin/account/state.v9.go @@ -10,6 +10,7 @@ import ( "github.com/filecoin-project/go-address" "github.com/ipfs/go-cid" + "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" @@ -47,7 +48,7 @@ func (s *state9) GetState() interface{} { } func (s *state9) ActorKey() string { - return actors.AccountKey + return manifest.AccountKey } func (s *state9) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/builtin.go b/venus-shared/actors/builtin/builtin.go index 683e5c1c2f..8d6ef5db39 100644 --- a/venus-shared/actors/builtin/builtin.go +++ b/venus-shared/actors/builtin/builtin.go @@ -24,6 +24,7 @@ import ( "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/builtin" + "github.com/filecoin-project/go-state-types/manifest" "github.com/filecoin-project/go-state-types/proof" "github.com/filecoin-project/venus/venus-shared/actors" @@ -184,7 +185,7 @@ func IsAccountActor(c cid.Cid) bool { func IsStorageMinerActor(c cid.Cid) bool { name, _, ok := actors.GetActorMetaByCode(c) if ok { - return name == actors.MinerKey + return name == manifest.MinerKey } if c == builtin0.StorageMinerActorCodeID { @@ -221,7 +222,7 @@ func IsStorageMinerActor(c cid.Cid) bool { func IsMultisigActor(c cid.Cid) bool { name, _, ok := actors.GetActorMetaByCode(c) if ok { - return name == actors.MultisigKey + return name == manifest.MultisigKey } if c == builtin0.MultisigActorCodeID { diff --git a/venus-shared/actors/builtin/builtin.go.template b/venus-shared/actors/builtin/builtin.go.template index 69c3e584df..1067b10306 100644 --- a/venus-shared/actors/builtin/builtin.go.template +++ b/venus-shared/actors/builtin/builtin.go.template @@ -17,6 +17,7 @@ import ( "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/proof" "github.com/filecoin-project/go-state-types/builtin" + "github.com/filecoin-project/go-state-types/manifest" "github.com/filecoin-project/venus/venus-shared/actors" @@ -109,7 +110,7 @@ func IsAccountActor(c cid.Cid) bool { func IsStorageMinerActor(c cid.Cid) bool { name, _, ok := actors.GetActorMetaByCode(c) if ok { - return name == actors.MinerKey + return name == manifest.MinerKey } {{range .versions}} @@ -125,7 +126,7 @@ func IsStorageMinerActor(c cid.Cid) bool { func IsMultisigActor(c cid.Cid) bool { name, _, ok := actors.GetActorMetaByCode(c) if ok { - return name == actors.MultisigKey + return name == manifest.MultisigKey } {{range .versions}} diff --git a/venus-shared/actors/builtin/cron/actor.go b/venus-shared/actors/builtin/cron/actor.go index ee29b4d7ea..eb6f4aa586 100644 --- a/venus-shared/actors/builtin/cron/actor.go +++ b/venus-shared/actors/builtin/cron/actor.go @@ -6,6 +6,7 @@ import ( "fmt" actorstypes "github.com/filecoin-project/go-state-types/actors" + "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" types "github.com/filecoin-project/venus/venus-shared/internal" @@ -30,7 +31,7 @@ import ( func Load(store adt.Store, act *types.Actor) (State, error) { if name, av, ok := actors.GetActorMetaByCode(act.Code); ok { - if name != actors.CronKey { + if name != manifest.CronKey { return nil, fmt.Errorf("actor code is not cron: %s", name) } diff --git a/venus-shared/actors/builtin/cron/actor.go.template b/venus-shared/actors/builtin/cron/actor.go.template index ff498dd4e2..2e9ac566b5 100644 --- a/venus-shared/actors/builtin/cron/actor.go.template +++ b/venus-shared/actors/builtin/cron/actor.go.template @@ -9,6 +9,7 @@ import ( "github.com/filecoin-project/venus/venus-shared/actors/adt" "fmt" types "github.com/filecoin-project/venus/venus-shared/internal" + "github.com/filecoin-project/go-state-types/manifest" {{range .versions}} {{if (le . 7)}} @@ -20,7 +21,7 @@ import ( func Load(store adt.Store, act *types.Actor) (State, error) { if name, av, ok := actors.GetActorMetaByCode(act.Code); ok { - if name != actors.CronKey { + if name != manifest.CronKey { return nil, fmt.Errorf("actor code is not cron: %s", name) } diff --git a/venus-shared/actors/builtin/cron/state.sep.go.template b/venus-shared/actors/builtin/cron/state.sep.go.template index 477d25f294..35bf4847bc 100644 --- a/venus-shared/actors/builtin/cron/state.sep.go.template +++ b/venus-shared/actors/builtin/cron/state.sep.go.template @@ -9,6 +9,7 @@ import ( "github.com/filecoin-project/venus/venus-shared/actors/adt" "github.com/filecoin-project/venus/venus-shared/actors" actorstypes "github.com/filecoin-project/go-state-types/actors" + "github.com/filecoin-project/go-state-types/manifest" {{if (le .v 7)}} cron{{.v}} "github.com/filecoin-project/specs-actors{{.import}}actors/builtin/cron" @@ -44,7 +45,7 @@ func (s *state{{.v}}) GetState() interface{} { } func (s *state{{.v}}) ActorKey() string { - return actors.CronKey + return manifest.CronKey } func (s *state{{.v}}) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/cron/state.v0.go b/venus-shared/actors/builtin/cron/state.v0.go index b900ff7f46..825f1c1e10 100644 --- a/venus-shared/actors/builtin/cron/state.v0.go +++ b/venus-shared/actors/builtin/cron/state.v0.go @@ -8,6 +8,7 @@ import ( "github.com/ipfs/go-cid" actorstypes "github.com/filecoin-project/go-state-types/actors" + "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" @@ -41,7 +42,7 @@ func (s *state0) GetState() interface{} { } func (s *state0) ActorKey() string { - return actors.CronKey + return manifest.CronKey } func (s *state0) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/cron/state.v10.go b/venus-shared/actors/builtin/cron/state.v10.go index 909659a1fd..0bac9fb5c3 100644 --- a/venus-shared/actors/builtin/cron/state.v10.go +++ b/venus-shared/actors/builtin/cron/state.v10.go @@ -8,6 +8,7 @@ import ( "github.com/ipfs/go-cid" actorstypes "github.com/filecoin-project/go-state-types/actors" + "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" @@ -41,7 +42,7 @@ func (s *state10) GetState() interface{} { } func (s *state10) ActorKey() string { - return actors.CronKey + return manifest.CronKey } func (s *state10) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/cron/state.v2.go b/venus-shared/actors/builtin/cron/state.v2.go index 960ca87d52..fa020d5cbe 100644 --- a/venus-shared/actors/builtin/cron/state.v2.go +++ b/venus-shared/actors/builtin/cron/state.v2.go @@ -8,6 +8,7 @@ import ( "github.com/ipfs/go-cid" actorstypes "github.com/filecoin-project/go-state-types/actors" + "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" @@ -41,7 +42,7 @@ func (s *state2) GetState() interface{} { } func (s *state2) ActorKey() string { - return actors.CronKey + return manifest.CronKey } func (s *state2) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/cron/state.v3.go b/venus-shared/actors/builtin/cron/state.v3.go index 344af14dbd..0b87275d34 100644 --- a/venus-shared/actors/builtin/cron/state.v3.go +++ b/venus-shared/actors/builtin/cron/state.v3.go @@ -8,6 +8,7 @@ import ( "github.com/ipfs/go-cid" actorstypes "github.com/filecoin-project/go-state-types/actors" + "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" @@ -41,7 +42,7 @@ func (s *state3) GetState() interface{} { } func (s *state3) ActorKey() string { - return actors.CronKey + return manifest.CronKey } func (s *state3) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/cron/state.v4.go b/venus-shared/actors/builtin/cron/state.v4.go index 138433af49..50eedd34f4 100644 --- a/venus-shared/actors/builtin/cron/state.v4.go +++ b/venus-shared/actors/builtin/cron/state.v4.go @@ -8,6 +8,7 @@ import ( "github.com/ipfs/go-cid" actorstypes "github.com/filecoin-project/go-state-types/actors" + "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" @@ -41,7 +42,7 @@ func (s *state4) GetState() interface{} { } func (s *state4) ActorKey() string { - return actors.CronKey + return manifest.CronKey } func (s *state4) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/cron/state.v5.go b/venus-shared/actors/builtin/cron/state.v5.go index c7bef8f7f2..423f42c707 100644 --- a/venus-shared/actors/builtin/cron/state.v5.go +++ b/venus-shared/actors/builtin/cron/state.v5.go @@ -8,6 +8,7 @@ import ( "github.com/ipfs/go-cid" actorstypes "github.com/filecoin-project/go-state-types/actors" + "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" @@ -41,7 +42,7 @@ func (s *state5) GetState() interface{} { } func (s *state5) ActorKey() string { - return actors.CronKey + return manifest.CronKey } func (s *state5) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/cron/state.v6.go b/venus-shared/actors/builtin/cron/state.v6.go index 087c8ffb73..8d2b3f2045 100644 --- a/venus-shared/actors/builtin/cron/state.v6.go +++ b/venus-shared/actors/builtin/cron/state.v6.go @@ -8,6 +8,7 @@ import ( "github.com/ipfs/go-cid" actorstypes "github.com/filecoin-project/go-state-types/actors" + "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" @@ -41,7 +42,7 @@ func (s *state6) GetState() interface{} { } func (s *state6) ActorKey() string { - return actors.CronKey + return manifest.CronKey } func (s *state6) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/cron/state.v7.go b/venus-shared/actors/builtin/cron/state.v7.go index 55e03e07dd..5cd41640fe 100644 --- a/venus-shared/actors/builtin/cron/state.v7.go +++ b/venus-shared/actors/builtin/cron/state.v7.go @@ -8,6 +8,7 @@ import ( "github.com/ipfs/go-cid" actorstypes "github.com/filecoin-project/go-state-types/actors" + "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" @@ -41,7 +42,7 @@ func (s *state7) GetState() interface{} { } func (s *state7) ActorKey() string { - return actors.CronKey + return manifest.CronKey } func (s *state7) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/cron/state.v8.go b/venus-shared/actors/builtin/cron/state.v8.go index dc6f069c3e..95cfc06851 100644 --- a/venus-shared/actors/builtin/cron/state.v8.go +++ b/venus-shared/actors/builtin/cron/state.v8.go @@ -8,6 +8,7 @@ import ( "github.com/ipfs/go-cid" actorstypes "github.com/filecoin-project/go-state-types/actors" + "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" @@ -41,7 +42,7 @@ func (s *state8) GetState() interface{} { } func (s *state8) ActorKey() string { - return actors.CronKey + return manifest.CronKey } func (s *state8) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/cron/state.v9.go b/venus-shared/actors/builtin/cron/state.v9.go index 7f679fa3c2..af6dbd1d19 100644 --- a/venus-shared/actors/builtin/cron/state.v9.go +++ b/venus-shared/actors/builtin/cron/state.v9.go @@ -8,6 +8,7 @@ import ( "github.com/ipfs/go-cid" actorstypes "github.com/filecoin-project/go-state-types/actors" + "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" @@ -41,7 +42,7 @@ func (s *state9) GetState() interface{} { } func (s *state9) ActorKey() string { - return actors.CronKey + return manifest.CronKey } func (s *state9) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/datacap/actor.go b/venus-shared/actors/builtin/datacap/actor.go index 04c06c91e0..c52d66eb85 100644 --- a/venus-shared/actors/builtin/datacap/actor.go +++ b/venus-shared/actors/builtin/datacap/actor.go @@ -13,6 +13,7 @@ import ( builtin10 "github.com/filecoin-project/go-state-types/builtin" "github.com/filecoin-project/go-state-types/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" types "github.com/filecoin-project/venus/venus-shared/internal" @@ -25,7 +26,7 @@ var ( func Load(store adt.Store, act *types.Actor) (State, error) { if name, av, ok := actors.GetActorMetaByCode(act.Code); ok { - if name != actors.DatacapKey { + if name != manifest.DatacapKey { return nil, fmt.Errorf("actor code is not datacap: %s", name) } diff --git a/venus-shared/actors/builtin/datacap/actor.go.template b/venus-shared/actors/builtin/datacap/actor.go.template index 7308c3a965..cb6f82c2e1 100644 --- a/venus-shared/actors/builtin/datacap/actor.go.template +++ b/venus-shared/actors/builtin/datacap/actor.go.template @@ -16,6 +16,7 @@ import ( "github.com/filecoin-project/venus/venus-shared/actors" "github.com/filecoin-project/venus/venus-shared/actors/adt" types "github.com/filecoin-project/venus/venus-shared/internal" + "github.com/filecoin-project/go-state-types/manifest" ) var ( @@ -25,7 +26,7 @@ var ( func Load(store adt.Store, act *types.Actor) (State, error) { if name, av, ok := actors.GetActorMetaByCode(act.Code); ok { - if name != actors.DatacapKey { + if name != manifest.DatacapKey { return nil, fmt.Errorf("actor code is not datacap: %s", name) } diff --git a/venus-shared/actors/builtin/datacap/state.sep.go.template b/venus-shared/actors/builtin/datacap/state.sep.go.template index 9356f12373..d55679b0e0 100644 --- a/venus-shared/actors/builtin/datacap/state.sep.go.template +++ b/venus-shared/actors/builtin/datacap/state.sep.go.template @@ -14,6 +14,7 @@ import ( datacap{{.v}} "github.com/filecoin-project/go-state-types/builtin{{.import}}datacap" adt{{.v}} "github.com/filecoin-project/go-state-types/builtin{{.import}}util/adt" + "github.com/filecoin-project/go-state-types/manifest" ) var _ State = (*state{{.v}})(nil) @@ -65,7 +66,7 @@ func (s *state{{.v}}) VerifiedClientDataCap(addr address.Address) (bool, abi.Sto } func (s *state{{.v}}) ActorKey() string { - return actors.DatacapKey + return manifest.DatacapKey } func (s *state{{.v}}) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/datacap/state.v10.go b/venus-shared/actors/builtin/datacap/state.v10.go index 86709c25bd..dfc768543e 100644 --- a/venus-shared/actors/builtin/datacap/state.v10.go +++ b/venus-shared/actors/builtin/datacap/state.v10.go @@ -15,6 +15,7 @@ import ( datacap10 "github.com/filecoin-project/go-state-types/builtin/v10/datacap" adt10 "github.com/filecoin-project/go-state-types/builtin/v10/util/adt" + "github.com/filecoin-project/go-state-types/manifest" ) var _ State = (*state10)(nil) @@ -66,7 +67,7 @@ func (s *state10) VerifiedClientDataCap(addr address.Address) (bool, abi.Storage } func (s *state10) ActorKey() string { - return actors.DatacapKey + return manifest.DatacapKey } func (s *state10) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/datacap/state.v9.go b/venus-shared/actors/builtin/datacap/state.v9.go index b8a7b55885..a4ac37430d 100644 --- a/venus-shared/actors/builtin/datacap/state.v9.go +++ b/venus-shared/actors/builtin/datacap/state.v9.go @@ -15,6 +15,7 @@ import ( datacap9 "github.com/filecoin-project/go-state-types/builtin/v9/datacap" adt9 "github.com/filecoin-project/go-state-types/builtin/v9/util/adt" + "github.com/filecoin-project/go-state-types/manifest" ) var _ State = (*state9)(nil) @@ -66,7 +67,7 @@ func (s *state9) VerifiedClientDataCap(addr address.Address) (bool, abi.StorageP } func (s *state9) ActorKey() string { - return actors.DatacapKey + return manifest.DatacapKey } func (s *state9) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/evm/actor.go b/venus-shared/actors/builtin/evm/actor.go index ace0a4dbab..f571d6f332 100644 --- a/venus-shared/actors/builtin/evm/actor.go +++ b/venus-shared/actors/builtin/evm/actor.go @@ -10,6 +10,7 @@ import ( actorstypes "github.com/filecoin-project/go-state-types/actors" "github.com/filecoin-project/go-state-types/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" types "github.com/filecoin-project/venus/venus-shared/internal" @@ -21,7 +22,7 @@ var Methods = builtin10.MethodsEVM func Load(store adt.Store, act *types.Actor) (State, error) { if name, av, ok := actors.GetActorMetaByCode(act.Code); ok { - if name != actors.EvmKey { + if name != manifest.EvmKey { return nil, fmt.Errorf("actor code is not evm: %s", name) } diff --git a/venus-shared/actors/builtin/evm/actor.go.template b/venus-shared/actors/builtin/evm/actor.go.template index bf6d5518b8..36adbbf5e4 100644 --- a/venus-shared/actors/builtin/evm/actor.go.template +++ b/venus-shared/actors/builtin/evm/actor.go.template @@ -12,6 +12,7 @@ import ( "github.com/filecoin-project/venus/venus-shared/actors" "github.com/filecoin-project/venus/venus-shared/actors/adt" types "github.com/filecoin-project/venus/venus-shared/internal" + "github.com/filecoin-project/go-state-types/manifest" builtin{{.latestVersion}} "github.com/filecoin-project/go-state-types/builtin" ) @@ -20,7 +21,7 @@ var Methods = builtin{{.latestVersion}}.MethodsEVM func Load(store adt.Store, act *types.Actor) (State, error) { if name, av, ok := actors.GetActorMetaByCode(act.Code); ok { - if name != actors.EvmKey { + if name != manifest.EvmKey { return nil, fmt.Errorf("actor code is not evm: %s", name) } diff --git a/venus-shared/actors/builtin/init/actor.go b/venus-shared/actors/builtin/init/actor.go index 0b78e871bc..f475a86573 100644 --- a/venus-shared/actors/builtin/init/actor.go +++ b/venus-shared/actors/builtin/init/actor.go @@ -16,6 +16,8 @@ import ( "github.com/filecoin-project/venus/venus-shared/actors/adt" types "github.com/filecoin-project/venus/venus-shared/internal" + "github.com/filecoin-project/go-state-types/manifest" + builtin0 "github.com/filecoin-project/specs-actors/actors/builtin" builtin2 "github.com/filecoin-project/specs-actors/v2/actors/builtin" @@ -40,7 +42,7 @@ var ( func Load(store adt.Store, act *types.Actor) (State, error) { if name, av, ok := actors.GetActorMetaByCode(act.Code); ok { - if name != actors.InitKey { + if name != manifest.InitKey { return nil, fmt.Errorf("actor code is not init: %s", name) } diff --git a/venus-shared/actors/builtin/init/actor.go.template b/venus-shared/actors/builtin/init/actor.go.template index ca43a412a7..6d77897a11 100644 --- a/venus-shared/actors/builtin/init/actor.go.template +++ b/venus-shared/actors/builtin/init/actor.go.template @@ -15,6 +15,7 @@ import ( "github.com/filecoin-project/venus/venus-shared/actors/adt" types "github.com/filecoin-project/venus/venus-shared/internal" + "github.com/filecoin-project/go-state-types/manifest" {{range .versions}} {{if (le . 7)}} builtin{{.}} "github.com/filecoin-project/specs-actors{{import .}}actors/builtin" @@ -30,7 +31,7 @@ var ( func Load(store adt.Store, act *types.Actor) (State, error) { if name, av, ok := actors.GetActorMetaByCode(act.Code); ok { - if name != actors.InitKey { + if name != manifest.InitKey { return nil, fmt.Errorf("actor code is not init: %s", name) } diff --git a/venus-shared/actors/builtin/init/state.sep.go.template b/venus-shared/actors/builtin/init/state.sep.go.template index 45fab3d9cb..7cd32a50fe 100644 --- a/venus-shared/actors/builtin/init/state.sep.go.template +++ b/venus-shared/actors/builtin/init/state.sep.go.template @@ -15,6 +15,7 @@ import ( "github.com/filecoin-project/venus/venus-shared/actors/adt" actorstypes "github.com/filecoin-project/go-state-types/actors" + "github.com/filecoin-project/go-state-types/manifest" {{if (le .v 7)}} {{if (ge .v 3)}} @@ -149,7 +150,7 @@ func (s *state{{.v}}) AddressMapHashFunction() func(input []byte) []byte { } func (s *state{{.v}}) ActorKey() string { - return actors.InitKey + return manifest.InitKey } func (s *state{{.v}}) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/init/state.v0.go b/venus-shared/actors/builtin/init/state.v0.go index a6a1260aa3..5d0d079bea 100644 --- a/venus-shared/actors/builtin/init/state.v0.go +++ b/venus-shared/actors/builtin/init/state.v0.go @@ -15,6 +15,8 @@ import ( "github.com/filecoin-project/venus/venus-shared/actors" "github.com/filecoin-project/venus/venus-shared/actors/adt" + "github.com/filecoin-project/go-state-types/manifest" + init0 "github.com/filecoin-project/specs-actors/actors/builtin/init" adt0 "github.com/filecoin-project/specs-actors/actors/util/adt" ) @@ -128,7 +130,7 @@ func (s *state0) AddressMapHashFunction() func(input []byte) []byte { } func (s *state0) ActorKey() string { - return actors.InitKey + return manifest.InitKey } func (s *state0) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/init/state.v10.go b/venus-shared/actors/builtin/init/state.v10.go index 22230f4ba7..d145a969c7 100644 --- a/venus-shared/actors/builtin/init/state.v10.go +++ b/venus-shared/actors/builtin/init/state.v10.go @@ -15,6 +15,8 @@ import ( "github.com/filecoin-project/venus/venus-shared/actors" "github.com/filecoin-project/venus/venus-shared/actors/adt" + "github.com/filecoin-project/go-state-types/manifest" + builtin10 "github.com/filecoin-project/go-state-types/builtin" init10 "github.com/filecoin-project/go-state-types/builtin/v10/init" adt10 "github.com/filecoin-project/go-state-types/builtin/v10/util/adt" @@ -129,7 +131,7 @@ func (s *state10) AddressMapHashFunction() func(input []byte) []byte { } func (s *state10) ActorKey() string { - return actors.InitKey + return manifest.InitKey } func (s *state10) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/init/state.v2.go b/venus-shared/actors/builtin/init/state.v2.go index 1128947cb5..48c0902cbf 100644 --- a/venus-shared/actors/builtin/init/state.v2.go +++ b/venus-shared/actors/builtin/init/state.v2.go @@ -15,6 +15,8 @@ import ( "github.com/filecoin-project/venus/venus-shared/actors" "github.com/filecoin-project/venus/venus-shared/actors/adt" + "github.com/filecoin-project/go-state-types/manifest" + init2 "github.com/filecoin-project/specs-actors/v2/actors/builtin/init" adt2 "github.com/filecoin-project/specs-actors/v2/actors/util/adt" ) @@ -128,7 +130,7 @@ func (s *state2) AddressMapHashFunction() func(input []byte) []byte { } func (s *state2) ActorKey() string { - return actors.InitKey + return manifest.InitKey } func (s *state2) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/init/state.v3.go b/venus-shared/actors/builtin/init/state.v3.go index f38be62e00..564fa375e1 100644 --- a/venus-shared/actors/builtin/init/state.v3.go +++ b/venus-shared/actors/builtin/init/state.v3.go @@ -15,6 +15,8 @@ import ( "github.com/filecoin-project/venus/venus-shared/actors" "github.com/filecoin-project/venus/venus-shared/actors/adt" + "github.com/filecoin-project/go-state-types/manifest" + builtin3 "github.com/filecoin-project/specs-actors/v3/actors/builtin" init3 "github.com/filecoin-project/specs-actors/v3/actors/builtin/init" @@ -130,7 +132,7 @@ func (s *state3) AddressMapHashFunction() func(input []byte) []byte { } func (s *state3) ActorKey() string { - return actors.InitKey + return manifest.InitKey } func (s *state3) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/init/state.v4.go b/venus-shared/actors/builtin/init/state.v4.go index febec4df8c..99822556f1 100644 --- a/venus-shared/actors/builtin/init/state.v4.go +++ b/venus-shared/actors/builtin/init/state.v4.go @@ -15,6 +15,8 @@ import ( "github.com/filecoin-project/venus/venus-shared/actors" "github.com/filecoin-project/venus/venus-shared/actors/adt" + "github.com/filecoin-project/go-state-types/manifest" + builtin4 "github.com/filecoin-project/specs-actors/v4/actors/builtin" init4 "github.com/filecoin-project/specs-actors/v4/actors/builtin/init" @@ -130,7 +132,7 @@ func (s *state4) AddressMapHashFunction() func(input []byte) []byte { } func (s *state4) ActorKey() string { - return actors.InitKey + return manifest.InitKey } func (s *state4) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/init/state.v5.go b/venus-shared/actors/builtin/init/state.v5.go index 8209010ce8..f1dae8981a 100644 --- a/venus-shared/actors/builtin/init/state.v5.go +++ b/venus-shared/actors/builtin/init/state.v5.go @@ -15,6 +15,8 @@ import ( "github.com/filecoin-project/venus/venus-shared/actors" "github.com/filecoin-project/venus/venus-shared/actors/adt" + "github.com/filecoin-project/go-state-types/manifest" + builtin5 "github.com/filecoin-project/specs-actors/v5/actors/builtin" init5 "github.com/filecoin-project/specs-actors/v5/actors/builtin/init" @@ -130,7 +132,7 @@ func (s *state5) AddressMapHashFunction() func(input []byte) []byte { } func (s *state5) ActorKey() string { - return actors.InitKey + return manifest.InitKey } func (s *state5) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/init/state.v6.go b/venus-shared/actors/builtin/init/state.v6.go index fec7e22081..34ef8127bf 100644 --- a/venus-shared/actors/builtin/init/state.v6.go +++ b/venus-shared/actors/builtin/init/state.v6.go @@ -15,6 +15,8 @@ import ( "github.com/filecoin-project/venus/venus-shared/actors" "github.com/filecoin-project/venus/venus-shared/actors/adt" + "github.com/filecoin-project/go-state-types/manifest" + builtin6 "github.com/filecoin-project/specs-actors/v6/actors/builtin" init6 "github.com/filecoin-project/specs-actors/v6/actors/builtin/init" @@ -130,7 +132,7 @@ func (s *state6) AddressMapHashFunction() func(input []byte) []byte { } func (s *state6) ActorKey() string { - return actors.InitKey + return manifest.InitKey } func (s *state6) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/init/state.v7.go b/venus-shared/actors/builtin/init/state.v7.go index ad1d706181..d311a7d355 100644 --- a/venus-shared/actors/builtin/init/state.v7.go +++ b/venus-shared/actors/builtin/init/state.v7.go @@ -15,6 +15,8 @@ import ( "github.com/filecoin-project/venus/venus-shared/actors" "github.com/filecoin-project/venus/venus-shared/actors/adt" + "github.com/filecoin-project/go-state-types/manifest" + builtin7 "github.com/filecoin-project/specs-actors/v7/actors/builtin" init7 "github.com/filecoin-project/specs-actors/v7/actors/builtin/init" @@ -130,7 +132,7 @@ func (s *state7) AddressMapHashFunction() func(input []byte) []byte { } func (s *state7) ActorKey() string { - return actors.InitKey + return manifest.InitKey } func (s *state7) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/init/state.v8.go b/venus-shared/actors/builtin/init/state.v8.go index 62319301cd..9a7a065227 100644 --- a/venus-shared/actors/builtin/init/state.v8.go +++ b/venus-shared/actors/builtin/init/state.v8.go @@ -15,6 +15,8 @@ import ( "github.com/filecoin-project/venus/venus-shared/actors" "github.com/filecoin-project/venus/venus-shared/actors/adt" + "github.com/filecoin-project/go-state-types/manifest" + builtin8 "github.com/filecoin-project/go-state-types/builtin" init8 "github.com/filecoin-project/go-state-types/builtin/v8/init" adt8 "github.com/filecoin-project/go-state-types/builtin/v8/util/adt" @@ -129,7 +131,7 @@ func (s *state8) AddressMapHashFunction() func(input []byte) []byte { } func (s *state8) ActorKey() string { - return actors.InitKey + return manifest.InitKey } func (s *state8) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/init/state.v9.go b/venus-shared/actors/builtin/init/state.v9.go index 27ffefcedc..277cb70b2a 100644 --- a/venus-shared/actors/builtin/init/state.v9.go +++ b/venus-shared/actors/builtin/init/state.v9.go @@ -15,6 +15,8 @@ import ( "github.com/filecoin-project/venus/venus-shared/actors" "github.com/filecoin-project/venus/venus-shared/actors/adt" + "github.com/filecoin-project/go-state-types/manifest" + builtin9 "github.com/filecoin-project/go-state-types/builtin" init9 "github.com/filecoin-project/go-state-types/builtin/v9/init" adt9 "github.com/filecoin-project/go-state-types/builtin/v9/util/adt" @@ -129,7 +131,7 @@ func (s *state9) AddressMapHashFunction() func(input []byte) []byte { } func (s *state9) ActorKey() string { - return actors.InitKey + return manifest.InitKey } func (s *state9) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/market/actor.go b/venus-shared/actors/builtin/market/actor.go index 8b17797a3e..b7d53e94f8 100644 --- a/venus-shared/actors/builtin/market/actor.go +++ b/venus-shared/actors/builtin/market/actor.go @@ -16,6 +16,7 @@ import ( "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" "github.com/filecoin-project/go-state-types/cbor" + "github.com/filecoin-project/go-state-types/manifest" cbg "github.com/whyrusleeping/cbor-gen" markettypes "github.com/filecoin-project/go-state-types/builtin/v9/market" @@ -49,7 +50,7 @@ var ( func Load(store adt.Store, act *types.Actor) (State, error) { if name, av, ok := actors.GetActorMetaByCode(act.Code); ok { - if name != actors.MarketKey { + if name != manifest.MarketKey { return nil, fmt.Errorf("actor code is not market: %s", name) } diff --git a/venus-shared/actors/builtin/market/actor.go.template b/venus-shared/actors/builtin/market/actor.go.template index f47b1e650f..dfe29ebbfc 100644 --- a/venus-shared/actors/builtin/market/actor.go.template +++ b/venus-shared/actors/builtin/market/actor.go.template @@ -15,6 +15,7 @@ import ( "github.com/filecoin-project/go-state-types/big" "github.com/filecoin-project/go-state-types/cbor" cbg "github.com/whyrusleeping/cbor-gen" + "github.com/filecoin-project/go-state-types/manifest" markettypes "github.com/filecoin-project/go-state-types/builtin/v9/market" verifregtypes "github.com/filecoin-project/go-state-types/builtin/v9/verifreg" @@ -38,7 +39,7 @@ var ( func Load(store adt.Store, act *types.Actor) (State, error) { if name, av, ok := actors.GetActorMetaByCode(act.Code); ok { - if name != actors.MarketKey { + if name != manifest.MarketKey { return nil, fmt.Errorf("actor code is not market: %s", name) } diff --git a/venus-shared/actors/builtin/market/state.sep.go.template b/venus-shared/actors/builtin/market/state.sep.go.template index 5930b18e69..bdef33465e 100644 --- a/venus-shared/actors/builtin/market/state.sep.go.template +++ b/venus-shared/actors/builtin/market/state.sep.go.template @@ -21,6 +21,7 @@ import ( "github.com/filecoin-project/venus/venus-shared/actors" types "github.com/filecoin-project/venus/venus-shared/internal" verifregtypes "github.com/filecoin-project/go-state-types/builtin/v9/verifreg" + "github.com/filecoin-project/go-state-types/manifest" {{if (le .v 7)}} market{{.v}} "github.com/filecoin-project/specs-actors{{.import}}actors/builtin/market" @@ -395,7 +396,7 @@ func (s *state{{.v}}) GetAllocationIdForPendingDeal(dealId abi.DealID) (verifreg func (s *state{{.v}}) ActorKey() string { - return actors.MarketKey + return manifest.MarketKey } func (s *state{{.v}}) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/market/state.v0.go b/venus-shared/actors/builtin/market/state.v0.go index ba98e4a5f3..631d1784ed 100644 --- a/venus-shared/actors/builtin/market/state.v0.go +++ b/venus-shared/actors/builtin/market/state.v0.go @@ -13,6 +13,7 @@ import ( actorstypes "github.com/filecoin-project/go-state-types/actors" verifregtypes "github.com/filecoin-project/go-state-types/builtin/v9/verifreg" + "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" types "github.com/filecoin-project/venus/venus-shared/internal" @@ -313,7 +314,7 @@ func (s *state0) GetAllocationIdForPendingDeal(dealId abi.DealID) (verifregtypes } func (s *state0) ActorKey() string { - return actors.MarketKey + return manifest.MarketKey } func (s *state0) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/market/state.v10.go b/venus-shared/actors/builtin/market/state.v10.go index a45cc70be1..4d342fb903 100644 --- a/venus-shared/actors/builtin/market/state.v10.go +++ b/venus-shared/actors/builtin/market/state.v10.go @@ -16,6 +16,7 @@ import ( actorstypes "github.com/filecoin-project/go-state-types/actors" verifregtypes "github.com/filecoin-project/go-state-types/builtin/v9/verifreg" + "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" types "github.com/filecoin-project/venus/venus-shared/internal" @@ -362,7 +363,7 @@ func (s *state10) GetAllocationIdForPendingDeal(dealId abi.DealID) (verifregtype } func (s *state10) ActorKey() string { - return actors.MarketKey + return manifest.MarketKey } func (s *state10) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/market/state.v2.go b/venus-shared/actors/builtin/market/state.v2.go index a304114713..770ab4032c 100644 --- a/venus-shared/actors/builtin/market/state.v2.go +++ b/venus-shared/actors/builtin/market/state.v2.go @@ -13,6 +13,7 @@ import ( actorstypes "github.com/filecoin-project/go-state-types/actors" verifregtypes "github.com/filecoin-project/go-state-types/builtin/v9/verifreg" + "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" types "github.com/filecoin-project/venus/venus-shared/internal" @@ -313,7 +314,7 @@ func (s *state2) GetAllocationIdForPendingDeal(dealId abi.DealID) (verifregtypes } func (s *state2) ActorKey() string { - return actors.MarketKey + return manifest.MarketKey } func (s *state2) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/market/state.v3.go b/venus-shared/actors/builtin/market/state.v3.go index a87cc83a26..59a5451c85 100644 --- a/venus-shared/actors/builtin/market/state.v3.go +++ b/venus-shared/actors/builtin/market/state.v3.go @@ -13,6 +13,7 @@ import ( actorstypes "github.com/filecoin-project/go-state-types/actors" verifregtypes "github.com/filecoin-project/go-state-types/builtin/v9/verifreg" + "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" types "github.com/filecoin-project/venus/venus-shared/internal" @@ -308,7 +309,7 @@ func (s *state3) GetAllocationIdForPendingDeal(dealId abi.DealID) (verifregtypes } func (s *state3) ActorKey() string { - return actors.MarketKey + return manifest.MarketKey } func (s *state3) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/market/state.v4.go b/venus-shared/actors/builtin/market/state.v4.go index 8d0fc95288..1ebb48b6f9 100644 --- a/venus-shared/actors/builtin/market/state.v4.go +++ b/venus-shared/actors/builtin/market/state.v4.go @@ -13,6 +13,7 @@ import ( actorstypes "github.com/filecoin-project/go-state-types/actors" verifregtypes "github.com/filecoin-project/go-state-types/builtin/v9/verifreg" + "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" types "github.com/filecoin-project/venus/venus-shared/internal" @@ -308,7 +309,7 @@ func (s *state4) GetAllocationIdForPendingDeal(dealId abi.DealID) (verifregtypes } func (s *state4) ActorKey() string { - return actors.MarketKey + return manifest.MarketKey } func (s *state4) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/market/state.v5.go b/venus-shared/actors/builtin/market/state.v5.go index 4add1e9292..581ba80cdd 100644 --- a/venus-shared/actors/builtin/market/state.v5.go +++ b/venus-shared/actors/builtin/market/state.v5.go @@ -13,6 +13,7 @@ import ( actorstypes "github.com/filecoin-project/go-state-types/actors" verifregtypes "github.com/filecoin-project/go-state-types/builtin/v9/verifreg" + "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" types "github.com/filecoin-project/venus/venus-shared/internal" @@ -308,7 +309,7 @@ func (s *state5) GetAllocationIdForPendingDeal(dealId abi.DealID) (verifregtypes } func (s *state5) ActorKey() string { - return actors.MarketKey + return manifest.MarketKey } func (s *state5) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/market/state.v6.go b/venus-shared/actors/builtin/market/state.v6.go index 6c67a38147..f56e73ad66 100644 --- a/venus-shared/actors/builtin/market/state.v6.go +++ b/venus-shared/actors/builtin/market/state.v6.go @@ -16,6 +16,7 @@ import ( actorstypes "github.com/filecoin-project/go-state-types/actors" verifregtypes "github.com/filecoin-project/go-state-types/builtin/v9/verifreg" + "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" types "github.com/filecoin-project/venus/venus-shared/internal" @@ -327,7 +328,7 @@ func (s *state6) GetAllocationIdForPendingDeal(dealId abi.DealID) (verifregtypes } func (s *state6) ActorKey() string { - return actors.MarketKey + return manifest.MarketKey } func (s *state6) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/market/state.v7.go b/venus-shared/actors/builtin/market/state.v7.go index 70efeefc06..3bdf041640 100644 --- a/venus-shared/actors/builtin/market/state.v7.go +++ b/venus-shared/actors/builtin/market/state.v7.go @@ -16,6 +16,7 @@ import ( actorstypes "github.com/filecoin-project/go-state-types/actors" verifregtypes "github.com/filecoin-project/go-state-types/builtin/v9/verifreg" + "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" types "github.com/filecoin-project/venus/venus-shared/internal" @@ -327,7 +328,7 @@ func (s *state7) GetAllocationIdForPendingDeal(dealId abi.DealID) (verifregtypes } func (s *state7) ActorKey() string { - return actors.MarketKey + return manifest.MarketKey } func (s *state7) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/market/state.v8.go b/venus-shared/actors/builtin/market/state.v8.go index dca9d8c511..02fa4d7981 100644 --- a/venus-shared/actors/builtin/market/state.v8.go +++ b/venus-shared/actors/builtin/market/state.v8.go @@ -16,6 +16,7 @@ import ( actorstypes "github.com/filecoin-project/go-state-types/actors" verifregtypes "github.com/filecoin-project/go-state-types/builtin/v9/verifreg" + "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" types "github.com/filecoin-project/venus/venus-shared/internal" @@ -344,7 +345,7 @@ func (s *state8) GetAllocationIdForPendingDeal(dealId abi.DealID) (verifregtypes } func (s *state8) ActorKey() string { - return actors.MarketKey + return manifest.MarketKey } func (s *state8) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/market/state.v9.go b/venus-shared/actors/builtin/market/state.v9.go index 962d8a0880..a022aa2049 100644 --- a/venus-shared/actors/builtin/market/state.v9.go +++ b/venus-shared/actors/builtin/market/state.v9.go @@ -16,6 +16,7 @@ import ( actorstypes "github.com/filecoin-project/go-state-types/actors" verifregtypes "github.com/filecoin-project/go-state-types/builtin/v9/verifreg" + "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" types "github.com/filecoin-project/venus/venus-shared/internal" @@ -362,7 +363,7 @@ func (s *state9) GetAllocationIdForPendingDeal(dealId abi.DealID) (verifregtypes } func (s *state9) ActorKey() string { - return actors.MarketKey + return manifest.MarketKey } func (s *state9) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/miner/actor.go b/venus-shared/actors/builtin/miner/actor.go index d1eebd5ae4..300a4f3b9b 100644 --- a/venus-shared/actors/builtin/miner/actor.go +++ b/venus-shared/actors/builtin/miner/actor.go @@ -19,6 +19,7 @@ import ( "github.com/filecoin-project/go-state-types/proof" minertypes "github.com/filecoin-project/go-state-types/builtin/v9/miner" + "github.com/filecoin-project/go-state-types/manifest" "github.com/filecoin-project/venus/venus-shared/actors/adt" types "github.com/filecoin-project/venus/venus-shared/internal" @@ -39,7 +40,7 @@ import ( func Load(store adt.Store, act *types.Actor) (State, error) { if name, av, ok := actors.GetActorMetaByCode(act.Code); ok { - if name != actors.MinerKey { + if name != manifest.MinerKey { return nil, fmt.Errorf("actor code is not miner: %s", name) } @@ -137,6 +138,7 @@ type State interface { LockedFunds() (LockedFunds, error) FeeDebt() (abi.TokenAmount, error) + // Returns nil, nil if sector is not found GetSector(abi.SectorNumber) (*SectorOnChainInfo, error) FindSector(abi.SectorNumber) (*SectorLocation, error) GetSectorExpiration(abi.SectorNumber) (*SectorExpiration, error) diff --git a/venus-shared/actors/builtin/miner/actor.go.template b/venus-shared/actors/builtin/miner/actor.go.template index 6d087f7727..1e41d356a9 100644 --- a/venus-shared/actors/builtin/miner/actor.go.template +++ b/venus-shared/actors/builtin/miner/actor.go.template @@ -20,6 +20,7 @@ import ( "github.com/filecoin-project/venus/venus-shared/actors/adt" types "github.com/filecoin-project/venus/venus-shared/internal" minertypes "github.com/filecoin-project/go-state-types/builtin/v9/miner" + "github.com/filecoin-project/go-state-types/manifest" {{range .versions}} {{if (le . 7)}} @@ -30,7 +31,7 @@ import ( func Load(store adt.Store, act *types.Actor) (State, error) { if name, av, ok := actors.GetActorMetaByCode(act.Code); ok { - if name != actors.MinerKey { + if name != manifest.MinerKey { return nil, fmt.Errorf("actor code is not miner: %s", name) } @@ -81,6 +82,7 @@ type State interface { LockedFunds() (LockedFunds, error) FeeDebt() (abi.TokenAmount, error) + // Returns nil, nil if sector is not found GetSector(abi.SectorNumber) (*SectorOnChainInfo, error) FindSector(abi.SectorNumber) (*SectorLocation, error) GetSectorExpiration(abi.SectorNumber) (*SectorExpiration, error) diff --git a/venus-shared/actors/builtin/miner/state.sep.go.template b/venus-shared/actors/builtin/miner/state.sep.go.template index a2ee898924..811b3099ae 100644 --- a/venus-shared/actors/builtin/miner/state.sep.go.template +++ b/venus-shared/actors/builtin/miner/state.sep.go.template @@ -19,6 +19,7 @@ import ( "github.com/filecoin-project/venus/venus-shared/actors/adt" "github.com/filecoin-project/venus/venus-shared/actors" actorstypes "github.com/filecoin-project/go-state-types/actors" + "github.com/filecoin-project/go-state-types/manifest" {{if (le .v 7)}} {{if (ge .v 3)}} @@ -101,6 +102,7 @@ func (s *state{{.v}}) PreCommitDeposits() (abi.TokenAmount, error) { return s.State.PreCommitDeposits, nil } +// Returns nil, nil if sector is not found func (s *state{{.v}}) GetSector(num abi.SectorNumber) (*SectorOnChainInfo, error) { info, ok, err := s.State.GetSector(s.store, num) if !ok || err != nil { @@ -614,7 +616,7 @@ func (s *state{{.v}}) GetState() interface{} { } func (s *state{{.v}}) ActorKey() string { - return actors.MinerKey + return manifest.MinerKey } func (s *state{{.v}}) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/miner/state.v0.go b/venus-shared/actors/builtin/miner/state.v0.go index 43412d582c..61f6b469f5 100644 --- a/venus-shared/actors/builtin/miner/state.v0.go +++ b/venus-shared/actors/builtin/miner/state.v0.go @@ -17,6 +17,7 @@ import ( cbg "github.com/whyrusleeping/cbor-gen" actorstypes "github.com/filecoin-project/go-state-types/actors" + "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" @@ -92,6 +93,7 @@ func (s *state0) PreCommitDeposits() (abi.TokenAmount, error) { return s.State.PreCommitDeposits, nil } +// Returns nil, nil if sector is not found func (s *state0) GetSector(num abi.SectorNumber) (*SectorOnChainInfo, error) { info, ok, err := s.State.GetSector(s.store, num) if !ok || err != nil { @@ -536,7 +538,7 @@ func (s *state0) GetState() interface{} { } func (s *state0) ActorKey() string { - return actors.MinerKey + return manifest.MinerKey } func (s *state0) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/miner/state.v10.go b/venus-shared/actors/builtin/miner/state.v10.go index 8f678313a3..eacffe4969 100644 --- a/venus-shared/actors/builtin/miner/state.v10.go +++ b/venus-shared/actors/builtin/miner/state.v10.go @@ -15,6 +15,7 @@ import ( cbg "github.com/whyrusleeping/cbor-gen" actorstypes "github.com/filecoin-project/go-state-types/actors" + "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" @@ -91,6 +92,7 @@ func (s *state10) PreCommitDeposits() (abi.TokenAmount, error) { return s.State.PreCommitDeposits, nil } +// Returns nil, nil if sector is not found func (s *state10) GetSector(num abi.SectorNumber) (*SectorOnChainInfo, error) { info, ok, err := s.State.GetSector(s.store, num) if !ok || err != nil { @@ -573,7 +575,7 @@ func (s *state10) GetState() interface{} { } func (s *state10) ActorKey() string { - return actors.MinerKey + return manifest.MinerKey } func (s *state10) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/miner/state.v2.go b/venus-shared/actors/builtin/miner/state.v2.go index d219fd72a8..56c5e9ac8f 100644 --- a/venus-shared/actors/builtin/miner/state.v2.go +++ b/venus-shared/actors/builtin/miner/state.v2.go @@ -15,6 +15,7 @@ import ( cbg "github.com/whyrusleeping/cbor-gen" actorstypes "github.com/filecoin-project/go-state-types/actors" + "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" @@ -90,6 +91,7 @@ func (s *state2) PreCommitDeposits() (abi.TokenAmount, error) { return s.State.PreCommitDeposits, nil } +// Returns nil, nil if sector is not found func (s *state2) GetSector(num abi.SectorNumber) (*SectorOnChainInfo, error) { info, ok, err := s.State.GetSector(s.store, num) if !ok || err != nil { @@ -566,7 +568,7 @@ func (s *state2) GetState() interface{} { } func (s *state2) ActorKey() string { - return actors.MinerKey + return manifest.MinerKey } func (s *state2) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/miner/state.v3.go b/venus-shared/actors/builtin/miner/state.v3.go index 497a3a4202..9e46bad2f7 100644 --- a/venus-shared/actors/builtin/miner/state.v3.go +++ b/venus-shared/actors/builtin/miner/state.v3.go @@ -15,6 +15,7 @@ import ( cbg "github.com/whyrusleeping/cbor-gen" actorstypes "github.com/filecoin-project/go-state-types/actors" + "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" @@ -92,6 +93,7 @@ func (s *state3) PreCommitDeposits() (abi.TokenAmount, error) { return s.State.PreCommitDeposits, nil } +// Returns nil, nil if sector is not found func (s *state3) GetSector(num abi.SectorNumber) (*SectorOnChainInfo, error) { info, ok, err := s.State.GetSector(s.store, num) if !ok || err != nil { @@ -567,7 +569,7 @@ func (s *state3) GetState() interface{} { } func (s *state3) ActorKey() string { - return actors.MinerKey + return manifest.MinerKey } func (s *state3) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/miner/state.v4.go b/venus-shared/actors/builtin/miner/state.v4.go index b440848ff8..e397d3f0c6 100644 --- a/venus-shared/actors/builtin/miner/state.v4.go +++ b/venus-shared/actors/builtin/miner/state.v4.go @@ -15,6 +15,7 @@ import ( cbg "github.com/whyrusleeping/cbor-gen" actorstypes "github.com/filecoin-project/go-state-types/actors" + "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" @@ -92,6 +93,7 @@ func (s *state4) PreCommitDeposits() (abi.TokenAmount, error) { return s.State.PreCommitDeposits, nil } +// Returns nil, nil if sector is not found func (s *state4) GetSector(num abi.SectorNumber) (*SectorOnChainInfo, error) { info, ok, err := s.State.GetSector(s.store, num) if !ok || err != nil { @@ -567,7 +569,7 @@ func (s *state4) GetState() interface{} { } func (s *state4) ActorKey() string { - return actors.MinerKey + return manifest.MinerKey } func (s *state4) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/miner/state.v5.go b/venus-shared/actors/builtin/miner/state.v5.go index 8ff312fa56..52bdcf2dcf 100644 --- a/venus-shared/actors/builtin/miner/state.v5.go +++ b/venus-shared/actors/builtin/miner/state.v5.go @@ -15,6 +15,7 @@ import ( cbg "github.com/whyrusleeping/cbor-gen" actorstypes "github.com/filecoin-project/go-state-types/actors" + "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" @@ -92,6 +93,7 @@ func (s *state5) PreCommitDeposits() (abi.TokenAmount, error) { return s.State.PreCommitDeposits, nil } +// Returns nil, nil if sector is not found func (s *state5) GetSector(num abi.SectorNumber) (*SectorOnChainInfo, error) { info, ok, err := s.State.GetSector(s.store, num) if !ok || err != nil { @@ -567,7 +569,7 @@ func (s *state5) GetState() interface{} { } func (s *state5) ActorKey() string { - return actors.MinerKey + return manifest.MinerKey } func (s *state5) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/miner/state.v6.go b/venus-shared/actors/builtin/miner/state.v6.go index 5d16be16f1..62978950c0 100644 --- a/venus-shared/actors/builtin/miner/state.v6.go +++ b/venus-shared/actors/builtin/miner/state.v6.go @@ -15,6 +15,7 @@ import ( cbg "github.com/whyrusleeping/cbor-gen" actorstypes "github.com/filecoin-project/go-state-types/actors" + "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" @@ -92,6 +93,7 @@ func (s *state6) PreCommitDeposits() (abi.TokenAmount, error) { return s.State.PreCommitDeposits, nil } +// Returns nil, nil if sector is not found func (s *state6) GetSector(num abi.SectorNumber) (*SectorOnChainInfo, error) { info, ok, err := s.State.GetSector(s.store, num) if !ok || err != nil { @@ -567,7 +569,7 @@ func (s *state6) GetState() interface{} { } func (s *state6) ActorKey() string { - return actors.MinerKey + return manifest.MinerKey } func (s *state6) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/miner/state.v7.go b/venus-shared/actors/builtin/miner/state.v7.go index 8b8f6e8961..60cfd8fa78 100644 --- a/venus-shared/actors/builtin/miner/state.v7.go +++ b/venus-shared/actors/builtin/miner/state.v7.go @@ -15,6 +15,7 @@ import ( cbg "github.com/whyrusleeping/cbor-gen" actorstypes "github.com/filecoin-project/go-state-types/actors" + "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" @@ -92,6 +93,7 @@ func (s *state7) PreCommitDeposits() (abi.TokenAmount, error) { return s.State.PreCommitDeposits, nil } +// Returns nil, nil if sector is not found func (s *state7) GetSector(num abi.SectorNumber) (*SectorOnChainInfo, error) { info, ok, err := s.State.GetSector(s.store, num) if !ok || err != nil { @@ -568,7 +570,7 @@ func (s *state7) GetState() interface{} { } func (s *state7) ActorKey() string { - return actors.MinerKey + return manifest.MinerKey } func (s *state7) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/miner/state.v8.go b/venus-shared/actors/builtin/miner/state.v8.go index 921e26f691..cfe7fe87e0 100644 --- a/venus-shared/actors/builtin/miner/state.v8.go +++ b/venus-shared/actors/builtin/miner/state.v8.go @@ -15,6 +15,7 @@ import ( cbg "github.com/whyrusleeping/cbor-gen" actorstypes "github.com/filecoin-project/go-state-types/actors" + "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" @@ -91,6 +92,7 @@ func (s *state8) PreCommitDeposits() (abi.TokenAmount, error) { return s.State.PreCommitDeposits, nil } +// Returns nil, nil if sector is not found func (s *state8) GetSector(num abi.SectorNumber) (*SectorOnChainInfo, error) { info, ok, err := s.State.GetSector(s.store, num) if !ok || err != nil { @@ -567,7 +569,7 @@ func (s *state8) GetState() interface{} { } func (s *state8) ActorKey() string { - return actors.MinerKey + return manifest.MinerKey } func (s *state8) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/miner/state.v9.go b/venus-shared/actors/builtin/miner/state.v9.go index 330ae6a2c9..68be53d2dd 100644 --- a/venus-shared/actors/builtin/miner/state.v9.go +++ b/venus-shared/actors/builtin/miner/state.v9.go @@ -15,6 +15,7 @@ import ( cbg "github.com/whyrusleeping/cbor-gen" actorstypes "github.com/filecoin-project/go-state-types/actors" + "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" @@ -91,6 +92,7 @@ func (s *state9) PreCommitDeposits() (abi.TokenAmount, error) { return s.State.PreCommitDeposits, nil } +// Returns nil, nil if sector is not found func (s *state9) GetSector(num abi.SectorNumber) (*SectorOnChainInfo, error) { info, ok, err := s.State.GetSector(s.store, num) if !ok || err != nil { @@ -573,7 +575,7 @@ func (s *state9) GetState() interface{} { } func (s *state9) ActorKey() string { - return actors.MinerKey + return manifest.MinerKey } func (s *state9) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/multisig/actor.go b/venus-shared/actors/builtin/multisig/actor.go index 018398c3d2..96f9108dd6 100644 --- a/venus-shared/actors/builtin/multisig/actor.go +++ b/venus-shared/actors/builtin/multisig/actor.go @@ -32,6 +32,7 @@ import ( builtin7 "github.com/filecoin-project/specs-actors/v7/actors/builtin" builtintypes "github.com/filecoin-project/go-state-types/builtin" + "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" @@ -40,7 +41,7 @@ import ( func Load(store adt.Store, act *types.Actor) (State, error) { if name, av, ok := actors.GetActorMetaByCode(act.Code); ok { - if name != actors.MultisigKey { + if name != manifest.MultisigKey { return nil, fmt.Errorf("actor code is not multisig: %s", name) } diff --git a/venus-shared/actors/builtin/multisig/actor.go.template b/venus-shared/actors/builtin/multisig/actor.go.template index ca9e84a00f..05e39568e8 100644 --- a/venus-shared/actors/builtin/multisig/actor.go.template +++ b/venus-shared/actors/builtin/multisig/actor.go.template @@ -22,6 +22,7 @@ import ( {{end}} builtintypes "github.com/filecoin-project/go-state-types/builtin" + "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" @@ -30,7 +31,7 @@ import ( func Load(store adt.Store, act *types.Actor) (State, error) { if name, av, ok := actors.GetActorMetaByCode(act.Code); ok { - if name != actors.MultisigKey { + if name != manifest.MultisigKey { return nil, fmt.Errorf("actor code is not multisig: %s", name) } diff --git a/venus-shared/actors/builtin/multisig/message.sep.go.template b/venus-shared/actors/builtin/multisig/message.sep.go.template index c709234b01..3aa0b5f407 100644 --- a/venus-shared/actors/builtin/multisig/message.sep.go.template +++ b/venus-shared/actors/builtin/multisig/message.sep.go.template @@ -16,6 +16,7 @@ import ( actorstypes "github.com/filecoin-project/go-state-types/actors" multisig{{.v}} "github.com/filecoin-project/go-state-types/builtin{{.import}}multisig" init{{.latestVersion}} "github.com/filecoin-project/go-state-types/builtin/v{{.latestVersion}}/init" + "github.com/filecoin-project/go-state-types/manifest" {{end}} builtintypes "github.com/filecoin-project/go-state-types/builtin" @@ -70,7 +71,7 @@ func (m message{{.v}}) Create( ConstructorParams: enc, } {{else}} - code, ok := actors.GetActorCodeID(actorstypes.Version{{.v}}, actors.MultisigKey) + code, ok := actors.GetActorCodeID(actorstypes.Version{{.v}}, manifest.MultisigKey) if !ok { return nil, fmt.Errorf("failed to get multisig code ID") } diff --git a/venus-shared/actors/builtin/multisig/message.v10.go b/venus-shared/actors/builtin/multisig/message.v10.go index 37e92f369a..86ec22a01c 100644 --- a/venus-shared/actors/builtin/multisig/message.v10.go +++ b/venus-shared/actors/builtin/multisig/message.v10.go @@ -11,6 +11,7 @@ import ( actorstypes "github.com/filecoin-project/go-state-types/actors" init10 "github.com/filecoin-project/go-state-types/builtin/v10/init" multisig10 "github.com/filecoin-project/go-state-types/builtin/v10/multisig" + "github.com/filecoin-project/go-state-types/manifest" builtintypes "github.com/filecoin-project/go-state-types/builtin" "github.com/filecoin-project/venus/venus-shared/actors" @@ -53,7 +54,7 @@ func (m message10) Create( return nil, actErr } - code, ok := actors.GetActorCodeID(actorstypes.Version10, actors.MultisigKey) + code, ok := actors.GetActorCodeID(actorstypes.Version10, manifest.MultisigKey) if !ok { return nil, fmt.Errorf("failed to get multisig code ID") } diff --git a/venus-shared/actors/builtin/multisig/message.v8.go b/venus-shared/actors/builtin/multisig/message.v8.go index 407db58e63..51f33e8277 100644 --- a/venus-shared/actors/builtin/multisig/message.v8.go +++ b/venus-shared/actors/builtin/multisig/message.v8.go @@ -11,6 +11,7 @@ import ( actorstypes "github.com/filecoin-project/go-state-types/actors" init10 "github.com/filecoin-project/go-state-types/builtin/v10/init" multisig8 "github.com/filecoin-project/go-state-types/builtin/v8/multisig" + "github.com/filecoin-project/go-state-types/manifest" builtintypes "github.com/filecoin-project/go-state-types/builtin" "github.com/filecoin-project/venus/venus-shared/actors" @@ -53,7 +54,7 @@ func (m message8) Create( return nil, actErr } - code, ok := actors.GetActorCodeID(actorstypes.Version8, actors.MultisigKey) + code, ok := actors.GetActorCodeID(actorstypes.Version8, manifest.MultisigKey) if !ok { return nil, fmt.Errorf("failed to get multisig code ID") } diff --git a/venus-shared/actors/builtin/multisig/message.v9.go b/venus-shared/actors/builtin/multisig/message.v9.go index 0bbf42899e..e33edcbf3e 100644 --- a/venus-shared/actors/builtin/multisig/message.v9.go +++ b/venus-shared/actors/builtin/multisig/message.v9.go @@ -11,6 +11,7 @@ import ( actorstypes "github.com/filecoin-project/go-state-types/actors" init10 "github.com/filecoin-project/go-state-types/builtin/v10/init" multisig9 "github.com/filecoin-project/go-state-types/builtin/v9/multisig" + "github.com/filecoin-project/go-state-types/manifest" builtintypes "github.com/filecoin-project/go-state-types/builtin" "github.com/filecoin-project/venus/venus-shared/actors" @@ -53,7 +54,7 @@ func (m message9) Create( return nil, actErr } - code, ok := actors.GetActorCodeID(actorstypes.Version9, actors.MultisigKey) + code, ok := actors.GetActorCodeID(actorstypes.Version9, manifest.MultisigKey) if !ok { return nil, fmt.Errorf("failed to get multisig code ID") } diff --git a/venus-shared/actors/builtin/multisig/state.sep.go.template b/venus-shared/actors/builtin/multisig/state.sep.go.template index 051910822b..8c0b7a529f 100644 --- a/venus-shared/actors/builtin/multisig/state.sep.go.template +++ b/venus-shared/actors/builtin/multisig/state.sep.go.template @@ -16,6 +16,7 @@ import ( "github.com/filecoin-project/venus/venus-shared/actors/adt" "github.com/filecoin-project/venus/venus-shared/actors" + "github.com/filecoin-project/go-state-types/manifest" {{if (le .v 7)}} {{if (ge .v 3)}} @@ -137,7 +138,7 @@ func (s *state{{.v}}) GetState() interface{} { } func (s *state{{.v}}) ActorKey() string { - return actors.MultisigKey + return manifest.MultisigKey } func (s *state{{.v}}) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/multisig/state.v0.go b/venus-shared/actors/builtin/multisig/state.v0.go index e2e2395d98..12e3d79473 100644 --- a/venus-shared/actors/builtin/multisig/state.v0.go +++ b/venus-shared/actors/builtin/multisig/state.v0.go @@ -14,6 +14,7 @@ import ( "github.com/ipfs/go-cid" cbg "github.com/whyrusleeping/cbor-gen" + "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" @@ -121,7 +122,7 @@ func (s *state0) GetState() interface{} { } func (s *state0) ActorKey() string { - return actors.MultisigKey + return manifest.MultisigKey } func (s *state0) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/multisig/state.v10.go b/venus-shared/actors/builtin/multisig/state.v10.go index 750d2cd72d..70f7ea18e7 100644 --- a/venus-shared/actors/builtin/multisig/state.v10.go +++ b/venus-shared/actors/builtin/multisig/state.v10.go @@ -14,6 +14,7 @@ import ( "github.com/ipfs/go-cid" cbg "github.com/whyrusleeping/cbor-gen" + "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" @@ -122,7 +123,7 @@ func (s *state10) GetState() interface{} { } func (s *state10) ActorKey() string { - return actors.MultisigKey + return manifest.MultisigKey } func (s *state10) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/multisig/state.v2.go b/venus-shared/actors/builtin/multisig/state.v2.go index 718927cf40..59c3f715cd 100644 --- a/venus-shared/actors/builtin/multisig/state.v2.go +++ b/venus-shared/actors/builtin/multisig/state.v2.go @@ -14,6 +14,7 @@ import ( "github.com/ipfs/go-cid" cbg "github.com/whyrusleeping/cbor-gen" + "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" @@ -121,7 +122,7 @@ func (s *state2) GetState() interface{} { } func (s *state2) ActorKey() string { - return actors.MultisigKey + return manifest.MultisigKey } func (s *state2) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/multisig/state.v3.go b/venus-shared/actors/builtin/multisig/state.v3.go index a970a517b2..481e5feb43 100644 --- a/venus-shared/actors/builtin/multisig/state.v3.go +++ b/venus-shared/actors/builtin/multisig/state.v3.go @@ -14,6 +14,7 @@ import ( "github.com/ipfs/go-cid" cbg "github.com/whyrusleeping/cbor-gen" + "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" @@ -123,7 +124,7 @@ func (s *state3) GetState() interface{} { } func (s *state3) ActorKey() string { - return actors.MultisigKey + return manifest.MultisigKey } func (s *state3) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/multisig/state.v4.go b/venus-shared/actors/builtin/multisig/state.v4.go index 98d371d109..7cb3b9e381 100644 --- a/venus-shared/actors/builtin/multisig/state.v4.go +++ b/venus-shared/actors/builtin/multisig/state.v4.go @@ -14,6 +14,7 @@ import ( "github.com/ipfs/go-cid" cbg "github.com/whyrusleeping/cbor-gen" + "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" @@ -123,7 +124,7 @@ func (s *state4) GetState() interface{} { } func (s *state4) ActorKey() string { - return actors.MultisigKey + return manifest.MultisigKey } func (s *state4) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/multisig/state.v5.go b/venus-shared/actors/builtin/multisig/state.v5.go index 6078eaaf85..abf2c871d6 100644 --- a/venus-shared/actors/builtin/multisig/state.v5.go +++ b/venus-shared/actors/builtin/multisig/state.v5.go @@ -14,6 +14,7 @@ import ( "github.com/ipfs/go-cid" cbg "github.com/whyrusleeping/cbor-gen" + "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" @@ -123,7 +124,7 @@ func (s *state5) GetState() interface{} { } func (s *state5) ActorKey() string { - return actors.MultisigKey + return manifest.MultisigKey } func (s *state5) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/multisig/state.v6.go b/venus-shared/actors/builtin/multisig/state.v6.go index 6643e7da02..4ec43882d1 100644 --- a/venus-shared/actors/builtin/multisig/state.v6.go +++ b/venus-shared/actors/builtin/multisig/state.v6.go @@ -14,6 +14,7 @@ import ( "github.com/ipfs/go-cid" cbg "github.com/whyrusleeping/cbor-gen" + "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" @@ -123,7 +124,7 @@ func (s *state6) GetState() interface{} { } func (s *state6) ActorKey() string { - return actors.MultisigKey + return manifest.MultisigKey } func (s *state6) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/multisig/state.v7.go b/venus-shared/actors/builtin/multisig/state.v7.go index 6b885c6402..3aaaaccad0 100644 --- a/venus-shared/actors/builtin/multisig/state.v7.go +++ b/venus-shared/actors/builtin/multisig/state.v7.go @@ -14,6 +14,7 @@ import ( "github.com/ipfs/go-cid" cbg "github.com/whyrusleeping/cbor-gen" + "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" @@ -123,7 +124,7 @@ func (s *state7) GetState() interface{} { } func (s *state7) ActorKey() string { - return actors.MultisigKey + return manifest.MultisigKey } func (s *state7) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/multisig/state.v8.go b/venus-shared/actors/builtin/multisig/state.v8.go index 2fa5d1912a..9646ed4e75 100644 --- a/venus-shared/actors/builtin/multisig/state.v8.go +++ b/venus-shared/actors/builtin/multisig/state.v8.go @@ -14,6 +14,7 @@ import ( "github.com/ipfs/go-cid" cbg "github.com/whyrusleeping/cbor-gen" + "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" @@ -122,7 +123,7 @@ func (s *state8) GetState() interface{} { } func (s *state8) ActorKey() string { - return actors.MultisigKey + return manifest.MultisigKey } func (s *state8) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/multisig/state.v9.go b/venus-shared/actors/builtin/multisig/state.v9.go index de3426a275..0fd9d6ec1f 100644 --- a/venus-shared/actors/builtin/multisig/state.v9.go +++ b/venus-shared/actors/builtin/multisig/state.v9.go @@ -14,6 +14,7 @@ import ( "github.com/ipfs/go-cid" cbg "github.com/whyrusleeping/cbor-gen" + "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" @@ -122,7 +123,7 @@ func (s *state9) GetState() interface{} { } func (s *state9) ActorKey() string { - return actors.MultisigKey + return manifest.MultisigKey } func (s *state9) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/paych/actor.go b/venus-shared/actors/builtin/paych/actor.go index b490d816f5..6aa28b7092 100644 --- a/venus-shared/actors/builtin/paych/actor.go +++ b/venus-shared/actors/builtin/paych/actor.go @@ -13,6 +13,7 @@ import ( "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" "github.com/filecoin-project/go-state-types/cbor" + "github.com/filecoin-project/go-state-types/manifest" ipldcbor "github.com/ipfs/go-ipld-cbor" paychtypes "github.com/filecoin-project/go-state-types/builtin/v8/paych" @@ -40,7 +41,7 @@ import ( // Load returns an abstract copy of payment channel state, irregardless of actor version func Load(store adt.Store, act *types.Actor) (State, error) { if name, av, ok := actors.GetActorMetaByCode(act.Code); ok { - if name != actors.PaychKey { + if name != manifest.PaychKey { return nil, fmt.Errorf("actor code is not paych: %s", name) } diff --git a/venus-shared/actors/builtin/paych/actor.go.template b/venus-shared/actors/builtin/paych/actor.go.template index b8a4025079..32dfea5668 100644 --- a/venus-shared/actors/builtin/paych/actor.go.template +++ b/venus-shared/actors/builtin/paych/actor.go.template @@ -14,6 +14,7 @@ import ( "github.com/filecoin-project/go-state-types/big" "github.com/filecoin-project/go-state-types/cbor" ipldcbor "github.com/ipfs/go-ipld-cbor" + "github.com/filecoin-project/go-state-types/manifest" paych0 "github.com/filecoin-project/specs-actors/actors/builtin/paych" paychtypes "github.com/filecoin-project/go-state-types/builtin/v8/paych" @@ -31,7 +32,7 @@ import ( // Load returns an abstract copy of payment channel state, irregardless of actor version func Load(store adt.Store, act *types.Actor) (State, error) { if name, av, ok := actors.GetActorMetaByCode(act.Code); ok { - if name != actors.PaychKey { + if name != manifest.PaychKey { return nil, fmt.Errorf("actor code is not paych: %s", name) } diff --git a/venus-shared/actors/builtin/paych/mock/mock.go b/venus-shared/actors/builtin/paych/mock/mock.go index e32215ff8d..8bc530862a 100644 --- a/venus-shared/actors/builtin/paych/mock/mock.go +++ b/venus-shared/actors/builtin/paych/mock/mock.go @@ -3,13 +3,14 @@ package mock import ( "io" + "github.com/ipfs/go-cid" + "github.com/filecoin-project/go-address" "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/ipfs/go-cid" + "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/paych" ) @@ -26,7 +27,7 @@ func (ms *mockState) Code() cid.Cid { } func (ms *mockState) ActorKey() string { - return actors.PaychKey + return manifest.PaychKey } func (ms *mockState) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/paych/state.sep.go.template b/venus-shared/actors/builtin/paych/state.sep.go.template index 76398aba9e..3e8353bad0 100644 --- a/venus-shared/actors/builtin/paych/state.sep.go.template +++ b/venus-shared/actors/builtin/paych/state.sep.go.template @@ -13,6 +13,7 @@ import ( "github.com/filecoin-project/venus/venus-shared/actors/adt" "github.com/filecoin-project/venus/venus-shared/actors" + "github.com/filecoin-project/go-state-types/manifest" {{if (le .v 7)}} paych{{.v}} "github.com/filecoin-project/specs-actors{{.import}}actors/builtin/paych" @@ -124,7 +125,7 @@ func (ls *laneState{{.v}}) Nonce() (uint64, error) { } func (s *state{{.v}}) ActorKey() string { - return actors.PaychKey + return manifest.PaychKey } func (s *state{{.v}}) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/paych/state.v0.go b/venus-shared/actors/builtin/paych/state.v0.go index 69fa0f0cf1..c322d74a4d 100644 --- a/venus-shared/actors/builtin/paych/state.v0.go +++ b/venus-shared/actors/builtin/paych/state.v0.go @@ -12,6 +12,7 @@ import ( "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" + "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" @@ -120,7 +121,7 @@ func (ls *laneState0) Nonce() (uint64, error) { } func (s *state0) ActorKey() string { - return actors.PaychKey + return manifest.PaychKey } func (s *state0) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/paych/state.v10.go b/venus-shared/actors/builtin/paych/state.v10.go index a02b4a4bd0..f6bab6d037 100644 --- a/venus-shared/actors/builtin/paych/state.v10.go +++ b/venus-shared/actors/builtin/paych/state.v10.go @@ -12,6 +12,7 @@ import ( "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" + "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" @@ -120,7 +121,7 @@ func (ls *laneState10) Nonce() (uint64, error) { } func (s *state10) ActorKey() string { - return actors.PaychKey + return manifest.PaychKey } func (s *state10) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/paych/state.v2.go b/venus-shared/actors/builtin/paych/state.v2.go index ba47de5e45..df2005db0e 100644 --- a/venus-shared/actors/builtin/paych/state.v2.go +++ b/venus-shared/actors/builtin/paych/state.v2.go @@ -12,6 +12,7 @@ import ( "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" + "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" @@ -120,7 +121,7 @@ func (ls *laneState2) Nonce() (uint64, error) { } func (s *state2) ActorKey() string { - return actors.PaychKey + return manifest.PaychKey } func (s *state2) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/paych/state.v3.go b/venus-shared/actors/builtin/paych/state.v3.go index 9e6f59f271..45424b80bb 100644 --- a/venus-shared/actors/builtin/paych/state.v3.go +++ b/venus-shared/actors/builtin/paych/state.v3.go @@ -12,6 +12,7 @@ import ( "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" + "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" @@ -120,7 +121,7 @@ func (ls *laneState3) Nonce() (uint64, error) { } func (s *state3) ActorKey() string { - return actors.PaychKey + return manifest.PaychKey } func (s *state3) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/paych/state.v4.go b/venus-shared/actors/builtin/paych/state.v4.go index 576aea31bf..bd82484e47 100644 --- a/venus-shared/actors/builtin/paych/state.v4.go +++ b/venus-shared/actors/builtin/paych/state.v4.go @@ -12,6 +12,7 @@ import ( "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" + "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" @@ -120,7 +121,7 @@ func (ls *laneState4) Nonce() (uint64, error) { } func (s *state4) ActorKey() string { - return actors.PaychKey + return manifest.PaychKey } func (s *state4) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/paych/state.v5.go b/venus-shared/actors/builtin/paych/state.v5.go index 78bd0c0a10..8b47eb08de 100644 --- a/venus-shared/actors/builtin/paych/state.v5.go +++ b/venus-shared/actors/builtin/paych/state.v5.go @@ -12,6 +12,7 @@ import ( "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" + "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" @@ -120,7 +121,7 @@ func (ls *laneState5) Nonce() (uint64, error) { } func (s *state5) ActorKey() string { - return actors.PaychKey + return manifest.PaychKey } func (s *state5) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/paych/state.v6.go b/venus-shared/actors/builtin/paych/state.v6.go index 2f60034933..348b32c89c 100644 --- a/venus-shared/actors/builtin/paych/state.v6.go +++ b/venus-shared/actors/builtin/paych/state.v6.go @@ -12,6 +12,7 @@ import ( "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" + "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" @@ -120,7 +121,7 @@ func (ls *laneState6) Nonce() (uint64, error) { } func (s *state6) ActorKey() string { - return actors.PaychKey + return manifest.PaychKey } func (s *state6) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/paych/state.v7.go b/venus-shared/actors/builtin/paych/state.v7.go index 5f950b6056..33691c23c7 100644 --- a/venus-shared/actors/builtin/paych/state.v7.go +++ b/venus-shared/actors/builtin/paych/state.v7.go @@ -12,6 +12,7 @@ import ( "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" + "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" @@ -120,7 +121,7 @@ func (ls *laneState7) Nonce() (uint64, error) { } func (s *state7) ActorKey() string { - return actors.PaychKey + return manifest.PaychKey } func (s *state7) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/paych/state.v8.go b/venus-shared/actors/builtin/paych/state.v8.go index 089ef8427e..f347df3861 100644 --- a/venus-shared/actors/builtin/paych/state.v8.go +++ b/venus-shared/actors/builtin/paych/state.v8.go @@ -12,6 +12,7 @@ import ( "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" + "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" @@ -120,7 +121,7 @@ func (ls *laneState8) Nonce() (uint64, error) { } func (s *state8) ActorKey() string { - return actors.PaychKey + return manifest.PaychKey } func (s *state8) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/paych/state.v9.go b/venus-shared/actors/builtin/paych/state.v9.go index 79e5a58a55..b69c6590cf 100644 --- a/venus-shared/actors/builtin/paych/state.v9.go +++ b/venus-shared/actors/builtin/paych/state.v9.go @@ -12,6 +12,7 @@ import ( "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" + "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" @@ -120,7 +121,7 @@ func (ls *laneState9) Nonce() (uint64, error) { } func (s *state9) ActorKey() string { - return actors.PaychKey + return manifest.PaychKey } func (s *state9) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/power/actor.go b/venus-shared/actors/builtin/power/actor.go index c5de095aa0..a56d935060 100644 --- a/venus-shared/actors/builtin/power/actor.go +++ b/venus-shared/actors/builtin/power/actor.go @@ -15,6 +15,7 @@ import ( "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/cbor" + "github.com/filecoin-project/go-state-types/manifest" "github.com/filecoin-project/venus/venus-shared/actors/adt" "github.com/filecoin-project/venus/venus-shared/actors/builtin" types "github.com/filecoin-project/venus/venus-shared/internal" @@ -43,7 +44,7 @@ var ( func Load(store adt.Store, act *types.Actor) (State, error) { if name, av, ok := actors.GetActorMetaByCode(act.Code); ok { - if name != actors.PowerKey { + if name != manifest.PowerKey { return nil, fmt.Errorf("actor code is not power: %s", name) } diff --git a/venus-shared/actors/builtin/power/actor.go.template b/venus-shared/actors/builtin/power/actor.go.template index ae035371aa..347a53c845 100644 --- a/venus-shared/actors/builtin/power/actor.go.template +++ b/venus-shared/actors/builtin/power/actor.go.template @@ -17,6 +17,7 @@ import ( "github.com/filecoin-project/venus/venus-shared/actors/adt" "github.com/filecoin-project/venus/venus-shared/actors/builtin" types "github.com/filecoin-project/venus/venus-shared/internal" + "github.com/filecoin-project/go-state-types/manifest" {{range .versions}} {{if (le . 7)}} @@ -33,7 +34,7 @@ var ( func Load(store adt.Store, act *types.Actor) (State, error) { if name, av, ok := actors.GetActorMetaByCode(act.Code); ok { - if name != actors.PowerKey { + if name != manifest.PowerKey { return nil, fmt.Errorf("actor code is not power: %s", name) } diff --git a/venus-shared/actors/builtin/power/state.sep.go.template b/venus-shared/actors/builtin/power/state.sep.go.template index 813b5a0653..723a1ee83f 100644 --- a/venus-shared/actors/builtin/power/state.sep.go.template +++ b/venus-shared/actors/builtin/power/state.sep.go.template @@ -15,6 +15,7 @@ import ( "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" + "github.com/filecoin-project/go-state-types/manifest" {{if (le .v 7)}} {{if (ge .v 3)}} @@ -212,7 +213,7 @@ func fromV{{.v}}Claim(v{{.v}} power{{.v}}.Claim) Claim { } func (s *state{{.v}}) ActorKey() string { - return actors.PowerKey + return manifest.PowerKey } func (s *state{{.v}}) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/power/state.v0.go b/venus-shared/actors/builtin/power/state.v0.go index e18e70191b..9a9cc1ac5e 100644 --- a/venus-shared/actors/builtin/power/state.v0.go +++ b/venus-shared/actors/builtin/power/state.v0.go @@ -13,6 +13,7 @@ import ( "github.com/ipfs/go-cid" cbg "github.com/whyrusleeping/cbor-gen" + "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" @@ -196,7 +197,7 @@ func fromV0Claim(v0 power0.Claim) Claim { } func (s *state0) ActorKey() string { - return actors.PowerKey + return manifest.PowerKey } func (s *state0) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/power/state.v10.go b/venus-shared/actors/builtin/power/state.v10.go index 6bfebe4edb..50717d2cc9 100644 --- a/venus-shared/actors/builtin/power/state.v10.go +++ b/venus-shared/actors/builtin/power/state.v10.go @@ -13,6 +13,7 @@ import ( "github.com/ipfs/go-cid" cbg "github.com/whyrusleeping/cbor-gen" + "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" @@ -192,7 +193,7 @@ func fromV10Claim(v10 power10.Claim) Claim { } func (s *state10) ActorKey() string { - return actors.PowerKey + return manifest.PowerKey } func (s *state10) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/power/state.v2.go b/venus-shared/actors/builtin/power/state.v2.go index 62327faf1f..ea77dd0074 100644 --- a/venus-shared/actors/builtin/power/state.v2.go +++ b/venus-shared/actors/builtin/power/state.v2.go @@ -13,6 +13,7 @@ import ( "github.com/ipfs/go-cid" cbg "github.com/whyrusleeping/cbor-gen" + "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" @@ -196,7 +197,7 @@ func fromV2Claim(v2 power2.Claim) Claim { } func (s *state2) ActorKey() string { - return actors.PowerKey + return manifest.PowerKey } func (s *state2) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/power/state.v3.go b/venus-shared/actors/builtin/power/state.v3.go index b92b1ca0a4..07bfd91759 100644 --- a/venus-shared/actors/builtin/power/state.v3.go +++ b/venus-shared/actors/builtin/power/state.v3.go @@ -13,6 +13,7 @@ import ( "github.com/ipfs/go-cid" cbg "github.com/whyrusleeping/cbor-gen" + "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" @@ -193,7 +194,7 @@ func fromV3Claim(v3 power3.Claim) Claim { } func (s *state3) ActorKey() string { - return actors.PowerKey + return manifest.PowerKey } func (s *state3) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/power/state.v4.go b/venus-shared/actors/builtin/power/state.v4.go index 85f677aff3..daa3967528 100644 --- a/venus-shared/actors/builtin/power/state.v4.go +++ b/venus-shared/actors/builtin/power/state.v4.go @@ -13,6 +13,7 @@ import ( "github.com/ipfs/go-cid" cbg "github.com/whyrusleeping/cbor-gen" + "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" @@ -193,7 +194,7 @@ func fromV4Claim(v4 power4.Claim) Claim { } func (s *state4) ActorKey() string { - return actors.PowerKey + return manifest.PowerKey } func (s *state4) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/power/state.v5.go b/venus-shared/actors/builtin/power/state.v5.go index 4fc4282c87..19256b97fc 100644 --- a/venus-shared/actors/builtin/power/state.v5.go +++ b/venus-shared/actors/builtin/power/state.v5.go @@ -13,6 +13,7 @@ import ( "github.com/ipfs/go-cid" cbg "github.com/whyrusleeping/cbor-gen" + "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" @@ -193,7 +194,7 @@ func fromV5Claim(v5 power5.Claim) Claim { } func (s *state5) ActorKey() string { - return actors.PowerKey + return manifest.PowerKey } func (s *state5) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/power/state.v6.go b/venus-shared/actors/builtin/power/state.v6.go index 59aefa7854..fee1596cae 100644 --- a/venus-shared/actors/builtin/power/state.v6.go +++ b/venus-shared/actors/builtin/power/state.v6.go @@ -13,6 +13,7 @@ import ( "github.com/ipfs/go-cid" cbg "github.com/whyrusleeping/cbor-gen" + "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" @@ -193,7 +194,7 @@ func fromV6Claim(v6 power6.Claim) Claim { } func (s *state6) ActorKey() string { - return actors.PowerKey + return manifest.PowerKey } func (s *state6) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/power/state.v7.go b/venus-shared/actors/builtin/power/state.v7.go index 0f938bf991..add7a59bf6 100644 --- a/venus-shared/actors/builtin/power/state.v7.go +++ b/venus-shared/actors/builtin/power/state.v7.go @@ -13,6 +13,7 @@ import ( "github.com/ipfs/go-cid" cbg "github.com/whyrusleeping/cbor-gen" + "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" @@ -193,7 +194,7 @@ func fromV7Claim(v7 power7.Claim) Claim { } func (s *state7) ActorKey() string { - return actors.PowerKey + return manifest.PowerKey } func (s *state7) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/power/state.v8.go b/venus-shared/actors/builtin/power/state.v8.go index ff25bf6b0e..53429a270b 100644 --- a/venus-shared/actors/builtin/power/state.v8.go +++ b/venus-shared/actors/builtin/power/state.v8.go @@ -13,6 +13,7 @@ import ( "github.com/ipfs/go-cid" cbg "github.com/whyrusleeping/cbor-gen" + "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" @@ -192,7 +193,7 @@ func fromV8Claim(v8 power8.Claim) Claim { } func (s *state8) ActorKey() string { - return actors.PowerKey + return manifest.PowerKey } func (s *state8) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/power/state.v9.go b/venus-shared/actors/builtin/power/state.v9.go index 0d60c87606..12389acaa6 100644 --- a/venus-shared/actors/builtin/power/state.v9.go +++ b/venus-shared/actors/builtin/power/state.v9.go @@ -13,6 +13,7 @@ import ( "github.com/ipfs/go-cid" cbg "github.com/whyrusleeping/cbor-gen" + "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" @@ -192,7 +193,7 @@ func fromV9Claim(v9 power9.Claim) Claim { } func (s *state9) ActorKey() string { - return actors.PowerKey + return manifest.PowerKey } func (s *state9) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/registry.go b/venus-shared/actors/builtin/registry.go index e34ed993fb..6a4bd41dc0 100644 --- a/venus-shared/actors/builtin/registry.go +++ b/venus-shared/actors/builtin/registry.go @@ -52,7 +52,9 @@ import ( datacap10 "github.com/filecoin-project/go-state-types/builtin/v10/datacap" + "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/cbor" + "github.com/filecoin-project/go-state-types/manifest" rtt "github.com/filecoin-project/go-state-types/rt" "github.com/filecoin-project/venus/venus-shared/actors" ) @@ -60,14 +62,14 @@ import ( type RegistryEntry struct { state cbor.Er code cid.Cid - methods map[uint64]builtin.MethodMeta + methods map[abi.MethodNum]builtin.MethodMeta } func (r RegistryEntry) State() cbor.Er { return r.state } -func (r RegistryEntry) Exports() map[uint64]builtin.MethodMeta { +func (r RegistryEntry) Exports() map[abi.MethodNum]builtin.MethodMeta { return r.methods } @@ -79,10 +81,10 @@ func MakeRegistryLegacy(actors []rtt.VMActor) []RegistryEntry { registry := make([]RegistryEntry, 0) for _, actor := range actors { - methodMap := make(map[uint64]builtin.MethodMeta) + methodMap := make(map[abi.MethodNum]builtin.MethodMeta) for methodNum, method := range actor.Exports() { if method != nil { - methodMap[uint64(methodNum)] = makeMethodMeta(method) + methodMap[abi.MethodNum(methodNum)] = makeMethodMeta(method) } } registry = append(registry, RegistryEntry{ @@ -125,67 +127,67 @@ func MakeRegistry(av actorstypes.Version) []RegistryEntry { case actorstypes.Version8: for key, codeID := range codeIDs { switch key { - case actors.AccountKey: + case manifest.AccountKey: registry = append(registry, RegistryEntry{ code: codeID, methods: account8.Methods, state: new(account8.State), }) - case actors.CronKey: + case manifest.CronKey: registry = append(registry, RegistryEntry{ code: codeID, methods: cron8.Methods, state: new(cron8.State), }) - case actors.InitKey: + case manifest.InitKey: registry = append(registry, RegistryEntry{ code: codeID, methods: _init8.Methods, state: new(_init8.State), }) - case actors.MarketKey: + case manifest.MarketKey: registry = append(registry, RegistryEntry{ code: codeID, methods: market8.Methods, state: new(market8.State), }) - case actors.MinerKey: + case manifest.MinerKey: registry = append(registry, RegistryEntry{ code: codeID, methods: miner8.Methods, state: new(miner8.State), }) - case actors.MultisigKey: + case manifest.MultisigKey: registry = append(registry, RegistryEntry{ code: codeID, methods: multisig8.Methods, state: new(multisig8.State), }) - case actors.PaychKey: + case manifest.PaychKey: registry = append(registry, RegistryEntry{ code: codeID, methods: paych8.Methods, state: new(paych8.State), }) - case actors.PowerKey: + case manifest.PowerKey: registry = append(registry, RegistryEntry{ code: codeID, methods: power8.Methods, state: new(power8.State), }) - case actors.RewardKey: + case manifest.RewardKey: registry = append(registry, RegistryEntry{ code: codeID, methods: reward8.Methods, state: new(reward8.State), }) - case actors.SystemKey: + case manifest.SystemKey: registry = append(registry, RegistryEntry{ code: codeID, methods: system8.Methods, state: new(system8.State), }) - case actors.VerifregKey: + case manifest.VerifregKey: registry = append(registry, RegistryEntry{ code: codeID, methods: verifreg8.Methods, @@ -198,73 +200,73 @@ func MakeRegistry(av actorstypes.Version) []RegistryEntry { case actorstypes.Version9: for key, codeID := range codeIDs { switch key { - case actors.AccountKey: + case manifest.AccountKey: registry = append(registry, RegistryEntry{ code: codeID, methods: account9.Methods, state: new(account9.State), }) - case actors.CronKey: + case manifest.CronKey: registry = append(registry, RegistryEntry{ code: codeID, methods: cron9.Methods, state: new(cron9.State), }) - case actors.InitKey: + case manifest.InitKey: registry = append(registry, RegistryEntry{ code: codeID, methods: _init9.Methods, state: new(_init9.State), }) - case actors.MarketKey: + case manifest.MarketKey: registry = append(registry, RegistryEntry{ code: codeID, methods: market9.Methods, state: new(market9.State), }) - case actors.MinerKey: + case manifest.MinerKey: registry = append(registry, RegistryEntry{ code: codeID, methods: miner9.Methods, state: new(miner9.State), }) - case actors.MultisigKey: + case manifest.MultisigKey: registry = append(registry, RegistryEntry{ code: codeID, methods: multisig9.Methods, state: new(multisig9.State), }) - case actors.PaychKey: + case manifest.PaychKey: registry = append(registry, RegistryEntry{ code: codeID, methods: paych9.Methods, state: new(paych9.State), }) - case actors.PowerKey: + case manifest.PowerKey: registry = append(registry, RegistryEntry{ code: codeID, methods: power9.Methods, state: new(power9.State), }) - case actors.RewardKey: + case manifest.RewardKey: registry = append(registry, RegistryEntry{ code: codeID, methods: reward9.Methods, state: new(reward9.State), }) - case actors.SystemKey: + case manifest.SystemKey: registry = append(registry, RegistryEntry{ code: codeID, methods: system9.Methods, state: new(system9.State), }) - case actors.VerifregKey: + case manifest.VerifregKey: registry = append(registry, RegistryEntry{ code: codeID, methods: verifreg9.Methods, state: new(verifreg9.State), }) - case actors.DatacapKey: + case manifest.DatacapKey: registry = append(registry, RegistryEntry{ code: codeID, methods: datacap9.Methods, @@ -276,73 +278,73 @@ func MakeRegistry(av actorstypes.Version) []RegistryEntry { case actorstypes.Version10: for key, codeID := range codeIDs { switch key { - case actors.AccountKey: + case manifest.AccountKey: registry = append(registry, RegistryEntry{ code: codeID, methods: account10.Methods, state: new(account10.State), }) - case actors.CronKey: + case manifest.CronKey: registry = append(registry, RegistryEntry{ code: codeID, methods: cron10.Methods, state: new(cron10.State), }) - case actors.InitKey: + case manifest.InitKey: registry = append(registry, RegistryEntry{ code: codeID, methods: _init10.Methods, state: new(_init10.State), }) - case actors.MarketKey: + case manifest.MarketKey: registry = append(registry, RegistryEntry{ code: codeID, methods: market10.Methods, state: new(market10.State), }) - case actors.MinerKey: + case manifest.MinerKey: registry = append(registry, RegistryEntry{ code: codeID, methods: miner10.Methods, state: new(miner10.State), }) - case actors.MultisigKey: + case manifest.MultisigKey: registry = append(registry, RegistryEntry{ code: codeID, methods: multisig10.Methods, state: new(multisig10.State), }) - case actors.PaychKey: + case manifest.PaychKey: registry = append(registry, RegistryEntry{ code: codeID, methods: paych10.Methods, state: new(paych10.State), }) - case actors.PowerKey: + case manifest.PowerKey: registry = append(registry, RegistryEntry{ code: codeID, methods: power10.Methods, state: new(power10.State), }) - case actors.RewardKey: + case manifest.RewardKey: registry = append(registry, RegistryEntry{ code: codeID, methods: reward10.Methods, state: new(reward10.State), }) - case actors.SystemKey: + case manifest.SystemKey: registry = append(registry, RegistryEntry{ code: codeID, methods: system10.Methods, state: new(system10.State), }) - case actors.VerifregKey: + case manifest.VerifregKey: registry = append(registry, RegistryEntry{ code: codeID, methods: verifreg10.Methods, state: new(verifreg10.State), }) - case actors.DatacapKey: + case manifest.DatacapKey: registry = append(registry, RegistryEntry{ code: codeID, methods: datacap10.Methods, diff --git a/venus-shared/actors/builtin/registry.go.template b/venus-shared/actors/builtin/registry.go.template index d3ef0d2187..f1f563c714 100644 --- a/venus-shared/actors/builtin/registry.go.template +++ b/venus-shared/actors/builtin/registry.go.template @@ -31,19 +31,21 @@ import ( "github.com/filecoin-project/go-state-types/cbor" rtt "github.com/filecoin-project/go-state-types/rt" "github.com/filecoin-project/venus/venus-shared/actors" + "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/go-state-types/manifest" ) type RegistryEntry struct { state cbor.Er code cid.Cid - methods map[uint64]builtin.MethodMeta + methods map[abi.MethodNum]builtin.MethodMeta } func (r RegistryEntry) State() cbor.Er { return r.state } -func (r RegistryEntry) Exports() map[uint64]builtin.MethodMeta { +func (r RegistryEntry) Exports() map[abi.MethodNum]builtin.MethodMeta { return r.methods } @@ -55,10 +57,10 @@ func MakeRegistryLegacy(actors []rtt.VMActor) []RegistryEntry { registry := make([]RegistryEntry, 0) for _, actor := range actors { - methodMap := make(map[uint64]builtin.MethodMeta) + methodMap := make(map[abi.MethodNum]builtin.MethodMeta) for methodNum, method := range actor.Exports() { if method != nil { - methodMap[uint64(methodNum)] = makeMethodMeta(method) + methodMap[abi.MethodNum(methodNum)] = makeMethodMeta(method) } } registry = append(registry, RegistryEntry{ @@ -102,73 +104,73 @@ func MakeRegistry(av actorstypes.Version) []RegistryEntry { case actorstypes.Version{{.}}: for key, codeID := range codeIDs { switch key { - case actors.AccountKey: + case manifest.AccountKey: registry = append(registry, RegistryEntry{ code: codeID, methods: account{{.}}.Methods, state: new(account{{.}}.State), }) - case actors.CronKey: + case manifest.CronKey: registry = append(registry, RegistryEntry{ code: codeID, methods: cron{{.}}.Methods, state: new(cron{{.}}.State), }) - case actors.InitKey: + case manifest.InitKey: registry = append(registry, RegistryEntry{ code: codeID, methods: _init{{.}}.Methods, state: new(_init{{.}}.State), }) - case actors.MarketKey: + case manifest.MarketKey: registry = append(registry, RegistryEntry{ code: codeID, methods: market{{.}}.Methods, state: new(market{{.}}.State), }) - case actors.MinerKey: + case manifest.MinerKey: registry = append(registry, RegistryEntry{ code: codeID, methods: miner{{.}}.Methods, state: new(miner{{.}}.State), }) - case actors.MultisigKey: + case manifest.MultisigKey: registry = append(registry, RegistryEntry{ code: codeID, methods: multisig{{.}}.Methods, state: new(multisig{{.}}.State), }) - case actors.PaychKey: + case manifest.PaychKey: registry = append(registry, RegistryEntry{ code: codeID, methods: paych{{.}}.Methods, state: new(paych{{.}}.State), }) - case actors.PowerKey: + case manifest.PowerKey: registry = append(registry, RegistryEntry{ code: codeID, methods: power{{.}}.Methods, state: new(power{{.}}.State), }) - case actors.RewardKey: + case manifest.RewardKey: registry = append(registry, RegistryEntry{ code: codeID, methods: reward{{.}}.Methods, state: new(reward{{.}}.State), }) - case actors.SystemKey: + case manifest.SystemKey: registry = append(registry, RegistryEntry{ code: codeID, methods: system{{.}}.Methods, state: new(system{{.}}.State), }) - case actors.VerifregKey: + case manifest.VerifregKey: registry = append(registry, RegistryEntry{ code: codeID, methods: verifreg{{.}}.Methods, state: new(verifreg{{.}}.State), }) - {{if (ge . 9)}}case actors.DatacapKey: + {{if (ge . 9)}}case manifest.DatacapKey: registry = append(registry, RegistryEntry{ code: codeID, methods: datacap{{.}}.Methods, diff --git a/venus-shared/actors/builtin/reward/actor.go b/venus-shared/actors/builtin/reward/actor.go index b94dd93b88..a64317d1db 100644 --- a/venus-shared/actors/builtin/reward/actor.go +++ b/venus-shared/actors/builtin/reward/actor.go @@ -29,6 +29,7 @@ import ( builtin10 "github.com/filecoin-project/go-state-types/builtin" + "github.com/filecoin-project/go-state-types/manifest" "github.com/filecoin-project/venus/venus-shared/actors/adt" "github.com/filecoin-project/venus/venus-shared/actors/builtin" types "github.com/filecoin-project/venus/venus-shared/internal" @@ -41,7 +42,7 @@ var ( func Load(store adt.Store, act *types.Actor) (State, error) { if name, av, ok := actors.GetActorMetaByCode(act.Code); ok { - if name != actors.RewardKey { + if name != manifest.RewardKey { return nil, fmt.Errorf("actor code is not reward: %s", name) } diff --git a/venus-shared/actors/builtin/reward/actor.go.template b/venus-shared/actors/builtin/reward/actor.go.template index 2e6507f0d5..ce9b6aa3d3 100644 --- a/venus-shared/actors/builtin/reward/actor.go.template +++ b/venus-shared/actors/builtin/reward/actor.go.template @@ -21,6 +21,7 @@ import ( "github.com/filecoin-project/venus/venus-shared/actors/adt" "github.com/filecoin-project/venus/venus-shared/actors/builtin" types "github.com/filecoin-project/venus/venus-shared/internal" + "github.com/filecoin-project/go-state-types/manifest" ) var ( @@ -30,7 +31,7 @@ var ( func Load(store adt.Store, act *types.Actor) (State, error) { if name, av, ok := actors.GetActorMetaByCode(act.Code); ok { - if name != actors.RewardKey { + if name != manifest.RewardKey { return nil, fmt.Errorf("actor code is not reward: %s", name) } diff --git a/venus-shared/actors/builtin/reward/state.sep.go.template b/venus-shared/actors/builtin/reward/state.sep.go.template index e958e00202..d34fcb13db 100644 --- a/venus-shared/actors/builtin/reward/state.sep.go.template +++ b/venus-shared/actors/builtin/reward/state.sep.go.template @@ -11,6 +11,7 @@ import ( "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" + "github.com/filecoin-project/go-state-types/manifest" {{if (le .v 7)}} miner{{.v}} "github.com/filecoin-project/specs-actors{{.import}}actors/builtin/miner" @@ -124,7 +125,7 @@ func (s *state{{.v}}) GetState() interface{} { } func (s *state{{.v}}) ActorKey() string { - return actors.RewardKey + return manifest.RewardKey } func (s *state{{.v}}) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/reward/state.v0.go b/venus-shared/actors/builtin/reward/state.v0.go index d5e114ed82..92895e2401 100644 --- a/venus-shared/actors/builtin/reward/state.v0.go +++ b/venus-shared/actors/builtin/reward/state.v0.go @@ -9,6 +9,7 @@ import ( actorstypes "github.com/filecoin-project/go-state-types/actors" "github.com/ipfs/go-cid" + "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" @@ -101,7 +102,7 @@ func (s *state0) GetState() interface{} { } func (s *state0) ActorKey() string { - return actors.RewardKey + return manifest.RewardKey } func (s *state0) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/reward/state.v10.go b/venus-shared/actors/builtin/reward/state.v10.go index 0b547b5c13..66556bef4b 100644 --- a/venus-shared/actors/builtin/reward/state.v10.go +++ b/venus-shared/actors/builtin/reward/state.v10.go @@ -9,6 +9,7 @@ import ( actorstypes "github.com/filecoin-project/go-state-types/actors" "github.com/ipfs/go-cid" + "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" @@ -104,7 +105,7 @@ func (s *state10) GetState() interface{} { } func (s *state10) ActorKey() string { - return actors.RewardKey + return manifest.RewardKey } func (s *state10) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/reward/state.v2.go b/venus-shared/actors/builtin/reward/state.v2.go index e1f20a8e9f..1b1d4f05dd 100644 --- a/venus-shared/actors/builtin/reward/state.v2.go +++ b/venus-shared/actors/builtin/reward/state.v2.go @@ -9,6 +9,7 @@ import ( actorstypes "github.com/filecoin-project/go-state-types/actors" "github.com/ipfs/go-cid" + "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" @@ -104,7 +105,7 @@ func (s *state2) GetState() interface{} { } func (s *state2) ActorKey() string { - return actors.RewardKey + return manifest.RewardKey } func (s *state2) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/reward/state.v3.go b/venus-shared/actors/builtin/reward/state.v3.go index ddf801b967..5e23f88f5d 100644 --- a/venus-shared/actors/builtin/reward/state.v3.go +++ b/venus-shared/actors/builtin/reward/state.v3.go @@ -9,6 +9,7 @@ import ( actorstypes "github.com/filecoin-project/go-state-types/actors" "github.com/ipfs/go-cid" + "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" @@ -104,7 +105,7 @@ func (s *state3) GetState() interface{} { } func (s *state3) ActorKey() string { - return actors.RewardKey + return manifest.RewardKey } func (s *state3) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/reward/state.v4.go b/venus-shared/actors/builtin/reward/state.v4.go index f15b65de10..274f85b790 100644 --- a/venus-shared/actors/builtin/reward/state.v4.go +++ b/venus-shared/actors/builtin/reward/state.v4.go @@ -9,6 +9,7 @@ import ( actorstypes "github.com/filecoin-project/go-state-types/actors" "github.com/ipfs/go-cid" + "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" @@ -104,7 +105,7 @@ func (s *state4) GetState() interface{} { } func (s *state4) ActorKey() string { - return actors.RewardKey + return manifest.RewardKey } func (s *state4) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/reward/state.v5.go b/venus-shared/actors/builtin/reward/state.v5.go index f577d9f0a1..0fa51d4808 100644 --- a/venus-shared/actors/builtin/reward/state.v5.go +++ b/venus-shared/actors/builtin/reward/state.v5.go @@ -9,6 +9,7 @@ import ( actorstypes "github.com/filecoin-project/go-state-types/actors" "github.com/ipfs/go-cid" + "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" @@ -104,7 +105,7 @@ func (s *state5) GetState() interface{} { } func (s *state5) ActorKey() string { - return actors.RewardKey + return manifest.RewardKey } func (s *state5) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/reward/state.v6.go b/venus-shared/actors/builtin/reward/state.v6.go index 79e90efdd0..b5c74eddf5 100644 --- a/venus-shared/actors/builtin/reward/state.v6.go +++ b/venus-shared/actors/builtin/reward/state.v6.go @@ -9,6 +9,7 @@ import ( actorstypes "github.com/filecoin-project/go-state-types/actors" "github.com/ipfs/go-cid" + "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" @@ -104,7 +105,7 @@ func (s *state6) GetState() interface{} { } func (s *state6) ActorKey() string { - return actors.RewardKey + return manifest.RewardKey } func (s *state6) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/reward/state.v7.go b/venus-shared/actors/builtin/reward/state.v7.go index c145f68a10..5b4fa54819 100644 --- a/venus-shared/actors/builtin/reward/state.v7.go +++ b/venus-shared/actors/builtin/reward/state.v7.go @@ -9,6 +9,7 @@ import ( actorstypes "github.com/filecoin-project/go-state-types/actors" "github.com/ipfs/go-cid" + "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" @@ -104,7 +105,7 @@ func (s *state7) GetState() interface{} { } func (s *state7) ActorKey() string { - return actors.RewardKey + return manifest.RewardKey } func (s *state7) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/reward/state.v8.go b/venus-shared/actors/builtin/reward/state.v8.go index 94cfb02bc4..05e042741f 100644 --- a/venus-shared/actors/builtin/reward/state.v8.go +++ b/venus-shared/actors/builtin/reward/state.v8.go @@ -9,6 +9,7 @@ import ( actorstypes "github.com/filecoin-project/go-state-types/actors" "github.com/ipfs/go-cid" + "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" @@ -104,7 +105,7 @@ func (s *state8) GetState() interface{} { } func (s *state8) ActorKey() string { - return actors.RewardKey + return manifest.RewardKey } func (s *state8) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/reward/state.v9.go b/venus-shared/actors/builtin/reward/state.v9.go index 32f7dd8d7e..019ab8f898 100644 --- a/venus-shared/actors/builtin/reward/state.v9.go +++ b/venus-shared/actors/builtin/reward/state.v9.go @@ -9,6 +9,7 @@ import ( actorstypes "github.com/filecoin-project/go-state-types/actors" "github.com/ipfs/go-cid" + "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" @@ -104,7 +105,7 @@ func (s *state9) GetState() interface{} { } func (s *state9) ActorKey() string { - return actors.RewardKey + return manifest.RewardKey } func (s *state9) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/system/actor.go b/venus-shared/actors/builtin/system/actor.go index 2aa7b6d401..85d1cf7046 100644 --- a/venus-shared/actors/builtin/system/actor.go +++ b/venus-shared/actors/builtin/system/actor.go @@ -4,6 +4,7 @@ package system import ( actorstypes "github.com/filecoin-project/go-state-types/actors" + "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" types "github.com/filecoin-project/venus/venus-shared/internal" @@ -34,7 +35,7 @@ var ( func Load(store adt.Store, act *types.Actor) (State, error) { if name, av, ok := actors.GetActorMetaByCode(act.Code); ok { - if name != actors.SystemKey { + if name != manifest.SystemKey { return nil, fmt.Errorf("actor code is not system: %s", name) } diff --git a/venus-shared/actors/builtin/system/actor.go.template b/venus-shared/actors/builtin/system/actor.go.template index 992e6e2d9c..54eb68fccd 100644 --- a/venus-shared/actors/builtin/system/actor.go.template +++ b/venus-shared/actors/builtin/system/actor.go.template @@ -5,6 +5,7 @@ package system import ( "github.com/ipfs/go-cid" actorstypes "github.com/filecoin-project/go-state-types/actors" + "github.com/filecoin-project/go-state-types/manifest" "github.com/filecoin-project/venus/venus-shared/actors/adt" "github.com/filecoin-project/venus/venus-shared/actors" types "github.com/filecoin-project/venus/venus-shared/internal" @@ -25,7 +26,7 @@ var ( func Load(store adt.Store, act *types.Actor) (State, error) { if name, av, ok := actors.GetActorMetaByCode(act.Code); ok { - if name != actors.SystemKey { + if name != manifest.SystemKey { return nil, fmt.Errorf("actor code is not system: %s", name) } diff --git a/venus-shared/actors/builtin/system/state.sep.go.template b/venus-shared/actors/builtin/system/state.sep.go.template index 8422e56cb9..164654148a 100644 --- a/venus-shared/actors/builtin/system/state.sep.go.template +++ b/venus-shared/actors/builtin/system/state.sep.go.template @@ -5,6 +5,7 @@ package system import ( "fmt" actorstypes "github.com/filecoin-project/go-state-types/actors" + "github.com/filecoin-project/go-state-types/manifest" "github.com/ipfs/go-cid" @@ -64,7 +65,7 @@ func (s *state{{.v}}) SetBuiltinActors(c cid.Cid) error { } func (s *state{{.v}}) ActorKey() string { - return actors.SystemKey + return manifest.SystemKey } func (s *state{{.v}}) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/system/state.v0.go b/venus-shared/actors/builtin/system/state.v0.go index fe0ca17d34..85729d8d73 100644 --- a/venus-shared/actors/builtin/system/state.v0.go +++ b/venus-shared/actors/builtin/system/state.v0.go @@ -6,6 +6,7 @@ import ( "fmt" actorstypes "github.com/filecoin-project/go-state-types/actors" + "github.com/filecoin-project/go-state-types/manifest" "golang.org/x/xerrors" "github.com/ipfs/go-cid" @@ -55,7 +56,7 @@ func (s *state0) SetBuiltinActors(c cid.Cid) error { } func (s *state0) ActorKey() string { - return actors.SystemKey + return manifest.SystemKey } func (s *state0) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/system/state.v10.go b/venus-shared/actors/builtin/system/state.v10.go index cae1337c6d..f7f4c0fb90 100644 --- a/venus-shared/actors/builtin/system/state.v10.go +++ b/venus-shared/actors/builtin/system/state.v10.go @@ -6,6 +6,7 @@ import ( "fmt" actorstypes "github.com/filecoin-project/go-state-types/actors" + "github.com/filecoin-project/go-state-types/manifest" "github.com/ipfs/go-cid" @@ -57,7 +58,7 @@ func (s *state10) SetBuiltinActors(c cid.Cid) error { } func (s *state10) ActorKey() string { - return actors.SystemKey + return manifest.SystemKey } func (s *state10) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/system/state.v2.go b/venus-shared/actors/builtin/system/state.v2.go index 9826496426..d1b44fdc75 100644 --- a/venus-shared/actors/builtin/system/state.v2.go +++ b/venus-shared/actors/builtin/system/state.v2.go @@ -6,6 +6,7 @@ import ( "fmt" actorstypes "github.com/filecoin-project/go-state-types/actors" + "github.com/filecoin-project/go-state-types/manifest" "golang.org/x/xerrors" "github.com/ipfs/go-cid" @@ -55,7 +56,7 @@ func (s *state2) SetBuiltinActors(c cid.Cid) error { } func (s *state2) ActorKey() string { - return actors.SystemKey + return manifest.SystemKey } func (s *state2) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/system/state.v3.go b/venus-shared/actors/builtin/system/state.v3.go index 83e97c97f5..d640b65f46 100644 --- a/venus-shared/actors/builtin/system/state.v3.go +++ b/venus-shared/actors/builtin/system/state.v3.go @@ -6,6 +6,7 @@ import ( "fmt" actorstypes "github.com/filecoin-project/go-state-types/actors" + "github.com/filecoin-project/go-state-types/manifest" "golang.org/x/xerrors" "github.com/ipfs/go-cid" @@ -55,7 +56,7 @@ func (s *state3) SetBuiltinActors(c cid.Cid) error { } func (s *state3) ActorKey() string { - return actors.SystemKey + return manifest.SystemKey } func (s *state3) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/system/state.v4.go b/venus-shared/actors/builtin/system/state.v4.go index bb4b73a6df..070b512989 100644 --- a/venus-shared/actors/builtin/system/state.v4.go +++ b/venus-shared/actors/builtin/system/state.v4.go @@ -6,6 +6,7 @@ import ( "fmt" actorstypes "github.com/filecoin-project/go-state-types/actors" + "github.com/filecoin-project/go-state-types/manifest" "golang.org/x/xerrors" "github.com/ipfs/go-cid" @@ -55,7 +56,7 @@ func (s *state4) SetBuiltinActors(c cid.Cid) error { } func (s *state4) ActorKey() string { - return actors.SystemKey + return manifest.SystemKey } func (s *state4) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/system/state.v5.go b/venus-shared/actors/builtin/system/state.v5.go index 9029079531..75db894e8b 100644 --- a/venus-shared/actors/builtin/system/state.v5.go +++ b/venus-shared/actors/builtin/system/state.v5.go @@ -6,6 +6,7 @@ import ( "fmt" actorstypes "github.com/filecoin-project/go-state-types/actors" + "github.com/filecoin-project/go-state-types/manifest" "golang.org/x/xerrors" "github.com/ipfs/go-cid" @@ -55,7 +56,7 @@ func (s *state5) SetBuiltinActors(c cid.Cid) error { } func (s *state5) ActorKey() string { - return actors.SystemKey + return manifest.SystemKey } func (s *state5) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/system/state.v6.go b/venus-shared/actors/builtin/system/state.v6.go index 5aa1872746..7c57ca5d72 100644 --- a/venus-shared/actors/builtin/system/state.v6.go +++ b/venus-shared/actors/builtin/system/state.v6.go @@ -6,6 +6,7 @@ import ( "fmt" actorstypes "github.com/filecoin-project/go-state-types/actors" + "github.com/filecoin-project/go-state-types/manifest" "golang.org/x/xerrors" "github.com/ipfs/go-cid" @@ -55,7 +56,7 @@ func (s *state6) SetBuiltinActors(c cid.Cid) error { } func (s *state6) ActorKey() string { - return actors.SystemKey + return manifest.SystemKey } func (s *state6) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/system/state.v7.go b/venus-shared/actors/builtin/system/state.v7.go index f9a0209825..feb918ae18 100644 --- a/venus-shared/actors/builtin/system/state.v7.go +++ b/venus-shared/actors/builtin/system/state.v7.go @@ -6,6 +6,7 @@ import ( "fmt" actorstypes "github.com/filecoin-project/go-state-types/actors" + "github.com/filecoin-project/go-state-types/manifest" "golang.org/x/xerrors" "github.com/ipfs/go-cid" @@ -55,7 +56,7 @@ func (s *state7) SetBuiltinActors(c cid.Cid) error { } func (s *state7) ActorKey() string { - return actors.SystemKey + return manifest.SystemKey } func (s *state7) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/system/state.v8.go b/venus-shared/actors/builtin/system/state.v8.go index 671b3b4a8d..484e788904 100644 --- a/venus-shared/actors/builtin/system/state.v8.go +++ b/venus-shared/actors/builtin/system/state.v8.go @@ -6,6 +6,7 @@ import ( "fmt" actorstypes "github.com/filecoin-project/go-state-types/actors" + "github.com/filecoin-project/go-state-types/manifest" "github.com/ipfs/go-cid" @@ -57,7 +58,7 @@ func (s *state8) SetBuiltinActors(c cid.Cid) error { } func (s *state8) ActorKey() string { - return actors.SystemKey + return manifest.SystemKey } func (s *state8) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/system/state.v9.go b/venus-shared/actors/builtin/system/state.v9.go index 43cace29ff..01dede5fbb 100644 --- a/venus-shared/actors/builtin/system/state.v9.go +++ b/venus-shared/actors/builtin/system/state.v9.go @@ -6,6 +6,7 @@ import ( "fmt" actorstypes "github.com/filecoin-project/go-state-types/actors" + "github.com/filecoin-project/go-state-types/manifest" "github.com/ipfs/go-cid" @@ -57,7 +58,7 @@ func (s *state9) SetBuiltinActors(c cid.Cid) error { } func (s *state9) ActorKey() string { - return actors.SystemKey + return manifest.SystemKey } func (s *state9) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/verifreg/actor.go b/venus-shared/actors/builtin/verifreg/actor.go index 36c84ffe88..3c95683290 100644 --- a/venus-shared/actors/builtin/verifreg/actor.go +++ b/venus-shared/actors/builtin/verifreg/actor.go @@ -6,6 +6,7 @@ import ( "fmt" actorstypes "github.com/filecoin-project/go-state-types/actors" + "github.com/filecoin-project/go-state-types/manifest" "github.com/ipfs/go-cid" "github.com/filecoin-project/go-address" @@ -42,7 +43,7 @@ var ( func Load(store adt.Store, act *types.Actor) (State, error) { if name, av, ok := actors.GetActorMetaByCode(act.Code); ok { - if name != actors.VerifregKey { + if name != manifest.VerifregKey { return nil, fmt.Errorf("actor code is not verifreg: %s", name) } diff --git a/venus-shared/actors/builtin/verifreg/actor.go.template b/venus-shared/actors/builtin/verifreg/actor.go.template index 49edd084f0..db02c075cf 100644 --- a/venus-shared/actors/builtin/verifreg/actor.go.template +++ b/venus-shared/actors/builtin/verifreg/actor.go.template @@ -5,6 +5,7 @@ package verifreg import ( "github.com/ipfs/go-cid" actorstypes "github.com/filecoin-project/go-state-types/actors" + "github.com/filecoin-project/go-state-types/manifest" "fmt" "github.com/filecoin-project/go-address" @@ -31,7 +32,7 @@ var ( func Load(store adt.Store, act *types.Actor) (State, error) { if name, av, ok := actors.GetActorMetaByCode(act.Code); ok { - if name != actors.VerifregKey { + if name != manifest.VerifregKey { return nil, fmt.Errorf("actor code is not verifreg: %s", name) } diff --git a/venus-shared/actors/builtin/verifreg/state.sep.go.template b/venus-shared/actors/builtin/verifreg/state.sep.go.template index 1ec884ea4a..83a9e74661 100644 --- a/venus-shared/actors/builtin/verifreg/state.sep.go.template +++ b/venus-shared/actors/builtin/verifreg/state.sep.go.template @@ -5,6 +5,7 @@ package verifreg import ( "fmt" actorstypes "github.com/filecoin-project/go-state-types/actors" + "github.com/filecoin-project/go-state-types/manifest" "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" "github.com/ipfs/go-cid" @@ -171,7 +172,7 @@ func (s *state{{.v}}) GetClaims(providerIdAddr address.Address) (map[ClaimId]Cla } func (s *state{{.v}}) ActorKey() string { - return actors.VerifregKey + return manifest.VerifregKey } func (s *state{{.v}}) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/verifreg/state.v0.go b/venus-shared/actors/builtin/verifreg/state.v0.go index fbeabbe9d3..86c9e58550 100644 --- a/venus-shared/actors/builtin/verifreg/state.v0.go +++ b/venus-shared/actors/builtin/verifreg/state.v0.go @@ -8,6 +8,7 @@ import ( "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" actorstypes "github.com/filecoin-project/go-state-types/actors" + "github.com/filecoin-project/go-state-types/manifest" "github.com/ipfs/go-cid" "github.com/filecoin-project/venus/venus-shared/actors" @@ -120,7 +121,7 @@ func (s *state0) GetClaims(providerIdAddr address.Address) (map[ClaimId]Claim, e } func (s *state0) ActorKey() string { - return actors.VerifregKey + return manifest.VerifregKey } func (s *state0) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/verifreg/state.v10.go b/venus-shared/actors/builtin/verifreg/state.v10.go index 378b5835c2..319a44c492 100644 --- a/venus-shared/actors/builtin/verifreg/state.v10.go +++ b/venus-shared/actors/builtin/verifreg/state.v10.go @@ -8,6 +8,7 @@ import ( "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" actorstypes "github.com/filecoin-project/go-state-types/actors" + "github.com/filecoin-project/go-state-types/manifest" "github.com/ipfs/go-cid" "github.com/filecoin-project/venus/venus-shared/actors" @@ -137,7 +138,7 @@ func (s *state10) GetClaims(providerIdAddr address.Address) (map[ClaimId]Claim, } func (s *state10) ActorKey() string { - return actors.VerifregKey + return manifest.VerifregKey } func (s *state10) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/verifreg/state.v2.go b/venus-shared/actors/builtin/verifreg/state.v2.go index 0930a73299..091bd0e2fb 100644 --- a/venus-shared/actors/builtin/verifreg/state.v2.go +++ b/venus-shared/actors/builtin/verifreg/state.v2.go @@ -8,6 +8,7 @@ import ( "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" actorstypes "github.com/filecoin-project/go-state-types/actors" + "github.com/filecoin-project/go-state-types/manifest" "github.com/ipfs/go-cid" "github.com/filecoin-project/venus/venus-shared/actors" @@ -120,7 +121,7 @@ func (s *state2) GetClaims(providerIdAddr address.Address) (map[ClaimId]Claim, e } func (s *state2) ActorKey() string { - return actors.VerifregKey + return manifest.VerifregKey } func (s *state2) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/verifreg/state.v3.go b/venus-shared/actors/builtin/verifreg/state.v3.go index 32b79251f4..fa6f8083d5 100644 --- a/venus-shared/actors/builtin/verifreg/state.v3.go +++ b/venus-shared/actors/builtin/verifreg/state.v3.go @@ -8,6 +8,7 @@ import ( "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" actorstypes "github.com/filecoin-project/go-state-types/actors" + "github.com/filecoin-project/go-state-types/manifest" "github.com/ipfs/go-cid" "github.com/filecoin-project/venus/venus-shared/actors" @@ -122,7 +123,7 @@ func (s *state3) GetClaims(providerIdAddr address.Address) (map[ClaimId]Claim, e } func (s *state3) ActorKey() string { - return actors.VerifregKey + return manifest.VerifregKey } func (s *state3) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/verifreg/state.v4.go b/venus-shared/actors/builtin/verifreg/state.v4.go index bb03afc7db..66c47ed70b 100644 --- a/venus-shared/actors/builtin/verifreg/state.v4.go +++ b/venus-shared/actors/builtin/verifreg/state.v4.go @@ -8,6 +8,7 @@ import ( "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" actorstypes "github.com/filecoin-project/go-state-types/actors" + "github.com/filecoin-project/go-state-types/manifest" "github.com/ipfs/go-cid" "github.com/filecoin-project/venus/venus-shared/actors" @@ -122,7 +123,7 @@ func (s *state4) GetClaims(providerIdAddr address.Address) (map[ClaimId]Claim, e } func (s *state4) ActorKey() string { - return actors.VerifregKey + return manifest.VerifregKey } func (s *state4) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/verifreg/state.v5.go b/venus-shared/actors/builtin/verifreg/state.v5.go index f8361c79ef..9928ec64c8 100644 --- a/venus-shared/actors/builtin/verifreg/state.v5.go +++ b/venus-shared/actors/builtin/verifreg/state.v5.go @@ -8,6 +8,7 @@ import ( "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" actorstypes "github.com/filecoin-project/go-state-types/actors" + "github.com/filecoin-project/go-state-types/manifest" "github.com/ipfs/go-cid" "github.com/filecoin-project/venus/venus-shared/actors" @@ -122,7 +123,7 @@ func (s *state5) GetClaims(providerIdAddr address.Address) (map[ClaimId]Claim, e } func (s *state5) ActorKey() string { - return actors.VerifregKey + return manifest.VerifregKey } func (s *state5) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/verifreg/state.v6.go b/venus-shared/actors/builtin/verifreg/state.v6.go index 82fd402a86..b5f89760dd 100644 --- a/venus-shared/actors/builtin/verifreg/state.v6.go +++ b/venus-shared/actors/builtin/verifreg/state.v6.go @@ -8,6 +8,7 @@ import ( "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" actorstypes "github.com/filecoin-project/go-state-types/actors" + "github.com/filecoin-project/go-state-types/manifest" "github.com/ipfs/go-cid" "github.com/filecoin-project/venus/venus-shared/actors" @@ -122,7 +123,7 @@ func (s *state6) GetClaims(providerIdAddr address.Address) (map[ClaimId]Claim, e } func (s *state6) ActorKey() string { - return actors.VerifregKey + return manifest.VerifregKey } func (s *state6) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/verifreg/state.v7.go b/venus-shared/actors/builtin/verifreg/state.v7.go index 91320bf12e..aec2b62402 100644 --- a/venus-shared/actors/builtin/verifreg/state.v7.go +++ b/venus-shared/actors/builtin/verifreg/state.v7.go @@ -8,6 +8,7 @@ import ( "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" actorstypes "github.com/filecoin-project/go-state-types/actors" + "github.com/filecoin-project/go-state-types/manifest" "github.com/ipfs/go-cid" "github.com/filecoin-project/venus/venus-shared/actors" @@ -121,7 +122,7 @@ func (s *state7) GetClaims(providerIdAddr address.Address) (map[ClaimId]Claim, e } func (s *state7) ActorKey() string { - return actors.VerifregKey + return manifest.VerifregKey } func (s *state7) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/verifreg/state.v8.go b/venus-shared/actors/builtin/verifreg/state.v8.go index ba7978769d..e5efb2a71e 100644 --- a/venus-shared/actors/builtin/verifreg/state.v8.go +++ b/venus-shared/actors/builtin/verifreg/state.v8.go @@ -8,6 +8,7 @@ import ( "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" actorstypes "github.com/filecoin-project/go-state-types/actors" + "github.com/filecoin-project/go-state-types/manifest" "github.com/ipfs/go-cid" "github.com/filecoin-project/venus/venus-shared/actors" @@ -120,7 +121,7 @@ func (s *state8) GetClaims(providerIdAddr address.Address) (map[ClaimId]Claim, e } func (s *state8) ActorKey() string { - return actors.VerifregKey + return manifest.VerifregKey } func (s *state8) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin/verifreg/state.v9.go b/venus-shared/actors/builtin/verifreg/state.v9.go index 52789c3266..fa7c090c86 100644 --- a/venus-shared/actors/builtin/verifreg/state.v9.go +++ b/venus-shared/actors/builtin/verifreg/state.v9.go @@ -8,6 +8,7 @@ import ( "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" actorstypes "github.com/filecoin-project/go-state-types/actors" + "github.com/filecoin-project/go-state-types/manifest" "github.com/ipfs/go-cid" "github.com/filecoin-project/venus/venus-shared/actors" @@ -135,7 +136,7 @@ func (s *state9) GetClaims(providerIdAddr address.Address) (map[ClaimId]Claim, e } func (s *state9) ActorKey() string { - return actors.VerifregKey + return manifest.VerifregKey } func (s *state9) ActorVersion() actorstypes.Version { diff --git a/venus-shared/actors/builtin_actors_gen.go b/venus-shared/actors/builtin_actors_gen.go index 2358285ffa..7b5a364424 100644 --- a/venus-shared/actors/builtin_actors_gen.go +++ b/venus-shared/actors/builtin_actors_gen.go @@ -43,23 +43,24 @@ var EmbeddedBuiltinActorsMetadata []*BuiltinActorsMetadata = []*BuiltinActorsMet }, { Network: "butterflynet", Version: 10, - ManifestCid: mustParseCid("bafy2bzaceciz4ytt5gnn6gc4epez7v6xeg6efkgbvwfxkoa34o2gj3hp5f7zc"), + ManifestCid: mustParseCid("bafy2bzacea6kki7qtpkuxhskje3p7tuwmsdb2lequi3fjo7q2g4egedgmcaos"), Actors: map[string]cid.Cid{ - "account": mustParseCid("bafk2bzacedavorwsriewoddjlaganjpsk3o7zfts2wyid3clv5xnctacg37j2"), - "cron": mustParseCid("bafk2bzacebtauucwaewxuzgxfpjtmn6xt3kya4om4ugyprlkhhkde76h7fkqg"), - "datacap": mustParseCid("bafk2bzacebzdjapqwasq6woxkgq2nm2nre3v7cl2754xwiuo2cfhvsceq4cba"), - "eam": mustParseCid("bafk2bzacecmr4zdbpfnemvgo446qby7x4y4v5cbfespt3f6ousv2hxnflyrlk"), - "embryo": mustParseCid("bafk2bzacebj2mj5zlcs3yjlgpbznzistfjkdlwaoncjziliqrxqavvz4dcvnk"), - "evm": mustParseCid("bafk2bzacebuewexvig54cuvsvwn4k4zr36tm2q5fel4ezq4v7363n2lmn362k"), - "init": mustParseCid("bafk2bzacebww5gsctsk5hack2alkt4kh55bmpb4ywzbyyhoaskryymjj3snj6"), - "multisig": mustParseCid("bafk2bzacec5k4wxvou34pyjd5kcsrbsfnlk4k753kkscg3ron2r7tsxollfsq"), - "paymentchannel": mustParseCid("bafk2bzacebzdeaxglaqpmegalakmxr6secjd24mu5llo4ctoy7pvom5upyuvs"), - "reward": mustParseCid("bafk2bzaceb4hyabxnyrrsno5erqqwk5ynnjibblzfcaq3aotlz3ek4uu6dyla"), - "storagemarket": mustParseCid("bafk2bzacedpocbf2lg2x2jg6arw2argnwmvo2hyjqvpkrgfu4khz5mtlzxz2o"), - "storageminer": mustParseCid("bafk2bzaceacrumah7jdfc62bmvemob4lsh5yiohwodest2cgxakgnn24cenlk"), - "storagepower": mustParseCid("bafk2bzaceaxz6n5nywermfptnz6dc53vqsa42lic4rf66l4irm3mqfj4ak5ps"), - "system": mustParseCid("bafk2bzaceb4w5bblgyu25ylytpmfrixjsk2ra6emd44j4mv42xfxbwnqloyzi"), - "verifiedregistry": mustParseCid("bafk2bzacedbz2koeb6teewobcjdpgfv7qdae7utgoka6wzlkf6gronnis2nn2"), + "account": mustParseCid("bafk2bzacebvgiflqavofskiq56aj4ktkzediyeo7j4cqqdkbmu6f3pib4sbb2"), + "cron": mustParseCid("bafk2bzaceb4mn2ehsyjueq4ja3zmvmgstx2sdvzvf52xzs7pzlumxr7acr5sk"), + "datacap": mustParseCid("bafk2bzacecetu7dadc2dznwhutwl43lislb22qqdkdmpwgmonspiiysud63rg"), + "eam": mustParseCid("bafk2bzacebuexqxddkgyptjn5cmldjkbmxgmkq5i4pbvtdwcdcfdt63fpwrwe"), + "embryo": mustParseCid("bafk2bzaceax2tehd7m42kxf3z56hjj67buzucn5cj2456daz5yj4ai5txs2r4"), + "ethaccount": mustParseCid("bafk2bzacebeqqs3ov6olevtpnra4txkfumnx5yqi2hrn47nphyzz3wjb5s3xa"), + "evm": mustParseCid("bafk2bzacedgfppymynx6gf5t5abs25fhpjljwp3pzyg2rh777iq4qkoxv6r2m"), + "init": mustParseCid("bafk2bzacedezxmexxjrxda3aqyghk6v53to4dxtpcvk3oyp5hrpxsmhokjtzk"), + "multisig": mustParseCid("bafk2bzaceady5ddezunmb77i2yod727jx5tegdxdhxric4hv5tdgoyj2yzs76"), + "paymentchannel": mustParseCid("bafk2bzacedljjqkbtn33jlx5iic6rxz6g7l5j55xut5kvxkp3n53lfguhh3tk"), + "reward": mustParseCid("bafk2bzacecpaajt7l47j2oh4k5xm2lkpfxssy2s3ruethh3nrjqa5vzk636ee"), + "storagemarket": mustParseCid("bafk2bzacedyg67aeetx7yc5nhkv24dyy5qgsb4miktqtbllhb25qxhezxkeua"), + "storageminer": mustParseCid("bafk2bzacecmrhmmowsetorpgl5ljbfzowe7p5jhsg6qrpqffcxiobj6viouts"), + "storagepower": mustParseCid("bafk2bzacedygmbf2reecyktif77fhgik6r2hrt5lpxwcrcsvgrb6fzuz64r5e"), + "system": mustParseCid("bafk2bzacedobj3mr33345jy236wzbs46luvqxllczmmv2leqkonezskibehxa"), + "verifiedregistry": mustParseCid("bafk2bzacecaud67cooasim3xmykvla7sprxds5vjpyjugwaubapmglxwrcd5m"), }, }, { Network: "calibrationnet", @@ -99,23 +100,24 @@ var EmbeddedBuiltinActorsMetadata []*BuiltinActorsMetadata = []*BuiltinActorsMet }, { Network: "calibrationnet", Version: 10, - ManifestCid: mustParseCid("bafy2bzaced7wbd43lvgc55xb37mkoo4ppev6ig4jj4j7dtswtjfjq4u5qmpck"), + ManifestCid: mustParseCid("bafy2bzaceavw3rjjahsviowz6nprq6ame33tel5tqzsmpfh7uw4tov24gkcww"), Actors: map[string]cid.Cid{ - "account": mustParseCid("bafk2bzacecq4owv5begvryvpsy4atfb2jnf7g7o4hxovtdb5a4jfkzacownli"), - "cron": mustParseCid("bafk2bzaced4uz5w5h5wksx4end27lphd4qc4kh7q336uyt46lba5ddynwftya"), - "datacap": mustParseCid("bafk2bzacedoc7y4s5n3p2zo4bcmafcrellkakn2e3uyf5wb3mtbuqhvwqn2l4"), - "eam": mustParseCid("bafk2bzacealpqjgz5qmucm3v6z6hn36igx7zijixhqrxwoj3g4bdgvyml3adi"), - "embryo": mustParseCid("bafk2bzacebj2mj5zlcs3yjlgpbznzistfjkdlwaoncjziliqrxqavvz4dcvnk"), - "evm": mustParseCid("bafk2bzacedmlmyy2efbt4qk5ighawiychklhzc6pzyiwvpijwvxoq3xyxlgxw"), - "init": mustParseCid("bafk2bzaceaqcfmfylwdemq5bdcelydpf6iqfct4p7b2zwtmqyhuxn522yvic2"), - "multisig": mustParseCid("bafk2bzacebuh55hkbkobmmoaoduruss5nsh6e2gtqtdbqsmw6e7k5vg6heyrm"), - "paymentchannel": mustParseCid("bafk2bzacedcpzw7prdoxnaclcvmtwr6yf54zi4bzzwe5w3xknh72ji6p3qfc6"), - "reward": mustParseCid("bafk2bzaced74ym6j424zzbr6millasfcyl3r4zm5fnauasrwn3ti6fdarbkym"), - "storagemarket": mustParseCid("bafk2bzacec7delr2q42yj4wu3daa5xjz4zezeivphtx3xwyvpgwpdnfoevhh2"), - "storageminer": mustParseCid("bafk2bzaced7isnew5lhu237pdtwaqmbv65qqvfmmnve2c5yfobtfqw2fptuvc"), - "storagepower": mustParseCid("bafk2bzacebe5frk6gcgzcvzkxavhhbs3id3iyacybn7y7gxwzgl5t6zawzswg"), - "system": mustParseCid("bafk2bzacectivaezqijucle5s2f7xeui5uxig7bnk7fe4vsvz3xu7agjtb2ge"), - "verifiedregistry": mustParseCid("bafk2bzaceczgwckte4exultjxyzgzoo6m6r5coyphnlappi4clethhhybslxc"), + "account": mustParseCid("bafk2bzacedifn4xp6aike3xdgntk355pgb3ky6bme454t6dpol5235w2vibwi"), + "cron": mustParseCid("bafk2bzacecwcvtgwto3s5o6v5jzx2rvbzv6uaixws7i4epdcsxgg52hwtw2tm"), + "datacap": mustParseCid("bafk2bzaceczuhzrowju6c6jk2agkrqahjnkm3abu3dvjve5g6z3xng2m7hxwq"), + "eam": mustParseCid("bafk2bzacecpf4u5zr2ilft5rt3i3s4alldjxqekhdruwrfqts57fwwoagjjws"), + "embryo": mustParseCid("bafk2bzaceax2tehd7m42kxf3z56hjj67buzucn5cj2456daz5yj4ai5txs2r4"), + "ethaccount": mustParseCid("bafk2bzacec5kyeyy32zmucx3vbiw22j4znmmdvzkdoqu2e5e5gk33bhbfkseq"), + "evm": mustParseCid("bafk2bzacec72jwgdndy2gnbvzapknihdlp27f3qvj3ykmj6paq7o6tdgbykvq"), + "init": mustParseCid("bafk2bzacea6mrjm65wr436mlgv6eaceghfvpchcueqf3qsdon5e2paxnoqgtm"), + "multisig": mustParseCid("bafk2bzaceaeuzxfixer56laljcn34tygi2kvngstqmhwz7ushjx4qwx4n5mi2"), + "paymentchannel": mustParseCid("bafk2bzacecm6k45iz277jypjd6sfyjodgbiwymblsch6wnkz4q2uzzmy4gsuw"), + "reward": mustParseCid("bafk2bzacebr7gdppcalate32rukzbbezbyk6sounbdigb2asyeodcjdedzpm2"), + "storagemarket": mustParseCid("bafk2bzacea6kvoeb2v4mmvhf4vzmxim3objnsasjfg33jabqianczt7i3zyfi"), + "storageminer": mustParseCid("bafk2bzacecrmibyb4oyd53ik3zva5debmyzha72l65oom3ulwftfiv6jo5va2"), + "storagepower": mustParseCid("bafk2bzaceajch5ed7s2ennbnfny6r4l2kpidnxbsclqedvufi2b5635vsgabe"), + "system": mustParseCid("bafk2bzacea6dferxxxiimkdl43y7yqh6rywtbrprrg76pn2xfkyixwgd6j2jw"), + "verifiedregistry": mustParseCid("bafk2bzaceckaisg3sv4j6d3bsu5rqpvtw4vvzsosb5e2brxcllvjymgj6uvaa"), }, }, { Network: "caterpillarnet", @@ -155,23 +157,24 @@ var EmbeddedBuiltinActorsMetadata []*BuiltinActorsMetadata = []*BuiltinActorsMet }, { Network: "caterpillarnet", Version: 10, - ManifestCid: mustParseCid("bafy2bzacea5csj2os7h76a6yvf6shgpwkysawijxemk5uvvzejxrwjo6ir4yg"), + ManifestCid: mustParseCid("bafy2bzacedkotw6g6uork3rjwqtoixta4ajphfqrjjqef6p3grqd5bwu7o6t6"), Actors: map[string]cid.Cid{ - "account": mustParseCid("bafk2bzacea7tpruyxdgyz4xa7curiphwdw4abmspft3ee24puruazdcl3tq5c"), - "cron": mustParseCid("bafk2bzacebc6kkj7kzsicm5baszjgd37b4b3kijsffqmmkhhjlyd7zhkwfcqm"), - "datacap": mustParseCid("bafk2bzaceddcmwl6po2jd3tfkkgv4zvub7i47gsx33pkqdspqhgvhe4npc4as"), - "eam": mustParseCid("bafk2bzaceccsvcww2rmqnh4plkq6oapqaeqbhydrtup54z4dwunolz5tpgtb4"), - "embryo": mustParseCid("bafk2bzacebj2mj5zlcs3yjlgpbznzistfjkdlwaoncjziliqrxqavvz4dcvnk"), - "evm": mustParseCid("bafk2bzacea5sig3zpxfkqppoj3t344cvuhzvkx6ge2isgdzc34rfpng2ogdje"), - "init": mustParseCid("bafk2bzacedtby353aho7itoyoj7w6moydmigjm3sgy6djgnfxqehlpae4vcc2"), - "multisig": mustParseCid("bafk2bzacedyguvwz5zfveqoqicn3j6lkdzipf247nhvdi6dvmahulr7nzgox6"), - "paymentchannel": mustParseCid("bafk2bzaceavaatmmnsz3v3ksopcbu6jx4iq7u7nnmqbclsiabsfkfu3zfpmka"), - "reward": mustParseCid("bafk2bzacecrphs4avteik4yejsqwkpy5bcqramdhnzykbfq3uu2qalj2p26ti"), - "storagemarket": mustParseCid("bafk2bzaceajby2jb5m3fenzarum374zxdzuyrpkspfljwovu7c3hvyceqd5sa"), - "storageminer": mustParseCid("bafk2bzacebqtn7jdvk756ighri5ajro6gjepnef3c6rxupbbgkth62zytiy5s"), - "storagepower": mustParseCid("bafk2bzacedwlo32brlalpovfkkk7qwo3ou2kpgv2bf7fioy5srn7uejmn7n46"), - "system": mustParseCid("bafk2bzacebbt63h26x5vw5fdo2pmdb4q65u3t6lilkugvmjar6zfsc7ethxsi"), - "verifiedregistry": mustParseCid("bafk2bzacecr5kbyypdxnxlepzk5sji2k72t454vto5ok4owfcuwfpeyivjtu4"), + "account": mustParseCid("bafk2bzaceckyjekq4bk5cdi2jxwm7frt4zi3fgx6jtxxwasjyf7novw6wjygy"), + "cron": mustParseCid("bafk2bzacedgrej6vnsjiagnt32uwmaaj7elar7qbqepmd7tbqgi4kvnut77fs"), + "datacap": mustParseCid("bafk2bzaceaty2is6zk4riuovw3sljonxwy6z4kor6iqn7qhpvisqwaytunhfi"), + "eam": mustParseCid("bafk2bzacebdnuqjgeeulpkre7pi7dhsyy2ylbhc2kaz2q3x774zcykwsnbh4y"), + "embryo": mustParseCid("bafk2bzaceax2tehd7m42kxf3z56hjj67buzucn5cj2456daz5yj4ai5txs2r4"), + "ethaccount": mustParseCid("bafk2bzaceayfch6isxpeocfq2gxdmzbk7cnj34qpuieb5mckutstjmffntrm2"), + "evm": mustParseCid("bafk2bzaceb7cxusflapxwubzwcievqtobkk2jhyek2wrgv2ym5io2s4xfy3aw"), + "init": mustParseCid("bafk2bzacebkwjggvge2budrgnhuclmyzivqvw2qt33odgxbycvr2dhdk6ipvq"), + "multisig": mustParseCid("bafk2bzacebyzyofjm636trmq5uriaccfbvnkjfxmjayfo3autndtuxpbz52co"), + "paymentchannel": mustParseCid("bafk2bzacea4m4bhoilmjzrrl7og2oudyj6juy3adod2duy6gkl3pzkunefpls"), + "reward": mustParseCid("bafk2bzaceavtfypwa6qpeo3j7bc2ty3zkphefy4hep43hhx4kssfmdr3utsga"), + "storagemarket": mustParseCid("bafk2bzacecoudxpin4hwajlzp7wufntfijus4nlnacfbqv4n3zfd4cstezmg6"), + "storageminer": mustParseCid("bafk2bzacebflyrvdlc2iu7aehjtaue5nsu45oelpzwrt7wslyngeyzyjderom"), + "storagepower": mustParseCid("bafk2bzacedem5mvgirhfloykv5owwafcleaaeog3x27datnnmfs2tp7yqwilg"), + "system": mustParseCid("bafk2bzacedtfjxsiimp2cfwpx2ocy6vvtj3xs57spddrywmodpzqhpov7az74"), + "verifiedregistry": mustParseCid("bafk2bzacec7slmn6lrpooarehctxdtmjdbizoxsj345im53x5u3mbphnp7764"), }, }, { Network: "devnet", @@ -211,23 +214,24 @@ var EmbeddedBuiltinActorsMetadata []*BuiltinActorsMetadata = []*BuiltinActorsMet }, { Network: "devnet", Version: 10, - ManifestCid: mustParseCid("bafy2bzacea73thrlpfejrswlcu5uhe7rcgdewvmrcwoef6jzngsba3i4v5ibi"), + ManifestCid: mustParseCid("bafy2bzaced4j4o6aujjdnrcedyzqmdmy335mamepf5wxjxtrrrcbmjqjkwmai"), Actors: map[string]cid.Cid{ - "account": mustParseCid("bafk2bzaceau2o55aripm7kqrbzzog72zcduv5psnxzpohx5rdkykepc4z7aag"), - "cron": mustParseCid("bafk2bzacec5qc5xluwikf4lolfa4oe356iwep25tiezbxfdyg5jib54rhlh6q"), - "datacap": mustParseCid("bafk2bzacebo47u6q3xou5exsecjpa4rpfqjfm7vyhz4qlr3nk7p46trsk4occ"), - "eam": mustParseCid("bafk2bzacea6yeptevserd7ayf4ahokor4sdpizpxpbqwkuvvhzdkon672shsm"), - "embryo": mustParseCid("bafk2bzacebj2mj5zlcs3yjlgpbznzistfjkdlwaoncjziliqrxqavvz4dcvnk"), - "evm": mustParseCid("bafk2bzacebi46zgjili4luu3nqy6mno5k4skvo4cvs7genhkdfaukhtw7xirw"), - "init": mustParseCid("bafk2bzacedvf2bij6jovem2dfzkz347yvmydxj7vlgaiagosz5t3c5jyy43zu"), - "multisig": mustParseCid("bafk2bzacecukolwx6y5pcajnxg2aawiubgxo5zyj24a23zg5t4qu3k4qbofh4"), - "paymentchannel": mustParseCid("bafk2bzacecwyih7nodrwsw5vyl5zk7fapklje76jpowqjr6x6br2bm55smqqy"), - "reward": mustParseCid("bafk2bzacea6vfrcprxg2i4l5qnigf4c6pyvnjxpzfqr4pmph3elif7sfidrei"), - "storagemarket": mustParseCid("bafk2bzaceahradb3od4ahs46x6yriwvm36iabgtohhoiolubsumto5eravzbu"), - "storageminer": mustParseCid("bafk2bzacedekivqgvqapbepvzn6jte3xyymyg5yjuwy42xvboa6rcqnzgo74u"), - "storagepower": mustParseCid("bafk2bzacedkmiosllqqqarmr53twspyswdvsm7givwczgo3qqsxzpad4hzjma"), - "system": mustParseCid("bafk2bzaceagdymtxb4lxqqjgmnphbgdtdgveuuqaouswpzagj4bpbon3ptop4"), - "verifiedregistry": mustParseCid("bafk2bzacec556wsqldm22k2abshvvnsrawlm3bbqkwzht6ubcj76m2jsy3azi"), + "account": mustParseCid("bafk2bzacechueo4lu2celcpv54wfcg24fmrzhxflqqzo2wlisbmfnau5admrk"), + "cron": mustParseCid("bafk2bzacecwazk6vmemzhpqbziuc4h4ldmomvxbb64dpxdoupnbe22rq3ay7o"), + "datacap": mustParseCid("bafk2bzaceaq7ghb7j7tzjm3moeqnpzwwm22jmmxrtid7wb7bgudw5zuhbu6kk"), + "eam": mustParseCid("bafk2bzaceb7r6vktesqypltzqmdwev7izvljce3zbtgvrzz56zfoutvcmbmac"), + "embryo": mustParseCid("bafk2bzaceax2tehd7m42kxf3z56hjj67buzucn5cj2456daz5yj4ai5txs2r4"), + "ethaccount": mustParseCid("bafk2bzacedtdrfesgj6w6e4txltpwyhvu655dl6y3z3h3yszfcrfl2thcmvg2"), + "evm": mustParseCid("bafk2bzacebefcg7i6qa6b6hnnbdaobxe5knusmfxszydw5fcpradcdgnfxevu"), + "init": mustParseCid("bafk2bzacedgihzwljh7ss3i77fvfrmiei6rg2u3fxrlhxasnexmdsqt2wok32"), + "multisig": mustParseCid("bafk2bzacea6ecjhk64kh3mzcfd4elk5fj7c5dodey2jzpfd75h73mhpv5q5pg"), + "paymentchannel": mustParseCid("bafk2bzaceduj4lck7aywx2byp4xadkao6iapaze76b3gs46ueo4hwjwptuq56"), + "reward": mustParseCid("bafk2bzacednnsuol6pxcqduhwyi4jpn2ci6llw6e5jsps2t4zvqwhrizqk3jq"), + "storagemarket": mustParseCid("bafk2bzacecmoed6ip7omv4qm55klsa73zh6qb2pxapavvnw5d3uxymowdcbg2"), + "storageminer": mustParseCid("bafk2bzaceaeuxvmxuwkezbigjfnieirqkljl4evyjsfu2hklun2legmp6emos"), + "storagepower": mustParseCid("bafk2bzacec447h7soxygu37fph3f5qgua6t4e5h53p4cfk56zhxhw4xhavjt6"), + "system": mustParseCid("bafk2bzacec742xs2egn2xyfbspjkszsinpgamtdm4cj45k55mmw2gwbp7le7c"), + "verifiedregistry": mustParseCid("bafk2bzacedw6yaadhwqeifx2tr66zz2l4q5x37sb6udbbrwpopcwavlmyf65g"), }, }, { Network: "mainnet", @@ -267,23 +271,24 @@ var EmbeddedBuiltinActorsMetadata []*BuiltinActorsMetadata = []*BuiltinActorsMet }, { Network: "mainnet", Version: 10, - ManifestCid: mustParseCid("bafy2bzaceduyggnyqhlr346hfw32tbobzrvhzhill33zhe7jw64pmwjci2xoc"), + ManifestCid: mustParseCid("bafy2bzaceb2pad2sm5pp73mplrgn43zgcruhnog3rtovxdstc33j6tqw2txeu"), Actors: map[string]cid.Cid{ - "account": mustParseCid("bafk2bzacedmr3wxl7qmhquageorrt3aavbzqfpm7eymxidakwuhaobu7dseqs"), - "cron": mustParseCid("bafk2bzaceblekxapm5nnqnxmw3mk27236iyutvbhhpsc3fyde7zi7guccn7cc"), - "datacap": mustParseCid("bafk2bzacedu4jevyvqsilq7bq4uhegbkm75muwebc5ifqpfaojwhexf2j4i6a"), - "eam": mustParseCid("bafk2bzacedc7224twbolvdq6iwc7ybdpah2ywe3ueo33jv67ecimndinle374"), - "embryo": mustParseCid("bafk2bzacebj2mj5zlcs3yjlgpbznzistfjkdlwaoncjziliqrxqavvz4dcvnk"), - "evm": mustParseCid("bafk2bzaceaggldo6wmkvp5innv4pnjv4xnpedspzofvma3dhu7vk45hh5djoq"), - "init": mustParseCid("bafk2bzacedutlaebaczkdi4vqvt3xim24u3whleqk2r4lufjd5jnmxcosea6q"), - "multisig": mustParseCid("bafk2bzaceatiqxjwtugpzus3s52zoggnrftxqn7kiw3obvjgkjvtd6zr3636q"), - "paymentchannel": mustParseCid("bafk2bzacebyviac6i43gtsvmjfg6mzcp6rwgz44axidc7m432btbmvt7i2m2g"), - "reward": mustParseCid("bafk2bzacecbcnlvk2izojpfoaksitqenhzaofn6ynxx5pegl4y45wjlouexdi"), - "storagemarket": mustParseCid("bafk2bzacebobteeoz2jycplgtydfyltzughegz2sopn6pzy2udjfvuo77joyk"), - "storageminer": mustParseCid("bafk2bzacecwcypas3y6u4rya7qolfwmou437xgrjxh7mnnim7bo3nhk4dscxw"), - "storagepower": mustParseCid("bafk2bzacec62kids6rcrdmdeqhwiz3s5rs35s5gn25ilwemgmm6jqnr2rnaaq"), - "system": mustParseCid("bafk2bzacecj3c4bjbs2xfttn7zqle7yocqh47u2s7hwuxrsn7fi5h74tcyxoc"), - "verifiedregistry": mustParseCid("bafk2bzacedgf7zbnlste5ukzueduemkimiit64scz7lvebztufx5jxtx6gkz2"), + "account": mustParseCid("bafk2bzaced52tigw7332nbwmntkhc3cbnhfwofxjgmgbb4a4zrz32ssoryoa2"), + "cron": mustParseCid("bafk2bzacecvbqhnxwrbdcmkby6gbancdegzpd5deur2gwz7m4jofqqvuwzjlq"), + "datacap": mustParseCid("bafk2bzacebsbpmcmu6iulwsyqfvvlmb3gb7wkikomxelic7q4edwm2se3mmkw"), + "eam": mustParseCid("bafk2bzacedlitpm3xq6ccwvagen74j33g4b5modvhmdyfdp3zgugdzi5i7zca"), + "embryo": mustParseCid("bafk2bzaceax2tehd7m42kxf3z56hjj67buzucn5cj2456daz5yj4ai5txs2r4"), + "ethaccount": mustParseCid("bafk2bzaceb3lxonodwk37f2oir6bniided2igfmzyguahvbr2jboqxtw36msg"), + "evm": mustParseCid("bafk2bzacedcd6nssqvrkhj5poggswcsx6nwhp6c35r7qdcuhpr3n3n7hvt4io"), + "init": mustParseCid("bafk2bzacebpxqu3snf35csvq3xhammyksous2vq3b5vo4j4wcmisfefc2g3im"), + "multisig": mustParseCid("bafk2bzaceayuaank6skp6vjemcpkkrq3j27aqdj7dxbz4zsrg4jrlgdqv4lki"), + "paymentchannel": mustParseCid("bafk2bzacebq4cq3bwtcwkqlogeeb2kd2wszi574qpeerlnyu6ue7uaa5yhrs6"), + "reward": mustParseCid("bafk2bzacebyps7ufqmyoleu2l6khm2f5lm4f7fdetsel2dkhob6ap3mncz3f4"), + "storagemarket": mustParseCid("bafk2bzacearla63zfijzysmg7bq53px5meslo6bs57wc22unepsb5vq2kmbxa"), + "storageminer": mustParseCid("bafk2bzacedwn3amkxwp5gfn3padbtstzukoxdny4zb3i72vtfyecf5qqfmx6c"), + "storagepower": mustParseCid("bafk2bzaceaqj4nwaekiczhqa5c3ijoj2qdtf6zyny573ybh5agk2wyfn5hrwa"), + "system": mustParseCid("bafk2bzacecnu27jhvsccspft5nlnava5ymj53qid2tvtoa5gq3whixejuqzc2"), + "verifiedregistry": mustParseCid("bafk2bzaceb5a3hot67g62augmuxmeu7nzwy4eputtdd5w6ncuhheycjzwbucu"), }, }, { Network: "testing", @@ -323,23 +328,24 @@ var EmbeddedBuiltinActorsMetadata []*BuiltinActorsMetadata = []*BuiltinActorsMet }, { Network: "testing", Version: 10, - ManifestCid: mustParseCid("bafy2bzacearlgbespxi2zdrybtp2rrbwscmtbyou5qa2egbdvcz6v2yjjqvjo"), + ManifestCid: mustParseCid("bafy2bzaceav62uv5asafn2z5ycqtgfbiziym7lkfgdfoauxkjg23qj6lwgo2q"), Actors: map[string]cid.Cid{ - "account": mustParseCid("bafk2bzaceba6me5ipkcijuhyypnzjydhv3ebi2ctailar7mtzlk4vk3rbxfee"), - "cron": mustParseCid("bafk2bzacea6k2mai2xnakygqvbigivfrvv5q7d34qrzjv2crkqtwbjxnxmkbe"), - "datacap": mustParseCid("bafk2bzaceah4oxcgck6bcfkzctm2klpvmltyidq7uxnlkcap6ypi3lnkcvrqk"), - "eam": mustParseCid("bafk2bzacedjtkvocrnkrot2oztsfrxtpwl32wwbmbkrjfbbm4xipwzrhhxn5c"), - "embryo": mustParseCid("bafk2bzacebj2mj5zlcs3yjlgpbznzistfjkdlwaoncjziliqrxqavvz4dcvnk"), - "evm": mustParseCid("bafk2bzaced6vhabkr2ojpjzsybrq5yvksjzpjk6yei6fwobkwwydlj5f473pw"), - "init": mustParseCid("bafk2bzaceaib3o5e7wop7kwjirgpferqarmngrgjkur2yhdnwplctidpxsgme"), - "multisig": mustParseCid("bafk2bzaced4z3awacxumq6yr33a3adu2legb7colahgvqpmigs3fvvjxs3byc"), - "paymentchannel": mustParseCid("bafk2bzaceb6mfi24mpzt7qlkratj2tdtqo7aia67zcztuslrxcjaycz6fnai6"), - "reward": mustParseCid("bafk2bzacebngh5kwtem4ncarpjtxhs4rwyoficttkgxlsjtiz5ucdi4p3czoc"), - "storagemarket": mustParseCid("bafk2bzacecnsibyil62jfq2gbkoe6c2epehfcrxzjmqjnwz7kxab2hkbu3lks"), - "storageminer": mustParseCid("bafk2bzacedzw4vkrt3sdkhagpvn62pknyyjkcrzewncvtvae5qgwe6ulzx4a4"), - "storagepower": mustParseCid("bafk2bzacedxgadibot6nzvripqt3z5shvjsoscupinejnsvswq4cbeskblwyy"), - "system": mustParseCid("bafk2bzacedm24avrmp5o5odhpad43qeglooflygwh4ah7qnzbij2h4c3v6cge"), - "verifiedregistry": mustParseCid("bafk2bzaceapq3j6ww3ofytwq3pz3obumaqsyg3wrm6tksdh7op23a72co3rya"), + "account": mustParseCid("bafk2bzacedv3nqh7an5mruvymqd3yfo4llb2fkplfyuygoyjmw6zvms3getk6"), + "cron": mustParseCid("bafk2bzacebavz62zzbji2titwdal4gynm5izzpinvqxcuqzx2pcfazemknw56"), + "datacap": mustParseCid("bafk2bzacebtexhugokrbrftjrf5wyisv2kmz6gjngn5btzb2jcwi5rswlwswo"), + "eam": mustParseCid("bafk2bzacecejdlqwa4owqjx6vd7szgsl7eliwme4xkggch6qmdz4egei7ugrq"), + "embryo": mustParseCid("bafk2bzaceax2tehd7m42kxf3z56hjj67buzucn5cj2456daz5yj4ai5txs2r4"), + "ethaccount": mustParseCid("bafk2bzacedk3tsjwvjmvublhroesm7jwg7oymydo7zg35zfrqm327ojeizkoi"), + "evm": mustParseCid("bafk2bzacedgtmzatizm3l6e5qis7lzuodq2ky5brjladxxocsws2hbp2fgqzc"), + "init": mustParseCid("bafk2bzaceaevlnwyust4hjmmqx2owyy3x3pdmonjtqlwilfqxy4vidz32cbaq"), + "multisig": mustParseCid("bafk2bzacea6qbjyvq7uo66priz6maqluwjt7dfljv5xmzbm5guumqdmpak6ta"), + "paymentchannel": mustParseCid("bafk2bzacebcc5vdwkwizjjipy5mnk5ymneititrm7g6bcolvvnejys75qk7xg"), + "reward": mustParseCid("bafk2bzaceaycrdfmsayqyd5c6lxy6wevpkey57hrzukg7bcmctrccajzhl3oi"), + "storagemarket": mustParseCid("bafk2bzacecgpuwjbzvscr4stwclatt52xepd5yhcv3yzr6sfoijefiyi2blbu"), + "storageminer": mustParseCid("bafk2bzacedb77qv4zajpgjylvpuyephiffhavd4iujbmc7s2epkgbbkaijozg"), + "storagepower": mustParseCid("bafk2bzacealijkzu3qcehojibkth7kkhbi4v5ilxm6g5vhdn3apb3dfwuqgta"), + "system": mustParseCid("bafk2bzaceb3i3oqv5plkzrakukaphr2nq3q5sk55hmilmznfyshmthg7ybduq"), + "verifiedregistry": mustParseCid("bafk2bzaceb5n547gmp6idmulnlnxm3hoa3ib6x3yuzoilhim3r4u4acodka7e"), }, }, { Network: "testing-fake-proofs", @@ -379,23 +385,24 @@ var EmbeddedBuiltinActorsMetadata []*BuiltinActorsMetadata = []*BuiltinActorsMet }, { Network: "testing-fake-proofs", Version: 10, - ManifestCid: mustParseCid("bafy2bzacea4irr2oxhclwt4mvtrevbzb7mbqddcebjz7bkqjq6eoflpfhencc"), + ManifestCid: mustParseCid("bafy2bzacebqopajwertdqzuklkqudhqh5coa6zhbj4zhkqkumlhjtn7gyzb3k"), Actors: map[string]cid.Cid{ - "account": mustParseCid("bafk2bzaceba6me5ipkcijuhyypnzjydhv3ebi2ctailar7mtzlk4vk3rbxfee"), - "cron": mustParseCid("bafk2bzacea6k2mai2xnakygqvbigivfrvv5q7d34qrzjv2crkqtwbjxnxmkbe"), - "datacap": mustParseCid("bafk2bzaceah4oxcgck6bcfkzctm2klpvmltyidq7uxnlkcap6ypi3lnkcvrqk"), - "eam": mustParseCid("bafk2bzacedjtkvocrnkrot2oztsfrxtpwl32wwbmbkrjfbbm4xipwzrhhxn5c"), - "embryo": mustParseCid("bafk2bzacebj2mj5zlcs3yjlgpbznzistfjkdlwaoncjziliqrxqavvz4dcvnk"), - "evm": mustParseCid("bafk2bzaced6vhabkr2ojpjzsybrq5yvksjzpjk6yei6fwobkwwydlj5f473pw"), - "init": mustParseCid("bafk2bzaceaib3o5e7wop7kwjirgpferqarmngrgjkur2yhdnwplctidpxsgme"), - "multisig": mustParseCid("bafk2bzaced4z3awacxumq6yr33a3adu2legb7colahgvqpmigs3fvvjxs3byc"), - "paymentchannel": mustParseCid("bafk2bzaceb6mfi24mpzt7qlkratj2tdtqo7aia67zcztuslrxcjaycz6fnai6"), - "reward": mustParseCid("bafk2bzacebngh5kwtem4ncarpjtxhs4rwyoficttkgxlsjtiz5ucdi4p3czoc"), - "storagemarket": mustParseCid("bafk2bzacecnsibyil62jfq2gbkoe6c2epehfcrxzjmqjnwz7kxab2hkbu3lks"), - "storageminer": mustParseCid("bafk2bzaceb4grddnw54gczgcdak5a2gqvwed66mhibbug6qu4jy35bf45jltg"), - "storagepower": mustParseCid("bafk2bzacedp2dnbk4bg3hhaeztre4q3jv7eqs267rlafszpggb2njjn3x5eru"), - "system": mustParseCid("bafk2bzacedm24avrmp5o5odhpad43qeglooflygwh4ah7qnzbij2h4c3v6cge"), - "verifiedregistry": mustParseCid("bafk2bzaceapq3j6ww3ofytwq3pz3obumaqsyg3wrm6tksdh7op23a72co3rya"), + "account": mustParseCid("bafk2bzacedv3nqh7an5mruvymqd3yfo4llb2fkplfyuygoyjmw6zvms3getk6"), + "cron": mustParseCid("bafk2bzacebavz62zzbji2titwdal4gynm5izzpinvqxcuqzx2pcfazemknw56"), + "datacap": mustParseCid("bafk2bzacebtexhugokrbrftjrf5wyisv2kmz6gjngn5btzb2jcwi5rswlwswo"), + "eam": mustParseCid("bafk2bzacecejdlqwa4owqjx6vd7szgsl7eliwme4xkggch6qmdz4egei7ugrq"), + "embryo": mustParseCid("bafk2bzaceax2tehd7m42kxf3z56hjj67buzucn5cj2456daz5yj4ai5txs2r4"), + "ethaccount": mustParseCid("bafk2bzacedk3tsjwvjmvublhroesm7jwg7oymydo7zg35zfrqm327ojeizkoi"), + "evm": mustParseCid("bafk2bzacedgtmzatizm3l6e5qis7lzuodq2ky5brjladxxocsws2hbp2fgqzc"), + "init": mustParseCid("bafk2bzaceaevlnwyust4hjmmqx2owyy3x3pdmonjtqlwilfqxy4vidz32cbaq"), + "multisig": mustParseCid("bafk2bzacea6qbjyvq7uo66priz6maqluwjt7dfljv5xmzbm5guumqdmpak6ta"), + "paymentchannel": mustParseCid("bafk2bzacebcc5vdwkwizjjipy5mnk5ymneititrm7g6bcolvvnejys75qk7xg"), + "reward": mustParseCid("bafk2bzaceaycrdfmsayqyd5c6lxy6wevpkey57hrzukg7bcmctrccajzhl3oi"), + "storagemarket": mustParseCid("bafk2bzacecgpuwjbzvscr4stwclatt52xepd5yhcv3yzr6sfoijefiyi2blbu"), + "storageminer": mustParseCid("bafk2bzacecka5zpyelv62iuqya6vfbhabhqc4qtugpe7po6kayy2v4yntzrl2"), + "storagepower": mustParseCid("bafk2bzacearjt7hf56on3qotxaxacrz3vqbdckuxf32m6azhu56oisi3j62xo"), + "system": mustParseCid("bafk2bzaceb3i3oqv5plkzrakukaphr2nq3q5sk55hmilmznfyshmthg7ybduq"), + "verifiedregistry": mustParseCid("bafk2bzaceb5n547gmp6idmulnlnxm3hoa3ib6x3yuzoilhim3r4u4acodka7e"), }, }} diff --git a/venus-shared/actors/builtin_actors_test.go b/venus-shared/actors/builtin_actors_test.go index 1e4af87454..62aba2e6ae 100644 --- a/venus-shared/actors/builtin_actors_test.go +++ b/venus-shared/actors/builtin_actors_test.go @@ -4,6 +4,7 @@ import ( "testing" actorstypes "github.com/filecoin-project/go-state-types/actors" + "github.com/filecoin-project/go-state-types/manifest" "github.com/stretchr/testify/require" ) @@ -21,7 +22,7 @@ func TestRegistration(t *testing.T) { require.True(t, found) require.True(t, manifestCid.Defined()) - for _, key := range GetBuiltinActorsKeys(actorstypes.Version8) { + for _, key := range manifest.GetBuiltinActorsKeys(actorstypes.Version8) { actorCid, found := GetActorCodeID(actorstypes.Version8, key) require.True(t, found) name, version, found := GetActorMetaByCode(actorCid) diff --git a/venus-shared/actors/manifest.go b/venus-shared/actors/manifest.go index aefd711d61..9ce11e05bb 100644 --- a/venus-shared/actors/manifest.go +++ b/venus-shared/actors/manifest.go @@ -17,47 +17,6 @@ var manifestCids map[actorstypes.Version]cid.Cid = make(map[actorstypes.Version] var manifests map[actorstypes.Version]map[string]cid.Cid = make(map[actorstypes.Version]map[string]cid.Cid) var actorMeta map[cid.Cid]actorEntry = make(map[cid.Cid]actorEntry) -const ( - AccountKey = "account" - CronKey = "cron" - InitKey = "init" - MarketKey = "storagemarket" - MinerKey = "storageminer" - MultisigKey = "multisig" - PaychKey = "paymentchannel" - PowerKey = "storagepower" - RewardKey = "reward" - SystemKey = "system" - VerifregKey = "verifiedregistry" - DatacapKey = "datacap" - EvmKey = "evm" - EamKey = "eam" - EmbryoKey = "embryo" -) - -func GetBuiltinActorsKeys(av actorstypes.Version) []string { - keys := []string{ - AccountKey, - CronKey, - InitKey, - MarketKey, - MinerKey, - MultisigKey, - PaychKey, - PowerKey, - RewardKey, - SystemKey, - VerifregKey, - } - if av >= 9 { - keys = append(keys, DatacapKey) - } - if av >= 10 { - keys = append(keys, EvmKey, EamKey, EmbryoKey) - } - return keys -} - var ( manifestMx sync.RWMutex ) diff --git a/venus-shared/compatible-checks/actor-sources.txt b/venus-shared/compatible-checks/actor-sources.txt index 882bd26c07..4a2018bccf 100644 --- a/venus-shared/compatible-checks/actor-sources.txt +++ b/venus-shared/compatible-checks/actor-sources.txt @@ -35,6 +35,7 @@ SOURCES IN chain/actors: builtin/datacap/util.go builtin/datacap/v10.go builtin/datacap/v9.go + builtin/embryo.go builtin/evm/evm.go builtin/evm/v10.go builtin/init/diff.go diff --git a/venus-shared/compatible-checks/api-checksum.txt b/venus-shared/compatible-checks/api-checksum.txt index 250e2bb2ed..fe6d4f16bf 100644 --- a/venus-shared/compatible-checks/api-checksum.txt +++ b/venus-shared/compatible-checks/api-checksum.txt @@ -282,6 +282,28 @@ api.FullNode: Closing: In=1, Out=2, CheckSum=3e0dae65a2378c12be14cee8a60a3bfe CreateBackup: In=2, Out=1, CheckSum=7b0679c2c73ab9606a7da21c5251ad19 Discover: In=1, Out=2, CheckSum=09640e20c6d71c3e96c7a56c8698acc9 + EthAccounts: In=1, Out=2, CheckSum=d2d1b2a1ffc7dc9b28e8c64c79147670 + EthBlockNumber: In=1, Out=2, CheckSum=442f3dc12ea5a22b7b8fea633069692a + EthCall: In=3, Out=2, CheckSum=64610416ed5674a0c717908d51904008 + EthChainId: In=1, Out=2, CheckSum=442f3dc12ea5a22b7b8fea633069692a + EthEstimateGas: In=2, Out=2, CheckSum=f4d63e320f2fb2778b210a925516a114 + EthFeeHistory: In=4, Out=2, CheckSum=9164bb73179979bdbcd52af8c63a56d4 + EthGasPrice: In=1, Out=2, CheckSum=e2f5588dddfc36a9cdef0fad6f4db93e + EthGetBalance: In=3, Out=2, CheckSum=a35a35a610cd3193c836ce7d61f5a05a + EthGetBlockByHash: In=3, Out=2, CheckSum=606bca6c962d8e2d4e0b8bb14e8fa0a9 + EthGetBlockByNumber: In=3, Out=2, CheckSum=9d82b96bb03c2de85dc7a31e7d4c45d2 + EthGetBlockTransactionCountByHash: In=2, Out=2, CheckSum=aea75f99eaccb878b97512a29568c204 + EthGetBlockTransactionCountByNumber: In=2, Out=2, CheckSum=2c3bfb8fef7edce8563d84eab6e9bf4f + EthGetCode: In=3, Out=2, CheckSum=cdfa3798431df16537bf990bfee6dbe1 + EthGetStorageAt: In=4, Out=2, CheckSum=e505cd577c7257ac17fe6f48e5ebbd42 + EthGetTransactionByBlockHashAndIndex: In=3, Out=2, CheckSum=13509ac07867df1e4009e81b23765a42 + EthGetTransactionByBlockNumberAndIndex: In=3, Out=2, CheckSum=6fdf4dad9476e44749e4e5308bd28312 + EthGetTransactionByHash: In=2, Out=2, CheckSum=8b646987054551f0bf8ccf342d4d0a93 + EthGetTransactionCount: In=3, Out=2, CheckSum=be1148526dd6b62c4f74ce21c9b6585e + EthGetTransactionReceipt: In=2, Out=2, CheckSum=af6d9dda90fdb0f9427498580b9481a6 + EthMaxPriorityFeePerGas: In=1, Out=2, CheckSum=e2f5588dddfc36a9cdef0fad6f4db93e + EthProtocolVersion: In=1, Out=2, CheckSum=442f3dc12ea5a22b7b8fea633069692a + EthSendRawTransaction: In=2, Out=2, CheckSum=f63e0b205164d628bc8022b6d5a496f5 GasEstimateFeeCap: In=4, Out=2, CheckSum=0fcac02de1d21c9ac6e10696a6499eba GasEstimateGasLimit: In=3, Out=2, CheckSum=4d1bd57eef0ee90d4c2e89f097d0604d GasEstimateGasPremium: In=5, Out=2, CheckSum=550724ed37e2fdaa64e55147e82214b1 @@ -344,6 +366,7 @@ api.FullNode: NetDisconnect: In=2, Out=1, CheckSum=5ac3aa2dccdc990c45ca8ef35b1bdb9f NetFindPeer: In=2, Out=2, CheckSum=9f9de93a69acd82e4195b253d17a9e8b NetLimit: In=2, Out=2, CheckSum=9a35d6e94508e633a1cc5c5dc3f983eb + NetListening: In=1, Out=2, CheckSum=de305c848673f2b095e6cfdecdaf85c3 NetPeerInfo: In=2, Out=2, CheckSum=2f530e3029ddebf897c3d3029ad763bf NetPeers: In=1, Out=2, CheckSum=165dfc6f0c55818a2e2be3fcacea8045 NetPing: In=2, Out=2, CheckSum=31c80ab2bc55adad54a85e38b45430b7 @@ -353,6 +376,7 @@ api.FullNode: NetPubsubScores: In=1, Out=2, CheckSum=66c7a1061de3d6e11d39ce90692aa885 NetSetLimit: In=3, Out=1, CheckSum=f591c226feead6f0c1d9442a2320cd1e NetStat: In=2, Out=2, CheckSum=82ea34376644e023a4314cde3fb1e4fc + NetVersion: In=1, Out=2, CheckSum=be418036949143c75c2d83aed9a66229 NodeStatus: In=2, Out=2, CheckSum=b46530b68171c85301db86c1b7c19824 PaychAllocateLane: In=2, Out=2, CheckSum=2f0992ed1f0be8ff9bee0c3f0a39e1e1 PaychAvailableFunds: In=2, Out=2, CheckSum=f40942f65ce181601e7bc49e6378a89c diff --git a/venus-shared/compatible-checks/api-diff.txt b/venus-shared/compatible-checks/api-diff.txt index 12841d7baf..4096fc76fe 100644 --- a/venus-shared/compatible-checks/api-diff.txt +++ b/venus-shared/compatible-checks/api-diff.txt @@ -156,28 +156,6 @@ github.com/filecoin-project/venus/venus-shared/api/chain/v1.FullNode <> github.c + Concurrent - CreateBackup - Discover - + EthAccounts - + EthBlockNumber - + EthCall - + EthChainId - + EthEstimateGas - + EthFeeHistory - + EthGasPrice - + EthGetBalance - + EthGetBlockByHash - + EthGetBlockByNumber - + EthGetBlockTransactionCountByHash - + EthGetBlockTransactionCountByNumber - + EthGetCode - + EthGetStorageAt - + EthGetTransactionByBlockHashAndIndex - + EthGetTransactionByBlockNumberAndIndex - + EthGetTransactionByHash - + EthGetTransactionCount - + EthGetTransactionReceipt - + EthMaxPriorityFeePerGas - + EthProtocolVersion - + EthSendRawTransaction + GasBatchEstimateMessageGas > GasEstimateMessageGas {[func(context.Context, *internal.Message, *types.MessageSendSpec, types.TipSetKey) (*internal.Message, error) <> func(context.Context, *types.Message, *api.MessageSendSpec, types.TipSetKey) (*types.Message, error)] base=func in type: #2 input; nested={[*types.MessageSendSpec <> *api.MessageSendSpec] base=pointed type; nested={[types.MessageSendSpec <> api.MessageSendSpec] base=struct field; nested={[types.MessageSendSpec <> api.MessageSendSpec] base=exported fields count: 3 != 2; nested=nil}}}} + GetActor @@ -211,10 +189,8 @@ github.com/filecoin-project/venus/venus-shared/api/chain/v1.FullNode <> github.c + NetFindProvidersAsync + NetGetClosestPeers - NetLimit - + NetListening - NetSetLimit - NetStat - + NetVersion + ProtocolParameters - RaftLeader - RaftState diff --git a/venus-shared/compatible-checks/api-perm.txt b/venus-shared/compatible-checks/api-perm.txt index 538e50fcf4..e316dff03e 100644 --- a/venus-shared/compatible-checks/api-perm.txt +++ b/venus-shared/compatible-checks/api-perm.txt @@ -69,30 +69,6 @@ v1: github.com/filecoin-project/venus/venus-shared/api/chain/v1 <> github.com/fi - IChainInfo.VerifyEntry - IMinerState.StateMinerSectorSize - IMinerState.StateMinerWorkerAddress - - IETH.EthAccounts - - IETH.EthBlockNumber - - IETH.EthCall - - IETH.EthChainId - - IETH.EthEstimateGas - - IETH.EthFeeHistory - - IETH.EthGasPrice - - IETH.EthGetBalance - - IETH.EthGetBlockByHash - - IETH.EthGetBlockByNumber - - IETH.EthGetBlockTransactionCountByHash - - IETH.EthGetBlockTransactionCountByNumber - - IETH.EthGetCode - - IETH.EthGetStorageAt - - IETH.EthGetTransactionByBlockHashAndIndex - - IETH.EthGetTransactionByBlockNumberAndIndex - - IETH.EthGetTransactionByHash - - IETH.EthGetTransactionCount - - IETH.EthGetTransactionReceipt - - IETH.EthMaxPriorityFeePerGas - - IETH.EthProtocolVersion - - IETH.EthSendRawTransaction - - IETH.NetListening - - IETH.NetVersion - IMessagePool.GasBatchEstimateMessageGas - IMessagePool.MpoolDeleteByAdress - IMessagePool.MpoolPublishByAddr diff --git a/venus-shared/types/state_types_gen.go b/venus-shared/types/state_types_gen.go index 2cb2407a8e..4b9ab91c1c 100755 --- a/venus-shared/types/state_types_gen.go +++ b/venus-shared/types/state_types_gen.go @@ -193,7 +193,6 @@ const ( EndOfLifeClaimDropPeriod = verifreg.EndOfLifeClaimDropPeriod MaximumVerifiedAllocationExpiration = verifreg.MaximumVerifiedAllocationExpiration MaximumVerifiedAllocationTerm = verifreg.MaximumVerifiedAllocationTerm - MinimumVerifiedAllocationSize = verifreg.MinimumVerifiedAllocationSize MinimumVerifiedAllocationTerm = verifreg.MinimumVerifiedAllocationTerm NoAllocationID = verifreg.NoAllocationID SignatureDomainSeparation_RemoveDataCap = verifreg.SignatureDomainSeparation_RemoveDataCap diff --git a/venus-shared/utils/method_map_test.go b/venus-shared/utils/method_map_test.go index 851783d2a7..b926eaa8a0 100644 --- a/venus-shared/utils/method_map_test.go +++ b/venus-shared/utils/method_map_test.go @@ -3,6 +3,7 @@ package utils import ( "testing" + "github.com/filecoin-project/go-state-types/manifest" tf "github.com/filecoin-project/venus/pkg/testhelpers/testflags" "github.com/filecoin-project/venus/venus-shared/actors" "github.com/filecoin-project/venus/venus-shared/types" @@ -56,7 +57,7 @@ func TestMethodMap(t *testing.T) { // 没有把 v10 actor注入,等注入后移除 func skipEvmActor(name string) bool { - if name == actors.EamKey || name == actors.EvmKey || name == actors.EmbryoKey { + if name == manifest.EamKey || name == manifest.EvmKey || name == manifest.EmbryoKey { return true } return false