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>
193 lines
7.6 KiB
Go
193 lines
7.6 KiB
Go
package sealing
|
|
|
|
import (
|
|
"bytes"
|
|
"context"
|
|
"fmt"
|
|
|
|
"github.com/ipfs/go-cid"
|
|
"golang.org/x/xerrors"
|
|
|
|
"github.com/filecoin-project/go-address"
|
|
"github.com/filecoin-project/go-state-types/abi"
|
|
markettypes "github.com/filecoin-project/go-state-types/builtin/v9/market"
|
|
"github.com/filecoin-project/go-state-types/exitcode"
|
|
"github.com/filecoin-project/go-state-types/network"
|
|
|
|
"github.com/filecoin-project/lotus/api"
|
|
"github.com/filecoin-project/lotus/chain/actors/builtin/market"
|
|
"github.com/filecoin-project/lotus/chain/types"
|
|
)
|
|
|
|
type CurrentDealInfoAPI interface {
|
|
ChainGetMessage(context.Context, cid.Cid) (*types.Message, error)
|
|
StateLookupID(context.Context, address.Address, types.TipSetKey) (address.Address, error)
|
|
StateMarketStorageDeal(context.Context, abi.DealID, types.TipSetKey) (*api.MarketDeal, error)
|
|
StateSearchMsg(ctx context.Context, from types.TipSetKey, msg cid.Cid, limit abi.ChainEpoch, allowReplaced bool) (*api.MsgLookup, error)
|
|
StateNetworkVersion(ctx context.Context, tsk types.TipSetKey) (network.Version, error)
|
|
}
|
|
|
|
type CurrentDealInfo struct {
|
|
DealID abi.DealID
|
|
MarketDeal *api.MarketDeal
|
|
PublishMsgTipSet types.TipSetKey
|
|
}
|
|
|
|
type CurrentDealInfoManager struct {
|
|
CDAPI CurrentDealInfoAPI
|
|
}
|
|
|
|
// GetCurrentDealInfo gets the current deal state and deal ID.
|
|
// Note that the deal ID is assigned when the deal is published, so it may
|
|
// have changed if there was a reorg after the deal was published.
|
|
func (mgr *CurrentDealInfoManager) GetCurrentDealInfo(ctx context.Context, tsk types.TipSetKey, proposal *market.DealProposal, publishCid cid.Cid) (CurrentDealInfo, error) {
|
|
// Lookup the deal ID by comparing the deal proposal to the proposals in
|
|
// the publish deals message, and indexing into the message return value
|
|
dealID, pubMsgTok, err := mgr.dealIDFromPublishDealsMsg(ctx, tsk, proposal, publishCid)
|
|
if err != nil {
|
|
return CurrentDealInfo{}, err
|
|
}
|
|
|
|
// Lookup the deal state by deal ID
|
|
marketDeal, err := mgr.CDAPI.StateMarketStorageDeal(ctx, dealID, tsk)
|
|
if err == nil && proposal != nil {
|
|
// Make sure the retrieved deal proposal matches the target proposal
|
|
equal, err := mgr.CheckDealEquality(ctx, tsk, *proposal, marketDeal.Proposal)
|
|
if err != nil {
|
|
return CurrentDealInfo{}, err
|
|
}
|
|
if !equal {
|
|
return CurrentDealInfo{}, xerrors.Errorf("Deal proposals for publish message %s did not match", publishCid)
|
|
}
|
|
}
|
|
return CurrentDealInfo{DealID: dealID, MarketDeal: marketDeal, PublishMsgTipSet: pubMsgTok}, err
|
|
}
|
|
|
|
// dealIDFromPublishDealsMsg looks up the publish deals message by cid, and finds the deal ID
|
|
// by looking at the message return value
|
|
func (mgr *CurrentDealInfoManager) dealIDFromPublishDealsMsg(ctx context.Context, tsk types.TipSetKey, proposal *market.DealProposal, publishCid cid.Cid) (abi.DealID, types.TipSetKey, error) {
|
|
dealID := abi.DealID(0)
|
|
|
|
// Get the return value of the publish deals message
|
|
lookup, err := mgr.CDAPI.StateSearchMsg(ctx, tsk, publishCid, api.LookbackNoLimit, true)
|
|
if err != nil {
|
|
return dealID, types.EmptyTSK, xerrors.Errorf("looking for publish deal message %s: search msg failed: %w", publishCid, err)
|
|
}
|
|
|
|
if lookup == nil {
|
|
return dealID, types.EmptyTSK, xerrors.Errorf("looking for publish deal message %s: not found", publishCid)
|
|
}
|
|
|
|
if lookup.Receipt.ExitCode != exitcode.Ok {
|
|
return dealID, types.EmptyTSK, xerrors.Errorf("looking for publish deal message %s: non-ok exit code: %s", publishCid, lookup.Receipt.ExitCode)
|
|
}
|
|
|
|
nv, err := mgr.CDAPI.StateNetworkVersion(ctx, lookup.TipSet)
|
|
if err != nil {
|
|
return dealID, types.EmptyTSK, xerrors.Errorf("getting network version: %w", err)
|
|
}
|
|
|
|
retval, err := market.DecodePublishStorageDealsReturn(lookup.Receipt.Return, nv)
|
|
if err != nil {
|
|
return dealID, types.EmptyTSK, xerrors.Errorf("looking for publish deal message %s: decoding message return: %w", publishCid, err)
|
|
}
|
|
|
|
dealIDs, err := retval.DealIDs()
|
|
if err != nil {
|
|
return dealID, types.EmptyTSK, xerrors.Errorf("looking for publish deal message %s: getting dealIDs: %w", publishCid, err)
|
|
}
|
|
|
|
// TODO: Can we delete this? We're well past the point when we first introduced the proposals into sealing deal info
|
|
// Previously, publish deals messages contained a single deal, and the
|
|
// deal proposal was not included in the sealing deal info.
|
|
// So check if the proposal is nil and check the number of deals published
|
|
// in the message.
|
|
if proposal == nil {
|
|
if len(dealIDs) > 1 {
|
|
return dealID, types.EmptyTSK, xerrors.Errorf(
|
|
"getting deal ID from publish deal message %s: "+
|
|
"no deal proposal supplied but message return value has more than one deal (%d deals)",
|
|
publishCid, len(dealIDs))
|
|
}
|
|
|
|
// There is a single deal in this publish message and no deal proposal
|
|
// was supplied, so we have nothing to compare against. Just assume
|
|
// the deal ID is correct and that it was valid
|
|
return dealIDs[0], lookup.TipSet, nil
|
|
}
|
|
|
|
// Get the parameters to the publish deals message
|
|
pubmsg, err := mgr.CDAPI.ChainGetMessage(ctx, publishCid)
|
|
if err != nil {
|
|
return dealID, types.EmptyTSK, xerrors.Errorf("getting publish deal message %s: %w", publishCid, err)
|
|
}
|
|
|
|
var pubDealsParams markettypes.PublishStorageDealsParams
|
|
if err := pubDealsParams.UnmarshalCBOR(bytes.NewReader(pubmsg.Params)); err != nil {
|
|
return dealID, types.EmptyTSK, xerrors.Errorf("unmarshalling publish deal message params for message %s: %w", publishCid, err)
|
|
}
|
|
|
|
// Scan through the deal proposals in the message parameters to find the
|
|
// index of the target deal proposal
|
|
dealIdx := -1
|
|
for i, paramDeal := range pubDealsParams.Deals {
|
|
eq, err := mgr.CheckDealEquality(ctx, tsk, *proposal, paramDeal.Proposal)
|
|
if err != nil {
|
|
return dealID, types.EmptyTSK, xerrors.Errorf("comparing publish deal message %s proposal to deal proposal: %w", publishCid, err)
|
|
}
|
|
if eq {
|
|
dealIdx = i
|
|
break
|
|
}
|
|
}
|
|
fmt.Printf("found dealIdx %d\n", dealIdx)
|
|
|
|
if dealIdx == -1 {
|
|
return dealID, types.EmptyTSK, xerrors.Errorf("could not find deal in publish deals message %s", publishCid)
|
|
}
|
|
|
|
if dealIdx >= len(pubDealsParams.Deals) {
|
|
return dealID, types.EmptyTSK, xerrors.Errorf(
|
|
"deal index %d out of bounds of deal proposals (len %d) in publish deals message %s",
|
|
dealIdx, len(dealIDs), publishCid)
|
|
}
|
|
|
|
valid, outIdx, err := retval.IsDealValid(uint64(dealIdx))
|
|
if err != nil {
|
|
return dealID, types.EmptyTSK, xerrors.Errorf("determining deal validity: %w", err)
|
|
}
|
|
|
|
if !valid {
|
|
return dealID, types.EmptyTSK, xerrors.New("deal was invalid at publication")
|
|
}
|
|
|
|
// final check against for invalid return value output
|
|
// should not be reachable from onchain output, only pathological test cases
|
|
if outIdx >= len(dealIDs) {
|
|
return dealID, types.EmptyTSK, xerrors.Errorf("invalid publish storage deals ret marking %d as valid while only returning %d valid deals in publish deal message %s", outIdx, len(dealIDs), publishCid)
|
|
}
|
|
return dealIDs[outIdx], lookup.TipSet, nil
|
|
}
|
|
|
|
func (mgr *CurrentDealInfoManager) CheckDealEquality(ctx context.Context, tsk types.TipSetKey, p1, p2 market.DealProposal) (bool, error) {
|
|
p1ClientID, err := mgr.CDAPI.StateLookupID(ctx, p1.Client, tsk)
|
|
if err != nil {
|
|
return false, err
|
|
}
|
|
p2ClientID, err := mgr.CDAPI.StateLookupID(ctx, p2.Client, tsk)
|
|
if err != nil {
|
|
return false, err
|
|
}
|
|
return p1.PieceCID.Equals(p2.PieceCID) &&
|
|
p1.PieceSize == p2.PieceSize &&
|
|
p1.VerifiedDeal == p2.VerifiedDeal &&
|
|
p1.Label.Equals(p2.Label) &&
|
|
p1.StartEpoch == p2.StartEpoch &&
|
|
p1.EndEpoch == p2.EndEpoch &&
|
|
p1.StoragePricePerEpoch.Equals(p2.StoragePricePerEpoch) &&
|
|
p1.ProviderCollateral.Equals(p2.ProviderCollateral) &&
|
|
p1.ClientCollateral.Equals(p2.ClientCollateral) &&
|
|
p1.Provider == p2.Provider &&
|
|
p1ClientID == p2ClientID, nil
|
|
}
|