Merge branch 'main' into taztingo/1292-new-marker-supply

provenance-io · Sep 12, 2023 · 1027a8d · 1027a8d
2 parents b799176 + a37cd2d
commit 1027a8d
Show file tree

Hide file tree

Showing 5 changed files with 69 additions and 5 deletions.
diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml
@@ -0,0 +1,32 @@
+name: 'changelog'
+on:
+  pull_request:
+    types:
+      - opened
+      - synchronize
+      - reopened
+      - ready_for_review
+      - labeled
+      - unlabeled
+
+jobs:
+  changelog:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          # Depending on your needs, you can use a token that will re-trigger workflows
+          # See https://github.com/stefanzweifel/git-auto-commit-action#commits-of-this-action-do-not-trigger-new-workflow-runs
+          token: ${{ secrets.GITHUB_TOKEN }}
+
+      - uses: dangoslen/dependabot-changelog-helper@v3
+        with:
+          version: ${{ needs.setup.outputs.version }}
+          activationLabel: 'dependencies'
+          changelogPath: './CHANGELOG.md'
+
+      # This step is required for committing the changes to your branch. 
+      # See https://github.com/stefanzweifel/git-auto-commit-action#commits-of-this-action-do-not-trigger-new-workflow-runs 
+      - uses: stefanzweifel/git-auto-commit-action@v4
+        with:
+          commit_message: "Updated Changelog"
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -15,7 +15,6 @@ jobs:
   golangci:
     name: golangci-lint
     runs-on: ubuntu-latest
-    timeout-minutes: 6
     steps:
       - uses: actions/checkout@v4
       - uses: technote-space/[email protected]
@@ -29,12 +28,12 @@ jobs:
       - uses: actions/setup-go@v4
         if: env.GIT_DIFF
         with:
-          go-version: '1.20'
-      - uses: golangci/golangci-lint-action@v3.7.0
+          go-version: '1.21'
+      - uses: golangci/golangci-lint-action@v3
         if: env.GIT_DIFF
         with:
           # If you change this version, be sure to also change it in contrib/devtools/Makefile.
-          version: v1.52.2
+          version: v1.54
           args: --timeout 10m --out-${NO_FUTURE}format colored-line-number
           github-token: ${{ secrets.github_token }}
       - name: No Now Usage

diff --git a/.golangci.yml b/.golangci.yml
@@ -92,6 +92,11 @@ linters-settings:
           - github.com/CosmWasm/wasmd
           - github.com/CosmWasm/wasmvm/types
 
+          # used for interchain queries
+          - github.com/strangelove-ventures/async-icq/v6
+          - github.com/strangelove-ventures/async-icq/v6/types
+          - github.com/strangelove-ventures/async-icq/v6/keeper
+
           - github.com/gogo/protobuf
 
           - github.com/google/uuid
@@ -112,6 +117,7 @@ linters-settings:
           - github.com/spf13/viper
 
           - github.com/stretchr/testify/require # used by the test-utils shared toolkit
