Merge pull request #8533 from filecoin-project/jen/v1522

chore: release: v1.15.2-rc2
filecoin-project · May 2, 2022 · ece51c5 · ece51c5
2 parents dcf6f64 + 48c5460
commit ece51c5
Show file tree

Hide file tree

Showing 29 changed files with 507 additions and 164 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,12 +1,11 @@
 version: 2.1
 orbs:
-  go: gotest/[email protected]
   aws-cli: circleci/[email protected]
 
 executors:
   golang:
     docker:
-      - image: circleci/golang:1.16.4
+      - image: cimg/go:1.17.9
     resource_class: 2xlarge
   ubuntu:
     docker:
@@ -25,8 +24,9 @@ executors:
 commands:
   install-deps:
     steps:
-      - go/install-ssh
-      - go/install: {package: git}
+      - run: |
+          sudo apt update
+          sudo apt install python-is-python3
   prepare:
     parameters:
       linux:
@@ -110,8 +110,12 @@ jobs:
     steps:
       - install-deps
       - prepare
-      - go/mod-tidy-check
-
+      - run: go mod tidy -v
+      - run:
+          name: Check git diff
+          command: |
+            git --no-pager diff go.mod go.sum
+            git --no-pager diff --quiet go.mod go.sum
   build-all:
     executor: golang
     steps:
@@ -188,9 +192,6 @@ jobs:
           command: make deps lotus
           no_output_timeout: 30m
       - download-params
-      - go/install-gotestsum:
-          gobin: $HOME/.local/bin
-          version: 0.5.2
       - run:
           name: go test
           environment:
@@ -215,8 +216,6 @@ jobs:
       - when:
           condition: << parameters.codecov-upload >>
           steps:
-            - go/install: {package: bash}
-            - go/install: {package: curl}
             - run:
                 shell: /bin/bash -eo pipefail
                 command: |
@@ -255,9 +254,6 @@ jobs:
                   cd extern/test-vectors
                   git fetch
                   git checkout origin/<< parameters.vectors-branch >>
-      - go/install-gotestsum:
-          gobin: $HOME/.local/bin
-          version: 0.5.2
       - run:
           name: install statediff globally
           command: |
@@ -370,8 +366,8 @@ jobs:
       - run:
           name: Install go
           command: |
-            curl -O https://dl.google.com/go/go1.16.4.darwin-amd64.pkg && \
-            sudo installer -pkg go1.16.4.darwin-amd64.pkg -target /
+            curl -O https://dl.google.com/go/go1.17.9.darwin-amd64.pkg && \
+            sudo installer -pkg go1.17.9.darwin-amd64.pkg -target /
       - run:
           name: Install pkg-config
           command: HOMEBREW_NO_AUTO_UPDATE=1 brew install pkg-config
@@ -512,9 +508,6 @@ jobs:
       executor:
         type: executor
         default: golang
-      golangci-lint-version:
-        type: string
-        default: 1.27.0
       concurrency:
         type: string
         default: '2'
@@ -533,13 +526,10 @@ jobs:
       - run:
           command: make deps
           no_output_timeout: 30m
-      - go/install-golangci-lint:
-          gobin: $HOME/.local/bin
-          version: << parameters.golangci-lint-version >>
       - run:
           name: Lint
           command: |
-            $HOME/.local/bin/golangci-lint run -v --timeout 2m \
+            golangci-lint run -v --timeout 2m \
               --concurrency << parameters.concurrency >> << parameters.args >>
   lint-all:
     <<: *lint

diff --git a/.circleci/template.yml b/.circleci/template.yml
@@ -1,12 +1,11 @@
 version: 2.1
 orbs:
-  go: gotest/[email protected]
   aws-cli: circleci/[email protected]
 
 executors:
   golang:
     docker:
-      - image: circleci/golang:1.16.4
+      - image: cimg/go:1.17.9
     resource_class: 2xlarge
   ubuntu:
     docker:
@@ -25,8 +24,9 @@ executors:
 commands:
   install-deps:
     steps:
-      - go/install-ssh
-      - go/install: {package: git}
+      - run: |
+          sudo apt update
+          sudo apt install python-is-python3
   prepare:
     parameters:
       linux:
@@ -110,8 +110,12 @@ jobs:
     steps:
       - install-deps
       - prepare
-      - go/mod-tidy-check
-
+      - run: go mod tidy -v
+      - run:
+          name: Check git diff
+          command: |
+            git --no-pager diff go.mod go.sum
+            git --no-pager diff --quiet go.mod go.sum
   build-all:
     executor: golang
     steps:
