refactor: remove unnecessary deps from 08-wasm by reusing top level simapp binary

.github/workflows/build-simd-image-from-tag.yml

@@ -21,19 +21,28 @@ jobs:
    build-image-at-tag:
       runs-on: ubuntu-latest
       steps:
-         - uses: actions/checkout@v4
-           with:
+        - uses: actions/checkout@v4
+          with:
             ref: "${{ env.GIT_TAG }}"
             fetch-depth: 0
-         - name: Log in to the Container registry
-           uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567
-           with:
+        - uses: actions/setup-python@v5
+          with:
+             python-version: '3.10'
+        - name: Install dependencies
+          run: make python-install-deps
+        - name: Log in to the Container registry
+          uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567
+          with:
               registry: ${{ env.REGISTRY }}
               username: ${{ github.actor }}
               password: ${{ secrets.GITHUB_TOKEN }}
-         - name: Build image
-           run: |
+        - name: Build image
+          run: |
+            version="$(scripts/get-libwasm-version.py --get-version)"
+            checksum="$(scripts/get-libwasm-version.py --get-checksum)"
+
             # remove any `/` characters from the docker tag and replace them with a -
+            # this ensures the docker tag is valid.
             docker_tag="$(echo $GIT_TAG | sed 's/[^a-zA-Z0-9\.]/-/g')"
             docker build . -t "${REGISTRY}/${ORG}/${IMAGE_NAME}:${docker_tag}" --build-arg IBC_GO_VERSION=${{ inputs.ibc-go-version }}
             docker push "${REGISTRY}/${ORG}/${IMAGE_NAME}:${docker_tag}"

.github/workflows/build-wasm-simd-image-from-tag.yml

@@ -1,4 +1,6 @@
 name: Build Wasm Simd Image
+# starting ibc-go v10, simd can be reused for wasm images
+# this workflow can be deleted after support for v9 is dropped
 on:
   workflow_dispatch:
     inputs:

.github/workflows/docker.yml

@@ -33,6 +33,9 @@ jobs:
         context: .
         tags: ${{ steps.meta.outputs.tags }}
         build-args: |
+          version="$(scripts/get-libwasm-version.py --get-version)"
+          checksum="$(scripts/get-libwasm-version.py --get-checksum)"
+
           IBC_GO_VERSION=main
 
     - name: Test simd is runnable
@@ -52,4 +55,7 @@ jobs:
         push: true
         tags: ${{ steps.meta.outputs.tags }}
         build-args: |
+          version="$(scripts/get-libwasm-version.py --get-version)"
+          checksum="$(scripts/get-libwasm-version.py --get-checksum)"
+
           IBC_GO_VERSION=main

.github/workflows/e2e-manual-simd.yaml

@@ -18,6 +18,7 @@ on:
           - TestInterchainAccountsGovTestSuite
           - TestIncentivizedInterchainAccountsTestSuite
           - TestAuthzTransferTestSuite
+          - TestGrandpaTestSuite
       chain-image:
         description: 'The image to use for chain A'
         required: true
@@ -72,6 +73,7 @@ on:
         options:
           - rly
           - hermes
+          - hyperspace
       relayer-tag:
         description: 'The tag to use for the relayer'
         required: true

.github/workflows/e2e-manual-wasm-simd.yaml

@@ -1,4 +1,6 @@
 name: Manual WASM E2E (Simd)
+# starting ibc-go v10, simd can be reused for wasm images
+# this workflow can be deleted after support for v9 is dropped
 on:
   # when https://github.com/community/community/discussions/11795 is resolved
   # we will be able to dynamically build up the list of valid inputs.
@@ -16,6 +18,9 @@ on:
         required: true
         type: string
         default: "ghcr.io/cosmos/ibc-go-wasm-simd"
+        options:
+          - ghcr.io/cosmos/ibc-go-simd # for v10 and up
+          - ghcr.io/cosmos/ibc-go-wasm-simd
       chain-binary:
         description: 'Specify the chain binary to be used'
         required: true

