agen

chain/actors/builtin/account/account.go

@@ -1,26 +1,34 @@
 package account
 
 import (
+	actorstypes "github.com/filecoin-project/go-state-types/actors"
+	"github.com/filecoin-project/lotus/chain/actors"
 	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/go-address"
-	actorstypes "github.com/filecoin-project/go-state-types/actors"
-	builtin9 "github.com/filecoin-project/go-state-types/builtin"
 	"github.com/filecoin-project/go-state-types/cbor"
-	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"
-	builtin4 "github.com/filecoin-project/specs-actors/v4/actors/builtin"
-	builtin5 "github.com/filecoin-project/specs-actors/v5/actors/builtin"
-	builtin6 "github.com/filecoin-project/specs-actors/v6/actors/builtin"
-	builtin7 "github.com/filecoin-project/specs-actors/v7/actors/builtin"
 
-	"github.com/filecoin-project/lotus/chain/actors"
 	"github.com/filecoin-project/lotus/chain/actors/adt"
 	"github.com/filecoin-project/lotus/chain/types"
+
+	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"
+
+	builtin4 "github.com/filecoin-project/specs-actors/v4/actors/builtin"
+
+	builtin5 "github.com/filecoin-project/specs-actors/v5/actors/builtin"
+
+	builtin6 "github.com/filecoin-project/specs-actors/v6/actors/builtin"
+
+	builtin7 "github.com/filecoin-project/specs-actors/v7/actors/builtin"
+
+	builtin10 "github.com/filecoin-project/go-state-types/builtin"
 )
 
-var Methods = builtin9.MethodsAccount
+var Methods = builtin10.MethodsAccount
 
 func Load(store adt.Store, act *types.Actor) (State, error) {
 	if name, av, ok := actors.GetActorMetaByCode(act.Code); ok {
@@ -36,6 +44,9 @@ func Load(store adt.Store, act *types.Actor) (State, error) {
 		case actorstypes.Version9:
 			return load9(store, act.Head)
 
+		case actorstypes.Version10:
+			return load10(store, act.Head)
+
 		}
 	}
 
@@ -97,6 +108,9 @@ func MakeState(store adt.Store, av actorstypes.Version, addr address.Address) (S
 	case actorstypes.Version9:
 		return make9(store, addr)
 
+	case actorstypes.Version10:
+		return make10(store, addr)
+
 	}
 	return nil, xerrors.Errorf("unknown actor version %d", av)
 }

chain/actors/builtin/account/v0.go

@@ -1,12 +1,12 @@
 package account
 
 import (
+	"github.com/filecoin-project/go-address"
 	"github.com/ipfs/go-cid"
 
-	"github.com/filecoin-project/go-address"
-	account0 "github.com/filecoin-project/specs-actors/actors/builtin/account"
-
 	"github.com/filecoin-project/lotus/chain/actors/adt"
+
+	account0 "github.com/filecoin-project/specs-actors/actors/builtin/account"
 )
 
 var _ State = (*state0)(nil)

chain/actors/builtin/account/v10.go

@@ -0,0 +1,40 @@
+package account
+
+import (
+	"github.com/filecoin-project/go-address"
+	"github.com/ipfs/go-cid"
+
+	"github.com/filecoin-project/lotus/chain/actors/adt"
+
+	account10 "github.com/filecoin-project/go-state-types/builtin/v10/account"
+)
+
+var _ State = (*state10)(nil)
+
+func load10(store adt.Store, root cid.Cid) (State, error) {
+	out := state10{store: store}
+	err := store.Get(store.Context(), root, &out)
+	if err != nil {
+		return nil, err
+	}
+	return &out, nil
+}
+
+func make10(store adt.Store, addr address.Address) (State, error) {
+	out := state10{store: store}
+	out.State = account10.State{Address: addr}
+	return &out, nil
+}
+
+type state10 struct {
+	account10.State
+	store adt.Store
+}
+
+func (s *state10) PubkeyAddress() (address.Address, error) {
+	return s.Address, nil
+}
+
+func (s *state10) GetState() interface{} {
+	return &s.State
+}

chain/actors/builtin/account/v2.go

@@ -1,12 +1,12 @@
 package account
 
 import (
+	"github.com/filecoin-project/go-address"
 	"github.com/ipfs/go-cid"
 
-	"github.com/filecoin-project/go-address"
-	account2 "github.com/filecoin-project/specs-actors/v2/actors/builtin/account"
-
 	"github.com/filecoin-project/lotus/chain/actors/adt"
+
+	account2 "github.com/filecoin-project/specs-actors/v2/actors/builtin/account"
 )
 
 var _ State = (*state2)(nil)

chain/actors/builtin/account/v3.go

@@ -1,12 +1,12 @@
 package account
 
 import (
+	"github.com/filecoin-project/go-address"
 	"github.com/ipfs/go-cid"
 
-	"github.com/filecoin-project/go-address"
-	account3 "github.com/filecoin-project/specs-actors/v3/actors/builtin/account"
-
 	"github.com/filecoin-project/lotus/chain/actors/adt"
+
+	account3 "github.com/filecoin-project/specs-actors/v3/actors/builtin/account"
 )
 
 var _ State = (*state3)(nil)

chain/actors/builtin/account/v4.go

@@ -1,12 +1,12 @@
 package account
 
 import (
+	"github.com/filecoin-project/go-address"
 	"github.com/ipfs/go-cid"
 
-	"github.com/filecoin-project/go-address"
-	account4 "github.com/filecoin-project/specs-actors/v4/actors/builtin/account"
-
 	"github.com/filecoin-project/lotus/chain/actors/adt"
+
+	account4 "github.com/filecoin-project/specs-actors/v4/actors/builtin/account"
 )
 
 var _ State = (*state4)(nil)

chain/actors/builtin/account/v5.go

@@ -1,12 +1,12 @@
 package account
 
 import (
+	"github.com/filecoin-project/go-address"
 	"github.com/ipfs/go-cid"
 
-	"github.com/filecoin-project/go-address"
-	account5 "github.com/filecoin-project/specs-actors/v5/actors/builtin/account"
-
 	"github.com/filecoin-project/lotus/chain/actors/adt"
+
+	account5 "github.com/filecoin-project/specs-actors/v5/actors/builtin/account"
 )
 
 var _ State = (*state5)(nil)

chain/actors/builtin/account/v6.go

@@ -1,12 +1,12 @@
 package account
 
 import (
+	"github.com/filecoin-project/go-address"
 	"github.com/ipfs/go-cid"
 
-	"github.com/filecoin-project/go-address"
-	account6 "github.com/filecoin-project/specs-actors/v6/actors/builtin/account"
-
 	"github.com/filecoin-project/lotus/chain/actors/adt"
+
+	account6 "github.com/filecoin-project/specs-actors/v6/actors/builtin/account"
 )
 
 var _ State = (*state6)(nil)

chain/actors/builtin/account/v7.go

@@ -1,12 +1,12 @@
 package account
 
 import (
+	"github.com/filecoin-project/go-address"
 	"github.com/ipfs/go-cid"
 
-	"github.com/filecoin-project/go-address"
-	account7 "github.com/filecoin-project/specs-actors/v7/actors/builtin/account"
-
 	"github.com/filecoin-project/lotus/chain/actors/adt"
+
+	account7 "github.com/filecoin-project/specs-actors/v7/actors/builtin/account"
 )
 
 var _ State = (*state7)(nil)

chain/actors/builtin/account/v8.go

@@ -1,12 +1,12 @@
 package account
 
 import (
+	"github.com/filecoin-project/go-address"
 	"github.com/ipfs/go-cid"
 
-	"github.com/filecoin-project/go-address"
-	account8 "github.com/filecoin-project/go-state-types/builtin/v8/account"
-
 	"github.com/filecoin-project/lotus/chain/actors/adt"
+
+	account8 "github.com/filecoin-project/go-state-types/builtin/v8/account"
 )
 
 var _ State = (*state8)(nil)

chain/actors/builtin/account/v9.go

@@ -1,12 +1,12 @@
 package account
 
 import (
+	"github.com/filecoin-project/go-address"
 	"github.com/ipfs/go-cid"
 
-	"github.com/filecoin-project/go-address"
-	account9 "github.com/filecoin-project/go-state-types/builtin/v9/account"
-
 	"github.com/filecoin-project/lotus/chain/actors/adt"
+
+	account9 "github.com/filecoin-project/go-state-types/builtin/v9/account"
 )
 
 var _ State = (*state9)(nil)

chain/actors/builtin/builtin.go

@@ -3,23 +3,31 @@ package builtin
 import (
 	"fmt"
 
+	"github.com/filecoin-project/go-address"
 	"github.com/ipfs/go-cid"
 
-	"github.com/filecoin-project/go-address"
-	"github.com/filecoin-project/go-state-types/abi"
-	"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/proof"
 	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"
+
 	builtin4 "github.com/filecoin-project/specs-actors/v4/actors/builtin"
+
 	builtin5 "github.com/filecoin-project/specs-actors/v5/actors/builtin"
+
 	builtin6 "github.com/filecoin-project/specs-actors/v6/actors/builtin"
+
 	builtin7 "github.com/filecoin-project/specs-actors/v7/actors/builtin"
 
+	"github.com/filecoin-project/go-state-types/abi"
+	"github.com/filecoin-project/go-state-types/builtin"
+	"github.com/filecoin-project/go-state-types/proof"
+
 	"github.com/filecoin-project/lotus/chain/actors"
+
+	smoothingtypes "github.com/filecoin-project/go-state-types/builtin/v8/util/smoothing"
+	minertypes "github.com/filecoin-project/go-state-types/builtin/v9/miner"
 )
 
 var SystemActorAddr = builtin.SystemActorAddr

chain/actors/builtin/cron/cron.go

@@ -1,21 +1,27 @@
 package cron
 
 import (
-	"golang.org/x/xerrors"
-
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
-	builtin9 "github.com/filecoin-project/go-state-types/builtin"
-	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"
-	builtin4 "github.com/filecoin-project/specs-actors/v4/actors/builtin"
-	builtin5 "github.com/filecoin-project/specs-actors/v5/actors/builtin"
-	builtin6 "github.com/filecoin-project/specs-actors/v6/actors/builtin"
-	builtin7 "github.com/filecoin-project/specs-actors/v7/actors/builtin"
-
 	"github.com/filecoin-project/lotus/chain/actors"
 	"github.com/filecoin-project/lotus/chain/actors/adt"
 	"github.com/filecoin-project/lotus/chain/types"
+	"golang.org/x/xerrors"
+
+	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"
+
+	builtin4 "github.com/filecoin-project/specs-actors/v4/actors/builtin"
+
+	builtin5 "github.com/filecoin-project/specs-actors/v5/actors/builtin"
+
+	builtin6 "github.com/filecoin-project/specs-actors/v6/actors/builtin"
+
+	builtin7 "github.com/filecoin-project/specs-actors/v7/actors/builtin"
+
+	builtin10 "github.com/filecoin-project/go-state-types/builtin"
 )
 
 func Load(store adt.Store, act *types.Actor) (State, error) {
@@ -32,6 +38,9 @@ func Load(store adt.Store, act *types.Actor) (State, error) {
 		case actorstypes.Version9:
 			return load9(store, act.Head)
 
+		case actorstypes.Version10:
+			return load10(store, act.Head)
+
 		}
 	}
 
@@ -93,13 +102,16 @@ func MakeState(store adt.Store, av actorstypes.Version) (State, error) {
 	case actorstypes.Version9:
 		return make9(store)
 
+	case actorstypes.Version10:
+		return make10(store)
+
 	}
 	return nil, xerrors.Errorf("unknown actor version %d", av)
 }
 
 var (
-	Address = builtin9.CronActorAddr
-	Methods = builtin9.MethodsCron
+	Address = builtin10.CronActorAddr
+	Methods = builtin10.MethodsCron
 )
 
 type State interface {

chain/actors/builtin/cron/v0.go

@@ -3,9 +3,9 @@ package cron
 import (
 	"github.com/ipfs/go-cid"
 
-	cron0 "github.com/filecoin-project/specs-actors/actors/builtin/cron"
-
 	"github.com/filecoin-project/lotus/chain/actors/adt"
+
+	cron0 "github.com/filecoin-project/specs-actors/actors/builtin/cron"
 )
 
 var _ State = (*state0)(nil)

chain/actors/builtin/cron/v10.go

@@ -0,0 +1,35 @@
+package cron
+
+import (
+	"github.com/ipfs/go-cid"
+
+	"github.com/filecoin-project/lotus/chain/actors/adt"
+
+	cron10 "github.com/filecoin-project/go-state-types/builtin/v10/cron"
+)
+
+var _ State = (*state10)(nil)
+
+func load10(store adt.Store, root cid.Cid) (State, error) {
+	out := state10{store: store}
+	err := store.Get(store.Context(), root, &out)
+	if err != nil {
+		return nil, err
+	}
+	return &out, nil
+}
+
+func make10(store adt.Store) (State, error) {
+	out := state10{store: store}
+	out.State = *cron10.ConstructState(cron10.BuiltInEntries())
+	return &out, nil
+}
+
+type state10 struct {
+	cron10.State
+	store adt.Store
+}
+
+func (s *state10) GetState() interface{} {
+	return &s.State
+}

chain/actors/builtin/cron/v2.go

@@ -3,9 +3,9 @@ package cron
 import (
 	"github.com/ipfs/go-cid"
 
-	cron2 "github.com/filecoin-project/specs-actors/v2/actors/builtin/cron"
-
 	"github.com/filecoin-project/lotus/chain/actors/adt"
+
+	cron2 "github.com/filecoin-project/specs-actors/v2/actors/builtin/cron"
 )
 
 var _ State = (*state2)(nil)

chain/actors/builtin/cron/v3.go

@@ -3,9 +3,9 @@ package cron
 import (
 	"github.com/ipfs/go-cid"
 
-	cron3 "github.com/filecoin-project/specs-actors/v3/actors/builtin/cron"
-
 	"github.com/filecoin-project/lotus/chain/actors/adt"
+
+	cron3 "github.com/filecoin-project/specs-actors/v3/actors/builtin/cron"
 )
 
 var _ State = (*state3)(nil)

chain/actors/builtin/cron/v4.go

@@ -3,9 +3,9 @@ package cron
 import (
 	"github.com/ipfs/go-cid"
 
-	cron4 "github.com/filecoin-project/specs-actors/v4/actors/builtin/cron"
-
 	"github.com/filecoin-project/lotus/chain/actors/adt"
+
+	cron4 "github.com/filecoin-project/specs-actors/v4/actors/builtin/cron"
 )
 
 var _ State = (*state4)(nil)

chain/actors/builtin/cron/v5.go

@@ -3,9 +3,9 @@ package cron
 import (
 	"github.com/ipfs/go-cid"
 
-	cron5 "github.com/filecoin-project/specs-actors/v5/actors/builtin/cron"
-
 	"github.com/filecoin-project/lotus/chain/actors/adt"
+
+	cron5 "github.com/filecoin-project/specs-actors/v5/actors/builtin/cron"
 )
 
 var _ State = (*state5)(nil)

chain/actors/builtin/cron/v6.go

@@ -3,9 +3,9 @@ package cron
 import (
 	"github.com/ipfs/go-cid"
 
-	cron6 "github.com/filecoin-project/specs-actors/v6/actors/builtin/cron"
-
 	"github.com/filecoin-project/lotus/chain/actors/adt"
+
+	cron6 "github.com/filecoin-project/specs-actors/v6/actors/builtin/cron"
 )
 
 var _ State = (*state6)(nil)

chain/actors/builtin/cron/v7.go

@@ -3,9 +3,9 @@ package cron
 import (
 	"github.com/ipfs/go-cid"
 
-	cron7 "github.com/filecoin-project/specs-actors/v7/actors/builtin/cron"
-
 	"github.com/filecoin-project/lotus/chain/actors/adt"
+
+	cron7 "github.com/filecoin-project/specs-actors/v7/actors/builtin/cron"
 )
 
 var _ State = (*state7)(nil)

chain/actors/builtin/cron/v8.go

@@ -3,9 +3,9 @@ package cron
 import (
 	"github.com/ipfs/go-cid"
 
-	cron8 "github.com/filecoin-project/go-state-types/builtin/v8/cron"
-
 	"github.com/filecoin-project/lotus/chain/actors/adt"
+
+	cron8 "github.com/filecoin-project/go-state-types/builtin/v8/cron"
 )
 
 var _ State = (*state8)(nil)

chain/actors/builtin/cron/v9.go

@@ -3,9 +3,9 @@ package cron
 import (
 	"github.com/ipfs/go-cid"
 
-	cron9 "github.com/filecoin-project/go-state-types/builtin/v9/cron"
-
 	"github.com/filecoin-project/lotus/chain/actors/adt"
+
+	cron9 "github.com/filecoin-project/go-state-types/builtin/v9/cron"
 )
 
 var _ State = (*state9)(nil)

chain/actors/builtin/datacap/datacap.go

@@ -6,7 +6,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"
-	builtin9 "github.com/filecoin-project/go-state-types/builtin"
+	builtin10 "github.com/filecoin-project/go-state-types/builtin"
 	"github.com/filecoin-project/go-state-types/cbor"
 
 	"github.com/filecoin-project/lotus/chain/actors"
@@ -15,8 +15,8 @@ import (
 )
 
 var (
-	Address = builtin9.DatacapActorAddr
-	Methods = builtin9.MethodsDatacap
+	Address = builtin10.DatacapActorAddr
+	Methods = builtin10.MethodsDatacap
 )
 
 func Load(store adt.Store, act *types.Actor) (State, error) {
@@ -30,6 +30,9 @@ func Load(store adt.Store, act *types.Actor) (State, error) {
 		case actorstypes.Version9:
 			return load9(store, act.Head)
 
+		case actorstypes.Version10:
+			return load10(store, act.Head)
+
 		}
 	}
 
@@ -42,9 +45,11 @@ func MakeState(store adt.Store, av actorstypes.Version, governor address.Address
 	case actorstypes.Version9:
 		return make9(store, governor, bitwidth)
 
+	case actorstypes.Version10:
+		return make10(store, governor, bitwidth)
+
 	default:
 		return nil, xerrors.Errorf("datacap actor only valid for actors v9 and above, got %d", av)
-
 	}
 }
 

