fix merge conflict

.github/workflows/nightly-e2e.yml

@@ -16,6 +16,25 @@ on:
     - cron: "0 3 * * *"
 
 jobs:
+  compatibility-test:
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+    steps:
+      - uses: actions/setup-go@v5
+        with:
+          go-version: "1.21"
+      - uses: actions/checkout@v4
+      - name: Checkout LFS objects
+        run: git lfs checkout
+      - name: Setup Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: "1.21" # The Go version to download (if necessary) and use.
+      - name: E2E compatibility test
+        # Run compatibility tests for different consumer (-cv) and provider (-pv) versions.
+        # Combination of all provider versions with consumer versions are tested.
+        # For new versions to be tested add/modify -pc/-cv parameters.
+        run: go run ./tests/e2e/... --tc compatibility -pv latest -pv v4.0.0 -pv v3.3.2-lsm -cv latest -cv v4.0.0 -cv v3.3.0
   happy-path-test:
     runs-on: ubuntu-latest
     timeout-minutes: 20

.github/workflows/test.yml

@@ -197,7 +197,38 @@ jobs:
         if: env.GIT_DIFF
         run: |
           make test-e2e-short
-  
+
+  test-e2e-compatibility:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          lfs: true
+      - name: checkout LFS objects
+        run: git lfs checkout
+      - uses: actions/setup-go@v5
+        with:
+          go-version: "1.21"
+          check-latest: true
+          cache: true
+          cache-dependency-path: go.sum
+      - uses: technote-space/get-diff-action@v6.1.2
+        id: git_diff
+        with:
+          PATTERNS: |
+            **/*.go
+            go.mod
+            go.sum
+            **/go.mod
+            **/go.sum
+            **/Makefile
+            Makefile
+            Dockerfile*
+      - name: e2e compatibility tests
+        if: env.GIT_DIFF
+        run: |
+          make test-e2e-compatibility-tests-latest
+
   test-cometmock:
     runs-on: ubuntu-latest
     steps:
@@ -228,7 +259,7 @@ jobs:
         if: env.GIT_DIFF
         run: |
           make test-e2e-short-cometmock
-  
+
   test-trace:
     runs-on: ubuntu-latest
     steps:

Dockerfile.combined

@@ -10,6 +10,10 @@
 ARG PROVIDER_IMAGE
 ARG CONSUMER_IMAGE
 
+# TRANSFORMER_IMAGE is the ICS image containing the version of the consumer executable to be used
+# to perform the transformation of the consumer genesis exported from the provider.
+ARG TRANSFORMER_IMAGE
+
 # The image from where the consumer implementation will be used
 # Defaults to
 FROM --platform=linux/amd64 ${PROVIDER_IMAGE} AS provider
@@ -26,6 +30,8 @@ FROM --platform=linux/amd64 ghcr.io/informalsystems/hermes:v1.8.0 AS hermes-buil
 # Get GoRelayer
 FROM ghcr.io/informalsystems/relayer-no-gas-sim:v2.3.0-rc4-no-gas-sim AS gorelayer-builder
 
+# Transformer
+FROM --platform=linux/amd64 ${TRANSFORMER_IMAGE} AS transformer
 
 FROM --platform=linux/amd64 fedora:39
 RUN dnf update -y
@@ -51,3 +57,5 @@ COPY --from=provider /usr/local/bin/cometmock /usr/local/bin
 
 # Copy in the hermes config
 ADD ./tests/e2e/testnet-scripts/hermes-config.toml /root/.hermes/config.toml
+
+COPY --from=transformer /usr/local/bin/interchain-security-cd /usr/local/bin/interchain-security-transformer

Makefile

@@ -2,6 +2,8 @@
 
 BRANCH := $(shell git rev-parse --abbrev-ref HEAD)
 COMMIT := $(shell git log -1 --format='%H')
+# Fetch tags and get the latest ICS version by filtering tags by vX.Y.Z and vX.Y.Z-lsm
+LATEST_RELEASE := $(shell git fetch; git tag -l --sort -v:refname 'v*.?' 'v*.?'-lsm 'v*.??' 'v*.??'-lsm | head -n 1)
 
 # don't override user values
 ifeq (,$(VERSION))
@@ -94,6 +96,10 @@ test-e2e-multi-consumer:
 test-e2e-parallel:
 	go run ./tests/e2e/... --include-multi-consumer --parallel
 
+# run E2E compatibility tests against latest release
+test-e2e-compatibility-tests-latest:
+	go run ./tests/e2e/... --tc compatibility -pv $(LATEST_RELEASE)
+
 # run full E2E tests in sequence (including multiconsumer) using latest tagged gaia
 test-gaia-e2e:
 	go run ./tests/e2e/... --include-multi-consumer --use-gaia

app/consumer/genesis.go

