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>
350 lines
9.0 KiB
Go
350 lines
9.0 KiB
Go
package market
|
|
|
|
import (
|
|
"bytes"
|
|
|
|
"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"
|
|
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"
|
|
)
|
|
|
|
var _ State = (*state9)(nil)
|
|
|
|
func load9(store adt.Store, root cid.Cid) (State, error) {
|
|
out := state9{store: store}
|
|
err := store.Get(store.Context(), root, &out)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return &out, nil
|
|
}
|
|
|
|
func make9(store adt.Store) (State, error) {
|
|
out := state9{store: store}
|
|
|
|
s, err := market9.ConstructState(store)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
out.State = *s
|
|
|
|
return &out, nil
|
|
}
|
|
|
|
type state9 struct {
|
|
market9.State
|
|
store adt.Store
|
|
}
|
|
|
|
func (s *state9) TotalLocked() (abi.TokenAmount, error) {
|
|
fml := types.BigAdd(s.TotalClientLockedCollateral, s.TotalProviderLockedCollateral)
|
|
fml = types.BigAdd(fml, s.TotalClientStorageFee)
|
|
return fml, nil
|
|
}
|
|
|
|
func (s *state9) BalancesChanged(otherState State) (bool, error) {
|
|
otherState9, ok := otherState.(*state9)
|
|
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(otherState9.State.EscrowTable) || !s.State.LockedTable.Equals(otherState9.State.LockedTable), nil
|
|
}
|
|
|
|
func (s *state9) StatesChanged(otherState State) (bool, error) {
|
|
otherState9, ok := otherState.(*state9)
|
|
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(otherState9.State.States), nil
|
|
}
|
|
|
|
func (s *state9) States() (DealStates, error) {
|
|
stateArray, err := adt9.AsArray(s.store, s.State.States, market9.StatesAmtBitwidth)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return &dealStates9{stateArray}, nil
|
|
}
|
|
|
|
func (s *state9) ProposalsChanged(otherState State) (bool, error) {
|
|
otherState9, ok := otherState.(*state9)
|
|
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(otherState9.State.Proposals), nil
|
|
}
|
|
|
|
func (s *state9) Proposals() (DealProposals, error) {
|
|
proposalArray, err := adt9.AsArray(s.store, s.State.Proposals, market9.ProposalsAmtBitwidth)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return &dealProposals9{proposalArray}, nil
|
|
}
|
|
|
|
func (s *state9) EscrowTable() (BalanceTable, error) {
|
|
bt, err := adt9.AsBalanceTable(s.store, s.State.EscrowTable)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return &balanceTable9{bt}, nil
|
|
}
|
|
|
|
func (s *state9) LockedTable() (BalanceTable, error) {
|
|
bt, err := adt9.AsBalanceTable(s.store, s.State.LockedTable)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return &balanceTable9{bt}, nil
|
|
}
|
|
|
|
func (s *state9) VerifyDealsForActivation(
|
|
minerAddr address.Address, deals []abi.DealID, currEpoch, sectorExpiry abi.ChainEpoch,
|
|
) (weight, verifiedWeight abi.DealWeight, err error) {
|
|
w, vw, _, err := market9.ValidateDealsForActivation(&s.State, s.store, deals, minerAddr, sectorExpiry, currEpoch)
|
|
return w, vw, err
|
|
}
|
|
|
|
func (s *state9) NextID() (abi.DealID, error) {
|
|
return s.State.NextID, nil
|
|
}
|
|
|
|
type balanceTable9 struct {
|
|
*adt9.BalanceTable
|
|
}
|
|
|
|
func (bt *balanceTable9) ForEach(cb func(address.Address, abi.TokenAmount) error) error {
|
|
asMap := (*adt9.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 dealStates9 struct {
|
|
adt.Array
|
|
}
|
|
|
|
func (s *dealStates9) Get(dealID abi.DealID) (*DealState, bool, error) {
|
|
var deal9 market9.DealState
|
|
found, err := s.Array.Get(uint64(dealID), &deal9)
|
|
if err != nil {
|
|
return nil, false, err
|
|
}
|
|
if !found {
|
|
return nil, false, nil
|
|
}
|
|
deal := fromV9DealState(deal9)
|
|
return &deal, true, nil
|
|
}
|
|
|
|
func (s *dealStates9) ForEach(cb func(dealID abi.DealID, ds DealState) error) error {
|
|
var ds9 market9.DealState
|
|
return s.Array.ForEach(&ds9, func(idx int64) error {
|
|
return cb(abi.DealID(idx), fromV9DealState(ds9))
|
|
})
|
|
}
|
|
|
|
func (s *dealStates9) decode(val *cbg.Deferred) (*DealState, error) {
|
|
var ds9 market9.DealState
|
|
if err := ds9.UnmarshalCBOR(bytes.NewReader(val.Raw)); err != nil {
|
|
return nil, err
|
|
}
|
|
ds := fromV9DealState(ds9)
|
|
return &ds, nil
|
|
}
|
|
|
|
func (s *dealStates9) array() adt.Array {
|
|
return s.Array
|
|
}
|
|
|
|
func fromV9DealState(v9 market9.DealState) DealState {
|
|
|
|
return (DealState)(v9)
|
|
|
|
}
|
|
|
|
type dealProposals9 struct {
|
|
adt.Array
|
|
}
|
|
|
|
func (s *dealProposals9) Get(dealID abi.DealID) (*DealProposal, bool, error) {
|
|
var proposal9 market9.DealProposal
|
|
found, err := s.Array.Get(uint64(dealID), &proposal9)
|
|
if err != nil {
|
|
return nil, false, err
|
|
}
|
|
if !found {
|
|
return nil, false, nil
|
|
}
|
|
|
|
proposal, err := fromV9DealProposal(proposal9)
|
|
if err != nil {
|
|
return nil, true, xerrors.Errorf("decoding proposal: %w", err)
|
|
}
|
|
|
|
return &proposal, true, nil
|
|
}
|
|
|
|
func (s *dealProposals9) ForEach(cb func(dealID abi.DealID, dp DealProposal) error) error {
|
|
var dp9 market9.DealProposal
|
|
return s.Array.ForEach(&dp9, func(idx int64) error {
|
|
dp, err := fromV9DealProposal(dp9)
|
|
if err != nil {
|
|
return xerrors.Errorf("decoding proposal: %w", err)
|
|
}
|
|
|
|
return cb(abi.DealID(idx), dp)
|
|
})
|
|
}
|
|
|
|
func (s *dealProposals9) decode(val *cbg.Deferred) (*DealProposal, error) {
|
|
var dp9 market9.DealProposal
|
|
if err := dp9.UnmarshalCBOR(bytes.NewReader(val.Raw)); err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
dp, err := fromV9DealProposal(dp9)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return &dp, nil
|
|
}
|
|
|
|
func (s *dealProposals9) array() adt.Array {
|
|
return s.Array
|
|
}
|
|
|
|
func fromV9DealProposal(v9 market9.DealProposal) (DealProposal, error) {
|
|
|
|
label, err := fromV9Label(v9.Label)
|
|
|
|
if err != nil {
|
|
return DealProposal{}, xerrors.Errorf("error setting deal label: %w", err)
|
|
}
|
|
|
|
return DealProposal{
|
|
PieceCID: v9.PieceCID,
|
|
PieceSize: v9.PieceSize,
|
|
VerifiedDeal: v9.VerifiedDeal,
|
|
Client: v9.Client,
|
|
Provider: v9.Provider,
|
|
|
|
Label: label,
|
|
|
|
StartEpoch: v9.StartEpoch,
|
|
EndEpoch: v9.EndEpoch,
|
|
StoragePricePerEpoch: v9.StoragePricePerEpoch,
|
|
|
|
ProviderCollateral: v9.ProviderCollateral,
|
|
ClientCollateral: v9.ClientCollateral,
|
|
}, nil
|
|
}
|
|
|
|
func fromV9Label(v9 market9.DealLabel) (DealLabel, error) {
|
|
if v9.IsString() {
|
|
str, err := v9.ToString()
|
|
if err != nil {
|
|
return markettypes.EmptyDealLabel, xerrors.Errorf("failed to convert string label to string: %w", err)
|
|
}
|
|
return markettypes.NewLabelFromString(str)
|
|
}
|
|
|
|
bs, err := v9.ToBytes()
|
|
if err != nil {
|
|
return markettypes.EmptyDealLabel, xerrors.Errorf("failed to convert bytes label to bytes: %w", err)
|
|
}
|
|
return markettypes.NewLabelFromBytes(bs)
|
|
}
|
|
|
|
func (s *state9) GetState() interface{} {
|
|
return &s.State
|
|
}
|
|
|
|
var _ PublishStorageDealsReturn = (*publishStorageDealsReturn9)(nil)
|
|
|
|
func decodePublishStorageDealsReturn9(b []byte) (PublishStorageDealsReturn, error) {
|
|
var retval market9.PublishStorageDealsReturn
|
|
if err := retval.UnmarshalCBOR(bytes.NewReader(b)); err != nil {
|
|
return nil, xerrors.Errorf("failed to unmarshal PublishStorageDealsReturn: %w", err)
|
|
}
|
|
|
|
return &publishStorageDealsReturn9{retval}, nil
|
|
}
|
|
|
|
type publishStorageDealsReturn9 struct {
|
|
market9.PublishStorageDealsReturn
|
|
}
|
|
|
|
func (r *publishStorageDealsReturn9) 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 *publishStorageDealsReturn9) DealIDs() ([]abi.DealID, error) {
|
|
return r.IDs, nil
|
|
}
|
|
|
|
func (s *state9) GetAllocationIdForPendingDeal(dealId abi.DealID) (verifregtypes.AllocationId, error) {
|
|
|
|
allocations, err := adt9.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
|
|
|
|
}
|