cerc-io/lotus
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

Merge pull request #9866 from filecoin-project/gstuart/actor-key-refactor

Browse Source 
chore: Drop actor keys from chain/actors/manifest.go
This commit is contained in:
Aayush Rajasekaran 2022-12-13 20:04:53 -05:00 committed by GitHub
commit 1ddbb417f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
176 changed files with 410 additions and 281 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build/builtin_actors_test.go
View File

@ -6,6 +6,7 @@ import (
"github.com/stretchr/testify/require"
actorstypes "github.com/filecoin-project/go-state-types/actors"
"github.com/filecoin-project/go-state-types/manifest"
"github.com/filecoin-project/lotus/build"
"github.com/filecoin-project/lotus/chain/actors"
@ -26,7 +27,7 @@ func TestRegistration(t *testing.T) {
require.True(t, found)
require.True(t, manifestCid.Defined())
for _, key := range actors.GetBuiltinActorsKeys(av) {
for _, key := range manifest.GetBuiltinActorsKeys(av) {
actorCid, found := actors.GetActorCodeID(av, key)
require.True(t, found)
name, version, found := actors.GetActorMetaByCode(actorCid)

25
chain/actors/actor_cids.go
View File

@ -5,6 +5,7 @@ import (
"golang.org/x/xerrors"
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"
@ -28,7 +29,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:
@ -53,7 +54,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:
@ -78,7 +79,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:
@ -103,7 +104,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:
@ -128,7 +129,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:
@ -153,7 +154,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:
@ -178,7 +179,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:
@ -203,7 +204,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:
@ -228,7 +229,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:
@ -253,7 +254,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:
@ -278,7 +279,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:
@ -314,7 +315,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 {

3
chain/actors/builtin/account/account.go
View File

@ -8,6 +8,7 @@ import (
actorstypes "github.com/filecoin-project/go-state-types/actors"
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"
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"
@ -25,7 +26,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, xerrors.Errorf("actor code is not account: %s", name)
}

3
chain/actors/builtin/account/actor.go.template
View File

@ -11,6 +11,7 @@ import (
"github.com/filecoin-project/lotus/chain/actors/adt"
"github.com/filecoin-project/lotus/chain/types"
"github.com/filecoin-project/go-state-types/manifest"
{{range .versions}}
{{if (le . 7)}}
@ -24,7 +25,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, xerrors.Errorf("actor code is not account: %s", name)
}

3
chain/actors/builtin/account/state.go.template
View File

@ -9,6 +9,7 @@ import (
"github.com/filecoin-project/lotus/chain/actors/adt"
"github.com/filecoin-project/lotus/chain/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"
@ -48,7 +49,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 {

3
chain/actors/builtin/account/v0.go generated
View File

@ -7,6 +7,7 @@ import (
"github.com/filecoin-project/go-address"
actorstypes "github.com/filecoin-project/go-state-types/actors"
"github.com/filecoin-project/go-state-types/manifest"
account0 "github.com/filecoin-project/specs-actors/actors/builtin/account"
"github.com/filecoin-project/lotus/chain/actors"
@ -44,7 +45,7 @@ func (s *state0) GetState() interface{} {
}
func (s *state0) ActorKey() string {
return actors.AccountKey
return manifest.AccountKey
}
func (s *state0) ActorVersion() actorstypes.Version {

3
chain/actors/builtin/account/v10.go generated
View File

@ -8,6 +8,7 @@ import (
"github.com/filecoin-project/go-address"
actorstypes "github.com/filecoin-project/go-state-types/actors"
account10 "github.com/filecoin-project/go-state-types/builtin/v10/account"
"github.com/filecoin-project/go-state-types/manifest"
"github.com/filecoin-project/lotus/chain/actors"
"github.com/filecoin-project/lotus/chain/actors/adt"
@ -44,7 +45,7 @@ func (s *state10) GetState() interface{} {
}
func (s *state10) ActorKey() string {
return actors.AccountKey
return manifest.AccountKey
}
func (s *state10) ActorVersion() actorstypes.Version {

3
chain/actors/builtin/account/v2.go generated
View File

@ -7,6 +7,7 @@ import (
"github.com/filecoin-project/go-address"
actorstypes "github.com/filecoin-project/go-state-types/actors"
"github.com/filecoin-project/go-state-types/manifest"
account2 "github.com/filecoin-project/specs-actors/v2/actors/builtin/account"
"github.com/filecoin-project/lotus/chain/actors"
@ -44,7 +45,7 @@ func (s *state2) GetState() interface{} {
}
func (s *state2) ActorKey() string {
return actors.AccountKey
return manifest.AccountKey
}
func (s *state2) ActorVersion() actorstypes.Version {

3
chain/actors/builtin/account/v3.go generated
View File

@ -7,6 +7,7 @@ import (
"github.com/filecoin-project/go-address"
actorstypes "github.com/filecoin-project/go-state-types/actors"
"github.com/filecoin-project/go-state-types/manifest"
account3 "github.com/filecoin-project/specs-actors/v3/actors/builtin/account"
"github.com/filecoin-project/lotus/chain/actors"
@ -44,7 +45,7 @@ func (s *state3) GetState() interface{} {
}
func (s *state3) ActorKey() string {
return actors.AccountKey
return manifest.AccountKey
}
func (s *state3) ActorVersion() actorstypes.Version {

3
chain/actors/builtin/account/v4.go generated
View File

@ -7,6 +7,7 @@ import (
"github.com/filecoin-project/go-address"
actorstypes "github.com/filecoin-project/go-state-types/actors"
"github.com/filecoin-project/go-state-types/manifest"
account4 "github.com/filecoin-project/specs-actors/v4/actors/builtin/account"
"github.com/filecoin-project/lotus/chain/actors"
@ -44,7 +45,7 @@ func (s *state4) GetState() interface{} {
}
func (s *state4) ActorKey() string {
return actors.AccountKey
return manifest.AccountKey
}
func (s *state4) ActorVersion() actorstypes.Version {

3
chain/actors/builtin/account/v5.go generated
View File

@ -7,6 +7,7 @@ import (
"github.com/filecoin-project/go-address"
actorstypes "github.com/filecoin-project/go-state-types/actors"
"github.com/filecoin-project/go-state-types/manifest"
account5 "github.com/filecoin-project/specs-actors/v5/actors/builtin/account"
"github.com/filecoin-project/lotus/chain/actors"
@ -44,7 +45,7 @@ func (s *state5) GetState() interface{} {
}
func (s *state5) ActorKey() string {
return actors.AccountKey
return manifest.AccountKey
}
func (s *state5) ActorVersion() actorstypes.Version {

3
chain/actors/builtin/account/v6.go generated
View File

@ -7,6 +7,7 @@ import (
"github.com/filecoin-project/go-address"
actorstypes "github.com/filecoin-project/go-state-types/actors"
"github.com/filecoin-project/go-state-types/manifest"
account6 "github.com/filecoin-project/specs-actors/v6/actors/builtin/account"
"github.com/filecoin-project/lotus/chain/actors"
@ -44,7 +45,7 @@ func (s *state6) GetState() interface{} {
}
func (s *state6) ActorKey() string {
return actors.AccountKey
return manifest.AccountKey
}
func (s *state6) ActorVersion() actorstypes.Version {

3
chain/actors/builtin/account/v7.go generated
View File

@ -7,6 +7,7 @@ import (
"github.com/filecoin-project/go-address"
actorstypes "github.com/filecoin-project/go-state-types/actors"
"github.com/filecoin-project/go-state-types/manifest"
account7 "github.com/filecoin-project/specs-actors/v7/actors/builtin/account"
"github.com/filecoin-project/lotus/chain/actors"
@ -44,7 +45,7 @@ func (s *state7) GetState() interface{} {
}
func (s *state7) ActorKey() string {
return actors.AccountKey
return manifest.AccountKey
}
func (s *state7) ActorVersion() actorstypes.Version {

3
chain/actors/builtin/account/v8.go generated
View File

@ -8,6 +8,7 @@ import (
"github.com/filecoin-project/go-address"
actorstypes "github.com/filecoin-project/go-state-types/actors"
account8 "github.com/filecoin-project/go-state-types/builtin/v8/account"
"github.com/filecoin-project/go-state-types/manifest"
"github.com/filecoin-project/lotus/chain/actors"
"github.com/filecoin-project/lotus/chain/actors/adt"
@ -44,7 +45,7 @@ func (s *state8) GetState() interface{} {
}
func (s *state8) ActorKey() string {
return actors.AccountKey
return manifest.AccountKey
}
func (s *state8) ActorVersion() actorstypes.Version {

3
chain/actors/builtin/account/v9.go generated
View File

@ -8,6 +8,7 @@ import (
"github.com/filecoin-project/go-address"
actorstypes "github.com/filecoin-project/go-state-types/actors"
account9 "github.com/filecoin-project/go-state-types/builtin/v9/account"
"github.com/filecoin-project/go-state-types/manifest"
"github.com/filecoin-project/lotus/chain/actors"
"github.com/filecoin-project/lotus/chain/actors/adt"
@ -44,7 +45,7 @@ func (s *state9) GetState() interface{} {
}
func (s *state9) ActorKey() string {
return actors.AccountKey
return manifest.AccountKey
}
func (s *state9) ActorVersion() actorstypes.Version {

5
chain/actors/builtin/builtin.go
View File

@ -10,6 +10,7 @@ import (
"github.com/filecoin-project/go-state-types/builtin"
smoothingtypes "github.com/filecoin-project/go-state-types/builtin/v8/util/smoothing"
minertypes "github.com/filecoin-project/go-state-types/builtin/v9/miner"
"github.com/filecoin-project/go-state-types/manifest"
"github.com/filecoin-project/go-state-types/proof"
builtin0 "github.com/filecoin-project/specs-actors/actors/builtin"
builtin2 "github.com/filecoin-project/specs-actors/v2/actors/builtin"
@ -165,7 +166,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 {
@ -202,7 +203,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 {

5
chain/actors/builtin/builtin.go.template
View File

@ -15,6 +15,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/lotus/chain/actors"
@ -107,7 +108,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}}
@ -123,7 +124,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}}

3
chain/actors/builtin/cron/actor.go.template
View File

@ -7,6 +7,7 @@ import (
"github.com/filecoin-project/lotus/chain/actors/adt"
"golang.org/x/xerrors"
"github.com/filecoin-project/lotus/chain/types"
"github.com/filecoin-project/go-state-types/manifest"
{{range .versions}}
{{if (le . 7)}}
@ -18,7 +19,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, xerrors.Errorf("actor code is not cron: %s", name)
}

3
chain/actors/builtin/cron/cron.go
View File

@ -6,6 +6,7 @@ import (
actorstypes "github.com/filecoin-project/go-state-types/actors"
builtin10 "github.com/filecoin-project/go-state-types/builtin"
"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"
@ -21,7 +22,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, xerrors.Errorf("actor code is not cron: %s", name)
}

3
chain/actors/builtin/cron/state.go.template
View File

@ -7,6 +7,7 @@ import (
"github.com/filecoin-project/lotus/chain/actors/adt"
"github.com/filecoin-project/lotus/chain/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"
@ -42,7 +43,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 {

3
chain/actors/builtin/cron/v0.go generated
View File

@ -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"
cron0 "github.com/filecoin-project/specs-actors/actors/builtin/cron"
"github.com/filecoin-project/lotus/chain/actors"
@ -39,7 +40,7 @@ func (s *state0) GetState() interface{} {
}
func (s *state0) ActorKey() string {
return actors.CronKey
return manifest.CronKey
}
func (s *state0) ActorVersion() actorstypes.Version {

3
chain/actors/builtin/cron/v10.go generated
View File

@ -7,6 +7,7 @@ import (
actorstypes "github.com/filecoin-project/go-state-types/actors"
cron10 "github.com/filecoin-project/go-state-types/builtin/v10/cron"
"github.com/filecoin-project/go-state-types/manifest"
"github.com/filecoin-project/lotus/chain/actors"
"github.com/filecoin-project/lotus/chain/actors/adt"
@ -39,7 +40,7 @@ func (s *state10) GetState() interface{} {
}
func (s *state10) ActorKey() string {
return actors.CronKey
return manifest.CronKey
}
func (s *state10) ActorVersion() actorstypes.Version {

3
chain/actors/builtin/cron/v2.go generated
View File

@ -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"
cron2 "github.com/filecoin-project/specs-actors/v2/actors/builtin/cron"
"github.com/filecoin-project/lotus/chain/actors"
@ -39,7 +40,7 @@ func (s *state2) GetState() interface{} {
}
func (s *state2) ActorKey() string {
return actors.CronKey
return manifest.CronKey
}
func (s *state2) ActorVersion() actorstypes.Version {

3
chain/actors/builtin/cron/v3.go generated
View File

@ -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"
cron3 "github.com/filecoin-project/specs-actors/v3/actors/builtin/cron"
"github.com/filecoin-project/lotus/chain/actors"
@ -39,7 +40,7 @@ func (s *state3) GetState() interface{} {
}
func (s *state3) ActorKey() string {
return actors.CronKey
return manifest.CronKey
}
func (s *state3) ActorVersion() actorstypes.Version {

3
chain/actors/builtin/cron/v4.go generated
View File

@ -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"
cron4 "github.com/filecoin-project/specs-actors/v4/actors/builtin/cron"
"github.com/filecoin-project/lotus/chain/actors"
@ -39,7 +40,7 @@ func (s *state4) GetState() interface{} {
}
func (s *state4) ActorKey() string {
return actors.CronKey
return manifest.CronKey
}
func (s *state4) ActorVersion() actorstypes.Version {

3
chain/actors/builtin/cron/v5.go generated
View File

@ -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"
cron5 "github.com/filecoin-project/specs-actors/v5/actors/builtin/cron"
"github.com/filecoin-project/lotus/chain/actors"
@ -39,7 +40,7 @@ func (s *state5) GetState() interface{} {
}
func (s *state5) ActorKey() string {
return actors.CronKey
return manifest.CronKey
}
func (s *state5) ActorVersion() actorstypes.Version {

3
chain/actors/builtin/cron/v6.go generated
View File

@ -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"
cron6 "github.com/filecoin-project/specs-actors/v6/actors/builtin/cron"
"github.com/filecoin-project/lotus/chain/actors"
@ -39,7 +40,7 @@ func (s *state6) GetState() interface{} {
}
func (s *state6) ActorKey() string {
return actors.CronKey
return manifest.CronKey
}
func (s *state6) ActorVersion() actorstypes.Version {

3
chain/actors/builtin/cron/v7.go generated
View File

@ -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"
cron7 "github.com/filecoin-project/specs-actors/v7/actors/builtin/cron"
"github.com/filecoin-project/lotus/chain/actors"
@ -39,7 +40,7 @@ func (s *state7) GetState() interface{} {
}
func (s *state7) ActorKey() string {
return actors.CronKey
return manifest.CronKey
}
func (s *state7) ActorVersion() actorstypes.Version {

3
chain/actors/builtin/cron/v8.go generated
View File

@ -7,6 +7,7 @@ import (
actorstypes "github.com/filecoin-project/go-state-types/actors"
cron8 "github.com/filecoin-project/go-state-types/builtin/v8/cron"
"github.com/filecoin-project/go-state-types/manifest"
"github.com/filecoin-project/lotus/chain/actors"
"github.com/filecoin-project/lotus/chain/actors/adt"
@ -39,7 +40,7 @@ func (s *state8) GetState() interface{} {
}
func (s *state8) ActorKey() string {
return actors.CronKey
return manifest.CronKey
}
func (s *state8) ActorVersion() actorstypes.Version {

3
chain/actors/builtin/cron/v9.go generated
View File

@ -7,6 +7,7 @@ import (
actorstypes "github.com/filecoin-project/go-state-types/actors"
cron9 "github.com/filecoin-project/go-state-types/builtin/v9/cron"
"github.com/filecoin-project/go-state-types/manifest"
"github.com/filecoin-project/lotus/chain/actors"
"github.com/filecoin-project/lotus/chain/actors/adt"
@ -39,7 +40,7 @@ func (s *state9) GetState() interface{} {
}
func (s *state9) ActorKey() string {
return actors.CronKey
return manifest.CronKey
}
func (s *state9) ActorVersion() actorstypes.Version {

3
chain/actors/builtin/datacap/actor.go.template
View File

@ -14,6 +14,7 @@ import (
"github.com/filecoin-project/lotus/chain/actors"
"github.com/filecoin-project/lotus/chain/actors/adt"
"github.com/filecoin-project/lotus/chain/types"
"github.com/filecoin-project/go-state-types/manifest"
)
var (
@ -23,7 +24,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, xerrors.Errorf("actor code is not datacap: %s", name)
}

3
chain/actors/builtin/datacap/datacap.go
View File

@ -9,6 +9,7 @@ import (
actorstypes "github.com/filecoin-project/go-state-types/actors"
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/lotus/chain/actors"
"github.com/filecoin-project/lotus/chain/actors/adt"
@ -22,7 +23,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, xerrors.Errorf("actor code is not datacap: %s", name)
}

3
chain/actors/builtin/datacap/state.go.template
View File

@ -12,6 +12,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)
@ -63,7 +64,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 {

3
chain/actors/builtin/datacap/v10.go generated
View File

@ -10,6 +10,7 @@ import (
actorstypes "github.com/filecoin-project/go-state-types/actors"
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"
"github.com/filecoin-project/lotus/chain/actors"
"github.com/filecoin-project/lotus/chain/actors/adt"
@ -64,7 +65,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 {

3
chain/actors/builtin/datacap/v9.go generated
View File

@ -10,6 +10,7 @@ import (
actorstypes "github.com/filecoin-project/go-state-types/actors"
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"
"github.com/filecoin-project/lotus/chain/actors"
"github.com/filecoin-project/lotus/chain/actors/adt"
@ -64,7 +65,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 {

3
chain/actors/builtin/evm/actor.go.template
View File

@ -10,6 +10,7 @@ import (
"github.com/filecoin-project/lotus/chain/actors"
"github.com/filecoin-project/lotus/chain/actors/adt"
"github.com/filecoin-project/lotus/chain/types"
"github.com/filecoin-project/go-state-types/manifest"
builtin{{.latestVersion}} "github.com/filecoin-project/go-state-types/builtin"
)
@ -18,7 +19,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, xerrors.Errorf("actor code is not evm: %s", name)
}

3
chain/actors/builtin/evm/evm.go
View File

@ -7,6 +7,7 @@ import (
actorstypes "github.com/filecoin-project/go-state-types/actors"
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/lotus/chain/actors"
"github.com/filecoin-project/lotus/chain/actors/adt"
@ -17,7 +18,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, xerrors.Errorf("actor code is not evm: %s", name)
}

3
chain/actors/builtin/init/actor.go.template
View File

@ -13,6 +13,7 @@ import (
"github.com/filecoin-project/lotus/chain/actors/adt"
"github.com/filecoin-project/lotus/chain/types"
"github.com/filecoin-project/lotus/node/modules/dtypes"
"github.com/filecoin-project/go-state-types/manifest"
{{range .versions}}
{{if (le . 7)}}
builtin{{.}} "github.com/filecoin-project/specs-actors{{import .}}actors/builtin"
@ -28,7 +29,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, xerrors.Errorf("actor code is not init: %s", name)
}

3
chain/actors/builtin/init/init.go
View File

@ -9,6 +9,7 @@ import (
actorstypes "github.com/filecoin-project/go-state-types/actors"
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"
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"
@ -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, xerrors.Errorf("actor code is not init: %s", name)
}

3
chain/actors/builtin/init/state.go.template
View File

@ -14,6 +14,7 @@ import (
"github.com/filecoin-project/lotus/chain/actors/adt"
actorstypes "github.com/filecoin-project/go-state-types/actors"
"github.com/filecoin-project/lotus/node/modules/dtypes"
"github.com/filecoin-project/go-state-types/manifest"
{{if (le .v 7)}}
{{if (ge .v 3)}}
@ -148,7 +149,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 {

3
chain/actors/builtin/init/v0.go generated
View File

@ -11,6 +11,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"
init0 "github.com/filecoin-project/specs-actors/actors/builtin/init"
adt0 "github.com/filecoin-project/specs-actors/actors/util/adt"
@ -128,7 +129,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 {

3
chain/actors/builtin/init/v10.go generated
View File

@ -14,6 +14,7 @@ import (
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"
"github.com/filecoin-project/go-state-types/manifest"
"github.com/filecoin-project/lotus/chain/actors"
"github.com/filecoin-project/lotus/chain/actors/adt"
@ -129,7 +130,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 {

3
chain/actors/builtin/init/v2.go generated
View File

@ -11,6 +11,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"
init2 "github.com/filecoin-project/specs-actors/v2/actors/builtin/init"
adt2 "github.com/filecoin-project/specs-actors/v2/actors/util/adt"
@ -128,7 +129,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 {

3
chain/actors/builtin/init/v3.go generated
View File

@ -11,6 +11,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"
builtin3 "github.com/filecoin-project/specs-actors/v3/actors/builtin"
init3 "github.com/filecoin-project/specs-actors/v3/actors/builtin/init"
adt3 "github.com/filecoin-project/specs-actors/v3/actors/util/adt"
@ -129,7 +130,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 {

3
chain/actors/builtin/init/v4.go generated
View File

@ -11,6 +11,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"
builtin4 "github.com/filecoin-project/specs-actors/v4/actors/builtin"
init4 "github.com/filecoin-project/specs-actors/v4/actors/builtin/init"
adt4 "github.com/filecoin-project/specs-actors/v4/actors/util/adt"
@ -129,7 +130,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 {

3
chain/actors/builtin/init/v5.go generated
View File

@ -11,6 +11,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"
builtin5 "github.com/filecoin-project/specs-actors/v5/actors/builtin"
init5 "github.com/filecoin-project/specs-actors/v5/actors/builtin/init"
adt5 "github.com/filecoin-project/specs-actors/v5/actors/util/adt"
@ -129,7 +130,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 {

3
chain/actors/builtin/init/v6.go generated
View File

@ -11,6 +11,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"
builtin6 "github.com/filecoin-project/specs-actors/v6/actors/builtin"
init6 "github.com/filecoin-project/specs-actors/v6/actors/builtin/init"
adt6 "github.com/filecoin-project/specs-actors/v6/actors/util/adt"
@ -129,7 +130,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 {

3
chain/actors/builtin/init/v7.go generated
View File

@ -11,6 +11,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"
builtin7 "github.com/filecoin-project/specs-actors/v7/actors/builtin"
init7 "github.com/filecoin-project/specs-actors/v7/actors/builtin/init"
adt7 "github.com/filecoin-project/specs-actors/v7/actors/util/adt"
@ -129,7 +130,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 {

3
chain/actors/builtin/init/v8.go generated
View File

@ -14,6 +14,7 @@ import (
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"
"github.com/filecoin-project/go-state-types/manifest"
"github.com/filecoin-project/lotus/chain/actors"
"github.com/filecoin-project/lotus/chain/actors/adt"
@ -129,7 +130,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 {

3
chain/actors/builtin/init/v9.go generated
View File

@ -14,6 +14,7 @@ import (
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"
"github.com/filecoin-project/go-state-types/manifest"
"github.com/filecoin-project/lotus/chain/actors"
"github.com/filecoin-project/lotus/chain/actors/adt"
@ -129,7 +130,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 {

3
chain/actors/builtin/market/actor.go.template
View File

@ -13,6 +13,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"
@ -36,7 +37,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, xerrors.Errorf("actor code is not market: %s", name)
}

3
chain/actors/builtin/market/market.go
View File

@ -15,6 +15,7 @@ import (
markettypes "github.com/filecoin-project/go-state-types/builtin/v9/market"
verifregtypes "github.com/filecoin-project/go-state-types/builtin/v9/verifreg"
"github.com/filecoin-project/go-state-types/cbor"
"github.com/filecoin-project/go-state-types/manifest"
"github.com/filecoin-project/go-state-types/network"
builtin0 "github.com/filecoin-project/specs-actors/actors/builtin"
builtin2 "github.com/filecoin-project/specs-actors/v2/actors/builtin"
@ -36,7 +37,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, xerrors.Errorf("actor code is not market: %s", name)
}

3
chain/actors/builtin/market/state.go.template
View File

@ -20,6 +20,7 @@ import (
"github.com/filecoin-project/lotus/chain/actors"
"github.com/filecoin-project/lotus/chain/types"
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"
@ -394,7 +395,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 {

3
chain/actors/builtin/market/v0.go generated
View File

@ -12,6 +12,7 @@ import (
"github.com/filecoin-project/go-state-types/abi"
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"
market0 "github.com/filecoin-project/specs-actors/actors/builtin/market"
adt0 "github.com/filecoin-project/specs-actors/actors/util/adt"
@ -312,7 +313,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 {

3
chain/actors/builtin/market/v10.go generated
View File

@ -18,6 +18,7 @@ import (
adt10 "github.com/filecoin-project/go-state-types/builtin/v10/util/adt"
markettypes "github.com/filecoin-project/go-state-types/builtin/v9/market"
verifregtypes "github.com/filecoin-project/go-state-types/builtin/v9/verifreg"
"github.com/filecoin-project/go-state-types/manifest"
"github.com/filecoin-project/lotus/chain/actors"
"github.com/filecoin-project/lotus/chain/actors/adt"
@ -359,7 +360,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 {

3
chain/actors/builtin/market/v2.go generated
View File

@ -12,6 +12,7 @@ import (
"github.com/filecoin-project/go-state-types/abi"
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"
market2 "github.com/filecoin-project/specs-actors/v2/actors/builtin/market"
adt2 "github.com/filecoin-project/specs-actors/v2/actors/util/adt"
@ -312,7 +313,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 {

3
chain/actors/builtin/market/v3.go generated
View File

@ -12,6 +12,7 @@ import (
"github.com/filecoin-project/go-state-types/abi"
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"
market3 "github.com/filecoin-project/specs-actors/v3/actors/builtin/market"
adt3 "github.com/filecoin-project/specs-actors/v3/actors/util/adt"
@ -307,7 +308,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 {

3
chain/actors/builtin/market/v4.go generated
View File

@ -12,6 +12,7 @@ import (
"github.com/filecoin-project/go-state-types/abi"
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"
market4 "github.com/filecoin-project/specs-actors/v4/actors/builtin/market"
adt4 "github.com/filecoin-project/specs-actors/v4/actors/util/adt"
@ -307,7 +308,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 {

3
chain/actors/builtin/market/v5.go generated
View File

@ -12,6 +12,7 @@ import (
"github.com/filecoin-project/go-state-types/abi"
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"
market5 "github.com/filecoin-project/specs-actors/v5/actors/builtin/market"
adt5 "github.com/filecoin-project/specs-actors/v5/actors/util/adt"
@ -307,7 +308,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 {

3
chain/actors/builtin/market/v6.go generated
View File

@ -14,6 +14,7 @@ import (
"github.com/filecoin-project/go-state-types/abi"
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"
market6 "github.com/filecoin-project/specs-actors/v6/actors/builtin/market"
adt6 "github.com/filecoin-project/specs-actors/v6/actors/util/adt"
@ -325,7 +326,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 {

3
chain/actors/builtin/market/v7.go generated
View File

@ -14,6 +14,7 @@ import (
"github.com/filecoin-project/go-state-types/abi"
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"
market7 "github.com/filecoin-project/specs-actors/v7/actors/builtin/market"
adt7 "github.com/filecoin-project/specs-actors/v7/actors/util/adt"
@ -325,7 +326,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 {

3
chain/actors/builtin/market/v8.go generated
View File

@ -17,6 +17,7 @@ import (
adt8 "github.com/filecoin-project/go-state-types/builtin/v8/util/adt"
markettypes "github.com/filecoin-project/go-state-types/builtin/v9/market"
verifregtypes "github.com/filecoin-project/go-state-types/builtin/v9/verifreg"
"github.com/filecoin-project/go-state-types/manifest"
"github.com/filecoin-project/lotus/chain/actors"
"github.com/filecoin-project/lotus/chain/actors/adt"
@ -342,7 +343,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 {

3
chain/actors/builtin/market/v9.go generated
View File

@ -18,6 +18,7 @@ import (
markettypes "github.com/filecoin-project/go-state-types/builtin/v9/market"
adt9 "github.com/filecoin-project/go-state-types/builtin/v9/util/adt"
verifregtypes "github.com/filecoin-project/go-state-types/builtin/v9/verifreg"
"github.com/filecoin-project/go-state-types/manifest"
"github.com/filecoin-project/lotus/chain/actors"
"github.com/filecoin-project/lotus/chain/actors/adt"
@ -359,7 +360,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 {

3
chain/actors/builtin/miner/actor.go.template
View File

@ -18,6 +18,7 @@ import (
"github.com/filecoin-project/lotus/chain/actors/adt"
"github.com/filecoin-project/lotus/chain/types"
minertypes "github.com/filecoin-project/go-state-types/builtin/v9/miner"
"github.com/filecoin-project/go-state-types/manifest"
{{range .versions}}
{{if (le . 7)}}
@ -28,7 +29,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, xerrors.Errorf("actor code is not miner: %s", name)
}

3
chain/actors/builtin/miner/miner.go
View File

@ -12,6 +12,7 @@ import (
minertypes "github.com/filecoin-project/go-state-types/builtin/v9/miner"
"github.com/filecoin-project/go-state-types/cbor"
"github.com/filecoin-project/go-state-types/dline"
"github.com/filecoin-project/go-state-types/manifest"
"github.com/filecoin-project/go-state-types/network"
"github.com/filecoin-project/go-state-types/proof"
builtin0 "github.com/filecoin-project/specs-actors/actors/builtin"
@ -29,7 +30,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, xerrors.Errorf("actor code is not miner: %s", name)
}

3
chain/actors/builtin/miner/state.go.template
View File

@ -18,6 +18,7 @@ import (
"github.com/filecoin-project/lotus/chain/actors/adt"
"github.com/filecoin-project/lotus/chain/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)}}
@ -614,7 +615,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 {

3
chain/actors/builtin/miner/v0.go generated
View File

@ -15,6 +15,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/dline"
"github.com/filecoin-project/go-state-types/manifest"
miner0 "github.com/filecoin-project/specs-actors/actors/builtin/miner"
adt0 "github.com/filecoin-project/specs-actors/actors/util/adt"
@ -535,7 +536,7 @@ func (s *state0) GetState() interface{} {
}
func (s *state0) ActorKey() string {
return actors.MinerKey
return manifest.MinerKey
}
func (s *state0) ActorVersion() actorstypes.Version {

3
chain/actors/builtin/miner/v10.go generated
View File

@ -17,6 +17,7 @@ import (
miner10 "github.com/filecoin-project/go-state-types/builtin/v10/miner"
adt10 "github.com/filecoin-project/go-state-types/builtin/v10/util/adt"
"github.com/filecoin-project/go-state-types/dline"
"github.com/filecoin-project/go-state-types/manifest"
"github.com/filecoin-project/lotus/chain/actors"
"github.com/filecoin-project/lotus/chain/actors/adt"
@ -573,7 +574,7 @@ func (s *state10) GetState() interface{} {
}
func (s *state10) ActorKey() string {
return actors.MinerKey
return manifest.MinerKey
}
func (s *state10) ActorVersion() actorstypes.Version {

3
chain/actors/builtin/miner/v2.go generated
View File

@ -14,6 +14,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/dline"
"github.com/filecoin-project/go-state-types/manifest"
miner2 "github.com/filecoin-project/specs-actors/v2/actors/builtin/miner"
adt2 "github.com/filecoin-project/specs-actors/v2/actors/util/adt"
@ -566,7 +567,7 @@ func (s *state2) GetState() interface{} {
}
func (s *state2) ActorKey() string {
return actors.MinerKey
return manifest.MinerKey
}
func (s *state2) ActorVersion() actorstypes.Version {

3
chain/actors/builtin/miner/v3.go generated
View File

@ -14,6 +14,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/dline"
"github.com/filecoin-project/go-state-types/manifest"
builtin3 "github.com/filecoin-project/specs-actors/v3/actors/builtin"
miner3 "github.com/filecoin-project/specs-actors/v3/actors/builtin/miner"
adt3 "github.com/filecoin-project/specs-actors/v3/actors/util/adt"
@ -566,7 +567,7 @@ func (s *state3) GetState() interface{} {
}
func (s *state3) ActorKey() string {
return actors.MinerKey
return manifest.MinerKey
}
func (s *state3) ActorVersion() actorstypes.Version {

3
chain/actors/builtin/miner/v4.go generated
View File

@ -14,6 +14,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/dline"
"github.com/filecoin-project/go-state-types/manifest"
builtin4 "github.com/filecoin-project/specs-actors/v4/actors/builtin"
miner4 "github.com/filecoin-project/specs-actors/v4/actors/builtin/miner"
adt4 "github.com/filecoin-project/specs-actors/v4/actors/util/adt"
@ -566,7 +567,7 @@ func (s *state4) GetState() interface{} {
}
func (s *state4) ActorKey() string {
return actors.MinerKey
return manifest.MinerKey
}
func (s *state4) ActorVersion() actorstypes.Version {

3
chain/actors/builtin/miner/v5.go generated
View File

@ -14,6 +14,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/dline"
"github.com/filecoin-project/go-state-types/manifest"
builtin5 "github.com/filecoin-project/specs-actors/v5/actors/builtin"
miner5 "github.com/filecoin-project/specs-actors/v5/actors/builtin/miner"
adt5 "github.com/filecoin-project/specs-actors/v5/actors/util/adt"
@ -566,7 +567,7 @@ func (s *state5) GetState() interface{} {
}
func (s *state5) ActorKey() string {
return actors.MinerKey
return manifest.MinerKey
}
func (s *state5) ActorVersion() actorstypes.Version {

3
chain/actors/builtin/miner/v6.go generated
View File

@ -14,6 +14,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/dline"
"github.com/filecoin-project/go-state-types/manifest"
builtin6 "github.com/filecoin-project/specs-actors/v6/actors/builtin"
miner6 "github.com/filecoin-project/specs-actors/v6/actors/builtin/miner"
adt6 "github.com/filecoin-project/specs-actors/v6/actors/util/adt"
@ -566,7 +567,7 @@ func (s *state6) GetState() interface{} {
}
func (s *state6) ActorKey() string {
return actors.MinerKey
return manifest.MinerKey
}
func (s *state6) ActorVersion() actorstypes.Version {

3
chain/actors/builtin/miner/v7.go generated
View File

@ -14,6 +14,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/dline"
"github.com/filecoin-project/go-state-types/manifest"
builtin7 "github.com/filecoin-project/specs-actors/v7/actors/builtin"
miner7 "github.com/filecoin-project/specs-actors/v7/actors/builtin/miner"
adt7 "github.com/filecoin-project/specs-actors/v7/actors/util/adt"
@ -567,7 +568,7 @@ func (s *state7) GetState() interface{} {
}
func (s *state7) ActorKey() string {
return actors.MinerKey
return manifest.MinerKey
}
func (s *state7) ActorVersion() actorstypes.Version {

3
chain/actors/builtin/miner/v8.go generated
View File

@ -17,6 +17,7 @@ import (
miner8 "github.com/filecoin-project/go-state-types/builtin/v8/miner"
adt8 "github.com/filecoin-project/go-state-types/builtin/v8/util/adt"
"github.com/filecoin-project/go-state-types/dline"
"github.com/filecoin-project/go-state-types/manifest"
"github.com/filecoin-project/lotus/chain/actors"
"github.com/filecoin-project/lotus/chain/actors/adt"
@ -567,7 +568,7 @@ func (s *state8) GetState() interface{} {
}
func (s *state8) ActorKey() string {
return actors.MinerKey
return manifest.MinerKey
}
func (s *state8) ActorVersion() actorstypes.Version {

3
chain/actors/builtin/miner/v9.go generated
View File

@ -17,6 +17,7 @@ import (
miner9 "github.com/filecoin-project/go-state-types/builtin/v9/miner"
adt9 "github.com/filecoin-project/go-state-types/builtin/v9/util/adt"
"github.com/filecoin-project/go-state-types/dline"
"github.com/filecoin-project/go-state-types/manifest"
"github.com/filecoin-project/lotus/chain/actors"
"github.com/filecoin-project/lotus/chain/actors/adt"
@ -573,7 +574,7 @@ func (s *state9) GetState() interface{} {
}
func (s *state9) ActorKey() string {
return actors.MinerKey
return manifest.MinerKey
}
func (s *state9) ActorVersion() actorstypes.Version {

3
chain/actors/builtin/multisig/actor.go.template
View File

@ -21,6 +21,7 @@ import (
{{end}}
builtintypes "github.com/filecoin-project/go-state-types/builtin"
"github.com/filecoin-project/go-state-types/manifest"
"github.com/filecoin-project/lotus/chain/actors"
"github.com/filecoin-project/lotus/chain/actors/adt"
@ -29,7 +30,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, xerrors.Errorf("actor code is not multisig: %s", name)
}

3
chain/actors/builtin/multisig/message.go.template generated
View File

@ -14,6 +14,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"
@ -68,7 +69,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, xerrors.Errorf("failed to get multisig code ID")
}

3
chain/actors/builtin/multisig/message10.go generated
View File

@ -9,6 +9,7 @@ import (
builtintypes "github.com/filecoin-project/go-state-types/builtin"
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"
"github.com/filecoin-project/lotus/chain/actors"
init_ "github.com/filecoin-project/lotus/chain/actors/builtin/init"
@ -50,7 +51,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, xerrors.Errorf("failed to get multisig code ID")
}

3
chain/actors/builtin/multisig/message8.go generated
View File

@ -9,6 +9,7 @@ import (
builtintypes "github.com/filecoin-project/go-state-types/builtin"
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"
"github.com/filecoin-project/lotus/chain/actors"
init_ "github.com/filecoin-project/lotus/chain/actors/builtin/init"
@ -50,7 +51,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, xerrors.Errorf("failed to get multisig code ID")
}

3
chain/actors/builtin/multisig/message9.go generated
View File

@ -9,6 +9,7 @@ import (
builtintypes "github.com/filecoin-project/go-state-types/builtin"
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"
"github.com/filecoin-project/lotus/chain/actors"
init_ "github.com/filecoin-project/lotus/chain/actors/builtin/init"
@ -50,7 +51,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, xerrors.Errorf("failed to get multisig code ID")
}

3
chain/actors/builtin/multisig/multisig.go
View File

@ -14,6 +14,7 @@ import (
builtintypes "github.com/filecoin-project/go-state-types/builtin"
msig10 "github.com/filecoin-project/go-state-types/builtin/v10/multisig"
"github.com/filecoin-project/go-state-types/cbor"
"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 @@ 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, xerrors.Errorf("actor code is not multisig: %s", name)
}

3
chain/actors/builtin/multisig/state.go.template
View File

@ -15,6 +15,7 @@ import (
"github.com/filecoin-project/lotus/chain/actors/adt"
"github.com/filecoin-project/lotus/chain/actors"
"github.com/filecoin-project/go-state-types/manifest"
{{if (le .v 7)}}
{{if (ge .v 3)}}
@ -136,7 +137,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 {

3
chain/actors/builtin/multisig/v0.go generated
View File

@ -12,6 +12,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"
msig0 "github.com/filecoin-project/specs-actors/actors/builtin/multisig"
adt0 "github.com/filecoin-project/specs-actors/actors/util/adt"
@ -119,7 +120,7 @@ func (s *state0) GetState() interface{} {
}
func (s *state0) ActorKey() string {
return actors.MultisigKey
return manifest.MultisigKey
}
func (s *state0) ActorVersion() actorstypes.Version {

3
chain/actors/builtin/multisig/v10.go generated
View File

@ -15,6 +15,7 @@ import (
builtin10 "github.com/filecoin-project/go-state-types/builtin"
msig10 "github.com/filecoin-project/go-state-types/builtin/v10/multisig"
adt10 "github.com/filecoin-project/go-state-types/builtin/v10/util/adt"
"github.com/filecoin-project/go-state-types/manifest"
"github.com/filecoin-project/lotus/chain/actors"
"github.com/filecoin-project/lotus/chain/actors/adt"
@ -120,7 +121,7 @@ func (s *state10) GetState() interface{} {
}
func (s *state10) ActorKey() string {
return actors.MultisigKey
return manifest.MultisigKey
}
func (s *state10) ActorVersion() actorstypes.Version {

3
chain/actors/builtin/multisig/v2.go generated
View File

@ -12,6 +12,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"
msig2 "github.com/filecoin-project/specs-actors/v2/actors/builtin/multisig"
adt2 "github.com/filecoin-project/specs-actors/v2/actors/util/adt"
@ -119,7 +120,7 @@ func (s *state2) GetState() interface{} {
}
func (s *state2) ActorKey() string {
return actors.MultisigKey
return manifest.MultisigKey
}
func (s *state2) ActorVersion() actorstypes.Version {

3
chain/actors/builtin/multisig/v3.go generated
View File

@ -12,6 +12,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"
builtin3 "github.com/filecoin-project/specs-actors/v3/actors/builtin"
msig3 "github.com/filecoin-project/specs-actors/v3/actors/builtin/multisig"
adt3 "github.com/filecoin-project/specs-actors/v3/actors/util/adt"
@ -120,7 +121,7 @@ func (s *state3) GetState() interface{} {
}
func (s *state3) ActorKey() string {
return actors.MultisigKey
return manifest.MultisigKey
}
func (s *state3) ActorVersion() actorstypes.Version {

3
chain/actors/builtin/multisig/v4.go generated
View File

@ -12,6 +12,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"
builtin4 "github.com/filecoin-project/specs-actors/v4/actors/builtin"
msig4 "github.com/filecoin-project/specs-actors/v4/actors/builtin/multisig"
adt4 "github.com/filecoin-project/specs-actors/v4/actors/util/adt"
@ -120,7 +121,7 @@ func (s *state4) GetState() interface{} {
}
func (s *state4) ActorKey() string {
return actors.MultisigKey
return manifest.MultisigKey
}
func (s *state4) ActorVersion() actorstypes.Version {

3
chain/actors/builtin/multisig/v5.go generated
View File

@ -12,6 +12,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"
builtin5 "github.com/filecoin-project/specs-actors/v5/actors/builtin"
msig5 "github.com/filecoin-project/specs-actors/v5/actors/builtin/multisig"
adt5 "github.com/filecoin-project/specs-actors/v5/actors/util/adt"
@ -120,7 +121,7 @@ func (s *state5) GetState() interface{} {
}
func (s *state5) ActorKey() string {
return actors.MultisigKey
return manifest.MultisigKey
}
func (s *state5) ActorVersion() actorstypes.Version {

3
chain/actors/builtin/multisig/v6.go generated
View File

@ -12,6 +12,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"
builtin6 "github.com/filecoin-project/specs-actors/v6/actors/builtin"
msig6 "github.com/filecoin-project/specs-actors/v6/actors/builtin/multisig"
adt6 "github.com/filecoin-project/specs-actors/v6/actors/util/adt"
@ -120,7 +121,7 @@ func (s *state6) GetState() interface{} {
}
func (s *state6) ActorKey() string {
return actors.MultisigKey
return manifest.MultisigKey
}
func (s *state6) ActorVersion() actorstypes.Version {

3
chain/actors/builtin/multisig/v7.go generated
View File

@ -12,6 +12,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"
builtin7 "github.com/filecoin-project/specs-actors/v7/actors/builtin"
msig7 "github.com/filecoin-project/specs-actors/v7/actors/builtin/multisig"
adt7 "github.com/filecoin-project/specs-actors/v7/actors/util/adt"
@ -120,7 +121,7 @@ func (s *state7) GetState() interface{} {
}
func (s *state7) ActorKey() string {
return actors.MultisigKey
return manifest.MultisigKey
}
func (s *state7) ActorVersion() actorstypes.Version {

3
chain/actors/builtin/multisig/v8.go generated
View File

@ -15,6 +15,7 @@ import (
builtin8 "github.com/filecoin-project/go-state-types/builtin"
msig8 "github.com/filecoin-project/go-state-types/builtin/v8/multisig"
adt8 "github.com/filecoin-project/go-state-types/builtin/v8/util/adt"
"github.com/filecoin-project/go-state-types/manifest"
"github.com/filecoin-project/lotus/chain/actors"
"github.com/filecoin-project/lotus/chain/actors/adt"
@ -120,7 +121,7 @@ func (s *state8) GetState() interface{} {
}
func (s *state8) ActorKey() string {
return actors.MultisigKey
return manifest.MultisigKey
}
func (s *state8) ActorVersion() actorstypes.Version {

3
chain/actors/builtin/multisig/v9.go generated
View File

@ -15,6 +15,7 @@ import (
builtin9 "github.com/filecoin-project/go-state-types/builtin"
msig9 "github.com/filecoin-project/go-state-types/builtin/v9/multisig"
adt9 "github.com/filecoin-project/go-state-types/builtin/v9/util/adt"
"github.com/filecoin-project/go-state-types/manifest"
"github.com/filecoin-project/lotus/chain/actors"
"github.com/filecoin-project/lotus/chain/actors/adt"
@ -120,7 +121,7 @@ func (s *state9) GetState() interface{} {
}
func (s *state9) ActorKey() string {
return actors.MultisigKey
return manifest.MultisigKey
}
func (s *state9) ActorVersion() actorstypes.Version {

3
chain/actors/builtin/paych/actor.go.template
View File

@ -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, xerrors.Errorf("actor code is not paych: %s", name)
}

4
chain/actors/builtin/paych/mock/mock.go
View File

@ -9,8 +9,8 @@ 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/lotus/chain/actors"
"github.com/filecoin-project/lotus/chain/actors/builtin/paych"
)
@ -27,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 {

3
chain/actors/builtin/paych/paych.go
View File

@ -14,6 +14,7 @@ import (
"github.com/filecoin-project/go-state-types/big"
paychtypes "github.com/filecoin-project/go-state-types/builtin/v8/paych"
"github.com/filecoin-project/go-state-types/cbor"
"github.com/filecoin-project/go-state-types/manifest"
builtin0 "github.com/filecoin-project/specs-actors/actors/builtin"
paych0 "github.com/filecoin-project/specs-actors/actors/builtin/paych"
builtin2 "github.com/filecoin-project/specs-actors/v2/actors/builtin"
@ -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, xerrors.Errorf("actor code is not paych: %s", name)
}

3
chain/actors/builtin/paych/state.go.template
View File

@ -11,6 +11,7 @@ import (
"github.com/filecoin-project/lotus/chain/actors/adt"
"github.com/filecoin-project/lotus/chain/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"
@ -122,7 +123,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 {

3
chain/actors/builtin/paych/v0.go generated
View File

@ -9,6 +9,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"
paych0 "github.com/filecoin-project/specs-actors/actors/builtin/paych"
adt0 "github.com/filecoin-project/specs-actors/actors/util/adt"
@ -117,7 +118,7 @@ func (ls *laneState0) Nonce() (uint64, error) {
}
func (s *state0) ActorKey() string {
return actors.PaychKey
return manifest.PaychKey
}
func (s *state0) ActorVersion() actorstypes.Version {

3
chain/actors/builtin/paych/v10.go generated
View File

@ -11,6 +11,7 @@ import (
"github.com/filecoin-project/go-state-types/big"
paych10 "github.com/filecoin-project/go-state-types/builtin/v10/paych"
adt10 "github.com/filecoin-project/go-state-types/builtin/v10/util/adt"
"github.com/filecoin-project/go-state-types/manifest"
"github.com/filecoin-project/lotus/chain/actors"
"github.com/filecoin-project/lotus/chain/actors/adt"
@ -117,7 +118,7 @@ func (ls *laneState10) Nonce() (uint64, error) {
}
func (s *state10) ActorKey() string {
return actors.PaychKey
return manifest.PaychKey
}
func (s *state10) ActorVersion() actorstypes.Version {

3
chain/actors/builtin/paych/v2.go generated
View File

@ -9,6 +9,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"
paych2 "github.com/filecoin-project/specs-actors/v2/actors/builtin/paych"
adt2 "github.com/filecoin-project/specs-actors/v2/actors/util/adt"
@ -117,7 +118,7 @@ func (ls *laneState2) Nonce() (uint64, error) {
}
func (s *state2) ActorKey() string {
return actors.PaychKey
return manifest.PaychKey
}
func (s *state2) ActorVersion() actorstypes.Version {

Some files were not shown because too many files have changed in this diff Show More