Merge branch 'main' into adam/set-optimistic-execution

osmosis-labs · Nov 26, 2024 · 04d41a0 · 04d41a0
2 parents 671013f + e3f4a06
commit 04d41a0
Show file tree

Hide file tree

Showing 1,142 changed files with 37,137 additions and 15,204 deletions.
diff --git a/.github/mergify.yml b/.github/mergify.yml
@@ -183,3 +183,19 @@ pull_request_rules:
       backport:
         branches:
           - v25.x
+  - name: backport patches to v26.x branch
+    conditions:
+      - base=main
+      - label=A:backport/v26.x
+    actions:
+      backport:
+        branches:
+          - v26.x
+  - name: backport patches to v27.x branch
+    conditions:
+      - base=main
+      - label=A:backport/v27.x
+    actions:
+      backport:
+        branches:
+          - v27.x
diff --git a/.github/workflows/check-broken-links.yml b/.github/workflows/check-broken-links.yml
@@ -25,7 +25,7 @@ jobs:
 
       - name: Link Checker
         id: lychee
-        uses: lycheeverse/lychee-action@v1.10.0
+        uses: lycheeverse/lychee-action@v2.1.0
         with:
           args: --exclude-loopback --verbose --no-progress --max-concurrency 1 './**/*.md' './**/*.html'
         env:

diff --git a/.github/workflows/e2e-full.yml b/.github/workflows/e2e-full.yml
@@ -47,7 +47,7 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
       - name: Build e2e image
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           load: true
           context: .

diff --git a/.github/workflows/gen-upgrade-on-manual-input.yml b/.github/workflows/gen-upgrade-on-manual-input.yml
@@ -59,7 +59,7 @@ jobs:
 
       - name: Create PR
         if: env.MAJOR == 1
-        uses: peter-evans/create-pull-request@v6
+        uses: peter-evans/create-pull-request@v7
         with:
           token: ${{ secrets.COMMIT_TO_BRANCH }}
           title: "auto: code-gen upgrade handler ${{ env.input }}"

diff --git a/.github/workflows/generate-docs.yml b/.github/workflows/generate-docs.yml
@@ -46,7 +46,7 @@ jobs:
           make docs
 
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v6
+        uses: peter-evans/create-pull-request@v7
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           commit-message: Update docs

diff --git a/.github/workflows/pprof-auto.yml b/.github/workflows/pprof-auto.yml
@@ -0,0 +1,39 @@
+# This workflow triggers a pprof automation on new tag creation in the repository
+
+name: Trigger pprof automation
+
+# Controls when the workflow will run
+on:
+  push:
+    tags:
+      - '**'  # This workflow will trigger on any new tag push
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  # This workflow contains a single job called "build"
+  build:
+    # The type of runner that the job will run on
+    runs-on: ubuntu-latest
+
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+      # Triggers a repository dispatch event to initiate pprof automation
+      - name: Repository Dispatch
+        uses: peter-evans/repository-dispatch@v3
+        with:
+          token: ${{ secrets.GH_TOKEN }}
+          repository: ${{ secrets.PPROF_REPO }}  # Target repository for dispatch
+          event-type: new_tag_created  # Custom event type for dispatch
+          client-payload: >  # JSON payload with information for the triggered event
+            {
+              "triggered_by": "${{ github.repository }}",  # Repository that triggered the dispatch
+              "on_push_event": "true",  # Indicating that this was triggered by a push event
+              "commit_sha": "${{ github.sha }}",  # Commit SHA of the push
+              "branch": "${{ github.ref }}",  # Reference (branch or tag) of the push
+              "tag": "${{ github.ref_name }}",  # Name of the tag that triggered the push
+              "profile_type": "head",  # Profile type for pprof automation
+              "binary_version": "${{ github.ref_name }}",  # Binary version corresponding to the tag
+              "profile_duration": "7200",  # Duration of profiling in seconds
+              "osmosis_sdk_fork_hash": "",
+              "osmosis_comet_fork_hash": ""
+            }
diff --git a/.github/workflows/push-dev-docker-images.yml b/.github/workflows/push-dev-docker-images.yml
@@ -24,7 +24,7 @@ on:
       - v[0-9]+.x-iavl-v1
 
 env:
-  RUNNER_BASE_IMAGE_ALPINE: alpine:3.17
+  RUNNER_BASE_IMAGE_ALPINE: alpine:3.20
   OSMOSIS_DEV_IMAGE_REPOSITORY: osmolabs/osmosis-dev
   OSMOSIS_INIT_CHAIN_IMAGE_REPOSITORY: osmolabs/osmosis-e2e-init-chain
   OSMOSIS_DEV_IMAGE_COSMOVISOR_REPOSITORY: osmolabs/osmosis-dev-cosmovisor
@@ -39,6 +39,9 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
+      -
+        name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
       -
         name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
@@ -69,12 +72,12 @@ jobs:
           echo "OSMOSIS_VERSION=${{ github.ref_name }}-$SHORT_SHA" >> $GITHUB_ENV
       -
         name: Build and Push Docker Images
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           file: Dockerfile
           context: .
           push: true
