Merge branch 'main' into tamjid/code-style

Author: gjermundgaraba

Makefile

@@ -335,13 +335,6 @@ benchmark:
 ###                                Linting                                  ###
 ###############################################################################
 
-#? setup-pre-commit: Set pre commit git hook
-setup-pre-commit:
-	@cp .git/hooks/pre-commit .git/hooks/pre-commit.bak 2>/dev/null || true
-	@echo "Installing pre-commit hook..."
-	@ln -sf ../../scripts/hooks/pre-commit.sh .git/hooks/pre-commit
-	@echo "Pre-commit hook was installed at .git/hooks/pre-commit"
-
 #? lint: Run golangci-lint on all modules
 lint:
 	@echo "--> Running linter"
@@ -352,10 +345,9 @@ lint-fix:
 	@echo "--> Running linter"
 	@./scripts/go-lint-all.sh --fix
 
-#? format: Run gofumpt and misspell
+#? format: Run gofumpt
 format:
-	find . -name '*.go' -type f -not -path "./vendor*" -not -path "*.git*" -not -path "./docs/client/statik/statik.go" -not -path "./tests/mocks/*" -not -name '*.pb.go' -not -name '*.pb.gw.go' | xargs gofumpt -w
-	find . -name '*.go' -type f -not -path "./vendor*" -not -path "*.git*" -not -path "./docs/client/statik/statik.go" -not -path "./tests/mocks/*" -not -name '*.pb.go' -not -name '*.pb.gw.go' | xargs misspell -w
+	find . -name '*.go' -type f -not -path "./vendor*" -not -path "*.git*" -not -path "./tests/mocks/*" -not -name '*.pb.go' -not -name '*.pb.gw.go' | xargs gofumpt -w
 .PHONY: format
 
 .PHONY: lint lint-fix format
@@ -364,7 +356,7 @@ format:
 ###                                Protobuf                                 ###
 ###############################################################################
 
-protoVer=0.14.0
+protoVer=0.17.0
 protoImageName=ghcr.io/cosmos/proto-builder:$(protoVer)
 protoImage=$(DOCKER) run --rm -v $(CURDIR):/workspace --workdir /workspace $(protoImageName)
 

e2e/ci-e2e-config.yaml

@@ -2,16 +2,16 @@
 # 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_C_TAG          | The tag used for chain C                  | N/A (optional; fallback to A)|
-# | CHAIN_D_TAG          | The tag used for chain D                  | N/A (optional; fallback to A)|
-# | CHAIN_BINARY         | The binary used in the container          | simd                         |
-# | RELAYER_TAG          | The tag used for the relayer              | 1.10.4                       |
-# | RELAYER_ID           | The type of relayer to use (rly/hermes)   | hermes                       |
+# | 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_C_TAG          | The tag used for chain C                  | N/A (optional; fallback to A) |
+# | CHAIN_D_TAG          | The tag used for chain D                  | N/A (optional; fallback to A) |
+# | CHAIN_BINARY         | The binary used in the container          | simd                          |
+# | RELAYER_TAG          | The tag used for the relayer              | luca_joss-update-docker-build |
+# | 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.
@@ -51,7 +51,7 @@ activeRelayer: hermes # override with RELAYER_ID
 relayers:
   - id: hermes
     image: ghcr.io/informalsystems/hermes
-    tag: "1.10.4"
+    tag: "luca_joss-update-docker-build" # v1.13.1 had to be built manually
   - id: rly
     image: ghcr.io/cosmos/relayer
     tag: "latest"

e2e/sample.config.extended.yaml

@@ -2,16 +2,16 @@
 # 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_C_TAG          | The tag used for chain C                  | Optional (fallback to A)     |
-# | CHAIN_D_TAG          | The tag used for chain D                  | Optional (fallback to A)     |
-# | CHAIN_BINARY         | The binary used in the container          | simd                         |
-# | RELAYER_TAG          | The tag used for the relayer              | 1.10.4                       |
-# | RELAYER_ID           | The type of relayer to use (rly/hermes)   | hermes                       |
+# | 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_C_TAG          | The tag used for chain C                  | Optional (fallback to A)      |
+# | CHAIN_D_TAG          | The tag used for chain D                  | Optional (fallback to A)      |
+# | CHAIN_BINARY         | The binary used in the container          | simd                          |
+# | RELAYER_TAG          | The tag used for the relayer              | luca_joss-update-docker-build |
+# | 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.

e2e/testsuite/testconfig.go

@@ -71,7 +71,7 @@ const (
 	defaultRlyTag = "latest"
 
 	// defaultHermesTag is the tag that will be used if no relayer tag is specified for hermes.
-	defaultHermesTag = "1.10.4"
+	defaultHermesTag = "luca_joss-update-docker-build" // v1.13.1 had to be built manually
 	// defaultChainTag is the tag that will be used for the chains if none is specified.
 	defaultChainTag = "main"
 	// defaultConfigFileName is the default filename for the config file that can be used to configure