Merge branch 'release/v1.18.1' into sbansal/merge_from_1.18.1

CHANGELOG.md

@@ -112,6 +112,26 @@ Contributors
 | Rob Quist | 1 | +3/-1 | 1 |
 | Jakub Sztandera | 1 | +1/-1 | 1 |
 
+
+# 1.18.1 / 2022-11-28
+
+This is a small OPTIONAL patch release for the mandatory v1.18.0 release that supports the Filecoin nv17 Shark Upgrade. 
+We highly recommend you to read the full [v1.18.0 release note](https://github.com/filecoin-project/lotus/releases/tag/v1.18.0) if you haven't already.
+
+Note to SPs:
+If you are running into issue with updating your miner node from an earlier release and is failing to restart your miner, check your `journalctl` and see if you noticed the following error:
+```
+New sector storage: <%d>
+Nov 19 15:03:43 g0lotus01 lotus-miner[<id>]: ERROR: creating node: starting node: could not build arguments for function "reflect".makeFuncStub (/usr/local/go/src/reflect/asm_amd64.s:28): failed to build *paths.Local: received non-nil error from function "reflect".makeFuncStub (/usr/local/go/src/reflect/asm_amd64.s:28): opening path /media/data1/lotusstorage: path with ID <%d> already opened: '<path>'
+```
+If so, this check is introduced via [#9032](https://github.com/filecoin-project/lotus/pull/9032), precisely this [line](https://github.com/filecoin-project/lotus/blame/master/storage/paths/local.go#L164-L166
+). It's added to prevents double-attaching paths given it's now possible to manipulate paths at runtime. Verify storage.json configs if you encounter this error or remove the undesired depulicated path as you see fit accordingly.
+
+## Bug Fixes
+
+- fix: cli: check found before dereferencing SectorInfo #9703
+>>>>>>> release/v1.18.1
+
 # 1.18.0 / 2022-11-15
 
 > ⚠️ **Please note that from Lotus v1.17.2&^ will require a Go-version of v1.18.1&^**

build/version.go

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

cmd/lotus-miner/sectors.go

@@ -919,12 +919,12 @@ var sectorsRenewCmd = &cli.Command{
 				}
 
 				si, found := activeSectorsInfo[abi.SectorNumber(id)]
-				if len(si.DealIDs) > 0 && cctx.Bool("only-cc") {
-					continue
-				}
 				if !found {
 					return xerrors.Errorf("sector %d is not active", id)
 				}
+				if len(si.DealIDs) > 0 && cctx.Bool("only-cc") {
+					continue
+				}
 
 				sis = append(sis, si)
 			}

documentation/en/cli-lotus-miner.md

@@ -7,7 +7,11 @@ USAGE:
    lotus-miner [global options] command [command options] [arguments...]
 
 VERSION:
+<<<<<<< HEAD
    1.19.0-rc2
+=======
+   1.18.1
+>>>>>>> release/v1.18.1
 
 COMMANDS:
    init     Initialize a lotus miner repo

documentation/en/cli-lotus-worker.md

@@ -7,7 +7,11 @@ USAGE:
    lotus-worker [global options] command [command options] [arguments...]
 
 VERSION:
+<<<<<<< HEAD
    1.19.0-rc2
+=======
+   1.18.1
+>>>>>>> release/v1.18.1
 
 COMMANDS:
    run         Start lotus worker

documentation/en/cli-lotus.md

@@ -7,7 +7,11 @@ USAGE:
    lotus [global options] command [command options] [arguments...]
 
 VERSION:
+<<<<<<< HEAD
    1.19.0-rc2
+=======
+   1.18.1
+>>>>>>> release/v1.18.1
 
 COMMANDS:
    daemon   Start a lotus daemon process