chain/actors/builtin/datacap/v10.go

@@ -0,0 +1,61 @@
+package datacap
+
+import (
+	"github.com/filecoin-project/go-address"
+	"github.com/filecoin-project/go-state-types/abi"
+	"github.com/ipfs/go-cid"
+
+	"github.com/filecoin-project/lotus/chain/actors"
+	"github.com/filecoin-project/lotus/chain/actors/adt"
+
+	datacap10 "github.com/filecoin-project/go-state-types/builtin/v10/datacap"
+	adt10 "github.com/filecoin-project/go-state-types/builtin/v10/util/adt"
+)
+
+var _ State = (*state10)(nil)
+
+func load10(store adt.Store, root cid.Cid) (State, error) {
+	out := state10{store: store}
+	err := store.Get(store.Context(), root, &out)
+	if err != nil {
+		return nil, err
+	}
+	return &out, nil
+}
+
+func make10(store adt.Store, governor address.Address, bitwidth uint64) (State, error) {
+	out := state10{store: store}
+	s, err := datacap10.ConstructState(store, governor, bitwidth)
+	if err != nil {
+		return nil, err
+	}
+
+	out.State = *s
+
+	return &out, nil
+}
+
+type state10 struct {
+	datacap10.State
+	store adt.Store
+}
+
+func (s *state10) Governor() (address.Address, error) {
+	return s.State.Governor, nil
+}
+
+func (s *state10) GetState() interface{} {
+	return &s.State
+}
+
+func (s *state10) ForEachClient(cb func(addr address.Address, dcap abi.StoragePower) error) error {
+	return forEachClient(s.store, actors.Version10, s.verifiedClients, cb)
+}
+
+func (s *state10) verifiedClients() (adt.Map, error) {
+	return adt10.AsMap(s.store, s.Token.Balances, int(s.Token.HamtBitWidth))
+}
+
+func (s *state10) VerifiedClientDataCap(addr address.Address) (bool, abi.StoragePower, error) {
+	return getDataCap(s.store, actors.Version10, s.verifiedClients, addr)
+}

chain/actors/builtin/datacap/v9.go

@@ -1,15 +1,15 @@
 package datacap
 
 import (
-	"github.com/ipfs/go-cid"
-
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
-	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/ipfs/go-cid"
 
 	"github.com/filecoin-project/lotus/chain/actors"
 	"github.com/filecoin-project/lotus/chain/actors/adt"
+
+	datacap9 "github.com/filecoin-project/go-state-types/builtin/v9/datacap"
+	adt9 "github.com/filecoin-project/go-state-types/builtin/v9/util/adt"
 )
 
 var _ State = (*state9)(nil)

chain/actors/builtin/init/init.go

@@ -1,31 +1,39 @@
 package init
 
 import (
-	"github.com/ipfs/go-cid"
+	actorstypes "github.com/filecoin-project/go-state-types/actors"
+	"github.com/filecoin-project/lotus/chain/actors"
 	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
-	actorstypes "github.com/filecoin-project/go-state-types/actors"
-	builtin9 "github.com/filecoin-project/go-state-types/builtin"
 	"github.com/filecoin-project/go-state-types/cbor"
-	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"
-	builtin4 "github.com/filecoin-project/specs-actors/v4/actors/builtin"
-	builtin5 "github.com/filecoin-project/specs-actors/v5/actors/builtin"
-	builtin6 "github.com/filecoin-project/specs-actors/v6/actors/builtin"
-	builtin7 "github.com/filecoin-project/specs-actors/v7/actors/builtin"
+	"github.com/ipfs/go-cid"
 
-	"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/lotus/node/modules/dtypes"
+
+	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"
+
+	builtin4 "github.com/filecoin-project/specs-actors/v4/actors/builtin"
+
+	builtin5 "github.com/filecoin-project/specs-actors/v5/actors/builtin"
+
+	builtin6 "github.com/filecoin-project/specs-actors/v6/actors/builtin"
+
+	builtin7 "github.com/filecoin-project/specs-actors/v7/actors/builtin"
+
+	builtin10 "github.com/filecoin-project/go-state-types/builtin"
 )
 
 var (
-	Address = builtin9.InitActorAddr
-	Methods = builtin9.MethodsInit
+	Address = builtin10.InitActorAddr
+	Methods = builtin10.MethodsInit
 )
 
 func Load(store adt.Store, act *types.Actor) (State, error) {
@@ -42,6 +50,9 @@ func Load(store adt.Store, act *types.Actor) (State, error) {
 		case actorstypes.Version9:
 			return load9(store, act.Head)
 
+		case actorstypes.Version10:
+			return load10(store, act.Head)
+
 		}
 	}
 
@@ -103,6 +114,9 @@ func MakeState(store adt.Store, av actorstypes.Version, networkName string) (Sta
 	case actorstypes.Version9:
 		return make9(store, networkName)
 
+	case actorstypes.Version10:
+		return make10(store, networkName)
+
 	}
 	return nil, xerrors.Errorf("unknown actor version %d", av)
 }

chain/actors/builtin/init/v0.go

@@ -1,17 +1,17 @@
 package init
 
 import (
+	"github.com/filecoin-project/go-address"
+	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/ipfs/go-cid"
 	cbg "github.com/whyrusleeping/cbor-gen"
 	"golang.org/x/xerrors"
 
-	"github.com/filecoin-project/go-address"
-	"github.com/filecoin-project/go-state-types/abi"
-	init0 "github.com/filecoin-project/specs-actors/actors/builtin/init"
-	adt0 "github.com/filecoin-project/specs-actors/actors/util/adt"
-
 	"github.com/filecoin-project/lotus/chain/actors/adt"
 	"github.com/filecoin-project/lotus/node/modules/dtypes"
+
+	init0 "github.com/filecoin-project/specs-actors/actors/builtin/init"
+	adt0 "github.com/filecoin-project/specs-actors/actors/util/adt"
 )
 
 var _ State = (*state0)(nil)

chain/actors/builtin/init/v10.go

@@ -0,0 +1,113 @@
+package init
+
+import (
+	"github.com/filecoin-project/go-address"
+	"github.com/filecoin-project/go-state-types/abi"
+	"github.com/ipfs/go-cid"
+	cbg "github.com/whyrusleeping/cbor-gen"
+	"golang.org/x/xerrors"
+
+	"github.com/filecoin-project/lotus/chain/actors/adt"
+	"github.com/filecoin-project/lotus/node/modules/dtypes"
+
+	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"
+)
+
+var _ State = (*state10)(nil)
+
+func load10(store adt.Store, root cid.Cid) (State, error) {
+	out := state10{store: store}
+	err := store.Get(store.Context(), root, &out)
+	if err != nil {
+		return nil, err
+	}
+	return &out, nil
+}
+
+func make10(store adt.Store, networkName string) (State, error) {
+	out := state10{store: store}
+
+	s, err := init10.ConstructState(store, networkName)
+	if err != nil {
+		return nil, err
+	}
+
+	out.State = *s
+
+	return &out, nil
+}
+
+type state10 struct {
+	init10.State
+	store adt.Store
+}
+
+func (s *state10) ResolveAddress(address address.Address) (address.Address, bool, error) {
+	return s.State.ResolveAddress(s.store, address)
+}
+
+func (s *state10) MapAddressToNewID(address address.Address) (address.Address, error) {
+	return s.State.MapAddressToNewID(s.store, address)
+}
+
+func (s *state10) ForEachActor(cb func(id abi.ActorID, address address.Address) error) error {
+	addrs, err := adt10.AsMap(s.store, s.State.AddressMap, builtin10.DefaultHamtBitwidth)
+	if err != nil {
+		return err
+	}
+	var actorID cbg.CborInt
+	return addrs.ForEach(&actorID, func(key string) error {
+		addr, err := address.NewFromBytes([]byte(key))
+		if err != nil {
+			return err
+		}
+		return cb(abi.ActorID(actorID), addr)
+	})
+}
+
+func (s *state10) NetworkName() (dtypes.NetworkName, error) {
+	return dtypes.NetworkName(s.State.NetworkName), nil
+}
+
+func (s *state10) SetNetworkName(name string) error {
+	s.State.NetworkName = name
+	return nil
+}
+
+func (s *state10) SetNextID(id abi.ActorID) error {
+	s.State.NextID = id
+	return nil
+}
+
+func (s *state10) Remove(addrs ...address.Address) (err error) {
+	m, err := adt10.AsMap(s.store, s.State.AddressMap, builtin10.DefaultHamtBitwidth)
+	if err != nil {
+		return err
+	}
+	for _, addr := range addrs {
+		if err = m.Delete(abi.AddrKey(addr)); err != nil {
+			return xerrors.Errorf("failed to delete entry for address: %s; err: %w", addr, err)
+		}
+	}
+	amr, err := m.Root()
+	if err != nil {
+		return xerrors.Errorf("failed to get address map root: %w", err)
+	}
+	s.State.AddressMap = amr
+	return nil
+}
+
+func (s *state10) SetAddressMap(mcid cid.Cid) error {
+	s.State.AddressMap = mcid
+	return nil
+}
+
+func (s *state10) AddressMap() (adt.Map, error) {
+	return adt10.AsMap(s.store, s.State.AddressMap, builtin10.DefaultHamtBitwidth)
+}
+
+func (s *state10) GetState() interface{} {
+	return &s.State
+}

chain/actors/builtin/init/v2.go

@@ -1,17 +1,17 @@
 package init
 
 import (
+	"github.com/filecoin-project/go-address"
+	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/ipfs/go-cid"
 	cbg "github.com/whyrusleeping/cbor-gen"
 	"golang.org/x/xerrors"
 
-	"github.com/filecoin-project/go-address"
-	"github.com/filecoin-project/go-state-types/abi"
-	init2 "github.com/filecoin-project/specs-actors/v2/actors/builtin/init"
-	adt2 "github.com/filecoin-project/specs-actors/v2/actors/util/adt"
-
 	"github.com/filecoin-project/lotus/chain/actors/adt"
 	"github.com/filecoin-project/lotus/node/modules/dtypes"
+
+	init2 "github.com/filecoin-project/specs-actors/v2/actors/builtin/init"
+	adt2 "github.com/filecoin-project/specs-actors/v2/actors/util/adt"
 )
 
 var _ State = (*state2)(nil)

chain/actors/builtin/init/v3.go

@@ -1,18 +1,19 @@
 package init
 
 import (
+	"github.com/filecoin-project/go-address"
+	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/ipfs/go-cid"
 	cbg "github.com/whyrusleeping/cbor-gen"
 	"golang.org/x/xerrors"
 
-	"github.com/filecoin-project/go-address"
-	"github.com/filecoin-project/go-state-types/abi"
-	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"
-
 	"github.com/filecoin-project/lotus/chain/actors/adt"
 	"github.com/filecoin-project/lotus/node/modules/dtypes"
+
+	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"
 )
 
 var _ State = (*state3)(nil)

chain/actors/builtin/init/v4.go

@@ -1,18 +1,19 @@
 package init
 
 import (
+	"github.com/filecoin-project/go-address"
+	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/ipfs/go-cid"
 	cbg "github.com/whyrusleeping/cbor-gen"
 	"golang.org/x/xerrors"
 
-	"github.com/filecoin-project/go-address"
-	"github.com/filecoin-project/go-state-types/abi"
-	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"
-
 	"github.com/filecoin-project/lotus/chain/actors/adt"
 	"github.com/filecoin-project/lotus/node/modules/dtypes"
+
+	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"
 )
 
 var _ State = (*state4)(nil)

chain/actors/builtin/init/v5.go

@@ -1,18 +1,19 @@
 package init
 
 import (
+	"github.com/filecoin-project/go-address"
+	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/ipfs/go-cid"
 	cbg "github.com/whyrusleeping/cbor-gen"
 	"golang.org/x/xerrors"
 
-	"github.com/filecoin-project/go-address"
-	"github.com/filecoin-project/go-state-types/abi"
-	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"
-
 	"github.com/filecoin-project/lotus/chain/actors/adt"
 	"github.com/filecoin-project/lotus/node/modules/dtypes"
+
+	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"
 )
 
 var _ State = (*state5)(nil)

chain/actors/builtin/init/v6.go

@@ -1,18 +1,19 @@
 package init
 
 import (
+	"github.com/filecoin-project/go-address"
+	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/ipfs/go-cid"
 	cbg "github.com/whyrusleeping/cbor-gen"
 	"golang.org/x/xerrors"
 
-	"github.com/filecoin-project/go-address"
-	"github.com/filecoin-project/go-state-types/abi"
-	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"
-
 	"github.com/filecoin-project/lotus/chain/actors/adt"
 	"github.com/filecoin-project/lotus/node/modules/dtypes"
+
+	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"
 )
 
 var _ State = (*state6)(nil)

chain/actors/builtin/init/v7.go

@@ -1,18 +1,19 @@
 package init
 
 import (
+	"github.com/filecoin-project/go-address"
+	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/ipfs/go-cid"
 	cbg "github.com/whyrusleeping/cbor-gen"
 	"golang.org/x/xerrors"
 
-	"github.com/filecoin-project/go-address"
-	"github.com/filecoin-project/go-state-types/abi"
-	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"
-
 	"github.com/filecoin-project/lotus/chain/actors/adt"
 	"github.com/filecoin-project/lotus/node/modules/dtypes"
+
+	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"
 )
 
 var _ State = (*state7)(nil)

chain/actors/builtin/init/v8.go

@@ -1,18 +1,18 @@
 package init
 
 import (
+	"github.com/filecoin-project/go-address"
+	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/ipfs/go-cid"
 	cbg "github.com/whyrusleeping/cbor-gen"
 	"golang.org/x/xerrors"
 
-	"github.com/filecoin-project/go-address"
-	"github.com/filecoin-project/go-state-types/abi"
+	"github.com/filecoin-project/lotus/chain/actors/adt"
+	"github.com/filecoin-project/lotus/node/modules/dtypes"
+
 	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/lotus/chain/actors/adt"
-	"github.com/filecoin-project/lotus/node/modules/dtypes"
 )
 
 var _ State = (*state8)(nil)

chain/actors/builtin/init/v9.go

@@ -1,18 +1,18 @@
 package init
 
 import (
+	"github.com/filecoin-project/go-address"
+	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/ipfs/go-cid"
 	cbg "github.com/whyrusleeping/cbor-gen"
 	"golang.org/x/xerrors"
 
-	"github.com/filecoin-project/go-address"
-	"github.com/filecoin-project/go-state-types/abi"
+	"github.com/filecoin-project/lotus/chain/actors/adt"
+	"github.com/filecoin-project/lotus/node/modules/dtypes"
+
 	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/lotus/chain/actors/adt"
-	"github.com/filecoin-project/lotus/node/modules/dtypes"
 )
 
 var _ State = (*state9)(nil)

chain/actors/builtin/market/market.go

