Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Refine the market diff function #1286

Merged
merged 4 commits into from
Apr 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
113 changes: 30 additions & 83 deletions chain/actors/builtin/market/actor.go.template
Original file line number Diff line number Diff line change
@@ -1,33 +1,31 @@
// Code generated by: `make actors-gen`. DO NOT EDIT.

package market

import (
"github.com/ipfs/go-cid"
actorstypes "github.com/filecoin-project/go-state-types/actors"
"unicode/utf8"
"unicode/utf8"

"github.com/filecoin-project/go-state-types/network"
"golang.org/x/xerrors"
"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/go-state-types/cbor"
cbg "github.com/whyrusleeping/cbor-gen"
actorstypes "github.com/filecoin-project/go-state-types/actors"
"github.com/filecoin-project/go-state-types/manifest"

markettypes "github.com/filecoin-project/go-state-types/builtin/v9/market"
verifregtypes "github.com/filecoin-project/go-state-types/builtin/v9/verifreg"
{{range .versions}}
{{if (le . 7)}}
builtin{{.}} "github.com/filecoin-project/specs-actors{{import .}}actors/builtin"
{{end}}
{{end}}

builtintypes "github.com/filecoin-project/go-state-types/builtin"
markettypes "github.com/filecoin-project/go-state-types/builtin/v9/market"

"github.com/filecoin-project/lotus/chain/actors/adt"
"github.com/filecoin-project/lotus/chain/actors"
"github.com/filecoin-project/lotus/chain/types"
lotusactors "github.com/filecoin-project/lotus/chain/actors"
)

var (
Expand All @@ -36,12 +34,12 @@ var (
)

func Load(store adt.Store, act *types.Actor) (State, error) {
if name, av, ok := actors.GetActorMetaByCode(act.Code); ok {
if name, av, ok := lotusactors.GetActorMetaByCode(act.Code); ok {
if name != manifest.MarketKey {
return nil, xerrors.Errorf("actor code is not market: %s", name)
}

switch av {
switch actorstypes.Version(av) {
{{range .versions}}
{{if (ge . 8)}}
case actorstypes.Version{{.}}:
Expand All @@ -63,37 +61,20 @@ func Load(store adt.Store, act *types.Actor) (State, error) {
return nil, xerrors.Errorf("unknown actor code %s", act.Code)
}

func MakeState(store adt.Store, av actorstypes.Version) (State, error) {
switch av {
{{range .versions}}
case actorstypes.Version{{.}}:
return make{{.}}(store)
{{end}}
}
return nil, xerrors.Errorf("unknown actor version %d", av)
}

type State interface {
cbor.Marshaler

Code() cid.Cid
ActorKey() string
ActorVersion() actorstypes.Version
Code() cid.Cid
ActorKey() string
ActorVersion() actorstypes.Version

BalancesChanged(State) (bool, error)
EscrowTable() (BalanceTable, error)
LockedTable() (BalanceTable, error)
TotalLocked() (abi.TokenAmount, error)
StatesChanged(State) (bool, error)
States() (DealStates, error)
ProposalsChanged(State) (bool, error)
Proposals() (DealProposals, error)
VerifyDealsForActivation(
minerAddr address.Address, deals []abi.DealID, currEpoch, sectorExpiry abi.ChainEpoch,
) (weight, verifiedWeight abi.DealWeight, err error)
NextID() (abi.DealID, error)
GetState() interface{}
GetAllocationIdForPendingDeal(dealId abi.DealID) (verifregtypes.AllocationId, error)

DealProposalsAmtBitwidth() int
DealStatesAmtBitwidth() int
}

type BalanceTable interface {
Expand All @@ -118,27 +99,6 @@ type DealProposals interface {
}


type PublishStorageDealsReturn interface {
DealIDs() ([]abi.DealID, error)
// Note that this index is based on the batch of deals that were published, NOT the DealID
IsDealValid(index uint64) (bool, int, error)
}

func DecodePublishStorageDealsReturn(b []byte, nv network.Version) (PublishStorageDealsReturn, error) {
av, err := actorstypes.VersionForNetwork(nv)
if err != nil {
return nil, err
}

switch av {
{{range .versions}}
case actorstypes.Version{{.}}:
return decodePublishStorageDealsReturn{{.}}(b)
{{end}}
}
return nil, xerrors.Errorf("unknown actor version %d", av)
}

type DealProposal = markettypes.DealProposal
type DealLabel = markettypes.DealLabel

Expand Down Expand Up @@ -182,6 +142,13 @@ type ProposalIDState struct {
Proposal markettypes.DealProposal
}

func labelFromGoString(s string) (markettypes.DealLabel, error) {
if utf8.ValidString(s) {
return markettypes.NewLabelFromString(s)
} else {
return markettypes.NewLabelFromBytes([]byte(s))
}
}

type emptyDealState struct{}

Expand Down Expand Up @@ -214,37 +181,17 @@ func EmptyDealState() DealState {
return &emptyDealState{}
}

// returns the earned fees and pending fees for a given deal
func GetDealFees(deal markettypes.DealProposal, height abi.ChainEpoch) (abi.TokenAmount, abi.TokenAmount) {
tf := big.Mul(deal.StoragePricePerEpoch, big.NewInt(int64(deal.EndEpoch-deal.StartEpoch)))

ef := big.Mul(deal.StoragePricePerEpoch, big.NewInt(int64(height-deal.StartEpoch)))
if ef.LessThan(big.Zero()) {
ef = big.Zero()
}

if ef.GreaterThan(tf) {
ef = tf
}

return ef, big.Sub(tf, ef)
}

func IsDealActive(state DealState) bool {
return state.SectorStartEpoch() > -1 && state.SlashEpoch() == -1
}

func labelFromGoString(s string) (markettypes.DealLabel, error) {
if utf8.ValidString(s) {
return markettypes.NewLabelFromString(s)
} else {
return markettypes.NewLabelFromBytes([]byte(s))
}
}

func AllCodes() []cid.Cid {
return []cid.Cid{ {{range .versions}}
(&state{{.}}{}).Code(),
{{- end}}
}
}

func VersionCodes() map[actorstypes.Version]cid.Cid {
return map[actorstypes.Version]cid.Cid{
{{- range .versions}}
actorstypes.Version{{.}}: (&state{{.}}{}).Code(),
{{- end}}
}
}
Loading