Merge branch 'marko/gomod_change' into damian/icahost-runtime-env

.golangci.yml

@@ -16,18 +16,16 @@ linters:
     - ineffassign
     - misspell
     - nakedret
+    - revive
     - staticcheck
-    - thelper
-    - typecheck
     - stylecheck
-    - revive
-    - typecheck
     - tenv
+    - thelper
+    - typecheck
     - unconvert
     # Prefer unparam over revive's unused param. It is more thorough in its checking.
     - unparam
     - unused
-    - misspell
 
 issues:
   exclude-rules:
@@ -37,6 +35,9 @@ issues:
     - text: "Use of weak random number generator"
       linters:
         - gosec
+    - text: "G115: integer overflow conversion"
+      linters:
+        - gosec
     - linters:
         - staticcheck
       text: "SA1019:" # silence errors on usage of deprecated funcs
@@ -56,6 +57,18 @@ linters-settings:
       - prefix(github.com/cometbft/cometbft)
       - prefix(github.com/cosmos/ibc-go)
     custom-order: true
+  gocritic:
+    disabled-checks:
+      - appendAssign
+  gosec:
+    # Available rules: https://github.com/securego/gosec#available-rules
+    excludes:
+      - G101 # Potential hardcoded credentials
+      - G107 # Potential HTTP request made with variable url
+      - G115 # Integer overflow conversion (used everywhere with int64 -> uint64 block height)
+      - G404 # Use of weak random number generator (math/rand instead of crypto/rand)
+    exclude-generated: true
+    confidence: medium
   revive:
     enable-all-rules: true
     # Do NOT whine about the following, full explanation found in:

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.23.2-alpine as builder
+FROM golang:1.23.3-alpine as builder
 ARG IBC_GO_VERSION
 
 RUN set -eux; apk add --no-cache git libusb-dev linux-headers gcc musl-dev make;

docs/versioned_docs/version-v6.3.x/04-migrations/06-v4-to-v5.md

