Merge pull request #9745 from filecoin-project/release/v1.18.1

build:release: v1.18.1
filecoin-project · Nov 29, 2022 · e68b8e9 · e68b8e9
2 parents bd10bdf + c32b8af
commit e68b8e9
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,23 @@
 # Lotus changelog
 
+# 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
+
 # 1.18.0 / 2022-11-15
 
 > ⚠️ **Please note that from Lotus v1.17.2&^ will require a Go-version of v1.18.1&^**

diff --git a/build/openrpc/full.json.gz b/build/openrpc/full.json.gz
diff --git a/build/openrpc/gateway.json.gz b/build/openrpc/gateway.json.gz
diff --git a/build/openrpc/miner.json.gz b/build/openrpc/miner.json.gz
diff --git a/build/openrpc/worker.json.gz b/build/openrpc/worker.json.gz
diff --git a/build/version.go b/build/version.go
@@ -37,7 +37,7 @@ func BuildTypeString() string {
 }
 
 // BuildVersion is the local build version
-const BuildVersion = "1.18.0"
+const BuildVersion = "1.18.1"
 
 func UserVersion() string {
 	if os.Getenv("LOTUS_VERSION_IGNORE_COMMIT") == "1" {

diff --git a/cmd/lotus-miner/sectors.go b/cmd/lotus-miner/sectors.go
@@ -918,12 +918,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)
 			}

diff --git a/documentation/en/cli-lotus-miner.md b/documentation/en/cli-lotus-miner.md
@@ -7,7 +7,7 @@ USAGE:
    lotus-miner [global options] command [command options] [arguments...]
 
 VERSION:
-   1.18.0
+   1.18.1
 
 COMMANDS:
    init     Initialize a lotus miner repo

diff --git a/documentation/en/cli-lotus-worker.md b/documentation/en/cli-lotus-worker.md
@@ -7,7 +7,7 @@ USAGE:
    lotus-worker [global options] command [command options] [arguments...]
 
 VERSION:
-   1.18.0
+   1.18.1
 
 COMMANDS:
    run         Start lotus worker

diff --git a/documentation/en/cli-lotus.md b/documentation/en/cli-lotus.md
@@ -7,7 +7,7 @@ USAGE:
    lotus [global options] command [command options] [arguments...]
 
 VERSION:
-   1.18.0
+   1.18.1
 
 COMMANDS:
    daemon   Start a lotus daemon process