@@ -188,7 +188,7 @@ func transformToV2(jsonRaw []byte, ctx client.Context, removePreHashKey bool) (j
 
 	provider, err := ctx.Codec.MarshalJSON(&srcConGen.Provider)
 	if err != nil {
-		return nil, fmt.Errorf("unmarshalling 'Provider' failed: %v", err)
+		return nil, fmt.Errorf("marshalling 'Provider' failed: %v", err)
 	}
 	providerMap := map[string]json.RawMessage{}
 	if err := json.Unmarshal(provider, &providerMap); err != nil {

go.mod

@@ -24,22 +24,22 @@ require (
 	github.com/spf13/cobra v1.8.0
 	github.com/stretchr/testify v1.8.4
 	github.com/tidwall/gjson v1.17.1
-	golang.org/x/crypto v0.17.0 // indirect
+	golang.org/x/crypto v0.18.0 // indirect
 	golang.org/x/exp v0.0.0-20230711153332-06a737ee72cb
-	golang.org/x/net v0.19.0 // indirect
+	golang.org/x/net v0.20.0 // indirect
 	golang.org/x/sys v0.16.0 // indirect
-	google.golang.org/genproto v0.0.0-20240102182953-50ed04b92917 // indirect
-	google.golang.org/grpc v1.61.1
+	google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80 // indirect
+	google.golang.org/grpc v1.62.0
 	google.golang.org/protobuf v1.32.0
 	gopkg.in/yaml.v2 v2.4.0
 )
 
 require (
-	cloud.google.com/go v0.111.0 // indirect
+	cloud.google.com/go v0.112.0 // indirect
 	cloud.google.com/go/compute v1.23.3 // indirect
 	cloud.google.com/go/compute/metadata v0.2.3 // indirect
 	cloud.google.com/go/iam v1.1.5 // indirect
-	cloud.google.com/go/storage v1.30.1 // indirect
+	cloud.google.com/go/storage v1.36.0 // indirect
 	cosmossdk.io/api v0.3.1
 	cosmossdk.io/core v0.5.1 // indirect
 	cosmossdk.io/depinject v1.0.0-alpha.4 // indirect
@@ -78,21 +78,21 @@ require (
 	github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect
 	github.com/dvsekhvalnov/jose2go v1.6.0 // indirect
-	github.com/felixge/httpsnoop v1.0.2 // indirect
+	github.com/felixge/httpsnoop v1.0.4 // indirect
 	github.com/fsnotify/fsnotify v1.6.0 // indirect
 	github.com/go-kit/kit v0.12.0 // indirect
 	github.com/go-kit/log v0.2.1 // indirect
 	github.com/go-logfmt/logfmt v0.6.0 // indirect
 	github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect
 	github.com/gogo/googleapis v1.4.1 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
-	github.com/golang/glog v1.1.2 // indirect
+	github.com/golang/glog v1.2.0 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/snappy v0.0.4 // indirect
 	github.com/google/btree v1.1.2 // indirect
 	github.com/google/go-cmp v0.6.0
 	github.com/google/orderedcode v0.0.1 // indirect
-	github.com/google/uuid v1.4.0 // indirect
+	github.com/google/uuid v1.6.0 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
 	github.com/googleapis/gax-go/v2 v2.12.0 // indirect
 	github.com/gorilla/handlers v1.5.1 // indirect
@@ -154,10 +154,10 @@ require (
 	github.com/zondax/ledger-go v0.14.3 // indirect
 	go.etcd.io/bbolt v1.3.8 // indirect
 	go.opencensus.io v0.24.0 // indirect
-	golang.org/x/oauth2 v0.14.0 // indirect
-	golang.org/x/term v0.15.0 // indirect
+	golang.org/x/oauth2 v0.16.0 // indirect
+	golang.org/x/term v0.16.0 // indirect
 	golang.org/x/text v0.14.0 // indirect
-	google.golang.org/api v0.149.0 // indirect
+	google.golang.org/api v0.155.0 // indirect
 	google.golang.org/appengine v1.6.8 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
@@ -169,7 +169,8 @@ require (
 require (
 	github.com/informalsystems/itf-go v0.0.1
 	github.com/spf13/viper v1.16.0
-	google.golang.org/genproto/googleapis/api v0.0.0-20231212172506-995d672761c0
+	golang.org/x/mod v0.15.0
+	google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80
 )
 
 require (
@@ -180,20 +181,23 @@ require (
 	github.com/cockroachdb/pebble v1.0.0 // indirect
 	github.com/cockroachdb/redact v1.1.5 // indirect
 	github.com/getsentry/sentry-go v0.23.0 // indirect
-	github.com/go-logr/logr v1.2.4 // indirect
+	github.com/go-logr/logr v1.3.0 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/google/s2a-go v0.1.7 // indirect
 	github.com/kr/pretty v0.3.1 // indirect
 	github.com/kr/text v0.2.0 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/rogpeppe/go-internal v1.11.0 // indirect
 	github.com/rs/zerolog v1.32.0 // indirect
-	go.opentelemetry.io/otel v1.19.0 // indirect
-	go.opentelemetry.io/otel/metric v1.19.0 // indirect
-	go.opentelemetry.io/otel/trace v1.19.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1 // indirect
+	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 // indirect
+	go.opentelemetry.io/otel v1.21.0 // indirect
+	go.opentelemetry.io/otel/metric v1.21.0 // indirect
+	go.opentelemetry.io/otel/trace v1.21.0 // indirect
 	go.uber.org/mock v0.2.0 // indirect
-	golang.org/x/sync v0.5.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20240108191215-35c7eff3a6b1 // indirect
+	golang.org/x/sync v0.6.0 // indirect
+	golang.org/x/time v0.5.0 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect
 )
 
 // following versions might cause unexpected behavior