@@ -336,7 +336,7 @@ The `MockEmptyAcknowledgement` type has been renamed to `EmptyAcknowledgement` (
 
 The `TestingApp` interface in `testing` has gone through some modifications:
 
-- The return type of the function `GetStakingKeeper` is not the concrete type `stakingkeeper.Keeper` anymore (where `stakingkeeper` is an import alias for `"cosmossdk.io/x/staking/keeper"`), but it has been changed to the interface `ibctestingtypes.StakingKeeper` (where `ibctestingtypes` is an import alias for `""github.com/cosmos/ibc-go/v5/testing/types"`). See this [PR](https://github.com/cosmos/ibc-go/pull/2028) for more details. The `StakingKeeper` interface is defined as:
+- The return type of the function `GetStakingKeeper` is not the concrete type `stakingkeeper.Keeper` anymore (where `stakingkeeper` is an import alias for `"github.com/cosmos/cosmos-sdk/x/staking/keeper"`), but it has been changed to the interface `ibctestingtypes.StakingKeeper` (where `ibctestingtypes` is an import alias for `""github.com/cosmos/ibc-go/v5/testing/types"`). See this [PR](https://github.com/cosmos/ibc-go/pull/2028) for more details. The `StakingKeeper` interface is defined as:
 
 ```go
 type StakingKeeper interface {

docs/versioned_docs/version-v7.8.x/03-light-clients/01-developer-guide/09-setup.md

@@ -44,7 +44,7 @@ func (AppModuleBasic) RegisterLegacyAminoCodec(*codec.LegacyAmino) {}
 
 // RegisterInterfaces registers module concrete types into protobuf Any. This allows core IBC
 // to unmarshal tendermint light client types.
-func (AppModuleBasic) RegisterInterfaces(registry coreregistry.InterfaceRegistrar) {
+func (AppModuleBasic) RegisterInterfaces(registry codectypes.InterfaceRegistry) {
   RegisterInterfaces(registry)
 }
 

docs/versioned_docs/version-v7.8.x/03-light-clients/04-wasm/05-governance.md

@@ -19,7 +19,7 @@ import (
   ...
   "github.com/cosmos/cosmos-sdk/runtime"
   authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
-  govtypes "cosmossdk.io/x/gov/types"
+  govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
 
   ibcwasmkeeper "github.com/cosmos/ibc-go/modules/light-clients/08-wasm/keeper"
   ibcwasmtypes "github.com/cosmos/ibc-go/modules/light-clients/08-wasm/types"

docs/versioned_docs/version-v7.8.x/05-migrations/06-v4-to-v5.md

@@ -336,7 +336,7 @@ The `MockEmptyAcknowledgement` type has been renamed to `EmptyAcknowledgement` (
 
 The `TestingApp` interface in `testing` has gone through some modifications:
 
-- The return type of the function `GetStakingKeeper` is not the concrete type `stakingkeeper.Keeper` anymore (where `stakingkeeper` is an import alias for `"cosmossdk.io/x/staking/keeper"`), but it has been changed to the interface `ibctestingtypes.StakingKeeper` (where `ibctestingtypes` is an import alias for `""github.com/cosmos/ibc-go/v5/testing/types"`). See this [PR](https://github.com/cosmos/ibc-go/pull/2028) for more details. The `StakingKeeper` interface is defined as:
+- The return type of the function `GetStakingKeeper` is not the concrete type `stakingkeeper.Keeper` anymore (where `stakingkeeper` is an import alias for `"github.com/cosmos/cosmos-sdk/x/staking/keeper"`), but it has been changed to the interface `ibctestingtypes.StakingKeeper` (where `ibctestingtypes` is an import alias for `""github.com/cosmos/ibc-go/v5/testing/types"`). See this [PR](https://github.com/cosmos/ibc-go/pull/2028) for more details. The `StakingKeeper` interface is defined as:
 
 ```go
 type StakingKeeper interface {

docs/versioned_docs/version-v8.5.x/03-light-clients/01-developer-guide/09-setup.md

@@ -44,7 +44,7 @@ func (AppModuleBasic) RegisterLegacyAminoCodec(*codec.LegacyAmino) {}
 
 // RegisterInterfaces registers module concrete types into protobuf Any. This allows core IBC
 // to unmarshal tendermint light client types.
-func (AppModuleBasic) RegisterInterfaces(registry coreregistry.InterfaceRegistrar) {
+func (AppModuleBasic) RegisterInterfaces(registry codectypes.InterfaceRegistry) {
   RegisterInterfaces(registry)
 }
 

docs/versioned_docs/version-v8.5.x/03-light-clients/04-wasm/05-governance.md

@@ -19,7 +19,7 @@ import (
   ...
   "github.com/cosmos/cosmos-sdk/runtime"
   authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
-  govtypes "cosmossdk.io/x/gov/types"
+  govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
 
   ibcwasmkeeper "github.com/cosmos/ibc-go/modules/light-clients/08-wasm/keeper"
   ibcwasmtypes "github.com/cosmos/ibc-go/modules/light-clients/08-wasm/types"

docs/versioned_docs/version-v8.5.x/05-migrations/06-v4-to-v5.md

@@ -336,7 +336,7 @@ The `MockEmptyAcknowledgement` type has been renamed to `EmptyAcknowledgement` (
 
 The `TestingApp` interface in `testing` has gone through some modifications:
 
-- The return type of the function `GetStakingKeeper` is not the concrete type `stakingkeeper.Keeper` anymore (where `stakingkeeper` is an import alias for `"cosmossdk.io/x/staking/keeper"`), but it has been changed to the interface `ibctestingtypes.StakingKeeper` (where `ibctestingtypes` is an import alias for `""github.com/cosmos/ibc-go/v5/testing/types"`). See this [PR](https://github.com/cosmos/ibc-go/pull/2028) for more details. The `StakingKeeper` interface is defined as:
+- The return type of the function `GetStakingKeeper` is not the concrete type `stakingkeeper.Keeper` anymore (where `stakingkeeper` is an import alias for `"github.com/cosmos/cosmos-sdk/x/staking/keeper"`), but it has been changed to the interface `ibctestingtypes.StakingKeeper` (where `ibctestingtypes` is an import alias for `""github.com/cosmos/ibc-go/v5/testing/types"`). See this [PR](https://github.com/cosmos/ibc-go/pull/2028) for more details. The `StakingKeeper` interface is defined as:
 
 ```go
 type StakingKeeper interface {

e2e/ci-e2e-config.yaml

@@ -2,17 +2,15 @@
 # Many of these fields can be overridden with environment variables.
 # All fields that support this have the corresponding environment variable name in a comment beside the field.
 
-
 # | Environment Variable | Description                               | Default Value                |
 # |----------------------|-------------------------------------------|------------------------------|
 # | CHAIN_IMAGE          | The image that will be used for the chain | ghcr.io/cosmos/ibc-go-simd   |
 # | CHAIN_A_TAG          | The tag used for chain A                  | N/A (must be set)            |
 # | CHAIN_B_TAG          | The tag used for chain B                  | N/A (must be set)            |
 # | CHAIN_BINARY         | The binary used in the container          | simd                         |
-# | RELAYER_TAG          | The tag used for the relayer              | 1.10.0                       |
+# | RELAYER_TAG          | The tag used for the relayer              | 1.10.4                       |
 # | RELAYER_ID           | The type of relayer to use (rly/hermes)   | hermes                       |
 
-
 # see sample.config.yaml for a bare minimum configuration example.
 # set env E2E_CONFIG_PATH to point to this file to use it.
 ---
@@ -37,7 +35,7 @@ activeRelayer: hermes # override with RELAYER_ID
 relayers:
   - id: hermes
     image: ghcr.io/informalsystems/hermes
-    tag: "1.10.0"
+    tag: "1.10.4"
   - id: rly
     image: ghcr.io/cosmos/relayer
     tag: "latest"