diff --git a/.github/workflows/e2e-full.yml b/.github/workflows/e2e-full.yml
index 26696416ddf..c9a98d4914c 100644
--- 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
index 36197d59309..36c4219f343 100644
--- 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/get-diff-action@v6.1.2
         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,31 +111,25 @@ 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
@@ -160,23 +137,19 @@ jobs:
           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
index 7dbf949ecf6..a7b24f58746 100644
--- 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
index 14c484cfc77..de262611075 100644
--- 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
deleted file mode 100644
index 2811a81fdf8..00000000000
--- a/app/ante_no_seq.go
+++ /dev/null
@@ -1,121 +0,0 @@
-//go:build excludeIncrement
-// +build excludeIncrement
-
-package app
-
-import (
-	wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"
-	wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types"
-	ibcante "github.com/cosmos/ibc-go/v7/modules/core/ante"
-	ibckeeper "github.com/cosmos/ibc-go/v7/modules/core/keeper"
-
-	"github.com/cosmos/cosmos-sdk/client"
-	servertypes "github.com/cosmos/cosmos-sdk/server/types"
-	sdk "github.com/cosmos/cosmos-sdk/types"
-	ante "github.com/cosmos/cosmos-sdk/x/auth/ante"
-	"github.com/cosmos/cosmos-sdk/x/auth/signing"
-
-	osmoante "github.com/osmosis-labs/osmosis/v25/ante"
-	v9 "github.com/osmosis-labs/osmosis/v25/app/upgrades/v9"
-
-	storetypes "github.com/cosmos/cosmos-sdk/store/types"
-
-	smartaccountante "github.com/osmosis-labs/osmosis/v25/x/smart-account/ante"
-	smartaccountkeeper "github.com/osmosis-labs/osmosis/v25/x/smart-account/keeper"
-
-	auctionkeeper "github.com/skip-mev/block-sdk/x/auction/keeper"
-
-	txfeeskeeper "github.com/osmosis-labs/osmosis/v25/x/txfees/keeper"
-	txfeestypes "github.com/osmosis-labs/osmosis/v25/x/txfees/types"
-
-	auctionante "github.com/skip-mev/block-sdk/x/auction/ante"
-)
-
-// BlockSDKAnteHandlerParams are the parameters necessary to configure the block-sdk antehandlers
-type BlockSDKAnteHandlerParams struct {
-	mevLane       auctionante.MEVLane
-	auctionKeeper auctionkeeper.Keeper
-	txConfig      client.TxConfig
-}
-
-// Link to default ante handler used by cosmos sdk:
-// https://github.com/cosmos/cosmos-sdk/blob/v0.43.0/x/auth/ante/ante.go#L41
-// N.B. There is a sister file called `ante_eq.go` that is used for production.
-// Opposite to this, it also chains `IncrementSequenceDecorator` which is not needed for e2e testing but is critical for production.
-// If you make a change here, make sure to make the same change in `ante.go`.
-func NewAnteHandler(
-	appOpts servertypes.AppOptions,
-	wasmConfig wasmtypes.WasmConfig,
-	txCounterStoreKey storetypes.StoreKey,
-	accountKeeper ante.AccountKeeper,
-	smartAccountKeeper *smartaccountkeeper.Keeper,
-	bankKeeper txfeestypes.BankKeeper,
-	txFeesKeeper *txfeeskeeper.Keeper,
-	spotPriceCalculator txfeestypes.SpotPriceCalculator,
-	sigGasConsumer ante.SignatureVerificationGasConsumer,
-	signModeHandler signing.SignModeHandler,
-	channelKeeper *ibckeeper.Keeper,
-	blockSDKParams BlockSDKAnteHandlerParams,
-) sdk.AnteHandler {
-	mempoolFeeOptions := txfeestypes.NewMempoolFeeOptions(appOpts)
-	mempoolFeeDecorator := txfeeskeeper.NewMempoolFeeDecorator(*txFeesKeeper, mempoolFeeOptions)
-	sendblockOptions := osmoante.NewSendBlockOptions(appOpts)
-	sendblockDecorator := osmoante.NewSendBlockDecorator(sendblockOptions)
-	deductFeeDecorator := txfeeskeeper.NewDeductFeeDecorator(*txFeesKeeper, accountKeeper, bankKeeper, nil)
-
-	// classicSignatureVerificationDecorator is the old flow to enable a circuit breaker
-	classicSignatureVerificationDecorator := sdk.ChainAnteDecorators(
-		deductFeeDecorator,
-		// We use the old pubkey decorator here to ensure that accounts work as expected,
-		// in SetPubkeyDecorator we set a pubkey in the account store, for authenticators
-		// we avoid this code path completely.
-		ante.NewSetPubKeyDecorator(accountKeeper),
-		ante.NewValidateSigCountDecorator(accountKeeper),
-		ante.NewSigGasConsumeDecorator(accountKeeper, sigGasConsumer),
-		ante.NewSigVerificationDecorator(accountKeeper, signModeHandler),
-		// ante.NewIncrementSequenceDecorator(accountKeeper),
-		ibcante.NewRedundantRelayDecorator(channelKeeper),
-		auctionante.NewAuctionDecorator(
-			blockSDKParams.auctionKeeper,
-			blockSDKParams.txConfig.TxEncoder(),
-			blockSDKParams.mevLane,
-		),
-	)
-
-	// authenticatorVerificationDecorator is the new authenticator flow that's embedded into the circuit breaker ante
-	authenticatorVerificationDecorator := sdk.ChainAnteDecorators(
-		smartaccountante.NewEmitPubKeyDecoratorEvents(accountKeeper),
-		ante.NewValidateSigCountDecorator(accountKeeper), // we can probably remove this as multisigs are not supported here
-		// Both the signature verification, fee deduction, and gas consumption functionality
-		// is embedded in the authenticator decorator
-		smartaccountante.NewAuthenticatorDecorator(smartAccountKeeper, accountKeeper, signModeHandler, deductFeeDecorator),
-		// ante.NewIncrementSequenceDecorator(accountKeeper),
-		// auction module antehandler
-		auctionante.NewAuctionDecorator(
-			blockSDKParams.auctionKeeper,
-			blockSDKParams.txConfig.TxEncoder(),
-			blockSDKParams.mevLane,
-		),
-	)
-
-	return sdk.ChainAnteDecorators(
-		ante.NewSetUpContextDecorator(), // outermost AnteDecorator. SetUpContext must be called first
-		wasmkeeper.NewLimitSimulationGasDecorator(wasmConfig.SimulationGasLimit),
-		wasmkeeper.NewCountTXDecorator(txCounterStoreKey),
-		ante.NewExtensionOptionsDecorator(nil),
-		v9.MsgFilterDecorator{},
-		// Use Mempool Fee Decorator from our txfees module instead of default one from auth
-		// https://github.com/cosmos/cosmos-sdk/blob/master/x/auth/middleware/fee.go#L34
-		mempoolFeeDecorator,
-		sendblockDecorator,
-		ante.NewValidateBasicDecorator(),
-		ante.TxTimeoutHeightDecorator{},
-		ante.NewValidateMemoDecorator(accountKeeper),
-		ante.NewConsumeGasForTxSizeDecorator(accountKeeper),
-		smartaccountante.NewCircuitBreakerDecorator(
-			smartAccountKeeper,
-			authenticatorVerificationDecorator,
-			classicSignatureVerificationDecorator,
-		),
-	)
-}
diff --git a/go.mod b/go.mod
index bb9379f84ef..81bf007fb9c 100644
--- 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.12-0.20240502024814-785ee58ac507
+	github.com/osmosis-labs/osmosis/osmoutils v0.0.12-0.20240502024814-785ee58ac507
+	github.com/osmosis-labs/osmosis/x/epochs v0.0.8-0.20240502024814-785ee58ac507
+	github.com/osmosis-labs/osmosis/x/ibc-hooks v0.0.14-0.20240502024814-785ee58ac507
 	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
