Merge branch 'master' of github.com:gnolang/gno into albttx/package-a…

…lready-in-cache

.github/golangci.yml

@@ -1,9 +1,20 @@
 run:
-  timeout: 5m
+  concurrency: 8
+  timeout: 10m
+  issue-exit-code: 1
   tests: true
   skip-dirs-use-default: true
+  modules-download-mode: readonly
+  allow-parallel-runners: false
+  go: ""
+
+output:
+  uniq-by-line: false
+  path-prefix: ""
+  sort-results: true
 
 linters:
+  fast: false
   disable-all: true
   enable:
     - whitespace # Tool for detection of leading and trailing whitespace
@@ -21,12 +32,11 @@ linters:
     - gofmt # Whether the code was gofmt-ed
     - goimports # Unused imports
     - goconst # Repeated strings that could be replaced by a constant
-    #- forcetypeassert # Finds forced type assertions
     - dogsled # Checks assignments with too many blank identifiers (e.g. x, , , _, := f())
-    #- dupl # Code clone detection
     - errname # Checks that sentinel errors are prefixed with the Err and error types are suffixed with the Error
     - errorlint # errorlint is a linter for that can be used to find code that will cause problems with the error wrapping scheme introduced in Go 1.13
     - gofumpt # Stricter gofmt
+    - unused # Checks Go code for unused constants, variables, functions and types
 
 linters-settings:
   gofmt:
@@ -42,9 +52,20 @@ linters-settings:
     checks: [ "all", "-ST1022", "-ST1003" ]
   errorlint:
     asserts: false
+  gocritic:
+    enabled-tags:
+      - diagnostic
+      - experimental
+      - opinionated
+      - performance
+      - style
 
 issues:
   whole-files: true
+  max-issues-per-linter: 0
+  max-same-issues: 0
+  new: false
+  fix: false
   exclude-rules:
     - path: _test\.go
       linters:

.github/workflows/contribs.yml

@@ -0,0 +1,35 @@
+name: contribs
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    paths:
+      - "contribs/**"
+      - ".github/workflows/contribs.yml"
+      - "gnovm/**.go"
+      - "gno.land/**.go"
+      - "tm2/**.go"
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
+jobs:
+  install:
+    strategy:
+      fail-fast: false
+      matrix:
+        goversion: # two latest versions
+          - "1.21.x"
+        program:
+          - "gnomd"
+    runs-on: ubuntu-latest
+    timeout-minutes: 5
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v4
+        with:
+          go-version: ${{ matrix.goversion }}
+      - run: make install ${{ matrix.program }}
+        working-directory: contribs

.github/workflows/examples.yml

@@ -73,3 +73,22 @@ jobs:
       - run: go run ./gnovm/cmd/gno lint --verbose ./examples/gno.land/r/gnoland
       - run: go run ./gnovm/cmd/gno lint --verbose ./examples/gno.land/r/system
     # TODO: track coverage
+  mod-tidy:
+    strategy:
+      fail-fast: false
+      matrix:
+        go-version: [ "1.21.x" ]
+        # unittests: TODO: matrix with contracts
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+    steps:
+      - uses: actions/setup-go@v4
+        with:
+          go-version: ${{ matrix.go-version }}
+      - uses: actions/checkout@v4
+      - run: |
+          GNO_CMD="$(pwd)/gnovm/cmd/gno"
+          # Find all directories containing gno.mod file
+          find ./examples -name "gno.mod" -execdir go run "$GNO_CMD" mod tidy \;
+          # Check if there are changes after running gno mod tidy
+          git diff --exit-code || (echo "Some gno.mod files are not tidy, please run 'make tidy'." && exit 1)

.github/workflows/gnoland.yml

@@ -60,9 +60,7 @@ jobs:
           - _test.gnoland
           - _test.gnokey
           - _test.pkgs
-          # XXX: test broken, should be rewritten to run an inmemory localnode
-          # Re-add to makefile when fixed. Tracked here: https://github.com/gnolang/gno/issues/1222
-          #- _test.gnoweb
+          - _test.gnoweb 
     runs-on: ubuntu-latest
     timeout-minutes: 15
     steps:
@@ -78,7 +76,7 @@ jobs:
           export LOG_DIR="${{ runner.temp }}/logs/test-${{ matrix.goversion }}-gnoland"
           make ${{ matrix.args }}
       - name: Upload Test Log
-        if: always()
+        if: always() 
         uses: actions/upload-artifact@v3
         with:
           name: logs-test-gnoland-go${{ matrix.goversion }}
@@ -101,7 +99,7 @@ jobs:
         uses: codecov/codecov-action@v3
         with:
           directory: ${{ runner.temp }}/coverage
-          token: ${{ secrets.CODECOV_TOKEN }}
+          token: ${{ secrets.CODECOV_TOKEN }} 
           fail_ci_if_error: ${{ github.repository == 'gnolang/gno' }}
 
   docker-integration:

.github/workflows/gnovm.yml

