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

Add a command to get the fees of a deal #5307

Merged
merged 1 commit into from
Apr 29, 2021
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
17 changes: 17 additions & 0 deletions chain/actors/builtin/market/market.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package market

import (
"github.com/filecoin-project/go-state-types/big"
"golang.org/x/xerrors"

"github.com/filecoin-project/go-address"
Expand Down Expand Up @@ -153,3 +154,19 @@ func EmptyDealState() *DealState {
LastUpdatedEpoch: -1,
}
}

// returns the earned fees and pending fees for a given deal
func (deal DealProposal) GetDealFees(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)))
magik6k marked this conversation as resolved.
Show resolved Hide resolved
if ef.LessThan(big.Zero()) {
ef = big.Zero()
}

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

return ef, big.Sub(tf, ef)
}
1 change: 1 addition & 0 deletions cmd/lotus-shed/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ func main() {
postFindCmd,
proofsCmd,
verifRegCmd,
marketCmd,
miscCmd,
mpoolCmd,
genesisVerifyCmd,
Expand Down
102 changes: 102 additions & 0 deletions cmd/lotus-shed/market.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,102 @@
package main

import (
"fmt"

lcli "github.com/filecoin-project/lotus/cli"

"github.com/filecoin-project/go-address"
"github.com/filecoin-project/go-state-types/abi"
"github.com/filecoin-project/go-state-types/big"
"github.com/urfave/cli/v2"
"golang.org/x/xerrors"
)

var marketCmd = &cli.Command{
Name: "market",
Usage: "Interact with the market actor",
Flags: []cli.Flag{},
Subcommands: []*cli.Command{
marketDealFeesCmd,
},
}

var marketDealFeesCmd = &cli.Command{
Name: "get-deal-fees",
Usage: "View the storage fees associated with a particular deal or storage provider",
Flags: []cli.Flag{
&cli.StringFlag{
Name: "provider",
Usage: "provider whose outstanding fees you'd like to calculate",
},
&cli.IntFlag{
Name: "dealId",
Usage: "deal whose outstanding fees you'd like to calculate",
},
},
Action: func(cctx *cli.Context) error {
api, closer, err := lcli.GetFullNodeAPI(cctx)
if err != nil {
return err
}
defer closer()

ctx := lcli.ReqContext(cctx)

ts, err := lcli.LoadTipSet(ctx, cctx, api)
if err != nil {
return err
}

ht := ts.Height()

if cctx.IsSet("provider") {
p, err := address.NewFromString(cctx.String("provider"))
if err != nil {
return fmt.Errorf("failed to parse provider: %w", err)
}

deals, err := api.StateMarketDeals(ctx, ts.Key())
if err != nil {
return err
}

ef := big.Zero()
pf := big.Zero()
count := 0

for _, deal := range deals {
if deal.Proposal.Provider == p {
e, p := deal.Proposal.GetDealFees(ht)
ef = big.Add(ef, e)
pf = big.Add(pf, p)
count++
}
}

fmt.Println("Total deals: ", count)
fmt.Println("Total earned fees: ", ef)
fmt.Println("Total pending fees: ", pf)
fmt.Println("Total fees: ", big.Add(ef, pf))

return nil
}

if dealid := cctx.Int("dealId"); dealid != 0 {
deal, err := api.StateMarketStorageDeal(ctx, abi.DealID(dealid), ts.Key())
if err != nil {
return err
}

ef, pf := deal.Proposal.GetDealFees(ht)

fmt.Println("Earned fees: ", ef)
fmt.Println("Pending fees: ", pf)
fmt.Println("Total fees: ", big.Add(ef, pf))

return nil
}

return xerrors.New("must provide either --provider or --dealId flag")
},
}