@@ -1,28 +1,37 @@
 package market
 
 import (
+	actorstypes "github.com/filecoin-project/go-state-types/actors"
 	"unicode/utf8"
 
-	cbg "github.com/whyrusleeping/cbor-gen"
+	"github.com/filecoin-project/go-state-types/network"
 	"golang.org/x/xerrors"
 
 	"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"
-	builtintypes "github.com/filecoin-project/go-state-types/builtin"
+	"github.com/filecoin-project/go-state-types/cbor"
+	cbg "github.com/whyrusleeping/cbor-gen"
+
 	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/network"
+
 	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"
+
 	builtin4 "github.com/filecoin-project/specs-actors/v4/actors/builtin"
+
 	builtin5 "github.com/filecoin-project/specs-actors/v5/actors/builtin"
+
 	builtin6 "github.com/filecoin-project/specs-actors/v6/actors/builtin"
+
 	builtin7 "github.com/filecoin-project/specs-actors/v7/actors/builtin"
 
+	builtintypes "github.com/filecoin-project/go-state-types/builtin"
+
 	"github.com/filecoin-project/lotus/chain/actors"
 	"github.com/filecoin-project/lotus/chain/actors/adt"
 	"github.com/filecoin-project/lotus/chain/types"
@@ -47,6 +56,9 @@ func Load(store adt.Store, act *types.Actor) (State, error) {
 		case actorstypes.Version9:
 			return load9(store, act.Head)
 
+		case actorstypes.Version10:
+			return load10(store, act.Head)
+
 		}
 	}
 
@@ -108,6 +120,9 @@ func MakeState(store adt.Store, av actorstypes.Version) (State, error) {
 	case actorstypes.Version9:
 		return make9(store)
 
+	case actorstypes.Version10:
+		return make10(store)
+
 	}
 	return nil, xerrors.Errorf("unknown actor version %d", av)
 }
@@ -192,6 +207,9 @@ func DecodePublishStorageDealsReturn(b []byte, nv network.Version) (PublishStora
 	case actorstypes.Version9:
 		return decodePublishStorageDealsReturn9(b)
 
+	case actorstypes.Version10:
+		return decodePublishStorageDealsReturn10(b)
+
 	}
 	return nil, xerrors.Errorf("unknown actor version %d", av)
 }

chain/actors/builtin/market/v0.go

@@ -3,18 +3,18 @@ package market
 import (
 	"bytes"
 
+	"github.com/filecoin-project/go-address"
+	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/ipfs/go-cid"
 	cbg "github.com/whyrusleeping/cbor-gen"
 	"golang.org/x/xerrors"
 
-	"github.com/filecoin-project/go-address"
-	"github.com/filecoin-project/go-state-types/abi"
 	verifregtypes "github.com/filecoin-project/go-state-types/builtin/v9/verifreg"
-	market0 "github.com/filecoin-project/specs-actors/actors/builtin/market"
-	adt0 "github.com/filecoin-project/specs-actors/actors/util/adt"
-
 	"github.com/filecoin-project/lotus/chain/actors/adt"
 	"github.com/filecoin-project/lotus/chain/types"
+
+	market0 "github.com/filecoin-project/specs-actors/actors/builtin/market"
+	adt0 "github.com/filecoin-project/specs-actors/actors/util/adt"
 )
 
 var _ State = (*state0)(nil)

chain/actors/builtin/market/v10.go

@@ -0,0 +1,351 @@
+package market
+
+import (
+	"bytes"
+
+	"github.com/filecoin-project/go-address"
+	"github.com/filecoin-project/go-state-types/abi"
+	"github.com/ipfs/go-cid"
+	cbg "github.com/whyrusleeping/cbor-gen"
+	"golang.org/x/xerrors"
+
+	"github.com/filecoin-project/go-bitfield"
+	rlepluslazy "github.com/filecoin-project/go-bitfield/rle"
+
+	verifregtypes "github.com/filecoin-project/go-state-types/builtin/v9/verifreg"
+	"github.com/filecoin-project/lotus/chain/actors/adt"
+	"github.com/filecoin-project/lotus/chain/types"
+
+	market10 "github.com/filecoin-project/go-state-types/builtin/v10/market"
+	adt10 "github.com/filecoin-project/go-state-types/builtin/v10/util/adt"
+	markettypes "github.com/filecoin-project/go-state-types/builtin/v9/market"
+
+	"github.com/filecoin-project/go-state-types/builtin"
+)
+
+var _ State = (*state10)(nil)
+
+func load10(store adt.Store, root cid.Cid) (State, error) {
+	out := state10{store: store}
+	err := store.Get(store.Context(), root, &out)
+	if err != nil {
+		return nil, err
+	}
+	return &out, nil
+}
+
+func make10(store adt.Store) (State, error) {
+	out := state10{store: store}
+
+	s, err := market10.ConstructState(store)
+	if err != nil {
+		return nil, err
+	}
+
+	out.State = *s
+
+	return &out, nil
+}
+
+type state10 struct {
+	market10.State
+	store adt.Store
+}
+
+func (s *state10) TotalLocked() (abi.TokenAmount, error) {
+	fml := types.BigAdd(s.TotalClientLockedCollateral, s.TotalProviderLockedCollateral)
+	fml = types.BigAdd(fml, s.TotalClientStorageFee)
+	return fml, nil
+}
+
+func (s *state10) BalancesChanged(otherState State) (bool, error) {
+	otherState10, ok := otherState.(*state10)
+	if !ok {
+		// there's no way to compare different versions of the state, so let's
+		// just say that means the state of balances has changed
+		return true, nil
+	}
+	return !s.State.EscrowTable.Equals(otherState10.State.EscrowTable) || !s.State.LockedTable.Equals(otherState10.State.LockedTable), nil
+}
+
+func (s *state10) StatesChanged(otherState State) (bool, error) {
+	otherState10, ok := otherState.(*state10)
+	if !ok {
+		// there's no way to compare different versions of the state, so let's
+		// just say that means the state of balances has changed
+		return true, nil
+	}
+	return !s.State.States.Equals(otherState10.State.States), nil
+}
+
+func (s *state10) States() (DealStates, error) {
+	stateArray, err := adt10.AsArray(s.store, s.State.States, market10.StatesAmtBitwidth)
+	if err != nil {
+		return nil, err
+	}
+	return &dealStates10{stateArray}, nil
+}
+
+func (s *state10) ProposalsChanged(otherState State) (bool, error) {
+	otherState10, ok := otherState.(*state10)
+	if !ok {
+		// there's no way to compare different versions of the state, so let's
+		// just say that means the state of balances has changed
+		return true, nil
+	}
+	return !s.State.Proposals.Equals(otherState10.State.Proposals), nil
+}
+
+func (s *state10) Proposals() (DealProposals, error) {
+	proposalArray, err := adt10.AsArray(s.store, s.State.Proposals, market10.ProposalsAmtBitwidth)
+	if err != nil {
+		return nil, err
+	}
+	return &dealProposals10{proposalArray}, nil
+}
+
+func (s *state10) EscrowTable() (BalanceTable, error) {
+	bt, err := adt10.AsBalanceTable(s.store, s.State.EscrowTable)
+	if err != nil {
+		return nil, err
+	}
+	return &balanceTable10{bt}, nil
+}
+
+func (s *state10) LockedTable() (BalanceTable, error) {
+	bt, err := adt10.AsBalanceTable(s.store, s.State.LockedTable)
+	if err != nil {
+		return nil, err
+	}
+	return &balanceTable10{bt}, nil
+}
+
+func (s *state10) VerifyDealsForActivation(
+	minerAddr address.Address, deals []abi.DealID, currEpoch, sectorExpiry abi.ChainEpoch,
+) (weight, verifiedWeight abi.DealWeight, err error) {
+	w, vw, _, err := market10.ValidateDealsForActivation(&s.State, s.store, deals, minerAddr, sectorExpiry, currEpoch)
+	return w, vw, err
+}
+
+func (s *state10) NextID() (abi.DealID, error) {
+	return s.State.NextID, nil
+}
+
+type balanceTable10 struct {
+	*adt10.BalanceTable
+}
+
+func (bt *balanceTable10) ForEach(cb func(address.Address, abi.TokenAmount) error) error {
+	asMap := (*adt10.Map)(bt.BalanceTable)
+	var ta abi.TokenAmount
+	return asMap.ForEach(&ta, func(key string) error {
+		a, err := address.NewFromBytes([]byte(key))
+		if err != nil {
+			return err
+		}
+		return cb(a, ta)
+	})
+}
+
+type dealStates10 struct {
+	adt.Array
+}
+
+func (s *dealStates10) Get(dealID abi.DealID) (*DealState, bool, error) {
+	var deal10 market10.DealState
+	found, err := s.Array.Get(uint64(dealID), &deal10)
+	if err != nil {
+		return nil, false, err
+	}
+	if !found {
+		return nil, false, nil
+	}
+	deal := fromV10DealState(deal10)
+	return &deal, true, nil
+}
+
+func (s *dealStates10) ForEach(cb func(dealID abi.DealID, ds DealState) error) error {
+	var ds10 market10.DealState
+	return s.Array.ForEach(&ds10, func(idx int64) error {
+		return cb(abi.DealID(idx), fromV10DealState(ds10))
+	})
+}
+
+func (s *dealStates10) decode(val *cbg.Deferred) (*DealState, error) {
+	var ds10 market10.DealState
+	if err := ds10.UnmarshalCBOR(bytes.NewReader(val.Raw)); err != nil {
+		return nil, err
+	}
+	ds := fromV10DealState(ds10)
+	return &ds, nil
+}
+
+func (s *dealStates10) array() adt.Array {
+	return s.Array
+}
+
+func fromV10DealState(v10 market10.DealState) DealState {
+
+	return (DealState)(v10)
+
+}
+
+type dealProposals10 struct {
+	adt.Array
+}
+
+func (s *dealProposals10) Get(dealID abi.DealID) (*DealProposal, bool, error) {
+	var proposal10 market10.DealProposal
+	found, err := s.Array.Get(uint64(dealID), &proposal10)
+	if err != nil {
+		return nil, false, err
+	}
+	if !found {
+		return nil, false, nil
+	}
+
+	proposal, err := fromV10DealProposal(proposal10)
+	if err != nil {
+		return nil, true, xerrors.Errorf("decoding proposal: %w", err)
+	}
+
+	return &proposal, true, nil
+}
+
+func (s *dealProposals10) ForEach(cb func(dealID abi.DealID, dp DealProposal) error) error {
+	var dp10 market10.DealProposal
+	return s.Array.ForEach(&dp10, func(idx int64) error {
+		dp, err := fromV10DealProposal(dp10)
+		if err != nil {
+			return xerrors.Errorf("decoding proposal: %w", err)
+		}
+
+		return cb(abi.DealID(idx), dp)
+	})
+}
+
+func (s *dealProposals10) decode(val *cbg.Deferred) (*DealProposal, error) {
+	var dp10 market10.DealProposal
+	if err := dp10.UnmarshalCBOR(bytes.NewReader(val.Raw)); err != nil {
+		return nil, err
+	}
+
+	dp, err := fromV10DealProposal(dp10)
+	if err != nil {
+		return nil, err
+	}
+
+	return &dp, nil
+}
+
+func (s *dealProposals10) array() adt.Array {
+	return s.Array
+}
+
+func fromV10DealProposal(v10 market10.DealProposal) (DealProposal, error) {
+
+	label, err := fromV10Label(v10.Label)
+
+	if err != nil {
+		return DealProposal{}, xerrors.Errorf("error setting deal label: %w", err)
+	}
+
+	return DealProposal{
+		PieceCID:     v10.PieceCID,
+		PieceSize:    v10.PieceSize,
+		VerifiedDeal: v10.VerifiedDeal,
+		Client:       v10.Client,
+		Provider:     v10.Provider,
+
+		Label: label,
+
+		StartEpoch:           v10.StartEpoch,
+		EndEpoch:             v10.EndEpoch,
+		StoragePricePerEpoch: v10.StoragePricePerEpoch,
+
+		ProviderCollateral: v10.ProviderCollateral,
+		ClientCollateral:   v10.ClientCollateral,
+	}, nil
+}
+
+func fromV10Label(v10 market10.DealLabel) (DealLabel, error) {
+	if v10.IsString() {
+		str, err := v10.ToString()
+		if err != nil {
+			return markettypes.EmptyDealLabel, xerrors.Errorf("failed to convert string label to string: %w", err)
+		}
+		return markettypes.NewLabelFromString(str)
+	}
+
+	bs, err := v10.ToBytes()
+	if err != nil {
+		return markettypes.EmptyDealLabel, xerrors.Errorf("failed to convert bytes label to bytes: %w", err)
+	}
+	return markettypes.NewLabelFromBytes(bs)
+}
+
+func (s *state10) GetState() interface{} {
+	return &s.State
+}
+
+var _ PublishStorageDealsReturn = (*publishStorageDealsReturn10)(nil)
+
+func decodePublishStorageDealsReturn10(b []byte) (PublishStorageDealsReturn, error) {
+	var retval market10.PublishStorageDealsReturn
+	if err := retval.UnmarshalCBOR(bytes.NewReader(b)); err != nil {
+		return nil, xerrors.Errorf("failed to unmarshal PublishStorageDealsReturn: %w", err)
+	}
+
+	return &publishStorageDealsReturn10{retval}, nil
+}
+
+type publishStorageDealsReturn10 struct {
+	market10.PublishStorageDealsReturn
+}
+
+func (r *publishStorageDealsReturn10) IsDealValid(index uint64) (bool, int, error) {
+
+	set, err := r.ValidDeals.IsSet(index)
+	if err != nil || !set {
+		return false, -1, err
+	}
+	maskBf, err := bitfield.NewFromIter(&rlepluslazy.RunSliceIterator{
+		Runs: []rlepluslazy.Run{rlepluslazy.Run{Val: true, Len: index}}})
+	if err != nil {
+		return false, -1, err
+	}
+	before, err := bitfield.IntersectBitField(maskBf, r.ValidDeals)
+	if err != nil {
+		return false, -1, err
+	}
+	outIdx, err := before.Count()
+	if err != nil {
+		return false, -1, err
+	}
+	return set, int(outIdx), nil
+
+}
+
+func (r *publishStorageDealsReturn10) DealIDs() ([]abi.DealID, error) {
+	return r.IDs, nil
+}
+
+func (s *state10) GetAllocationIdForPendingDeal(dealId abi.DealID) (verifregtypes.AllocationId, error) {
+
+	allocations, err := adt10.AsMap(s.store, s.PendingDealAllocationIds, builtin.DefaultHamtBitwidth)
+	if err != nil {
+		return verifregtypes.NoAllocationID, xerrors.Errorf("failed to load allocation id for %d: %w", dealId, err)
+	}
+
+	var allocationId cbg.CborInt
+	found, err := allocations.Get(abi.UIntKey(uint64(dealId)), &allocationId)
+	if err != nil {
+		return verifregtypes.NoAllocationID, xerrors.Errorf("failed to load allocation id for %d: %w", dealId, err)
+	}
+	if !found {
+		return verifregtypes.NoAllocationID, nil
+	}
+
+	return verifregtypes.AllocationId(allocationId), nil
+
+}

chain/actors/builtin/market/v2.go

@@ -3,18 +3,18 @@ package market
 import (
 	"bytes"
 
+	"github.com/filecoin-project/go-address"
+	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/ipfs/go-cid"
 	cbg "github.com/whyrusleeping/cbor-gen"
 	"golang.org/x/xerrors"
 
-	"github.com/filecoin-project/go-address"
-	"github.com/filecoin-project/go-state-types/abi"
 	verifregtypes "github.com/filecoin-project/go-state-types/builtin/v9/verifreg"
-	market2 "github.com/filecoin-project/specs-actors/v2/actors/builtin/market"
-	adt2 "github.com/filecoin-project/specs-actors/v2/actors/util/adt"
-
 	"github.com/filecoin-project/lotus/chain/actors/adt"
 	"github.com/filecoin-project/lotus/chain/types"
+
+	market2 "github.com/filecoin-project/specs-actors/v2/actors/builtin/market"
+	adt2 "github.com/filecoin-project/specs-actors/v2/actors/util/adt"
 )
 
 var _ State = (*state2)(nil)

chain/actors/builtin/market/v3.go

@@ -3,18 +3,18 @@ package market
 import (
 	"bytes"
 
+	"github.com/filecoin-project/go-address"
+	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/ipfs/go-cid"
 	cbg "github.com/whyrusleeping/cbor-gen"
 	"golang.org/x/xerrors"
 
-	"github.com/filecoin-project/go-address"
-	"github.com/filecoin-project/go-state-types/abi"
 	verifregtypes "github.com/filecoin-project/go-state-types/builtin/v9/verifreg"
-	market3 "github.com/filecoin-project/specs-actors/v3/actors/builtin/market"
-	adt3 "github.com/filecoin-project/specs-actors/v3/actors/util/adt"
-
 	"github.com/filecoin-project/lotus/chain/actors/adt"
 	"github.com/filecoin-project/lotus/chain/types"
+
+	market3 "github.com/filecoin-project/specs-actors/v3/actors/builtin/market"
+	adt3 "github.com/filecoin-project/specs-actors/v3/actors/util/adt"
 )
 
 var _ State = (*state3)(nil)

chain/actors/builtin/market/v4.go

@@ -3,18 +3,18 @@ package market
 import (
 	"bytes"
 
+	"github.com/filecoin-project/go-address"
+	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/ipfs/go-cid"
 	cbg "github.com/whyrusleeping/cbor-gen"
 	"golang.org/x/xerrors"
 
-	"github.com/filecoin-project/go-address"
-	"github.com/filecoin-project/go-state-types/abi"
 	verifregtypes "github.com/filecoin-project/go-state-types/builtin/v9/verifreg"
-	market4 "github.com/filecoin-project/specs-actors/v4/actors/builtin/market"
-	adt4 "github.com/filecoin-project/specs-actors/v4/actors/util/adt"
-
 	"github.com/filecoin-project/lotus/chain/actors/adt"
 	"github.com/filecoin-project/lotus/chain/types"
+
+	market4 "github.com/filecoin-project/specs-actors/v4/actors/builtin/market"
+	adt4 "github.com/filecoin-project/specs-actors/v4/actors/util/adt"
 )
 
 var _ State = (*state4)(nil)

chain/actors/builtin/market/v5.go

@@ -3,18 +3,18 @@ package market
 import (
 	"bytes"
 
+	"github.com/filecoin-project/go-address"
+	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/ipfs/go-cid"
 	cbg "github.com/whyrusleeping/cbor-gen"
 	"golang.org/x/xerrors"
 
-	"github.com/filecoin-project/go-address"
-	"github.com/filecoin-project/go-state-types/abi"
 	verifregtypes "github.com/filecoin-project/go-state-types/builtin/v9/verifreg"
-	market5 "github.com/filecoin-project/specs-actors/v5/actors/builtin/market"
-	adt5 "github.com/filecoin-project/specs-actors/v5/actors/util/adt"
-
 	"github.com/filecoin-project/lotus/chain/actors/adt"
 	"github.com/filecoin-project/lotus/chain/types"
+
+	market5 "github.com/filecoin-project/specs-actors/v5/actors/builtin/market"
+	adt5 "github.com/filecoin-project/specs-actors/v5/actors/util/adt"
 )
 
 var _ State = (*state5)(nil)

chain/actors/builtin/market/v6.go

@@ -3,20 +3,21 @@ package market
 import (
 	"bytes"
 
+	"github.com/filecoin-project/go-address"
+	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/ipfs/go-cid"
 	cbg "github.com/whyrusleeping/cbor-gen"
 	"golang.org/x/xerrors"
 
-	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-bitfield"
 	rlepluslazy "github.com/filecoin-project/go-bitfield/rle"
-	"github.com/filecoin-project/go-state-types/abi"
-	verifregtypes "github.com/filecoin-project/go-state-types/builtin/v9/verifreg"
-	market6 "github.com/filecoin-project/specs-actors/v6/actors/builtin/market"
-	adt6 "github.com/filecoin-project/specs-actors/v6/actors/util/adt"
 
+	verifregtypes "github.com/filecoin-project/go-state-types/builtin/v9/verifreg"
 	"github.com/filecoin-project/lotus/chain/actors/adt"
 	"github.com/filecoin-project/lotus/chain/types"
+
+	market6 "github.com/filecoin-project/specs-actors/v6/actors/builtin/market"
+	adt6 "github.com/filecoin-project/specs-actors/v6/actors/util/adt"
 )
 
 var _ State = (*state6)(nil)

chain/actors/builtin/market/v7.go

@@ -3,20 +3,21 @@ package market
 import (
 	"bytes"
 
+	"github.com/filecoin-project/go-address"
+	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/ipfs/go-cid"
 	cbg "github.com/whyrusleeping/cbor-gen"
 	"golang.org/x/xerrors"
 
-	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-bitfield"
 	rlepluslazy "github.com/filecoin-project/go-bitfield/rle"
-	"github.com/filecoin-project/go-state-types/abi"
-	verifregtypes "github.com/filecoin-project/go-state-types/builtin/v9/verifreg"
-	market7 "github.com/filecoin-project/specs-actors/v7/actors/builtin/market"
-	adt7 "github.com/filecoin-project/specs-actors/v7/actors/util/adt"
 
+	verifregtypes "github.com/filecoin-project/go-state-types/builtin/v9/verifreg"
 	"github.com/filecoin-project/lotus/chain/actors/adt"
 	"github.com/filecoin-project/lotus/chain/types"
+
+	market7 "github.com/filecoin-project/specs-actors/v7/actors/builtin/market"
+	adt7 "github.com/filecoin-project/specs-actors/v7/actors/util/adt"
 )
 
 var _ State = (*state7)(nil)

chain/actors/builtin/market/v8.go

@@ -3,21 +3,22 @@ package market
 import (
 	"bytes"
 
+	"github.com/filecoin-project/go-address"
+	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/ipfs/go-cid"
 	cbg "github.com/whyrusleeping/cbor-gen"
 	"golang.org/x/xerrors"
 
-	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-bitfield"
 	rlepluslazy "github.com/filecoin-project/go-bitfield/rle"
-	"github.com/filecoin-project/go-state-types/abi"
+
+	verifregtypes "github.com/filecoin-project/go-state-types/builtin/v9/verifreg"
+	"github.com/filecoin-project/lotus/chain/actors/adt"
+	"github.com/filecoin-project/lotus/chain/types"
+
 	market8 "github.com/filecoin-project/go-state-types/builtin/v8/market"
 	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/lotus/chain/actors/adt"
-	"github.com/filecoin-project/lotus/chain/types"
 )
 
 var _ State = (*state8)(nil)

chain/actors/builtin/market/v9.go

@@ -3,22 +3,24 @@ package market
 import (
 	"bytes"
 
+	"github.com/filecoin-project/go-address"
+	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/ipfs/go-cid"
 	cbg "github.com/whyrusleeping/cbor-gen"
 	"golang.org/x/xerrors"
 
-	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-bitfield"
 	rlepluslazy "github.com/filecoin-project/go-bitfield/rle"
-	"github.com/filecoin-project/go-state-types/abi"
-	"github.com/filecoin-project/go-state-types/builtin"
+
+	verifregtypes "github.com/filecoin-project/go-state-types/builtin/v9/verifreg"
+	"github.com/filecoin-project/lotus/chain/actors/adt"
+	"github.com/filecoin-project/lotus/chain/types"
+
 	market9 "github.com/filecoin-project/go-state-types/builtin/v9/market"
 	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/lotus/chain/actors/adt"
-	"github.com/filecoin-project/lotus/chain/types"
+	"github.com/filecoin-project/go-state-types/builtin"
 )
 
 var _ State = (*state9)(nil)

chain/actors/builtin/miner/miner.go

@@ -1,29 +1,36 @@
 package miner
 
 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/network"
+	"github.com/filecoin-project/lotus/chain/actors"
 	cbg "github.com/whyrusleeping/cbor-gen"
 	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/go-bitfield"
 	"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"
-	miner9 "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/network"
 	"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"
-	builtin3 "github.com/filecoin-project/specs-actors/v3/actors/builtin"
-	builtin4 "github.com/filecoin-project/specs-actors/v4/actors/builtin"
-	builtin5 "github.com/filecoin-project/specs-actors/v5/actors/builtin"
-	builtin6 "github.com/filecoin-project/specs-actors/v6/actors/builtin"
-	builtin7 "github.com/filecoin-project/specs-actors/v7/actors/builtin"
 
-	"github.com/filecoin-project/lotus/chain/actors"
+	miner10 "github.com/filecoin-project/go-state-types/builtin/v10/miner"
 	"github.com/filecoin-project/lotus/chain/actors/adt"
 	"github.com/filecoin-project/lotus/chain/types"
+
+	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"
+
+	builtin4 "github.com/filecoin-project/specs-actors/v4/actors/builtin"
+
+	builtin5 "github.com/filecoin-project/specs-actors/v5/actors/builtin"
+
+	builtin6 "github.com/filecoin-project/specs-actors/v6/actors/builtin"
+
+	builtin7 "github.com/filecoin-project/specs-actors/v7/actors/builtin"
 )
 
 func Load(store adt.Store, act *types.Actor) (State, error) {
@@ -40,6 +47,9 @@ func Load(store adt.Store, act *types.Actor) (State, error) {
 		case actorstypes.Version9:
 			return load9(store, act.Head)
 
+		case actorstypes.Version10:
+			return load10(store, act.Head)
+
 		}
 	}
 
@@ -101,6 +111,9 @@ func MakeState(store adt.Store, av actors.Version) (State, error) {
 	case actors.Version9:
 		return make9(store)
 
+	case actors.Version10:
+		return make10(store)
+
 	}
 	return nil, xerrors.Errorf("unknown actor version %d", av)
 }