@@ -188,9 +192,6 @@ jobs:
           command: make deps lotus
           no_output_timeout: 30m
       - download-params
-      - go/install-gotestsum:
-          gobin: $HOME/.local/bin
-          version: 0.5.2
       - run:
           name: go test
           environment:
@@ -215,8 +216,6 @@ jobs:
       - when:
           condition: << parameters.codecov-upload >>
           steps:
-            - go/install: {package: bash}
-            - go/install: {package: curl}
             - run:
                 shell: /bin/bash -eo pipefail
                 command: |
@@ -255,9 +254,6 @@ jobs:
                   cd extern/test-vectors
                   git fetch
                   git checkout origin/<< parameters.vectors-branch >>
-      - go/install-gotestsum:
-          gobin: $HOME/.local/bin
-          version: 0.5.2
       - run:
           name: install statediff globally
           command: |
@@ -370,8 +366,8 @@ jobs:
       - run:
           name: Install go
           command: |
-            curl -O https://dl.google.com/go/go1.16.4.darwin-amd64.pkg && \
-            sudo installer -pkg go1.16.4.darwin-amd64.pkg -target /
+            curl -O https://dl.google.com/go/go1.17.9.darwin-amd64.pkg && \
+            sudo installer -pkg go1.17.9.darwin-amd64.pkg -target /
       - run:
           name: Install pkg-config
           command: HOMEBREW_NO_AUTO_UPDATE=1 brew install pkg-config
@@ -512,9 +508,6 @@ jobs:
       executor:
         type: executor
         default: golang
-      golangci-lint-version:
-        type: string
-        default: 1.27.0
       concurrency:
         type: string
         default: '2'
@@ -533,13 +526,10 @@ jobs:
       - run:
           command: make deps
           no_output_timeout: 30m
-      - go/install-golangci-lint:
-          gobin: $HOME/.local/bin
-          version: << parameters.golangci-lint-version >>
       - run:
           name: Lint
           command: |
-            $HOME/.local/bin/golangci-lint run -v --timeout 2m \
+            golangci-lint run -v --timeout 2m \
               --concurrency << parameters.concurrency >> << parameters.args >>
   lint-all:
     <<: *lint

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -37,7 +37,7 @@ jobs:
 
     - uses: actions/setup-go@v1
       with:
-        go-version: '1.16.4'
+        go-version: '1.17.9'
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

diff --git a/.golangci.yml b/.golangci.yml
@@ -25,7 +25,7 @@ skip-dirs:
 
 issues:
   exclude:
-    - "func name will be used as test\\.Test.* by other packages, and that stutters; consider calling this"
+    - "by other packages, and that stutters; consider calling this"
     - "Potential file inclusion via variable"
     - "should have( a package)? comment"
     - "Error return value of `logging.SetLogLevel` is not checked"
@@ -37,6 +37,9 @@ issues:
     - "string .* has .* occurrences, make it a constant"
     - "a blank import should be only in a main or test package, or have a comment justifying it"
     - "package comment should be of the form"
+    - "Potential hardcoded credentials"
+    - "Use of weak random number generator"
+    - "xerrors.* is deprecated"
 
   exclude-use-default: false
   exclude-rules:
@@ -51,7 +54,7 @@ issues:
     - path: build/params_.*\.go
       linters:
         - golint
-          
+
     - path: api/apistruct/struct.go
       linters:
         - golint

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,8 +1,8 @@
 # Lotus changelog
 
-# 1.15.2-rc1 / 2022-04-13
+# 1.15.2-rc2 / 2022-04-26
 
-This is the first release candidate of the next highly recommended feature release v1.15.2. This feature release introduces many new features and  for SPs, including PoSt workers, sealing scheduler, snap deal queue and so on. 
+This is the second release candidate of the next highly recommended feature release v1.15.2. This feature release introduces many new features and  for SPs, including PoSt workers, sealing scheduler, snap deal queue and so on. 
 
 ## Highlights
 ### ❣️❣️❣️ PoSt Workers ❣️❣️❣️
