Merge branch 'main' into feat/pfm-ibc-v10

cosmos · Feb 26, 2025 · 1273579 · 1273579
2 parents 8b4b114 + 56b9c5e
commit 1273579
Show file tree

Hide file tree

Showing 66 changed files with 876 additions and 675 deletions.
diff --git a/.github/workflows/rate-limiting.yml b/.github/workflows/rate-limiting.yml
@@ -19,14 +19,25 @@ jobs:
     name: Linter
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-
-      - name: golangci-lint
-        uses: golangci/golangci-lint-action@v2
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
+        with:
+          go-version: "1.23"
+          check-latest: true
+      - uses: technote-space/get-diff-action@v6.1.2
+        id: git_diff
         with:
-          version: ${{ env.LINT_VERSION }}
-          working-directory: ${{ env.WORKING_DIRECTORY }}
-          args: --timeout=5m
+          PATTERNS: |
+            **/*.go
+            go.mod
+            go.sum
+            **/go.mod
+            **/go.sum
+      - name: run linting
+        if: env.GIT_DIFF
+        run: |
+          cd ${{ env.WORKING_DIRECTORY }}
+          make lint
 
   test:
     runs-on: ubuntu-latest

diff --git a/modules/rate-limiting/Dockerfile b/modules/rate-limiting/Dockerfile
@@ -1,7 +1,7 @@
 # make local-image
 # docker run --rm -it rate-limiting:local q
 
-FROM golang:1.22-alpine3.18 as builder
+FROM golang:1.23-alpine3.21 AS builder
 
 RUN set -eux; apk add --no-cache git libusb-dev linux-headers gcc musl-dev make go;
 

diff --git a/modules/rate-limiting/Makefile b/modules/rate-limiting/Makefile
@@ -90,8 +90,13 @@ clean:
 gosec:
 	gosec -exclude-dir=deps -severity=high ./...
 
+golangci_lint_cmd=golangci-lint
+golangci_version=v1.60.1
+
 lint:
-	golangci-lint run
+	@echo "--> Running linter"
+	@go install github.com/golangci/golangci-lint/cmd/golangci-lint@$(golangci_version)
+	@$(golangci_lint_cmd) run --timeout=10m
 
 ###############################################################################
 ###                                Tests                                    ###

diff --git a/modules/rate-limiting/README.md b/modules/rate-limiting/README.md
@@ -20,9 +20,9 @@ To add the rate limit module, wire it up in `app.go` in line with the following
 
 // Import the rate limit module
 import (
-  "github.com/cosmos/ibc-apps/modules/rate-limiting/v8/ratelimit"
-  ratelimitkeeper "github.com/cosmos/ibc-apps/modules/rate-limiting/v8/ratelimit/keeper"
-  ratelimittypes "github.com/cosmos/ibc-apps/modules/rate-limiting/v8/ratelimit/types"
+  "github.com/cosmos/ibc-apps/modules/rate-limiting/v9/ratelimit"
+  ratelimitkeeper "github.com/cosmos/ibc-apps/modules/rate-limiting/v9/ratelimit/keeper"
+  ratelimittypes "github.com/cosmos/ibc-apps/modules/rate-limiting/v9/ratelimit/types"
 )
 
 ...

diff --git a/modules/rate-limiting/api/ratelimit/module/v1/module.pulsar.go b/modules/rate-limiting/api/ratelimit/module/v1/module.pulsar.go
diff --git a/modules/rate-limiting/api/ratelimit/v1/genesis.pulsar.go b/modules/rate-limiting/api/ratelimit/v1/genesis.pulsar.go
diff --git a/modules/rate-limiting/api/ratelimit/v1/params.pulsar.go b/modules/rate-limiting/api/ratelimit/v1/params.pulsar.go
diff --git a/modules/rate-limiting/api/ratelimit/v1/query.pulsar.go b/modules/rate-limiting/api/ratelimit/v1/query.pulsar.go
diff --git a/modules/rate-limiting/api/ratelimit/v1/ratelimit.pulsar.go b/modules/rate-limiting/api/ratelimit/v1/ratelimit.pulsar.go
diff --git a/modules/rate-limiting/api/ratelimit/v1/tx.pulsar.go b/modules/rate-limiting/api/ratelimit/v1/tx.pulsar.go
diff --git a/modules/rate-limiting/client/cli/query.go b/modules/rate-limiting/client/cli/query.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/cosmos/ibc-apps/modules/rate-limiting/v8/types"
+	"github.com/cosmos/ibc-apps/modules/rate-limiting/v9/types"
 	"github.com/spf13/cobra"
 
 	"github.com/cosmos/cosmos-sdk/client"

diff --git a/modules/rate-limiting/depinject.go b/modules/rate-limiting/depinject.go
@@ -1,9 +1,9 @@
 package ratelimit
 
 import (
-	modulev1 "github.com/cosmos/ibc-apps/modules/rate-limiting/v8/api/ratelimit/module/v1"
-	"github.com/cosmos/ibc-apps/modules/rate-limiting/v8/keeper"
-	"github.com/cosmos/ibc-apps/modules/rate-limiting/v8/types"
+	modulev1 "github.com/cosmos/ibc-apps/modules/rate-limiting/v9/api/ratelimit/module/v1"
+	"github.com/cosmos/ibc-apps/modules/rate-limiting/v9/keeper"
+	"github.com/cosmos/ibc-apps/modules/rate-limiting/v9/types"
 
 	"cosmossdk.io/core/appmodule"
 	"cosmossdk.io/core/store"

diff --git a/modules/rate-limiting/e2e/go.mod b/modules/rate-limiting/e2e/go.mod
@@ -8,7 +8,7 @@ replace (
 	github.com/ChainSafe/go-schnorrkel => github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d
 	github.com/ChainSafe/go-schnorrkel/1 => github.com/ChainSafe/go-schnorrkel v1.0.0
 	github.com/btcsuite/btcd => github.com/btcsuite/btcd v0.22.2 //indirect
-	github.com/cosmos/ibc-apps/modules/rate-limiting/v8 => ../
+	github.com/cosmos/ibc-apps/modules/rate-limiting/v9 => ../
 	github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1
 	github.com/vedhavyas/go-subkey => github.com/strangelove-ventures/go-subkey v1.0.7
 )