Merge branch 'master' into hariom/addpkg-respect-gnomod

gnolang · Feb 19, 2024 · a4260fc · a4260fc
2 parents 089c861 + ee0880b
commit a4260fc
Show file tree

Hide file tree

Showing 77 changed files with 460 additions and 270 deletions.
diff --git a/.github/golangci.yml b/.github/golangci.yml
@@ -60,17 +60,6 @@ linters-settings:
       - opinionated
       - performance
       - style
-  gomodguard:
-    blocked:
-      modules:
-        - log/slog:
-            recommendations:
-              - golang.org/x/exp
-            reason: "the minimum go version for the monorepo is 1.20"
-      versions:
-        - go.uber.org/zap/exp:
-            version: "> 0.1.0"
-            reason: "this version of zap/exp is a requirement until we upgrade to go 1.21 (https://github.com/uber-go/zap/blob/master/exp/CHANGELOG.md)"
 
 issues:
   whole-files: true
@@ -86,4 +75,4 @@ issues:
         - goconst # Disabled linting of common mnemonics and test case strings
     - path: _\.gno
       linters:
-        - errorlint # Disabled linting of error comparisons, because of lacking std lib support
+        - errorlint # Disabled linting of error comparisons, because of lacking std lib support
diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
@@ -19,7 +19,7 @@ jobs:
         fetch-depth: 1
     - uses: actions/setup-go@v4
       with:
-        go-version: "1.21.x"
+        go-version: "1.22.x"
     - name: "gobenchdata publish: ${{ inputs.publish }}"
       run: go run go.bobheadxi.dev/gobenchdata@v1 action
       env:

diff --git a/.github/workflows/codegen.yml b/.github/workflows/codegen.yml
@@ -20,7 +20,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v4
         with:
-          go-version: 1.21.x
+          go-version: 1.22.x
 
       - name: Checkout code
         uses: actions/checkout@v4

diff --git a/.github/workflows/contribs.yml b/.github/workflows/contribs.yml
@@ -21,7 +21,7 @@ jobs:
       fail-fast: false
       matrix:
         goversion: # two latest versions
-          - "1.21.x"
+          - "1.22.x"
         program:
           - "gnomd"
           - "gnodev"

diff --git a/.github/workflows/db-tests.yml b/.github/workflows/db-tests.yml
@@ -21,8 +21,8 @@ jobs:
       fail-fast: false
       matrix:
         goversion:
-          - "1.20.x"
           - "1.21.x"
+          - "1.22.x"
         tags:
           - cleveldb
           - memdb

diff --git a/.github/workflows/dependabot-tidy.yml b/.github/workflows/dependabot-tidy.yml
@@ -20,7 +20,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v4
         with:
-          go-version: 1.21.x
+          go-version: 1.22.x
 
       - name: Tidy all Go mods
         env:

diff --git a/.github/workflows/examples.yml b/.github/workflows/examples.yml
@@ -22,8 +22,8 @@ jobs:
       fail-fast: false
       matrix:
         goversion:
-          - "1.20.x"
           - "1.21.x"
+          - "1.22.x"
     runs-on: ubuntu-latest
     timeout-minutes: 30
     steps:
@@ -38,8 +38,8 @@ jobs:
       fail-fast: false
       matrix:
         goversion:
-          - "1.20.x"
           - "1.21.x"
+          - "1.22.x"
         # unittests: TODO: matrix with contracts
     runs-on: ubuntu-latest
     timeout-minutes: 30
@@ -63,8 +63,8 @@ jobs:
       fail-fast: false
       matrix:
         goversion:
-          - "1.20.x"
           - "1.21.x"
+          - "1.22.x"
         # unittests: TODO: matrix with contracts
     runs-on: ubuntu-latest
     timeout-minutes: 10
@@ -84,7 +84,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        go-version: [ "1.21.x" ]
+        go-version: [ "1.22.x" ]
         # unittests: TODO: matrix with contracts
     runs-on: ubuntu-latest
     timeout-minutes: 10

diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml
@@ -23,7 +23,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v4
         with:
-          go-version: "1.21.x"
+          go-version: "1.22.x"
       - run: "cd misc/gendocs && make install gen"
       - uses: actions/configure-pages@v4
         id: pages

diff --git a/.github/workflows/gnoland.yml b/.github/workflows/gnoland.yml
@@ -28,8 +28,8 @@ jobs:
       fail-fast: false
       matrix:
         goversion:
-          - "1.20.x"
           - "1.21.x"
+          - "1.22.x"
         goarch: [ "amd64" ]
         goos: [ "linux" ]
         program:
@@ -53,8 +53,8 @@ jobs:
       fail-fast: false
       matrix:
         goversion:
-          - "1.20.x"
           - "1.21.x"
+          - "1.22.x"
         args:
           - _test.gnoland
           - _test.gnokey
@@ -82,7 +82,7 @@ jobs:
           export GOTEST_FLAGS="-v -p 1 -timeout=30m -coverprofile=coverage.out -covermode=atomic"
           make ${{ matrix.args }}
       - uses: actions/upload-artifact@v3
-        if: ${{ runner.os == 'Linux' && matrix.goversion == '1.21.x' }}
+        if: ${{ runner.os == 'Linux' && matrix.goversion == '1.22.x' }}
         with:
           name: ${{runner.os}}-coverage-gnoland-${{ matrix.args}}-${{matrix.goversion}}
           path: ./gno.land/coverage.out
@@ -115,6 +115,9 @@ jobs:
     timeout-minutes: 10
     steps:
       - uses: actions/checkout@v4
+      - uses: actions/setup-go@v4
+        with:
+          go-version: 1.22.x
       # TODO: setup docker caching
       - run: make test.docker
       - run: docker logs int_gnoland || true

diff --git a/.github/workflows/gnovm.yml b/.github/workflows/gnovm.yml
@@ -30,8 +30,8 @@ jobs:
       fail-fast: false
       matrix:
         goversion: # two latest versions
-          - "1.20.x"
           - "1.21.x"
+          - "1.22.x"
         goenv: # TODO: replace with pairs, so it's easier to read in the GH interface.
           - "GOARCH=amd64 GOOS=linux"
           - "GOARCH=wasm GOOS=js"
@@ -53,8 +53,8 @@ jobs:
       fail-fast: false
       matrix:
         goversion:
-          - "1.20.x"
           - "1.21.x"
+          - "1.22.x"
         args:
           - _test.cmd
           - _test.pkg
@@ -96,7 +96,7 @@ jobs:
           # Run target test
           make ${{ matrix.args }}
       - uses: actions/upload-artifact@v3
-        if: ${{ runner.os == 'Linux' && matrix.goversion == '1.21.x' }}
+        if: ${{ runner.os == 'Linux' && matrix.goversion == '1.22.x' }}
         with:
           name: ${{runner.os}}-coverage-gnovm-${{ matrix.args}}-${{matrix.goversion}}
           path: ${{ env.COVERAGE_DIR }}
@@ -122,7 +122,7 @@ jobs:
           path: ${{ env.COVERAGE_DATA }}
       - uses: actions/setup-go@v4
         with:
-          go-version: "1.21.x"
+          go-version: "1.22.x"
       - name: Merge coverages
         working-directory: ${{ env.COVERAGE_DATA }}
         run: |

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -19,7 +19,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v4
         with:
-          go-version: 1.21.x
+          go-version: 1.22.x
 
       - name: Lint
         uses: golangci/golangci-lint-action@v3
@@ -37,7 +37,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v4
         with:
-          go-version: 1.21.x
+          go-version: 1.22.x
 
       - name: Install make
         run: sudo apt-get install -y make
@@ -68,7 +68,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v4
         with:
