chore: sdk 50 upgrade for wasm hooks (#166)

* updates * updates * updates * updates * bump ibc v8 deps * cleanup sdkmodule.go and wasm_hook.go * continue updating wasm hooks * continue working on ibc hooks for v50 * chore: update simapp to sdk 50 * chore: resolve conflict in other files * fix: nft module account not set * fix: add circuit keeper * existing test passes * fix lint * bump sdk and comet * remove an unused parameter * update go and linter version * Update packet-forward-middleware.yml --------- Co-authored-by: Aleksandr Bezobchuk <[email protected]> Co-authored-by: kienn6034 <[email protected]>
cosmos · May 22, 2024 · 66df072 · 66df072
1 parent ed0e92f
commit 66df072
Show file tree

Hide file tree

Showing 20 changed files with 1,323 additions and 1,335 deletions.
diff --git a/.github/workflows/async-icq.yml b/.github/workflows/async-icq.yml
@@ -2,12 +2,12 @@ name: async-icq
 on:
   pull_request:
     paths:
-      - 'modules/async-icq/**'
-      - '.github/workflows/async-icq.yml'
+      - "modules/async-icq/**"
+      - ".github/workflows/async-icq.yml"
 
 env:
   LINT_VERSION: v1.55.2
-  GO_VERSION: 1.21.0
+  GO_VERSION: 1.22.1
   WORKING_DIRECTORY: modules/async-icq
 
   HOST_TAR_PATH: /tmp/icq-host.tar
@@ -33,9 +33,9 @@ jobs:
           args: --timeout=5m
 
   test:
-      runs-on: ubuntu-latest
-      name: test
-      steps:
+    runs-on: ubuntu-latest
+    name: test
+    steps:
       - name: Install Go
         uses: actions/setup-go@v4
         with:
@@ -131,4 +131,4 @@ jobs:
           docker image ls -a
 
       - name: Run Test
-        run: make ${{ matrix.test }}
+        run: make ${{ matrix.test }}
diff --git a/.github/workflows/ibc-hooks.yml b/.github/workflows/ibc-hooks.yml
@@ -2,12 +2,12 @@ name: ibc-hooks
 on:
   pull_request:
     paths:
-      - 'modules/ibc-hooks/**'
-      - '.github/workflows/ibc-hooks.yml'
+      - "modules/ibc-hooks/**"
+      - ".github/workflows/ibc-hooks.yml"
 
 env:
-  LINT_VERSION: v1.55.2
-  GO_VERSION: 1.21.0
+  LINT_VERSION: v1.57.1
+  GO_VERSION: 1.22.1
   WORKING_DIRECTORY: modules/ibc-hooks
 
 jobs:
@@ -25,9 +25,9 @@ jobs:
           args: --timeout=5m
 
   test:
-      runs-on: ubuntu-latest
-      name: test
-      steps:
+    runs-on: ubuntu-latest
+    name: test
+    steps:
       - name: Install Go
         uses: actions/setup-go@v4
         with:
@@ -37,4 +37,5 @@ jobs:
 
       - name: Test
         run: go test ./...
-        working-directory: ${{ env.WORKING_DIRECTORY }}
+        working-directory: ${{ env.WORKING_DIRECTORY }}
+
diff --git a/.github/workflows/packet-forward-middleware.yml b/.github/workflows/packet-forward-middleware.yml
@@ -2,17 +2,17 @@ name: packet-forward-middleware
 on:
   pull_request:
     paths:
-      - 'middleware/packet-forward-middleware/**'
-      - '.github/workflows/packet-forward-middleware.yml'
+      - "middleware/packet-forward-middleware/**"
+      - ".github/workflows/packet-forward-middleware.yml"
 
 env:
-    LINT_VERSION: v1.55.2
-    GO_VERSION: 1.21.0
-    WORKING_DIRECTORY: middleware/packet-forward-middleware
+  LINT_VERSION: v1.57.1
+  GO_VERSION: 1.22.1
+  WORKING_DIRECTORY: middleware/packet-forward-middleware
 
-    DOCKER_TAG: pfm:local
-    TAR_PATH: /tmp/pfm-docker-image.tar
-    IMAGE_NAME: pfm-docker-image
+  DOCKER_TAG: pfm:local
+  TAR_PATH: /tmp/pfm-docker-image.tar
+  IMAGE_NAME: pfm-docker-image
 
 jobs:
   golangci:
@@ -29,9 +29,9 @@ jobs:
           args: --timeout=5m
 
   test:
-      runs-on: ubuntu-latest
-      name: test
-      steps:
+    runs-on: ubuntu-latest
+    name: test
+    steps:
       - name: Install Go
         uses: actions/setup-go@v4
         with:
@@ -105,4 +105,4 @@ jobs:
           docker image ls -a
 
       - name: Run Test
-        run: make ${{ matrix.test }}
+        run: make ${{ matrix.test }}
diff --git a/modules/ibc-hooks/README.md b/modules/ibc-hooks/README.md
@@ -194,9 +194,9 @@ Follow these steps to install the IBC hooks module. The following lines are all
 ```go
 // import (
     ...
-    ibchooks "github.com/cosmos/ibc-apps/modules/ibc-hooks/v7"
-	ibchookskeeper "github.com/cosmos/ibc-apps/modules/ibc-hooks/v7/keeper"
-	ibchookstypes "github.com/cosmos/ibc-apps/modules/ibc-hooks/v7/types"
+    ibchooks "github.com/cosmos/ibc-apps/modules/ibc-hooks/v8"
+	ibchookskeeper "github.com/cosmos/ibc-apps/modules/ibc-hooks/v8/keeper"
+	ibchookstypes "github.com/cosmos/ibc-apps/modules/ibc-hooks/v8/types"
     ...
 // )
 ```
@@ -359,4 +359,5 @@ Follow these steps to install the IBC hooks module. The following lines are all
 ```
 ## Tests
 
-Tests are included in the [tests folder](./tests/unit/testdata/counter/README.md).
+
+Tests are included in the [tests folder](./tests/unit/testdata/counter/README.md).
diff --git a/modules/ibc-hooks/client/cli/query.go b/modules/ibc-hooks/client/cli/query.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/cosmos/ibc-apps/modules/ibc-hooks/v7/keeper"
-	"github.com/cosmos/ibc-apps/modules/ibc-hooks/v7/types"
+	"github.com/cosmos/ibc-apps/modules/ibc-hooks/v8/keeper"
+	"github.com/cosmos/ibc-apps/modules/ibc-hooks/v8/types"
 	"github.com/spf13/cobra"
 
 	"github.com/cosmos/cosmos-sdk/client/flags"
@@ -16,7 +16,7 @@ import (
 func indexRunCmd(cmd *cobra.Command, args []string) error {
 	usageTemplate := `Usage:{{if .HasAvailableSubCommands}}
   {{.CommandPath}} [command]{{end}}
-  
+
 {{if .HasAvailableSubCommands}}Available Commands:{{range .Commands}}{{if .IsAvailableCommand}}
   {{rpad .Name .NamePadding }} {{.Short}}{{end}}{{end}}