@@ -84,9 +84,10 @@ The Filecoin Network introduced Snap Deal with the network v15 OhSnap upgrade, a
 - fix: miner cli: Estimate deal weight in sector list when upgrading ([filecoin-project/lotus#8336](https://github.com/filecoin-project/lotus/pull/8336))
 - fix: sealing: FinalizeSector doesn't need sealed replica access ([filecoin-project/lotus#8337](https://github.com/filecoin-project/lotus/pull/8337))
 - fix: cli: add ArgsUsage field to clientGetDealCmd ([filecoin-project/lotus#8241](https://github.com/filecoin-project/lotus/pull/8241))
-
+- fix: market: Infer index provider topic from network name by default #8533
+- 
 ## Dependency Updates
-- Update libp2p to v0.18.1 ([filecoin-project/lotus#8469](https://github.com/filecoin-project/lotus/pull/8469))
+- deps: update go-libp2p@v0.19 #8533
 - chore: ffi: update the FFI to update the FVM ([filecoin-project/lotus#8440](https://github.com/filecoin-project/lotus/pull/8440))
 - deps: ffi: pull ffi that includes the latest fvm ([filecoin-project/lotus#8424](https://github.com/filecoin-project/lotus/pull/8424))
 - Update to go-log 2.5.1 ([filecoin-project/lotus#8422](https://github.com/filecoin-project/lotus/pull/8422))
@@ -107,6 +108,7 @@ The Filecoin Network introduced Snap Deal with the network v15 OhSnap upgrade, a
 - Update Dockerfile.lotus
 - chore:sealing:remove endpoint from cli ([filecoin-project/lotus#8215](https://github.com/filecoin-project/lotus/pull/8215))
 - chore: build: bump the master version to v1.15.2-dev ([filecoin-project/lotus#8322](https://github.com/filecoin-project/lotus/pull/8322))
+- chore: fix lint issue #8533
 
 ## Contributors
 

diff --git a/Dockerfile.lotus b/Dockerfile.lotus
@@ -1,4 +1,4 @@
-FROM golang:1.16.4 AS builder-deps
+FROM golang:1.17.9-buster AS builder-deps
 MAINTAINER Lotus Development Team
 
 RUN apt-get update && apt-get install -y ca-certificates build-essential clang ocl-icd-opencl-dev ocl-icd-libopencl1 jq libhwloc-dev

diff --git a/Makefile b/Makefile
@@ -10,7 +10,7 @@ GOCC?=go
 GOVERSION:=$(shell $(GOCC) version | tr ' ' '\n' | grep go1 | sed 's/^go//' | awk -F. '{printf "%d%03d%03d", $$1, $$2, $$3}')
 ifeq ($(shell expr $(GOVERSION) \< 1016000), 1)
 $(warning Your Golang version is go$(shell expr $(GOVERSION) / 1000000).$(shell expr $(GOVERSION) % 1000000 / 1000).$(shell expr $(GOVERSION) % 1000))
-$(error Update Golang to version to at least 1.16.0)
+$(error Update Golang to version to at least 1.17.9)
 endif
 
 # git modules that need to be loaded

diff --git a/README.md b/README.md
@@ -71,10 +71,10 @@ For other distributions you can find the required dependencies [here.](https://d
 
 #### Go
 
-To build Lotus, you need a working installation of [Go 1.16.4 or higher](https://golang.org/dl/):
+To build Lotus, you need a working installation of [Go 1.17.9 or higher](https://golang.org/dl/):
 
 ```bash
-wget -c https://golang.org/dl/go1.16.4.linux-amd64.tar.gz -O - | sudo tar -xz -C /usr/local
+wget -c https://golang.org/dl/go1.17.9.linux-amd64.tar.gz -O - | sudo tar -xz -C /usr/local
 ```
 
 **TIP:**

diff --git a/build/openrpc/full.json.gz b/build/openrpc/full.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.15.2-rc1"
+const BuildVersion = "1.15.2-rc2"
 
 func UserVersion() string {
 	if os.Getenv("LOTUS_VERSION_IGNORE_COMMIT") == "1" {

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.15.2-rc1
+   1.15.2-rc2
 
 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.15.2-rc1
+   1.15.2-rc2
 
 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.15.2-rc1
+   1.15.2-rc2
 
 COMMANDS:
    daemon   Start a lotus daemon process

diff --git a/documentation/en/default-lotus-miner-config.toml b/documentation/en/default-lotus-miner-config.toml
@@ -291,11 +291,13 @@
   #EntriesChunkSize = 16384
 
   # TopicName sets the topic name on which the changes to the advertised content are announced.
-  # Defaults to '/indexer/ingest/mainnet' if not specified.
+  # If not explicitly specified, the topic name is automatically inferred from the network name
+  # in following format: '/indexer/ingest/<network-name>'
+  # Defaults to empty, which implies the topic name is inferred from network name.
   #
   # type: string
   # env var: LOTUS_INDEXPROVIDER_TOPICNAME
-  #TopicName = "/indexer/ingest/mainnet"
+  #TopicName = ""
 
   # PurgeCacheOnStart sets whether to clear any cached entries chunks when the provider engine
   # starts. By default, the cache is rehydrated from previously cached entries stored in