-          go-version: 1.21.x
+          go-version: 1.22.x
 
       - name: Install make
         run: sudo apt-get install -y make

diff --git a/.github/workflows/misc.yml b/.github/workflows/misc.yml
@@ -27,7 +27,7 @@ jobs:
       fail-fast: false
       matrix:
         goversion:
-          - "1.21.x"
+          - "1.22.x"
         program:
           - "genstd"
     runs-on: ubuntu-latest
@@ -49,7 +49,7 @@ jobs:
       fail-fast: false
       matrix:
         goversion:
-          - "1.21.x"
+          - "1.22.x"
         args:
           - _test.genstd
     runs-on: ubuntu-latest

diff --git a/.github/workflows/tm2.yml b/.github/workflows/tm2.yml
@@ -26,8 +26,8 @@ jobs:
       fail-fast: false
       matrix:
         goversion:
-          - "1.20.x"
           - "1.21.x"
+          - "1.22.x"
         goarch: [ "amd64" ]
         goos: [ "linux" ]
         program: [ "./pkg/amino/cmd/aminoscan", "./pkg/amino/cmd/goscan", "./pkg/autofile/cmd", "./pkg/iavl/cmd/iaviewer" ]
@@ -48,8 +48,8 @@ jobs:
       fail-fast: false
       matrix:
         goversion:
-          - "1.20.x"
           - "1.21.x"
+          - "1.22.x"
         args:
           - _test.flappy
           - _test.pkg.amino
@@ -78,7 +78,7 @@ jobs:
           make ${{ matrix.args }}
           touch coverage.out
       - uses: actions/upload-artifact@v3
-        if: ${{ runner.os == 'Linux' && matrix.goversion == '1.21.x' }}
+        if: ${{ runner.os == 'Linux' && matrix.goversion == '1.22.x' }}
         with:
           name: ${{runner.os}}-coverage-tm2-${{ matrix.args}}-${{matrix.goversion}}
           path: ./tm2/coverage.out

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -56,7 +56,7 @@ The gno repository is primarily based on Go (Golang) and Gno.
 
 The primary tech stack for working on the repository:
 
-- Go (version 1.20+)
+- Go (version 1.21+)
 - make (for using Makefile configurations)
 
 It is recommended to work on a Unix environment, as most of the tooling is built around ready-made tools in Unix (WSL2

diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
 # build
-FROM        golang:1.21 AS build
+FROM        golang:1.22 AS build
 RUN         mkdir -p /opt/gno/src /opt/build
 WORKDIR     /opt/build
 ADD         go.mod go.sum ./

diff --git a/contribs/gnodev/go.mod b/contribs/gnodev/go.mod
@@ -1,14 +1,13 @@
 module github.com/gnolang/gno/contribs/gnodev
 
-go 1.20
+go 1.21
 
 replace github.com/gnolang/gno => ../..
 
 require (
 	github.com/fsnotify/fsnotify v1.7.0
 	github.com/gnolang/gno v0.0.0-00010101000000-000000000000
-	go.uber.org/zap v1.24.0
-	golang.org/x/exp v0.0.0-20240112132812-db7319d0e0e3
+	go.uber.org/zap v1.26.0
 	golang.org/x/term v0.16.0
 )
 
@@ -56,9 +55,8 @@ require (
 	github.com/zondax/ledger-go v0.14.3 // indirect
 	go.etcd.io/bbolt v1.3.8 // indirect
 	go.opencensus.io v0.22.5 // indirect
-	go.uber.org/atomic v1.10.0 // indirect
 	go.uber.org/multierr v1.10.0 // indirect
-	go.uber.org/zap/exp v0.1.0 // indirect
+	go.uber.org/zap/exp v0.2.0 // indirect
 	golang.org/x/crypto v0.18.0 // indirect
 	golang.org/x/mod v0.14.0 // indirect
 	golang.org/x/net v0.20.0 // indirect