+          - github.com/stretchr/testify/assert
           - github.com/stretchr/testify/suite
 
           - github.com/tendermint/tendermint

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -63,6 +63,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
 * Removed the quicksilver upgrade handlers [PR 1648](https://github.com/provenance-io/provenance/pull/1648).
 * Bump cometbft to v0.34.29 (from v0.34.28) [PR 1649](https://github.com/provenance-io/provenance/pull/1649).
 * Add genesis/init for Marker module send deny list addresses. [#1660](https://github.com/provenance-io/provenance/issues/1660)
+* Add automatic changelog entries for dependabot. [#1674](https://github.com/provenance-io/provenance/issues/1674)
 
 ### Bug Fixes
 
@@ -81,6 +82,32 @@ Ref: https://keepachangelog.com/en/1.0.0/
   The command no longer has any `--include-<thing>` flags since they don't pertain to the `GetByAddr` query.
   The specific queries (e.g. `provenanced query metadata scope`) are still available with all appropriate flags.
 
+### Dependencies
+
+- Bump google.golang.org/grpc from 1.57.0 to 1.58.0 [PR 1672](https://github.com/provenance-io/provenance/pull/1672)
+- Bump crazy-max/ghaction-import-gpg from 5 to 6 [PR 1677](https://github.com/provenance-io/provenance/pull/1677)
+- Bump golang.org/x/text from 0.12.0 to 0.13.0 [PR 1667](https://github.com/provenance-io/provenance/pull/1667)
+- Bump actions/checkout from 3 to 4 [PR 1668](https://github.com/provenance-io/provenance/pull/1668)
+- Bump bufbuild/buf-breaking-action from 1.1.2 to 1.1.3 [PR 1663](https://github.com/provenance-io/provenance/pull/1663)
+- Bump cosmossdk.io/math from 1.0.1 to 1.1.2 [PR 1656](https://github.com/provenance-io/provenance/pull/1656)
+- Bump github.com/google/uuid from 1.3.0 to 1.3.1 [PR 1657](https://github.com/provenance-io/provenance/pull/1657)
+- Bump golangci/golangci-lint-action from 3.6.0 to 3.7.0 [PR 1651](https://github.com/provenance-io/provenance/pull/1651)
+- Bump bufbuild/buf-setup-action from 1.26.0 to 1.26.1 [PR 1650](https://github.com/provenance-io/provenance/pull/1650)
+- Bump cometbft to v0.34.29 (from v0.34.28) [PR 1649](https://github.com/provenance-io/provenance/pull/1649)
+- Bump golang.org/x/text from 0.11.0 to 0.12.0 [PR 1644](https://github.com/provenance-io/provenance/pull/1644)
+- Bump bufbuild/buf-setup-action from 1.25.1 to 1.26.0 [PR 1645](https://github.com/provenance-io/provenance/pull/1645)
+- Bump bufbuild/buf-setup-action from 1.25.0 to 1.25.1 [PR 1642](https://github.com/provenance-io/provenance/pull/1642)
+- Bump google.golang.org/grpc from 1.56.2 to 1.57.0 [PR 1635](https://github.com/provenance-io/provenance/pull/1635)
+- Bump github.com/rs/zerolog from 1.29.1 to 1.30.0 [PR 1639](https://github.com/provenance-io/provenance/pull/1639)
+- Bump bufbuild/buf-setup-action from 1.24.0 to 1.25.0 [PR 1632](https://github.com/provenance-io/provenance/pull/1632)
+- Bump bufbuild/buf-setup-action from 1.23.1 to 1.24.0 [PR 1631](https://github.com/provenance-io/provenance/pull/1631)
+- Bump github.com/cosmos/ibc-go/v6 from 6.1.1 to 6.2.0 [PR 1629](https://github.com/provenance-io/provenance/pull/1629)
+- Bump cosmossdk.io/errors from 1.0.0-beta.7 to 1.0.0 [PR 1628](https://github.com/provenance-io/provenance/pull/1628)
+- Bump google.golang.org/grpc from 1.56.1 to 1.56.2 [PR 1624](https://github.com/provenance-io/provenance/pull/1624)
+- Bump google.golang.org/protobuf from 1.30.0 to 1.31.0 [PR 1611](https://github.com/provenance-io/provenance/pull/1611)
+- Bump bufbuild/buf-setup-action from 1.22.0 to 1.23.1 [PR 1613](https://github.com/provenance-io/provenance/pull/1613)
+- Bump bufbuild/buf-setup-action from 1.21.0 to 1.22.0 [PR 1610](https://github.com/provenance-io/provenance/pull/1610)
+
 ---
 
 ## [v1.16.0](https://github.com/provenance-io/provenance/releases/tag/v1.16.0) - 2023-06-23

diff --git a/contrib/devtools/Makefile b/contrib/devtools/Makefile
@@ -90,7 +90,7 @@ tools-clean:
 	rm -f proto-tools-stamp tools-stamp
 
 # If you change this version, be sure to also change it in .github/workflows/lint.yml.
-GOLANGCI_LINT_VERSION = v1.52.2
+GOLANGCI_LINT_VERSION = v1.54.2
 golangci-lint: $(GOLANGCI_LINT)
 $(GOLANGCI_LINT):
 	@$(MAKE) golangci-lint-update