6a0f16b084
* Initial work supporting DDO pieces in lotus-miner * sealing: Update pipeline input to operate on UniversalPiece * sealing: Update pipeline checks/sealing states to operate on UniversalPiece * sealing: Make pipeline build with UniversalPiece * move PieceDealInfo out of api * make gen * make sealing pipeline unit tests pass * fix itest ensemble build * don't panic in SectorsStatus with deals * stop linter from complaining about checkPieces * fix sector import tests * mod tidy * sealing: Add logic for (pre)committing DDO sectors * sealing: state-types with method defs * DDO non-snap pipeline works(?), DDO Itests * DDO support in snapdeals pipeline * make gen * update actor bundles * update the gst market fix * fix: chain: use PreCommitSectorsBatch2 when setting up genesis * some bug fixes * integration working changes * update actor bundles * Make TestOnboardRawPieceSnap pass * Appease the linter * Make deadlines test pass with v12 actors * Update go-state-types, abstract market DealState * make gen * mod tidy, lint fixes * Fix some more tests * Bump version in master Bump version in master * Make gen Make gen * fix sender * fix: lotus-provider: Fix winning PoSt * fix: sql Scan cannot write to an object * Actually show miner-addrs in info-log Actually show miner-addrs in lotus-provider info-log * [WIP] feat: Add nv22 skeleton Addition of Network Version 22 skeleton * update FFI * ddo is now nv22 * make gen * temp actor bundle with ddo * use working go-state-types * gst with v13 market migration * update bundle, builtin.MethodsMiner.ProveCommitSectors2 -> 3 * actually working v13 migration, v13 migration itest * Address review * sealing: Correct DDO snap pledge math * itests: Mixed ddo itest * pipeline: Fix sectorWeight * sealing: convert market deals into PAMs in mixed sectors * sealing: make market to ddo conversion work * fix lint * update gst * Update actors and GST to lastest integ branch * commit batcher: Update ProveCommitSectors3Params builder logic * make gen * use builtin-actors master * ddo: address review * itests: Add commd assertions to ddo tests * make gen * gst with fixed types * config knobs for RequireActivationSuccess * storage: Drop obsolete flaky tasts --------- Co-authored-by: Jennifer Wang <jiayingw703@gmail.com> Co-authored-by: Aayush <arajasek94@gmail.com> Co-authored-by: Shrenuj Bansal <shrenuj.bansal@protocol.ai> Co-authored-by: Phi <orjan.roren@gmail.com> Co-authored-by: Andrew Jackson (Ajax) <snadrus@gmail.com> Co-authored-by: TippyFlits <james.bluett@protocol.ai>
360 lines
8.8 KiB
Go
Generated
360 lines
8.8 KiB
Go
Generated
package market
|
|
|
|
import (
|
|
"bytes"
|
|
"fmt"
|
|
|
|
"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"
|
|
actorstypes "github.com/filecoin-project/go-state-types/actors"
|
|
"github.com/filecoin-project/go-state-types/manifest"
|
|
market2 "github.com/filecoin-project/specs-actors/v2/actors/builtin/market"
|
|
adt2 "github.com/filecoin-project/specs-actors/v2/actors/util/adt"
|
|
|
|
"github.com/filecoin-project/lotus/chain/actors"
|
|
"github.com/filecoin-project/lotus/chain/actors/adt"
|
|
verifregtypes "github.com/filecoin-project/lotus/chain/actors/builtin/verifreg"
|
|
"github.com/filecoin-project/lotus/chain/types"
|
|
)
|
|
|
|
var _ State = (*state2)(nil)
|
|
|
|
func load2(store adt.Store, root cid.Cid) (State, error) {
|
|
out := state2{store: store}
|
|
err := store.Get(store.Context(), root, &out)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return &out, nil
|
|
}
|
|
|
|
func make2(store adt.Store) (State, error) {
|
|
out := state2{store: store}
|
|
|
|
ea, err := adt2.MakeEmptyArray(store).Root()
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
em, err := adt2.MakeEmptyMap(store).Root()
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
out.State = *market2.ConstructState(ea, em, em)
|
|
|
|
return &out, nil
|
|
}
|
|
|
|
type state2 struct {
|
|
market2.State
|
|
store adt.Store
|
|
}
|
|
|
|
func (s *state2) TotalLocked() (abi.TokenAmount, error) {
|
|
fml := types.BigAdd(s.TotalClientLockedCollateral, s.TotalProviderLockedCollateral)
|
|
fml = types.BigAdd(fml, s.TotalClientStorageFee)
|
|
return fml, nil
|
|
}
|
|
|
|
func (s *state2) BalancesChanged(otherState State) (bool, error) {
|
|
otherState2, ok := otherState.(*state2)
|
|
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(otherState2.State.EscrowTable) || !s.State.LockedTable.Equals(otherState2.State.LockedTable), nil
|
|
}
|
|
|
|
func (s *state2) StatesChanged(otherState State) (bool, error) {
|
|
otherState2, ok := otherState.(*state2)
|
|
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(otherState2.State.States), nil
|
|
}
|
|
|
|
func (s *state2) States() (DealStates, error) {
|
|
stateArray, err := adt2.AsArray(s.store, s.State.States)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return &dealStates2{stateArray}, nil
|
|
}
|
|
|
|
func (s *state2) ProposalsChanged(otherState State) (bool, error) {
|
|
otherState2, ok := otherState.(*state2)
|
|
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(otherState2.State.Proposals), nil
|
|
}
|
|
|
|
func (s *state2) Proposals() (DealProposals, error) {
|
|
proposalArray, err := adt2.AsArray(s.store, s.State.Proposals)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return &dealProposals2{proposalArray}, nil
|
|
}
|
|
|
|
func (s *state2) EscrowTable() (BalanceTable, error) {
|
|
bt, err := adt2.AsBalanceTable(s.store, s.State.EscrowTable)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return &balanceTable2{bt}, nil
|
|
}
|
|
|
|
func (s *state2) LockedTable() (BalanceTable, error) {
|
|
bt, err := adt2.AsBalanceTable(s.store, s.State.LockedTable)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return &balanceTable2{bt}, nil
|
|
}
|
|
|
|
func (s *state2) VerifyDealsForActivation(
|
|
minerAddr address.Address, deals []abi.DealID, currEpoch, sectorExpiry abi.ChainEpoch,
|
|
) (weight, verifiedWeight abi.DealWeight, err error) {
|
|
w, vw, _, err := market2.ValidateDealsForActivation(&s.State, s.store, deals, minerAddr, sectorExpiry, currEpoch)
|
|
return w, vw, err
|
|
}
|
|
|
|
func (s *state2) NextID() (abi.DealID, error) {
|
|
return s.State.NextID, nil
|
|
}
|
|
|
|
type balanceTable2 struct {
|
|
*adt2.BalanceTable
|
|
}
|
|
|
|
func (bt *balanceTable2) ForEach(cb func(address.Address, abi.TokenAmount) error) error {
|
|
asMap := (*adt2.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 dealStates2 struct {
|
|
adt.Array
|
|
}
|
|
|
|
func (s *dealStates2) Get(dealID abi.DealID) (DealState, bool, error) {
|
|
var deal2 market2.DealState
|
|
found, err := s.Array.Get(uint64(dealID), &deal2)
|
|
if err != nil {
|
|
return nil, false, err
|
|
}
|
|
if !found {
|
|
return nil, false, nil
|
|
}
|
|
deal := fromV2DealState(deal2)
|
|
return deal, true, nil
|
|
}
|
|
|
|
func (s *dealStates2) ForEach(cb func(dealID abi.DealID, ds DealState) error) error {
|
|
var ds2 market2.DealState
|
|
return s.Array.ForEach(&ds2, func(idx int64) error {
|
|
return cb(abi.DealID(idx), fromV2DealState(ds2))
|
|
})
|
|
}
|
|
|
|
func (s *dealStates2) decode(val *cbg.Deferred) (DealState, error) {
|
|
var ds2 market2.DealState
|
|
if err := ds2.UnmarshalCBOR(bytes.NewReader(val.Raw)); err != nil {
|
|
return nil, err
|
|
}
|
|
ds := fromV2DealState(ds2)
|
|
return ds, nil
|
|
}
|
|
|
|
func (s *dealStates2) array() adt.Array {
|
|
return s.Array
|
|
}
|
|
|
|
type dealStateV2 struct {
|
|
ds2 market2.DealState
|
|
}
|
|
|
|
func (d dealStateV2) SectorStartEpoch() abi.ChainEpoch {
|
|
return d.ds2.SectorStartEpoch
|
|
}
|
|
|
|
func (d dealStateV2) LastUpdatedEpoch() abi.ChainEpoch {
|
|
return d.ds2.LastUpdatedEpoch
|
|
}
|
|
|
|
func (d dealStateV2) SlashEpoch() abi.ChainEpoch {
|
|
return d.ds2.SlashEpoch
|
|
}
|
|
|
|
func (d dealStateV2) Equals(other DealState) bool {
|
|
if ov2, ok := other.(dealStateV2); ok {
|
|
return d.ds2 == ov2.ds2
|
|
}
|
|
|
|
if d.SectorStartEpoch() != other.SectorStartEpoch() {
|
|
return false
|
|
}
|
|
if d.LastUpdatedEpoch() != other.LastUpdatedEpoch() {
|
|
return false
|
|
}
|
|
if d.SlashEpoch() != other.SlashEpoch() {
|
|
return false
|
|
}
|
|
|
|
return true
|
|
}
|
|
|
|
var _ DealState = (*dealStateV2)(nil)
|
|
|
|
func fromV2DealState(v2 market2.DealState) DealState {
|
|
return dealStateV2{v2}
|
|
}
|
|
|
|
type dealProposals2 struct {
|
|
adt.Array
|
|
}
|
|
|
|
func (s *dealProposals2) Get(dealID abi.DealID) (*DealProposal, bool, error) {
|
|
var proposal2 market2.DealProposal
|
|
found, err := s.Array.Get(uint64(dealID), &proposal2)
|
|
if err != nil {
|
|
return nil, false, err
|
|
}
|
|
if !found {
|
|
return nil, false, nil
|
|
}
|
|
|
|
proposal, err := fromV2DealProposal(proposal2)
|
|
if err != nil {
|
|
return nil, true, xerrors.Errorf("decoding proposal: %w", err)
|
|
}
|
|
|
|
return &proposal, true, nil
|
|
}
|
|
|
|
func (s *dealProposals2) ForEach(cb func(dealID abi.DealID, dp DealProposal) error) error {
|
|
var dp2 market2.DealProposal
|
|
return s.Array.ForEach(&dp2, func(idx int64) error {
|
|
dp, err := fromV2DealProposal(dp2)
|
|
if err != nil {
|
|
return xerrors.Errorf("decoding proposal: %w", err)
|
|
}
|
|
|
|
return cb(abi.DealID(idx), dp)
|
|
})
|
|
}
|
|
|
|
func (s *dealProposals2) decode(val *cbg.Deferred) (*DealProposal, error) {
|
|
var dp2 market2.DealProposal
|
|
if err := dp2.UnmarshalCBOR(bytes.NewReader(val.Raw)); err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
dp, err := fromV2DealProposal(dp2)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return &dp, nil
|
|
}
|
|
|
|
func (s *dealProposals2) array() adt.Array {
|
|
return s.Array
|
|
}
|
|
|
|
func fromV2DealProposal(v2 market2.DealProposal) (DealProposal, error) {
|
|
|
|
label, err := labelFromGoString(v2.Label)
|
|
|
|
if err != nil {
|
|
return DealProposal{}, xerrors.Errorf("error setting deal label: %w", err)
|
|
}
|
|
|
|
return DealProposal{
|
|
PieceCID: v2.PieceCID,
|
|
PieceSize: v2.PieceSize,
|
|
VerifiedDeal: v2.VerifiedDeal,
|
|
Client: v2.Client,
|
|
Provider: v2.Provider,
|
|
|
|
Label: label,
|
|
|
|
StartEpoch: v2.StartEpoch,
|
|
EndEpoch: v2.EndEpoch,
|
|
StoragePricePerEpoch: v2.StoragePricePerEpoch,
|
|
|
|
ProviderCollateral: v2.ProviderCollateral,
|
|
ClientCollateral: v2.ClientCollateral,
|
|
}, nil
|
|
}
|
|
|
|
func (s *state2) GetState() interface{} {
|
|
return &s.State
|
|
}
|
|
|
|
var _ PublishStorageDealsReturn = (*publishStorageDealsReturn2)(nil)
|
|
|
|
func decodePublishStorageDealsReturn2(b []byte) (PublishStorageDealsReturn, error) {
|
|
var retval market2.PublishStorageDealsReturn
|
|
if err := retval.UnmarshalCBOR(bytes.NewReader(b)); err != nil {
|
|
return nil, xerrors.Errorf("failed to unmarshal PublishStorageDealsReturn: %w", err)
|
|
}
|
|
|
|
return &publishStorageDealsReturn2{retval}, nil
|
|
}
|
|
|
|
type publishStorageDealsReturn2 struct {
|
|
market2.PublishStorageDealsReturn
|
|
}
|
|
|
|
func (r *publishStorageDealsReturn2) IsDealValid(index uint64) (bool, int, error) {
|
|
|
|
// PublishStorageDeals only succeeded if all deals were valid in this version of actors
|
|
return true, int(index), nil
|
|
|
|
}
|
|
|
|
func (r *publishStorageDealsReturn2) DealIDs() ([]abi.DealID, error) {
|
|
return r.IDs, nil
|
|
}
|
|
|
|
func (s *state2) GetAllocationIdForPendingDeal(dealId abi.DealID) (verifregtypes.AllocationId, error) {
|
|
|
|
return verifregtypes.NoAllocationID, xerrors.Errorf("unsupported before actors v9")
|
|
|
|
}
|
|
|
|
func (s *state2) ActorKey() string {
|
|
return manifest.MarketKey
|
|
}
|
|
|
|
func (s *state2) ActorVersion() actorstypes.Version {
|
|
return actorstypes.Version2
|
|
}
|
|
|
|
func (s *state2) Code() cid.Cid {
|
|
code, ok := actors.GetActorCodeID(s.ActorVersion(), s.ActorKey())
|
|
if !ok {
|
|
panic(fmt.Errorf("didn't find actor %v code id for actor version %d", s.ActorKey(), s.ActorVersion()))
|
|
}
|
|
|
|
return code
|
|
}
|