index 2175a9d1bd7..a4949e37320 100644
--- 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.12-0.20240502024814-785ee58ac507 h1:LJMTBQBH4Xiz9YzWo9BbxKvQr6Yij0e0z9Mb4X9kQKw=
+github.com/osmosis-labs/osmosis/osmomath v0.0.12-0.20240502024814-785ee58ac507/go.mod h1:iCRNyb2pkXwsr4UdbXJDX4lWkzeUNsIALzagBBTq4wU=
+github.com/osmosis-labs/osmosis/osmoutils v0.0.12-0.20240502024814-785ee58ac507 h1:wCCBw7gvrBQKuKAA+Oi0uLIlqTjSHi5uE0KinpT3wgU=
+github.com/osmosis-labs/osmosis/osmoutils v0.0.12-0.20240502024814-785ee58ac507/go.mod h1:GaDargX3Hg/rthi993uk//ZH9K5+67589UM8h8TF6xY=
+github.com/osmosis-labs/osmosis/x/epochs v0.0.8-0.20240502024814-785ee58ac507 h1:yrtrsYT6LwVHueT7Hbkoe58pxrVT8PPnm4QQqvhoAcE=
+github.com/osmosis-labs/osmosis/x/epochs v0.0.8-0.20240502024814-785ee58ac507/go.mod h1:lfLwYLam75LnjFh0TLfM+TGyb8O4xLR4iAAVZKzi5KQ=
+github.com/osmosis-labs/osmosis/x/ibc-hooks v0.0.14-0.20240502024814-785ee58ac507 h1:MQYr3x+tRmTM5a7BVfd68t4O453EMl4APhqmbFACPOs=
+github.com/osmosis-labs/osmosis/x/ibc-hooks v0.0.14-0.20240502024814-785ee58ac507/go.mod h1:c9XhY9arUhqkVgSj4bw1P7NVUfdtwdeAHaDk2bYhVhY=
 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
