Merge branch 'main' into dependabot/go_modules/github.com/cosmos/ibc-…

…go/v8-8.2.0
osmosis-labs · Jun 9, 2024 · c441710 · c441710
2 parents 096db7c + e06bbc3
commit c441710
Show file tree

Hide file tree

Showing 24 changed files with 230 additions and 209 deletions.
diff --git a/.github/mergify.yml b/.github/mergify.yml
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -11,9 +11,9 @@ jobs:
     runs-on: ubuntu-latest
     name: build
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Setup go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v5
         with:
-          go-version: 1.21
+          go-version: 1.22
       - run: go build ./...
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -1,15 +1,15 @@
-name: 'CodeQL'
+name: "CodeQL"
 
 on:
   pull_request:
     paths:
-      - '**.go'
+      - "**.go"
   push:
     branches:
       - main
       - release/**
     paths:
-      - '**.go'
+      - "**.go"
 
 jobs:
   analyze:
@@ -22,15 +22,15 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
-      - uses: actions/setup-go@v3
+        uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
         with:
           go-version: 1.21
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
         uses: github/codeql-action/init@v2
         with:
-          languages: 'go'
+          languages: "go"
           queries: crypto-com/cosmos-sdk-codeql@main,security-and-quality
 
       - name: Build

diff --git a/.github/workflows/interchaintest.yaml b/.github/workflows/interchaintest.yaml
@@ -11,15 +11,15 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Login to DockerHub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Build and push
         id: build_push_image
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v5
         with:
           file: Dockerfile
           context: .
@@ -31,13 +31,13 @@ jobs:
     runs-on: ubuntu-latest
     needs: build-and-push-image
     steps:
-      - name: Set up Go 1.21
-        uses: actions/setup-go@v3
+      - name: Set up Go 1.22
+        uses: actions/setup-go@v5
         with:
-          go-version: 1.21
+          go-version: 1.22
 
       - name: checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - run: make ictest-basic
         env:
@@ -47,13 +47,13 @@ jobs:
     runs-on: ubuntu-latest
     needs: build-and-push-image
     steps:
-      - name: Set up Go 1.21
-        uses: actions/setup-go@v3
+      - name: Set up Go 1.22
+        uses: actions/setup-go@v5
         with:
-          go-version: 1.21
+          go-version: 1.22
 
       - name: checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - run: make ictest-ibc
         env:
@@ -63,13 +63,13 @@ jobs:
     runs-on: ubuntu-latest
     needs: build-and-push-image
     steps:
-      - name: Set up Go 1.21
-        uses: actions/setup-go@v3
+      - name: Set up Go 1.22
+        uses: actions/setup-go@v5
         with:
-          go-version: 1.21
+          go-version: 1.22
 
       - name: checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - run: make ictest-ibc-custom
         env:
@@ -79,13 +79,13 @@ jobs:
     runs-on: ubuntu-latest
     needs: build-and-push-image
     steps:
-      - name: Set up Go 1.21
-        uses: actions/setup-go@v3
+      - name: Set up Go 1.22
+        uses: actions/setup-go@v5
         with:
-          go-version: 1.21
+          go-version: 1.22
 
       - name: checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - run: make ictest-packet-forward
         env:
@@ -95,13 +95,13 @@ jobs:
     runs-on: ubuntu-latest
     needs: build-and-push-image
     steps:
-      - name: Set up Go 1.21
-        uses: actions/setup-go@v3
+      - name: Set up Go 1.22
+        uses: actions/setup-go@v5
         with:
-          go-version: 1.21
+          go-version: 1.22
 
       - name: checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - run: make ictest-host-zone-proposal
         env:
@@ -111,13 +111,13 @@ jobs:
     runs-on: ubuntu-latest
     needs: build-and-push-image
     steps:
-      - name: Set up Go 1.21
-        uses: actions/setup-go@v3
+      - name: Set up Go 1.22
+        uses: actions/setup-go@v5
         with:
-          go-version: 1.21
+          go-version: 1.22
 
       - name: checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - run: make ictest-query-osmosis-twap
         env:

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -13,12 +13,12 @@ jobs:
     name: lint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/setup-go@v3
+      - uses: actions/setup-go@v5
         with:
-          go-version: 1.21
-      - uses: actions/checkout@v3
+          go-version: 1.22
+      - uses: actions/checkout@v4
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v3
+        uses: golangci/golangci-lint-action@v5
         with:
           version: latest
           args: --timeout 15m
diff --git a/.github/workflows/push_docker_image.yml b/.github/workflows/push_docker_image.yml
@@ -19,17 +19,17 @@ on:
     types: [published, created, edited]
   push:
     tags:
-      - 'v[0-9]+.[0-9]+.[0-9]+' # ignore rc
+      - "v[0-9]+.[0-9]+.[0-9]+" # ignore rc
 jobs:
   feeapp-images:
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: Login to DockerHub
         uses: docker/login-action@v3
@@ -49,7 +49,7 @@ jobs:
           echo "PATCH_VERSION=$PATCH_VERSION" >> $GITHUB_ENV
       - name: Build and push
         id: build_push_image
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v5
         with:
           file: Dockerfile
           context: .

diff --git a/.github/workflows/push_protobuf_image.yml b/.github/workflows/push_protobuf_image.yml
@@ -4,7 +4,7 @@
 #
 # osmolabs/fa-proto-gen:commit-hash    # is pushed
 # osmolabs/fa-proto-gen:latest         # is updated
-# 
+#
 # All the images above have support for linux/amd64 and linux/arm64.
 
 name: Push Protogen Images
@@ -17,29 +17,24 @@ jobs:
   feeapp-images:
     runs-on: ubuntu-latest
     steps:
-      - 
-        name: Check out the repo
-        uses: actions/checkout@v3
-      - 
-        name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-      - 
-        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-      - 
-        name: Login to DockerHub
-        uses: docker/login-action@v2
+      - name: Check out the repo
+        uses: actions/checkout@v4
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Login to DockerHub
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - 
-        name: Build and push 
+      - name: Build and push
         id: build_push_image
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v5
         with:
           file: proto/Dockerfile
           context: .
           push: true
           platforms: linux/amd64,linux/arm64
           tags: |
-            osmolabs/fa-proto-gen:${{ github.sha }}
+            osmolabs/fa-proto-gen:${{ github.sha }}
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -12,9 +12,9 @@ jobs:
     name: test
     steps:
       - name: Install Go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v5
         with:
-          go-version: 1.21
+          go-version: 1.22
       - name: Checkout code
         uses: actions/checkout@v3
       - name: Test

diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-ARG GO_VERSION="1.21"
+ARG GO_VERSION="1.22"
 # --------------------------------------------------------
 # Builder
 # --------------------------------------------------------