.github/workflows/e2e-test-workflow-call.yml

@@ -72,11 +72,6 @@ on:
         required: false
         type: boolean
         default: false
-      build-and-push-docker-image-wasm:
-        description: 'Flag to specify if the wasm docker image should be built and pushed beforehand'
-        required: false
-        type: boolean
-        default: false
       upload-logs:
         description: 'Specify flag to indicate that logs should be uploaded on failure'
         required: false
@@ -86,7 +81,6 @@ on:
 env:
   REGISTRY: ghcr.io
   IMAGE_NAME: ibc-go-simd
-  IMAGE_NAME_WASM: ibc-go-wasm-simd
 
 jobs:
   # test-details exists to provide an easy way to see the inputs for the e2e test.
@@ -114,82 +108,50 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-        if: ${{ inputs.build-and-push-docker-image }}
-      - name: Log in to the Container registry
-        if: ${{ inputs.build-and-push-docker-image }}
-        uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Extract metadata (tags, labels) for Docker
-        if: ${{ inputs.build-and-push-docker-image }}
-        id: meta
-        uses: docker/metadata-action@8e5442c4ef9f78752691e2d8f8d19755c6f78e81
-        with:
-          images: ${{ env.REGISTRY }}/cosmos/${{ env.IMAGE_NAME }}
-
-      - name: Build and push Docker image
-        if: ${{ inputs.build-and-push-docker-image }}
-        uses: docker/build-push-action@4f58ea79222b3b9dc2c8bbdd6debcef730109a75
-        with:
-          context: .
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          build-args: |
-            IBC_GO_VERSION=${{ github.ref_name }}
-
-  docker-build-wasm:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        if: ${{ inputs.build-and-push-docker-image-wasm }}
-
+        if: ${{ inputs.build-and-push-docker-image }} 
       - uses: actions/setup-python@v5
-        if: ${{ inputs.build-and-push-docker-image-wasm }}
+        if: ${{ inputs.build-and-push-docker-image }}
         with:
           python-version: '3.10'
 
       - name: Install dependencies
-        if: ${{ inputs.build-and-push-docker-image-wasm }}
+        if: ${{ inputs.build-and-push-docker-image }}
         run: make python-install-deps
 
       - name: Determine Build arguments
-        if: ${{ inputs.build-and-push-docker-image-wasm }}
+        if: ${{ inputs.build-and-push-docker-image }}
         id: build-args
         run: |
           echo "version=$(scripts/get-libwasm-version.py --get-version)" >> $GITHUB_OUTPUT
           echo "checksum=$(scripts/get-libwasm-version.py --get-checksum)" >> $GITHUB_OUTPUT
 
       - name: Log in to the Container registry
-        if: ${{ inputs.build-and-push-docker-image-wasm }}
+        if: ${{ inputs.build-and-push-docker-image }}
         uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Extract metadata (tags, labels) for Docker
-        if: ${{ inputs.build-and-push-docker-image-wasm }}
+        if: ${{ inputs.build-and-push-docker-image }}
         id: meta
         uses: docker/metadata-action@8e5442c4ef9f78752691e2d8f8d19755c6f78e81
         with:
-          images: ${{ env.REGISTRY }}/cosmos/${{ env.IMAGE_NAME_WASM }}
+          images: ${{ env.REGISTRY }}/cosmos/${{ env.IMAGE_NAME }}
 
       - name: Build and push Docker image
-        if: ${{ inputs.build-and-push-docker-image-wasm }}
+        if: ${{ inputs.build-and-push-docker-image }}
         uses: docker/build-push-action@4f58ea79222b3b9dc2c8bbdd6debcef730109a75
         with:
           context: .
           push: true
           tags: ${{ steps.meta.outputs.tags }}
-          file: modules/light-clients/08-wasm/Dockerfile
           build-args: |
