fix: e2e and remove toolchain (backport #8191) (#8201)

* chore: add v25.x backport tag to mergify github action (#8151) * Try out making a read cache for poolmanager pool modules (#8128) * Try out making a read cache * Make this stored in the keeper to fix tests * Fix test reset caches * Auto: update go.mod after push to dev/test_out_read_cahce that modified dependencies locally * Add changelog --------- Co-authored-by: github-actions <[email protected]> * chore(deps): bump github.com/hashicorp/go-getter from 1.7.1 to 1.7.4 (#8155) Bumps [github.com/hashicorp/go-getter](https://github.com/hashicorp/go-getter) from 1.7.1 to 1.7.4. - [Release notes](https://github.com/hashicorp/go-getter/releases) - [Changelog](https://github.com/hashicorp/go-getter/blob/main/.goreleaser.yml) - [Commits](hashicorp/go-getter@v1.7.1...v1.7.4) --- updated-dependencies: - dependency-name: github.com/hashicorp/go-getter dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps): bump github.com/hashicorp/go-getter in /osmoutils (#8156) Bumps [github.com/hashicorp/go-getter](https://github.com/hashicorp/go-getter) from 1.7.1 to 1.7.4. - [Release notes](https://github.com/hashicorp/go-getter/releases) - [Changelog](https://github.com/hashicorp/go-getter/blob/main/.goreleaser.yml) - [Commits](hashicorp/go-getter@v1.7.1...v1.7.4) --- updated-dependencies: - dependency-name: github.com/hashicorp/go-getter dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps): bump github.com/hashicorp/go-getter in /x/ibc-hooks (#8154) Bumps [github.com/hashicorp/go-getter](https://github.com/hashicorp/go-getter) from 1.7.1 to 1.7.4. - [Release notes](https://github.com/hashicorp/go-getter/releases) - [Changelog](https://github.com/hashicorp/go-getter/blob/main/.goreleaser.yml) - [Commits](hashicorp/go-getter@v1.7.1...v1.7.4) --- updated-dependencies: - dependency-name: github.com/hashicorp/go-getter dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * .5s epoch speedup (#8159) * Speedup protorev by having route calculation phase not unmarshal pools (#8157) * Another expected ~1% state machine speedup * Add changelog * minor other improvement * Reduce addr decoding overhead * chore: Create CI for bumping sdk version via GA (#8162) * Create CI for updating sdk version * Fix some comments * On PR * Use osmo v0.47.5 as default * Fix * Fix 2 * Fix 4 * Fix * Final * Final fix * Fix PR ver * Final * Final * Final * fix: return err if type not in manager (#8170) * chore(deps): bump actions/checkout from 3 to 4 (#8173) Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](actions/checkout@v3...v4) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps): bump actions/setup-go from 3 to 5 (#8174) Bumps [actions/setup-go](https://github.com/actions/setup-go) from 3 to 5. - [Release notes](https://github.com/actions/setup-go/releases) - [Commits](actions/setup-go@v3...v5) --- updated-dependencies: - dependency-name: actions/setup-go dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * auto: update Go import paths to v25 on branch main (#8172) * auto: update Go import paths to v25 * Generated protofile changes * chore: update sqsdomain to v25 * chore: update osmoutils to latest version --------- Co-authored-by: PaddyMc <[email protected]> Co-authored-by: github-actions <[email protected]> Co-authored-by: PaddyMc <[email protected]> * chore: don't use hardcoded "uosmo" string (#8145) * check denoms for gauge creation * changelog * extract logic * use uosmo var * initial push of test fixes * fix lint * tidy * tidy * add comments * add test cases * chore: update cometbft and cosmos-sdk deps (#8179) * chore: update cometbft and cosmos-sdk deps * chore: update comments for cosmos-sdk * auto: update asset lists (#8180) Co-authored-by: czarcas7ic <[email protected]> * Properly create the module account for auction (#8178) * properly create the module account for auction * typo * lint * preserve name * updated osmoutils * chore: consensus param change (#8177) * consensus param change * changelog * err * Update upgrades.go --------- Co-authored-by: PaddyMc <[email protected]> * fix: e2e and remove toolchain (#8191) * remove toolchain * remove exclude increment * script * remove build tags * build script * remove build arg * fix: e2e and remove toolchain (#8191) * remove toolchain * remove exclude increment * script * remove build tags * build script * remove build arg (cherry picked from commit 27548cc) # Conflicts: # osmoutils/go.sum # x/ibc-hooks/go.sum * fix conflict * tidy * Revert "tidy" This reverts commit fabe8ea. * Revert "fix conflict" This reverts commit 32031fd. * Revert "Merge branch 'main' into mergify/bp/v25.x/pr-8191" This reverts commit 708dbdf, reversing changes made to 29a0917. * tidy * run script --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: PaddyMc <[email protected]> Co-authored-by: Dev Ojha <[email protected]> Co-authored-by: github-actions <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Matt, Park <[email protected]> Co-authored-by: Osmosis <[email protected]> Co-authored-by: PaddyMc <[email protected]> Co-authored-by: Adam Tucker <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: czarcas7ic <[email protected]> Co-authored-by: Nicolas Lara <[email protected]> Co-authored-by: Adam Tucker <[email protected]>
osmosis-labs · May 2, 2024 · 5f51967 · 5f51967
1 parent 24d9b92
commit 5f51967
Show file tree

Hide file tree

Showing 17 changed files with 101 additions and 252 deletions.
diff --git a/.github/workflows/e2e-full.yml b/.github/workflows/e2e-full.yml
@@ -54,7 +54,7 @@ jobs:
           tags: osmosis:debug
           build-args: |
             BASE_IMG_TAG=debug
-            BUILD_TAGS="netgo,muslc,excludeIncrement"
+            BUILD_TAGS="netgo,muslc"
       - name: Test e2e and Upgrade
         run: make test-e2e-ci-scheduled
       - name: Dump docker logs on failure

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -15,16 +15,13 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
 
-
 jobs:
   get_diff:
     runs-on: buildjet-4vcpu-ubuntu-2204
     steps:
-      -
-        name: Check out repository code
+      - name: Check out repository code
         uses: actions/checkout@v4
-      -
-        name: Get git diff
+      - name: Get git diff
         uses: technote-space/[email protected]
         with:
           PATTERNS: |
@@ -35,8 +32,7 @@ jobs:
             Makefile
             Dockerfile
             .github/workflows/test.yml
-      -
-        name: Set output
+      - name: Set output
         id: vars
         run: echo "git_diff=$GIT_DIFF" >> $GITHUB_OUTPUT
     outputs:
@@ -47,16 +43,13 @@ jobs:
     if: ${{ needs.get_diff.outputs.git_diff || github.actor == 'dependabot[bot]' || github.actor == 'mergify[bot]' }}
     runs-on: buildjet-4vcpu-ubuntu-2204
     steps:
-      -
-        name: Check out repository
+      - name: Check out repository
         uses: actions/checkout@v4
-      -
-        name: 🐿 Setup Golang
+      - name: 🐿 Setup Golang
         uses: actions/setup-go@v5
         with:
           go-version-file: go.mod
-      -
-        name: Create a file with all core Cosmos SDK pkgs
+      - name: Create a file with all core Cosmos SDK pkgs
         run: |
           go list \
             ./... \
@@ -66,27 +59,22 @@ jobs:
             ./x/epochs \
             | grep -E -v 'tests/simulator|e2e' \
             > pkgs.txt
-      -
-        name: Split pkgs into 4 files
+      - name: Split pkgs into 4 files
         run: |
           split -d -n l/4 pkgs.txt pkgs.txt.part.
-      -
-        uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v4
         with:
           name: "${{ github.sha }}-00"
           path: ./pkgs.txt.part.00
-      -
-        uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v4
         with:
           name: "${{ github.sha }}-01"
           path: ./pkgs.txt.part.01
-      -
-        uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v4
         with:
           name: "${{ github.sha }}-02"
           path: ./pkgs.txt.part.02
-      -
-        uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v4
         with:
           name: "${{ github.sha }}-03"
           path: ./pkgs.txt.part.03
@@ -100,23 +88,18 @@ jobs:
       matrix:
         part: ["00", "01", "02", "03"]
     steps:
-      -
-        name: Check out repository
+      - name: Check out repository
         uses: actions/checkout@v4
-      -
-        name: 🐿 Setup Golang
+      - name: 🐿 Setup Golang
         uses: actions/setup-go@v5
         with:
           go-version-file: go.mod
-      -
-        name: Display go version
+      - name: Display go version
         run: go version
-      -
-        uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v4
         with:
           name: "${{ github.sha }}-${{ matrix.part }}"
-      -
-        name: Test & coverage report creation
+      - name: Test & coverage report creation
         run: |
           VERSION=$(echo $(git describe --tags) | sed 's/^v//') || VERSION=${GITHUB_SHA}
           TESTS=$(cat pkgs.txt.part.${{ matrix.part }})
@@ -128,55 +111,45 @@ jobs:
     runs-on: buildjet-4vcpu-ubuntu-2204
     timeout-minutes: 20
     steps:
-      -
-        name: Check out repository
+      - name: Check out repository
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      -
-        name: Set up QEMU
+      - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
-      -
-        name: Set up Docker Buildx
+      - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
-      -
-        name: Login to DockerHub
+      - name: Login to DockerHub
         uses: docker/login-action@v3
         if: ${{ github.actor != 'dependabot[bot]' && github.actor != 'mergify[bot]' }}
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-      -
-        name: 🐿 Setup Golang
+      - name: 🐿 Setup Golang
         uses: actions/setup-go@v5
         with:
           go-version-file: go.mod
-      -
-        name: Build e2e image
+      - name: Build e2e image
         uses: docker/build-push-action@v5
         with:
           load: true
           context: .
           tags: osmosis:debug
           build-args: |
             BASE_IMG_TAG=debug
-            BUILD_TAGS="netgo,muslc,excludeIncrement"
-      -
-        name: Test e2e and Upgrade
+            BUILD_TAGS="netgo,muslc"
+      - name: Test e2e and Upgrade
         run: make test-e2e-ci
-      -
-        name: Dump docker logs on failure
+      - name: Dump docker logs on failure
         if: failure()
         uses: jwalton/gh-docker-logs@v2
         with:
           dest: "./logs"
-      -
-        name: Tar logs
+      - name: Tar logs
         if: failure()
         run: |
           tar cvzf ./logs.tgz ./logs
-      -
-        name: Upload logs to GitHub
+      - name: Upload logs to GitHub
         if: failure()
         uses: actions/upload-artifact@v4
         with:

diff --git a/Dockerfile b/Dockerfile
@@ -42,7 +42,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build \
     --mount=type=cache,target=/root/go/pkg/mod \
     GOWORK=off go build \
     -mod=readonly \
-    -tags ${BUILD_TAGS} \
+    -tags "netgo,ledger,muslc" \
     -ldflags \
     "-X github.com/cosmos/cosmos-sdk/version.Name="osmosis" \
     -X github.com/cosmos/cosmos-sdk/version.AppName="osmosisd" \

diff --git a/app/ante.go b/app/ante.go
@@ -1,6 +1,3 @@
-//go:build !excludeIncrement
-// +build !excludeIncrement
-
 package app
 
 import (

diff --git a/app/ante_no_seq.go b/app/ante_no_seq.go
diff --git a/go.mod b/go.mod
@@ -2,8 +2,6 @@ module github.com/osmosis-labs/osmosis/v25
 
 go 1.21.4
 
-toolchain go1.22.0
-
 require (
 	cosmossdk.io/api v0.3.1
 	cosmossdk.io/errors v1.0.1
@@ -30,10 +28,10 @@ require (
 	github.com/mattn/go-sqlite3 v1.14.17
 	github.com/ory/dockertest/v3 v3.10.0
 	github.com/osmosis-labs/go-mutesting v0.0.0-20221208041716-b43bcd97b3b3
-	github.com/osmosis-labs/osmosis/osmomath v0.0.12-0.20240423073233-246239a8f662
-	github.com/osmosis-labs/osmosis/osmoutils v0.0.12-0.20240430173456-105713b242f8
-	github.com/osmosis-labs/osmosis/x/epochs v0.0.8-0.20240423073233-246239a8f662
-	github.com/osmosis-labs/osmosis/x/ibc-hooks v0.0.14-0.20240423073233-246239a8f662
+	github.com/osmosis-labs/osmosis/osmomath v0.0.13-0.20240502181753-5ba797611f84
+	github.com/osmosis-labs/osmosis/osmoutils v0.0.13-0.20240502181753-5ba797611f84
+	github.com/osmosis-labs/osmosis/x/epochs v0.0.9-0.20240502181753-5ba797611f84
+	github.com/osmosis-labs/osmosis/x/ibc-hooks v0.0.15-0.20240502181753-5ba797611f84
 	github.com/osmosis-labs/sqs/sqsdomain v0.0.0-20240429202838-7d69de2c9bea
 	github.com/pkg/errors v0.9.1
 	github.com/rakyll/statik v0.1.7

diff --git a/go.sum b/go.sum
@@ -1485,14 +1485,14 @@ github.com/osmosis-labs/cosmos-sdk v0.47.5-v25-osmo-1 h1:l1Hk4DGxDoBe1YUb7IbwRz/
 github.com/osmosis-labs/cosmos-sdk v0.47.5-v25-osmo-1/go.mod h1:eSRUVYwL3eG1jnh01CnBbHiqOM3xJO49p5rTOrSFX1k=
 github.com/osmosis-labs/go-mutesting v0.0.0-20221208041716-b43bcd97b3b3 h1:YlmchqTmlwdWSmrRmXKR+PcU96ntOd8u10vTaTZdcNY=
 github.com/osmosis-labs/go-mutesting v0.0.0-20221208041716-b43bcd97b3b3/go.mod h1:lV6KnqXYD/ayTe7310MHtM3I2q8Z6bBfMAi+bhwPYtI=
-github.com/osmosis-labs/osmosis/osmomath v0.0.12-0.20240423073233-246239a8f662 h1:P6deXtGtSXJgPtvo6f/1vAQgF38HUsrIT6Mq7LMGYrs=
-github.com/osmosis-labs/osmosis/osmomath v0.0.12-0.20240423073233-246239a8f662/go.mod h1:ubFhAjLis9cH6GPIhaCjf4JdXrn8HBBOxvOYMxPtgSM=
-github.com/osmosis-labs/osmosis/osmoutils v0.0.12-0.20240430173456-105713b242f8 h1:4Zm6E1mk8r68kwIUafaHbEWhexob60sxBTcVDlV7jek=
-github.com/osmosis-labs/osmosis/osmoutils v0.0.12-0.20240430173456-105713b242f8/go.mod h1:sHrm1JXicWHDt74cJavXKe19OWongf/kiVX9SBI+Dec=
-github.com/osmosis-labs/osmosis/x/epochs v0.0.8-0.20240423073233-246239a8f662 h1:bG3Fll3ryw+yo+70u0oOUjxq1SZ2GgTRDgmivZEdPKE=
-github.com/osmosis-labs/osmosis/x/epochs v0.0.8-0.20240423073233-246239a8f662/go.mod h1:3BTKszIZFP/3ut/sW0izJOZRNDXWINU5zfZGo+a8QhE=
-github.com/osmosis-labs/osmosis/x/ibc-hooks v0.0.14-0.20240423073233-246239a8f662 h1:1GiW1IDHH6BfmBYdP5YGnS+TkO6ZKKVzSFccG9RH9gA=
-github.com/osmosis-labs/osmosis/x/ibc-hooks v0.0.14-0.20240423073233-246239a8f662/go.mod h1:VBMzVCCaiVJokiQ+6+O6KAU9XaH656o6kCeHoVCiTL8=
+github.com/osmosis-labs/osmosis/osmomath v0.0.13-0.20240502181753-5ba797611f84 h1:h7fA83QzN1vVibEi+WpLNDxHwsDhc+t2kkRcfQ8jSF8=
+github.com/osmosis-labs/osmosis/osmomath v0.0.13-0.20240502181753-5ba797611f84/go.mod h1:eWYAcQOQLAfj2AVAXYzRJECpmSgGPXbXPsFFtI4SMhI=
+github.com/osmosis-labs/osmosis/osmoutils v0.0.13-0.20240502181753-5ba797611f84 h1:/OXRU8pDbMFkIxfv8sBFbmW7TD+nmPn9J2FPrA1Btis=
+github.com/osmosis-labs/osmosis/osmoutils v0.0.13-0.20240502181753-5ba797611f84/go.mod h1:UFD8ht+LfM/3ge8LqMt1uUqXcC7UabAkR5/jTanfdX0=
+github.com/osmosis-labs/osmosis/x/epochs v0.0.9-0.20240502181753-5ba797611f84 h1:zyAQg4YHVqokeAT1OYtapXLrgrnDYwft02Qln2lFFzU=
+github.com/osmosis-labs/osmosis/x/epochs v0.0.9-0.20240502181753-5ba797611f84/go.mod h1:9slBqQ/wuqHsjRZAvNXsSXPMKKPPUm7ttPQO8y8WgwE=
+github.com/osmosis-labs/osmosis/x/ibc-hooks v0.0.15-0.20240502181753-5ba797611f84 h1:w5/xe/hWI01UPvl7DEJpAkBEZ+WojC2fjO72DJSxP6M=
+github.com/osmosis-labs/osmosis/x/ibc-hooks v0.0.15-0.20240502181753-5ba797611f84/go.mod h1:2NeUt7QGUnSsbm/ShzbjwqugkWTrmCDCXHmtz776kx0=
 github.com/osmosis-labs/sqs/sqsdomain v0.0.0-20240429202838-7d69de2c9bea h1:jcwN05LSSV7Vdp+FHp3WtabuFtBb7l+ki4O5R2P1Sr4=
 github.com/osmosis-labs/sqs/sqsdomain v0.0.0-20240429202838-7d69de2c9bea/go.mod h1:d3wAamev0J2ABDeUvCDTUnw0mMrraXRia1e/dqq/xFI=
 github.com/osmosis-labs/wasmd v0.45.0-osmo h1:NIp7pvJV5HuBN1HwPgEmXKQM2TjVIVdJErIHnB9IMO8=

diff --git a/go.work b/go.work
@@ -1,7 +1,5 @@
 go 1.21.4
 
-toolchain go1.22.0
-
 use .
 
 use ./osmomath