Merge pull request #7371 from filecoin-project/jen/rc2

v1.11.3-rc2

CHANGELOG.md

@@ -1,13 +1,24 @@
 # Lotus changelog
 
-# v1.11.3-rc1 / 2021-09-08
+# v1.11.3-rc2 / 2021-09-21
 
-This is the first release candidate for lotus v1.11.3. Changelog will be updated later.
+This is the second release candidate for lotus v1.11.3. Detailed changelog will be updated upon final release.
 
 ## Changelog
 
 - github.com/filecoin-project/lotus:
-    - version bump v1.11.3-rc1
+  - bump lotus version to v1.11.3-rc2
+  - fix(deps): use go-graphsync v0.9.3 with hotfix
+  - feat(deps): update go-graphsync v0.9.2
+  - unit test where StateMarketStorageDeal return nil, err
+  - GetCurrentDealInfo err: handle correctly err case
+  - update to ffi to update-bellperson-proofs-v9-0-2 ([filecoin-project/lotus#7369](https://github.com/filecoin-project/lotus/pull/7369))
+  - fix bug for CommittedCapacitySectorLifetime ([filecoin-project/lotus#7337](https://github.com/filecoin-project/lotus/pull/7337))
+  - feat(ci): include version/cli checks in tagged releases ([filecoin-project/lotus#7331](https://github.com/filecoin-project/lotus/pull/7331))
+  - fix a panic in HandleRecoverDealIDs ([filecoin-project/lotus#7336](https://github.com/filecoin-project/lotus/pull/7336))
+  - build macOS CI ([filecoin-project/lotus#7307](https://github.com/filecoin-project/lotus/pull/7307))
+  - remove job to install jq
+  - v1.11.3-rc1 ([filecoin-project/lotus#7299](https://github.com/filecoin-project/lotus/pull/7299))
   - update to proof v0.9.2 ([filecoin-project/lotus#7297](https://github.com/filecoin-project/lotus/pull/7297))
   - Show deal sizes is sealing sectors ([filecoin-project/lotus#7261](https://github.com/filecoin-project/lotus/pull/7261))
   - docker entrypoint.sh missing variable escape character ([filecoin-project/lotus#7291](https://github.com/filecoin-project/lotus/pull/7291))
@@ -90,26 +101,15 @@ Contributors
 
 | Contributor | Commits | Lines ± | Files Changed |
 |-------------|---------|---------|---------------|
-| Łukasz Magiera | 38 | +3306/-1825 | 178 |
+| Łukasz Magiera | 39 | +3311/-1825 | 179 |
 | Steven Allen | 23 | +1935/-1417 | 84 |
 | dirkmc | 12 | +921/-732 | 111 |
 | Dirk McCormick | 12 | +663/-790 | 30 |
 | Hannah Howard | 3 | +482/-275 | 46 |
 | Travis Person | 1 | +317/-65 | 5 |
-| hannahhoward | 5 | +251/-50 | 12 |
-| Anton Evangelatov | 7 | +198/-37 | 17 |
+| hannahhoward | 7 | +257/-55 | 16 |
+| Anton Evangelatov | 9 | +258/-37 | 19 |
 | Raúl Kripalani | 4 | +127/-36 | 13 |
-| raulk | 1 | +43/-60 | 15 |
-| Aayush Rajasekaran | 4 | +74/-8 | 10 |
-| Frank | 2 | +68/-8 | 3 |
-| Adrian Lanzafame | 1 | +16/-2 | 1 |
-| Aarsh Shah | 2 | +11/-6 | 2 |
-| Jennifer Wang | 3 | +7/-7 | 9 |
-| ZenGround0 | 2 | +7/-6 | 2 |
-| KAYUII | 2 | +4/-4 | 2 |
-| lanzafame | 1 | +6/-0 | 1 |
-| Jacob Heun | 1 | +3/-3 | 1 |
-| frank | 1 | +4/-0 | 1 |
 
 # v1.11.2 / 2021-09-06
 

build/version.go

@@ -40,7 +40,7 @@ func buildType() string {
 }
 
 // BuildVersion is the local build version
-const BuildVersion = "1.11.3-rc1"
+const BuildVersion = "1.11.3-rc2"
 
 func UserVersion() string {
 	if os.Getenv("LOTUS_VERSION_IGNORE_COMMIT") == "1" {

documentation/en/cli-lotus-miner.md

@@ -7,7 +7,7 @@ USAGE:
    lotus-miner [global options] command [command options] [arguments...]
 
 VERSION:
-   1.11.3-rc1
+   1.11.3-rc2
 
 COMMANDS:
    init     Initialize a lotus miner repo

documentation/en/cli-lotus-worker.md

@@ -7,7 +7,7 @@ USAGE:
    lotus-worker [global options] command [command options] [arguments...]
 
 VERSION:
-   1.11.3-rc1
+   1.11.3-rc2
 
 COMMANDS:
    run         Start lotus worker

documentation/en/cli-lotus.md

@@ -7,7 +7,7 @@ USAGE:
    lotus [global options] command [command options] [arguments...]
 
 VERSION:
-   1.11.3-rc1
+   1.11.3-rc2
 
 COMMANDS:
    daemon   Start a lotus daemon process

extern/storage-sealing/states_failed.go

@@ -392,6 +392,7 @@ func (m *Sealing) HandleRecoverDealIDs(ctx Context, sector SectorInfo) error {
 		res, err := m.DealInfo.GetCurrentDealInfo(ctx.Context(), tok, dp, *p.DealInfo.PublishCid)
 		if err != nil {
 			failed[i] = xerrors.Errorf("getting current deal info for piece %d: %w", i, err)
+			continue
 		}
 
 		if res.MarketDeal == nil {

extern/storage-sealing/states_failed_test.go

@@ -3,6 +3,7 @@ package sealing_test
 import (
 	"bytes"
 	"context"
+	"errors"
 	"testing"
 
 	"github.com/golang/mock/gomock"
@@ -20,6 +21,64 @@ import (
 	"github.com/filecoin-project/lotus/extern/storage-sealing/mocks"
 )
 
+func TestStateRecoverDealIDsErredDealInfo(t *testing.T) {
+	mockCtrl := gomock.NewController(t)
+	defer mockCtrl.Finish()
+
+	ctx := context.Background()
+
+	api := mocks.NewMockSealingAPI(mockCtrl)
+
+	fakeSealing := &sealing.Sealing{
+		Api:      api,
+		DealInfo: &sealing.CurrentDealInfoManager{CDAPI: api},
+	}
+
+	sctx := mocks.NewMockContext(mockCtrl)
+	sctx.EXPECT().Context().AnyTimes().Return(ctx)
+
+	api.EXPECT().ChainHead(ctx).Times(1).Return(nil, abi.ChainEpoch(10), nil)
+
+	var dealId abi.DealID = 12
+	dealProposal := market.DealProposal{
+		PieceCID: idCid("newPieceCID"),
+	}
+
+	api.EXPECT().StateMarketStorageDealProposal(ctx, dealId, nil).Return(dealProposal, nil)
+
+	pc := idCid("publishCID")
+
+	// expect GetCurrentDealInfo
+	{
+		api.EXPECT().StateSearchMsg(ctx, pc).Return(&sealing.MsgLookup{
+			Receipt: sealing.MessageReceipt{
+				ExitCode: exitcode.Ok,
+				Return: cborRet(&market.PublishStorageDealsReturn{
+					IDs: []abi.DealID{dealId},
+				}),
+			},
+		}, nil)
+		api.EXPECT().StateMarketStorageDeal(ctx, dealId, nil).Return(nil, errors.New("deal may not have completed sealing or slashed"))
+	}
+
+	sctx.EXPECT().Send(sealing.SectorRemove{}).Return(nil)
+
+	err := fakeSealing.HandleRecoverDealIDs(sctx, sealing.SectorInfo{
+		Pieces: []sealing.Piece{
+			{
+				DealInfo: &api2.PieceDealInfo{
+					DealID:     dealId,
+					PublishCid: &pc,
+				},
+				Piece: abi.PieceInfo{
+					PieceCID: idCid("oldPieceCID"),
+				},
+			},
+		},
+	})
+	require.NoError(t, err)
+}
+
 func TestStateRecoverDealIDs(t *testing.T) {
 	mockCtrl := gomock.NewController(t)
 	defer mockCtrl.Finish()

go.mod

@@ -77,7 +77,7 @@ require (
 	github.com/ipfs/go-ds-pebble v0.0.2-0.20200921225637-ce220f8ac459
 	github.com/ipfs/go-filestore v1.0.0
 	github.com/ipfs/go-fs-lock v0.0.6
-	github.com/ipfs/go-graphsync v0.9.1
+	github.com/ipfs/go-graphsync v0.9.3
 	github.com/ipfs/go-ipfs-blockstore v1.0.4
 	github.com/ipfs/go-ipfs-blocksutil v0.0.1
 	github.com/ipfs/go-ipfs-chunker v0.0.5

go.sum

@@ -651,8 +651,9 @@ github.com/ipfs/go-graphsync v0.1.0/go.mod h1:jMXfqIEDFukLPZHqDPp8tJMbHO9Rmeb9CE
 github.com/ipfs/go-graphsync v0.4.2/go.mod h1:/VmbZTUdUMTbNkgzAiCEucIIAU3BkLE2cZrDCVUhyi0=
 github.com/ipfs/go-graphsync v0.4.3/go.mod h1:mPOwDYv128gf8gxPFgXnz4fNrSYPsWyqisJ7ych+XDY=
 github.com/ipfs/go-graphsync v0.9.0/go.mod h1:J62ahWT9JbPsFL2UWsUM5rOu0lZJ0LOIH1chHdxGGcw=
-github.com/ipfs/go-graphsync v0.9.1 h1:jo7ZaAZ3lal89RhKxKoRkPzIO8lmOY6KUWA1mDRZ2+U=
 github.com/ipfs/go-graphsync v0.9.1/go.mod h1:J62ahWT9JbPsFL2UWsUM5rOu0lZJ0LOIH1chHdxGGcw=
+github.com/ipfs/go-graphsync v0.9.3 h1:oWqUuN3OYqLwu669fxYbgymBrIodB0fD7vFZfF//X7Y=
+github.com/ipfs/go-graphsync v0.9.3/go.mod h1:J62ahWT9JbPsFL2UWsUM5rOu0lZJ0LOIH1chHdxGGcw=
 github.com/ipfs/go-hamt-ipld v0.1.1/go.mod h1:1EZCr2v0jlCnhpa+aZ0JZYp8Tt2w16+JJOAVz17YcDk=
 github.com/ipfs/go-ipfs-blockstore v0.0.1/go.mod h1:d3WClOmRQKFnJ0Jz/jj/zmksX0ma1gROTlovZKBmN08=
 github.com/ipfs/go-ipfs-blockstore v0.1.0/go.mod h1:5aD0AvHPi7mZc6Ci1WCAhiBQu2IsfTduLl+422H6Rqw=