+            IBC_GO_VERSION=${{ github.ref_name }}
             LIBWASM_VERSION=${{ steps.build-args.outputs.version }}
             LIBWASM_CHECKSUM=${{ steps.build-args.outputs.checksum }}
 
-
   # dynamically build a matrix of test/test suite pairs to run.
   # this job runs a go tool located at cmd/build_test_matrix/main.go.
   # it walks the e2e/test directory in order to locate all test suite / test name
@@ -223,7 +185,6 @@ jobs:
     needs:
       - build-test-matrix
       - docker-build
-      - docker-build-wasm
     env:
       CHAIN_IMAGE: '${{ inputs.chain-image }}'
       CHAIN_A_TAG: '${{ inputs.chain-a-tag }}'
@@ -266,7 +227,6 @@ jobs:
     needs:
       - build-test-matrix
       - docker-build
-      - docker-build-wasm
     env:
       CHAIN_IMAGE: '${{ inputs.chain-image }}'
       CHAIN_A_TAG: '${{ inputs.chain-a-tag }}'
@@ -313,4 +273,4 @@ jobs:
         with:
           name: '${{ matrix.entrypoint }}-${{ matrix.test }}'
           path: e2e/diagnostics
-          retention-days: 5
+          retention-days: 5

.github/workflows/e2e-wasm.yaml

@@ -59,10 +59,10 @@ jobs:
     secrets: inherit
     with:
       # with each test, we build an image from the current code.
-      build-and-push-docker-image-wasm: true
+      build-and-push-docker-image: true
       # if the test fails, we upload logs so that we can download them from the UI.
       upload-logs: true
-      chain-image: ghcr.io/cosmos/ibc-go-wasm-simd
+      chain-image: ghcr.io/cosmos/ibc-go-simd
       # with regular tests, both images are the same.
       chain-a-tag: '${{ needs.determine-image-tag.outputs.simd-tag }}'
       chain-b-tag: '${{ needs.determine-image-tag.outputs.simd-tag }}'

.github/workflows/release-wasm.yml

@@ -1,5 +1,6 @@
 name: Build Wasm Docker Simapp
-
+# starting ibc-go v10, simd can be reused for wasm images
+# this workflow can be deleted after support for v9 is dropped
 on:
   workflow_dispatch:
     inputs:

.github/workflows/release.yml

@@ -37,6 +37,8 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+      - name: Install dependencies
+        run: make python-install-deps
 
       - name: Log in to the Container registry
         uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567
@@ -59,3 +61,6 @@ jobs:
           tags: ${{ steps.meta.outputs.tags }}
           build-args: |
             IBC_GO_VERSION=${{ github.ref_name }}
+            version="$(scripts/get-libwasm-version.py --get-version)"
+            checksum="$(scripts/get-libwasm-version.py --get-checksum)"
+

Dockerfile

@@ -1,12 +1,22 @@
 FROM golang:1.22-alpine3.20 as builder
+
 ARG IBC_GO_VERSION
+ARG LIBWASM_VERSION
+ARG LIBWASM_CHECKSUM
+
+# ensure the arguments are being specified for this image.
+RUN test -n "${IBC_GO_VERSION}"
+RUN test -n "${LIBWASM_VERSION}"
+RUN test -n "${LIBWASM_CHECKSUM}"
 
 RUN set -eux; apk add --no-cache git libusb-dev linux-headers gcc musl-dev make;
 
 ENV GOPATH=""
 
-# ensure the ibc go version is being specified for this image.
-RUN test -n "${IBC_GO_VERSION}"
+# Grab the static library and copy it to location that will be found by the linker flag `-lwasmvm_muslc`.
+ADD https://github.com/CosmWasm/wasmvm/releases/download/${LIBWASM_VERSION}/libwasmvm_muslc.x86_64.a /lib/libwasmvm_muslc.x86_64.a
+RUN sha256sum /lib/libwasmvm_muslc.x86_64.a | grep ${LIBWASM_CHECKSUM}
+RUN cp /lib/libwasmvm_muslc.x86_64.a /lib/libwasmvm_muslc.a
 
 # Copy relevant files before go mod download. Replace directives to local paths break if local
 # files are not copied before go mod download.
