cerc-io/lotus
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

update

Browse Source
This commit is contained in:
Frank 2021-08-04 15:49:35 +08:00
parent 2fec0c2440
commit 2744bb4e5a
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cmd/lotus-miner/info.go
View File

@ -17,8 +17,8 @@ import (
cbor "github.com/ipfs/go-ipld-cbor" cbor "github.com/ipfs/go-ipld-cbor"
"github.com/filecoin-project/go-fil-markets/retrievalmarket"
"github.com/filecoin-project/go-address" "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-fil-markets/storagemarket"
"github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/abi"
"github.com/filecoin-project/go-state-types/big" "github.com/filecoin-project/go-state-types/big"
@ -34,6 +34,7 @@ import (
"github.com/filecoin-project/lotus/chain/actors/builtin/reward" "github.com/filecoin-project/lotus/chain/actors/builtin/reward"
"github.com/filecoin-project/lotus/chain/types" "github.com/filecoin-project/lotus/chain/types"
lcli "github.com/filecoin-project/lotus/cli" lcli "github.com/filecoin-project/lotus/cli"
"github.com/filecoin-project/lotus/tools/stats"
) )
var infoCmd = &cli.Command{ var infoCmd = &cli.Command{
@ -328,7 +329,7 @@ func handleMiningInfo(ctx context.Context, cctx *cli.Context, fullapi v0api.Full
if cctx.IsSet("blocks") { if cctx.IsSet("blocks") {
fmt.Println("Produced newest blocks:") fmt.Println("Produced newest blocks:")
err = producedBlocks(ctx, cctx.Int("blocks"), head, maddr, fullapi) err = producedBlocks(ctx, cctx.Int("blocks"), maddr, fullapi)
if err != nil { if err != nil {
return err return err
} }
@ -542,8 +543,12 @@ func colorTokenAmount(format string, amount abi.TokenAmount) {
} }
} }
func producedBlocks(ctx context.Context, count int, head *types.TipSet, maddr address.Address, napi v0api.FullNode) error { func producedBlocks(ctx context.Context, count int, maddr address.Address, napi v0api.FullNode) error {
var err error var err error
head, err := napi.ChainHead(ctx)
if err != nil {
return err
}
ts := head ts := head
fmt.Printf(" Epoch | Block ID | Reward\n") fmt.Printf(" Epoch | Block ID | Reward\n")
for count > 0 { for count > 0 {
@ -556,7 +561,7 @@ func producedBlocks(ctx context.Context, count int, head *types.TipSet, maddr ad
return err return err
} }
rewardActorState, err := reward.Load(cw_util.NewAPIIpldStore(ctx, napi), rewardActor) rewardActorState, err := reward.Load(stats.NewApiIpldStore(ctx, napi), rewardActor)
if err != nil { if err != nil {
return err return err
} }