Merge remote-tracking branch 'origin/master' into next

markets/storageadapter/client.go

@@ -415,7 +415,7 @@ func (c *ClientNodeAdapter) OnDealExpiredOrSlashed(ctx context.Context, dealID a
 		preds.OnDealStateChanged(
 			preds.DealStateChangedForIDs([]abi.DealID{dealID})))
 	match := func(oldTs, newTs *types.TipSet) (bool, events.StateChange, error) {
-		return dealDiff(ctx, oldTs, newTs)
+		return dealDiff(ctx, oldTs.Key(), newTs.Key())
 	}
 	if err := c.ev.StateChanged(checkFunc, stateChanged, revert, int(build.MessageConfidence)+1, build.SealRandomnessLookbackLimit, match); err != nil {
 		return xerrors.Errorf("failed to set up state changed handler: %w", err)