@@ -24,7 +34,7 @@ COPY go.sum .
 
 RUN go mod download
 
-RUN make build
+RUN cd simapp && GOOS=linux GOARCH=amd64 go build -mod=readonly -tags "netgo ledger muslc" -ldflags '-X github.com/cosmos/cosmos-sdk/version.Name=sim -X github.com/cosmos/cosmos-sdk/version.AppName=simd -X github.com/cosmos/cosmos-sdk/version.Version= -X github.com/cosmos/cosmos-sdk/version.Commit= -X "github.com/cosmos/cosmos-sdk/version.BuildTags=netgo ledger muslc," -w -s -linkmode=external -extldflags "-Wl,-z,muldefs -static"' -trimpath -o /go/build/ ./...
 
 FROM alpine:3.18
 ARG IBC_GO_VERSION

e2e/go.sum

@@ -188,8 +188,6 @@ cloud.google.com/go/workflows v1.6.0/go.mod h1:6t9F5h/unJz41YqfBmqSASJSXccBLtD1V
 cloud.google.com/go/workflows v1.7.0/go.mod h1:JhSrZuVZWuiDfKEFxU0/F1PQjmpnpcoISEXH2bcHC3M=
 cosmossdk.io/api v0.7.6 h1:PC20PcXy1xYKH2KU4RMurVoFjjKkCgYRbVAD4PdqUuY=
 cosmossdk.io/api v0.7.6/go.mod h1:IcxpYS5fMemZGqyYtErK7OqvdM0C8kdW3dq8Q/XIG38=
-cosmossdk.io/client/v2 v2.0.0-beta.5 h1:0LVv3nEByn//hFDIrYLs2WvsEU3HodOelh4SDHnA/1I=
-cosmossdk.io/client/v2 v2.0.0-beta.5/go.mod h1:4p0P6o0ro+FizakJUYS9SeM94RNbv0thLmkHRw5o5as=
 cosmossdk.io/collections v0.4.0 h1:PFmwj2W8szgpD5nOd8GWH6AbYNi1f2J6akWXJ7P5t9s=
 cosmossdk.io/collections v0.4.0/go.mod h1:oa5lUING2dP+gdDquow+QjlF45eL1t4TJDypgGd+tv0=
 cosmossdk.io/core v0.11.1 h1:h9WfBey7NAiFfIcUhDVNS503I2P2HdZLebJlUIs8LPA=
@@ -204,10 +202,6 @@ cosmossdk.io/math v1.3.0 h1:RC+jryuKeytIiictDslBP9i1fhkVm6ZDmZEoNP316zE=
 cosmossdk.io/math v1.3.0/go.mod h1:vnRTxewy+M7BtXBNFybkuhSH4WfedVAAnERHgVFhp3k=
 cosmossdk.io/store v1.1.1 h1:NA3PioJtWDVU7cHHeyvdva5J/ggyLDkyH0hGHl2804Y=
 cosmossdk.io/store v1.1.1/go.mod h1:8DwVTz83/2PSI366FERGbWSH7hL6sB7HbYp8bqksNwM=
