Merge branch 'refs/heads/master' into examples-cleanup

# Conflicts:
#	examples/gno.land/r/demo/event/z1_filetest.gno

.dockerignore

@@ -1,7 +1,9 @@
 .dockerignore
 build/
 Dockerfile
-misc/
+misc/*
+!misc/loop/
+!misc/autocounterd/
 docker-compose.yml
 tests/docker-integration/
 

.github/golangci.yml

@@ -28,6 +28,7 @@ linters:
     - misspell # Misspelled English words in comments
     - makezero # Finds slice declarations with non-zero initial length
     - importas # Enforces consistent import aliases
+    - govet # same as 'go vet'
     - gosec # Security problems
     - gofmt # Whether the code was gofmt-ed
     - goimports # Unused imports

.github/workflows/autocounterd.yml

@@ -1,6 +1,9 @@
 name: autocounterd
 
 on:
+  pull_request:
+    branches:
+      - master
   push:
     paths:
       - misc/autocounterd
@@ -41,7 +44,6 @@ jobs:
       - name: Build and push
         uses: docker/build-push-action@v6
         with:
-          context: ./misc/autocounterd
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}

.github/workflows/benchmark-master-push.yml

@@ -34,9 +34,12 @@ jobs:
           go-version: "1.22.x"
 
       - name: Run benchmark
+        # add more benchmarks by adding additional lines for different packages;
+        # or modify the -bench regexp.
         run: |
-          go test -benchmem -bench=. ./... -run=^$ \
-          -cpu 1,2 -timeout 50m | tee benchmarks.txt
+          set -xeuo pipefail && (
+            go test ./gnovm/pkg/gnolang -bench='BenchmarkBenchdata' -benchmem -run='^$' -v -cpu=1,2
+          ) | tee benchmarks.txt
 
       - name: Download previous benchmark data
         uses: actions/cache@v4

.github/workflows/build_template.yml

@@ -12,14 +12,14 @@ jobs:
     generated:
         runs-on: ubuntu-latest
         steps:
+          - name: Checkout code
+            uses: actions/checkout@v4
+
           - name: Install Go
             uses: actions/setup-go@v5
             with:
               go-version: ${{ inputs.go-version }}
 
-          - name: Checkout code
-            uses: actions/checkout@v4
-
           - name: Check generated files are up to date
             working-directory: ${{ inputs.modulepath }}
             run: |

.github/workflows/gnoland.yml

@@ -13,5 +13,6 @@ jobs:
     uses: ./.github/workflows/main_template.yml
     with:
       modulepath: "gno.land"
+      tests-extra-args: "-coverpkg=github.com/gnolang/gno/gno.land/..."
     secrets:
       codecov-token: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/lint_template.yml

@@ -13,16 +13,16 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
       - name: Install Go
         uses: actions/setup-go@v5
         with:
           go-version: ${{ inputs.go-version }}
-      - name: Checkout code
-        uses: actions/checkout@v4
       - name: Lint
         uses: golangci/golangci-lint-action@v6
         with:
           working-directory: ${{ inputs.modulepath }}
           args:
             --config=${{ github.workspace }}/.github/golangci.yml
-          version: v1.59 # sync with misc/devdeps
+          version: v1.59 # sync with misc/devdeps

.github/workflows/main_template.yml

@@ -4,6 +4,9 @@ on:
             modulepath:
               required: true
               type: string
+            tests-extra-args:
+              required: false
+              type: string
         secrets:
           codecov-token:
             required: true
@@ -32,6 +35,7 @@ jobs:
             modulepath: ${{ inputs.modulepath }}
             tests-timeout: "30m"
             go-version: "1.22.x"
+            tests-extra-args: ${{ inputs.tests-extra-args }}
         secrets:
             codecov-token: ${{ secrets.codecov-token }}
-
+

.github/workflows/mod-tidy.yml

@@ -0,0 +1,26 @@
+name: Ensure go.mods are tidied
+
+on:
+  push:
+    branches:
+      - master
+  workflow_dispatch:
+  pull_request:
+
+jobs:
+  main:
+    name: Ensure go.mods are tidied
+    runs-on: ubuntu-latest
+    steps:
+      - name: Install Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: ${{ inputs.go-version }}
+
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Check go.mod files are up to date
+        working-directory: ${{ inputs.modulepath }}
+        run: |
+          make tidy VERIFY_MOD_SUMS=true

.github/workflows/portal-loop.yml

@@ -45,7 +45,6 @@ jobs:
       - name: Build and push
         uses: docker/build-push-action@v6
         with:
-          context: ./misc/loop
           target: portalloopd
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}

.github/workflows/releaser-master.yml

@@ -18,6 +18,8 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
+      - name: Create a dummy tag to avoid goreleaser failure
+        run: git tag v0.0.0 master
 
       - uses: actions/setup-go@v5
         with:
@@ -40,7 +42,7 @@ jobs:
         with:
           distribution: goreleaser-pro
           version: ~> v2
-          args: release --clean --snapshot --nightly --config ./.github/goreleaser.yaml
+          args: release --clean --nightly --config ./.github/goreleaser.yaml
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }}

.github/workflows/stale-bot.yml

@@ -0,0 +1,23 @@
+name: "Close stale PRs"
+on:
+  schedule:
+    - cron: "30 1 * * *"
+permissions:
+  pull-requests: write
+  issues: write
+
+jobs:
+  stale:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/stale@v9
+        with:
+          exempt-all-milestones: true
+          stale-pr-message: "This PR is stale because it has been open 3 months with no activity. Remove stale label or comment or this will be closed in 3 months."
+          close-pr-message: "This PR was closed because it has been stalled for 3 months with no activity."
+          days-before-pr-stale: 90
+          days-before-pr-close: 90
+          stale-issue-message: "This issue is stale because it has been open 6 months with no activity. Remove stale label or comment or this will be closed in 3 months."
+          close-issue-message: "This issue was closed because it has been stalled for 3 months with no activity."
+          days-before-issue-stale: 180
+          days-before-issue-close: 90

.github/workflows/test_template.yml

@@ -5,11 +5,14 @@ on:
               required: true
               type: string
             tests-timeout:
-                required: true
-                type: string
+              required: true
+              type: string
             go-version:
-                required: true
-                type: string
+              required: true
+              type: string
+            tests-extra-args:
+              required: false
+              type: string
         secrets:
            codecov-token:
              required: true
@@ -18,12 +21,12 @@ jobs:
     test:
         runs-on: ubuntu-latest
         steps:
+        - name: Checkout code
+          uses: actions/checkout@v4
         - name: Install Go
           uses: actions/setup-go@v5
           with:
-              go-version: ${{ inputs.go-version }}
-        - name: Checkout code
-          uses: actions/checkout@v4
+            go-version: ${{ inputs.go-version }}
         - name: Go test
           working-directory:  ${{ inputs.modulepath }}
           env:
@@ -42,7 +45,7 @@ jobs:
             # confusing and meticulous. There will be some improvements in Go
             # 1.23 regarding coverage, so we can use this as a workaround until
             # then.
-            go test -covermode=atomic -timeout ${{ inputs.tests-timeout }} -v ./... -test.gocoverdir=$GOCOVERDIR
+            go test -covermode=atomic -timeout ${{ inputs.tests-timeout }} ${{ inputs.tests-extra-args }} ./... -test.gocoverdir=$GOCOVERDIR
 
             # Print results
             (set +x; echo 'go coverage results:')
@@ -70,7 +73,7 @@ jobs:
     #     - name: Install Go
     #       uses: actions/setup-go@v5
     #       with:
-    #           go-version: ${{ inputs.go-version }}
+    #         go-version: ${{ inputs.go-version }}
     #     - name: Checkout code
     #       uses: actions/checkout@v4
     #     - name: Go race test

Dockerfile

@@ -10,11 +10,20 @@ RUN         --mount=type=cache,target=/root/.cache/go-build       go build -o ./
 RUN         --mount=type=cache,target=/root/.cache/go-build       go build -o ./build/gnoweb    ./gno.land/cmd/gnoweb
 RUN         --mount=type=cache,target=/root/.cache/go-build       go build -o ./build/gno       ./gnovm/cmd/gno
 
+# build misc binaries
+FROM        golang:1.22-alpine AS build-misc
+RUN         go env -w GOMODCACHE=/root/.cache/go-build
+WORKDIR     /gnoroot
+ENV         GNOROOT="/gnoroot"
+COPY        . ./
+RUN         --mount=type=cache,target=/root/.cache/go-build       go build -C ./misc/loop -o /gnoroot/build/portalloopd ./cmd
+RUN         --mount=type=cache,target=/root/.cache/go-build       go build -C ./misc/autocounterd -o /gnoroot/build/autocounterd ./cmd
+
 # Base image
 FROM        alpine:3.17 AS base
 WORKDIR     /gnoroot
 ENV         GNOROOT="/gnoroot"
-RUN         apk add ca-certificates
+RUN         apk add --no-cache ca-certificates
 CMD         [ "" ]
 
 # alpine images
@@ -47,6 +56,21 @@ COPY        --from=build-gno /opt/gno/src/gno.land/cmd/gnoweb /opt/gno/src/gnowe
 EXPOSE      8888
 ENTRYPOINT  ["/usr/bin/gnoweb"]
 
+# misc/loop
+FROM        docker AS portalloopd
+WORKDIR     /gnoroot
+ENV         GNOROOT="/gnoroot"
+RUN         apk add --no-cache ca-certificates bash curl jq
+COPY        --from=build-misc /gnoroot/build/portalloopd /usr/bin/portalloopd
+ENTRYPOINT  ["/usr/bin/portalloopd"]
+CMD         ["serve"]
+
+# misc/autocounterd
+FROM        base AS autocounterd
+COPY        --from=build-misc /gnoroot/build/autocounterd /usr/bin/autocounterd
+ENTRYPOINT  ["/usr/bin/autocounterd"]
+CMD         ["start"]
+
 # all, contains everything.
 FROM        base AS all
 COPY        --from=build-gno /gnoroot/build/* /usr/bin/

Dockerfile.release

@@ -1,3 +1,6 @@
+# This file is similar to Dockerfile, but assumes that the binaries have
+# already been created, and as such doesn't `go build` them.
+
 FROM alpine AS base
 
 ENV     GNOROOT="/gnoroot/"

Makefile

@@ -46,6 +46,7 @@ install.gnodev:
 	$(MAKE) --no-print-directory -C ./contribs/gnodev install
 	@printf "\033[0;32m[+] 'gnodev' has been installed. Read more in ./contribs/gnodev/\033[0m\n"
 
+
 # old aliases
 .PHONY: install_gnokey
 install_gnokey: install.gnokey

README.md

@@ -53,7 +53,7 @@ repository offers more resources to dig into. We are eager to see your first PR!
 
 * [examples](./examples) - Smart-contract examples and guides for new Gno developers.
 * [gnovm](./gnovm) - GnoVM and Gnolang.
-* [gno.land](./gno.land) - Gno.land blockchain and tools.
+* [gno.land](./gno.land) - gno.land blockchain and tools.
 * [tm2](./tm2) - Tendermint2.
 * [docs](./docs) - Official documentation, deployed under [docs.gno.land](https://docs.gno.land).
 * [contribs](./contribs) - Collection of enhanced tools for Gno.

contribs/gnodev/cmd/gnodev/setup_node.go

@@ -23,7 +23,7 @@ func setupDevNode(
 
 	if devCfg.txsFile != "" { // Load txs files
 		var err error
-		nodeConfig.InitialTxs, err = parseTxs(devCfg.txsFile)
+		nodeConfig.InitialTxs, err = gnoland.ReadGenesisTxs(ctx, devCfg.txsFile)
 		if err != nil {
 			return nil, fmt.Errorf("unable to load transactions: %w", err)
 		}
@@ -35,7 +35,13 @@ func setupDevNode(
 
 		// Override balances and txs
 		nodeConfig.BalancesList = state.Balances
-		nodeConfig.InitialTxs = state.Txs
+
+		stateTxs := state.Txs
+		nodeConfig.InitialTxs = make([]gnoland.TxWithMetadata, len(stateTxs))
+
+		for index, nodeTx := range stateTxs {
+			nodeConfig.InitialTxs[index] = nodeTx
+		}
 
 		logger.Info("genesis file loaded", "path", devCfg.genesisFile, "txs", len(nodeConfig.InitialTxs))
 	}

contribs/gnodev/go.mod

@@ -107,6 +107,6 @@ require (
 	google.golang.org/genproto/googleapis/api v0.0.0-20240822170219-fc7c04adadcd // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20240822170219-fc7c04adadcd // indirect
 	google.golang.org/grpc v1.65.0 // indirect
-	google.golang.org/protobuf v1.34.2 // indirect
+	google.golang.org/protobuf v1.35.1 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )