Merge pull request #7202 from filecoin-project/filcloud-info-blocks

Add optional mined block list to miner info

cmd/lotus-miner/info.go

@@ -12,24 +12,27 @@ import (
 	"time"
 
 	"github.com/fatih/color"
+	"github.com/mattn/go-isatty"
 	"github.com/urfave/cli/v2"
 	"golang.org/x/xerrors"
 
 	cbor "github.com/ipfs/go-ipld-cbor"
 
+	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-fil-markets/retrievalmarket"
 	"github.com/filecoin-project/go-fil-markets/storagemarket"
 	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/filecoin-project/go-state-types/big"
 	"github.com/filecoin-project/lotus/api/v0api"
 	sealing "github.com/filecoin-project/lotus/extern/storage-sealing"
+	"github.com/filecoin-project/specs-actors/actors/builtin"
 
 	"github.com/filecoin-project/lotus/api"
 	"github.com/filecoin-project/lotus/blockstore"
 	"github.com/filecoin-project/lotus/build"
 	"github.com/filecoin-project/lotus/chain/actors/adt"
-	"github.com/filecoin-project/lotus/chain/actors/builtin"
 	"github.com/filecoin-project/lotus/chain/actors/builtin/miner"
+	"github.com/filecoin-project/lotus/chain/actors/builtin/reward"
 	"github.com/filecoin-project/lotus/chain/types"
 	lcli "github.com/filecoin-project/lotus/cli"
 	"github.com/filecoin-project/lotus/journal/alerting"
@@ -46,6 +49,10 @@ var infoCmd = &cli.Command{
 			Name:  "hide-sectors-info",
 			Usage: "hide sectors info",
 		},
+		&cli.IntFlag{
+			Name:  "blocks",
+			Usage: "Log of produced <blocks> newest blocks and rewards(Miner Fee excluded)",
+		},
 	},
 	Action: infoCmdAct,
 }
@@ -157,6 +164,7 @@ func handleMiningInfo(ctx context.Context, cctx *cli.Context, fullapi v0api.Full
 	}
 
 	tbs := blockstore.NewTieredBstore(blockstore.NewAPIBlockstore(fullapi), blockstore.NewMemory())
+
 	mas, err := miner.Load(adt.WrapStore(ctx, cbor.NewCborStore(tbs)), mact)
 	if err != nil {
 		return err
@@ -164,6 +172,7 @@ func handleMiningInfo(ctx context.Context, cctx *cli.Context, fullapi v0api.Full
 
 	// Sector size
 	mi, err := fullapi.StateMinerInfo(ctx, maddr, types.EmptyTSK)
+
 	if err != nil {
 		return err
 	}
@@ -194,6 +203,7 @@ func handleMiningInfo(ctx context.Context, cctx *cli.Context, fullapi v0api.Full
 		),
 	)
 	secCounts, err := fullapi.StateMinerSectorCount(ctx, maddr, types.EmptyTSK)
+
 	if err != nil {
 		return err
 	}
@@ -291,6 +301,7 @@ func handleMiningInfo(ctx context.Context, cctx *cli.Context, fullapi v0api.Full
 	colorTokenAmount("      Available:  %s\n", availBalance)
 
 	mb, err := fullapi.StateMarketBalance(ctx, maddr, types.EmptyTSK)
+
 	if err != nil {
 		return xerrors.Errorf("getting market balance: %w", err)
 	}
@@ -301,6 +312,7 @@ func handleMiningInfo(ctx context.Context, cctx *cli.Context, fullapi v0api.Full
 	colorTokenAmount("       Available: %s\n", big.Sub(mb.Escrow, mb.Locked))
 
 	wb, err := fullapi.WalletBalance(ctx, mi.Worker)
+
 	if err != nil {
 		return xerrors.Errorf("getting worker balance: %w", err)
 	}
@@ -331,6 +343,13 @@ func handleMiningInfo(ctx context.Context, cctx *cli.Context, fullapi v0api.Full
 		}
 	}
 
+	if cctx.IsSet("blocks") {
+		fmt.Println("Produced newest blocks:")
+		err = producedBlocks(ctx, cctx.Int("blocks"), maddr, fullapi)
+		if err != nil {
+			return err
+		}
+	}
 	// TODO: grab actr state / info
 	//  * Sealed sectors (count / bytes)
 	//  * Power
@@ -500,8 +519,8 @@ func init() {
 	}
 }
 
-func sectorsInfo(ctx context.Context, napi api.StorageMiner) error {
+func sectorsInfo(ctx context.Context, mapi api.StorageMiner) error {
-	summary, err := napi.SectorsSummary(ctx)
+	summary, err := mapi.SectorsSummary(ctx)
 	if err != nil {
 		return err
 	}
@@ -539,3 +558,66 @@ func colorTokenAmount(format string, amount abi.TokenAmount) {
 		color.Red(format, types.FIL(amount).Short())
 	}
 }
+
+func producedBlocks(ctx context.Context, count int, maddr address.Address, napi v0api.FullNode) error {
+	var err error
+	head, err := napi.ChainHead(ctx)
+	if err != nil {
+		return err
+	}
+
+	tbs := blockstore.NewTieredBstore(blockstore.NewAPIBlockstore(napi), blockstore.NewMemory())
+
+	tty := isatty.IsTerminal(os.Stderr.Fd())
+
+	ts := head
+	fmt.Printf(" Epoch   | Block ID                                                       | Reward\n")
+	for count > 0 {
+		tsk := ts.Key()
+		bhs := ts.Blocks()
+		for _, bh := range bhs {
+			if ctx.Err() != nil {
+				return ctx.Err()
+			}
+
+			if bh.Miner == maddr {
+				if tty {
+					_, _ = fmt.Fprint(os.Stderr, "\r\x1b[0K")
+				}
+
+				rewardActor, err := napi.StateGetActor(ctx, reward.Address, tsk)
+				if err != nil {
+					return err
+				}
+
+				rewardActorState, err := reward.Load(adt.WrapStore(ctx, cbor.NewCborStore(tbs)), rewardActor)
+				if err != nil {
+					return err
+				}
+				blockReward, err := rewardActorState.ThisEpochReward()
+				if err != nil {
+					return err
+				}
+
+				minerReward := types.BigDiv(types.BigMul(types.NewInt(uint64(bh.ElectionProof.WinCount)),
+					blockReward), types.NewInt(uint64(builtin.ExpectedLeadersPerEpoch)))
+
+				fmt.Printf("%8d | %s | %s\n", ts.Height(), bh.Cid(), types.FIL(minerReward))
+				count--
+			} else if tty && bh.Height%120 == 0 {
+				_, _ = fmt.Fprintf(os.Stderr, "\r\x1b[0KChecking epoch %s", lcli.EpochTime(head.Height(), bh.Height))
+			}
+		}
+		tsk = ts.Parents()
+		ts, err = napi.ChainGetTipSet(ctx, tsk)
+		if err != nil {
+			return err
+		}
+	}
+
+	if tty {
+		_, _ = fmt.Fprint(os.Stderr, "\r\x1b[0K")
+	}
+
+	return nil
+}

documentation/en/cli-lotus-miner.md

@@ -430,6 +430,7 @@ COMMANDS:
 
 OPTIONS:
    --hide-sectors-info  hide sectors info (default: false)
+   --blocks value       Log of produced <blocks> newest blocks and rewards(Miner Fee excluded) (default: 0)
    --help, -h           show help (default: false)
    --version, -v        print the version (default: false)