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

fix: Incorrect payload size #524

Merged
merged 3 commits into from
Apr 24, 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
13 changes: 13 additions & 0 deletions api/impl/venus_market.go
Original file line number Diff line number Diff line change
Expand Up @@ -1136,6 +1136,19 @@ func (m *MarketNodeImpl) UpdateDealStatus(ctx context.Context, miner address.Add
return m.DealAssigner.UpdateDealStatus(ctx, miner, dealId, pieceStatus, dealStatus)
}

func (m *MarketNodeImpl) UpdateStorageDealPayloadSize(ctx context.Context, dealProposal cid.Cid, payloadSize uint64) error {
deal, err := m.Repo.StorageDealRepo().GetDeal(ctx, dealProposal)
if err != nil {
return err
}
if err := jwtclient.CheckPermissionByMiner(ctx, m.AuthClient, deal.Proposal.Provider); err != nil {
return err
}

deal.PayloadSize = payloadSize
return m.Repo.StorageDealRepo().SaveDeal(ctx, deal)
}

func (m *MarketNodeImpl) DealsImportData(ctx context.Context, ref types.ImportDataRef, skipCommP bool) error {
deal, _, err := storageprovider.GetDealByDataRef(ctx, m.Repo.StorageDealRepo(), &ref)
if err != nil {
Expand Down
66 changes: 66 additions & 0 deletions cli/storage-deals.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import (
"github.com/filecoin-project/go-state-types/abi"

"github.com/ipfs-force-community/droplet/v2/cli/tablewriter"
"github.com/ipfs-force-community/droplet/v2/piecestorage"
"github.com/ipfs-force-community/droplet/v2/storageprovider"

"github.com/filecoin-project/venus/venus-shared/types"
Expand Down Expand Up @@ -53,6 +54,71 @@ var storageDealsCmds = &cli.Command{
dealsPendingPublish,
getDealCmd,
dealStateCmd,
autoUpdateDealPayloadSizeCmd,
},
}

var autoUpdateDealPayloadSizeCmd = &cli.Command{
Name: "auto-update-payload-size",
Usage: "Manually update payload size for a deal",
Flags: []cli.Flag{
&cli.Uint64Flag{
Name: "state",
Usage: "deal state",
Value: storagemarket.StorageDealAwaitingPreCommit,
},
},
Action: func(cctx *cli.Context) error {
api, closer, err := NewMarketNode(cctx)
if err != nil {
return err
}
defer closer()

ctx := DaemonContext(cctx)

cf, err := GetMarketConfig(cctx)
if err != nil {
return err
}
if cf == nil {
return fmt.Errorf("no storage deal config found")
}

state := cctx.Uint64("state")
params := &market.StorageDealQueryParams{State: &state}
deals, err := api.MarketListIncompleteDeals(ctx, params)
if err != nil {
return err
}
fmt.Println("found deals:", len(deals))

psm, err := piecestorage.NewPieceStorageManager(&cf.PieceStorage)
if err != nil {
return err
}

for _, deal := range deals {
piece := deal.Proposal.PieceCID
ps, err := psm.FindStorageForRead(ctx, piece.String())
if err != nil {
fmt.Println("no storage found for piece", piece)
continue
}
size, err := ps.Len(ctx, piece.String())
if err != nil {
fmt.Println("found no data for piece", piece)
continue
}
if deal.PayloadSize < uint64(size) && deal.PayloadSize < 1<<20 {
fmt.Println("piece", piece, "current payload size", deal.PayloadSize, "size", size)
if err := api.UpdateStorageDealPayloadSize(ctx, deal.ProposalCid, uint64(size)); err != nil {
return err
}
}
}

return nil
},
}

Expand Down
15 changes: 15 additions & 0 deletions cli/util.go
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,21 @@ func NewMarketNode(cctx *cli.Context) (marketapi.IMarket, jsonrpc.ClientCloser,
return marketapi.NewIMarketRPC(cctx.Context, addr, apiInfo.AuthHeader())
}

func GetMarketConfig(cctx *cli.Context) (*config.MarketConfig, error) {
homePath, err := GetRepoPath(cctx, "repo", OldMarketRepoPath)
if err != nil {
return nil, err
}

cfgPath := path.Join(homePath, "config.toml")
marketCfg := config.DefaultMarketConfig
err = config.LoadConfig(cfgPath, marketCfg)
if err != nil {
return nil, err
}
return marketCfg, nil
}

func NewMarketClientNode(cctx *cli.Context) (clientapi.IMarketClient, jsonrpc.ClientCloser, error) {
homePath, err := GetRepoPath(cctx, "repo", OldClientRepoPath)
if err != nil {
Expand Down
12 changes: 6 additions & 6 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/ipfs-force-community/droplet/v2

go 1.18
go 1.21

require (
github.com/BurntSushi/toml v1.3.2
Expand All @@ -25,12 +25,12 @@ require (
github.com/filecoin-project/go-fil-markets v1.28.4-0.20230816163331-bd08f1651b1d
github.com/filecoin-project/go-jsonrpc v0.1.8
github.com/filecoin-project/go-padreader v0.0.1
github.com/filecoin-project/go-state-types v0.13.1
github.com/filecoin-project/go-state-types v0.13.3
github.com/filecoin-project/go-statemachine v1.0.3
github.com/filecoin-project/go-statestore v0.2.0
github.com/filecoin-project/specs-actors/v2 v2.3.6
github.com/filecoin-project/specs-actors/v7 v7.0.1
github.com/filecoin-project/venus v1.15.0
github.com/filecoin-project/venus v1.15.2
github.com/golang/mock v1.6.0
github.com/google/uuid v1.5.0
github.com/gorilla/mux v1.8.0
Expand Down Expand Up @@ -70,7 +70,7 @@ require (
github.com/libp2p/go-libp2p v0.31.1
github.com/libp2p/go-maddr-filter v0.1.0
github.com/mitchellh/go-homedir v1.1.0
github.com/multiformats/go-multiaddr v0.12.2
github.com/multiformats/go-multiaddr v0.12.3
github.com/multiformats/go-multibase v0.2.0
github.com/multiformats/go-multihash v0.2.3
github.com/multiformats/go-varint v0.0.7
Expand All @@ -79,7 +79,7 @@ require (
github.com/strikesecurity/strikememongo v0.2.4
github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7
github.com/urfave/cli/v2 v2.25.7
github.com/whyrusleeping/cbor-gen v0.1.0
github.com/whyrusleeping/cbor-gen v0.1.1
github.com/whyrusleeping/multiaddr-filter v0.0.0-20160516205228-e903e4adabd7
go.mongodb.org/mongo-driver v1.8.4
go.opencensus.io v0.24.0
Expand Down Expand Up @@ -126,7 +126,7 @@ require (
github.com/filecoin-project/filecoin-ffi v0.30.4-0.20220519234331-bfd1f5f9fe38 // indirect
github.com/filecoin-project/go-amt-ipld/v2 v2.1.1-0.20201006184820-924ee87a1349 // indirect
github.com/filecoin-project/go-amt-ipld/v3 v3.1.0 // indirect
github.com/filecoin-project/go-amt-ipld/v4 v4.2.0 // indirect
github.com/filecoin-project/go-amt-ipld/v4 v4.3.0 // indirect
github.com/filecoin-project/go-crypto v0.0.1 // indirect
github.com/filecoin-project/go-hamt-ipld v0.1.5 // indirect
github.com/filecoin-project/go-hamt-ipld/v2 v2.0.0 // indirect
Expand Down
Loading
Loading