bd10bdf99a
* build: Bump version to v1.17.3-dev * build: set version to v1.18.0-dev * chore: actors: Allow builtin-actors to return a map of methods (#9342) * Allow builtin-actors to return a map of methods * go mod * Fix tests * Fix tests, check carefully please * Delete lotus-pond (#9352) * feat: add StateNetworkVersion to mpool API * chore: refactor: rename NewestNetworkVersion * feat: actors: Integrate datacap actor into lotus (#9348) * Integrate datacap actor * Implement datacap actor in chain/builtin * feat: support typed errors over RPC * chore: deps: update to go-jsonrpc 0.1.8 * remove duplicate import * fix: itest: check for closed connection * chore: refactor: move retry test to API * address magik supernit * Add ability to only have single partition per msg for partitions with recovery sectors * doc gen * Address comments * Return beneficiary info from miner state Info() * Update builtin-actors to dev/20220922-v9 which includes FIP-0045 changes in progress * Integrate verifreg changes to lotus * Setup datacap actor * Update builtin-actors to dev/20220922-v9-1 * Update datacap actor to query datacap instead of verifreg * update gst * update markets * update actors with hamt fix * update gst * Update datacap to parse tokens * Update bundles * datacap and verifreg actors use ID addresses without protocol byte * update builtin-actors to rc1 * update go-fil-markets * Update bundles to rc2 * Integrate the v9 migration * Add api for getting allocation * Add upgrade epoch for butterfly * Tweak PreSeal struct to be infra-friendly * docsgen * More tweaking of PreSeal for genesis * review fixes * Use fake cid for test * add butterfly artifacts for oct 5 upgrade * check datacaps for v8 verifreg match v9 datacap actor * Remove print statements * Update to go-state-types master * Update to go-state-types v0.9.0-rc1 * review fixes * use go-fil-markets v1.24.0-v17 * Add accessors for allocations and claims maps * fix: missing permissions tag * butterfly * update butterfly artifacts * sealing pipeline: Prepare deal assigning logic for FIP-45 * sealing pipeline: Get allocationId with StateApi * use NoAllocationID instead of nil AllocationId * address review * Add datacap actor to registry.go * Add cli for listing allocations and removing expired allocations * Update to go-state-types master * deps: upgrade go-merkledag to 0.8.0 * shark params * Update cli/filplus.go Co-authored-by: Aayush Rajasekaran <arajasek94@gmail.com> * revert change to verifreg util * docsgen-cli * miss the stuff * Update FFI * Update go-state-types to v0.9.0 * Update builtin-actors to v9.0.0 * add calib upgrade epcoh * update the upgrade envvar * kill shark * Remove fvm splash banner from nv17 upgrade * check invariance for pending deals and allocations * check pending verified deal proposal migrated to allocation * Add check for unsealed CID in precommit sectors * Fix counting of allocations in nv17 migration test * make gen * pass state trees as pointers * Add assertion that migrations with & without cache are the same * compare allocation to verified deal proposal * Fix miner state precommit info * fix migration test tool * add changelog * Update to go-state-types v0.9.1 * Integrate builtin-actors v9.0.1 * chore: ver: bump version for rc3 (#9512) * Bump version to 1.18.0-rc3 * Update CHANGELOG.md * Update CHANGELOG.md Co-authored-by: Aayush Rajasekaran <arajasek94@gmail.com> * Update CHANGELOG.md Co-authored-by: Aayush Rajasekaran <arajasek94@gmail.com> Co-authored-by: Jiaying Wang <42981373+jennijuju@users.noreply.github.com> Co-authored-by: Aayush Rajasekaran <arajasek94@gmail.com> * Migration: Use autobatch bs * Fix autobatch Signed-off-by: Jakub Sztandera <kubuxu@protocol.ai> * Invoker: Use MethodMeta from go-state-types * Add a second premigration for nv17 * Add more shed tools for migration checking * address review * Lotus release v1.18.0-rc4 * fix: ci: fix app-image build on ci (#9527) * Remove old go version first * Add GO_VERSION file * Use GO_VERSION to set / verify go version * mv GO_VERSION GO_VERSION_MIN * Use GO_VERSION_MIN in Makefile check Co-authored-by: Ian Davis <jungziege@gmail.com> * Update to latest go-state-types for migration fixes * go mod tidy * fix: use api.ErrActorNotFound instead of types.ErrActorNotFound * fix: add fields to ForkUpgradeParams * docs: update actors_version_checklist.md * chore: fix lint * update to go state type v0.9.6 with market migration fix (#9545) * update go-state-types to v-0.9.7 * Add invariant checks to migration * fix invariant check: number of entries in datacap actor should include verifreg * Invariant checks: Only include not-activated deals * test: nv17 migration * Address review * add lotus-shed invariance method * Migration cli takes a stateroot cid and a height * make gen * Update to builtin-actors v9.0.2 * Failing test that shows that notaries can remove datacap from the verifreg actor * Test that should pass when the problem is solved * make gen * Review fixes * statemanager call function will return call information even if call errors * update go-state-types * update builtin-actors * bubble up errors properly from ApplyImplicitMessage * bump to rc5 * set new upgrade heights for calibnet * set new upgrade height for butterfly * tweak calibnet upgrade schedule * clarify changelog note about calibnet * butterfly * update calibnet artifacts * Allow setting local bundles for Debug FVM for av 9+ * fix: autobatch: remove potential deadlock when a block is missing Check the _underlying_ blockstore instead of recursing. Also, drop the lock before we do that. * fix imports * build: set shark mainnet epoch (#9640) * chore: build: Lotus release v1.18.0 (#9641) * Lotus release v1.18.0 * add changelog * address review * changelog improvement Co-authored-by: Jennifer Wang <jiayingw703@gmail.com> Co-authored-by: Jiaying Wang <42981373+jennijuju@users.noreply.github.com> Signed-off-by: Jakub Sztandera <kubuxu@protocol.ai> Co-authored-by: Łukasz Magiera <magik6k@gmail.com> Co-authored-by: Łukasz Magiera <magik6k@users.noreply.github.com> Co-authored-by: Aayush <arajasek94@gmail.com> Co-authored-by: Geoff Stuart <geoff.vball@gmail.com> Co-authored-by: Shrenuj Bansal <shrenuj.bansal@protocol.ai> Co-authored-by: simlecode <69969590+simlecode@users.noreply.github.com> Co-authored-by: Rod Vagg <rod@vagg.org> Co-authored-by: Jakub Sztandera <kubuxu@protocol.ai> Co-authored-by: Ian Davis <jungziege@gmail.com> Co-authored-by: zenground0 <ZenGround0@users.noreply.github.com> Co-authored-by: Steven Allen <steven@stebalien.com>
267 lines
6.8 KiB
Go
267 lines
6.8 KiB
Go
package market
|
|
|
|
import (
|
|
"unicode/utf8"
|
|
|
|
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/big"
|
|
builtintypes "github.com/filecoin-project/go-state-types/builtin"
|
|
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"
|
|
|
|
"github.com/filecoin-project/lotus/chain/actors"
|
|
"github.com/filecoin-project/lotus/chain/actors/adt"
|
|
"github.com/filecoin-project/lotus/chain/types"
|
|
)
|
|
|
|
var (
|
|
Address = builtintypes.StorageMarketActorAddr
|
|
Methods = builtintypes.MethodsMarket
|
|
)
|
|
|
|
func Load(store adt.Store, act *types.Actor) (State, error) {
|
|
if name, av, ok := actors.GetActorMetaByCode(act.Code); ok {
|
|
if name != actors.MarketKey {
|
|
return nil, xerrors.Errorf("actor code is not market: %s", name)
|
|
}
|
|
|
|
switch av {
|
|
|
|
case actorstypes.Version8:
|
|
return load8(store, act.Head)
|
|
|
|
case actorstypes.Version9:
|
|
return load9(store, act.Head)
|
|
|
|
}
|
|
}
|
|
|
|
switch act.Code {
|
|
|
|
case builtin0.StorageMarketActorCodeID:
|
|
return load0(store, act.Head)
|
|
|
|
case builtin2.StorageMarketActorCodeID:
|
|
return load2(store, act.Head)
|
|
|
|
case builtin3.StorageMarketActorCodeID:
|
|
return load3(store, act.Head)
|
|
|
|
case builtin4.StorageMarketActorCodeID:
|
|
return load4(store, act.Head)
|
|
|
|
case builtin5.StorageMarketActorCodeID:
|
|
return load5(store, act.Head)
|
|
|
|
case builtin6.StorageMarketActorCodeID:
|
|
return load6(store, act.Head)
|
|
|
|
case builtin7.StorageMarketActorCodeID:
|
|
return load7(store, act.Head)
|
|
|
|
}
|
|
|
|
return nil, xerrors.Errorf("unknown actor code %s", act.Code)
|
|
}
|
|
|
|
func MakeState(store adt.Store, av actorstypes.Version) (State, error) {
|
|
switch av {
|
|
|
|
case actorstypes.Version0:
|
|
return make0(store)
|
|
|
|
case actorstypes.Version2:
|
|
return make2(store)
|
|
|
|
case actorstypes.Version3:
|
|
return make3(store)
|
|
|
|
case actorstypes.Version4:
|
|
return make4(store)
|
|
|
|
case actorstypes.Version5:
|
|
return make5(store)
|
|
|
|
case actorstypes.Version6:
|
|
return make6(store)
|
|
|
|
case actorstypes.Version7:
|
|
return make7(store)
|
|
|
|
case actorstypes.Version8:
|
|
return make8(store)
|
|
|
|
case actorstypes.Version9:
|
|
return make9(store)
|
|
|
|
}
|
|
return nil, xerrors.Errorf("unknown actor version %d", av)
|
|
}
|
|
|
|
type State interface {
|
|
cbor.Marshaler
|
|
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)
|
|
}
|
|
|
|
type BalanceTable interface {
|
|
ForEach(cb func(address.Address, abi.TokenAmount) error) error
|
|
Get(key address.Address) (abi.TokenAmount, error)
|
|
}
|
|
|
|
type DealStates interface {
|
|
ForEach(cb func(id abi.DealID, ds DealState) error) error
|
|
Get(id abi.DealID) (*DealState, bool, error)
|
|
|
|
array() adt.Array
|
|
decode(*cbg.Deferred) (*DealState, error)
|
|
}
|
|
|
|
type DealProposals interface {
|
|
ForEach(cb func(id abi.DealID, dp markettypes.DealProposal) error) error
|
|
Get(id abi.DealID) (*markettypes.DealProposal, bool, error)
|
|
|
|
array() adt.Array
|
|
decode(*cbg.Deferred) (*markettypes.DealProposal, error)
|
|
}
|
|
|
|
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 {
|
|
|
|
case actorstypes.Version0:
|
|
return decodePublishStorageDealsReturn0(b)
|
|
|
|
case actorstypes.Version2:
|
|
return decodePublishStorageDealsReturn2(b)
|
|
|
|
case actorstypes.Version3:
|
|
return decodePublishStorageDealsReturn3(b)
|
|
|
|
case actorstypes.Version4:
|
|
return decodePublishStorageDealsReturn4(b)
|
|
|
|
case actorstypes.Version5:
|
|
return decodePublishStorageDealsReturn5(b)
|
|
|
|
case actorstypes.Version6:
|
|
return decodePublishStorageDealsReturn6(b)
|
|
|
|
case actorstypes.Version7:
|
|
return decodePublishStorageDealsReturn7(b)
|
|
|
|
case actorstypes.Version8:
|
|
return decodePublishStorageDealsReturn8(b)
|
|
|
|
case actorstypes.Version9:
|
|
return decodePublishStorageDealsReturn9(b)
|
|
|
|
}
|
|
return nil, xerrors.Errorf("unknown actor version %d", av)
|
|
}
|
|
|
|
type DealProposal = markettypes.DealProposal
|
|
type DealLabel = markettypes.DealLabel
|
|
|
|
type DealState = markettypes.DealState
|
|
|
|
type DealStateChanges struct {
|
|
Added []DealIDState
|
|
Modified []DealStateChange
|
|
Removed []DealIDState
|
|
}
|
|
|
|
type DealIDState struct {
|
|
ID abi.DealID
|
|
Deal DealState
|
|
}
|
|
|
|
// DealStateChange is a change in deal state from -> to
|
|
type DealStateChange struct {
|
|
ID abi.DealID
|
|
From *DealState
|
|
To *DealState
|
|
}
|
|
|
|
type DealProposalChanges struct {
|
|
Added []ProposalIDState
|
|
Removed []ProposalIDState
|
|
}
|
|
|
|
type ProposalIDState struct {
|
|
ID abi.DealID
|
|
Proposal markettypes.DealProposal
|
|
}
|
|
|
|
func EmptyDealState() *DealState {
|
|
return &DealState{
|
|
SectorStartEpoch: -1,
|
|
SlashEpoch: -1,
|
|
LastUpdatedEpoch: -1,
|
|
}
|
|
}
|
|
|
|
// 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 markettypes.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))
|
|
}
|
|
}
|