Merge remote-tracking branch 'origin/testnet/3' into feat/4stage-seal

node/impl/client/client.go

@@ -187,7 +187,7 @@ func (a *API) ClientFindData(ctx context.Context, root cid.Cid) ([]api.QueryOffe
 				MinPrice:                queryResponse.PieceRetrievalPrice(),
 				PaymentInterval:         queryResponse.MaxPaymentInterval,
 				PaymentIntervalIncrease: queryResponse.MaxPaymentIntervalIncrease,
-				Miner:                   p.Address, // TODO: check
+				Miner:                   queryResponse.PaymentAddress, // TODO: check
 				MinerPeerID:             p.ID,
 			}
 		}
@@ -308,10 +308,10 @@ func (a *API) ClientRetrieve(ctx context.Context, order api.RetrievalOrder, path
 
 	unsubscribe := a.Retrieval.SubscribeToEvents(func(event retrievalmarket.ClientEvent, state retrievalmarket.ClientDealState) {
 		if state.PayloadCID.Equals(order.Root) {
-			switch event {
-			case retrievalmarket.ClientEventError:
+			switch state.Status {
+			case retrievalmarket.DealStatusFailed, retrievalmarket.DealStatusErrored:
 				retrievalResult <- xerrors.Errorf("Retrieval Error: %s", state.Message)
-			case retrievalmarket.ClientEventComplete:
+			case retrievalmarket.DealStatusCompleted:
 				retrievalResult <- nil
 			}
 		}

node/impl/full/state.go

@@ -77,7 +77,7 @@ func (a *StateAPI) StateMinerPower(ctx context.Context, maddr address.Address, t
 		if err != nil {
 			return api.MinerPower{}, err
 		}
-		if slashed != 0 {
+		if slashed {
 			mpow = types.NewInt(0)
 		}
 	}

node/impl/full/sync.go

@@ -4,6 +4,7 @@ import (
 	"context"
 
 	"github.com/filecoin-project/lotus/api"
+	"github.com/filecoin-project/lotus/build"
 	"github.com/filecoin-project/lotus/chain"
 	"github.com/filecoin-project/lotus/chain/types"
 	cid "github.com/ipfs/go-cid"
@@ -76,7 +77,7 @@ func (a *SyncAPI) SyncSubmitBlock(ctx context.Context, blk *types.BlockMsg) erro
 	}
 
 	// TODO: anything else to do here?
-	return a.PubSub.Publish("/fil/blocks", b)
+	return a.PubSub.Publish(build.MessagesTopic, b)
 }
 
 func (a *SyncAPI) SyncIncomingBlocks(ctx context.Context) (<-chan *types.BlockHeader, error) {