@@ -67,35 +67,68 @@ jobs:
           - _test.gnolang.other
     runs-on: ubuntu-latest
     timeout-minutes: 15
+    env:
+      COVERAGE_DIR: "/tmp/coverage"
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v4
         with:
           go-version: ${{ matrix.goversion }}
       - name: test
         working-directory: gnovm
+        env:
+          TXTARCOVERDIR: ${{ env.COVERAGE_DIR }}
         run: |
+          mkdir -p $COVERAGE_DIR
+
+          # Setup testing environements variables
           export GOPATH=$HOME/go
-          export GOTEST_FLAGS="-v -p 1 -timeout=30m -coverprofile=coverage.out -covermode=atomic"
+          export GOTEST_FLAGS="-v -p 1 -timeout=30m -covermode=atomic -test.gocoverdir=$COVERAGE_DIR" 
+
+          # Run target test
           make ${{ matrix.args }}
       - uses: actions/upload-artifact@v3
         if: ${{ runner.os == 'Linux' && matrix.goversion == '1.21.x' }}
         with:
           name: ${{runner.os}}-coverage-gnovm-${{ matrix.args}}-${{matrix.goversion}}
-          path: ./gnovm/coverage.out
+          path: ${{ env.COVERAGE_DIR }}
 
   upload-coverage:
     needs: test
     runs-on: ubuntu-latest
+    env:
+      COVERAGE_DATA: /tmp/coverage/coverage-raw
+      COVERAGE_OUTPUT: /tmp/coverage/coverage-out
+      COVERAGE_PROFILE: /tmp/coverage/coverage.txt
     steps:
-      - name: Download all previous coverage artifacts
+      - run: mkdir -p $COVERAGE_DATA $COVERAGE_OUTPUT
+      - name: Download all previous coverage data artifacts
         uses: actions/download-artifact@v3
         with:
-          path: ${{ runner.temp }}/coverage
+          path: ${{ env.COVERAGE_DATA }}
+      - uses: actions/setup-go@v4
+        with:
+          go-version: "1.21.x"
+      - name: Merge coverages
+        working-directory: ${{ env.COVERAGE_DATA }}
+        run: |
+          # Create coverage directory list separate by comma
+          export COVERAGE_DIRS="$(ls | tr '\n' ',' | sed s/,$//)"
+
+          # Merge all coverage data directories from previous tests
+          go tool covdata merge -v 1 -i="$COVERAGE_DIRS" -o $COVERAGE_OUTPUT
+
+          # Print coverage percent for debug purpose if needed
+          echo 'coverage results:'
+          go tool covdata percent -i=$COVERAGE_OUTPUT
+
+          # Generate coverage profile
+          go tool covdata textfmt -v 1 -i=$COVERAGE_OUTPUT -o $COVERAGE_PROFILE
+
       - name: Upload combined coverage to Codecov
         uses: codecov/codecov-action@v3
         with:
-          directory: ${{ runner.temp }}/coverage
+          files: ${{ env.COVERAGE_PROFILE }}
           token: ${{ secrets.CODECOV_TOKEN }} 
           fail_ci_if_error: ${{ github.repository == 'gnolang/gno' }}
 

.github/workflows/misc.yml

@@ -71,8 +71,9 @@ jobs:
 
       - name: Check go.mods
         run: |
-          sums="$(sha256sum go.mod misc/devdeps/go.mod)"
-          for path in . ./misc/devdeps; do
+          gomods=$(find . -type f -name go.mod)
+          sums="$(sha256sum ${gomods})"
+          for path in $(dirname $(gomods)); do
             env -C $path go mod tidy -v || exit 1
           done
           echo "$sums" | sha256sum -c

.github/workflows/tm2.yml

@@ -55,7 +55,7 @@ jobs:
           - _test.pkg.bft
           - _test.pkg.others
     runs-on: ubuntu-latest
-    timeout-minutes: 15
+    timeout-minutes: 21
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v4
@@ -65,7 +65,7 @@ jobs:
         working-directory: tm2
         run: |
           export GOPATH=$HOME/go
-          export GOTEST_FLAGS="-v -p 1 -timeout=30m -coverprofile=coverage.out -covermode=atomic"
+          export GOTEST_FLAGS="-v -p 1 -timeout=20m -coverprofile=coverage.out -covermode=atomic"
           make ${{ matrix.args }}
           touch coverage.out
       - uses: actions/upload-artifact@v3

contribs/Makefile

@@ -0,0 +1,30 @@
+.PHONY: help
+help:
+	@echo "Available make commands:"
+	@cat Makefile | grep '^[a-z][^:]*:' | cut -d: -f1 | sort | sed 's/^/  /'
+
+.PHONY: install
+install: install.gnomd
+
+install.gnomd:; cd gnomd && go install .
+
+.PHONY: clean
+clean:
+	rm -rf build
+
+########################################
+# Dev tools
+rundep=go run -modfile ../misc/devdeps/go.mod
+
+.PHONY: fmt
+GOFMT_FLAGS ?= -w
+fmt:
+	$(rundep) mvdan.cc/gofumpt $(GOFMT_FLAGS) .
+
+########################################
+# Test suite
+GOTEST_FLAGS ?= -v -p 1 -timeout=30m
+
+.PHONY: test
+test:
+	@echo "nothing to do."