@@ -119,8 +132,8 @@ type State interface {
 	GetSector(abi.SectorNumber) (*SectorOnChainInfo, error)
 	FindSector(abi.SectorNumber) (*SectorLocation, error)
 	GetSectorExpiration(abi.SectorNumber) (*SectorExpiration, error)
-	GetPrecommittedSector(abi.SectorNumber) (*miner9.SectorPreCommitOnChainInfo, error)
-	ForEachPrecommittedSector(func(miner9.SectorPreCommitOnChainInfo) error) error
+	GetPrecommittedSector(abi.SectorNumber) (*miner10.SectorPreCommitOnChainInfo, error)
+	ForEachPrecommittedSector(func(miner10.SectorPreCommitOnChainInfo) error) error
 	LoadSectors(sectorNos *bitfield.BitField) ([]*SectorOnChainInfo, error)
 	NumLiveSectors() (uint64, error)
 	IsAllocated(abi.SectorNumber) (bool, error)
@@ -149,7 +162,7 @@ type State interface {
 	sectors() (adt.Array, error)
 	decodeSectorOnChainInfo(*cbg.Deferred) (SectorOnChainInfo, error)
 	precommits() (adt.Map, error)
-	decodeSectorPreCommitOnChainInfo(*cbg.Deferred) (miner9.SectorPreCommitOnChainInfo, error)
+	decodeSectorPreCommitOnChainInfo(*cbg.Deferred) (miner10.SectorPreCommitOnChainInfo, error)
 	GetState() interface{}
 }
 
@@ -187,7 +200,7 @@ type Partition interface {
 	UnprovenSectors() (bitfield.BitField, error)
 }
 
-type SectorOnChainInfo = miner9.SectorOnChainInfo
+type SectorOnChainInfo = miner10.SectorOnChainInfo
 
 func PreferredSealProofTypeFromWindowPoStType(nver network.Version, proof abi.RegisteredPoStProof) (abi.RegisteredSealProof, error) {
 	// We added support for the new proofs in network version 7, and removed support for the old
@@ -242,9 +255,9 @@ func WinningPoStProofTypeFromWindowPoStProofType(nver network.Version, proof abi
 	}
 }
 
-type MinerInfo = miner9.MinerInfo
-type WorkerKeyChange = miner9.WorkerKeyChange
-type SectorPreCommitOnChainInfo = miner9.SectorPreCommitOnChainInfo
+type MinerInfo = miner10.MinerInfo
+type WorkerKeyChange = miner10.WorkerKeyChange
+type SectorPreCommitOnChainInfo = miner10.SectorPreCommitOnChainInfo
 type WindowPostVerifyInfo = proof.WindowPoStVerifyInfo
 
 type SectorExpiration struct {
@@ -272,8 +285,8 @@ type SectorExtensions struct {
 }
 
 type PreCommitChanges struct {
-	Added   []miner9.SectorPreCommitOnChainInfo
-	Removed []miner9.SectorPreCommitOnChainInfo
+	Added   []miner10.SectorPreCommitOnChainInfo
+	Removed []miner10.SectorPreCommitOnChainInfo
 }
 
 type LockedFunds struct {

chain/actors/builtin/miner/v0.go

@@ -4,20 +4,21 @@ import (
 	"bytes"
 	"errors"
 
-	"github.com/ipfs/go-cid"
-	cbg "github.com/whyrusleeping/cbor-gen"
-	"golang.org/x/xerrors"
+	"github.com/filecoin-project/go-state-types/big"
 
 	"github.com/filecoin-project/go-bitfield"
 	rle "github.com/filecoin-project/go-bitfield/rle"
 	"github.com/filecoin-project/go-state-types/abi"
-	"github.com/filecoin-project/go-state-types/big"
-	minertypes "github.com/filecoin-project/go-state-types/builtin/v9/miner"
 	"github.com/filecoin-project/go-state-types/dline"
+	"github.com/ipfs/go-cid"
+	cbg "github.com/whyrusleeping/cbor-gen"
+	"golang.org/x/xerrors"
+
+	minertypes "github.com/filecoin-project/go-state-types/builtin/v10/miner"
+	"github.com/filecoin-project/lotus/chain/actors/adt"
+
 	miner0 "github.com/filecoin-project/specs-actors/actors/builtin/miner"
 	adt0 "github.com/filecoin-project/specs-actors/actors/util/adt"
-
-	"github.com/filecoin-project/lotus/chain/actors/adt"
 )
 
 var _ State = (*state0)(nil)

chain/actors/builtin/miner/v10.go

@@ -0,0 +1,554 @@
+package miner
+
+import (
+	"bytes"
+	"errors"
+
+	"github.com/filecoin-project/go-bitfield"
+	rle "github.com/filecoin-project/go-bitfield/rle"
+	"github.com/filecoin-project/go-state-types/abi"
+	"github.com/filecoin-project/go-state-types/dline"
+	"github.com/ipfs/go-cid"
+	cbg "github.com/whyrusleeping/cbor-gen"
+	"golang.org/x/xerrors"
+
+	minertypes "github.com/filecoin-project/go-state-types/builtin/v10/miner"
+	"github.com/filecoin-project/lotus/chain/actors/adt"
+
+	builtin10 "github.com/filecoin-project/go-state-types/builtin"
+	miner10 "github.com/filecoin-project/go-state-types/builtin/v10/miner"
+	adt10 "github.com/filecoin-project/go-state-types/builtin/v10/util/adt"
+)
+
+var _ State = (*state10)(nil)
+
+func load10(store adt.Store, root cid.Cid) (State, error) {
+	out := state10{store: store}
+	err := store.Get(store.Context(), root, &out)
+	if err != nil {
+		return nil, err
+	}
+	return &out, nil
+}
+
+func make10(store adt.Store) (State, error) {
+	out := state10{store: store}
+	out.State = miner10.State{}
+	return &out, nil
+}
+
+type state10 struct {
+	miner10.State
+	store adt.Store
+}
+
+type deadline10 struct {
+	miner10.Deadline
+	store adt.Store
+}
+
+type partition10 struct {
+	miner10.Partition
+	store adt.Store
+}
+
+func (s *state10) AvailableBalance(bal abi.TokenAmount) (available abi.TokenAmount, err error) {
+	defer func() {
+		if r := recover(); r != nil {
+			err = xerrors.Errorf("failed to get available balance: %w", r)
+			available = abi.NewTokenAmount(0)
+		}
+	}()
+	// this panics if the miner doesnt have enough funds to cover their locked pledge
+	available, err = s.GetAvailableBalance(bal)
+	return available, err
+}
+
+func (s *state10) VestedFunds(epoch abi.ChainEpoch) (abi.TokenAmount, error) {
+	return s.CheckVestedFunds(s.store, epoch)
+}
+
+func (s *state10) LockedFunds() (LockedFunds, error) {
+	return LockedFunds{
+		VestingFunds:             s.State.LockedFunds,
+		InitialPledgeRequirement: s.State.InitialPledge,
+		PreCommitDeposits:        s.State.PreCommitDeposits,
+	}, nil
+}
+
+func (s *state10) FeeDebt() (abi.TokenAmount, error) {
+	return s.State.FeeDebt, nil
+}
+
+func (s *state10) InitialPledge() (abi.TokenAmount, error) {
+	return s.State.InitialPledge, nil
+}
+
+func (s *state10) PreCommitDeposits() (abi.TokenAmount, error) {
+	return s.State.PreCommitDeposits, nil
+}
+
+func (s *state10) GetSector(num abi.SectorNumber) (*SectorOnChainInfo, error) {
+	info, ok, err := s.State.GetSector(s.store, num)
+	if !ok || err != nil {
+		return nil, err
+	}
+
+	ret := fromV10SectorOnChainInfo(*info)
+	return &ret, nil
+}
+
+func (s *state10) FindSector(num abi.SectorNumber) (*SectorLocation, error) {
+	dlIdx, partIdx, err := s.State.FindSector(s.store, num)
+	if err != nil {
+		return nil, err
+	}
+	return &SectorLocation{
+		Deadline:  dlIdx,
+		Partition: partIdx,
+	}, nil
+}
+
+func (s *state10) NumLiveSectors() (uint64, error) {
+	dls, err := s.State.LoadDeadlines(s.store)
+	if err != nil {
+		return 0, err
+	}
+	var total uint64
+	if err := dls.ForEach(s.store, func(dlIdx uint64, dl *miner10.Deadline) error {
+		total += dl.LiveSectors
+		return nil
+	}); err != nil {
+		return 0, err
+	}
+	return total, nil
+}
+
+// GetSectorExpiration returns the effective expiration of the given sector.
+//
+// If the sector does not expire early, the Early expiration field is 0.
+func (s *state10) GetSectorExpiration(num abi.SectorNumber) (*SectorExpiration, error) {
+	dls, err := s.State.LoadDeadlines(s.store)
+	if err != nil {
+		return nil, err
+	}
+	// NOTE: this can be optimized significantly.
+	// 1. If the sector is non-faulty, it will expire on-time (can be
+	// learned from the sector info).
+	// 2. If it's faulty, it will expire early within the first 42 entries
+	// of the expiration queue.
+
+	stopErr := errors.New("stop")
+	out := SectorExpiration{}
+	err = dls.ForEach(s.store, func(dlIdx uint64, dl *miner10.Deadline) error {
+		partitions, err := dl.PartitionsArray(s.store)
+		if err != nil {
+			return err
+		}
+		quant := s.State.QuantSpecForDeadline(dlIdx)
+		var part miner10.Partition
+		return partitions.ForEach(&part, func(partIdx int64) error {
+			if found, err := part.Sectors.IsSet(uint64(num)); err != nil {
+				return err
+			} else if !found {
+				return nil
+			}
+			if found, err := part.Terminated.IsSet(uint64(num)); err != nil {
+				return err
+			} else if found {
+				// already terminated
+				return stopErr
+			}
+
+			q, err := miner10.LoadExpirationQueue(s.store, part.ExpirationsEpochs, quant, miner10.PartitionExpirationAmtBitwidth)
+			if err != nil {
+				return err
+			}
+			var exp miner10.ExpirationSet
+			return q.ForEach(&exp, func(epoch int64) error {
+				if early, err := exp.EarlySectors.IsSet(uint64(num)); err != nil {
+					return err
+				} else if early {
+					out.Early = abi.ChainEpoch(epoch)
+					return nil
+				}
+				if onTime, err := exp.OnTimeSectors.IsSet(uint64(num)); err != nil {
+					return err
+				} else if onTime {
+					out.OnTime = abi.ChainEpoch(epoch)
+					return stopErr
+				}
+				return nil
+			})
+		})
+	})
+	if err == stopErr {
+		err = nil
+	}
+	if err != nil {
+		return nil, err
+	}
+	if out.Early == 0 && out.OnTime == 0 {
+		return nil, xerrors.Errorf("failed to find sector %d", num)
+	}
+	return &out, nil
+}
+
+func (s *state10) GetPrecommittedSector(num abi.SectorNumber) (*minertypes.SectorPreCommitOnChainInfo, error) {
+	info, ok, err := s.State.GetPrecommittedSector(s.store, num)
+	if !ok || err != nil {
+		return nil, err
+	}
+
+	ret := fromV10SectorPreCommitOnChainInfo(*info)
+
+	return &ret, nil
+}
+
+func (s *state10) ForEachPrecommittedSector(cb func(minertypes.SectorPreCommitOnChainInfo) error) error {
+	precommitted, err := adt10.AsMap(s.store, s.State.PreCommittedSectors, builtin10.DefaultHamtBitwidth)
+	if err != nil {
+		return err
+	}
+
+	var info miner10.SectorPreCommitOnChainInfo
+	if err := precommitted.ForEach(&info, func(_ string) error {
+		return cb(fromV10SectorPreCommitOnChainInfo(info))
+	}); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (s *state10) LoadSectors(snos *bitfield.BitField) ([]*SectorOnChainInfo, error) {
+	sectors, err := miner10.LoadSectors(s.store, s.State.Sectors)
+	if err != nil {
+		return nil, err
+	}
+
+	// If no sector numbers are specified, load all.
+	if snos == nil {
+		infos := make([]*SectorOnChainInfo, 0, sectors.Length())
+		var info10 miner10.SectorOnChainInfo
+		if err := sectors.ForEach(&info10, func(_ int64) error {
+			info := fromV10SectorOnChainInfo(info10)
+			infos = append(infos, &info)
+			return nil
+		}); err != nil {
+			return nil, err
+		}
+		return infos, nil
+	}
+
+	// Otherwise, load selected.
+	infos10, err := sectors.Load(*snos)
+	if err != nil {
+		return nil, err
+	}
+	infos := make([]*SectorOnChainInfo, len(infos10))
+	for i, info10 := range infos10 {
+		info := fromV10SectorOnChainInfo(*info10)
+		infos[i] = &info
+	}
+	return infos, nil
+}
+
+func (s *state10) loadAllocatedSectorNumbers() (bitfield.BitField, error) {
+	var allocatedSectors bitfield.BitField
+	err := s.store.Get(s.store.Context(), s.State.AllocatedSectors, &allocatedSectors)
+	return allocatedSectors, err
+}
+
+func (s *state10) IsAllocated(num abi.SectorNumber) (bool, error) {
+	allocatedSectors, err := s.loadAllocatedSectorNumbers()
+	if err != nil {
+		return false, err
+	}
+
+	return allocatedSectors.IsSet(uint64(num))
+}
+
+func (s *state10) GetProvingPeriodStart() (abi.ChainEpoch, error) {
+	return s.State.ProvingPeriodStart, nil
+}
+
+func (s *state10) UnallocatedSectorNumbers(count int) ([]abi.SectorNumber, error) {
+	allocatedSectors, err := s.loadAllocatedSectorNumbers()
+	if err != nil {
+		return nil, err
+	}
+
+	allocatedRuns, err := allocatedSectors.RunIterator()
+	if err != nil {
+		return nil, err
+	}
+
+	unallocatedRuns, err := rle.Subtract(
+		&rle.RunSliceIterator{Runs: []rle.Run{{Val: true, Len: abi.MaxSectorNumber}}},
+		allocatedRuns,
+	)
+	if err != nil {
+		return nil, err
+	}
+
+	iter, err := rle.BitsFromRuns(unallocatedRuns)
+	if err != nil {
+		return nil, err
+	}
+
+	sectors := make([]abi.SectorNumber, 0, count)
+	for iter.HasNext() && len(sectors) < count {
+		nextNo, err := iter.Next()
+		if err != nil {
+			return nil, err
+		}
+		sectors = append(sectors, abi.SectorNumber(nextNo))
+	}
+
+	return sectors, nil
+}
+
+func (s *state10) GetAllocatedSectors() (*bitfield.BitField, error) {
+	var allocatedSectors bitfield.BitField
+	if err := s.store.Get(s.store.Context(), s.State.AllocatedSectors, &allocatedSectors); err != nil {
+		return nil, err
+	}
+
+	return &allocatedSectors, nil
+}
+
+func (s *state10) LoadDeadline(idx uint64) (Deadline, error) {
+	dls, err := s.State.LoadDeadlines(s.store)
+	if err != nil {
+		return nil, err
+	}
+	dl, err := dls.LoadDeadline(s.store, idx)
+	if err != nil {
+		return nil, err
+	}
+	return &deadline10{*dl, s.store}, nil
+}
+
+func (s *state10) ForEachDeadline(cb func(uint64, Deadline) error) error {
+	dls, err := s.State.LoadDeadlines(s.store)
+	if err != nil {
+		return err
+	}
+	return dls.ForEach(s.store, func(i uint64, dl *miner10.Deadline) error {
+		return cb(i, &deadline10{*dl, s.store})
+	})
+}
+
+func (s *state10) NumDeadlines() (uint64, error) {
+	return miner10.WPoStPeriodDeadlines, nil
+}
+
+func (s *state10) DeadlinesChanged(other State) (bool, error) {
+	other10, ok := other.(*state10)
+	if !ok {
+		// treat an upgrade as a change, always
+		return true, nil
+	}
+
+	return !s.State.Deadlines.Equals(other10.Deadlines), nil
+}
+
+func (s *state10) MinerInfoChanged(other State) (bool, error) {
+	other0, ok := other.(*state10)
+	if !ok {
+		// treat an upgrade as a change, always
+		return true, nil
+	}
+	return !s.State.Info.Equals(other0.State.Info), nil
+}
+
+func (s *state10) Info() (MinerInfo, error) {
+	info, err := s.State.GetInfo(s.store)
+	if err != nil {
+		return MinerInfo{}, err
+	}
+
+	mi := MinerInfo{
+		Owner:            info.Owner,
+		Worker:           info.Worker,
+		ControlAddresses: info.ControlAddresses,
+
+		PendingWorkerKey: (*WorkerKeyChange)(info.PendingWorkerKey),
+
+		PeerId:                     info.PeerId,
+		Multiaddrs:                 info.Multiaddrs,
+		WindowPoStProofType:        info.WindowPoStProofType,
+		SectorSize:                 info.SectorSize,
+		WindowPoStPartitionSectors: info.WindowPoStPartitionSectors,
+		ConsensusFaultElapsed:      info.ConsensusFaultElapsed,
+
+		Beneficiary:            info.Beneficiary,
+		BeneficiaryTerm:        info.BeneficiaryTerm,
+		PendingBeneficiaryTerm: info.PendingBeneficiaryTerm,
+	}
+
+	return mi, nil
+}
+
+func (s *state10) DeadlineInfo(epoch abi.ChainEpoch) (*dline.Info, error) {
+	return s.State.RecordedDeadlineInfo(epoch), nil
+}
+
+func (s *state10) DeadlineCronActive() (bool, error) {
+	return s.State.DeadlineCronActive, nil
+}
+
+func (s *state10) sectors() (adt.Array, error) {
+	return adt10.AsArray(s.store, s.Sectors, miner10.SectorsAmtBitwidth)
+}
+
+func (s *state10) decodeSectorOnChainInfo(val *cbg.Deferred) (SectorOnChainInfo, error) {
+	var si miner10.SectorOnChainInfo
+	err := si.UnmarshalCBOR(bytes.NewReader(val.Raw))
+	if err != nil {
+		return SectorOnChainInfo{}, err
+	}
+
+	return fromV10SectorOnChainInfo(si), nil
+}
+
+func (s *state10) precommits() (adt.Map, error) {
+	return adt10.AsMap(s.store, s.PreCommittedSectors, builtin10.DefaultHamtBitwidth)
+}
+
+func (s *state10) decodeSectorPreCommitOnChainInfo(val *cbg.Deferred) (minertypes.SectorPreCommitOnChainInfo, error) {
+	var sp miner10.SectorPreCommitOnChainInfo
+	err := sp.UnmarshalCBOR(bytes.NewReader(val.Raw))
+	if err != nil {
+		return minertypes.SectorPreCommitOnChainInfo{}, err
+	}
+
+	return fromV10SectorPreCommitOnChainInfo(sp), nil
+}
+
+func (s *state10) EraseAllUnproven() error {
+
+	dls, err := s.State.LoadDeadlines(s.store)
+	if err != nil {
+		return err
+	}
+
+	err = dls.ForEach(s.store, func(dindx uint64, dl *miner10.Deadline) error {
+		ps, err := dl.PartitionsArray(s.store)
+		if err != nil {
+			return err
+		}
+
+		var part miner10.Partition
+		err = ps.ForEach(&part, func(pindx int64) error {
+			_ = part.ActivateUnproven()
+			err = ps.Set(uint64(pindx), &part)
+			return nil
+		})
+
+		if err != nil {
+			return err
+		}
+
+		dl.Partitions, err = ps.Root()
+		if err != nil {
+			return err
+		}
+
+		return dls.UpdateDeadline(s.store, dindx, dl)
+	})
+	if err != nil {
+		return err
+	}
+
+	return s.State.SaveDeadlines(s.store, dls)
+
+}
+
+func (d *deadline10) LoadPartition(idx uint64) (Partition, error) {
+	p, err := d.Deadline.LoadPartition(d.store, idx)
+	if err != nil {
+		return nil, err
+	}
+	return &partition10{*p, d.store}, nil
+}
+
+func (d *deadline10) ForEachPartition(cb func(uint64, Partition) error) error {
+	ps, err := d.Deadline.PartitionsArray(d.store)
+	if err != nil {
+		return err
+	}
+	var part miner10.Partition
+	return ps.ForEach(&part, func(i int64) error {
+		return cb(uint64(i), &partition10{part, d.store})
+	})
+}
+
+func (d *deadline10) PartitionsChanged(other Deadline) (bool, error) {
+	other10, ok := other.(*deadline10)
+	if !ok {
+		// treat an upgrade as a change, always
+		return true, nil
+	}
+
+	return !d.Deadline.Partitions.Equals(other10.Deadline.Partitions), nil
+}
+
+func (d *deadline10) PartitionsPoSted() (bitfield.BitField, error) {
+	return d.Deadline.PartitionsPoSted, nil
+}
+
+func (d *deadline10) DisputableProofCount() (uint64, error) {
+
+	ops, err := d.OptimisticProofsSnapshotArray(d.store)
+	if err != nil {
+		return 0, err
+	}
+
+	return ops.Length(), nil
+
+}
+
+func (p *partition10) AllSectors() (bitfield.BitField, error) {
+	return p.Partition.Sectors, nil
+}
+
+func (p *partition10) FaultySectors() (bitfield.BitField, error) {
+	return p.Partition.Faults, nil
+}
+
+func (p *partition10) RecoveringSectors() (bitfield.BitField, error) {
+	return p.Partition.Recoveries, nil
+}
+
+func (p *partition10) UnprovenSectors() (bitfield.BitField, error) {
+	return p.Partition.Unproven, nil
+}
+
+func fromV10SectorOnChainInfo(v10 miner10.SectorOnChainInfo) SectorOnChainInfo {
+	info := SectorOnChainInfo{
+		SectorNumber:          v10.SectorNumber,
+		SealProof:             v10.SealProof,
+		SealedCID:             v10.SealedCID,
+		DealIDs:               v10.DealIDs,
+		Activation:            v10.Activation,
+		Expiration:            v10.Expiration,
+		DealWeight:            v10.DealWeight,
+		VerifiedDealWeight:    v10.VerifiedDealWeight,
+		InitialPledge:         v10.InitialPledge,
+		ExpectedDayReward:     v10.ExpectedDayReward,
+		ExpectedStoragePledge: v10.ExpectedStoragePledge,
+
+		SectorKeyCID: v10.SectorKeyCID,
+	}
+	return info
+}
+
+func fromV10SectorPreCommitOnChainInfo(v10 miner10.SectorPreCommitOnChainInfo) minertypes.SectorPreCommitOnChainInfo {
+	return v10
+}
+
+func (s *state10) GetState() interface{} {
+	return &s.State
+}

chain/actors/builtin/miner/v2.go

@@ -4,19 +4,19 @@ import (
 	"bytes"
 	"errors"
 
+	"github.com/filecoin-project/go-bitfield"
+	rle "github.com/filecoin-project/go-bitfield/rle"
+	"github.com/filecoin-project/go-state-types/abi"
+	"github.com/filecoin-project/go-state-types/dline"
 	"github.com/ipfs/go-cid"
 	cbg "github.com/whyrusleeping/cbor-gen"
 	"golang.org/x/xerrors"
 
-	"github.com/filecoin-project/go-bitfield"
-	rle "github.com/filecoin-project/go-bitfield/rle"
-	"github.com/filecoin-project/go-state-types/abi"
-	minertypes "github.com/filecoin-project/go-state-types/builtin/v9/miner"
-	"github.com/filecoin-project/go-state-types/dline"
+	minertypes "github.com/filecoin-project/go-state-types/builtin/v10/miner"
+	"github.com/filecoin-project/lotus/chain/actors/adt"
+
 	miner2 "github.com/filecoin-project/specs-actors/v2/actors/builtin/miner"
 	adt2 "github.com/filecoin-project/specs-actors/v2/actors/util/adt"
-
-	"github.com/filecoin-project/lotus/chain/actors/adt"
 )
 
 var _ State = (*state2)(nil)

chain/actors/builtin/miner/v3.go

@@ -4,20 +4,21 @@ import (
 	"bytes"
 	"errors"
 
+	"github.com/filecoin-project/go-bitfield"
+	rle "github.com/filecoin-project/go-bitfield/rle"
+	"github.com/filecoin-project/go-state-types/abi"
+	"github.com/filecoin-project/go-state-types/dline"
 	"github.com/ipfs/go-cid"
 	cbg "github.com/whyrusleeping/cbor-gen"
 	"golang.org/x/xerrors"
 
-	"github.com/filecoin-project/go-bitfield"
-	rle "github.com/filecoin-project/go-bitfield/rle"
-	"github.com/filecoin-project/go-state-types/abi"
-	minertypes "github.com/filecoin-project/go-state-types/builtin/v9/miner"
-	"github.com/filecoin-project/go-state-types/dline"
+	minertypes "github.com/filecoin-project/go-state-types/builtin/v10/miner"
+	"github.com/filecoin-project/lotus/chain/actors/adt"
+
 	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"
-
-	"github.com/filecoin-project/lotus/chain/actors/adt"
 )
 
 var _ State = (*state3)(nil)

chain/actors/builtin/miner/v4.go

@@ -4,20 +4,21 @@ import (
 	"bytes"
 	"errors"
 
+	"github.com/filecoin-project/go-bitfield"
+	rle "github.com/filecoin-project/go-bitfield/rle"
+	"github.com/filecoin-project/go-state-types/abi"
+	"github.com/filecoin-project/go-state-types/dline"
 	"github.com/ipfs/go-cid"
 	cbg "github.com/whyrusleeping/cbor-gen"
 	"golang.org/x/xerrors"
 
-	"github.com/filecoin-project/go-bitfield"
-	rle "github.com/filecoin-project/go-bitfield/rle"
-	"github.com/filecoin-project/go-state-types/abi"
-	minertypes "github.com/filecoin-project/go-state-types/builtin/v9/miner"
-	"github.com/filecoin-project/go-state-types/dline"
+	minertypes "github.com/filecoin-project/go-state-types/builtin/v10/miner"
+	"github.com/filecoin-project/lotus/chain/actors/adt"
+
 	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"
-
-	"github.com/filecoin-project/lotus/chain/actors/adt"
 )
 
 var _ State = (*state4)(nil)

chain/actors/builtin/miner/v5.go

@@ -4,20 +4,21 @@ import (
 	"bytes"
 	"errors"
 
+	"github.com/filecoin-project/go-bitfield"
+	rle "github.com/filecoin-project/go-bitfield/rle"
+	"github.com/filecoin-project/go-state-types/abi"
+	"github.com/filecoin-project/go-state-types/dline"
 	"github.com/ipfs/go-cid"
 	cbg "github.com/whyrusleeping/cbor-gen"
 	"golang.org/x/xerrors"
 
-	"github.com/filecoin-project/go-bitfield"
-	rle "github.com/filecoin-project/go-bitfield/rle"
-	"github.com/filecoin-project/go-state-types/abi"
-	minertypes "github.com/filecoin-project/go-state-types/builtin/v9/miner"
-	"github.com/filecoin-project/go-state-types/dline"
+	minertypes "github.com/filecoin-project/go-state-types/builtin/v10/miner"
+	"github.com/filecoin-project/lotus/chain/actors/adt"
+
 	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"
-
-	"github.com/filecoin-project/lotus/chain/actors/adt"
 )
 
 var _ State = (*state5)(nil)

chain/actors/builtin/miner/v6.go

@@ -4,20 +4,21 @@ import (
 	"bytes"
 	"errors"
 
+	"github.com/filecoin-project/go-bitfield"
+	rle "github.com/filecoin-project/go-bitfield/rle"
+	"github.com/filecoin-project/go-state-types/abi"
+	"github.com/filecoin-project/go-state-types/dline"
 	"github.com/ipfs/go-cid"
 	cbg "github.com/whyrusleeping/cbor-gen"
 	"golang.org/x/xerrors"
 
-	"github.com/filecoin-project/go-bitfield"
-	rle "github.com/filecoin-project/go-bitfield/rle"
-	"github.com/filecoin-project/go-state-types/abi"
-	minertypes "github.com/filecoin-project/go-state-types/builtin/v9/miner"
-	"github.com/filecoin-project/go-state-types/dline"
+	minertypes "github.com/filecoin-project/go-state-types/builtin/v10/miner"
+	"github.com/filecoin-project/lotus/chain/actors/adt"
+
 	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"
-
-	"github.com/filecoin-project/lotus/chain/actors/adt"
 )
 
 var _ State = (*state6)(nil)

chain/actors/builtin/miner/v7.go

@@ -4,20 +4,21 @@ import (
 	"bytes"
 	"errors"
 
+	"github.com/filecoin-project/go-bitfield"
+	rle "github.com/filecoin-project/go-bitfield/rle"
+	"github.com/filecoin-project/go-state-types/abi"
+	"github.com/filecoin-project/go-state-types/dline"
 	"github.com/ipfs/go-cid"
 	cbg "github.com/whyrusleeping/cbor-gen"
 	"golang.org/x/xerrors"
 
-	"github.com/filecoin-project/go-bitfield"
-	rle "github.com/filecoin-project/go-bitfield/rle"
-	"github.com/filecoin-project/go-state-types/abi"
-	minertypes "github.com/filecoin-project/go-state-types/builtin/v9/miner"
-	"github.com/filecoin-project/go-state-types/dline"
+	minertypes "github.com/filecoin-project/go-state-types/builtin/v10/miner"
+	"github.com/filecoin-project/lotus/chain/actors/adt"
+
 	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"
-
-	"github.com/filecoin-project/lotus/chain/actors/adt"
 )
 
 var _ State = (*state7)(nil)

chain/actors/builtin/miner/v8.go

@@ -4,20 +4,20 @@ import (
 	"bytes"
 	"errors"
 
+	"github.com/filecoin-project/go-bitfield"
+	rle "github.com/filecoin-project/go-bitfield/rle"
+	"github.com/filecoin-project/go-state-types/abi"
+	"github.com/filecoin-project/go-state-types/dline"
 	"github.com/ipfs/go-cid"
 	cbg "github.com/whyrusleeping/cbor-gen"
 	"golang.org/x/xerrors"
 
-	"github.com/filecoin-project/go-bitfield"
-	rle "github.com/filecoin-project/go-bitfield/rle"
-	"github.com/filecoin-project/go-state-types/abi"
+	minertypes "github.com/filecoin-project/go-state-types/builtin/v10/miner"
+	"github.com/filecoin-project/lotus/chain/actors/adt"
+
 	builtin8 "github.com/filecoin-project/go-state-types/builtin"
 	miner8 "github.com/filecoin-project/go-state-types/builtin/v8/miner"
 	adt8 "github.com/filecoin-project/go-state-types/builtin/v8/util/adt"
-	minertypes "github.com/filecoin-project/go-state-types/builtin/v9/miner"
-	"github.com/filecoin-project/go-state-types/dline"
-
-	"github.com/filecoin-project/lotus/chain/actors/adt"
 )
 
 var _ State = (*state8)(nil)

chain/actors/builtin/miner/v9.go

@@ -4,20 +4,20 @@ import (
 	"bytes"
 	"errors"
 
+	"github.com/filecoin-project/go-bitfield"
+	rle "github.com/filecoin-project/go-bitfield/rle"
+	"github.com/filecoin-project/go-state-types/abi"
+	"github.com/filecoin-project/go-state-types/dline"
 	"github.com/ipfs/go-cid"
 	cbg "github.com/whyrusleeping/cbor-gen"
 	"golang.org/x/xerrors"
 
-	"github.com/filecoin-project/go-bitfield"
-	rle "github.com/filecoin-project/go-bitfield/rle"
-	"github.com/filecoin-project/go-state-types/abi"
+	minertypes "github.com/filecoin-project/go-state-types/builtin/v10/miner"
+	"github.com/filecoin-project/lotus/chain/actors/adt"
+
 	builtin9 "github.com/filecoin-project/go-state-types/builtin"
 	miner9 "github.com/filecoin-project/go-state-types/builtin/v9/miner"
-	minertypes "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/lotus/chain/actors/adt"
 )
 
 var _ State = (*state9)(nil)

chain/actors/builtin/multisig/message0.go

@@ -5,11 +5,12 @@ import (
 
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
-	builtintypes "github.com/filecoin-project/go-state-types/builtin"
+
 	builtin0 "github.com/filecoin-project/specs-actors/actors/builtin"
 	init0 "github.com/filecoin-project/specs-actors/actors/builtin/init"
 	multisig0 "github.com/filecoin-project/specs-actors/actors/builtin/multisig"
 
+	builtintypes "github.com/filecoin-project/go-state-types/builtin"
 	"github.com/filecoin-project/lotus/chain/actors"
 	init_ "github.com/filecoin-project/lotus/chain/actors/builtin/init"
 	"github.com/filecoin-project/lotus/chain/types"

chain/actors/builtin/multisig/message10.go

@@ -0,0 +1,77 @@
+package multisig
+
+import (
+	"golang.org/x/xerrors"
+
+	"github.com/filecoin-project/go-address"
+	"github.com/filecoin-project/go-state-types/abi"
+
+	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"
+
+	builtintypes "github.com/filecoin-project/go-state-types/builtin"
+	"github.com/filecoin-project/lotus/chain/actors"
+	init_ "github.com/filecoin-project/lotus/chain/actors/builtin/init"
+	"github.com/filecoin-project/lotus/chain/types"
+)
+
+type message10 struct{ message0 }
+
+func (m message10) Create(
+	signers []address.Address, threshold uint64,
+	unlockStart, unlockDuration abi.ChainEpoch,
+	initialAmount abi.TokenAmount,
+) (*types.Message, error) {
+
+	lenAddrs := uint64(len(signers))
+
+	if lenAddrs < threshold {
+		return nil, xerrors.Errorf("cannot require signing of more addresses than provided for multisig")
+	}
+
+	if threshold == 0 {
+		threshold = lenAddrs
+	}
+
+	if m.from == address.Undef {
+		return nil, xerrors.Errorf("must provide source address")
+	}
+
+	// Set up constructor parameters for multisig
+	msigParams := &multisig10.ConstructorParams{
+		Signers:               signers,
+		NumApprovalsThreshold: threshold,
+		UnlockDuration:        unlockDuration,
+		StartEpoch:            unlockStart,
+	}
+
+	enc, actErr := actors.SerializeParams(msigParams)
+	if actErr != nil {
+		return nil, actErr
+	}
+
+	code, ok := actors.GetActorCodeID(actorstypes.Version10, actors.MultisigKey)
+	if !ok {
+		return nil, xerrors.Errorf("failed to get multisig code ID")
+	}
+
+	// new actors are created by invoking 'exec' on the init actor with the constructor params
+	execParams := &init10.ExecParams{
+		CodeCID:           code,
+		ConstructorParams: enc,
+	}
+
+	enc, actErr = actors.SerializeParams(execParams)
+	if actErr != nil {
+		return nil, actErr
+	}
+
+	return &types.Message{
+		To:     init_.Address,
+		From:   m.from,
+		Method: builtintypes.MethodsInit.Exec,
+		Params: enc,
+		Value:  initialAmount,
+	}, nil
+}

chain/actors/builtin/multisig/message2.go

@@ -5,11 +5,12 @@ import (
 
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
-	builtintypes "github.com/filecoin-project/go-state-types/builtin"
+
 	builtin2 "github.com/filecoin-project/specs-actors/v2/actors/builtin"
 	init2 "github.com/filecoin-project/specs-actors/v2/actors/builtin/init"
 	multisig2 "github.com/filecoin-project/specs-actors/v2/actors/builtin/multisig"
 
+	builtintypes "github.com/filecoin-project/go-state-types/builtin"
 	"github.com/filecoin-project/lotus/chain/actors"
 	init_ "github.com/filecoin-project/lotus/chain/actors/builtin/init"
 	"github.com/filecoin-project/lotus/chain/types"

chain/actors/builtin/multisig/message3.go

@@ -5,11 +5,12 @@ import (
 
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
-	builtintypes "github.com/filecoin-project/go-state-types/builtin"
+
 	builtin3 "github.com/filecoin-project/specs-actors/v3/actors/builtin"
 	init3 "github.com/filecoin-project/specs-actors/v3/actors/builtin/init"
 	multisig3 "github.com/filecoin-project/specs-actors/v3/actors/builtin/multisig"
 
+	builtintypes "github.com/filecoin-project/go-state-types/builtin"
 	"github.com/filecoin-project/lotus/chain/actors"
 	init_ "github.com/filecoin-project/lotus/chain/actors/builtin/init"
 	"github.com/filecoin-project/lotus/chain/types"

chain/actors/builtin/multisig/message4.go

@@ -5,11 +5,12 @@ import (
 
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
-	builtintypes "github.com/filecoin-project/go-state-types/builtin"
+
 	builtin4 "github.com/filecoin-project/specs-actors/v4/actors/builtin"
 	init4 "github.com/filecoin-project/specs-actors/v4/actors/builtin/init"
 	multisig4 "github.com/filecoin-project/specs-actors/v4/actors/builtin/multisig"
 
+	builtintypes "github.com/filecoin-project/go-state-types/builtin"
 	"github.com/filecoin-project/lotus/chain/actors"
 	init_ "github.com/filecoin-project/lotus/chain/actors/builtin/init"
 	"github.com/filecoin-project/lotus/chain/types"

chain/actors/builtin/multisig/message5.go

@@ -5,11 +5,12 @@ import (
 
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
-	builtintypes "github.com/filecoin-project/go-state-types/builtin"
+
 	builtin5 "github.com/filecoin-project/specs-actors/v5/actors/builtin"
 	init5 "github.com/filecoin-project/specs-actors/v5/actors/builtin/init"
 	multisig5 "github.com/filecoin-project/specs-actors/v5/actors/builtin/multisig"
 
+	builtintypes "github.com/filecoin-project/go-state-types/builtin"
 	"github.com/filecoin-project/lotus/chain/actors"
 	init_ "github.com/filecoin-project/lotus/chain/actors/builtin/init"
 	"github.com/filecoin-project/lotus/chain/types"

chain/actors/builtin/multisig/message6.go

@@ -5,11 +5,12 @@ import (
 
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
-	builtintypes "github.com/filecoin-project/go-state-types/builtin"
+
 	builtin6 "github.com/filecoin-project/specs-actors/v6/actors/builtin"
 	init6 "github.com/filecoin-project/specs-actors/v6/actors/builtin/init"
 	multisig6 "github.com/filecoin-project/specs-actors/v6/actors/builtin/multisig"
 
+	builtintypes "github.com/filecoin-project/go-state-types/builtin"
 	"github.com/filecoin-project/lotus/chain/actors"
 	init_ "github.com/filecoin-project/lotus/chain/actors/builtin/init"
 	"github.com/filecoin-project/lotus/chain/types"

chain/actors/builtin/multisig/message7.go

@@ -5,11 +5,12 @@ import (
 
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
-	builtintypes "github.com/filecoin-project/go-state-types/builtin"
+
 	builtin7 "github.com/filecoin-project/specs-actors/v7/actors/builtin"
 	init7 "github.com/filecoin-project/specs-actors/v7/actors/builtin/init"
 	multisig7 "github.com/filecoin-project/specs-actors/v7/actors/builtin/multisig"
 
+	builtintypes "github.com/filecoin-project/go-state-types/builtin"
 	"github.com/filecoin-project/lotus/chain/actors"
 	init_ "github.com/filecoin-project/lotus/chain/actors/builtin/init"
 	"github.com/filecoin-project/lotus/chain/types"

chain/actors/builtin/multisig/message8.go

@@ -5,11 +5,12 @@ import (
 
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
-	actorstypes "github.com/filecoin-project/go-state-types/actors"
-	builtintypes "github.com/filecoin-project/go-state-types/builtin"
-	multisig8 "github.com/filecoin-project/go-state-types/builtin/v8/multisig"
-	init9 "github.com/filecoin-project/go-state-types/builtin/v9/init"
 
+	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"
+
+	builtintypes "github.com/filecoin-project/go-state-types/builtin"
 	"github.com/filecoin-project/lotus/chain/actors"
 	init_ "github.com/filecoin-project/lotus/chain/actors/builtin/init"
 	"github.com/filecoin-project/lotus/chain/types"
@@ -56,7 +57,7 @@ func (m message8) Create(
 	}
 
 	// new actors are created by invoking 'exec' on the init actor with the constructor params
-	execParams := &init9.ExecParams{
+	execParams := &init10.ExecParams{
 		CodeCID:           code,
 		ConstructorParams: enc,
 	}

chain/actors/builtin/multisig/message9.go

@@ -5,11 +5,12 @@ import (
 
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
+
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
-	builtintypes "github.com/filecoin-project/go-state-types/builtin"
-	init9 "github.com/filecoin-project/go-state-types/builtin/v9/init"
+	init10 "github.com/filecoin-project/go-state-types/builtin/v10/init"
 	multisig9 "github.com/filecoin-project/go-state-types/builtin/v9/multisig"
 
+	builtintypes "github.com/filecoin-project/go-state-types/builtin"
 	"github.com/filecoin-project/lotus/chain/actors"
 	init_ "github.com/filecoin-project/lotus/chain/actors/builtin/init"
 	"github.com/filecoin-project/lotus/chain/types"
@@ -56,7 +57,7 @@ func (m message9) Create(
 	}
 
 	// new actors are created by invoking 'exec' on the init actor with the constructor params
-	execParams := &init9.ExecParams{
+	execParams := &init10.ExecParams{
 		CodeCID:           code,
 		ConstructorParams: enc,
 	}

chain/actors/builtin/multisig/multisig.go

@@ -2,6 +2,7 @@ package multisig
 
 import (
 	"fmt"
+	actorstypes "github.com/filecoin-project/go-state-types/actors"
 
 	"github.com/minio/blake2b-simd"
 	cbg "github.com/whyrusleeping/cbor-gen"
@@ -9,18 +10,26 @@ import (
 
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
-	actorstypes "github.com/filecoin-project/go-state-types/actors"
-	builtintypes "github.com/filecoin-project/go-state-types/builtin"
-	msig9 "github.com/filecoin-project/go-state-types/builtin/v9/multisig"
 	"github.com/filecoin-project/go-state-types/cbor"
+
+	msig10 "github.com/filecoin-project/go-state-types/builtin/v10/multisig"
+
 	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"
+
 	builtin4 "github.com/filecoin-project/specs-actors/v4/actors/builtin"
+
 	builtin5 "github.com/filecoin-project/specs-actors/v5/actors/builtin"
+
 	builtin6 "github.com/filecoin-project/specs-actors/v6/actors/builtin"
+
 	builtin7 "github.com/filecoin-project/specs-actors/v7/actors/builtin"
 
+	builtintypes "github.com/filecoin-project/go-state-types/builtin"
+
 	"github.com/filecoin-project/lotus/chain/actors"
 	"github.com/filecoin-project/lotus/chain/actors/adt"
 	"github.com/filecoin-project/lotus/chain/types"
@@ -40,6 +49,9 @@ func Load(store adt.Store, act *types.Actor) (State, error) {
 		case actorstypes.Version9:
 			return load9(store, act.Head)
 
+		case actorstypes.Version10:
+			return load10(store, act.Head)
+
 		}
 	}
 
@@ -101,6 +113,9 @@ func MakeState(store adt.Store, av actorstypes.Version, signers []address.Addres
 	case actorstypes.Version9:
 		return make9(store, signers, threshold, startEpoch, unlockDuration, initialBalance)
 
+	case actorstypes.Version10:
+		return make10(store, signers, threshold, startEpoch, unlockDuration, initialBalance)
+
 	}
 	return nil, xerrors.Errorf("unknown actor version %d", av)
 }
@@ -123,7 +138,7 @@ type State interface {
 	GetState() interface{}
 }
 
-type Transaction = msig9.Transaction
+type Transaction = msig10.Transaction
 
 var Methods = builtintypes.MethodsMultisig
 
@@ -156,6 +171,9 @@ func Message(version actorstypes.Version, from address.Address) MessageBuilder {
 
 	case actorstypes.Version9:
 		return message9{message0{from}}
+
+	case actorstypes.Version10:
+		return message10{message0{from}}
 	default:
 		panic(fmt.Sprintf("unsupported actors version: %d", version))
 	}
@@ -179,13 +197,13 @@ type MessageBuilder interface {
 }
 
 // this type is the same between v0 and v2
-type ProposalHashData = msig9.ProposalHashData
-type ProposeReturn = msig9.ProposeReturn
-type ProposeParams = msig9.ProposeParams
-type ApproveReturn = msig9.ApproveReturn
+type ProposalHashData = msig10.ProposalHashData
+type ProposeReturn = msig10.ProposeReturn
+type ProposeParams = msig10.ProposeParams
+type ApproveReturn = msig10.ApproveReturn
 
 func txnParams(id uint64, data *ProposalHashData) ([]byte, error) {
-	params := msig9.TxnIDParams{ID: msig9.TxnID(id)}
+	params := msig10.TxnIDParams{ID: msig10.TxnID(id)}
 	if data != nil {
 		if data.Requester.Protocol() != address.ID {
 			return nil, xerrors.Errorf("proposer address must be an ID address, was %s", data.Requester)

chain/actors/builtin/multisig/v0.go

@@ -4,16 +4,16 @@ import (
 	"bytes"
 	"encoding/binary"
 
+	"github.com/filecoin-project/go-address"
+	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/ipfs/go-cid"
 	cbg "github.com/whyrusleeping/cbor-gen"
 	"golang.org/x/xerrors"
 
-	"github.com/filecoin-project/go-address"
-	"github.com/filecoin-project/go-state-types/abi"
+	"github.com/filecoin-project/lotus/chain/actors/adt"
+
 	msig0 "github.com/filecoin-project/specs-actors/actors/builtin/multisig"
 	adt0 "github.com/filecoin-project/specs-actors/actors/util/adt"
-
-	"github.com/filecoin-project/lotus/chain/actors/adt"
 )
 
 var _ State = (*state0)(nil)

chain/actors/builtin/multisig/v10.go

@@ -0,0 +1,117 @@
+package multisig
+
+import (
+	"bytes"
+	"encoding/binary"
+
+	"github.com/filecoin-project/go-address"
+	"github.com/filecoin-project/go-state-types/abi"
+	"github.com/ipfs/go-cid"
+	cbg "github.com/whyrusleeping/cbor-gen"
+	"golang.org/x/xerrors"
+
+	"github.com/filecoin-project/lotus/chain/actors/adt"
+
+	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"
+)
+
+var _ State = (*state10)(nil)
+
+func load10(store adt.Store, root cid.Cid) (State, error) {
+	out := state10{store: store}
+	err := store.Get(store.Context(), root, &out)
+	if err != nil {
+		return nil, err
+	}
+	return &out, nil
+}
+
+func make10(store adt.Store, signers []address.Address, threshold uint64, startEpoch abi.ChainEpoch, unlockDuration abi.ChainEpoch, initialBalance abi.TokenAmount) (State, error) {
+	out := state10{store: store}
+	out.State = msig10.State{}
+	out.State.Signers = signers
+	out.State.NumApprovalsThreshold = threshold
+	out.State.StartEpoch = startEpoch
+	out.State.UnlockDuration = unlockDuration
+	out.State.InitialBalance = initialBalance
+
+	em, err := adt10.StoreEmptyMap(store, builtin10.DefaultHamtBitwidth)
+	if err != nil {
+		return nil, err
+	}
+
+	out.State.PendingTxns = em
+
+	return &out, nil
+}
+
+type state10 struct {
+	msig10.State
+	store adt.Store
+}
+
+func (s *state10) LockedBalance(currEpoch abi.ChainEpoch) (abi.TokenAmount, error) {
+	return s.State.AmountLocked(currEpoch - s.State.StartEpoch), nil
+}
+
+func (s *state10) StartEpoch() (abi.ChainEpoch, error) {
+	return s.State.StartEpoch, nil
+}
+
+func (s *state10) UnlockDuration() (abi.ChainEpoch, error) {
+	return s.State.UnlockDuration, nil
+}
+
+func (s *state10) InitialBalance() (abi.TokenAmount, error) {
+	return s.State.InitialBalance, nil
+}
+
+func (s *state10) Threshold() (uint64, error) {
+	return s.State.NumApprovalsThreshold, nil
+}
+
+func (s *state10) Signers() ([]address.Address, error) {
+	return s.State.Signers, nil
+}
+
+func (s *state10) ForEachPendingTxn(cb func(id int64, txn Transaction) error) error {
+	arr, err := adt10.AsMap(s.store, s.State.PendingTxns, builtin10.DefaultHamtBitwidth)
+	if err != nil {
+		return err
+	}
+	var out msig10.Transaction
+	return arr.ForEach(&out, func(key string) error {
+		txid, n := binary.Varint([]byte(key))
+		if n <= 0 {
+			return xerrors.Errorf("invalid pending transaction key: %v", key)
+		}
+		return cb(txid, (Transaction)(out)) //nolint:unconvert
+	})
+}
+
+func (s *state10) PendingTxnChanged(other State) (bool, error) {
+	other10, ok := other.(*state10)
+	if !ok {
+		// treat an upgrade as a change, always
+		return true, nil
+	}
+	return !s.State.PendingTxns.Equals(other10.PendingTxns), nil
+}
+
+func (s *state10) transactions() (adt.Map, error) {
+	return adt10.AsMap(s.store, s.PendingTxns, builtin10.DefaultHamtBitwidth)
+}
+
+func (s *state10) decodeTransaction(val *cbg.Deferred) (Transaction, error) {
+	var tx msig10.Transaction
+	if err := tx.UnmarshalCBOR(bytes.NewReader(val.Raw)); err != nil {
+		return Transaction{}, err
+	}
+	return Transaction(tx), nil
+}
+
+func (s *state10) GetState() interface{} {
+	return &s.State
+}

chain/actors/builtin/multisig/v2.go

@@ -4,16 +4,16 @@ import (
 	"bytes"
 	"encoding/binary"
 
+	"github.com/filecoin-project/go-address"
+	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/ipfs/go-cid"
 	cbg "github.com/whyrusleeping/cbor-gen"
 	"golang.org/x/xerrors"
 
-	"github.com/filecoin-project/go-address"
-	"github.com/filecoin-project/go-state-types/abi"
+	"github.com/filecoin-project/lotus/chain/actors/adt"
+
 	msig2 "github.com/filecoin-project/specs-actors/v2/actors/builtin/multisig"
 	adt2 "github.com/filecoin-project/specs-actors/v2/actors/util/adt"
-
-	"github.com/filecoin-project/lotus/chain/actors/adt"
 )
 
 var _ State = (*state2)(nil)

chain/actors/builtin/multisig/v3.go

@@ -4,17 +4,18 @@ import (
 	"bytes"
 	"encoding/binary"
 
+	"github.com/filecoin-project/go-address"
+	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/ipfs/go-cid"
 	cbg "github.com/whyrusleeping/cbor-gen"
 	"golang.org/x/xerrors"
 
-	"github.com/filecoin-project/go-address"
-	"github.com/filecoin-project/go-state-types/abi"
+	"github.com/filecoin-project/lotus/chain/actors/adt"
+
 	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"
-
-	"github.com/filecoin-project/lotus/chain/actors/adt"
 )
 
 var _ State = (*state3)(nil)

chain/actors/builtin/multisig/v4.go

@@ -4,17 +4,18 @@ import (
 	"bytes"
 	"encoding/binary"
 
+	"github.com/filecoin-project/go-address"
+	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/ipfs/go-cid"
 	cbg "github.com/whyrusleeping/cbor-gen"
 	"golang.org/x/xerrors"
 
-	"github.com/filecoin-project/go-address"
-	"github.com/filecoin-project/go-state-types/abi"
+	"github.com/filecoin-project/lotus/chain/actors/adt"
+
 	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"
-
-	"github.com/filecoin-project/lotus/chain/actors/adt"
 )
 
 var _ State = (*state4)(nil)

chain/actors/builtin/multisig/v5.go

@@ -4,17 +4,18 @@ import (
 	"bytes"
 	"encoding/binary"
 
+	"github.com/filecoin-project/go-address"
+	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/ipfs/go-cid"
 	cbg "github.com/whyrusleeping/cbor-gen"
 	"golang.org/x/xerrors"
 
-	"github.com/filecoin-project/go-address"
-	"github.com/filecoin-project/go-state-types/abi"
+	"github.com/filecoin-project/lotus/chain/actors/adt"
+
 	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"
-
-	"github.com/filecoin-project/lotus/chain/actors/adt"
 )
 
 var _ State = (*state5)(nil)

chain/actors/builtin/multisig/v6.go

@@ -4,17 +4,18 @@ import (
 	"bytes"
 	"encoding/binary"
 
+	"github.com/filecoin-project/go-address"
+	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/ipfs/go-cid"
 	cbg "github.com/whyrusleeping/cbor-gen"
 	"golang.org/x/xerrors"
 
-	"github.com/filecoin-project/go-address"
-	"github.com/filecoin-project/go-state-types/abi"
+	"github.com/filecoin-project/lotus/chain/actors/adt"
+
 	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"
-
-	"github.com/filecoin-project/lotus/chain/actors/adt"
 )
 
 var _ State = (*state6)(nil)

chain/actors/builtin/multisig/v7.go

@@ -4,17 +4,18 @@ import (
 	"bytes"
 	"encoding/binary"
 
+	"github.com/filecoin-project/go-address"
+	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/ipfs/go-cid"
 	cbg "github.com/whyrusleeping/cbor-gen"
 	"golang.org/x/xerrors"
 
-	"github.com/filecoin-project/go-address"
-	"github.com/filecoin-project/go-state-types/abi"
+	"github.com/filecoin-project/lotus/chain/actors/adt"
+
 	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"
-
-	"github.com/filecoin-project/lotus/chain/actors/adt"
 )
 
 var _ State = (*state7)(nil)

chain/actors/builtin/multisig/v8.go

@@ -4,17 +4,17 @@ import (
 	"bytes"
 	"encoding/binary"
 
+	"github.com/filecoin-project/go-address"
+	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/ipfs/go-cid"
 	cbg "github.com/whyrusleeping/cbor-gen"
 	"golang.org/x/xerrors"
 
-	"github.com/filecoin-project/go-address"
-	"github.com/filecoin-project/go-state-types/abi"
+	"github.com/filecoin-project/lotus/chain/actors/adt"
+
 	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/lotus/chain/actors/adt"
 )
 
 var _ State = (*state8)(nil)

chain/actors/builtin/multisig/v9.go

@@ -4,17 +4,17 @@ import (
 	"bytes"
 	"encoding/binary"
 
+	"github.com/filecoin-project/go-address"
+	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/ipfs/go-cid"
 	cbg "github.com/whyrusleeping/cbor-gen"
 	"golang.org/x/xerrors"
 
-	"github.com/filecoin-project/go-address"
-	"github.com/filecoin-project/go-state-types/abi"
+	"github.com/filecoin-project/lotus/chain/actors/adt"
+
 	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/lotus/chain/actors/adt"
 )
 
 var _ State = (*state9)(nil)

chain/actors/builtin/paych/message0.go

@@ -3,7 +3,9 @@ package paych
 import (
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
+
 	paychtypes "github.com/filecoin-project/go-state-types/builtin/v8/paych"
+
 	builtin0 "github.com/filecoin-project/specs-actors/actors/builtin"
 	init0 "github.com/filecoin-project/specs-actors/actors/builtin/init"
 	paych0 "github.com/filecoin-project/specs-actors/actors/builtin/paych"

chain/actors/builtin/paych/message10.go

@@ -0,0 +1,111 @@
+package paych
+
+import (
+	"golang.org/x/xerrors"
+
+	"github.com/filecoin-project/go-address"
+	"github.com/filecoin-project/go-state-types/abi"
+
+	paychtypes "github.com/filecoin-project/go-state-types/builtin/v8/paych"
+
+	actorstypes "github.com/filecoin-project/go-state-types/actors"
+	builtin10 "github.com/filecoin-project/go-state-types/builtin"
+	init10 "github.com/filecoin-project/go-state-types/builtin/v10/init"
+	paych10 "github.com/filecoin-project/go-state-types/builtin/v10/paych"
+
+	"github.com/filecoin-project/lotus/chain/actors"
+	init_ "github.com/filecoin-project/lotus/chain/actors/builtin/init"
+	"github.com/filecoin-project/lotus/chain/types"
+)
+
+type message10 struct{ from address.Address }
+
+func (m message10) Create(to address.Address, initialAmount abi.TokenAmount) (*types.Message, error) {
+
+	actorCodeID, ok := actors.GetActorCodeID(actorstypes.Version10, "paymentchannel")
+	if !ok {
+		return nil, xerrors.Errorf("error getting actor paymentchannel code id for actor version %d", 10)
+	}
+
+	params, aerr := actors.SerializeParams(&paych10.ConstructorParams{From: m.from, To: to})
+	if aerr != nil {
+		return nil, aerr
+	}
+	enc, aerr := actors.SerializeParams(&init10.ExecParams{
+		CodeCID:           actorCodeID,
+		ConstructorParams: params,
+	})
+	if aerr != nil {
+		return nil, aerr
+	}
+
+	return &types.Message{
+		To:     init_.Address,
+		From:   m.from,
+		Value:  initialAmount,
+		Method: builtin10.MethodsInit.Exec,
+		Params: enc,
+	}, nil
+}
+
+func (m message10) Update(paych address.Address, sv *paychtypes.SignedVoucher, secret []byte) (*types.Message, error) {
+	params, aerr := actors.SerializeParams(&paych10.UpdateChannelStateParams{
+
+		Sv: toV10SignedVoucher(*sv),
+
+		Secret: secret,
+	})
+	if aerr != nil {
+		return nil, aerr
+	}
+
+	return &types.Message{
+		To:     paych,
+		From:   m.from,
+		Value:  abi.NewTokenAmount(0),
+		Method: builtin10.MethodsPaych.UpdateChannelState,
+		Params: params,
+	}, nil
+}
+
+func toV10SignedVoucher(sv paychtypes.SignedVoucher) paych10.SignedVoucher {
+	merges := make([]paych10.Merge, len(sv.Merges))
+	for i := range sv.Merges {
+		merges[i] = paych10.Merge{
+			Lane:  sv.Merges[i].Lane,
+			Nonce: sv.Merges[i].Nonce,
+		}
+	}
+
+	return paych10.SignedVoucher{
+		ChannelAddr:     sv.ChannelAddr,
+		TimeLockMin:     sv.TimeLockMin,
+		TimeLockMax:     sv.TimeLockMax,
+		SecretHash:      sv.SecretHash,
+		Extra:           (*paych10.ModVerifyParams)(sv.Extra),
+		Lane:            sv.Lane,
+		Nonce:           sv.Nonce,
+		Amount:          sv.Amount,
+		MinSettleHeight: sv.MinSettleHeight,
+		Merges:          merges,
+		Signature:       sv.Signature,
+	}
+}
+
+func (m message10) Settle(paych address.Address) (*types.Message, error) {
+	return &types.Message{
+		To:     paych,
+		From:   m.from,
+		Value:  abi.NewTokenAmount(0),
+		Method: builtin10.MethodsPaych.Settle,
+	}, nil
+}
+
+func (m message10) Collect(paych address.Address) (*types.Message, error) {
+	return &types.Message{
+		To:     paych,
+		From:   m.from,
+		Value:  abi.NewTokenAmount(0),
+		Method: builtin10.MethodsPaych.Collect,
+	}, nil
+}

chain/actors/builtin/paych/message2.go

@@ -3,7 +3,9 @@ package paych
 import (
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
+
 	paychtypes "github.com/filecoin-project/go-state-types/builtin/v8/paych"
+
 	builtin2 "github.com/filecoin-project/specs-actors/v2/actors/builtin"
 	init2 "github.com/filecoin-project/specs-actors/v2/actors/builtin/init"
 	paych2 "github.com/filecoin-project/specs-actors/v2/actors/builtin/paych"

chain/actors/builtin/paych/message3.go

@@ -3,7 +3,9 @@ package paych
 import (
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
+
 	paychtypes "github.com/filecoin-project/go-state-types/builtin/v8/paych"
+
 	builtin3 "github.com/filecoin-project/specs-actors/v3/actors/builtin"
 	init3 "github.com/filecoin-project/specs-actors/v3/actors/builtin/init"
 	paych3 "github.com/filecoin-project/specs-actors/v3/actors/builtin/paych"

chain/actors/builtin/paych/message4.go

@@ -3,7 +3,9 @@ package paych
 import (
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
+
 	paychtypes "github.com/filecoin-project/go-state-types/builtin/v8/paych"
+
 	builtin4 "github.com/filecoin-project/specs-actors/v4/actors/builtin"
 	init4 "github.com/filecoin-project/specs-actors/v4/actors/builtin/init"
 	paych4 "github.com/filecoin-project/specs-actors/v4/actors/builtin/paych"

chain/actors/builtin/paych/message5.go

@@ -3,7 +3,9 @@ package paych
 import (
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
+
 	paychtypes "github.com/filecoin-project/go-state-types/builtin/v8/paych"
+
 	builtin5 "github.com/filecoin-project/specs-actors/v5/actors/builtin"
 	init5 "github.com/filecoin-project/specs-actors/v5/actors/builtin/init"
 	paych5 "github.com/filecoin-project/specs-actors/v5/actors/builtin/paych"

chain/actors/builtin/paych/message6.go

@@ -3,7 +3,9 @@ package paych
 import (
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
+
 	paychtypes "github.com/filecoin-project/go-state-types/builtin/v8/paych"
+
 	builtin6 "github.com/filecoin-project/specs-actors/v6/actors/builtin"
 	init6 "github.com/filecoin-project/specs-actors/v6/actors/builtin/init"
 	paych6 "github.com/filecoin-project/specs-actors/v6/actors/builtin/paych"

chain/actors/builtin/paych/message7.go

@@ -3,7 +3,9 @@ package paych
 import (
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
+
 	paychtypes "github.com/filecoin-project/go-state-types/builtin/v8/paych"
+
 	builtin7 "github.com/filecoin-project/specs-actors/v7/actors/builtin"
 	init7 "github.com/filecoin-project/specs-actors/v7/actors/builtin/init"
 	paych7 "github.com/filecoin-project/specs-actors/v7/actors/builtin/paych"

chain/actors/builtin/paych/message8.go

@@ -5,11 +5,13 @@ import (
 
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
+
+	paychtypes "github.com/filecoin-project/go-state-types/builtin/v8/paych"
+
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
 	builtin8 "github.com/filecoin-project/go-state-types/builtin"
 	init8 "github.com/filecoin-project/go-state-types/builtin/v8/init"
 	paych8 "github.com/filecoin-project/go-state-types/builtin/v8/paych"
-	paychtypes "github.com/filecoin-project/go-state-types/builtin/v8/paych"
 
 	"github.com/filecoin-project/lotus/chain/actors"
 	init_ "github.com/filecoin-project/lotus/chain/actors/builtin/init"

chain/actors/builtin/paych/message9.go

@@ -5,9 +5,11 @@ import (
 
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
+
+	paychtypes "github.com/filecoin-project/go-state-types/builtin/v8/paych"
+
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
 	builtin9 "github.com/filecoin-project/go-state-types/builtin"
-	paychtypes "github.com/filecoin-project/go-state-types/builtin/v8/paych"
 	init9 "github.com/filecoin-project/go-state-types/builtin/v9/init"
 	paych9 "github.com/filecoin-project/go-state-types/builtin/v9/paych"
 

chain/actors/builtin/paych/paych.go

@@ -3,23 +3,31 @@ package paych
 import (
 	"encoding/base64"
 	"fmt"
+	actorstypes "github.com/filecoin-project/go-state-types/actors"
 
-	ipldcbor "github.com/ipfs/go-ipld-cbor"
 	"golang.org/x/xerrors"
 
 	"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"
-	paychtypes "github.com/filecoin-project/go-state-types/builtin/v8/paych"
 	"github.com/filecoin-project/go-state-types/cbor"
-	builtin0 "github.com/filecoin-project/specs-actors/actors/builtin"
+	ipldcbor "github.com/ipfs/go-ipld-cbor"
+
+	paychtypes "github.com/filecoin-project/go-state-types/builtin/v8/paych"
 	paych0 "github.com/filecoin-project/specs-actors/actors/builtin/paych"
+
+	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"
+
 	builtin4 "github.com/filecoin-project/specs-actors/v4/actors/builtin"
+
 	builtin5 "github.com/filecoin-project/specs-actors/v5/actors/builtin"
+
 	builtin6 "github.com/filecoin-project/specs-actors/v6/actors/builtin"
+
 	builtin7 "github.com/filecoin-project/specs-actors/v7/actors/builtin"
 
 	"github.com/filecoin-project/lotus/chain/actors"
@@ -42,6 +50,9 @@ func Load(store adt.Store, act *types.Actor) (State, error) {
 		case actorstypes.Version9:
 			return load9(store, act.Head)
 
+		case actorstypes.Version10:
+			return load10(store, act.Head)
+
 		}
 	}
 
@@ -148,6 +159,9 @@ func Message(version actorstypes.Version, from address.Address) MessageBuilder {
 	case actorstypes.Version9:
 		return message9{from}
 
+	case actorstypes.Version10:
+		return message10{from}
+
 	default:
 		panic(fmt.Sprintf("unsupported actors version: %d", version))
 	}

chain/actors/builtin/paych/v0.go

@@ -6,10 +6,11 @@ import (
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/filecoin-project/go-state-types/big"
-	paych0 "github.com/filecoin-project/specs-actors/actors/builtin/paych"
-	adt0 "github.com/filecoin-project/specs-actors/actors/util/adt"
 
 	"github.com/filecoin-project/lotus/chain/actors/adt"
+
+	paych0 "github.com/filecoin-project/specs-actors/actors/builtin/paych"
+	adt0 "github.com/filecoin-project/specs-actors/actors/util/adt"
 )
 
 var _ State = (*state0)(nil)

chain/actors/builtin/paych/v10.go

@@ -0,0 +1,114 @@
+package paych
+
+import (
+	"github.com/ipfs/go-cid"
+
+	"github.com/filecoin-project/go-address"
+	"github.com/filecoin-project/go-state-types/abi"
+	"github.com/filecoin-project/go-state-types/big"
+
+	"github.com/filecoin-project/lotus/chain/actors/adt"
+
+	paych10 "github.com/filecoin-project/go-state-types/builtin/v10/paych"
+	adt10 "github.com/filecoin-project/go-state-types/builtin/v10/util/adt"
+)
+
+var _ State = (*state10)(nil)
+
+func load10(store adt.Store, root cid.Cid) (State, error) {
+	out := state10{store: store}
+	err := store.Get(store.Context(), root, &out)
+	if err != nil {
+		return nil, err
+	}
+	return &out, nil
+}
+
+func make10(store adt.Store) (State, error) {
+	out := state10{store: store}
+	out.State = paych10.State{}
+	return &out, nil
+}
+
+type state10 struct {
+	paych10.State
+	store adt.Store
+	lsAmt *adt10.Array
+}
+
+// Channel owner, who has funded the actor
+func (s *state10) From() (address.Address, error) {
+	return s.State.From, nil
+}
+
+// Recipient of payouts from channel
+func (s *state10) To() (address.Address, error) {
+	return s.State.To, nil
+}
+
+// Height at which the channel can be `Collected`
+func (s *state10) SettlingAt() (abi.ChainEpoch, error) {
+	return s.State.SettlingAt, nil
+}
+
+// Amount successfully redeemed through the payment channel, paid out on `Collect()`
+func (s *state10) ToSend() (abi.TokenAmount, error) {
+	return s.State.ToSend, nil
+}
+
+func (s *state10) getOrLoadLsAmt() (*adt10.Array, error) {
+	if s.lsAmt != nil {
+		return s.lsAmt, nil
+	}
+
+	// Get the lane state from the chain
+	lsamt, err := adt10.AsArray(s.store, s.State.LaneStates, paych10.LaneStatesAmtBitwidth)
+	if err != nil {
+		return nil, err
+	}
+
+	s.lsAmt = lsamt
+	return lsamt, nil
+}
+
+// Get total number of lanes
+func (s *state10) LaneCount() (uint64, error) {
+	lsamt, err := s.getOrLoadLsAmt()
+	if err != nil {
+		return 0, err
+	}
+	return lsamt.Length(), nil
+}
+
+func (s *state10) GetState() interface{} {
+	return &s.State
+}
+
+// Iterate lane states
+func (s *state10) ForEachLaneState(cb func(idx uint64, dl LaneState) error) error {
+	// Get the lane state from the chain
+	lsamt, err := s.getOrLoadLsAmt()
+	if err != nil {
+		return err
+	}
+
+	// Note: we use a map instead of an array to store laneStates because the
+	// client sets the lane ID (the index) and potentially they could use a
+	// very large index.
+	var ls paych10.LaneState
+	return lsamt.ForEach(&ls, func(i int64) error {
+		return cb(uint64(i), &laneState10{ls})
+	})
+}
+
+type laneState10 struct {
+	paych10.LaneState
+}
+
+func (ls *laneState10) Redeemed() (big.Int, error) {
+	return ls.LaneState.Redeemed, nil
+}
+
+func (ls *laneState10) Nonce() (uint64, error) {
+	return ls.LaneState.Nonce, nil
+}

chain/actors/builtin/paych/v2.go

@@ -6,10 +6,11 @@ import (
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/filecoin-project/go-state-types/big"
-	paych2 "github.com/filecoin-project/specs-actors/v2/actors/builtin/paych"
-	adt2 "github.com/filecoin-project/specs-actors/v2/actors/util/adt"
 
 	"github.com/filecoin-project/lotus/chain/actors/adt"
+
+	paych2 "github.com/filecoin-project/specs-actors/v2/actors/builtin/paych"
+	adt2 "github.com/filecoin-project/specs-actors/v2/actors/util/adt"
 )
 
 var _ State = (*state2)(nil)

chain/actors/builtin/paych/v3.go

@@ -6,10 +6,11 @@ import (
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/filecoin-project/go-state-types/big"
-	paych3 "github.com/filecoin-project/specs-actors/v3/actors/builtin/paych"
-	adt3 "github.com/filecoin-project/specs-actors/v3/actors/util/adt"
 
 	"github.com/filecoin-project/lotus/chain/actors/adt"
+
+	paych3 "github.com/filecoin-project/specs-actors/v3/actors/builtin/paych"
+	adt3 "github.com/filecoin-project/specs-actors/v3/actors/util/adt"
 )
 
 var _ State = (*state3)(nil)

chain/actors/builtin/paych/v4.go

@@ -6,10 +6,11 @@ import (
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/filecoin-project/go-state-types/big"
-	paych4 "github.com/filecoin-project/specs-actors/v4/actors/builtin/paych"
-	adt4 "github.com/filecoin-project/specs-actors/v4/actors/util/adt"
 
 	"github.com/filecoin-project/lotus/chain/actors/adt"
+
+	paych4 "github.com/filecoin-project/specs-actors/v4/actors/builtin/paych"
+	adt4 "github.com/filecoin-project/specs-actors/v4/actors/util/adt"
 )
 
 var _ State = (*state4)(nil)

chain/actors/builtin/paych/v5.go

@@ -6,10 +6,11 @@ import (
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/filecoin-project/go-state-types/big"
-	paych5 "github.com/filecoin-project/specs-actors/v5/actors/builtin/paych"
-	adt5 "github.com/filecoin-project/specs-actors/v5/actors/util/adt"
 
 	"github.com/filecoin-project/lotus/chain/actors/adt"
+
+	paych5 "github.com/filecoin-project/specs-actors/v5/actors/builtin/paych"
+	adt5 "github.com/filecoin-project/specs-actors/v5/actors/util/adt"
 )
 
 var _ State = (*state5)(nil)

chain/actors/builtin/paych/v6.go

@@ -6,10 +6,11 @@ import (
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/filecoin-project/go-state-types/big"
-	paych6 "github.com/filecoin-project/specs-actors/v6/actors/builtin/paych"
-	adt6 "github.com/filecoin-project/specs-actors/v6/actors/util/adt"
 
 	"github.com/filecoin-project/lotus/chain/actors/adt"
+
+	paych6 "github.com/filecoin-project/specs-actors/v6/actors/builtin/paych"
+	adt6 "github.com/filecoin-project/specs-actors/v6/actors/util/adt"
 )
 
 var _ State = (*state6)(nil)

chain/actors/builtin/paych/v7.go

@@ -6,10 +6,11 @@ import (
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/filecoin-project/go-state-types/big"
-	paych7 "github.com/filecoin-project/specs-actors/v7/actors/builtin/paych"
-	adt7 "github.com/filecoin-project/specs-actors/v7/actors/util/adt"
 
 	"github.com/filecoin-project/lotus/chain/actors/adt"
+
+	paych7 "github.com/filecoin-project/specs-actors/v7/actors/builtin/paych"
+	adt7 "github.com/filecoin-project/specs-actors/v7/actors/util/adt"
 )
 
 var _ State = (*state7)(nil)

chain/actors/builtin/paych/v8.go

@@ -6,10 +6,11 @@ import (
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/filecoin-project/go-state-types/big"
-	paych8 "github.com/filecoin-project/go-state-types/builtin/v8/paych"
-	adt8 "github.com/filecoin-project/go-state-types/builtin/v8/util/adt"
 
 	"github.com/filecoin-project/lotus/chain/actors/adt"
+
+	paych8 "github.com/filecoin-project/go-state-types/builtin/v8/paych"
+	adt8 "github.com/filecoin-project/go-state-types/builtin/v8/util/adt"
 )
 
 var _ State = (*state8)(nil)