Merge remote-tracking branch 'origin/next' into asr/deal-collateral

chain/market/fundmgr.go

@@ -2,6 +2,7 @@ package market
 
 import (
 	"context"
+	"github.com/filecoin-project/specs-actors/actors/abi/big"
 	"sync"
 
 	"github.com/filecoin-project/specs-actors/actors/builtin"
@@ -52,29 +53,33 @@ func (fm *FundMgr) EnsureAvailable(ctx context.Context, addr, wallet address.Add
 	if avail.LessThan(types.NewInt(0)) {
 		// TODO: some rules around adding more to avoid doing stuff on-chain
 		//  all the time
-		toAdd = types.BigSub(toAdd, avail)
+		toAdd = avail.Neg()
 		avail = types.NewInt(0)
 	}
 	fm.available[addr] = avail
 
 	fm.lk.Unlock()
 
-	var err error
+	if toAdd.LessThanEqual(big.Zero()) {
-	params, err := actors.SerializeParams(&addr)
+		return cid.Undef, nil
-	if err != nil {
+	} else {
-		return cid.Undef, err
+		var err error
-	}
+		params, err := actors.SerializeParams(&addr)
+		if err != nil {
+			return cid.Undef, err
+		}
 
-	smsg, err := fm.mpool.MpoolPushMessage(ctx, &types.Message{
+		smsg, err := fm.mpool.MpoolPushMessage(ctx, &types.Message{
-		To:     builtin.StorageMarketActorAddr,
+			To:     builtin.StorageMarketActorAddr,
-		From:   wallet,
+			From:   wallet,
-		Value:  toAdd,
+			Value:  toAdd,
-		Method: builtin.MethodsMarket.AddBalance,
+			Method: builtin.MethodsMarket.AddBalance,
-		Params: params,
+			Params: params,
-	})
+		})
-	if err != nil {
+		if err != nil {
-		return cid.Undef, err
+			return cid.Undef, err
-	}
+		}
 
-	return smsg.Cid(), nil
+		return smsg.Cid(), nil
+	}
 }

cli/state.go

@@ -5,6 +5,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"github.com/multiformats/go-multiaddr"
 	"html/template"
 	"io"
 	"os"
@@ -105,6 +106,15 @@ var stateMinerInfo = &cli.Command{
 		fmt.Printf("Worker:\t%s\n", mi.Worker)
 		fmt.Printf("PeerID:\t%s\n", mi.PeerId)
 		fmt.Printf("SectorSize:\t%s (%d)\n", types.SizeStr(types.NewInt(uint64(mi.SectorSize))), mi.SectorSize)
+		fmt.Printf("Multiaddrs: \t")
+		for _, addr := range mi.Multiaddrs {
+			a, err := multiaddr.NewMultiaddrBytes(addr)
+			if err != nil {
+				return xerrors.Errorf("undecodable listen address: %w", err)
+			}
+			fmt.Printf("%s ", a)
+		}
+		fmt.Println()
 
 		return nil
 	},

cmd/lotus-storage-miner/actor.go

@@ -24,7 +24,7 @@ var actorCmd = &cli.Command{
 
 var actorSetAddrsCmd = &cli.Command{
 	Name:  "set-addrs",
-	Usage: "set addresses that your miner can be publically dialed on",
+	Usage: "set addresses that your miner can be publicly dialed on",
 	Flags: []cli.Flag{
 		&cli.Int64Flag{
 			Name:  "gas-limit",