contribs/README.md

@@ -0,0 +1,17 @@
+# Gno Contribs
+
+This directory houses additional commands and tools designed to enhance your Gno experience.
+These tools can range from simple wrappers for `gno`, `gnoland`, and `gnokey` to complete applications.
+Some may be Go binaries with their own `go.mod` files, allowing the use of specialized libraries,
+while others may be shell scripts or programs written in different languages.
+
+## Contributing Guidelines
+
+If you'd like to contribute a tool to Gno Contribs, please follow these guidelines:
+
+1. **Naming**: Choose a clear and concise name for your tool, starting with one of the prefixes: `gno`, `gnoland`, or `gnokey`,
+   followed by a short descriptive word or abbreviation.
+   This naming convention helps users identify the purpose of the tool easily.
+
+2. **User-Friendly**: Ensure that your tool is user-friendly and follows a similar style to other Gno tools,
+   providing a consistent experience for users.

contribs/gnokeykc/README.md

@@ -0,0 +1,16 @@
+# `gnokeykc`
+
+`gnokeykc` is a Go-based CLI tool that enhances [`gnokey`](../../gno.land/cmd/gnokey) by integrating with your system's keychain. It adds `gnokey kc ...` subcommands to set and unset passwords in the keychain, allowing Gnokey to fetch passwords directly from the keychain instead of prompting for terminal input.
+
+## Usage
+
+    gnokey kc -h
+
+## Terminal Alias
+
+For ease of use, set up a terminal alias to replace `gnokey` with `gnokeykc`:
+
+    echo "alias gnokey='gnokeykc'" >> ~/.bashrc && source ~/.bashrc
+
+Now, `gnokey` commands will use `gnokeykc`, fetching passwords from the keychain.
+

contribs/gnokeykc/go.mod

@@ -0,0 +1,54 @@
+module github.com/gnolang/gno/contribs/gnokeykc
+
+go 1.20
+
+replace github.com/gnolang/gno => ../..
+
+require (
+	github.com/gnolang/gno v0.0.0-00010101000000-000000000000
+	github.com/zalando/go-keyring v0.2.3
+)
+
+require (
+	github.com/alessio/shellescape v1.4.1 // indirect
+	github.com/btcsuite/btcd v0.22.0-beta.0.20220111032746-97732e52810c // indirect
+	github.com/btcsuite/btcd/btcutil v1.0.0 // indirect
+	github.com/cespare/xxhash v1.1.0 // indirect
+	github.com/cespare/xxhash/v2 v2.1.1 // indirect
+	github.com/cockroachdb/apd v1.1.0 // indirect
+	github.com/danieljoos/wincred v1.2.0 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/dgraph-io/badger/v3 v3.2103.4 // indirect
+	github.com/dgraph-io/ristretto v0.1.1 // indirect
+	github.com/dustin/go-humanize v1.0.0 // indirect
+	github.com/gnolang/goleveldb v0.0.9 // indirect
+	github.com/gnolang/overflow v0.0.0-20170615021017-4d914c927216 // indirect
+	github.com/godbus/dbus/v5 v5.1.0 // indirect
+	github.com/gogo/protobuf v1.3.2 // indirect
+	github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b // indirect
+	github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6 // indirect
+	github.com/golang/protobuf v1.5.3 // indirect
+	github.com/golang/snappy v0.0.4 // indirect
+	github.com/google/flatbuffers v1.12.1 // indirect
+	github.com/gorilla/websocket v1.5.1 // indirect
+	github.com/jmhodges/levigo v1.0.0 // indirect
+	github.com/klauspost/compress v1.12.3 // indirect
+	github.com/libp2p/go-buffer-pool v0.1.0 // indirect
+	github.com/linxGnu/grocksdb v1.8.4 // indirect
+	github.com/pelletier/go-toml v1.9.5 // indirect
+	github.com/peterbourgon/ff/v3 v3.4.0 // indirect
+	github.com/pkg/errors v0.9.1 // indirect
+	github.com/rs/cors v1.10.1 // indirect
+	github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c // indirect
+	go.etcd.io/bbolt v1.3.7 // indirect
+	go.opencensus.io v0.22.5 // indirect
+	go.uber.org/atomic v1.7.0 // indirect
+	go.uber.org/multierr v1.9.0 // indirect
+	golang.org/x/crypto v0.14.0 // indirect
+	golang.org/x/mod v0.14.0 // indirect
+	golang.org/x/net v0.17.0 // indirect
+	golang.org/x/sys v0.13.0 // indirect
+	golang.org/x/term v0.13.0 // indirect
+	golang.org/x/tools v0.13.0 // indirect
+	google.golang.org/protobuf v1.31.0 // indirect
+)