-cosmossdk.io/x/circuit v0.1.1 h1:KPJCnLChWrxD4jLwUiuQaf5mFD/1m7Omyo7oooefBVQ=
-cosmossdk.io/x/circuit v0.1.1/go.mod h1:B6f/urRuQH8gjt4eLIXfZJucrbreuYrKh5CSjaOxr+Q=
-cosmossdk.io/x/evidence v0.1.1 h1:Ks+BLTa3uftFpElLTDp9L76t2b58htjVbSZ86aoK/E4=
-cosmossdk.io/x/evidence v0.1.1/go.mod h1:OoDsWlbtuyqS70LY51aX8FBTvguQqvFrt78qL7UzeNc=
 cosmossdk.io/x/feegrant v0.1.1 h1:EKFWOeo/pup0yF0svDisWWKAA9Zags6Zd0P3nRvVvw8=
 cosmossdk.io/x/feegrant v0.1.1/go.mod h1:2GjVVxX6G2fta8LWj7pC/ytHjryA6MHAJroBWHFNiEQ=
 cosmossdk.io/x/tx v0.13.5 h1:FdnU+MdmFWn1pTsbfU0OCf2u6mJ8cqc1H4OMG418MLw=

modules/light-clients/08-wasm/Dockerfile

@@ -18,14 +18,15 @@
 # Copy relevant files before go mod download. Replace directives to local paths break if local
 # files are not copied before go mod download.
 ADD internal internal
+ADD simapp simapp
 ADD testing testing
 ADD modules modules
 ADD LICENSE LICENSE
 
 COPY go.mod .
 COPY go.sum .
 
-WORKDIR /go/modules/light-clients/08-wasm
+WORKDIR /go/simapp
 
 RUN go mod download
 

modules/light-clients/08-wasm/go.mod

@@ -9,18 +9,12 @@ replace github.com/cosmos/ibc-go/v9 => ../../../
 replace github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7
 
 require (
-	cosmossdk.io/api v0.7.6
-	cosmossdk.io/client/v2 v2.0.0-beta.5
 	cosmossdk.io/collections v0.4.0
 	cosmossdk.io/core v0.11.1
 	cosmossdk.io/errors v1.0.1
 	cosmossdk.io/log v1.4.1
 	cosmossdk.io/math v1.3.0
 	cosmossdk.io/store v1.1.1
-	cosmossdk.io/tools/confix v0.1.2
-	cosmossdk.io/x/circuit v0.1.1
-	cosmossdk.io/x/evidence v0.1.1
-	cosmossdk.io/x/feegrant v0.1.1
 	cosmossdk.io/x/tx v0.13.5
 	cosmossdk.io/x/upgrade v0.1.4
 	github.com/CosmWasm/wasmvm/v2 v2.1.2
@@ -33,7 +27,6 @@ require (
 	github.com/grpc-ecosystem/grpc-gateway v1.16.0
 	github.com/spf13/cast v1.7.0
 	github.com/spf13/cobra v1.8.1
-	github.com/spf13/viper v1.19.0
 	github.com/stretchr/testify v1.9.0
 	google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1
 	google.golang.org/grpc v1.68.0
@@ -46,6 +39,7 @@ require (
 	cloud.google.com/go/compute/metadata v0.5.0 // indirect
 	cloud.google.com/go/iam v1.1.9 // indirect
 	cloud.google.com/go/storage v1.41.0 // indirect
+	cosmossdk.io/api v0.7.6 // indirect
 	cosmossdk.io/depinject v1.0.0 // indirect
 	filippo.io/edwards25519 v1.1.0 // indirect
 	github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect
@@ -76,8 +70,6 @@ require (
 	github.com/cosmos/iavl v1.2.0 // indirect
 	github.com/cosmos/ics23/go v0.11.0 // indirect
 	github.com/cosmos/ledger-cosmos-go v0.13.3 // indirect
-	github.com/creachadair/atomicfile v0.3.1 // indirect
-	github.com/creachadair/tomledit v0.0.24 // indirect
 	github.com/danieljoos/wincred v1.2.1 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0 // indirect
@@ -171,6 +163,7 @@ require (
 	github.com/sourcegraph/conc v0.3.0 // indirect
 	github.com/spf13/afero v1.11.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
+	github.com/spf13/viper v1.19.0 // indirect
 	github.com/subosito/gotenv v1.6.0 // indirect
 	github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d // indirect
 	github.com/tendermint/go-amino v0.16.0 // indirect