index be15cfd0f3f..18cde01d407 100644
--- a/go.work
+++ b/go.work
@@ -1,7 +1,5 @@
 go 1.21.4
 
-toolchain go1.22.0
-
 use .
 
 use ./osmomath
diff --git a/osmomath/go.mod b/osmomath/go.mod
index aeaa1167c06..f6ab9d4106e 100644
--- a/osmomath/go.mod
+++ b/osmomath/go.mod
@@ -1,11 +1,13 @@
 module github.com/osmosis-labs/osmosis/osmomath
 
-go 1.21
+go 1.21.4
+
+toolchain go1.21.5
 
 require (
 	cosmossdk.io/math v1.3.0
 	github.com/cosmos/cosmos-sdk v0.47.8
-	github.com/osmosis-labs/osmosis/osmoutils v0.0.12-0.20240423073233-246239a8f662
+	github.com/osmosis-labs/osmosis/osmoutils v0.0.12-0.20240502024814-785ee58ac507
 	github.com/stretchr/testify v1.9.0
 	gopkg.in/yaml.v2 v2.4.0
 
@@ -83,7 +85,7 @@ require (
 	go.etcd.io/bbolt v1.3.8 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	golang.org/x/crypto v0.21.0 // indirect
-	golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
+	golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc // indirect
 	golang.org/x/net v0.23.0 // indirect
 	golang.org/x/sys v0.18.0 // indirect
 	golang.org/x/text v0.14.0 // indirect
diff --git a/osmomath/go.sum b/osmomath/go.sum
index 3d383cb998d..acba1b2f5e3 100644
--- a/osmomath/go.sum
+++ b/osmomath/go.sum
@@ -259,12 +259,12 @@ github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7J
 github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
 github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY=
 github.com/onsi/gomega v1.19.0/go.mod h1:LY+I3pBVzYsTBU1AnDwOSxaYi9WoWiqgwooUqq9yPro=
-github.com/onsi/gomega v1.28.1 h1:MijcGUbfYuznzK/5R4CPNoUP/9Xvuo20sXfEm6XxoTA=
-github.com/onsi/gomega v1.28.1/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ=
-github.com/osmosis-labs/cosmos-sdk v0.47.5-v24-osmo-5 h1:fnt89Cw+55vbnIEGkpCmj0cx/EaEnwHfYi4JN3rKkLU=
-github.com/osmosis-labs/cosmos-sdk v0.47.5-v24-osmo-5/go.mod h1:eSRUVYwL3eG1jnh01CnBbHiqOM3xJO49p5rTOrSFX1k=
-github.com/osmosis-labs/osmosis/osmoutils v0.0.12-0.20240423073233-246239a8f662 h1:evQCSCvgkEXpm3NanU54PK8OtUEPQHCV8EEIbRZ417k=
-github.com/osmosis-labs/osmosis/osmoutils v0.0.12-0.20240423073233-246239a8f662/go.mod h1:1uK78efyukxFZf0JVzU4YSSY4EGO0rignHh/NC/C6l8=
+github.com/onsi/gomega v1.31.1 h1:KYppCUK+bUgAZwHOu7EXVBKyQA6ILvOESHkn/tgoqvo=
+github.com/onsi/gomega v1.31.1/go.mod h1:y40C95dwAD1Nz36SsEnxvfFe8FFfNxzI5eJ0EYGyAy0=
+github.com/osmosis-labs/cosmos-sdk v0.47.5-v25-osmo-1 h1:l1Hk4DGxDoBe1YUb7IbwRz/CbzA3wfQZ+j+vz+ed5tM=
+github.com/osmosis-labs/cosmos-sdk v0.47.5-v25-osmo-1/go.mod h1:eSRUVYwL3eG1jnh01CnBbHiqOM3xJO49p5rTOrSFX1k=
+github.com/osmosis-labs/osmosis/osmoutils v0.0.12-0.20240502024814-785ee58ac507 h1:wCCBw7gvrBQKuKAA+Oi0uLIlqTjSHi5uE0KinpT3wgU=
+github.com/osmosis-labs/osmosis/osmoutils v0.0.12-0.20240502024814-785ee58ac507/go.mod h1:GaDargX3Hg/rthi993uk//ZH9K5+67589UM8h8TF6xY=
 github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
 github.com/pelletier/go-toml/v2 v2.1.0 h1:FnwAJ4oYMvbT/34k9zzHuZNrhlz48GB3/s6at6/MHO4=
 github.com/pelletier/go-toml/v2 v2.1.0/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc=
diff --git a/osmoutils/go.mod b/osmoutils/go.mod
index 2dec0180d1d..8ea67c64a66 100644
--- a/osmoutils/go.mod
+++ b/osmoutils/go.mod
@@ -2,8 +2,6 @@ module github.com/osmosis-labs/osmosis/osmoutils
 
 go 1.21.4
 
-toolchain go1.22.0
-
 require (
 	cosmossdk.io/log v1.3.0
 	cosmossdk.io/math v1.3.0
@@ -15,7 +13,7 @@ require (
 	github.com/cosmos/gogoproto v1.4.11
 	github.com/cosmos/iavl v1.1.2-0.20240405173644-e52f7630d3b7
 	github.com/cosmos/ibc-go/v7 v7.4.0
-	github.com/osmosis-labs/osmosis/osmomath v0.0.12-0.20240423073233-246239a8f662
+	github.com/osmosis-labs/osmosis/osmomath v0.0.12-0.20240502024814-785ee58ac507
 	github.com/osmosis-labs/osmosis/v25 v25.0.0-20240429183841-537ba1600888
 	github.com/spf13/cast v1.6.0
 	github.com/spf13/cobra v1.8.0
@@ -155,8 +153,8 @@ require (
 	github.com/oasisprotocol/curve25519-voi v0.0.0-20220708102147-0a8a51822cae // indirect
 	github.com/onsi/gomega v1.31.1 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
-	github.com/osmosis-labs/osmosis/x/epochs v0.0.8-0.20240423073233-246239a8f662 // indirect
-	github.com/osmosis-labs/osmosis/x/ibc-hooks v0.0.14-0.20240423073233-246239a8f662 // indirect
+	github.com/osmosis-labs/osmosis/x/epochs v0.0.8-0.20240502024814-785ee58ac507 // indirect
+	github.com/osmosis-labs/osmosis/x/ibc-hooks v0.0.14-0.20240502024814-785ee58ac507 // indirect
 	github.com/osmosis-labs/sqs/sqsdomain v0.0.0-20240429202838-7d69de2c9bea // indirect
 	github.com/pelletier/go-toml/v2 v2.1.0 // indirect
 	github.com/petermattis/goid v0.0.0-20230317030725-371a4b8eda08 // indirect
diff --git a/osmoutils/go.sum b/osmoutils/go.sum
index 1ebe6d5e41a..bd3b98081dc 100644
--- a/osmoutils/go.sum
+++ b/osmoutils/go.sum
@@ -1277,14 +1277,19 @@ github.com/osmosis-labs/cometbft v0.37.4-v25-osmo-1 h1:HezZywIk7C9UbCMuqrpBgC0gQ
 github.com/osmosis-labs/cometbft v0.37.4-v25-osmo-1/go.mod h1:p8RohShfTfbvSzgb9zFnqvtCgyLTzqA8otk0I/YDbSg=
 github.com/osmosis-labs/cosmos-sdk v0.47.5-v25-osmo-1 h1:l1Hk4DGxDoBe1YUb7IbwRz/CbzA3wfQZ+j+vz+ed5tM=
 github.com/osmosis-labs/cosmos-sdk v0.47.5-v25-osmo-1/go.mod h1:eSRUVYwL3eG1jnh01CnBbHiqOM3xJO49p5rTOrSFX1k=
+<<<<<<< HEAD
 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/osmomath v0.0.12-0.20240502024814-785ee58ac507 h1:LJMTBQBH4Xiz9YzWo9BbxKvQr6Yij0e0z9Mb4X9kQKw=
+github.com/osmosis-labs/osmosis/osmomath v0.0.12-0.20240502024814-785ee58ac507/go.mod h1:iCRNyb2pkXwsr4UdbXJDX4lWkzeUNsIALzagBBTq4wU=
+>>>>>>> 27548cca (fix: e2e and remove toolchain (#8191))
 github.com/osmosis-labs/osmosis/v25 v25.0.0-20240429183841-537ba1600888 h1:c+b4PKumqTYNDOOP+R53lnjxiocmYwjLgfBR6VfnGes=
 github.com/osmosis-labs/osmosis/v25 v25.0.0-20240429183841-537ba1600888/go.mod h1:TI3Qr4dqna7/afmPJUlueSg2iX5gI4YzHuye3y83S5E=
-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/x/epochs v0.0.8-0.20240502024814-785ee58ac507 h1:yrtrsYT6LwVHueT7Hbkoe58pxrVT8PPnm4QQqvhoAcE=
+github.com/osmosis-labs/osmosis/x/epochs v0.0.8-0.20240502024814-785ee58ac507/go.mod h1:lfLwYLam75LnjFh0TLfM+TGyb8O4xLR4iAAVZKzi5KQ=
+github.com/osmosis-labs/osmosis/x/ibc-hooks v0.0.14-0.20240502024814-785ee58ac507 h1:MQYr3x+tRmTM5a7BVfd68t4O453EMl4APhqmbFACPOs=
+github.com/osmosis-labs/osmosis/x/ibc-hooks v0.0.14-0.20240502024814-785ee58ac507/go.mod h1:c9XhY9arUhqkVgSj4bw1P7NVUfdtwdeAHaDk2bYhVhY=
 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/scripts/makefiles/e2e.mk b/scripts/makefiles/e2e.mk
index d1a7813d4b2..0340e26ae16 100644
--- a/scripts/makefiles/e2e.mk
+++ b/scripts/makefiles/e2e.mk
@@ -22,14 +22,14 @@ e2e-build-script:
 	go build -mod=readonly $(BUILD_FLAGS) -o $(BUILDDIR)/ ./tests/e2e/initialization/$(E2E_SCRIPT_NAME)
 
 e2e-docker-build-debug:
-	@DOCKER_BUILDKIT=1 docker build --build-arg BUILD_TAGS="netgo,muslc,excludeIncrement" -t osmosis:${COMMIT} --build-arg BASE_IMG_TAG=debug --build-arg RUNNER_IMAGE=$(RUNNER_BASE_IMAGE_ALPINE) -f Dockerfile .
+	@DOCKER_BUILDKIT=1 docker build -t osmosis:${COMMIT} --build-arg BASE_IMG_TAG=debug --build-arg RUNNER_IMAGE=$(RUNNER_BASE_IMAGE_ALPINE) -f Dockerfile .  
 	@DOCKER_BUILDKIT=1 docker tag osmosis:${COMMIT} osmosis:debug
 
 e2e-docker-build-e2e-init-chain:
-	@DOCKER_BUILDKIT=1 docker build --build-arg BUILD_TAGS="netgo,muslc,excludeIncrement" -t osmolabs/osmosis-e2e-init-chain:debug --build-arg E2E_SCRIPT_NAME=chain --platform=linux/x86_64 -f tests/e2e/initialization/init.Dockerfile .
+	@DOCKER_BUILDKIT=1 docker build -t osmolabs/osmosis-e2e-init-chain:debug --build-arg E2E_SCRIPT_NAME=chain --platform=linux/x86_64 -f tests/e2e/initialization/init.Dockerfile .
 
 e2e-docker-build-e2e-init-node:
-	@DOCKER_BUILDKIT=1 docker build --build-arg BUILD_TAGS="netgo,muslc,excludeIncrement" -t osmosis-e2e-init-node:debug --build-arg E2E_SCRIPT_NAME=node --platform=linux/x86_64 -f tests/e2e/initialization/init.Dockerfile .
+	@DOCKER_BUILDKIT=1 docker build -t osmosis-e2e-init-node:debug --build-arg E2E_SCRIPT_NAME=node --platform=linux/x86_64 -f tests/e2e/initialization/init.Dockerfile .
 
 e2e-setup: e2e-check-image-sha e2e-remove-resources
 	@echo Finished e2e environment setup, ready to start the test
diff --git a/x/epochs/go.mod b/x/epochs/go.mod
index 6fc53ac4343..4cdbf3dbabb 100644
--- a/x/epochs/go.mod
+++ b/x/epochs/go.mod
@@ -1,6 +1,8 @@
 module github.com/osmosis-labs/osmosis/x/epochs
 
-go 1.21
+go 1.21.4
+
+toolchain go1.21.5
 
 require (
 	github.com/armon/go-metrics v0.4.1
@@ -9,10 +11,10 @@ require (
 	github.com/cosmos/gogoproto v1.4.11
 	github.com/golang/protobuf v1.5.4
 	github.com/grpc-ecosystem/grpc-gateway v1.16.0
-	github.com/osmosis-labs/osmosis/osmoutils v0.0.12-0.20240423073233-246239a8f662
+	github.com/osmosis-labs/osmosis/osmoutils v0.0.12-0.20240502024814-785ee58ac507
 	github.com/spf13/cobra v1.8.0
 	github.com/stretchr/testify v1.9.0
-	golang.org/x/exp v0.0.0-20230905200255-921286631fa9
+	golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc
 	google.golang.org/genproto/googleapis/api v0.0.0-20240227224415-6ceb2ff114de
 	google.golang.org/grpc v1.63.2
 	google.golang.org/protobuf v1.33.0
@@ -111,7 +113,7 @@ require (
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/mtibben/percent v0.2.1 // indirect
 	github.com/oasisprotocol/curve25519-voi v0.0.0-20220708102147-0a8a51822cae // indirect
-	github.com/osmosis-labs/osmosis/osmomath v0.0.12-0.20240423073233-246239a8f662 // indirect
+	github.com/osmosis-labs/osmosis/osmomath v0.0.12-0.20240502024814-785ee58ac507 // indirect
 	github.com/pelletier/go-toml/v2 v2.1.0 // indirect
 	github.com/petermattis/goid v0.0.0-20230317030725-371a4b8eda08 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
diff --git a/x/epochs/go.sum b/x/epochs/go.sum
index f194bbc9924..53b20cac6a9 100644
--- a/x/epochs/go.sum
+++ b/x/epochs/go.sum
@@ -1012,8 +1012,8 @@ github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtng
 github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
 github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ=
 github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48=
-github.com/hashicorp/go-getter v1.7.1 h1:SWiSWN/42qdpR0MdhaOc/bLR48PLuP1ZQtYLRlM69uY=
-github.com/hashicorp/go-getter v1.7.1/go.mod h1:W7TalhMmbPmsSMdNjD0ZskARur/9GJ17cfHTRtXV744=
+github.com/hashicorp/go-getter v1.7.4 h1:3yQjWuxICvSpYwqSayAdKRFcvBl1y/vogCxczWSmix0=
+github.com/hashicorp/go-getter v1.7.4/go.mod h1:W7TalhMmbPmsSMdNjD0ZskARur/9GJ17cfHTRtXV744=
 github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
 github.com/hashicorp/go-immutable-radix v1.3.1 h1:DKHmCUm2hRBK510BaiZlwvpD40f8bJFeZnpfm2KLowc=
 github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
@@ -1201,8 +1201,8 @@ github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7J
 github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
 github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY=
 github.com/onsi/gomega v1.19.0/go.mod h1:LY+I3pBVzYsTBU1AnDwOSxaYi9WoWiqgwooUqq9yPro=
-github.com/onsi/gomega v1.28.1 h1:MijcGUbfYuznzK/5R4CPNoUP/9Xvuo20sXfEm6XxoTA=
-github.com/onsi/gomega v1.28.1/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ=
+github.com/onsi/gomega v1.31.1 h1:KYppCUK+bUgAZwHOu7EXVBKyQA6ILvOESHkn/tgoqvo=
+github.com/onsi/gomega v1.31.1/go.mod h1:y40C95dwAD1Nz36SsEnxvfFe8FFfNxzI5eJ0EYGyAy0=
 github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk=
 github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
 github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
@@ -1220,14 +1220,14 @@ github.com/openzipkin/zipkin-go v0.2.1/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnh
 github.com/openzipkin/zipkin-go v0.2.2/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4=
 github.com/ory/dockertest v3.3.5+incompatible h1:iLLK6SQwIhcbrG783Dghaaa3WPzGc+4Emza6EbVUUGA=
 github.com/ory/dockertest v3.3.5+incompatible/go.mod h1:1vX4m9wsvi00u5bseYwXaSnhNrne+V0E6LAcBILJdPs=
-github.com/osmosis-labs/cometbft v0.37.4-v24-osmo-2 h1:3k4I3zCxdNP+mjhR7AtKr1PPuGR58CcVTMZN0aV/iL4=
-github.com/osmosis-labs/cometbft v0.37.4-v24-osmo-2/go.mod h1:fE+yBeExsJHA35plOZ7FmC/JejO5UdEHNcwO3dj2wc8=
-github.com/osmosis-labs/cosmos-sdk v0.47.5-v24-osmo-5 h1:fnt89Cw+55vbnIEGkpCmj0cx/EaEnwHfYi4JN3rKkLU=
-github.com/osmosis-labs/cosmos-sdk v0.47.5-v24-osmo-5/go.mod h1:eSRUVYwL3eG1jnh01CnBbHiqOM3xJO49p5rTOrSFX1k=
-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.20240423073233-246239a8f662 h1:evQCSCvgkEXpm3NanU54PK8OtUEPQHCV8EEIbRZ417k=
-github.com/osmosis-labs/osmosis/osmoutils v0.0.12-0.20240423073233-246239a8f662/go.mod h1:1uK78efyukxFZf0JVzU4YSSY4EGO0rignHh/NC/C6l8=
+github.com/osmosis-labs/cometbft v0.37.4-v25-osmo-1 h1:HezZywIk7C9UbCMuqrpBgC0gQi9F1rPtBcf/XzrWXDY=
+github.com/osmosis-labs/cometbft v0.37.4-v25-osmo-1/go.mod h1:p8RohShfTfbvSzgb9zFnqvtCgyLTzqA8otk0I/YDbSg=
+github.com/osmosis-labs/cosmos-sdk v0.47.5-v25-osmo-1 h1:l1Hk4DGxDoBe1YUb7IbwRz/CbzA3wfQZ+j+vz+ed5tM=
+github.com/osmosis-labs/cosmos-sdk v0.47.5-v25-osmo-1/go.mod h1:eSRUVYwL3eG1jnh01CnBbHiqOM3xJO49p5rTOrSFX1k=
+github.com/osmosis-labs/osmosis/osmomath v0.0.12-0.20240502024814-785ee58ac507 h1:LJMTBQBH4Xiz9YzWo9BbxKvQr6Yij0e0z9Mb4X9kQKw=
+github.com/osmosis-labs/osmosis/osmomath v0.0.12-0.20240502024814-785ee58ac507/go.mod h1:iCRNyb2pkXwsr4UdbXJDX4lWkzeUNsIALzagBBTq4wU=
+github.com/osmosis-labs/osmosis/osmoutils v0.0.12-0.20240502024814-785ee58ac507 h1:wCCBw7gvrBQKuKAA+Oi0uLIlqTjSHi5uE0KinpT3wgU=
+github.com/osmosis-labs/osmosis/osmoutils v0.0.12-0.20240502024814-785ee58ac507/go.mod h1:GaDargX3Hg/rthi993uk//ZH9K5+67589UM8h8TF6xY=
 github.com/pact-foundation/pact-go v1.0.4/go.mod h1:uExwJY4kCzNPcHRj+hCR/HBbOOIwwtUjcrb0b5/5kLM=
 github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
 github.com/pascaldekloe/goe v0.1.0 h1:cBOtyMzM9HTpWjXfbbunk26uA6nG3a8n06Wieeh0MwY=
diff --git a/x/ibc-hooks/go.mod b/x/ibc-hooks/go.mod
index 6b25d9fb1a5..58e4cf873cb 100644
--- a/x/ibc-hooks/go.mod
+++ b/x/ibc-hooks/go.mod
@@ -1,6 +1,8 @@
 module github.com/osmosis-labs/osmosis/x/ibc-hooks
 
-go 1.21
+go 1.21.4
+
+toolchain go1.21.5
 
 require (
 	cosmossdk.io/errors v1.0.1
@@ -11,8 +13,8 @@ require (
 	github.com/cosmos/gogoproto v1.4.11
 	github.com/cosmos/ibc-go/v7 v7.4.0
 	github.com/grpc-ecosystem/grpc-gateway v1.16.0
-	github.com/osmosis-labs/osmosis/osmomath v0.0.12-0.20240423073233-246239a8f662
-	github.com/osmosis-labs/osmosis/osmoutils v0.0.12-0.20240423073233-246239a8f662
+	github.com/osmosis-labs/osmosis/osmomath v0.0.12-0.20240502024814-785ee58ac507
+	github.com/osmosis-labs/osmosis/osmoutils v0.0.12-0.20240502024814-785ee58ac507
 	github.com/spf13/cobra v1.8.0
 	google.golang.org/grpc v1.63.2
 	google.golang.org/protobuf v1.33.0
@@ -175,7 +177,7 @@ require (
 	go.opentelemetry.io/otel/trace v1.24.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	golang.org/x/crypto v0.21.0 // indirect
-	golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
+	golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc // indirect
 	golang.org/x/net v0.23.0 // indirect
 	golang.org/x/oauth2 v0.17.0 // indirect
 	golang.org/x/sync v0.6.0 // indirect
diff --git a/x/ibc-hooks/go.sum b/x/ibc-hooks/go.sum
index 015bf890281..8f6a7a355de 100644
--- a/x/ibc-hooks/go.sum
+++ b/x/ibc-hooks/go.sum
@@ -1216,8 +1216,8 @@ github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7J
 github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
 github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY=
 github.com/onsi/gomega v1.19.0/go.mod h1:LY+I3pBVzYsTBU1AnDwOSxaYi9WoWiqgwooUqq9yPro=
-github.com/onsi/gomega v1.28.1 h1:MijcGUbfYuznzK/5R4CPNoUP/9Xvuo20sXfEm6XxoTA=
-github.com/onsi/gomega v1.28.1/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ=
+github.com/onsi/gomega v1.31.1 h1:KYppCUK+bUgAZwHOu7EXVBKyQA6ILvOESHkn/tgoqvo=
+github.com/onsi/gomega v1.31.1/go.mod h1:y40C95dwAD1Nz36SsEnxvfFe8FFfNxzI5eJ0EYGyAy0=
 github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk=
 github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
 github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
@@ -1235,6 +1235,7 @@ github.com/openzipkin/zipkin-go v0.2.1/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnh
 github.com/openzipkin/zipkin-go v0.2.2/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4=
 github.com/ory/dockertest v3.3.5+incompatible h1:iLLK6SQwIhcbrG783Dghaaa3WPzGc+4Emza6EbVUUGA=
 github.com/ory/dockertest v3.3.5+incompatible/go.mod h1:1vX4m9wsvi00u5bseYwXaSnhNrne+V0E6LAcBILJdPs=
+<<<<<<< HEAD
 github.com/osmosis-labs/cometbft v0.37.4-v24-osmo-2 h1:3k4I3zCxdNP+mjhR7AtKr1PPuGR58CcVTMZN0aV/iL4=
 github.com/osmosis-labs/cometbft v0.37.4-v24-osmo-2/go.mod h1:fE+yBeExsJHA35plOZ7FmC/JejO5UdEHNcwO3dj2wc8=
 github.com/osmosis-labs/cosmos-sdk v0.47.5-v24-osmo-5 h1:fnt89Cw+55vbnIEGkpCmj0cx/EaEnwHfYi4JN3rKkLU=
@@ -1243,6 +1244,16 @@ github.com/osmosis-labs/osmosis/osmomath v0.0.12-0.20240423073233-246239a8f662 h
 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.20240423073233-246239a8f662 h1:evQCSCvgkEXpm3NanU54PK8OtUEPQHCV8EEIbRZ417k=
 github.com/osmosis-labs/osmosis/osmoutils v0.0.12-0.20240423073233-246239a8f662/go.mod h1:1uK78efyukxFZf0JVzU4YSSY4EGO0rignHh/NC/C6l8=
+=======
+github.com/osmosis-labs/cometbft v0.37.4-v25-osmo-1 h1:HezZywIk7C9UbCMuqrpBgC0gQi9F1rPtBcf/XzrWXDY=
+github.com/osmosis-labs/cometbft v0.37.4-v25-osmo-1/go.mod h1:p8RohShfTfbvSzgb9zFnqvtCgyLTzqA8otk0I/YDbSg=
+github.com/osmosis-labs/cosmos-sdk v0.47.5-v25-osmo-1 h1:l1Hk4DGxDoBe1YUb7IbwRz/CbzA3wfQZ+j+vz+ed5tM=
+github.com/osmosis-labs/cosmos-sdk v0.47.5-v25-osmo-1/go.mod h1:eSRUVYwL3eG1jnh01CnBbHiqOM3xJO49p5rTOrSFX1k=
+github.com/osmosis-labs/osmosis/osmomath v0.0.12-0.20240502024814-785ee58ac507 h1:LJMTBQBH4Xiz9YzWo9BbxKvQr6Yij0e0z9Mb4X9kQKw=
+github.com/osmosis-labs/osmosis/osmomath v0.0.12-0.20240502024814-785ee58ac507/go.mod h1:iCRNyb2pkXwsr4UdbXJDX4lWkzeUNsIALzagBBTq4wU=
+github.com/osmosis-labs/osmosis/osmoutils v0.0.12-0.20240502024814-785ee58ac507 h1:wCCBw7gvrBQKuKAA+Oi0uLIlqTjSHi5uE0KinpT3wgU=
+github.com/osmosis-labs/osmosis/osmoutils v0.0.12-0.20240502024814-785ee58ac507/go.mod h1:GaDargX3Hg/rthi993uk//ZH9K5+67589UM8h8TF6xY=
+>>>>>>> 27548cca (fix: e2e and remove toolchain (#8191))
 github.com/osmosis-labs/wasmd v0.45.0-osmo h1:NIp7pvJV5HuBN1HwPgEmXKQM2TjVIVdJErIHnB9IMO8=
 github.com/osmosis-labs/wasmd v0.45.0-osmo/go.mod h1:J6eRvwii5T1WxhetZkBg1kOJS3GTn1Bw2OLyZBb8EVU=
 github.com/pact-foundation/pact-go v1.0.4/go.mod h1:uExwJY4kCzNPcHRj+hCR/HBbOOIwwtUjcrb0b5/5kLM=