-          platforms: linux/amd64
+          platforms: linux/amd64,linux/arm64
           build-args: |
             GO_VERSION=${{ env.GO_VERSION }}
             RUNNER_IMAGE=${{ env.RUNNER_BASE_IMAGE_ALPINE }}
@@ -84,25 +87,24 @@ jobs:
             ${{ env.OSMOSIS_DEV_IMAGE_REPOSITORY }}:${{ env.DOCKER_IMAGE_TAG }}
       -
         name: Build and Push E2E Init Docker Images
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           file: tests/e2e/initialization/init.Dockerfile
           context: .
           push: true
-          platforms: linux/amd64
+          platforms: linux/amd64,linux/arm64
           build-args: |
             E2E_SCRIPT_NAME=chain
           tags: |
             ${{ env.OSMOSIS_INIT_CHAIN_IMAGE_REPOSITORY }}:${{ env.DOCKER_IMAGE_TAG }}
-
       -
         name: Build and Push Cosmovisor Docker Images
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           file: Dockerfile.cosmovisor
           context: .
           push: true
-          platforms: linux/amd64
+          platforms: linux/amd64,linux/arm64
           build-args: |
             GO_VERSION=${{ env.GO_VERSION }}
             RUNNER_IMAGE=${{ env.RUNNER_BASE_IMAGE_ALPINE }}
@@ -111,67 +113,3 @@ jobs:
             COSMOVISOR_VERSION=${{ env.COSMOVISOR_VERSION }}
           tags: |
             ${{ env.OSMOSIS_DEV_IMAGE_COSMOVISOR_REPOSITORY }}:${{ env.DOCKER_IMAGE_TAG }}
-
-  push-docker-images-arm:
-    runs-on: buildjet-2vcpu-ubuntu-2204-arm
-    steps:
-      -
-        name: Check out repo
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-      -
-        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-      -
-        name: Login to DockerHub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      -
-        name: Find go version
-        run: |
-          GO_VERSION=$(cat go.mod | grep -E 'go [0-9].[0-9]+' | cut -d ' ' -f 2)
-          echo "GO_VERSION=$GO_VERSION" >> $GITHUB_ENV
-      -
-        name: Create Docker Image Tag for release candidate
-        if: startsWith(github.ref, 'refs/tags/v')
-        run: |
-          GITHUB_TAG=${{ github.ref_name }}
-          echo "DOCKER_IMAGE_TAG=${GITHUB_TAG#v}" >> $GITHUB_ENV
-          echo "OSMOSIS_VERSION=${{ github.ref_name }}" >> $GITHUB_ENV
-      -
-        name: Create Docker Image Tag for vN.x branch
-        if: ${{ !startsWith(github.ref, 'refs/tags/v') }}
-        run: |
-          SHORT_SHA=$(echo ${GITHUB_SHA} | cut -c1-8)
-          echo "DOCKER_IMAGE_TAG=${{ github.ref_name }}-${SHORT_SHA}-$(date +%s)" >> $GITHUB_ENV
-          echo "OSMOSIS_VERSION=${{ github.ref_name }}-$SHORT_SHA" >> $GITHUB_ENV
-      -
-        name: Build and Push Docker Images
-        uses: docker/build-push-action@v5
-        with:
-          file: Dockerfile
-          context: .
-          push: true
-          platforms: linux/arm64
-          build-args: |
-            GO_VERSION=${{ env.GO_VERSION }}
-            RUNNER_IMAGE=${{ env.RUNNER_BASE_IMAGE_ALPINE }}
-            GIT_VERSION=${{ env.OSMOSIS_VERSION }}
-            GIT_COMMIT=${{ github.sha }}
-          tags: |
-            ${{ env.OSMOSIS_DEV_IMAGE_REPOSITORY }}:${{ env.DOCKER_IMAGE_TAG }}
-      -
-        name: Build and Push E2E Init Docker Images
-        uses: docker/build-push-action@v5
-        with:
-          file: tests/e2e/initialization/init.Dockerfile
-          context: .
-          push: true
-          platforms: linux/arm64
-          build-args: |
-            E2E_SCRIPT_NAME=chain
-          tags: |
-            ${{ env.OSMOSIS_INIT_CHAIN_IMAGE_REPOSITORY }}:${{ env.DOCKER_IMAGE_TAG }}
diff --git a/.github/workflows/push-docker-images.yml b/.github/workflows/push-docker-images.yml
@@ -34,9 +34,11 @@ on:
 
 env:
   DOCKER_REPOSITORY: osmolabs/osmosis
+  DOCKER_REPOSITORY_COSMOVISOR: osmolabs/osmosis-cosmovisor
   RUNNER_BASE_IMAGE_DISTROLESS: gcr.io/distroless/static-debian11
   RUNNER_BASE_IMAGE_NONROOT: gcr.io/distroless/static-debian11:nonroot
-  RUNNER_BASE_IMAGE_ALPINE: alpine:3.17
+  RUNNER_BASE_IMAGE_ALPINE: alpine:3.20
+  COSMOVISOR_VERSION: v1.5.0
 
 jobs:
   push-docker-images:
@@ -74,7 +76,7 @@ jobs:
       # Distroless Docker image (default)
       - name: Build and push (distroless)
         id: build_push_distroless
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           file: Dockerfile
           context: .
@@ -95,7 +97,7 @@ jobs:
       # Distroless nonroot Docker image
       - name: Build and push (nonroot)
         id: build_push_nonroot
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           file: Dockerfile
           context: .
@@ -113,7 +115,7 @@ jobs:
       # Alpine Docker image
       - name: Build and push (alpine)
         id: build_push_alpine
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           file: Dockerfile
           context: .
@@ -130,7 +132,7 @@ jobs:
             ${{ env.DOCKER_REPOSITORY }}:${{ env.MAJOR_VERSION }}.${{ env.MINOR_VERSION }}.${{ env.PATCH_VERSION }}-alpine
       - if: startsWith(github.ref, 'refs/tags/v') && endsWith(github.ref, '.0')
         name: Build and push (e2e-chain-init)
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           file: tests/e2e/initialization/init.Dockerfile
           context: .
@@ -142,6 +144,24 @@ jobs:
             osmolabs/osmosis-e2e-init-chain:${{ env.MAJOR_VERSION }}
             osmolabs/osmosis-e2e-init-chain:${{ env.MAJOR_VERSION }}.${{ env.MINOR_VERSION }}
             osmolabs/osmosis-e2e-init-chain:${{ env.MAJOR_VERSION }}.${{ env.MINOR_VERSION }}.${{ env.PATCH_VERSION }}
+      # Cosmovisor image
+      - name: Build and Push Cosmovisor Docker Images
+        uses: docker/build-push-action@v6
+        with:
+          file: Dockerfile.cosmovisor
+          context: .
+          push: true
+          platforms: linux/amd64
+          build-args: |
+            GO_VERSION=${{ env.GO_VERSION }}
+            RUNNER_IMAGE=${{ env.RUNNER_BASE_IMAGE_ALPINE }}
+            GIT_VERSION=${{ env.VERSION }}
+            GIT_COMMIT=${{ github.sha }}
+            COSMOVISOR_VERSION=${{ env.COSMOVISOR_VERSION }}
+          tags: |
+            ${{ env.DOCKER_REPOSITORY_COSMOVISOR }}:${{ env.MAJOR_VERSION }}
+            ${{ env.DOCKER_REPOSITORY_COSMOVISOR }}:${{ env.MAJOR_VERSION }}.${{ env.MINOR_VERSION }}
+            ${{ env.DOCKER_REPOSITORY_COSMOVISOR }}:${{ env.MAJOR_VERSION }}.${{ env.MINOR_VERSION }}.${{ env.PATCH_VERSION }}
 
   push-iavl-docker-images:
     runs-on: buildjet-4vcpu-ubuntu-2204
@@ -178,7 +198,7 @@ jobs:
       # Distroless Docker image (default)
       - name: Build and push (distroless)
         id: build_push_distroless
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           file: Dockerfile
           context: .
@@ -197,7 +217,7 @@ jobs:
       # Distroless nonroot Docker image
       - name: Build and push (nonroot)
         id: build_push_nonroot
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           file: Dockerfile
           context: .
@@ -214,7 +234,7 @@ jobs:
       # Alpine Docker image
       - name: Build and push (alpine)
         id: build_push_alpine
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           file: Dockerfile
           context: .

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -130,7 +130,7 @@ jobs:
         with:
           go-version-file: go.mod
       - name: Build e2e image
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           load: true
           context: .

diff --git a/.github/workflows/update-asset-lists.yml b/.github/workflows/update-asset-lists.yml
@@ -40,7 +40,7 @@ jobs:
       - name: Run update script
         run: ./scripts/update_asset_lists.sh
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v6
+        uses: peter-evans/create-pull-request@v7
         with:
           title: "auto: update asset lists on branch ${{ inputs.target-branch || 'main' }}"
           commit-message: "auto: update asset lists"

diff --git a/.github/workflows/update-comet-version.yml b/.github/workflows/update-comet-version.yml
@@ -41,7 +41,7 @@ jobs:
         shell: bash
 
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v6
+        uses: peter-evans/create-pull-request@v7
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           title: "auto: update osmosis-labs/cometbft to ${{ github.event.inputs.version }}"

diff --git a/.github/workflows/update-go-import-paths.yml b/.github/workflows/update-go-import-paths.yml
@@ -42,7 +42,7 @@ jobs:
       - name: Run find & replace script
         run: ./scripts/replace_import_paths.sh ${{ inputs.version }}
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v6
+        uses: peter-evans/create-pull-request@v7
         with:
           token: ${{ secrets.COMMIT_TO_BRANCH }}
           title: "auto: update Go import paths to v${{ inputs.version }} on branch ${{ inputs.target-branch }}"

diff --git a/.github/workflows/update-sdk-version.yml b/.github/workflows/update-sdk-version.yml
@@ -41,7 +41,7 @@ jobs:
         shell: bash
 
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v6
+        uses: peter-evans/create-pull-request@v7
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           title: "auto: update osmosis-labs/cosmos-sdk to ${{ github.event.inputs.version }}"