diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml
index 647d2204440..688d0eec587 100644
--- a/.github/ISSUE_TEMPLATE/bug.yml
+++ b/.github/ISSUE_TEMPLATE/bug.yml
@@ -8,7 +8,7 @@ body:
       value: |
         Thanks for taking the time to fill out this bug report!
         Before smashing the submit button please review the template.
-        Please also ensure that this is not a duplicate issue :)  
+        Please also ensure that this is not a duplicate issue :)
 
   - type: textarea
     id: what-happened
@@ -33,4 +33,4 @@ body:
       description: If applicable could you describe how we could reproduce the bug
       placeholder: Tell us what how to reproduce the bug!
     validations:
-      required: false
\ No newline at end of file
+      required: false
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index a49eab2f6b9..0086358db1e 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1 +1 @@
-blank_issues_enabled: true
\ No newline at end of file
+blank_issues_enabled: true
diff --git a/.github/ISSUE_TEMPLATE/documentation.yml b/.github/ISSUE_TEMPLATE/documentation.yml
index 5e1c3423bb7..8f52fe62195 100644
--- a/.github/ISSUE_TEMPLATE/documentation.yml
+++ b/.github/ISSUE_TEMPLATE/documentation.yml
@@ -6,7 +6,7 @@ body:
   - type: markdown
     attributes:
       value: |
-        ✰  Thanks for opening an issue! ✰    
+        ✰  Thanks for opening an issue! ✰
         Tell us where what you would like to see get added to the documentation or if there is an error in the documentation?
 
   - type: textarea
diff --git a/.github/ISSUE_TEMPLATE/epics.yml b/.github/ISSUE_TEMPLATE/epics.yml
index a8fb1837881..01fe8a31afc 100644
--- a/.github/ISSUE_TEMPLATE/epics.yml
+++ b/.github/ISSUE_TEMPLATE/epics.yml
@@ -1,4 +1,3 @@
-
 name: Epic
 description: Create an epic/user
 title: "[Epic]: "
@@ -15,7 +14,7 @@ body:
       label: Summary
       description: |
         What are the user needs?
-        How could this solution fix the user facing problem? 
+        How could this solution fix the user facing problem?
       placeholder: Short, concise description of the proposed feature/changes to the repository
     validations:
       required: true
@@ -24,7 +23,7 @@ body:
     attributes:
       label: Problem Definition
       description: |
-        Why do we need this feature? 
+        Why do we need this feature?
         What problems may be addressed by introducing this feature?
         What benefits does the SDK stand to gain by including this feature?
         Are there any disadvantages of including this feature?
@@ -36,7 +35,7 @@ body:
     attributes:
       label: Work Breakdown
       description: |
-        Break the work into many bullet points that will later be turned into issues that can be assigned to developers to work on 
+        Break the work into many bullet points that will later be turned into issues that can be assigned to developers to work on
         This work may been to be broken up into phases of work in order to better organize when and how things get done.
       placeholder: Description of the steps needed to deliver this feature
     validations:
diff --git a/.github/ISSUE_TEMPLATE/feature-request.yml b/.github/ISSUE_TEMPLATE/feature-request.yml
index 02333497fda..4730e761dbc 100644
--- a/.github/ISSUE_TEMPLATE/feature-request.yml
+++ b/.github/ISSUE_TEMPLATE/feature-request.yml
@@ -6,14 +6,14 @@ body:
   - type: markdown
     attributes:
       value: |
-       ✰  Thanks for opening an issue! ✰  
+        ✰  Thanks for opening an issue! ✰
   - type: textarea
     id: summary
     attributes:
       label: Summary
       description: |
         What are the user needs?
-        How could this solution fix the user facing problem? 
+        How could this solution fix the user facing problem?
       placeholder: Short, concise description of the proposed feature/changes to the repository
     validations:
       required: true
@@ -23,7 +23,7 @@ body:
       label: Problem Definition
       description: |
         If applicable please answer the below questions
-        Why do we need this feature? 
+        Why do we need this feature?
         What problems may be addressed by introducing this feature?
         What benefits does the Osmosis stand to gain by including this feature?
         Are there any disadvantages of including this feature?
diff --git a/.github/ISSUE_TEMPLATE/general-issue.md b/.github/ISSUE_TEMPLATE/general-issue.md
index 86d1fd03d11..2659bcbcf09 100644
--- a/.github/ISSUE_TEMPLATE/general-issue.md
+++ b/.github/ISSUE_TEMPLATE/general-issue.md
@@ -5,7 +5,7 @@ title: ''
 assignees: ''
 ---
 <!-- < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < ☺
-v                               ✰  Thanks for creating an issue! ✰    
+v                               ✰  Thanks for creating an issue! ✰
 ☺ > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > >  -->
 
 ## Background
diff --git a/.github/labeler.yml b/.github/labeler.yml
index 26b7629a4a1..eabdef8be5f 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -2,119 +2,119 @@
 # until this file is merged into main. This is due to oddities of the labeler Github Action.
 "C:app-wiring":
   - changed-files:
-    - any-glob-to-any-file:
-      # Match all of app folder except wasm sub-folder
-      - app/*.go
-      - app/apptesting/**
-      - app/keepers/**
-      - app/params/**
-      - app/upgrades/**
-      # Also match any module.go update
-      - x/**/module.go
+      - any-glob-to-any-file:
+          # Match all of app folder except wasm sub-folder
+          - app/*.go
+          - app/apptesting/**
+          - app/keepers/**
+          - app/params/**
+          - app/upgrades/**
+          # Also match any module.go update
+          - x/**/module.go
 "C:simulator":
   - changed-files:
-    - any-glob-to-any-file:
-      # Match all of simulation & tests/simulator folder
-      - simulation/**
-      - tests/simulator/**
-      # Match any module update
-      - x/**/simulation/*.go
+      - any-glob-to-any-file:
+          # Match all of simulation & tests/simulator folder
+          - simulation/**
+          - tests/simulator/**
+          # Match any module update
+          - x/**/simulation/*.go
 "C:wasm":
   - changed-files:
-    - any-glob-to-any-file:
-      # Match all of app/wasm folder
-      - app/wasm/**
+      - any-glob-to-any-file:
+          # Match all of app/wasm folder
+          - app/wasm/**
 "C:x/claim":
   - changed-files:
-    - any-glob-to-any-file:
-      # Match all of x/claim folder
-      - x/claim/**
+      - any-glob-to-any-file:
+          # Match all of x/claim folder
+          - x/claim/**
 "C:x/concentrated-liquidity":
   - changed-files:
-    - any-glob-to-any-file:
-      # Match all of x/concentrated-liquidity folder
-      - x/concentrated-liquidity/**
+      - any-glob-to-any-file:
+          # Match all of x/concentrated-liquidity folder
+          - x/concentrated-liquidity/**
 "C:x/epochs":
   - changed-files:
-    - any-glob-to-any-file:
-      # Match all of x/epochs folder
-      - x/epochs/**
+      - any-glob-to-any-file:
+          # Match all of x/epochs folder
+          - x/epochs/**
 "C:x/gamm":
   - changed-files:
-    - any-glob-to-any-file:
-      # Match all of x/gamm folder
-      - x/gamm/**
+      - any-glob-to-any-file:
+          # Match all of x/gamm folder
+          - x/gamm/**
 "C:x/incentives":
   - changed-files:
-    - any-glob-to-any-file:
-      # Match all of x/incentives folder
-      - x/incentives/**
+      - any-glob-to-any-file:
+          # Match all of x/incentives folder
+          - x/incentives/**
 "C:x/lockup":
   - changed-files:
-    - any-glob-to-any-file:
-      # Match all of x/lockup folder
-      - x/lockup/**
+      - any-glob-to-any-file:
+          # Match all of x/lockup folder
+          - x/lockup/**
 "C:x/mint":
   - changed-files:
-    - any-glob-to-any-file:
-      # Match all of x/mint folder
-      - x/mint/**
+      - any-glob-to-any-file:
+          # Match all of x/mint folder
+          - x/mint/**
 "C:x/pool-incentives":
   - changed-files:
-    - any-glob-to-any-file:
-      # Match all of x/pool-incentives folder
-      - x/pool-incentives/**
+      - any-glob-to-any-file:
+          # Match all of x/pool-incentives folder
+          - x/pool-incentives/**
 "C:x/superfluid":
   - changed-files:
-    - any-glob-to-any-file:
-      # Match all of x/superfluid folder
-      - x/superfluid/**
+      - any-glob-to-any-file:
+          # Match all of x/superfluid folder
+          - x/superfluid/**
 "C:x/poolmanager":
   - changed-files:
-    - any-glob-to-any-file:
-      # Match all of x/poolmanager folder
-      - x/poolmanager/**
+      - any-glob-to-any-file:
+          # Match all of x/poolmanager folder
+          - x/poolmanager/**
 "C:x/txfees":
   - changed-files:
-    - any-glob-to-any-file:
-      # Match all of x/txfees folder
-      - x/txfees/**
+      - any-glob-to-any-file:
+          # Match all of x/txfees folder
+          - x/txfees/**
 "C:x/tokenfactory":
   - changed-files:
-    - any-glob-to-any-file:
-      # Match all of x/tokenfactory folder
-      - x/tokenfactory/**
+      - any-glob-to-any-file:
+          # Match all of x/tokenfactory folder
+          - x/tokenfactory/**
 "C:x/twap":
   - changed-files:
-    - any-glob-to-any-file:
-      # Match all of x/twap folder
-      - x/twap/**
+      - any-glob-to-any-file:
+          # Match all of x/twap folder
+          - x/twap/**
 "T:build":
   - changed-files:
-    - any-glob-to-any-file:
-      - Makefile
-      - Dockerfile
-      - scripts/*
+      - any-glob-to-any-file:
+          - Makefile
+          - Dockerfile
+          - scripts/*
 "T:CI":
   - changed-files:
-    - any-glob-to-any-file:
-    # Match all of the CI files
-      - .github/**/*.yml
-      - .mergify.yml
-      - .golangci.yml
+      - any-glob-to-any-file:
+          # Match all of the CI files
+          - .github/**/*.yml
+          - .mergify.yml
+          - .golangci.yml
 "C:CLI":
   - changed-files:
-    - any-glob-to-any-file:
-      - client/**
-      - x/*/client/**
+      - any-glob-to-any-file:
+          - client/**
+          - x/*/client/**
 # Add "C:docs" label to documented related files and directories.
 "C:docs":
   - changed-files:
-    - any-glob-to-any-file:
-      - bug.md
-      - issue.md
-      - proto-docs.md
-      - README.md
-      - x/**/*.md
-      - x/**/*/*.md
-      - tests/**/*.md
\ No newline at end of file
+      - any-glob-to-any-file:
+          - bug.md
+          - issue.md
+          - proto-docs.md
+          - README.md
+          - x/**/*.md
+          - x/**/*/*.md
+          - tests/**/*.md
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 930306eac32..dac08108ecd 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,5 +1,5 @@
 <!-- < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < ☺
-v                               ✰  Thanks for creating a PR! ✰    
+v                               ✰  Thanks for creating a PR! ✰
 v    Before smashing the submit button please review the checkboxes.
 v    If a checkbox is n/a - please still include it but + a little note why
 v    If your PR doesn't close an issue, that's OK!  Just remove the Closes: #XXX line!
@@ -38,7 +38,7 @@ This change added tests and can be verified as follows:
   - [ ] Does this pull request introduce a new feature or user-facing behavior changes?
   - [ ] Changelog entry added to `Unreleased` section of `CHANGELOG.md`?
 
-Where is the change documented? 
+Where is the change documented?
   - [ ] Specification (`x/{module}/README.md`)
   - [ ] Osmosis documentation site
   - [ ] Code comments?
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 1facbaef2b8..9c11e40f104 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -40,11 +40,9 @@ jobs:
             arch: arm64
 
     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: |
@@ -55,8 +53,7 @@ jobs:
             go.sum
             Makefile
             .github/workflows/build.yml
-      -
-        name: 🐿 Setup Golang
+      - name: 🐿 Setup Golang
         uses: actions/setup-go@v5
         if: env.GIT_DIFF
         with:
@@ -64,17 +61,14 @@ jobs:
         env:
           GOOS: ${{ matrix.targetos }}
           GOARCH: ${{ matrix.arch }}
-      -
-        name: Download Dependencies
+      - name: Download Dependencies
         if: env.GIT_DIFF
         run: go mod download
-      -
-        name: Build osmosisd
+      - name: Build osmosisd
         if: env.GIT_DIFF
         run: |
           GOWRK=off go build cmd/osmosisd/main.go
-      -
-        name: Upload osmosisd artifact
+      - name: Upload osmosisd artifact
         if: env.GIT_DIFF
         uses: actions/upload-artifact@v3
         with:
diff --git a/.github/workflows/check-broken-links.yml b/.github/workflows/check-broken-links.yml
index 7a4fda0c87c..da101c5c11b 100644
--- a/.github/workflows/check-broken-links.yml
+++ b/.github/workflows/check-broken-links.yml
@@ -2,8 +2,8 @@ name: Check Broken Links
 
 on:
   schedule:
-    - cron: '0 10 1,15 * *' # Run on 1st and 15th days of every month at 10:00 UTC
-  workflow_dispatch:   # Allow manual triggering of the workflow
+    - cron: "0 10 1,15 * *" # Run on 1st and 15th days of every month at 10:00 UTC
+  workflow_dispatch: # Allow manual triggering of the workflow
 
 jobs:
   check_links:
diff --git a/.github/workflows/check-state-compatibility.yml b/.github/workflows/check-state-compatibility.yml
index fef004d1c67..2dccafa22bb 100644
--- a/.github/workflows/check-state-compatibility.yml
+++ b/.github/workflows/check-state-compatibility.yml
@@ -46,7 +46,6 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-
   # Compare current mainnet osmosis major version with the major version of github branch
   # Skip the next job if the current github major is greater than the current mainnet major
   compare_versions:
@@ -55,8 +54,7 @@ jobs:
       should_i_run: ${{ steps.compare_versions.outputs.should_i_run }}
       mainnet_major_version: ${{ steps.mainnet_version.outputs.mainnet_major_version }}
     steps:
-      -
-        name: Get mainnet major version
+      - name: Get mainnet major version
         id: mainnet_version
         run: |
           RPC_ABCI_INFO=$(curl -s --retry 5 --retry-delay 5 --connect-timeout 30 -H "Accept: application/json" ${{ env.RPC_ENDPOINT }}/abci_info)
@@ -64,15 +62,14 @@ jobs:
 
           echo "MAINNET_MAJOR_VERSION=$MAINNET_MAJOR_VERSION" >> $GITHUB_ENV
           echo "mainnet_major_version=$MAINNET_MAJOR_VERSION" >> $GITHUB_OUTPUT
-      -
-        name: Get GitHub branch major version
+      - name: Get GitHub branch major version
         id: compare_versions
         run: |
           CURRENT_BRANCH_MAJOR_VERSION=$(echo ${{ github.event.pull_request.base.ref }} | tr -dc '0-9')
           SHOULD_I_RUN=$(( $CURRENT_BRANCH_MAJOR_VERSION <= $MAINNET_MAJOR_VERSION ))
 
           echo -n "Mainnet version: $MAINNET_MAJOR_VERSION | Branch version: $CURRENT_BRANCH_MAJOR_VERSION | Should I run: "
-          if (( $CURRENT_BRANCH_MAJOR_VERSION <= $MAINNET_MAJOR_VERSION )); 
+          if (( $CURRENT_BRANCH_MAJOR_VERSION <= $MAINNET_MAJOR_VERSION ));
           then
             echo 'should_i_run=true' >> $GITHUB_OUTPUT;
             echo "true"
@@ -87,31 +84,25 @@ jobs:
     timeout-minutes: 20
     if: ${{ needs.compare_versions.outputs.should_i_run == 'true'}}
     steps:
-      -
-        name: Get chain major version
+      - name: Get chain major version
         run: |
           echo "MAINNET_MAJOR_VERSION=${{ needs.compare_versions.outputs.mainnet_major_version }}" >> $GITHUB_ENV
-      -
-        name: Checkout ref
+      - name: Checkout ref
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      -
-        name: 🐿 Setup Golang
+      - name: 🐿 Setup Golang
         uses: buildjet/setup-go@v5
         with:
           go-version-file: go.mod
-      -
-        name: 🔨 Build the osmosisd binary
+      - name: 🔨 Build the osmosisd binary
         run: |
           make build
           build/osmosisd version
-      -
-        name: 🧪 Initialize Osmosis Node
-        run:  |
+      - name: 🧪 Initialize Osmosis Node
+        run: |
           build/osmosisd init runner -o --home ${{ runner.temp }}/.osmosisd/
-      -
-        name: ⏬ Download last pre-epoch snapshot
+      - name: ⏬ Download last pre-epoch snapshot
         run: |
           REPO_MAJOR_VERSION=$(echo ${{ github.base_ref }} | sed 's/\.x//')
           SNAPSHOT_INFO_URL=${{ env.SNAPSHOT_BUCKET }}/$REPO_MAJOR_VERSION/snapshots.json
@@ -124,9 +115,8 @@ jobs:
           # Download snapshot
           sudo apt install lz4 -y
           wget -q -O - $SNAPSHOT_URL | lz4 -d | tar -C ${{ runner.temp }}/.osmosisd/ -xvf -
-      -
-        name: ⏬ Download genesis and addrbook
-        run:  |
+      - name: ⏬ Download genesis and addrbook
+        run: |
           CONFIG_FOLDER=${{ runner.temp }}/.osmosisd/config
 
           # Download genesis
@@ -134,8 +124,7 @@ jobs:
 
           # Download addrbook
           wget -O $CONFIG_FOLDER/addrbook.json ${{ env.ADDRBOOK_URL }}
-      -
-        name: 🧪 Configure Osmosis Node
+      - name: 🧪 Configure Osmosis Node
         run: |
           CONFIG_FOLDER=${{ runner.temp }}/.osmosisd/config
           REPO_MAJOR_VERSION=$(echo ${{ github.base_ref }} | tr -dc '0-9')
@@ -168,16 +157,14 @@ jobs:
           # Edit app.toml for pruning, and snapshot onfigurations
           sed -i '/^pruning =/c\pruning = "everything"' $CONFIG_FOLDER/app.toml
           sed -i '/^snapshot-interval =/c\snapshot-interval = 0' $CONFIG_FOLDER/app.toml
-      -
-        name: 🧪 Start Osmosis Node in the background
+      - name: 🧪 Start Osmosis Node in the background
         run: |
           mkdir ${{ runner.temp }}/logs
 
           build/osmosisd start \
             --home ${{ runner.temp }}/.osmosisd > ${{ runner.temp }}/logs/osmosis.log 2>&1 &
           echo $! > ${{ runner.temp }}/osmosis_pid.txt
-      -
-        name: ⏳ Wait for Chain to start
+      - name: ⏳ Wait for Chain to start
         run: |
           echo -n "Waiting for chain to start"
 
@@ -189,8 +176,7 @@ jobs:
               exit 1
             fi
           done
-      -
-        name: ⏳ Wait for Chain to reach target height
+      - name: ⏳ Wait for Chain to reach target height
         run: |
           until $(curl --output /dev/null --silent --head --fail http://localhost:26657/status) && [ $(curl -s http://localhost:26657/status | jq -r '.result.sync_info.latest_block_height') -ge $TARGET_HEIGHT ]; do
 
@@ -204,8 +190,7 @@ jobs:
 
             sleep 1
           done
-      -
-        name: 📤 Upload Upgrade Logs as Artifacts
+      - name: 📤 Upload Upgrade Logs as Artifacts
         if: ${{ always() }}
         uses: actions/upload-artifact@v4
         with:
diff --git a/.github/workflows/cleanup-cache.yaml b/.github/workflows/cleanup-cache.yaml
index ddfcafccf85..a35db4c4b1c 100644
--- a/.github/workflows/cleanup-cache.yaml
+++ b/.github/workflows/cleanup-cache.yaml
@@ -1,5 +1,5 @@
-# This workflow is designed to automate the cleanup of caches 
-# created by a branch when a pull request is closed. 
+# This workflow is designed to automate the cleanup of caches
+# created by a branch when a pull request is closed.
 #
 # From: https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows#force-deleting-cache-entries
 
@@ -13,21 +13,19 @@ jobs:
   cleanup:
     runs-on: ubuntu-latest
     steps:
-      - 
-        name: Check out code
+      - name: Check out code
         uses: actions/checkout@v4
-      - 
-        name: Cache Cleanup
+      - name: Cache Cleanup
         run: |
           gh extension install actions/gh-actions-cache
-          
+
           REPO=${{ github.repository }}
           BRANCH="refs/pull/${{ github.event.pull_request.number }}/merge"
 
           echo "Fetching list of cache key"
           cacheKeysForPR=$(gh actions-cache list -R $REPO -B $BRANCH | cut -f 1 )
 
-          ## Setting this to not fail the workflow while deleting cache keys. 
+          ## Setting this to not fail the workflow while deleting cache keys.
           set +e
           echo "Deleting caches..."
           for cacheKey in $cacheKeysForPR
diff --git a/.github/workflows/codespell.yml b/.github/workflows/codespell.yml
index 9d7b3422650..1b50abc98da 100644
--- a/.github/workflows/codespell.yml
+++ b/.github/workflows/codespell.yml
@@ -13,16 +13,16 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - name: Checkout code
-      uses: actions/checkout@v4
+      - name: Checkout code
+        uses: actions/checkout@v4
 
-    - name: Set up Python
-      uses: actions/setup-python@v5
-      with:
-        python-version: '3.x'
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.x"
 
-    - name: Install codespell
-      run: pip install codespell
+      - name: Install codespell
+        run: pip install codespell
 
-    - name: Run codespell
-      run: codespell
+      - name: Run codespell
+        run: codespell
diff --git a/.github/workflows/contracts.yml b/.github/workflows/contracts.yml
index 70a366c8cdd..1d7cdcd93fa 100644
--- a/.github/workflows/contracts.yml
+++ b/.github/workflows/contracts.yml
@@ -36,12 +36,33 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        contract: [
-          {workdir: ./x/ibc-rate-limit/, bytecode: x/ibc-rate-limit/bytecode/rate_limiter.wasm, build: artifacts/rate_limiter.wasm, name: rate_limiter},
-          {workdir: ./cosmwasm/, bytecode: tests/ibc-hooks/bytecode/crosschain_swaps.wasm, build: artifacts/crosschain_swaps.wasm, name: crosschain_swaps},
-          {workdir: ./cosmwasm/, bytecode: tests/ibc-hooks/bytecode/swaprouter.wasm, build: artifacts/swaprouter.wasm, name: swaprouter},
-          {workdir: ./cosmwasm/, bytecode: tests/ibc-hooks/bytecode/outpost.wasm, build: artifacts/outpost.wasm, name: outpost},
-        ]
+        contract:
+          [
+            {
+              workdir: ./x/ibc-rate-limit/,
+              bytecode: x/ibc-rate-limit/bytecode/rate_limiter.wasm,
+              build: artifacts/rate_limiter.wasm,
+              name: rate_limiter,
+            },
+            {
+              workdir: ./cosmwasm/,
+              bytecode: tests/ibc-hooks/bytecode/crosschain_swaps.wasm,
+              build: artifacts/crosschain_swaps.wasm,
+              name: crosschain_swaps,
+            },
+            {
+              workdir: ./cosmwasm/,
+              bytecode: tests/ibc-hooks/bytecode/swaprouter.wasm,
+              build: artifacts/swaprouter.wasm,
+              name: swaprouter,
+            },
+            {
+              workdir: ./cosmwasm/,
+              bytecode: tests/ibc-hooks/bytecode/outpost.wasm,
+              build: artifacts/outpost.wasm,
+              name: outpost,
+            },
+          ]
 
     steps:
       - name: Checkout sources
@@ -55,14 +76,14 @@ jobs:
             --mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
             cosmwasm/workspace-optimizer:0.12.10
 
-      - name: 'Upload optimized contract artifact'
+      - name: "Upload optimized contract artifact"
         uses: actions/upload-artifact@v3
         with:
           name: ${{ matrix.contract.name }}
           path: ${{ matrix.contract.workdir }}${{ matrix.contract.build }}
           retention-days: 1
 
-      - name: 'Upload Cargo.lock artifact'
+      - name: "Upload Cargo.lock artifact"
         uses: actions/upload-artifact@v3
         with:
           name: Cargo.lock
@@ -81,12 +102,33 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        contract: [
-          {workdir: ./x/ibc-rate-limit/, bytecode: x/ibc-rate-limit/bytecode/rate_limiter.wasm, build: artifacts/rate_limiter.wasm, name: rate_limiter},
-          {workdir: ./cosmwasm/, bytecode: tests/ibc-hooks/bytecode/crosschain_swaps.wasm, build: artifacts/crosschain_swaps.wasm, name: crosschain_swaps},
-          {workdir: ./cosmwasm/, bytecode: tests/ibc-hooks/bytecode/swaprouter.wasm, build: artifacts/swaprouter.wasm, name: swaprouter},
-          {workdir: ./cosmwasm/, bytecode: tests/ibc-hooks/bytecode/outpost.wasm, build: artifacts/outpost.wasm, name: outpost},
-        ]
+        contract:
+          [
+            {
+              workdir: ./x/ibc-rate-limit/,
+              bytecode: x/ibc-rate-limit/bytecode/rate_limiter.wasm,
+              build: artifacts/rate_limiter.wasm,
+              name: rate_limiter,
+            },
+            {
+              workdir: ./cosmwasm/,
+              bytecode: tests/ibc-hooks/bytecode/crosschain_swaps.wasm,
+              build: artifacts/crosschain_swaps.wasm,
+              name: crosschain_swaps,
+            },
+            {
+              workdir: ./cosmwasm/,
+              bytecode: tests/ibc-hooks/bytecode/swaprouter.wasm,
+              build: artifacts/swaprouter.wasm,
+              name: swaprouter,
+            },
+            {
+              workdir: ./cosmwasm/,
+              bytecode: tests/ibc-hooks/bytecode/outpost.wasm,
+              build: artifacts/outpost.wasm,
+              name: outpost,
+            },
+          ]
 
     steps:
       - name: Checkout sources
@@ -130,4 +172,3 @@ jobs:
         working-directory: ${{ matrix.workdir }}
         run: >
           cargo clippy -- -D warnings
-
diff --git a/.github/workflows/delete-workflow-runs.yml b/.github/workflows/delete-workflow-runs.yml
index 6ecdae1ba03..2f30dc68ded 100644
--- a/.github/workflows/delete-workflow-runs.yml
+++ b/.github/workflows/delete-workflow-runs.yml
@@ -5,24 +5,24 @@ name: Delete old workflow runs
 
 on:
   schedule:
-    - cron: "0 0 * * 0"  # Run at 00:00 UTC every Sunday
+    - cron: "0 0 * * 0" # Run at 00:00 UTC every Sunday
 
   workflow_dispatch:
     inputs:
       days:
-        description: 'Number of days.'
+        description: "Number of days."
         required: true
       minimum_runs:
-        description: 'The minimum runs to keep for each workflow.'
+        description: "The minimum runs to keep for each workflow."
         required: true
       delete_workflow_pattern:
-        description: 'The name or filename of the workflow. if not set then it will target all workflows.'
+        description: "The name or filename of the workflow. if not set then it will target all workflows."
         required: false
-        default: 'all'
+        default: "all"
       delete_workflow_by_state_pattern:
-        description: 'Remove workflow by state: active, deleted, disabled_fork, disabled_inactivity, disabled_manually'
+        description: "Remove workflow by state: active, deleted, disabled_fork, disabled_inactivity, disabled_manually"
         required: false
-        default: 'all'
+        default: "all"
         type: choice
         options:
           - all
@@ -31,9 +31,9 @@ on:
           - disabled_inactivity
           - disabled_manually
       delete_run_by_conclusion_pattern:
-        description: 'Remove workflow by conclusion: action_required, cancelled, failure, skipped, success'
+        description: "Remove workflow by conclusion: action_required, cancelled, failure, skipped, success"
         required: false
-        default: 'all'
+        default: "all"
         type: choice
         options:
           - all
@@ -43,9 +43,9 @@ on:
           - skipped
           - success
       dry_run:
-        description: 'Only log actions, do not perform any delete operations.'
+        description: "Only log actions, do not perform any delete operations."
         required: false
-        default: false
+        default: "false"
 
 jobs:
   del_runs:
@@ -53,14 +53,12 @@ jobs:
     permissions:
       actions: write
     steps:
-      - 
-        name: Set defaults for scheduled runs
+      - name: Set defaults for scheduled runs
         if: github.event_name == 'schedule'
         run: |
           echo "::set-input name=days::30"
           echo "::set-input name=minimum_runs::6"
-      - 
-        name: Delete workflow runs
+      - name: Delete workflow runs
         uses: Mattraks/delete-workflow-runs@v2
         with:
           token: ${{ github.token }}
diff --git a/.github/workflows/e2e-full.yml b/.github/workflows/e2e-full.yml
index a05ad17d159..7baf39dce9b 100644
--- a/.github/workflows/e2e-full.yml
+++ b/.github/workflows/e2e-full.yml
@@ -13,11 +13,9 @@ jobs:
   get_diff:
     runs-on: ubuntu-latest
     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: |
@@ -28,8 +26,7 @@ jobs:
             Makefile
             Dockerfile
             .github/workflows/e2e-full.yml
-      -
-        name: Set output
+      - name: Set output
         id: vars
         run: echo "::set-output name=git_diff::$GIT_DIFF"
     outputs:
@@ -41,19 +38,15 @@ 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: Build e2e image
+      - name: Build e2e image
         uses: docker/build-push-action@v5
         with:
           load: true
@@ -62,25 +55,20 @@ jobs:
           build-args: |
             BASE_IMG_TAG=debug
             BUILD_TAGS="netgo,muslc,excludeIncrement"
-      -
-        name: Test e2e and Upgrade
+      - name: Test e2e and Upgrade
         run: make test-e2e-ci-scheduled
-      -
-        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:
           name: logs.tgz
           path: ./logs.tgz
-  
diff --git a/.github/workflows/e2e-initialization-instructions.yaml b/.github/workflows/e2e-initialization-instructions.yaml
index 3bc5a76595f..5238edf56fe 100644
--- a/.github/workflows/e2e-initialization-instructions.yaml
+++ b/.github/workflows/e2e-initialization-instructions.yaml
@@ -1,13 +1,13 @@
 # Workflow: E2E Initialization Instructions
 #
-# Guides contributors when changes are made to the 'tests/e2e/initialization' module. 
+# Guides contributors when changes are made to the 'tests/e2e/initialization' module.
 # Provides backporting and follow-up instructions in the PR comments.
 #
-# Triggers: 
+# Triggers:
 # - Pull Request Opened, Synchronized, Reopened
 # - Path: 'tests/e2e/initialization/**' (any file in the initialization directory or subdirectories)
 #
-# Secrets: 
+# Secrets:
 # GITHUB_TOKEN: Created automatically by GitHub, used for commenting on the PR
 
 name: E2E Initialization Instructions
@@ -19,10 +19,10 @@ on:
       - synchronize
       - reopened
     paths:
-      - 'tests/e2e/initialization/**'
+      - "tests/e2e/initialization/**"
 
-permissions: 
-  pull-requests: write 
+permissions:
+  pull-requests: write
 
 jobs:
   comment:
@@ -30,16 +30,14 @@ jobs:
       pull-requests: write
     runs-on: ubuntu-latest
     steps:
-      - 
-        name: Checkout code
+      - name: Checkout code
         uses: actions/checkout@v4
-      - 
-        name: Comment on PR
+      - name: Comment on PR
         uses: thollander/actions-comment-pull-request@v2
         with:
           message: |
-            **Important Notice** 
-            
+            **Important Notice**
+
             This PR includes modifications to the `tests/e2e/initialization` module.
             Please follow the instructions below:
 
@@ -48,7 +46,7 @@ jobs:
             3. Merge the backported changes.
             4. The image will be built and uploaded to Docker Hub [here](https://hub.docker.com/r/osmolabs/osmosis-e2e-init-chain/tags).
             5. Grab the latest image and update it in the PR to the main branch replacing the `previousVersionInitTag` in the `osmosis/tests/e2e/containers/config.go`
-            
+
             Please let us know if you need any help.
           mode: upsert
           comment_tag: instructions
diff --git a/.github/workflows/gen-upgrade-on-manual-input.yml b/.github/workflows/gen-upgrade-on-manual-input.yml
index de19cca7f08..6d205c3d1f2 100644
--- a/.github/workflows/gen-upgrade-on-manual-input.yml
+++ b/.github/workflows/gen-upgrade-on-manual-input.yml
@@ -24,19 +24,17 @@ jobs:
   post_release:
     runs-on: ubuntu-latest
     steps:
-      - 
-        name: Checkout
+      - name: Checkout
         uses: actions/checkout@v4
-      - 
-        name: 🐿 Setup Golang
+      - name: 🐿 Setup Golang
         uses: actions/setup-go@v5
         with:
-          go-version: '^1.20'
+          go-version: '^1.21'
       - 
         name: Specify input
         run: |
           env=${{ inputs.version }}
-          if [[ $env != '' ]]; then 
+          if [[ $env != '' ]]; then
             echo $env
             echo "input=$env" >> $GITHUB_ENV
           else
diff --git a/.github/workflows/generate-docs.yml b/.github/workflows/generate-docs.yml
index 502c5eeb17c..add0e7d5ad7 100644
--- a/.github/workflows/generate-docs.yml
+++ b/.github/workflows/generate-docs.yml
@@ -2,7 +2,7 @@ name: Update Docs
 
 on:
   schedule:
-    - cron: '0 0 * * 1'
+    - cron: "0 0 * * 1"
   workflow_dispatch:
 
 jobs:
@@ -10,46 +10,46 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - name: Check out code
-      uses: actions/checkout@v4
-
-    - name: Set up Go
-      uses: actions/setup-go@v5
-      with:
-        go-version: 1.18 
-
-    - name: Install Protoc
-      run: |
-        sudo apt-get update -y
-        sudo apt-get install -y protobuf-compiler
-
-    - name: Install Protoc-gen-swagger
-      run: |
-        go install github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger@latest
-
-    - name: Install Statik
-      run: |
-        sudo apt-get update -y
-        sudo apt-get install -y golang-statik
-
-    - name: Install Buf
-      run: |
-        curl -sSL https://github.com/bufbuild/buf/releases/download/v1.0.0-rc5/buf-Linux-x86_64 -o buf
-        chmod +x buf
-        sudo mv buf /usr/local/bin
-
-    - name: Download dependencies
-      run: go mod download
-
-    - name: Run make docs
-      run: |
-        make docs
-
-    - name: Create Pull Request
-      uses: peter-evans/create-pull-request@v6
-      with:
-        token: ${{ secrets.GITHUB_TOKEN }}
-        commit-message: Update docs
-        title: 'Update docs'
-        body: 'Update docs'
-        branch: 'docs-update-branch'
+      - name: Check out code
+        uses: actions/checkout@v4
+
+      - name: Set up Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: 1.18
+
+      - name: Install Protoc
+        run: |
+          sudo apt-get update -y
+          sudo apt-get install -y protobuf-compiler
+
+      - name: Install Protoc-gen-swagger
+        run: |
+          go install github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger@latest
+
+      - name: Install Statik
+        run: |
+          sudo apt-get update -y
+          sudo apt-get install -y golang-statik
+
+      - name: Install Buf
+        run: |
+          curl -sSL https://github.com/bufbuild/buf/releases/download/v1.0.0-rc5/buf-Linux-x86_64 -o buf
+          chmod +x buf
+          sudo mv buf /usr/local/bin
+
+      - name: Download dependencies
+        run: go mod download
+
+      - name: Run make docs
+        run: |
+          make docs
+
+      - name: Create Pull Request
+        uses: peter-evans/create-pull-request@v6
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          commit-message: Update docs
+          title: "Update docs"
+          body: "Update docs"
+          branch: "docs-update-branch"
diff --git a/.github/workflows/go-mod-auto-bump.yml b/.github/workflows/go-mod-auto-bump.yml
index 16fb63651c9..0c2c31ec7ab 100644
--- a/.github/workflows/go-mod-auto-bump.yml
+++ b/.github/workflows/go-mod-auto-bump.yml
@@ -35,7 +35,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
-          go-version: ">=1.20.0"
+          go-version: ">=1.21.0"
       - name: Fetch branches and checkout target
         run: |
           git fetch origin ${{ inputs.target-branch }}
diff --git a/.github/workflows/go-mod-auto-update-instructions.yaml b/.github/workflows/go-mod-auto-update-instructions.yaml
index 9647c61135e..1470d6522b0 100644
--- a/.github/workflows/go-mod-auto-update-instructions.yaml
+++ b/.github/workflows/go-mod-auto-update-instructions.yaml
@@ -3,10 +3,10 @@
 # Guides contributors when changes are made to our in-repo Go modules.
 # Links the manual GitHub action to run that updates the Go mods.
 #
-# Triggers: 
+# Triggers:
 # - Pull Request Opened, Synchronized, Reopened
 #
-# Secrets: 
+# Secrets:
 # GITHUB_TOKEN: Created automatically by GitHub, used for commenting on the PR
 
 name: Go Mod Auto-Update Instructions
@@ -18,45 +18,41 @@ on:
       - synchronize
       - reopened
     paths:
-      - 'osmomath/**'
-      - 'osmoutils/**'
-      - 'x/ibc-hooks/**'
-      - 'x/epochs/**'
+      - "osmomath/**"
+      - "osmoutils/**"
+      - "x/ibc-hooks/**"
+      - "x/epochs/**"
 
-permissions: 
-  pull-requests: write 
+permissions:
+  pull-requests: write
 
 jobs:
   comment:
     runs-on: ubuntu-latest
     steps:
-      - 
-        name: Checkout code
+      - name: Checkout code
         uses: actions/checkout@v4
-      - 
-        name: Comment on PR
+      - name: Comment on PR
         uses: thollander/actions-comment-pull-request@v2
-        permissions: 
-          pull-requests: write 
         with:
           message: |
-            **Important Notice** 
-            
+            **Important Notice**
+
             This PR modifies an in-repo Go module. It is one of:
             - osmomath
             - osmoutils
             - x/ibc-hooks
             - x/epochs
-            
+
             The dependent Go modules, especially the root one, will have to be
-            updated to reflect the changes. Failing to do so might cause e2e to fail.  
-            
+            updated to reflect the changes. Failing to do so might cause e2e to fail.
+
             Please follow the instructions below:
 
             1. Open https://github.com/osmosis-labs/osmosis/actions/workflows/go-mod-auto-bump.yml
             2. Provide the current branch name
             3. On success, confirm if an automated commit corretly updated the go.mod and go.sum files
-            
+
             Please let us know if you need any help.
           mode: upsert
           comment_tag: instructions
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index abf42a1c401..3c51aad0cc1 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -7,33 +7,31 @@ on:
       - concentrated-liquidity-main
 
 env:
-  GO_VERSION: '1.20.5'
+  GO_VERSION: "1.21"
+  GIT_DIFF:
+
 
 jobs:
   golangci:
     name: Run golangci-lint
     runs-on: ubuntu-latest
     steps:
-      -
-        name: Check out repository code
+      - name: Check out repository code
         uses: actions/checkout@v4
-      -
-        uses: technote-space/get-diff-action@v6.1.2
+      - uses: technote-space/get-diff-action@v6.1.2
         with:
-            PATTERNS: |
-             **/**.go
-             go.mod
-             go.sum
-             .github/**
-             Makefile
-      -
-        name: 🐿 Setup Golang
+          PATTERNS: |
+            **/**.go
+            go.mod
+            go.sum
+            .github/**
+            Makefile
+      - name: 🐿 Setup Golang
         uses: actions/setup-go@v5
         with:
           go-version: ${{env.GO_VERSION}}
 
-      -
-        name: Run golangci-lint
+      - name: Run golangci-lint
         if: env.GIT_DIFF
         run: make lint-all
 
@@ -41,15 +39,13 @@ jobs:
     name: Run super-linter
     runs-on: ubuntu-latest
     steps:
-      -
-        name: Check out repository code
+      - name: Check out repository code
         uses: actions/checkout@v4
         with:
           # Full git history is needed to get a proper list of changed files
           # within `super-linter`.
           fetch-depth: 0
-      -
-        name: Get git diff
+      - name: Get git diff
         uses: technote-space/get-diff-action@v6.1.2
         with:
           PATTERNS: |
@@ -57,7 +53,6 @@ jobs:
             go.mod
             go.sum
             Makefile
-      -
-        name: Run documentation linter
+      - name: Run documentation linter
         if: env.GIT_DIFF
         run: make lint-mdlint
diff --git a/.github/workflows/mutest-issue-generate.yml b/.github/workflows/mutest-issue-generate.yml
index 5078137e2f7..0f172c5d3d9 100644
--- a/.github/workflows/mutest-issue-generate.yml
+++ b/.github/workflows/mutest-issue-generate.yml
@@ -13,7 +13,7 @@ jobs:
       - name: 🐿 Setup Golang
         uses: actions/setup-go@v5
         with:
-          go-version: "^1.20"
+          go-version: "^1.21"
       - name: Display go version
         run: go version
       - name: Run mutation test
diff --git a/.github/workflows/protocol-docs.yml b/.github/workflows/protocol-docs.yml
index e06d62f07ab..6cf34742353 100644
--- a/.github/workflows/protocol-docs.yml
+++ b/.github/workflows/protocol-docs.yml
@@ -7,7 +7,6 @@ on:
       - main
 
 jobs:
-
   build:
     name: Render and deploy protocol and API docs
     timeout-minutes: 30
diff --git a/.github/workflows/push-dev-docker-images.yml b/.github/workflows/push-dev-docker-images.yml
index 4b732626c1e..3b2a956b75c 100644
--- a/.github/workflows/push-dev-docker-images.yml
+++ b/.github/workflows/push-dev-docker-images.yml
@@ -31,41 +31,34 @@ jobs:
   docker:
     runs-on: buildjet-2vcpu-ubuntu-2204
     steps:
-      - 
-        name: Check out repo
+      - name: Check out repo
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      -
-        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
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-      -
-        name: Find go version
+      - 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
+      - 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')"
+      - 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
+      - name: Build and Push Docker Images
         uses: docker/build-push-action@v5
         with:
           file: Dockerfile
@@ -79,8 +72,7 @@ jobs:
             GIT_COMMIT=${{ github.sha }}
           tags: |
             ${{ env.OSMOSIS_DEV_IMAGE_REPOSITORY }}:${{ env.DOCKER_IMAGE_TAG }}
-      - 
-        name: Build and Push E2E Init Docker Images
+      - name: Build and Push E2E Init Docker Images
         uses: docker/build-push-action@v5
         with:
           file: tests/e2e/initialization/init.Dockerfile
diff --git a/.github/workflows/push-docker-images.yml b/.github/workflows/push-docker-images.yml
index 1cdde2d6315..a417309770f 100644
--- a/.github/workflows/push-docker-images.yml
+++ b/.github/workflows/push-docker-images.yml
@@ -17,7 +17,7 @@
 # - `osmolabs/osmosis:X.Y.Z`             uses `gcr.io/distroless/static-debian11`
 # - `osmolabs/osmosis:X.Y.Z-distroless`  uses `gcr.io/distroless/static-debian11`
 # - `osmolabs/osmosis:X.Y.Z-nonroot`     uses `gcr.io/distroless/static-debian11:nonroot`
-# - `osmolabs/osmosis:X.Y.Z-alpine`      uses `alpine:3.17` 
+# - `osmolabs/osmosis:X.Y.Z-alpine`      uses `alpine:3.17`
 #
 # All the images above have support for linux/amd64 and linux/arm64.
 #
@@ -29,8 +29,8 @@ name: Push Docker Images
 on:
   push:
     tags:
-    - 'v[0-9]+.[0-9]+.[0-9]+' # ignore rc
-  
+      - "v[0-9]+.[0-9]+.[0-9]+" # ignore rc
+
 env:
   DOCKER_REPOSITORY: osmolabs/osmosis
   RUNNER_BASE_IMAGE_DISTROLESS: gcr.io/distroless/static-debian11
@@ -41,30 +41,24 @@ jobs:
   osmosisd-images:
     runs-on: buildjet-4vcpu-ubuntu-2204
     steps:
-      -
-        name: Check out the repo
+      - name: Check out the repo
         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
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-      -
-        name: Find go version
+      - 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: Parse tag
+      - name: Parse tag
         id: tag
         run: |
           VERSION=$(echo ${{ github.ref_name }} | sed "s/v//")
@@ -76,8 +70,7 @@ jobs:
           echo "MINOR_VERSION=$MINOR_VERSION" >> $GITHUB_ENV
           echo "PATCH_VERSION=$PATCH_VERSION" >> $GITHUB_ENV
       # Distroless Docker image (default)
-      -
-        name: Build and push (distroless)
+      - name: Build and push (distroless)
         id: build_push_distroless
         uses: docker/build-push-action@v5
         with:
@@ -98,8 +91,7 @@ jobs:
             ${{ env.DOCKER_REPOSITORY }}:${{ env.MAJOR_VERSION }}.${{ env.MINOR_VERSION }}-distroless
             ${{ env.DOCKER_REPOSITORY }}:${{ env.MAJOR_VERSION }}.${{ env.MINOR_VERSION }}.${{ env.PATCH_VERSION }}-distroless
       # Distroless nonroot Docker image
-      -
-        name: Build and push (nonroot)
+      - name: Build and push (nonroot)
         id: build_push_nonroot
         uses: docker/build-push-action@v5
         with:
@@ -117,8 +109,7 @@ jobs:
             ${{ env.DOCKER_REPOSITORY }}:${{ env.MAJOR_VERSION }}.${{ env.MINOR_VERSION }}-nonroot
             ${{ env.DOCKER_REPOSITORY }}:${{ env.MAJOR_VERSION }}.${{ env.MINOR_VERSION }}.${{ env.PATCH_VERSION }}-nonroot
       # Alpine Docker image
-      -
-        name: Build and push (alpine)
+      - name: Build and push (alpine)
         id: build_push_alpine
         uses: docker/build-push-action@v5
         with:
@@ -135,8 +126,7 @@ jobs:
             ${{ env.DOCKER_REPOSITORY }}:${{ env.MAJOR_VERSION }}-alpine
             ${{ env.DOCKER_REPOSITORY }}:${{ env.MAJOR_VERSION }}.${{ env.MINOR_VERSION }}-alpine
             ${{ env.DOCKER_REPOSITORY }}:${{ env.MAJOR_VERSION }}.${{ env.MINOR_VERSION }}.${{ env.PATCH_VERSION }}-alpine
-      -
-        if: startsWith(github.ref, 'refs/tags/v') && endsWith(github.ref, '.0')
+      - if: startsWith(github.ref, 'refs/tags/v') && endsWith(github.ref, '.0')
         name: Build and push (e2e-chain-init)
         uses: docker/build-push-action@v5
         with:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 7796c2ba6dc..aece2e14c42 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -7,7 +7,7 @@ on:
   workflow_dispatch:
     inputs:
       release_tag:
-        description: 'The desired tag for the release (e.g. v0.1.0).'
+        description: "The desired tag for the release (e.g. v0.1.0)."
         required: true
 
 permissions:
@@ -18,19 +18,16 @@ jobs:
     name: Create release
     runs-on: buildjet-4vcpu-ubuntu-2204
     steps:
-      -
-        name: Check out repository code
+      - name: Check out repository code
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
           ref: ${{ github.event.inputs.release_tag }}
-      - 
-        name: Make release
+      - name: Make release
         run: |
           make release
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      -
-        name: 🧹 Clean release folder
+      - name: 🧹 Clean release folder
         run: |
           sudo rm -rf dist
diff --git a/.github/workflows/sim.yml b/.github/workflows/sim.yml
index 44be4cfd823..82e9b692952 100644
--- a/.github/workflows/sim.yml
+++ b/.github/workflows/sim.yml
@@ -11,11 +11,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - 
-        name: 🐿 Setup Golang
+      - name: 🐿 Setup Golang
         uses: actions/setup-go@v5
         with:
-          go-version: '^1.20'
+          go-version: '^1.21'
       -
         name: Get git diff
         uses: technote-space/get-diff-action@v6.1.2
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 4157d2d4715..f29c7cfd407 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -15,15 +15,14 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
 
+
 jobs:
   get_diff:
     runs-on: ubuntu-latest
     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: |
@@ -34,8 +33,7 @@ jobs:
             Makefile
             Dockerfile
             .github/workflows/test.yml
-      -
-        name: Set output
+      - name: Set output
         id: vars
         run: echo "::set-output name=git_diff::$GIT_DIFF"
     outputs:
@@ -46,16 +44,15 @@ jobs:
     if: needs.get_diff.outputs.git_diff
     runs-on: ubuntu-latest
     steps:
-      -
-        name: Check out repository
+      - name: Check out repository
         uses: actions/checkout@v4
-      -
-        name: 🐿 Setup Golang
+      # Setup Golang based on the go.mod file.
+      # This is needed when the go version has changed and the code uses features from the new version.gi
+      - 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 \
             ./... \
@@ -65,27 +62,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
@@ -99,23 +91,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 }})
@@ -127,25 +114,24 @@ 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
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-      -
-        name: Build e2e image
+      - name: 🐿 Setup Golang
+        uses: actions/setup-go@v5
+        with:
+          go-version-file: go.mod
+      - name: Build e2e image
         uses: docker/build-push-action@v5
         with:
           load: true
@@ -154,22 +140,18 @@ jobs:
           build-args: |
             BASE_IMG_TAG=debug
             BUILD_TAGS="netgo,muslc,excludeIncrement"
-      -
-        name: Test e2e and Upgrade
+      - 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/.github/workflows/update-go-import-paths.yml b/.github/workflows/update-go-import-paths.yml
index b1877d7c014..676e6a7fc15 100644
--- a/.github/workflows/update-go-import-paths.yml
+++ b/.github/workflows/update-go-import-paths.yml
@@ -9,44 +9,40 @@ on:
   workflow_dispatch:
     inputs:
       version:
-        description: 'Current Version that we want to change (without v prefix)'
-        default: '10'
+        description: "Current Version that we want to change (without v prefix)"
+        default: "10"
         required: true
       target-branch:
-        description: 'Target Branch'
-        default: 'main'
+        description: "Target Branch"
+        default: "main"
         required: true
       source-branch:
-        description: 'Source Branch'
-        default: 'update-paths'
+        description: "Source Branch"
+        default: "update-paths"
         required: true
 
 env:
-  GO_VERSION: '1.20.5'
+  GO_VERSION: '1.21'
+
 
 jobs:
   update-import-paths:
     runs-on: ubuntu-latest
 
     steps:
-      -
-        name: Check out repository code
+      - name: Check out repository code
         uses: actions/checkout@v4
         with:
           ref: ${{ inputs.target-branch }}
-      -
-        name: 🐿 Setup Golang
+      - name: 🐿 Setup Golang
         uses: actions/setup-go@v5
         with:
           go-version: ${{env.GO_VERSION}}
-      -
-        name: Display go version
+      - name: Display go version
         run: go version
-      -
-        name: Run find & replace script
+      - name: Run find & replace script
         run: ./scripts/replace_import_paths.sh ${{ inputs.version }}
-      -
-        name: Create Pull Request
+      - name: Create Pull Request
         uses: peter-evans/create-pull-request@v6
         with:
           token: ${{ secrets.COMMIT_TO_BRANCH }}
diff --git a/.vscode/launch.json b/.vscode/launch.json
index 2f9252dcae7..aea6c0a0b75 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -11,7 +11,6 @@
                 "start"
             ],
         },
-        
         {
             // Note: Osmosisd must already be running
             // Binary must be built with debug flags.
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 9d1d67e3c46..3e0b7dcda9b 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,5 +1,7 @@
 {
+  "cSpell.diagnosticLevel": "Hint",
   "tabnine.experimentalAutoImports": true,
+  "go.lintOnSave": "workspace",
   "go.lintTool": "golangci-lint",
   "go.lintFlags": [
     "--fast"
@@ -9,14 +11,14 @@
   "[go.mod]": {
     "editor.formatOnSave": true,
     "editor.codeActionsOnSave": {
-      "source.organizeImports": true
+      "source.organizeImports": "explicit"
     }
   },
   "[go]": {
     "editor.snippetSuggestions": "none",
     "editor.formatOnSave": true,
     "editor.codeActionsOnSave": {
-      "source.organizeImports": true
+      "source.organizeImports": "explicit"
     }
   },
   "gopls": {
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d3e02b90c49..071577ecf01 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -57,14 +57,45 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * [#7595](https://github.com/osmosis-labs/osmosis/pull/7595) Fix cosmwasm pool model code ID migration.
 * [#7615](https://github.com/osmosis-labs/osmosis/pull/7615) Min value param for epoch distribution.
 * [#7619](https://github.com/osmosis-labs/osmosis/pull/7619) Slight speedup/gas improvement to CL GetTotalPoolLiquidity queries
+* [#7622](https://github.com/osmosis-labs/osmosis/pull/7622) Create/remove tick events.
+* [#7623](https://github.com/osmosis-labs/osmosis/pull/7623) Add query for querying all before send hooks
 * [#7622](https://github.com/osmosis-labs/osmosis/pull/7622) Remove duplicate CL accumulator update logic.
+* [#7665](https://github.com/osmosis-labs/osmosis/pull/7665) feat(x/protorev): Use Transient store to store swap backruns.
+* [#7685](https://github.com/osmosis-labs/osmosis/pull/7685) Speedup CL actions by only marshalling for CL hooks if they will be used.
+* [#7503](https://github.com/osmosis-labs/osmosis/pull/7503) Add IBC wasm light clients module
 
+## v23.0.4-iavl-v1 (contains everything in v23.0.4)
 
-### State Compatible
+* [#558](https://github.com/osmosis-labs/cosmos-sdk/pull/558) Gracefully log when there is a pruning error instead of panic
+
+## v23.0.4
+
+* [#7599](https://github.com/osmosis-labs/osmosis/pull/7599) Reduce sqrt calls in TickToSqrtPrice
+* [#7692](https://github.com/osmosis-labs/osmosis/pull/7692) Make CL operation mutative
+* [#530](https://github.com/osmosis-labs/cosmos-sdk/pull/530) Bump sdk fork Go to 1.20
+* [#540](https://github.com/osmosis-labs/cosmos-sdk/pull/540) Slashing speedup with getting params
+* [#546](https://github.com/osmosis-labs/cosmos-sdk/pull/546) Speedup to UnmarshalBalanceCompat
+* [#560](https://github.com/osmosis-labs/cosmos-sdk/pull/560) Enable fast nodes at a per module level
+
+## v23.0.3-iavl-v1 (contains everything in v23.0.3)
 
-* [#7590](https://github.com/osmosis-labs/osmosis/pull/7590) fix cwpool migration prop disallowing only one of code id or bytecode.
 * [#7582](https://github.com/osmosis-labs/osmosis/pull/7582) IAVL v1
-* [#7622](https://github.com/osmosis-labs/osmosis/pull/7622) Create/remove tick events.
+* [#537](https://github.com/osmosis-labs/cosmos-sdk/pull/537) Fix IAVL db grow issue
+
+## v23.0.3
+
+* [#7498](https://github.com/osmosis-labs/osmosis/pull/7498) Protorev mutation speedup
+* [#7497](https://github.com/osmosis-labs/osmosis/pull/7497) Better key formatting
+* [#7541](https://github.com/osmosis-labs/osmosis/pull/7541) Use more mutatitve operations in uptime accumulator operations
+* [#7538](https://github.com/osmosis-labs/osmosis/pull/7538) BigDec speedup
+* [#7539](https://github.com/osmosis-labs/osmosis/pull/7539) Speedup CL tickToPrice
+* [#7535](https://github.com/osmosis-labs/osmosis/pull/7535) Txfees speedup
+* [#7563](https://github.com/osmosis-labs/osmosis/pull/7563) No longer emit meaningless superfluid error at epoch
+* [#7590](https://github.com/osmosis-labs/osmosis/pull/7590) fix cwpool migration prop disallowing only one of code id or bytecode.
+* [#7577](https://github.com/osmosis-labs/osmosis/pull/7577) Update to sdk math v1.3.0
+* [#7598](https://github.com/osmosis-labs/osmosis/pull/7598) Remove extra code path in tickToPrice
+* [#3](https://github.com/osmosis-labs/cometbft/pull/3) Avoid double-calling types.BlockFromProto
+* [#4](https://github.com/osmosis-labs/cometbft/pull/4) Do not validatorBlock twice
 
 ## v23.0.0
 
diff --git a/app/app.go b/app/app.go
index 3f0d5f54d9c..4a5c0453d82 100644
--- a/app/app.go
+++ b/app/app.go
@@ -29,6 +29,8 @@ import (
 	slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types"
 	"github.com/cosmos/cosmos-sdk/x/staking"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
+	ibcwasmkeeper "github.com/cosmos/ibc-go/modules/light-clients/08-wasm/keeper"
+	ibcwasmtypes "github.com/cosmos/ibc-go/modules/light-clients/08-wasm/types"
 	"github.com/cosmos/ibc-go/v7/modules/apps/transfer"
 	ibc "github.com/cosmos/ibc-go/v7/modules/core"
 
@@ -232,6 +234,12 @@ func NewOsmosisApp(
 	app.homePath = homePath
 	dataDir := filepath.Join(homePath, "data")
 	wasmDir := filepath.Join(homePath, "wasm")
+	ibcWasmConfig :=
+		ibcwasmtypes.WasmConfig{
+			DataDir:               filepath.Join(homePath, "ibc_08-wasm"),
+			SupportedCapabilities: "iterator",
+			ContractDebugMode:     false,
+		}
 	wasmConfig, err := wasm.ReadWasmConfig(appOpts)
 	// Uncomment this for debugging contracts. In the future this could be made into a param passed by the tests
 	// wasmConfig.ContractDebugMode = true
@@ -258,6 +266,7 @@ func NewOsmosisApp(
 		wasmConfig,
 		wasmOpts,
 		app.BlockedAddrs(),
+		ibcWasmConfig,
 	)
 
 	// Initialize the ingest manager for propagating data to external sinks.
@@ -393,6 +402,13 @@ func NewOsmosisApp(
 		if err != nil {
 			panic(fmt.Errorf("failed to register snapshot extension: %s", err))
 		}
+
+		err = manager.RegisterExtensions(
+			ibcwasmkeeper.NewWasmSnapshotter(app.CommitMultiStore(), app.IBCWasmClientKeeper),
+		)
+		if err != nil {
+			panic(fmt.Errorf("failed to register snapshot extension: %s", err))
+		}
 	}
 
 	if loadLatest {
@@ -406,6 +422,10 @@ func NewOsmosisApp(
 		if err := app.WasmKeeper.InitializePinnedCodes(ctx); err != nil {
 			tmos.Exit(fmt.Sprintf("failed initialize pinned codes %s", err))
 		}
+
+		if err := ibcwasmkeeper.InitializePinnedCodes(ctx, appCodec); err != nil {
+			tmos.Exit(fmt.Sprintf("failed initialize pinned codes %s", err))
+		}
 	}
 
 	return app
diff --git a/app/apptesting/test_suite.go b/app/apptesting/test_suite.go
index 4ad8df5e736..d68ca1813df 100644
--- a/app/apptesting/test_suite.go
+++ b/app/apptesting/test_suite.go
@@ -108,7 +108,6 @@ func (s *KeeperTestHelper) Setup() {
 		signingInfo := slashingtypes.NewValidatorSigningInfo(
 			consAddr,
 			s.Ctx.BlockHeight(),
-			0,
 			time.Unix(0, 0),
 			false,
 			0,
@@ -133,7 +132,6 @@ func (s *KeeperTestHelper) SetupWithCustomChainId(chainId string) {
 		signingInfo := slashingtypes.NewValidatorSigningInfo(
 			consAddr,
 			s.Ctx.BlockHeight(),
-			0,
 			time.Unix(0, 0),
 			false,
 			0,
@@ -350,7 +348,6 @@ func (s *KeeperTestHelper) SetupValidator(bondStatus stakingtypes.BondStatus) sd
 	signingInfo := slashingtypes.NewValidatorSigningInfo(
 		consAddr,
 		s.Ctx.BlockHeight(),
-		0,
 		time.Unix(0, 0),
 		false,
 		0,
diff --git a/app/keepers/keepers.go b/app/keepers/keepers.go
index 2cc884f4d99..e0b2731824d 100644
--- a/app/keepers/keepers.go
+++ b/app/keepers/keepers.go
@@ -55,6 +55,8 @@ import (
 	ibchookstypes "github.com/osmosis-labs/osmosis/x/ibc-hooks/types"
 
 	icqkeeper "github.com/cosmos/ibc-apps/modules/async-icq/v7/keeper"
+	ibcwasmkeeper "github.com/cosmos/ibc-go/modules/light-clients/08-wasm/keeper"
+	ibcwasmtypes "github.com/cosmos/ibc-go/modules/light-clients/08-wasm/types"
 	icahost "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host"
 	icahostkeeper "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host/keeper"
 	icahosttypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host/types"
@@ -143,6 +145,7 @@ type AppKeepers struct {
 	ICAHostKeeper                *icahostkeeper.Keeper
 	ICQKeeper                    *icqkeeper.Keeper
 	TransferKeeper               *ibctransferkeeper.Keeper
+	IBCWasmClientKeeper          *ibcwasmkeeper.Keeper
 	EvidenceKeeper               *evidencekeeper.Keeper
 	GAMMKeeper                   *gammkeeper.Keeper
 	TwapKeeper                   *twap.Keeper
@@ -191,6 +194,7 @@ func (appKeepers *AppKeepers) InitNormalKeepers(
 	wasmConfig wasmtypes.WasmConfig,
 	wasmOpts []wasmkeeper.Option,
 	blockedAddress map[string]bool,
+	ibcWasmConfig ibcwasmtypes.WasmConfig,
 ) {
 	legacyAmino := encodingConfig.Amino
 	// Add 'normal' keepers
@@ -271,6 +275,18 @@ func (appKeepers *AppKeepers) InitNormalKeepers(
 	)
 	appKeepers.IBCHooksKeeper = hooksKeeper
 
+	// We are using a separate VM here
+	ibcWasmClientKeeper := ibcwasmkeeper.NewKeeperWithConfig(
+		appCodec,
+		appKeepers.keys[ibcwasmtypes.StoreKey],
+		appKeepers.IBCKeeper.ClientKeeper,
+		authtypes.NewModuleAddress(govtypes.ModuleName).String(),
+		ibcWasmConfig,
+		bApp.GRPCQueryRouter(),
+	)
+
+	appKeepers.IBCWasmClientKeeper = &ibcWasmClientKeeper
+
 	appKeepers.WireICS20PreWasmKeeper(appCodec, bApp, appKeepers.IBCHooksKeeper)
 
 	icaHostKeeper := icahostkeeper.NewKeeper(
@@ -384,6 +400,7 @@ func (appKeepers *AppKeepers) InitNormalKeepers(
 
 	protorevKeeper := protorevkeeper.NewKeeper(
 		appCodec, appKeepers.keys[protorevtypes.StoreKey],
+		appKeepers.tkeys[protorevtypes.TransientStoreKey],
 		appKeepers.GetSubspace(protorevtypes.ModuleName),
 		appKeepers.AccountKeeper,
 		appKeepers.BankKeeper,
@@ -813,6 +830,7 @@ func KVStoreKeys() []string {
 		upgradetypes.StoreKey,
 		evidencetypes.StoreKey,
 		ibctransfertypes.StoreKey,
+		ibcwasmtypes.StoreKey,
 		capabilitytypes.StoreKey,
 		gammtypes.StoreKey,
 		twaptypes.StoreKey,
diff --git a/app/keepers/keys.go b/app/keepers/keys.go
index aa8879205c1..b3387a8a7f5 100644
--- a/app/keepers/keys.go
+++ b/app/keepers/keys.go
@@ -7,6 +7,7 @@ import (
 
 	storetypes "github.com/cosmos/cosmos-sdk/store/types"
 
+	protorevtypes "github.com/osmosis-labs/osmosis/v23/x/protorev/types"
 	twaptypes "github.com/osmosis-labs/osmosis/v23/x/twap/types"
 )
 
@@ -17,7 +18,7 @@ func (appKeepers *AppKeepers) GenerateKeys() {
 	appKeepers.keys = sdk.NewKVStoreKeys(KVStoreKeys()...)
 
 	// Define transient store keys
-	appKeepers.tkeys = sdk.NewTransientStoreKeys(paramstypes.TStoreKey, twaptypes.TransientStoreKey)
+	appKeepers.tkeys = sdk.NewTransientStoreKeys(paramstypes.TStoreKey, twaptypes.TransientStoreKey, protorevtypes.TransientStoreKey)
 
 	// MemKeys are for information that is stored only in RAM.
 	appKeepers.memKeys = sdk.NewMemoryStoreKeys(capabilitytypes.MemStoreKey)
diff --git a/app/keepers/modules.go b/app/keepers/modules.go
index 6517a169efc..925d9bdee57 100644
--- a/app/keepers/modules.go
+++ b/app/keepers/modules.go
@@ -27,6 +27,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/x/upgrade"
 	upgradeclient "github.com/cosmos/cosmos-sdk/x/upgrade/client"
 	icq "github.com/cosmos/ibc-apps/modules/async-icq/v7"
+	ibcwasm "github.com/cosmos/ibc-go/modules/light-clients/08-wasm"
 	ica "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts"
 
 	"github.com/cosmos/cosmos-sdk/x/consensus"
@@ -125,6 +126,7 @@ var AppModuleBasics = []module.AppModuleBasic{
 	ica.AppModuleBasic{},
 	ibc_hooks.AppModuleBasic{},
 	ibcratelimitmodule.AppModuleBasic{},
+	ibcwasm.AppModuleBasic{},
 	packetforward.AppModuleBasic{},
 	cosmwasmpoolmodule.AppModuleBasic{},
 	tendermint.AppModuleBasic{},
diff --git a/app/modules.go b/app/modules.go
index 3dd1b9192dc..51aba73d549 100644
--- a/app/modules.go
+++ b/app/modules.go
@@ -11,6 +11,8 @@ import (
 	stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"
 	icq "github.com/cosmos/ibc-apps/modules/async-icq/v7"
 
+	ibcwasm "github.com/cosmos/ibc-go/modules/light-clients/08-wasm"
+	ibcwasmtypes "github.com/cosmos/ibc-go/modules/light-clients/08-wasm/types"
 	ibctransfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types"
 	ibc "github.com/cosmos/ibc-go/v7/modules/core"
 	ibchost "github.com/cosmos/ibc-go/v7/modules/core/exported"
@@ -162,6 +164,7 @@ func appModules(
 		evidence.NewAppModule(*app.EvidenceKeeper),
 		authzmodule.NewAppModule(appCodec, *app.AuthzKeeper, app.AccountKeeper, app.BankKeeper, app.interfaceRegistry),
 		ibc.NewAppModule(app.IBCKeeper),
+		ibcwasm.NewAppModule(*app.IBCWasmClientKeeper),
 		ica.NewAppModule(nil, app.ICAHostKeeper),
 		params.NewAppModule(*app.ParamsKeeper),
 		consensus.NewAppModule(appCodec, *app.AppKeepers.ConsensusParamsKeeper),
@@ -280,6 +283,7 @@ func OrderInitGenesis(allModuleNames []string) []string {
 		ibcratelimittypes.ModuleName,
 		// wasm after ibc transfer
 		wasmtypes.ModuleName,
+		ibcwasmtypes.ModuleName,
 		// ibc_hooks after auth keeper
 		ibchookstypes.ModuleName,
 		icqtypes.ModuleName,
diff --git a/app/upgrades/v24/constants.go b/app/upgrades/v24/constants.go
index 05afd03dc96..2573fa4a96a 100644
--- a/app/upgrades/v24/constants.go
+++ b/app/upgrades/v24/constants.go
@@ -1,6 +1,7 @@
 package v24
 
 import (
+	ibcwasmtypes "github.com/cosmos/ibc-go/modules/light-clients/08-wasm/types"
 	"github.com/osmosis-labs/osmosis/v23/app/upgrades"
 
 	store "github.com/cosmos/cosmos-sdk/store/types"
@@ -13,7 +14,7 @@ var Upgrade = upgrades.Upgrade{
 	UpgradeName:          UpgradeName,
 	CreateUpgradeHandler: CreateUpgradeHandler,
 	StoreUpgrades: store.StoreUpgrades{
-		Added:   []string{},
+		Added:   []string{ibcwasmtypes.StoreKey},
 		Deleted: []string{},
 	},
 }
diff --git a/cmd/osmosisd/cmd/root.go b/cmd/osmosisd/cmd/root.go
index e3e6859978d..655d68f66e6 100644
--- a/cmd/osmosisd/cmd/root.go
+++ b/cmd/osmosisd/cmd/root.go
@@ -850,6 +850,7 @@ func newApp(logger log.Logger, db cometbftdb.DB, traceStore io.Writer, appOpts s
 		baseapp.SetSnapshot(snapshotStore, snapshotOptions),
 		baseapp.SetIAVLCacheSize(cast.ToInt(appOpts.Get(server.FlagIAVLCacheSize))),
 		baseapp.SetIAVLDisableFastNode(cast.ToBool(appOpts.Get(server.FlagDisableIAVLFastNode))),
+		baseapp.SetIAVLFastNodeModuleWhitelist(cast.ToStringSlice(appOpts.Get(server.FlagIAVLFastNodeModuleWhitelist))),
 		baseapp.SetChainID(chainID),
 	}
 
diff --git a/cosmwasm/Cargo.lock b/cosmwasm/Cargo.lock
index b34226d9e7b..f87a7fcbfdc 100644
--- a/cosmwasm/Cargo.lock
+++ b/cosmwasm/Cargo.lock
@@ -1166,9 +1166,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
 
 [[package]]
 name = "libc"
-version = "0.2.147"
+version = "0.2.153"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3"
+checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
 
 [[package]]
 name = "libloading"
@@ -1215,9 +1215,9 @@ dependencies = [
 
 [[package]]
 name = "mio"
-version = "0.8.8"
+version = "0.8.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2"
+checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
 dependencies = [
  "libc",
  "wasi",
diff --git a/go.mod b/go.mod
index 376873113c6..c0a909b1951 100644
--- a/go.mod
+++ b/go.mod
@@ -15,8 +15,9 @@ require (
 	github.com/cosmos/cosmos-sdk v0.47.8
 	github.com/cosmos/go-bip39 v1.0.0
 	github.com/cosmos/gogoproto v1.4.11
-	github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.1.1
+	github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.1.3-0.20240228213828-cce7f56d000b
 	github.com/cosmos/ibc-apps/modules/async-icq/v7 v7.1.1
+	github.com/cosmos/ibc-go/modules/light-clients/08-wasm v0.1.1-0.20231213092633-b306e7a706e1
 	github.com/cosmos/ibc-go/v7 v7.3.2
 	github.com/golang/mock v1.6.0
 	github.com/golang/protobuf v1.5.3
@@ -27,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.9-0.20240222171503-685566578734
-	github.com/osmosis-labs/osmosis/osmoutils v0.0.9-0.20240222004208-b602d1901059
-	github.com/osmosis-labs/osmosis/x/epochs v0.0.5
-	github.com/osmosis-labs/osmosis/x/ibc-hooks v0.0.10
+	github.com/osmosis-labs/osmosis/osmomath v0.0.9-0.20240306055140-d7dfe8e8669e
+	github.com/osmosis-labs/osmosis/osmoutils v0.0.9-0.20240306055140-d7dfe8e8669e
+	github.com/osmosis-labs/osmosis/x/epochs v0.0.5-0.20240306055140-d7dfe8e8669e
+	github.com/osmosis-labs/osmosis/x/ibc-hooks v0.0.11-0.20240306055140-d7dfe8e8669e
 	github.com/osmosis-labs/sqs/sqsdomain v0.0.0-20240208025415-894605171463
 	github.com/pkg/errors v0.9.1
 	github.com/rakyll/statik v0.1.7
@@ -39,7 +40,7 @@ require (
 	github.com/spf13/cobra v1.8.0
 	github.com/spf13/pflag v1.0.5
 	github.com/spf13/viper v1.18.2
-	github.com/stretchr/testify v1.8.4
+	github.com/stretchr/testify v1.9.0
 	github.com/tidwall/btree v1.6.0
 	github.com/tidwall/gjson v1.17.1
 	go.uber.org/multierr v1.11.0
@@ -76,12 +77,14 @@ require (
 	github.com/alingse/asasalint v0.0.11 // indirect
 	github.com/aws/aws-sdk-go v1.44.224 // indirect
 	github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect
+	github.com/bits-and-blooms/bitset v1.8.0 // indirect
 	github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect
 	github.com/butuzov/mirror v1.1.0 // indirect
 	github.com/catenacyber/perfsprint v0.2.0 // indirect
 	github.com/ccojocar/zxcvbn-go v1.0.1 // indirect
 	github.com/chzyer/readline v1.5.1 // indirect
 	github.com/cockroachdb/apd/v2 v2.0.2 // indirect
+	github.com/cockroachdb/datadriven v1.0.3-0.20230801171734-e384cf455877 // indirect
 	github.com/cockroachdb/errors v1.11.1 // indirect
 	github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect
 	github.com/cockroachdb/pebble v1.1.0 // indirect
@@ -107,6 +110,8 @@ require (
 	github.com/go-logr/logr v1.3.0 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect
+	github.com/gobwas/httphead v0.1.0 // indirect
+	github.com/gobwas/pool v0.2.1 // indirect
 	github.com/gogo/googleapis v1.4.1 // indirect
 	github.com/google/btree v1.1.2 // indirect
 	github.com/google/s2a-go v0.1.7 // indirect
@@ -129,13 +134,11 @@ require (
 	github.com/macabu/inamedparam v0.1.2 // indirect
 	github.com/manifoldco/promptui v0.9.0 // indirect
 	github.com/maratori/testableexamples v1.0.0 // indirect
-	github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
 	github.com/mimoo/StrobeGo v0.0.0-20210601165009-122bf33a46e0 // indirect
 	github.com/mitchellh/go-testing-interface v1.14.1 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/nunnatsa/ginkgolinter v0.14.1 // indirect
-	github.com/osmosis-labs/sqs v0.0.0-20240109224414-786ae137f7c4 // indirect
 	github.com/rogpeppe/go-internal v1.12.0 // indirect
 	github.com/sagikazarmark/locafero v0.4.0 // indirect
 	github.com/sagikazarmark/slog-shim v0.1.0 // indirect
@@ -162,6 +165,7 @@ require (
 	go.uber.org/zap v1.26.0 // indirect
 	golang.org/x/oauth2 v0.16.0 // indirect
 	golang.org/x/time v0.5.0 // indirect
+	golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
 	google.golang.org/api v0.155.0 // indirect
 	google.golang.org/appengine v1.6.8 // indirect
 	google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80 // indirect
@@ -318,9 +322,9 @@ require (
 	github.com/petermattis/goid v0.0.0-20230317030725-371a4b8eda08 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/polyfloyd/go-errorlint v1.4.5 // indirect
-	github.com/prometheus/client_golang v1.18.0
+	github.com/prometheus/client_golang v1.19.0
 	github.com/prometheus/client_model v0.5.0 // indirect
-	github.com/prometheus/common v0.45.0 // indirect
+	github.com/prometheus/common v0.48.0 // indirect
 	github.com/prometheus/procfs v0.12.0 // indirect
 	github.com/quasilyte/go-ruleguard v0.4.0 // indirect
 	github.com/quasilyte/gogrep v0.5.0 // indirect
@@ -344,7 +348,7 @@ require (
 	github.com/spf13/afero v1.11.0 // indirect
 	github.com/ssgreg/nlreturn/v2 v2.2.1 // indirect
 	github.com/stbenjam/no-sprintf-host-port v0.1.1 // indirect
-	github.com/stretchr/objx v0.5.0 // indirect
+	github.com/stretchr/objx v0.5.2 // indirect
 	github.com/subosito/gotenv v1.6.0 // indirect
 	github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d
 	github.com/tdakkota/asciicheck v0.2.0 // indirect
@@ -395,9 +399,9 @@ replace (
 	// v1.0.0-beta.3 is incompatible, so we use v1.0.0-beta.2
 	github.com/cosmos/cosmos-proto => github.com/cosmos/cosmos-proto v1.0.0-beta.2
 
-	// Our cosmos-sdk branch is: https://github.com/osmosis-labs/cosmos-sdk/tree/osmo-v23/v0.47.5-iavl-v1, current branch: osmo-v23/v0.47.5-iavl-v1. Direct commit link: https://github.com/osmosis-labs/cosmos-sdk/commit/d44a3847e089de47cbba0f31a0cebed64ad2806f
+	// Our cosmos-sdk branch is: https://github.com/osmosis-labs/cosmos-sdk/tree/osmo/v0.47.5, current branch: osmo/v0.47.5. Direct commit link: https://github.com/osmosis-labs/cosmos-sdk/commit/76d3c64545bad5bc930756eca88eacaed30f9f3e
 	// https://github.com/osmosis-labs/cosmos-sdk/releases/tag/v0.47.5-v23-osmo-1
-	github.com/cosmos/cosmos-sdk => github.com/osmosis-labs/cosmos-sdk v0.47.5-v23-osmo-2-iavl-v1
+	github.com/cosmos/cosmos-sdk => github.com/osmosis-labs/cosmos-sdk v0.47.6-0.20240309220415-76d3c64545ba
 	github.com/cosmos/gogoproto => github.com/cosmos/gogoproto v1.4.10
 	github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1
 
diff --git a/go.sum b/go.sum
index 006c3a179b6..24f9db4774a 100644
--- a/go.sum
+++ b/go.sum
@@ -643,6 +643,8 @@ github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d/go.mod h1:6QX/PXZ
 github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
 github.com/bgentry/speakeasy v0.1.1-0.20220910012023-760eaf8b6816 h1:41iFGWnSlI2gVpmOtVTJZNodLdLQLn/KsJqFvXwnd/s=
 github.com/bgentry/speakeasy v0.1.1-0.20220910012023-760eaf8b6816/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
+github.com/bits-and-blooms/bitset v1.8.0 h1:FD+XqgOZDUxxZ8hzoBFuV9+cGWY9CslN6d5MS5JVb4c=
+github.com/bits-and-blooms/bitset v1.8.0/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8=
 github.com/bkielbasa/cyclop v1.2.1 h1:AeF71HZDob1P2/pRm1so9cd1alZnrpyc4q2uP2l0gJY=
 github.com/bkielbasa/cyclop v1.2.1/go.mod h1:K/dT/M0FPAiYjBgQGau7tz+3TMh4FWAEqlMhzFWCrgM=
 github.com/blizzy78/varnamelen v0.8.0 h1:oqSblyuQvFsW1hbBHh1zfwrKe3kcSj0rnXkKzsQ089M=
@@ -732,8 +734,8 @@ github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa/go.mod h1:x/1Gn8zydmfq
 github.com/cockroachdb/apd/v2 v2.0.2 h1:weh8u7Cneje73dDh+2tEVLUvyBc89iwepWCD8b8034E=
 github.com/cockroachdb/apd/v2 v2.0.2/go.mod h1:DDxRlzC2lo3/vSlmSoS7JkqbbrARPuFOGr0B9pvN3Gw=
 github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8=
-github.com/cockroachdb/datadriven v1.0.3-0.20230413201302-be42291fc80f h1:otljaYPt5hWxV3MUfO5dFPFiOXg9CyG5/kCfayTqsJ4=
-github.com/cockroachdb/datadriven v1.0.3-0.20230413201302-be42291fc80f/go.mod h1:a9RdTaap04u637JoCzcUoIcDmvwSUtcUFtT/C3kJlTU=
+github.com/cockroachdb/datadriven v1.0.3-0.20230801171734-e384cf455877 h1:1MLK4YpFtIEo3ZtMA5C795Wtv5VuUnrXX7mQG+aHg6o=
+github.com/cockroachdb/datadriven v1.0.3-0.20230801171734-e384cf455877/go.mod h1:a9RdTaap04u637JoCzcUoIcDmvwSUtcUFtT/C3kJlTU=
 github.com/cockroachdb/errors v1.11.1 h1:xSEW75zKaKCWzR3OfxXUxgrk/NtT4G1MiOv5lWZazG8=
 github.com/cockroachdb/errors v1.11.1/go.mod h1:8MUxA3Gi6b25tYlFEBGLf+D8aISL+M4MIpiWMSNRfxw=
 github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b h1:r6VH0faHjZeQy818SGhaone5OnYfxFR/+AzdY3sf5aE=
@@ -774,10 +776,12 @@ github.com/cosmos/gogoproto v1.4.10 h1:QH/yT8X+c0F4ZDacDv3z+xE3WU1P1Z3wQoLMBRJoK
 github.com/cosmos/gogoproto v1.4.10/go.mod h1:3aAZzeRWpAwr+SS/LLkICX2/kDFyaYVzckBDzygIxek=
 github.com/cosmos/iavl v1.0.2-0.20240221171955-e019f7411ec7 h1:RUVbQo6VsQJQWPZr0N7kTX+RlnA5NhCn8N3UqOjU+m8=
 github.com/cosmos/iavl v1.0.2-0.20240221171955-e019f7411ec7/go.mod h1:jLeUvm6bGT1YutCaL2fIar/8vGUE8cPZvh/gXEWDaDM=
-github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.1.1 h1:PqIK9vTr6zxCdQmrDZwxwL4KMAqg/GRGsiMEiaMP4wA=
-github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.1.1/go.mod h1:UvDmcGIWJPIytq+Q78/ff5NTOsuX/7IrNgEugTW5i0s=
+github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.1.3-0.20240228213828-cce7f56d000b h1:VwhHRRIPdMshBMb2TP7xrkY4Ee8CJWsHZvucYeJ56no=
+github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.1.3-0.20240228213828-cce7f56d000b/go.mod h1:UvDmcGIWJPIytq+Q78/ff5NTOsuX/7IrNgEugTW5i0s=
 github.com/cosmos/ibc-apps/modules/async-icq/v7 v7.1.1 h1:02RCbih5lQ8aGdDMSvxhTnk5JDLEDitn17ytEE1Qhko=
 github.com/cosmos/ibc-apps/modules/async-icq/v7 v7.1.1/go.mod h1:LvVkEXTORVgd87W2Yu7ZY3acKKeTMq/txdTworn8EZI=
+github.com/cosmos/ibc-go/modules/light-clients/08-wasm v0.1.1-0.20231213092633-b306e7a706e1 h1:fCtG9qasnNzhgxGR1jM9eBufZ5WQVpy0KdaOpKRfg8Y=
+github.com/cosmos/ibc-go/modules/light-clients/08-wasm v0.1.1-0.20231213092633-b306e7a706e1/go.mod h1:h114vYKBtI5zKBeSyr8y5JZ8ZtpQJInO4TYww2IQr6o=
 github.com/cosmos/ibc-go/v7 v7.3.2 h1:FeUDcBX7VYY0e0iRmcVkPPUjYfAqIc//QuHXo8JHz9c=
 github.com/cosmos/ibc-go/v7 v7.3.2/go.mod h1:IMeOXb7gwpZ+/nOG5BuUkdW4weM1ezvN4PQPws4uzOI=
 github.com/cosmos/ics23/go v0.10.0 h1:iXqLLgp2Lp+EdpIuwXTYIQU+AiHj9mOC2X9ab++bZDM=
@@ -974,10 +978,12 @@ github.com/go-xmlfmt/xmlfmt v1.1.2 h1:Nea7b4icn8s57fTx1M5AI4qQT5HEM3rVUO8MuE6g80
 github.com/go-xmlfmt/xmlfmt v1.1.2/go.mod h1:aUCEOzzezBEjDBbFBoSiya/gduyIiWYRP6CnSFIV8AM=
 github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=
 github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8=
-github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee h1:s+21KNqlpePfkah2I+gwHF8xmJWRjooY+5248k6m4A0=
 github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod h1:L0fX3K22YWvt/FAX9NnzrNzcI4wNYi9Yku4O0LKYflo=
-github.com/gobwas/pool v0.2.0 h1:QEmUOlnSjWtnpRGHF3SauEiOsy82Cup83Vf2LcMlnc8=
+github.com/gobwas/httphead v0.1.0 h1:exrUm0f4YX0L7EBwZHuCF4GDp8aJfVeBrlLQrs6NqWU=
+github.com/gobwas/httphead v0.1.0/go.mod h1:O/RXo79gxV8G+RqlR/otEwx4Q36zl9rqC5u12GKvMCM=
 github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw=
+github.com/gobwas/pool v0.2.1 h1:xfeeEhW7pwmX8nuLVlqbzVc7udMDrwetjEv+TZIz1og=
+github.com/gobwas/pool v0.2.1/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw=
 github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM=
 github.com/gobwas/ws v1.1.0 h1:7RFti/xnNkMJnrK7D1yQ/iCIB5OrrY/54/H930kIbHA=
 github.com/gobwas/ws v1.1.0/go.mod h1:nzvNcVha5eUziGrbxFCo6qFIojQHjJV5cLYIbezhfL0=
@@ -1386,8 +1392,6 @@ github.com/mattn/go-sqlite3 v1.14.17 h1:mCRHCLDUBXgpKAqIKsaAaAsrAlbkeomtRFKXh2L6
 github.com/mattn/go-sqlite3 v1.14.17/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=
 github.com/mattn/goveralls v0.0.3/go.mod h1:8d1ZMHsd7fW6IRPKQh46F2WRpyib5/X4FOpevwGNQEw=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
-github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 h1:jWpvCLoY8Z/e3VKvlsiIGKtc+UG6U5vzxaoagmhXfyg=
-github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0/go.mod h1:QUyp042oQthUoa9bqDv0ER0wrtXnBruoNd7aNjkbP+k=
 github.com/mbilski/exhaustivestruct v1.2.0 h1:wCBmUnSYufAHO6J4AVWY6ff+oxWxsVFrwgOdMUQePUo=
 github.com/mbilski/exhaustivestruct v1.2.0/go.mod h1:OeTBVxQWoEmB2J2JCHmXWPJ0aksxSUOUy+nvtVEfzXc=
 github.com/mgechev/revive v1.3.4 h1:k/tO3XTaWY4DEHal9tWBkkUMJYO/dLDVyMmAQxmIMDc=
@@ -1490,22 +1494,18 @@ github.com/ory/dockertest/v3 v3.10.0 h1:4K3z2VMe8Woe++invjaTB7VRyQXQy5UY+loujO4a
 github.com/ory/dockertest/v3 v3.10.0/go.mod h1:nr57ZbRWMqfsdGdFNLHz5jjNdDb7VVFnzAeW1n5N1Lg=
 github.com/osmosis-labs/cometbft v0.37.4-v23-osmo-2 h1:967/6vaO8l/eSzkB5rcCAZjxla1V/Z3HFUtBPPYv+PY=
 github.com/osmosis-labs/cometbft v0.37.4-v23-osmo-2/go.mod h1:Cmg5Hp4sNpapm7j+x0xRyt2g0juQfmB752ous+pA0G8=
-github.com/osmosis-labs/cosmos-sdk v0.47.5-v23-osmo-2-iavl-v1 h1:znGVTrQKVV2bKzZPSvC+RwX7tu+hf+WUCkgPHWGOiEc=
-github.com/osmosis-labs/cosmos-sdk v0.47.5-v23-osmo-2-iavl-v1/go.mod h1:4WHIpz3iRefLvpqKD9oRNWD10AQbDt0tj6MmWcuY1QI=
+github.com/osmosis-labs/cosmos-sdk v0.47.6-0.20240309220415-76d3c64545ba h1:ym3RdD1EmGSTayuYXJZGYVms0nTBKvsngAf6vO54sKA=
+github.com/osmosis-labs/cosmos-sdk v0.47.6-0.20240309220415-76d3c64545ba/go.mod h1:FBibzY5m5FUDfl/bs6/E+4pCnNAb1Do6LXb4gHNN/1c=
 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.9-0.20240222171503-685566578734 h1:o30q2J2Q/QZv7g9rwDJHK5e6tvd87GsY1uZ79lTdo5A=
-github.com/osmosis-labs/osmosis/osmomath v0.0.9-0.20240222171503-685566578734/go.mod h1:SuNYa8LXsQDYy9aRU0yrXQpkiZ8lDJmXDwthLyR5N+w=
-github.com/osmosis-labs/osmosis/osmoutils v0.0.9-0.20240222004208-b602d1901059 h1:2PyAblTdr9l5GacEuQY/CitAAUdA60UH43qD9FChdXQ=
-github.com/osmosis-labs/osmosis/osmoutils v0.0.9-0.20240222004208-b602d1901059/go.mod h1:uClYVpeXbVKOHRA0n55kfP1jJz1lv66k+V5N0w/vi5M=
-github.com/osmosis-labs/osmosis/v22 v22.0.0-alpha0 h1:pVUT1U8PpL+dBQmsmCaoY3P9BCPZO+wH8hs9kpw8v6A=
-github.com/osmosis-labs/osmosis/v22 v22.0.0-alpha0/go.mod h1:z6OG3nlY9vfBxEbLMNZBZdFWDVoIOQVclT7ZkuTkjx4=
-github.com/osmosis-labs/osmosis/x/epochs v0.0.5 h1:UIxJHif0Wsq0NU9wwAj9AEdIG8U2gSj5QgnB5OGStY0=
-github.com/osmosis-labs/osmosis/x/epochs v0.0.5/go.mod h1:qS1NDnKd9zlS0PVP+6IkaizLjkPHfdEPUoSHJSTFkII=
-github.com/osmosis-labs/osmosis/x/ibc-hooks v0.0.10 h1:s4Y1ZeOmQ+iTgODCbnuge0mcBeyOtZF80Q5nmqu8Tio=
-github.com/osmosis-labs/osmosis/x/ibc-hooks v0.0.10/go.mod h1:G3FNk7hOfmKKHP5aaDShRi93i3c7s6jok+gPS7It9rI=
-github.com/osmosis-labs/sqs v0.0.0-20240109224414-786ae137f7c4 h1:9eDKKZ3xmz+idc+XO/GkMSNwnFuDBg0uguvXAlPp8O0=
-github.com/osmosis-labs/sqs v0.0.0-20240109224414-786ae137f7c4/go.mod h1:tvG1qt+zMgJQlO9WgXeLFRTrdAJwn+6dCP+kD++XlSc=
+github.com/osmosis-labs/osmosis/osmomath v0.0.9-0.20240306055140-d7dfe8e8669e h1:wMbjfdBY8T8dfiC/llpyvrTmZ+85eO3BVGTXFoGYP8Q=
+github.com/osmosis-labs/osmosis/osmomath v0.0.9-0.20240306055140-d7dfe8e8669e/go.mod h1:u3sHQAPLDss2DovMB/4SCkiau85jVGv6Vsp8L7kSCcM=
+github.com/osmosis-labs/osmosis/osmoutils v0.0.9-0.20240306055140-d7dfe8e8669e h1:fn4rXlW2Qp6Zga/1bBrXxUwZ5fF+HKX221TFxNTpkJ8=
+github.com/osmosis-labs/osmosis/osmoutils v0.0.9-0.20240306055140-d7dfe8e8669e/go.mod h1:c/lE4YlUAEGRszC+l0rSd5ypkzlgyx3FHDg8RZNwmYA=
+github.com/osmosis-labs/osmosis/x/epochs v0.0.5-0.20240306055140-d7dfe8e8669e h1:5ncDRrqv90OcdXCNnyuIUVYPyypAzassK8qjJ4xMjFk=
+github.com/osmosis-labs/osmosis/x/epochs v0.0.5-0.20240306055140-d7dfe8e8669e/go.mod h1:OgeD5QfesfM6jOO/7egGo6QTxy6KnDCE0gBXa1n0JC0=
+github.com/osmosis-labs/osmosis/x/ibc-hooks v0.0.11-0.20240306055140-d7dfe8e8669e h1:NmgCMKvQPHt9M8FNYp9dr23SwAGIFZbogPfAU5beFdM=
+github.com/osmosis-labs/osmosis/x/ibc-hooks v0.0.11-0.20240306055140-d7dfe8e8669e/go.mod h1:t2IKIkpM3HzLXr72yK38yDKnGqEeBFCaYEnuhDFsJk4=
 github.com/osmosis-labs/sqs/sqsdomain v0.0.0-20240208025415-894605171463 h1:eeGZ0A/Z0c4wstIg8G/0VGQJyYnu6/1tlOpKDnflePM=
 github.com/osmosis-labs/sqs/sqsdomain v0.0.0-20240208025415-894605171463/go.mod h1:GNHf6+eQpoud7bV0dqJ3YVxov331z+jp9vbVuZPj14s=
 github.com/osmosis-labs/wasmd v0.45.0-osmo h1:NIp7pvJV5HuBN1HwPgEmXKQM2TjVIVdJErIHnB9IMO8=
@@ -1559,8 +1559,8 @@ github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3O
 github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M=
 github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0=
 github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY=
-github.com/prometheus/client_golang v1.18.0 h1:HzFfmkOzH5Q8L8G+kSJKUx5dtG87sewO+FoDDqP5Tbk=
-github.com/prometheus/client_golang v1.18.0/go.mod h1:T+GXkCk5wSJyOqMIzVgvvjFDlkOQntgjkJWKrN5txjA=
+github.com/prometheus/client_golang v1.19.0 h1:ygXvpU1AoN1MhdzckN+PyD9QJOSD4x7kmXYlnfbA6JU=
+github.com/prometheus/client_golang v1.19.0/go.mod h1:ZRM9uEAypZakd+q/x7+gmsvXdURP+DABIEIjnmDdp+k=
 github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
 github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
 github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
@@ -1578,8 +1578,8 @@ github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB8
 github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s=
 github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc=
 github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls=
-github.com/prometheus/common v0.45.0 h1:2BGz0eBc2hdMDLnO/8n0jeB3oPrt2D08CekT0lneoxM=
-github.com/prometheus/common v0.45.0/go.mod h1:YJmSTw9BoKxJplESWWxlbyttQR4uaEcGyv9MZjVOJsY=
+github.com/prometheus/common v0.48.0 h1:QO8U2CdOzSn1BBsmXJXduaaW+dY/5QLjfB8svtSzKKE=
+github.com/prometheus/common v0.48.0/go.mod h1:0/KsvlIEfPQCQ5I2iNSAWKPZziNCvRs5EC6ILDTlAPc=
 github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
@@ -1711,8 +1711,9 @@ github.com/streadway/handy v0.0.0-20190108123426-d5acb3125c2a/go.mod h1:qNTQ5P5J
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
-github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c=
 github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
+github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
+github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
@@ -1723,8 +1724,9 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
+github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
+github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8=
 github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU=
 github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 h1:epCh84lMvA70Z7CTTCmYQn2CKbY8j86K7/FAIr141uY=
@@ -2301,8 +2303,9 @@ golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8T
 golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8=
 golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8=
-golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 h1:H2TDz8ibqkAF6YGhCdN3jS9O0/s90v0rJh3X/OLHEUk=
 golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8=
+golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 h1:+cNy6SZtPcJQH3LJVLOSmiC7MMxXNOb3PU/VUEz+EhU=
+golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028/go.mod h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90=
 gonum.org/v1/gonum v0.0.0-20180816165407-929014505bf4/go.mod h1:Y+Yx5eoAFn32cQvJDxZx5Dpnq+c3wtXuadVZAcxbbBo=
 gonum.org/v1/gonum v0.8.2/go.mod h1:oe/vMfY3deqTw+1EZJhuvEW2iwGF1bW9wwu7XCu0+v0=
 gonum.org/v1/gonum v0.9.3/go.mod h1:TZumC3NeyVQskjXqmyWt4S3bINhy7B4eYwW69EbyX+0=
diff --git a/ingest/sqs/pools/ingester/pool_ingester.go b/ingest/sqs/pools/ingester/pool_ingester.go
index ab347e91b36..98f2e5073bf 100644
--- a/ingest/sqs/pools/ingester/pool_ingester.go
+++ b/ingest/sqs/pools/ingester/pool_ingester.go
@@ -13,12 +13,13 @@ import (
 	poolsredisrepo "github.com/osmosis-labs/sqs/sqsdomain/repository/redis/pools"
 	routerredisrepo "github.com/osmosis-labs/sqs/sqsdomain/repository/redis/router"
 
+	cosmwasmpooltypes "github.com/osmosis-labs/osmosis/v23/x/cosmwasmpool/types"
+
 	"github.com/osmosis-labs/osmosis/osmomath"
 	"github.com/osmosis-labs/osmosis/v23/ingest/sqs/domain"
 
 	"github.com/osmosis-labs/osmosis/v23/x/concentrated-liquidity/client/queryproto"
 	concentratedtypes "github.com/osmosis-labs/osmosis/v23/x/concentrated-liquidity/types"
-	"github.com/osmosis-labs/osmosis/v23/x/cosmwasmpool/model"
 	poolmanagertypes "github.com/osmosis-labs/osmosis/v23/x/poolmanager/types"
 )
 
@@ -74,9 +75,6 @@ const (
 	atomDenom   = "ibc/27394FB092D2ECCD56123C74F36E4C1F926001CEADA9CA97EA622B25F41E5EB2"
 	usdtDenom   = "ibc/2108F2D81CBE328F371AD0CEF56691B18A86E08C3651504E42487D9EE92DDE9C"
 	oneOSMO     = 1_000_000
-
-	// code ID of the broken WhiteWhale cosmwasm pools on mainnet.
-	whiteWhalePoolCodeID = uint64(503)
 )
 
 var (
@@ -201,18 +199,6 @@ func (pi *poolIngester) processPoolState(ctx sdk.Context, tx repository.Tx) erro
 	}
 
 	for _, pool := range cosmWasmPools {
-		// The logic below is to skip mainnet WhiteWhale pools that were instantiated while
-		// borne
-		cwPool, ok := pool.(*model.Pool)
-		if !ok {
-			return errors.New("fail to cast cw pool")
-		}
-
-		// White whale pool code ID
-		if cwPool.CodeId == whiteWhalePoolCodeID {
-			continue
-		}
-
 		// Parse cosmwasm pool to the standard SQS types.
 		pool, err := pi.convertPool(ctx, pool, denomToRoutablePoolIDMap, denomPairToTakerFeeMap, tokenPrecisionMap)
 		if err != nil {
@@ -330,6 +316,14 @@ func (pi *poolIngester) convertPool(
 	}()
 
 	balances := pi.bankKeeper.GetAllBalances(ctx, pool.GetAddress())
+	if pool.GetType() == poolmanagertypes.CosmWasm {
+		cwPool, ok := pool.(cosmwasmpooltypes.CosmWasmExtension)
+		if !ok {
+			return nil, fmt.Errorf("pool (%d) with type (%d) is not a CosmWasmExtension", pool.GetId(), pool.GetType())
+		}
+
+		balances = cwPool.GetTotalPoolLiquidity(ctx)
+	}
 
 	osmoPoolTVL := osmomath.ZeroInt()
 
diff --git a/osmomath/go.mod b/osmomath/go.mod
index 48486ce634f..55112ebec75 100644
--- a/osmomath/go.mod
+++ b/osmomath/go.mod
@@ -5,7 +5,7 @@ go 1.21
 require (
 	cosmossdk.io/math v1.2.1-0.20240219164559-72eae6dc50e4
 	github.com/cosmos/cosmos-sdk v0.47.8
-	github.com/osmosis-labs/osmosis/osmoutils v0.0.9-0.20240222004208-b602d1901059
+	github.com/osmosis-labs/osmosis/osmoutils v0.0.9-0.20240306055140-d7dfe8e8669e
 	github.com/stretchr/testify v1.8.4
 	gopkg.in/yaml.v2 v2.4.0
 
@@ -100,9 +100,9 @@ replace (
 	// v1.0.0-beta.3 is incompatible, so we use v1.0.0-beta.2
 	github.com/cosmos/cosmos-proto => github.com/cosmos/cosmos-proto v1.0.0-beta.2
 
-	// Our cosmos-sdk branch is: https://github.com/osmosis-labs/cosmos-sdk/tree/osmo-v23/v0.47.5-iavl-v1, current branch: osmo-v23/v0.47.5-iavl-v1. Direct commit link: https://github.com/osmosis-labs/cosmos-sdk/commit/d44a3847e089de47cbba0f31a0cebed64ad2806f
+	// Our cosmos-sdk branch is: https://github.com/osmosis-labs/cosmos-sdk/tree/osmo/v0.47.5, current branch: osmo/v0.47.5. Direct commit link: https://github.com/osmosis-labs/cosmos-sdk/commit/76d3c64545bad5bc930756eca88eacaed30f9f3e
 	// https://github.com/osmosis-labs/cosmos-sdk/releases/tag/v0.47.5-v23-osmo-1
-	github.com/cosmos/cosmos-sdk => github.com/osmosis-labs/cosmos-sdk v0.47.5-v23-osmo-2-iavl-v1
+	github.com/cosmos/cosmos-sdk => github.com/osmosis-labs/cosmos-sdk v0.47.6-0.20240309220415-76d3c64545ba
 	github.com/cosmos/gogoproto => github.com/cosmos/gogoproto v1.4.10
 	github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1
 
diff --git a/osmomath/go.sum b/osmomath/go.sum
index 0a349afdcc4..30c34588192 100644
--- a/osmomath/go.sum
+++ b/osmomath/go.sum
@@ -263,8 +263,8 @@ 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-v23-osmo-2-iavl-v1 h1:znGVTrQKVV2bKzZPSvC+RwX7tu+hf+WUCkgPHWGOiEc=
 github.com/osmosis-labs/cosmos-sdk v0.47.5-v23-osmo-2-iavl-v1/go.mod h1:4WHIpz3iRefLvpqKD9oRNWD10AQbDt0tj6MmWcuY1QI=
-github.com/osmosis-labs/osmosis/osmoutils v0.0.9-0.20240222004208-b602d1901059 h1:2PyAblTdr9l5GacEuQY/CitAAUdA60UH43qD9FChdXQ=
-github.com/osmosis-labs/osmosis/osmoutils v0.0.9-0.20240222004208-b602d1901059/go.mod h1:uClYVpeXbVKOHRA0n55kfP1jJz1lv66k+V5N0w/vi5M=
+github.com/osmosis-labs/osmosis/osmoutils v0.0.9-0.20240306055140-d7dfe8e8669e h1:fn4rXlW2Qp6Zga/1bBrXxUwZ5fF+HKX221TFxNTpkJ8=
+github.com/osmosis-labs/osmosis/osmoutils v0.0.9-0.20240306055140-d7dfe8e8669e/go.mod h1:c/lE4YlUAEGRszC+l0rSd5ypkzlgyx3FHDg8RZNwmYA=
 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/osmomath/math.go b/osmomath/math.go
index 6da8d5e4d1b..a3c53256ca4 100644
--- a/osmomath/math.go
+++ b/osmomath/math.go
@@ -79,7 +79,7 @@ func Pow(base Dec, exp Dec) Dec {
 
 	fractionalPow := PowApprox(base, fractional, powPrecision)
 
-	return integerPow.Mul(fractionalPow)
+	return integerPow.MulMut(fractionalPow)
 }
 
 // Contract: 0 < base <= 2
diff --git a/osmoutils/cache_ctx.go b/osmoutils/cache_ctx.go
index b5653ae305e..168d9e18886 100644
--- a/osmoutils/cache_ctx.go
+++ b/osmoutils/cache_ctx.go
@@ -18,6 +18,15 @@ import (
 // If its an out of gas panic, this function will also panic like in normal tx execution flow.
 // This is still safe for beginblock / endblock code though, as they do not have out of gas panics.
 func ApplyFuncIfNoError(ctx sdk.Context, f func(ctx sdk.Context) error) (err error) {
+	return applyFunc(ctx, f, ctx.Logger().Error)
+}
+
+// ApplyFuncIfNoErrorLogToDebug is the same as ApplyFuncIfNoError, but sends logs to debug instead of error if there is an error.
+func ApplyFuncIfNoErrorLogToDebug(ctx sdk.Context, f func(ctx sdk.Context) error) (err error) {
+	return applyFunc(ctx, f, ctx.Logger().Debug)
+}
+
+func applyFunc(ctx sdk.Context, f func(ctx sdk.Context) error, logFunc func(string, ...interface{})) (err error) {
 	// Add a panic safeguard
 	defer func() {
 		if recoveryError := recover(); recoveryError != nil {
@@ -34,7 +43,7 @@ func ApplyFuncIfNoError(ctx sdk.Context, f func(ctx sdk.Context) error) (err err
 	cacheCtx, write := ctx.CacheContext()
 	err = f(cacheCtx)
 	if err != nil {
-		ctx.Logger().Error(err.Error())
+		logFunc(err.Error())
 	} else {
 		// no error, write the output of f
 		write()
diff --git a/osmoutils/go.mod b/osmoutils/go.mod
index ef39855e90f..ac05de130fa 100644
--- a/osmoutils/go.mod
+++ b/osmoutils/go.mod
@@ -4,16 +4,15 @@ go 1.21
 
 require (
 	cosmossdk.io/log v1.3.0
-	cosmossdk.io/math v1.2.1-0.20240219164559-72eae6dc50e4
+	cosmossdk.io/math v1.3.0
 	github.com/CosmWasm/wasmvm v1.5.2
 	github.com/cometbft/cometbft v0.37.4
-	github.com/cometbft/cometbft-db v0.10.0
-	github.com/cosmos/cosmos-db v1.0.0
+	github.com/cometbft/cometbft-db v0.11.0
 	github.com/cosmos/cosmos-sdk v0.47.8
 	github.com/cosmos/gogoproto v1.4.11
 	github.com/cosmos/iavl v1.0.2-0.20240221171955-e019f7411ec7
 	github.com/cosmos/ibc-go/v7 v7.3.2
-	github.com/osmosis-labs/osmosis/osmomath v0.0.8
+	github.com/osmosis-labs/osmosis/osmomath v0.0.9-0.20240306055140-d7dfe8e8669e
 	github.com/spf13/cast v1.6.0
 	github.com/spf13/cobra v1.8.0
 	github.com/spf13/pflag v1.0.5
@@ -22,6 +21,7 @@ require (
 )
 
 require (
+	cloud.google.com/go/storage v1.36.0 // indirect
 	cosmossdk.io/api v0.3.1 // indirect
 	cosmossdk.io/core v0.5.1 // indirect
 	cosmossdk.io/depinject v1.0.0-alpha.4 // indirect
@@ -47,13 +47,16 @@ require (
 	github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect
 	github.com/chenzhuoyu/iasm v0.9.1 // indirect
 	github.com/chzyer/readline v1.5.1 // indirect
-	github.com/cockroachdb/errors v1.10.0 // indirect
+	github.com/cockroachdb/datadriven v1.0.3-0.20230801171734-e384cf455877 // indirect
+	github.com/cockroachdb/errors v1.11.1 // indirect
 	github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect
-	github.com/cockroachdb/pebble v1.0.0 // indirect
+	github.com/cockroachdb/pebble v1.1.0 // indirect
 	github.com/cockroachdb/redact v1.1.5 // indirect
+	github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 // indirect
 	github.com/coinbase/rosetta-sdk-go/types v1.0.0 // indirect
 	github.com/confio/ics23/go v0.9.1 // indirect
 	github.com/cosmos/btcutil v1.0.5 // indirect
+	github.com/cosmos/cosmos-db v1.0.0 // indirect
 	github.com/cosmos/cosmos-proto v1.0.0-beta.3 // indirect
 	github.com/cosmos/go-bip39 v1.0.0 // indirect
 	github.com/cosmos/gogogateway v1.2.0 // indirect
@@ -71,7 +74,7 @@ require (
 	github.com/dustin/go-humanize v1.0.1 // indirect
 	github.com/dvsekhvalnov/jose2go v1.6.0 // indirect
 	github.com/emicklei/dot v1.4.2 // indirect
-	github.com/felixge/httpsnoop v1.0.2 // indirect
+	github.com/felixge/httpsnoop v1.0.4 // indirect
 	github.com/fsnotify/fsnotify v1.7.0 // indirect
 	github.com/gabriel-vasile/mimetype v1.4.3 // indirect
 	github.com/getsentry/sentry-go v0.23.0 // indirect
@@ -83,7 +86,7 @@ require (
 	github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect
 	github.com/gogo/googleapis v1.4.1 // indirect
 	github.com/gogo/protobuf v1.3.3 // indirect
-	github.com/golang/glog v1.1.2 // indirect
+	github.com/golang/glog v1.2.0 // indirect
 	github.com/golang/mock v1.6.0 // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/golang/snappy v0.0.4 // indirect
@@ -113,7 +116,7 @@ require (
 	github.com/kr/text v0.2.0 // indirect
 	github.com/lib/pq v1.10.9 // indirect
 	github.com/libp2p/go-buffer-pool v0.1.0 // indirect
-	github.com/linxGnu/grocksdb v1.8.11 // indirect
+	github.com/linxGnu/grocksdb v1.8.12 // indirect
 	github.com/magiconair/properties v1.8.7 // indirect
 	github.com/manifoldco/promptui v0.9.0 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
@@ -124,7 +127,7 @@ require (
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/mtibben/percent v0.2.1 // indirect
 	github.com/onsi/gomega v1.28.1 // indirect
-	github.com/opencontainers/runc v1.1.7 // indirect
+	github.com/opencontainers/runc v1.1.12 // 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
@@ -154,17 +157,18 @@ require (
 	go.etcd.io/bbolt v1.3.8 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	golang.org/x/arch v0.7.0 // indirect
-	golang.org/x/crypto v0.17.0 // indirect
-	golang.org/x/net v0.19.0 // indirect
-	golang.org/x/sync v0.5.0 // indirect
+	golang.org/x/crypto v0.18.0 // indirect
+	golang.org/x/net v0.20.0 // indirect
+	golang.org/x/sync v0.6.0 // indirect
 	golang.org/x/sys v0.16.0 // indirect
-	golang.org/x/term v0.15.0 // indirect
+	golang.org/x/term v0.16.0 // indirect
 	golang.org/x/text v0.14.0 // indirect
-	golang.org/x/tools v0.14.0 // indirect
-	google.golang.org/genproto v0.0.0-20240102182953-50ed04b92917 // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20231212172506-995d672761c0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20240108191215-35c7eff3a6b1 // indirect
-	google.golang.org/grpc v1.60.1 // indirect
+	golang.org/x/tools v0.17.0 // indirect
+	google.golang.org/api v0.155.0 // indirect
+	google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect
+	google.golang.org/grpc v1.62.0 // indirect
 	google.golang.org/protobuf v1.32.0 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
@@ -184,9 +188,9 @@ replace (
 	// v1.0.0-beta.3 is incompatible, so we use v1.0.0-beta.2
 	github.com/cosmos/cosmos-proto => github.com/cosmos/cosmos-proto v1.0.0-beta.2
 
-	// Our cosmos-sdk branch is: https://github.com/osmosis-labs/cosmos-sdk/tree/osmo-v23/v0.47.5-iavl-v1, current branch: osmo-v23/v0.47.5-iavl-v1. Direct commit link: https://github.com/osmosis-labs/cosmos-sdk/commit/d44a3847e089de47cbba0f31a0cebed64ad2806f
+	// Our cosmos-sdk branch is: https://github.com/osmosis-labs/cosmos-sdk/tree/osmo/v0.47.5, current branch: osmo/v0.47.5. Direct commit link: https://github.com/osmosis-labs/cosmos-sdk/commit/76d3c64545bad5bc930756eca88eacaed30f9f3e
 	// https://github.com/osmosis-labs/cosmos-sdk/releases/tag/v0.47.5-v23-osmo-1
-	github.com/cosmos/cosmos-sdk => github.com/osmosis-labs/cosmos-sdk v0.47.5-v23-osmo-2-iavl-v1
+	github.com/cosmos/cosmos-sdk => github.com/osmosis-labs/cosmos-sdk v0.47.6-0.20240309220415-76d3c64545ba
 	github.com/cosmos/gogoproto => github.com/cosmos/gogoproto v1.4.10
 	github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1
 
diff --git a/osmoutils/go.sum b/osmoutils/go.sum
index 507fc791a82..d07e5a76e92 100644
--- a/osmoutils/go.sum
+++ b/osmoutils/go.sum
@@ -36,8 +36,8 @@ cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRY
 cloud.google.com/go v0.105.0/go.mod h1:PrLgOJNe5nfE9UMxKxgXj4mD3voiP+YQ6gdt6KMFOKM=
 cloud.google.com/go v0.107.0/go.mod h1:wpc2eNrD7hXUTy8EKS10jkxpZBjASrORK7goS+3YX2I=
 cloud.google.com/go v0.110.0/go.mod h1:SJnCLqQ0FCFGSZMUNUf84MV3Aia54kn7pi8st7tMzaY=
-cloud.google.com/go v0.111.0 h1:YHLKNupSD1KqjDbQ3+LVdQ81h/UJbJyZG203cEfnQgM=
-cloud.google.com/go v0.111.0/go.mod h1:0mibmpKP1TyOOFYQY5izo0LnT+ecvOQ0Sg3OdmMiNRU=
+cloud.google.com/go v0.112.0 h1:tpFCD7hpHFlQ8yPwT3x+QeXqc2T6+n6T+hmABHfDUSM=
+cloud.google.com/go v0.112.0/go.mod h1:3jEEVwZ/MHU4djK5t5RHuKOA/GbLddgTdVubX1qnPD4=
 cloud.google.com/go/accessapproval v1.4.0/go.mod h1:zybIuC3KpDOvotz59lFe5qxRZx6C75OtwbisN56xYB4=
 cloud.google.com/go/accessapproval v1.5.0/go.mod h1:HFy3tuiGvMdcd/u+Cu5b9NkO1pEICJ46IR82PoUdplw=
 cloud.google.com/go/accessapproval v1.6.0/go.mod h1:R0EiYnwV5fsRFiKZkPHr6mwyk2wxUJ30nL4j2pcFY2E=
@@ -460,8 +460,8 @@ cloud.google.com/go/storage v1.22.1/go.mod h1:S8N1cAStu7BOeFfE8KAQzmyyLkK8p/vmRq
 cloud.google.com/go/storage v1.23.0/go.mod h1:vOEEDNFnciUMhBeT6hsJIn3ieU5cFRmzeLgDvXzfIXc=
 cloud.google.com/go/storage v1.27.0/go.mod h1:x9DOL8TK/ygDUMieqwfhdpQryTeEkhGKMi80i/iqR2s=
 cloud.google.com/go/storage v1.28.1/go.mod h1:Qnisd4CqDdo6BGs2AD5LLnEsmSQ80wQ5ogcBBKhU86Y=
-cloud.google.com/go/storage v1.35.1 h1:B59ahL//eDfx2IIKFBeT5Atm9wnNmj3+8xG/W4WB//w=
-cloud.google.com/go/storage v1.35.1/go.mod h1:M6M/3V/D3KpzMTJyPOR/HU6n2Si5QdaXYEsng2xgOs8=
+cloud.google.com/go/storage v1.36.0 h1:P0mOkAcaJxhCTvAkMhxMfrTKiNcub4YmmPBtlhAyTr8=
+cloud.google.com/go/storage v1.36.0/go.mod h1:M6M/3V/D3KpzMTJyPOR/HU6n2Si5QdaXYEsng2xgOs8=
 cloud.google.com/go/storagetransfer v1.5.0/go.mod h1:dxNzUopWy7RQevYFHewchb29POFv3/AaBgnhqzqiK0w=
 cloud.google.com/go/storagetransfer v1.6.0/go.mod h1:y77xm4CQV/ZhFZH75PLEXY0ROiS7Gh6pSKrM8dJyg6I=
 cloud.google.com/go/storagetransfer v1.7.0/go.mod h1:8Giuj1QNb1kfLAiWM1bN6dHzfdlDAVC9rv9abHot2W4=
@@ -527,8 +527,8 @@ cosmossdk.io/errors v1.0.1 h1:bzu+Kcr0kS/1DuPBtUFdWjzLqyUuCiyHjyJB6srBV/0=
 cosmossdk.io/errors v1.0.1/go.mod h1:MeelVSZThMi4bEakzhhhE/CKqVv3nOJDA25bIqRDu/U=
 cosmossdk.io/log v1.3.0 h1:L0Z0XstClo2kOU4h3V1iDoE5Ji64sg5HLOogzGg67Oo=
 cosmossdk.io/log v1.3.0/go.mod h1:HIDyvWLqZe2ovlWabsDN4aPMpY/nUEquAhgfTf2ZzB8=
-cosmossdk.io/math v1.2.1-0.20240219164559-72eae6dc50e4 h1:YVXqcsZcHmFWA2IPSqOFbOpmbEAm8gAsr5FmEV3kv5s=
-cosmossdk.io/math v1.2.1-0.20240219164559-72eae6dc50e4/go.mod h1:vnRTxewy+M7BtXBNFybkuhSH4WfedVAAnERHgVFhp3k=
+cosmossdk.io/math v1.3.0 h1:RC+jryuKeytIiictDslBP9i1fhkVm6ZDmZEoNP316zE=
+cosmossdk.io/math v1.3.0/go.mod h1:vnRTxewy+M7BtXBNFybkuhSH4WfedVAAnERHgVFhp3k=
 cosmossdk.io/tools/rosetta v0.2.1 h1:ddOMatOH+pbxWbrGJKRAawdBkPYLfKXutK9IETnjYxw=
 cosmossdk.io/tools/rosetta v0.2.1/go.mod h1:Pqdc1FdvkNV3LcNIkYWt2RQY6IP1ge6YWZk8MhhO9Hw=
 filippo.io/edwards25519 v1.0.0 h1:0wAIcmJUqRdI8IJ/3eGi5/HwXZWPujYXXlkrQogz0Ek=
@@ -687,19 +687,21 @@ github.com/cockroachdb/apd/v2 v2.0.2/go.mod h1:DDxRlzC2lo3/vSlmSoS7JkqbbrARPuFOG
 github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8=
 github.com/cockroachdb/datadriven v1.0.3-0.20230801171734-e384cf455877 h1:1MLK4YpFtIEo3ZtMA5C795Wtv5VuUnrXX7mQG+aHg6o=
 github.com/cockroachdb/datadriven v1.0.3-0.20230801171734-e384cf455877/go.mod h1:a9RdTaap04u637JoCzcUoIcDmvwSUtcUFtT/C3kJlTU=
-github.com/cockroachdb/errors v1.10.0 h1:lfxS8zZz1+OjtV4MtNWgboi/W5tyLEB6VQZBXN+0VUU=
-github.com/cockroachdb/errors v1.10.0/go.mod h1:lknhIsEVQ9Ss/qKDBQS/UqFSvPQjOwNq2qyKAxtHRqE=
+github.com/cockroachdb/errors v1.11.1 h1:xSEW75zKaKCWzR3OfxXUxgrk/NtT4G1MiOv5lWZazG8=
+github.com/cockroachdb/errors v1.11.1/go.mod h1:8MUxA3Gi6b25tYlFEBGLf+D8aISL+M4MIpiWMSNRfxw=
 github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b h1:r6VH0faHjZeQy818SGhaone5OnYfxFR/+AzdY3sf5aE=
 github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b/go.mod h1:Vz9DsVWQQhf3vs21MhPMZpMGSht7O/2vFW2xusFUVOs=
-github.com/cockroachdb/pebble v1.0.0 h1:WZWlV/s78glZbY2ylUITDOWSVBD3cLjcWPLRPFbHNYg=
-github.com/cockroachdb/pebble v1.0.0/go.mod h1:bynZ3gvVyhlvjLI7PT6dmZ7g76xzJ7HpxfjgkzCGz6s=
+github.com/cockroachdb/pebble v1.1.0 h1:pcFh8CdCIt2kmEpK0OIatq67Ln9uGDYY3d5XnE0LJG4=
+github.com/cockroachdb/pebble v1.1.0/go.mod h1:sEHm5NOXxyiAoKWhoFxT8xMgd/f3RA6qUqQ1BXKrh2E=
 github.com/cockroachdb/redact v1.1.5 h1:u1PMllDkdFfPWaNGMyLD1+so+aq3uUItthCFqzwPJ30=
 github.com/cockroachdb/redact v1.1.5/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg=
+github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 h1:zuQyyAKVxetITBuuhv3BI9cMrmStnpT18zmgmTxunpo=
+github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06/go.mod h1:7nc4anLGjupUW/PeY5qiNYsdNXj7zopG+eqsS7To5IQ=
 github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI=
 github.com/coinbase/rosetta-sdk-go/types v1.0.0 h1:jpVIwLcPoOeCR6o1tU+Xv7r5bMONNbHU7MuEHboiFuA=
 github.com/coinbase/rosetta-sdk-go/types v1.0.0/go.mod h1:eq7W2TMRH22GTW0N0beDnN931DW0/WOI1R2sdHNHG4c=
-github.com/cometbft/cometbft-db v0.10.0 h1:VMBQh88zXn64jXVvj39tlu/IgsGR84T7ImjS523DCiU=
-github.com/cometbft/cometbft-db v0.10.0/go.mod h1:7RR7NRv99j7keWJ5IkE9iZibUTKYdtepXTp7Ra0FxKk=
+github.com/cometbft/cometbft-db v0.11.0 h1:M3Lscmpogx5NTbb1EGyGDaFRdsoLWrUWimFEyf7jej8=
+github.com/cometbft/cometbft-db v0.11.0/go.mod h1:GDPJAC/iFHNjmZZPN8V8C1yr/eyityhi2W1hz2MGKSc=
 github.com/confio/ics23/go v0.9.1 h1:3MV46eeWwO3xCauKyAtuAdJYMyPnnchW4iLr2bTw6/U=
 github.com/confio/ics23/go v0.9.1/go.mod h1:4LPZ2NYqnYIVRklaozjNR1FScgDJ2s5Xrp+e/mYVRak=
 github.com/containerd/continuity v0.3.0 h1:nisirsYROK15TAMVukJOUyGJjz4BNQJBVsNvAXZJ/eg=
@@ -800,8 +802,8 @@ github.com/envoyproxy/protoc-gen-validate v0.9.1/go.mod h1:OKNgG7TCp5pF4d6XftA0+
 github.com/envoyproxy/protoc-gen-validate v0.10.0/go.mod h1:DRjgyB0I43LtJapqN6NiRwroiAU2PaFuvk/vjgh61ss=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
 github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
-github.com/felixge/httpsnoop v1.0.2 h1:+nS9g82KMXccJ/wp0zyRW9ZBHFETmMGtkk+2CTTrW4o=
-github.com/felixge/httpsnoop v1.0.2/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
+github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg=
+github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
 github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k=
 github.com/fogleman/gg v1.3.0/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k=
 github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw=
@@ -846,8 +848,8 @@ github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V
 github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
 github.com/go-logfmt/logfmt v0.6.0 h1:wGYYu3uicYdqXVgoYbvnkrPVXkuLM1p1ifugDMEdRi4=
 github.com/go-logfmt/logfmt v0.6.0/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs=
-github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ=
-github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
+github.com/go-logr/logr v1.3.0 h1:2y3SDp0ZXuc6/cjLSZ+Q3ir+QB9T/iG5yYRXqsagWSY=
+github.com/go-logr/logr v1.3.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
 github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
 github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
 github.com/go-pdf/fpdf v0.5.0/go.mod h1:HzcnA+A23uwogo0tp9yU+l3V+KXhiESpt1PMayhOh5M=
@@ -887,8 +889,8 @@ github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGw
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/glog v1.0.0/go.mod h1:EWib/APOK0SL3dFbYqvxE3UYd8E6s1ouQ7iEp/0LWV4=
 github.com/golang/glog v1.1.0/go.mod h1:pfYeQZ3JWZoXTV5sFc986z3HTpwQs9At6P4ImfuP3NQ=
-github.com/golang/glog v1.1.2 h1:DVjP2PbBOzHyzA+dn3WhHIq4NdVu3Q+pvivFICf/7fo=
-github.com/golang/glog v1.1.2/go.mod h1:zR+okUeTbrL6EL3xHUDxZuEtGv04p5shwip1+mL/rLQ=
+github.com/golang/glog v1.2.0 h1:uCdmnmatrKCgMBlM4rMuJZWOkPDqdbZPnrMXDY4gI68=
+github.com/golang/glog v1.2.0/go.mod h1:6AhwSGph0fcJtXVM/PEHPqZlFeoLxhs7/t5UDAwmO+w=
 github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
@@ -983,8 +985,8 @@ github.com/google/s2a-go v0.1.7/go.mod h1:50CgR4k1jNlWBu4UfS4AcfhVe1r6pdZPygJ3R8
 github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/google/uuid v1.4.0 h1:MtMxsa51/r9yyhkyLsVeVt0B+BGQZzpQiTQ4eHZ8bc4=
-github.com/google/uuid v1.4.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
+github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/googleapis/enterprise-certificate-proxy v0.0.0-20220520183353-fd19c99a87aa/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8=
 github.com/googleapis/enterprise-certificate-proxy v0.1.0/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8=
 github.com/googleapis/enterprise-certificate-proxy v0.2.0/go.mod h1:8C0jb7/mgJe/9KK8Lm7X9ctZC2t60YyIpYEI16jx0Qg=
@@ -1154,8 +1156,8 @@ github.com/libp2p/go-buffer-pool v0.1.0 h1:oK4mSFcQz7cTQIfqbe4MIj9gLW+mnanjyFtc6
 github.com/libp2p/go-buffer-pool v0.1.0/go.mod h1:N+vh8gMqimBzdKkSMVuydVDq+UV5QTWy5HSiZacSbPg=
 github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod h1:qklhhLq1aX+mtWk9cPHPzaBjWImj5ULL6C7HFJtXQMM=
 github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4=
-github.com/linxGnu/grocksdb v1.8.11 h1:BGol9e5gB1BrsTvOxloC88pe70TCqgrfLNwkyWW0kD8=
-github.com/linxGnu/grocksdb v1.8.11/go.mod h1:xZCIb5Muw+nhbDK4Y5UJuOrin5MceOuiXkVUR7vp4WY=
+github.com/linxGnu/grocksdb v1.8.12 h1:1/pCztQUOa3BX/1gR3jSZDoaKFpeHFvQ1XrqZpSvZVo=
+github.com/linxGnu/grocksdb v1.8.12/go.mod h1:xZCIb5Muw+nhbDK4Y5UJuOrin5MceOuiXkVUR7vp4WY=
 github.com/lyft/protoc-gen-star v0.6.0/go.mod h1:TGAoBVkt8w7MPG72TrKIu85MIdXwDuzJYeZuUPFPNwA=
 github.com/lyft/protoc-gen-star v0.6.1/go.mod h1:TGAoBVkt8w7MPG72TrKIu85MIdXwDuzJYeZuUPFPNwA=
 github.com/lyft/protoc-gen-star/v2 v2.0.1/go.mod h1:RcCdONR2ScXaYnQC5tUzxzlpA3WVYF7/opLeUgcQs/o=
@@ -1245,8 +1247,8 @@ github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8
 github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
 github.com/opencontainers/image-spec v1.1.0-rc2 h1:2zx/Stx4Wc5pIPDvIxHXvXtQFW/7XWJGmnM7r3wg034=
 github.com/opencontainers/image-spec v1.1.0-rc2/go.mod h1:3OVijpioIKYWTqjiG0zfF6wvoJ4fAXGbjdZuI2NgsRQ=
-github.com/opencontainers/runc v1.1.7 h1:y2EZDS8sNng4Ksf0GUYNhKbTShZJPJg1FiXJNH/uoCk=
-github.com/opencontainers/runc v1.1.7/go.mod h1:CbUumNnWCuTGFukNXahoo/RFBZvDAgRh/smNYNOhA50=
+github.com/opencontainers/runc v1.1.12 h1:BOIssBaW1La0/qbNZHXOOa71dZfZEQOzW7dqQf3phss=
+github.com/opencontainers/runc v1.1.12/go.mod h1:S+lQwSfncpBha7XTy/5lBwWgm5+y5Ma/O44Ekby9FK8=
 github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod h1:Ngi6UdF0k5OKD5t5wlmGhe/EDKPoUM3BXZSSfIuJbis=
 github.com/opentracing/basictracer-go v1.0.0/go.mod h1:QfBfYuafItcjQuMwinw9GhYKwFXS9KnPs5lxoYwgW74=
 github.com/opentracing/opentracing-go v1.0.2/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
@@ -1261,8 +1263,8 @@ github.com/osmosis-labs/cometbft v0.37.4-v23-osmo-2 h1:967/6vaO8l/eSzkB5rcCAZjxl
 github.com/osmosis-labs/cometbft v0.37.4-v23-osmo-2/go.mod h1:Cmg5Hp4sNpapm7j+x0xRyt2g0juQfmB752ous+pA0G8=
 github.com/osmosis-labs/cosmos-sdk v0.47.5-v23-osmo-2-iavl-v1 h1:znGVTrQKVV2bKzZPSvC+RwX7tu+hf+WUCkgPHWGOiEc=
 github.com/osmosis-labs/cosmos-sdk v0.47.5-v23-osmo-2-iavl-v1/go.mod h1:4WHIpz3iRefLvpqKD9oRNWD10AQbDt0tj6MmWcuY1QI=
-github.com/osmosis-labs/osmosis/osmomath v0.0.8 h1:jm6D5UgzQ0GQGtyFezs7tQRgwakf3cTBsE8oJIQdPZE=
-github.com/osmosis-labs/osmosis/osmomath v0.0.8/go.mod h1:4iPfmy6R0qbImLe5urBLS0thndfLxfmHOdnYboDS1Qo=
+github.com/osmosis-labs/osmosis/osmomath v0.0.9-0.20240306055140-d7dfe8e8669e h1:wMbjfdBY8T8dfiC/llpyvrTmZ+85eO3BVGTXFoGYP8Q=
+github.com/osmosis-labs/osmosis/osmomath v0.0.9-0.20240306055140-d7dfe8e8669e/go.mod h1:u3sHQAPLDss2DovMB/4SCkiau85jVGv6Vsp8L7kSCcM=
 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=
@@ -1471,12 +1473,16 @@ go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
 go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
 go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0=
 go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo=
-go.opentelemetry.io/otel v1.19.0 h1:MuS/TNf4/j4IXsZuJegVzI1cwut7Qc00344rgH7p8bs=
-go.opentelemetry.io/otel v1.19.0/go.mod h1:i0QyjOq3UPoTzff0PJB2N66fb4S0+rSbSB15/oyH9fY=
-go.opentelemetry.io/otel/metric v1.19.0 h1:aTzpGtV0ar9wlV4Sna9sdJyII5jTVJEvKETPiOKwvpE=
-go.opentelemetry.io/otel/metric v1.19.0/go.mod h1:L5rUsV9kM1IxCj1MmSdS+JQAcVm319EUrDVLrt7jqt8=
-go.opentelemetry.io/otel/trace v1.19.0 h1:DFVQmlVbfVeOuBRrwdtaehRrWiL1JoVs9CPIQ1Dzxpg=
-go.opentelemetry.io/otel/trace v1.19.0/go.mod h1:mfaSyvGyEJEI0nyV2I4qhNQnbBOUUmYZpYojqMnX2vo=
+go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1 h1:SpGay3w+nEwMpfVnbqOLH5gY52/foP8RE8UzTZ1pdSE=
+go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1/go.mod h1:4UoMYEZOC0yN/sPGH76KPkkU7zgiEWYWL9vwmbnTJPE=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 h1:aFJWCqJMNjENlcleuuOkGAPH82y0yULBScfXcIEdS24=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1/go.mod h1:sEGXWArGqc3tVa+ekntsN65DmVbVeW+7lTKTjZF3/Fo=
+go.opentelemetry.io/otel v1.21.0 h1:hzLeKBZEL7Okw2mGzZ0cc4k/A7Fta0uoPgaJCr8fsFc=
+go.opentelemetry.io/otel v1.21.0/go.mod h1:QZzNPQPm1zLX4gZK4cMi+71eaorMSGT3A4znnUvNNEo=
+go.opentelemetry.io/otel/metric v1.21.0 h1:tlYWfeo+Bocx5kLEloTjbcDwBuELRrIFxwdQ36PlJu4=
+go.opentelemetry.io/otel/metric v1.21.0/go.mod h1:o1p3CA8nNHW8j5yuQLdc1eeqEaPfzug24uvsyIEJRWM=
+go.opentelemetry.io/otel/trace v1.21.0 h1:WD9i5gzvoUPuXIXH24ZNBudiarZDKuekPqi/E8fpfLc=
+go.opentelemetry.io/otel/trace v1.21.0/go.mod h1:LGbsEB0f9LGjN+OZaQQ26sohbOmiMR+BaslueVtS/qQ=
 go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
 go.opentelemetry.io/proto/otlp v0.15.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U=
 go.opentelemetry.io/proto/otlp v0.19.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U=
@@ -1514,8 +1520,8 @@ golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw=
-golang.org/x/crypto v0.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k=
-golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
+golang.org/x/crypto v0.18.0 h1:PGVlW0xEltQnzFZ55hkuX5+KLyrMYhHld1YHO4AKcdc=
+golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg=
 golang.org/x/exp v0.0.0-20230711153332-06a737ee72cb h1:xIApU0ow1zwMa2uL1VDNeQlNVFTWMQxZUZCMDy0Q4Us=
 golang.org/x/exp v0.0.0-20230711153332-06a737ee72cb/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc=
 golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs=
@@ -1556,8 +1562,8 @@ golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/mod v0.9.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/mod v0.11.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
-golang.org/x/mod v0.13.0 h1:I/DsJXRlw/8l/0c24sM9yb0T4z9liZTduXvdAWYiysY=
-golang.org/x/mod v0.13.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
+golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0=
+golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/net v0.0.0-20180719180050-a680a1efc54d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -1629,8 +1635,8 @@ golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
 golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns=
-golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c=
-golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U=
+golang.org/x/net v0.20.0 h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo=
+golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -1659,8 +1665,8 @@ golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri
 golang.org/x/oauth2 v0.4.0/go.mod h1:RznEsdpjGAINPTOF0UH/t+xJ75L18YO3Ho6Pyn+uRec=
 golang.org/x/oauth2 v0.5.0/go.mod h1:9/XBHVqLaWO3/BRHs5jbpYCnOZVjj5V0ndyaAM7KB4I=
 golang.org/x/oauth2 v0.6.0/go.mod h1:ycmewcwgD4Rpr3eZJLSB4Kyyljb3qDh40vJ8STE5HKw=
-golang.org/x/oauth2 v0.15.0 h1:s8pnnxNVzjWyrvYdFUQq5llS1PX2zhPXmccZv99h7uQ=
-golang.org/x/oauth2 v0.15.0/go.mod h1:q48ptWNTY5XWf+JNten23lcvHpLJ0ZSxF5ttTHKVCAM=
+golang.org/x/oauth2 v0.16.0 h1:aDkGMBSYxElaoP81NpoUoz2oo2R2wHdZpGToUxfyQrQ=
+golang.org/x/oauth2 v0.16.0/go.mod h1:hqZ+0LWXsiVoZpeld6jVt06P3adbS2Uu911W1SsJv2o=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -1677,8 +1683,8 @@ golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220929204114-8fcdb60fdcc0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.5.0 h1:60k92dhOjHxJkrqnwsfl8KuaHbn/5dl0lUPUklKo3qE=
-golang.org/x/sync v0.5.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ=
+golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -1797,8 +1803,8 @@ golang.org/x/term v0.4.0/go.mod h1:9P2UbLfCdcvo3p/nzKvsmas4TnlujnuoV9hGgYzW1lQ=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
 golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
 golang.org/x/term v0.7.0/go.mod h1:P32HKFT3hSsZrRxla30E9HqToFYAQPCMs/zFMBUFqPY=
-golang.org/x/term v0.15.0 h1:y/Oo/a/q3IXu26lQgl04j/gjuBDOBlx7X6Om1j2CPW4=
-golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0=
+golang.org/x/term v0.16.0 h1:m+B6fahuftsE9qjo0VWp2FW0mB3MTJvR0BaMQrq0pmE=
+golang.org/x/term v0.16.0/go.mod h1:yn7UURbUtPyrVJPGPq404EukNFxcm/foM+bV/bfcDsY=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -1891,8 +1897,8 @@ golang.org/x/tools v0.2.0/go.mod h1:y4OqIKeOV/fWJetJ8bXPU1sEVniLMIyDAZWeHdV+NTA=
 golang.org/x/tools v0.3.0/go.mod h1:/rWhSS2+zyEVwoJf8YAX6L2f0ntZ7Kn/mGgAWcipA5k=
 golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
 golang.org/x/tools v0.7.0/go.mod h1:4pg6aUX35JBAogB10C9AtvVL+qowtN4pT3CGSQex14s=
-golang.org/x/tools v0.14.0 h1:jvNa2pY0M4r62jkRQ6RwEZZyPcymeL9XZMLBbV7U2nc=
-golang.org/x/tools v0.14.0/go.mod h1:uYBEerGOWcJyEORxN+Ek8+TT266gXkNlHdJBwexUsBg=
+golang.org/x/tools v0.17.0 h1:FvmRgNOcs3kOa+T20R1uhfP9F6HgG2mfxDv1vrx1Htc=
+golang.org/x/tools v0.17.0/go.mod h1:xsh6VxdV005rRVaS6SSAf9oiAqljS7UZUacMZ8Bnsps=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -1965,8 +1971,8 @@ google.golang.org/api v0.106.0/go.mod h1:2Ts0XTHNVWxypznxWOYUeI4g3WdP9Pk2Qk58+a/
 google.golang.org/api v0.107.0/go.mod h1:2Ts0XTHNVWxypznxWOYUeI4g3WdP9Pk2Qk58+a/O9MY=
 google.golang.org/api v0.108.0/go.mod h1:2Ts0XTHNVWxypznxWOYUeI4g3WdP9Pk2Qk58+a/O9MY=
 google.golang.org/api v0.110.0/go.mod h1:7FC4Vvx1Mooxh8C5HWjzZHcavuS2f6pmJpZx60ca7iI=
-google.golang.org/api v0.153.0 h1:N1AwGhielyKFaUqH07/ZSIQR3uNPcV7NVw0vj+j4iR4=
-google.golang.org/api v0.153.0/go.mod h1:3qNJX5eOmhiWYc67jRA/3GsDw97UFb5ivv7Y2PrriAY=
+google.golang.org/api v0.155.0 h1:vBmGhCYs0djJttDNynWo44zosHlPvHmA0XiN2zP2DtA=
+google.golang.org/api v0.155.0/go.mod h1:GI5qK5f40kCpHfPn6+YzGAByIKWv8ujFnmoWm7Igduk=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
@@ -2107,12 +2113,12 @@ google.golang.org/genproto v0.0.0-20230209215440-0dfe4f8abfcc/go.mod h1:RGgjbofJ
 google.golang.org/genproto v0.0.0-20230216225411-c8e22ba71e44/go.mod h1:8B0gmkoRebU8ukX6HP+4wrVQUY1+6PkQ44BSyIlflHA=
 google.golang.org/genproto v0.0.0-20230222225845-10f96fb3dbec/go.mod h1:3Dl5ZL0q0isWJt+FVcfpQyirqemEuLAK/iFvg1UP1Hw=
 google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4/go.mod h1:NWraEVixdDnqcqQ30jipen1STv2r/n24Wb7twVTGR4s=
-google.golang.org/genproto v0.0.0-20240102182953-50ed04b92917 h1:nz5NESFLZbJGPFxDT/HCn+V1mZ8JGNoY4nUpmW/Y2eg=
-google.golang.org/genproto v0.0.0-20240102182953-50ed04b92917/go.mod h1:pZqR+glSb11aJ+JQcczCvgf47+duRuzNSKqE8YAQnV0=
-google.golang.org/genproto/googleapis/api v0.0.0-20231212172506-995d672761c0 h1:s1w3X6gQxwrLEpxnLd/qXTVLgQE2yXwaOaoa6IlY/+o=
-google.golang.org/genproto/googleapis/api v0.0.0-20231212172506-995d672761c0/go.mod h1:CAny0tYF+0/9rmDB9fahA9YLzX3+AEVl1qXbv5hhj6c=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20240108191215-35c7eff3a6b1 h1:gphdwh0npgs8elJ4T6J+DQJHPVF7RsuJHCfwztUb4J4=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20240108191215-35c7eff3a6b1/go.mod h1:daQN87bsDqDoe316QbbvX60nMoJQa4r6Ds0ZuoAe5yA=
+google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80 h1:KAeGQVN3M9nD0/bQXnr/ClcEMJ968gUXJQ9pwfSynuQ=
+google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80/go.mod h1:cc8bqMqtv9gMOr0zHg2Vzff5ULhhL2IXP4sbcn32Dro=
+google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80 h1:Lj5rbfG876hIAYFjqiJnPHfhXbv+nzTWfm04Fg/XSVU=
+google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80/go.mod h1:4jWUdICTdgc3Ibxmr8nAJiiLHwQBY0UI0XZcEMaFKaA=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s=
 google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.20.0/go.mod h1:chYK+tFQF0nDUGJgXMSgLCQk3phJEuONr2DCgLDdAQM=
@@ -2159,8 +2165,8 @@ google.golang.org/grpc v1.51.0/go.mod h1:wgNDFcnuBGmxLKI/qn4T+m5BtEBYXJPvibbUPsA
 google.golang.org/grpc v1.52.0/go.mod h1:pu6fVzoFb+NBYNAvQL08ic+lvB2IojljRYuun5vorUY=
 google.golang.org/grpc v1.53.0/go.mod h1:OnIrk0ipVdj4N5d9IUoFUx72/VlD7+jUsHwZgwSMQpw=
 google.golang.org/grpc v1.55.0/go.mod h1:iYEXKGkEBhg1PjZQvoYEVPTDkHo1/bjTnfwTeGONTY8=
-google.golang.org/grpc v1.60.1 h1:26+wFr+cNqSGFcOXcabYC0lUVJVRa2Sb2ortSK7VrEU=
-google.golang.org/grpc v1.60.1/go.mod h1:OlCHIeLYqSSsLi6i49B5QGdzaMZK9+M7LXN2FKz4eGM=
+google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk=
+google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE=
 google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
diff --git a/proto/Dockerfile b/proto/Dockerfile
index e390388b6ba..a72cb10a415 100644
--- a/proto/Dockerfile
+++ b/proto/Dockerfile
@@ -3,7 +3,7 @@
 
 FROM bufbuild/buf:1.7.0 as BUILDER
 
-FROM golang:1.20-alpine
+FROM golang:1.21-alpine
 
 
 RUN apk add --no-cache \
diff --git a/proto/buf.yaml b/proto/buf.yaml
index 3cfae5c521f..72e9d018bbf 100644
--- a/proto/buf.yaml
+++ b/proto/buf.yaml
@@ -16,8 +16,19 @@ lint:
   except:
     - UNARY_RPC
     - COMMENT_FIELD
+    - COMMENT_MESSAGE
+    - COMMENT_SERVICE
+    - COMMENT_RPC
     - SERVICE_SUFFIX
     - PACKAGE_VERSION_SUFFIX
     - RPC_REQUEST_STANDARD_NAME
+    - PACKAGE_SAME_GO_PACKAGE
+    - PACKAGE_SAME_DIRECTORY
+    - PACKAGE_DIRECTORY_MATCH
+    - RPC_RESPONSE_STANDARD_NAME
+    - COMMENT_ENUM_VALUE
+    - COMMENT_ENUM
+    - ENUM_ZERO_VALUE_SUFFIX
+    - ENUM_ZERO_VALUE
   ignore:
     - tendermint
diff --git a/proto/osmosis/bridge/v1beta1/bridge.proto b/proto/osmosis/bridge/v1beta1/bridge.proto
new file mode 100644
index 00000000000..5ffa86c30c5
--- /dev/null
+++ b/proto/osmosis/bridge/v1beta1/bridge.proto
@@ -0,0 +1,45 @@
+syntax = "proto3";
+package osmosis.bridge.v1beta1;
+
+import "gogoproto/gogo.proto";
+
+option go_package = "github.com/osmosis-labs/osmosis/v23/x/bridge/types";
+
+// Params defines params for x/bridge module.
+message Params {
+  // Signers used to sign inbound and release outbound transactions
+  repeated string signers = 1 [ (gogoproto.moretags) = "yaml:\"signers\"" ];
+  // Assets is a list used to create tokenfactory denoms
+  // for corresponding trading pairs
+  repeated AssetWithStatus assets = 2 [
+    (gogoproto.moretags) = "yaml:\"assets\"",
+    (gogoproto.nullable) = false
+  ];
+}
+
+enum AssetStatus {
+  ASSET_STATUS_UNSPECIFIED = 0;
+  ASSET_STATUS_OK = 1;
+  ASSET_STATUS_BLOCKED_INBOUND = 2;
+  ASSET_STATUS_BLOCKED_OUTBOUND = 3;
+  ASSET_STATUS_BLOCKED_BOTH = 4;
+}
+
+// AssetWithStatus defines a pair of the asset and its current status.
+message AssetWithStatus {
+  Asset asset = 1
+      [ (gogoproto.moretags) = "yaml:\"asset\"", (gogoproto.nullable) = false ];
+  AssetStatus asset_status = 2
+      [ (gogoproto.moretags) = "yaml:\"asset_status\"" ];
+}
+
+// Asset defines a pair of the source chain name and its Osmosis representation
+// denoted by denom. It also includes a precision used for coins representation.
+message Asset {
+  // SourceChain is a source chain name
+  string source_chain = 1 [ (gogoproto.moretags) = "yaml:\"source_chain\"" ];
+  // Denom is the Osmosis representation of the SourceChain
+  string denom = 2 [ (gogoproto.moretags) = "yaml:\"denom\"" ];
+  // Precision used for coins representation
+  uint64 precision = 3 [ (gogoproto.moretags) = "yaml:\"precision\"" ];
+}
\ No newline at end of file
diff --git a/proto/osmosis/bridge/v1beta1/events.proto b/proto/osmosis/bridge/v1beta1/events.proto
new file mode 100644
index 00000000000..1ff2eeedf85
--- /dev/null
+++ b/proto/osmosis/bridge/v1beta1/events.proto
@@ -0,0 +1,53 @@
+syntax = "proto3";
+package osmosis.bridge.v1beta1;
+
+import "gogoproto/gogo.proto";
+import "osmosis/bridge/v1beta1/bridge.proto";
+
+option go_package = "github.com/osmosis-labs/osmosis/v23/x/bridge/types";
+
+message EventInboundTransfer {
+  // Sender is a sender's address
+  string sender = 1;
+  // DestAddr is a destination Osmosis address
+  string dest_addr = 2;
+  // Asset contains a source chain and a target denom
+  Asset asset = 3 [ (gogoproto.nullable) = false ];
+  // Amount of coins to transfer
+  string amount = 4 [
+    (gogoproto.customtype) = "cosmossdk.io/math.Int",
+    (gogoproto.nullable) = false
+  ];
+}
+
+message EventOutboundTransfer {
+  // Sender is a sender's address
+  string sender = 1;
+  // DestAddr is a destination Osmosis address
+  string dest_addr = 2;
+  // Asset contains a source chain and a target denom
+  Asset asset = 3 [ (gogoproto.nullable) = false ];
+  // Amount of coins to transfer
+  string amount = 4 [
+    (gogoproto.customtype) = "cosmossdk.io/math.Int",
+    (gogoproto.nullable) = false
+  ];
+}
+
+message EventUpdateParams {
+  repeated string new_signers = 1;
+  repeated string created_signers = 2;
+  repeated string deleted_signers = 3;
+
+  repeated AssetWithStatus new_assets = 4 [ (gogoproto.nullable) = false ];
+  repeated AssetWithStatus created_assets = 5 [ (gogoproto.nullable) = false ];
+  repeated AssetWithStatus deleted_assets = 6 [ (gogoproto.nullable) = false ];
+}
+
+message EventChangeAssetStatus {
+  // Sender is a sender's address
+  string sender = 1;
+  // NewAssetStatus is a pair of the asset and its new status
+  AssetWithStatus old_asset_status = 2 [ (gogoproto.nullable) = false ];
+  AssetWithStatus new_asset_status = 3 [ (gogoproto.nullable) = false ];
+}
\ No newline at end of file
diff --git a/proto/osmosis/bridge/v1beta1/genesis.proto b/proto/osmosis/bridge/v1beta1/genesis.proto
new file mode 100644
index 00000000000..2fe87433abc
--- /dev/null
+++ b/proto/osmosis/bridge/v1beta1/genesis.proto
@@ -0,0 +1,13 @@
+syntax = "proto3";
+package osmosis.bridge.v1beta1;
+
+import "gogoproto/gogo.proto";
+import "osmosis/bridge/v1beta1/bridge.proto";
+
+option go_package = "github.com/osmosis-labs/osmosis/v23/x/bridge/types";
+
+// GenesisState defines the mint module's genesis state.
+message GenesisState {
+  // Params defines params for x/bridge module.
+  Params params = 1 [ (gogoproto.nullable) = false ];
+}
\ No newline at end of file
diff --git a/proto/osmosis/bridge/v1beta1/query.proto b/proto/osmosis/bridge/v1beta1/query.proto
new file mode 100644
index 00000000000..acd30443fa0
--- /dev/null
+++ b/proto/osmosis/bridge/v1beta1/query.proto
@@ -0,0 +1,27 @@
+syntax = "proto3";
+package osmosis.bridge.v1beta1;
+
+import "gogoproto/gogo.proto";
+import "google/api/annotations.proto";
+import "osmosis/bridge/v1beta1/bridge.proto";
+
+option go_package = "github.com/osmosis-labs/osmosis/v23/x/bridge/types";
+
+// Query provides defines the gRPC querier service.
+service Query {
+  // Params returns x/bridge module params.
+  rpc Params(QueryParamsRequest) returns (QueryParamsResponse) {
+    option (google.api.http).get = "/osmosis/bridge/v1beta1/params";
+  }
+}
+
+// QueryParamsRequest is the request type for the Query/Params RPC method.
+message QueryParamsRequest {}
+
+// QueryParamsResponse is the response type for the Query/Params RPC method.
+message QueryParamsResponse {
+  Params params = 1 [
+    (gogoproto.moretags) = "yaml:\"params\"",
+    (gogoproto.nullable) = false
+  ];
+}
\ No newline at end of file
diff --git a/proto/osmosis/bridge/v1beta1/tx.proto b/proto/osmosis/bridge/v1beta1/tx.proto
new file mode 100644
index 00000000000..8d82e393905
--- /dev/null
+++ b/proto/osmosis/bridge/v1beta1/tx.proto
@@ -0,0 +1,111 @@
+syntax = "proto3";
+package osmosis.bridge.v1beta1;
+
+import "gogoproto/gogo.proto";
+import "amino/amino.proto";
+import "cosmos/base/v1beta1/coin.proto";
+import "osmosis/bridge/v1beta1/bridge.proto";
+
+option go_package = "github.com/osmosis-labs/osmosis/v23/x/bridge/types";
+
+// Msg defines the bridge module's gRPC message service.
+service Msg {
+  // InboundTransfer is used for inbound transfers (<other_chain> -> OSMO).
+  rpc InboundTransfer(MsgInboundTransfer) returns (MsgInboundTransferResponse);
+
+  // OutboundTransfer is used for outbound transfers (OSMO -> <other_chain>).
+  rpc OutboundTransfer(MsgOutboundTransfer)
+      returns (MsgOutboundTransferResponse);
+
+  // UpdateParams is used for updating module params.
+  rpc UpdateParams(MsgUpdateParams) returns (MsgUpdateParamsResponse);
+
+  // ChangeAssetStatus will change the provided asset's status.
+  rpc ChangeAssetStatus(MsgChangeAssetStatus)
+      returns (MsgChangeAssetStatusResponse);
+}
+
+// MsgInboundTransfer defines the message structure for the InboundTransfer gRPC
+// service method. It allows a sender to perform an inbound cross-chain
+// transfer, i.e., to transfer their tokens from the source chain to Osmosis and
+// get the equivalent amount of the corresponding token (specified in subdenom)
+// on Osmosis in return. The tokens are minted through the x/tokenfactory module
+// to the destination address.
+message MsgInboundTransfer {
+  option (amino.name) = "osmosis/bridge/inbound-transfer";
+
+  // Sender is a sender's address
+  string sender = 1 [ (gogoproto.moretags) = "yaml:\"sender\"" ];
+  // DestAddr is a destination Osmosis address
+  string dest_addr = 2 [ (gogoproto.moretags) = "yaml:\"dest_addr\"" ];
+  // Asset contains a source chain and a target denom
+  Asset asset = 3
+      [ (gogoproto.moretags) = "yaml:\"asset\"", (gogoproto.nullable) = false ];
+  // Amount of coins to transfer
+  string amount = 4 [
+    (gogoproto.moretags) = "yaml:\"amount\"",
+    (gogoproto.customtype) = "cosmossdk.io/math.Int",
+    (gogoproto.nullable) = false
+  ];
+}
+
+message MsgInboundTransferResponse {}
+
+// MsgOutboundTransfer defines the message structure for the OutboundTransfer
+// gRPC service method. It allows a sender to perform an outbound cross-chain
+// transfer, i.e., to transfer their tokens from Osmosis to the destination
+// chain. The tokens are burned through the x/tokenfactory module from the
+// sender's address.
+message MsgOutboundTransfer {
+  option (amino.name) = "osmosis/bridge/outbound-transfer";
+
+  // Sender is a sender's Osmosis address
+  string sender = 1 [ (gogoproto.moretags) = "yaml:\"sender\"" ];
+  // DestAddr is a destination address
+  string dest_addr = 2 [ (gogoproto.moretags) = "yaml:\"dest_addr\"" ];
+  // Asset contains a target chain and a source denom
+  Asset asset = 3
+      [ (gogoproto.moretags) = "yaml:\"asset\"", (gogoproto.nullable) = false ];
+  // Amount of coins to transfer
+  string amount = 4 [
+    (gogoproto.moretags) = "yaml:\"amount\"",
+    (gogoproto.customtype) = "cosmossdk.io/math.Int",
+    (gogoproto.nullable) = false
+  ];
+}
+
+message MsgOutboundTransferResponse {}
+
+// MsgUpdateParams allows to update module params. It contains UpdateParams
+// instead of just Params to forbid status updating using this method.
+// All new assets introduced with this method have ASSET_STATUS_BLOCKED_BOTH
+// status by default.
+message MsgUpdateParams {
+  option (amino.name) = "osmosis/bridge/update-params";
+
+  // Sender is a sender's address
+  string sender = 1 [ (gogoproto.moretags) = "yaml:\"sender\"" ];
+  // NewParams should be fully populated
+  Params new_params = 2 [
+    (gogoproto.moretags) = "yaml:\"new_params\"",
+    (gogoproto.nullable) = false
+  ];
+}
+
+message MsgUpdateParamsResponse {}
+
+// MsgChangeAssetStatus changes the status of the provided asset.
+message MsgChangeAssetStatus {
+  option (amino.name) = "osmosis/bridge/change-asset-status";
+
+  // Sender is a sender's address
+  string sender = 1 [ (gogoproto.moretags) = "yaml:\"sender\"" ];
+  // NewAssetStatus is a pair of the asset and its new status.
+  // The asset should be known; otherwise, the method will failed.
+  AssetWithStatus new_asset_status = 2 [
+    (gogoproto.moretags) = "yaml:\"new_asset_status\"",
+    (gogoproto.nullable) = false
+  ];
+}
+
+message MsgChangeAssetStatusResponse {}
\ No newline at end of file
diff --git a/proto/osmosis/concentratedliquidity/params.proto b/proto/osmosis/concentratedliquidity/params.proto
index 79ebec0fabc..249930d7695 100644
--- a/proto/osmosis/concentratedliquidity/params.proto
+++ b/proto/osmosis/concentratedliquidity/params.proto
@@ -2,7 +2,6 @@ syntax = "proto3";
 package osmosis.concentratedliquidity;
 
 import "gogoproto/gogo.proto";
-import "cosmos_proto/cosmos.proto";
 import "google/protobuf/duration.proto";
 
 option go_package = "github.com/osmosis-labs/osmosis/v23/x/concentrated-liquidity/types";
diff --git a/proto/osmosis/concentratedliquidity/poolmodel/concentrated/v1beta1/tx.proto b/proto/osmosis/concentratedliquidity/poolmodel/concentrated/v1beta1/tx.proto
index 7fc1fd0e67b..0d2c663d81d 100644
--- a/proto/osmosis/concentratedliquidity/poolmodel/concentrated/v1beta1/tx.proto
+++ b/proto/osmosis/concentratedliquidity/poolmodel/concentrated/v1beta1/tx.proto
@@ -2,7 +2,6 @@ syntax = "proto3";
 package osmosis.concentratedliquidity.poolmodel.concentrated.v1beta1;
 
 import "gogoproto/gogo.proto";
-import "cosmos/base/v1beta1/coin.proto";
 
 option go_package = "github.com/osmosis-labs/osmosis/v23/x/concentrated-liquidity/model";
 
diff --git a/proto/osmosis/concentratedliquidity/v1beta1/genesis.proto b/proto/osmosis/concentratedliquidity/v1beta1/genesis.proto
index 34d8dedfa7e..6e4f06d2169 100644
--- a/proto/osmosis/concentratedliquidity/v1beta1/genesis.proto
+++ b/proto/osmosis/concentratedliquidity/v1beta1/genesis.proto
@@ -3,12 +3,11 @@ package osmosis.concentratedliquidity.v1beta1;
 
 import "gogoproto/gogo.proto";
 import "cosmos_proto/cosmos.proto";
-import "cosmos/base/v1beta1/coin.proto";
 import "google/protobuf/any.proto";
 import "osmosis/accum/v1beta1/accum.proto";
 import "osmosis/concentratedliquidity/params.proto";
 import "osmosis/concentratedliquidity/v1beta1/position.proto";
-import "osmosis/concentratedliquidity/v1beta1/tickInfo.proto";
+import "osmosis/concentratedliquidity/v1beta1/tick_info.proto";
 import "osmosis/concentratedliquidity/v1beta1/incentive_record.proto";
 
 option go_package = "github.com/osmosis-labs/osmosis/v23/x/concentrated-liquidity/types/genesis";
diff --git a/proto/osmosis/concentratedliquidity/v1beta1/incentive_record.proto b/proto/osmosis/concentratedliquidity/v1beta1/incentive_record.proto
index d125a3a3610..b4bcb50db67 100644
--- a/proto/osmosis/concentratedliquidity/v1beta1/incentive_record.proto
+++ b/proto/osmosis/concentratedliquidity/v1beta1/incentive_record.proto
@@ -1,7 +1,6 @@
 syntax = "proto3";
 package osmosis.concentratedliquidity.v1beta1;
 
-import "cosmos_proto/cosmos.proto";
 import "gogoproto/gogo.proto";
 import "google/protobuf/timestamp.proto";
 import "google/protobuf/duration.proto";
diff --git a/proto/osmosis/concentratedliquidity/v1beta1/position.proto b/proto/osmosis/concentratedliquidity/v1beta1/position.proto
index 10be34a7557..e4cf580d20b 100644
--- a/proto/osmosis/concentratedliquidity/v1beta1/position.proto
+++ b/proto/osmosis/concentratedliquidity/v1beta1/position.proto
@@ -5,9 +5,7 @@ syntax = "proto3";
 // investigated for changing proto package.
 package osmosis.concentratedliquidity.v1beta1;
 
-import "cosmos_proto/cosmos.proto";
 import "google/protobuf/timestamp.proto";
-import "google/protobuf/duration.proto";
 import "gogoproto/gogo.proto";
 import "cosmos/base/v1beta1/coin.proto";
 import "osmosis/lockup/lock.proto";
diff --git a/proto/osmosis/concentratedliquidity/v1beta1/query.proto b/proto/osmosis/concentratedliquidity/v1beta1/query.proto
index 799ce63b7aa..30503031435 100644
--- a/proto/osmosis/concentratedliquidity/v1beta1/query.proto
+++ b/proto/osmosis/concentratedliquidity/v1beta1/query.proto
@@ -3,15 +3,13 @@ package osmosis.concentratedliquidity.v1beta1;
 
 import "gogoproto/gogo.proto";
 import "osmosis/concentratedliquidity/params.proto";
-import "osmosis/concentratedliquidity/v1beta1/tickInfo.proto";
+import "osmosis/concentratedliquidity/v1beta1/tick_info.proto";
 
 import "cosmos/base/v1beta1/coin.proto";
 import "cosmos/base/query/v1beta1/pagination.proto";
 import "google/api/annotations.proto";
 import "google/protobuf/any.proto";
 import "cosmos_proto/cosmos.proto";
-import "google/protobuf/timestamp.proto";
-import "google/protobuf/duration.proto";
 
 import "osmosis/concentratedliquidity/v1beta1/position.proto";
 import "osmosis/concentratedliquidity/v1beta1/incentive_record.proto";
diff --git a/proto/osmosis/concentratedliquidity/v1beta1/tickInfo.proto b/proto/osmosis/concentratedliquidity/v1beta1/tick_info.proto
similarity index 98%
rename from proto/osmosis/concentratedliquidity/v1beta1/tickInfo.proto
rename to proto/osmosis/concentratedliquidity/v1beta1/tick_info.proto
index f5c398dfa1c..28abb834a25 100644
--- a/proto/osmosis/concentratedliquidity/v1beta1/tickInfo.proto
+++ b/proto/osmosis/concentratedliquidity/v1beta1/tick_info.proto
@@ -5,7 +5,6 @@ syntax = "proto3";
 // investigated for changing proto package.
 package osmosis.concentratedliquidity.v1beta1;
 
-import "cosmos_proto/cosmos.proto";
 import "gogoproto/gogo.proto";
 import "cosmos/base/v1beta1/coin.proto";
 
diff --git a/proto/osmosis/concentratedliquidity/v1beta1/tx.proto b/proto/osmosis/concentratedliquidity/v1beta1/tx.proto
index f8a5b12e88c..57c40f47939 100644
--- a/proto/osmosis/concentratedliquidity/v1beta1/tx.proto
+++ b/proto/osmosis/concentratedliquidity/v1beta1/tx.proto
@@ -3,8 +3,6 @@ package osmosis.concentratedliquidity.v1beta1;
 
 import "gogoproto/gogo.proto";
 import "amino/amino.proto";
-import "google/protobuf/timestamp.proto";
-import "google/protobuf/duration.proto";
 import "cosmos/base/v1beta1/coin.proto";
 
 option go_package = "github.com/osmosis-labs/osmosis/v23/x/concentrated-liquidity/types";
diff --git a/proto/osmosis/cosmwasmpool/v1beta1/genesis.proto b/proto/osmosis/cosmwasmpool/v1beta1/genesis.proto
index 3622aacbf96..5285f2e72c6 100644
--- a/proto/osmosis/cosmwasmpool/v1beta1/genesis.proto
+++ b/proto/osmosis/cosmwasmpool/v1beta1/genesis.proto
@@ -4,8 +4,6 @@ package osmosis.cosmwasmpool.v1beta1;
 import "gogoproto/gogo.proto";
 import "google/protobuf/any.proto";
 import "cosmos_proto/cosmos.proto";
-import "google/protobuf/duration.proto";
-import "cosmos/base/v1beta1/coin.proto";
 
 import "osmosis/cosmwasmpool/v1beta1/params.proto";
 
diff --git a/proto/osmosis/cosmwasmpool/v1beta1/model/instantiate_msg.proto b/proto/osmosis/cosmwasmpool/v1beta1/model/instantiate_msg.proto
index 3679e8038b2..77eee79eaa6 100644
--- a/proto/osmosis/cosmwasmpool/v1beta1/model/instantiate_msg.proto
+++ b/proto/osmosis/cosmwasmpool/v1beta1/model/instantiate_msg.proto
@@ -1,9 +1,6 @@
 syntax = "proto3";
 package osmosis.cosmwasmpool.v1beta1;
 
-import "gogoproto/gogo.proto";
-import "cosmos/base/v1beta1/coin.proto";
-
 option go_package = "github.com/osmosis-labs/osmosis/v23/x/cosmwasmpool/cosmwasm/msg";
 
 // ===================== InstantiateMsg
diff --git a/proto/osmosis/cosmwasmpool/v1beta1/model/pool.proto b/proto/osmosis/cosmwasmpool/v1beta1/model/pool.proto
index e8afd4ca69a..63e0ed6b06a 100644
--- a/proto/osmosis/cosmwasmpool/v1beta1/model/pool.proto
+++ b/proto/osmosis/cosmwasmpool/v1beta1/model/pool.proto
@@ -4,7 +4,6 @@ package osmosis.cosmwasmpool.v1beta1;
 
 import "cosmos_proto/cosmos.proto";
 import "gogoproto/gogo.proto";
-import "google/protobuf/timestamp.proto";
 
 option go_package = "github.com/osmosis-labs/osmosis/v23/x/cosmwasmpool/model";
 
diff --git a/proto/osmosis/cosmwasmpool/v1beta1/model/transmuter_msgs.proto b/proto/osmosis/cosmwasmpool/v1beta1/model/transmuter_msgs.proto
index fc93c891aaa..1f0f7d2b297 100644
--- a/proto/osmosis/cosmwasmpool/v1beta1/model/transmuter_msgs.proto
+++ b/proto/osmosis/cosmwasmpool/v1beta1/model/transmuter_msgs.proto
@@ -2,7 +2,6 @@ syntax = "proto3";
 package osmosis.cosmwasmpool.v1beta1;
 
 import "gogoproto/gogo.proto";
-import "cosmos/base/v1beta1/coin.proto";
 
 option go_package = "github.com/osmosis-labs/osmosis/v23/x/cosmwasmpool/cosmwasm/msg/transmuter";
 
diff --git a/proto/osmosis/cosmwasmpool/v1beta1/model/tx.proto b/proto/osmosis/cosmwasmpool/v1beta1/model/tx.proto
index bf46ba8abbe..23a204b77e3 100644
--- a/proto/osmosis/cosmwasmpool/v1beta1/model/tx.proto
+++ b/proto/osmosis/cosmwasmpool/v1beta1/model/tx.proto
@@ -2,7 +2,6 @@ syntax = "proto3";
 package osmosis.cosmwasmpool.v1beta1;
 
 import "gogoproto/gogo.proto";
-import "cosmos/base/v1beta1/coin.proto";
 
 option go_package = "github.com/osmosis-labs/osmosis/v23/x/cosmwasmpool/model";
 
diff --git a/proto/osmosis/cosmwasmpool/v1beta1/params.proto b/proto/osmosis/cosmwasmpool/v1beta1/params.proto
index 7ee9b4bcfc4..ef400c19701 100644
--- a/proto/osmosis/cosmwasmpool/v1beta1/params.proto
+++ b/proto/osmosis/cosmwasmpool/v1beta1/params.proto
@@ -2,8 +2,6 @@ syntax = "proto3";
 package osmosis.cosmwasmpool.v1beta1;
 
 import "gogoproto/gogo.proto";
-import "cosmos_proto/cosmos.proto";
-import "google/protobuf/duration.proto";
 
 option go_package = "github.com/osmosis-labs/osmosis/v23/x/cosmwasmpool/types";
 
diff --git a/proto/osmosis/cosmwasmpool/v1beta1/query.proto b/proto/osmosis/cosmwasmpool/v1beta1/query.proto
index 2ddabb0553d..e01828efd26 100644
--- a/proto/osmosis/cosmwasmpool/v1beta1/query.proto
+++ b/proto/osmosis/cosmwasmpool/v1beta1/query.proto
@@ -3,14 +3,11 @@ package osmosis.cosmwasmpool.v1beta1;
 
 import "gogoproto/gogo.proto";
 import "osmosis/cosmwasmpool/v1beta1/params.proto";
-import "osmosis/cosmwasmpool/v1beta1/tx.proto";
 
-import "cosmos/base/v1beta1/coin.proto";
 import "cosmos/base/query/v1beta1/pagination.proto";
 import "google/api/annotations.proto";
 import "google/protobuf/any.proto";
 import "cosmos_proto/cosmos.proto";
-import "google/protobuf/timestamp.proto";
 
 option go_package = "github.com/osmosis-labs/osmosis/v23/x/cosmwasmpool/client/queryproto";
 
diff --git a/proto/osmosis/cosmwasmpool/v1beta1/query.yml b/proto/osmosis/cosmwasmpool/v1beta1/query.yml
index d571725a747..bb29bcd2b1c 100644
--- a/proto/osmosis/cosmwasmpool/v1beta1/query.yml
+++ b/proto/osmosis/cosmwasmpool/v1beta1/query.yml
@@ -1,4 +1,4 @@
-keeper: 
+keeper:
   path: "github.com/osmosis-labs/osmosis/v23/x/cosmwasmpool"
   struct: "Keeper"
 client_path: "github.com/osmosis-labs/osmosis/v23/x/cosmwasmpool/client"
diff --git a/proto/osmosis/cosmwasmpool/v1beta1/tx.proto b/proto/osmosis/cosmwasmpool/v1beta1/tx.proto
index 0dcf8198179..d98465ff519 100644
--- a/proto/osmosis/cosmwasmpool/v1beta1/tx.proto
+++ b/proto/osmosis/cosmwasmpool/v1beta1/tx.proto
@@ -1,9 +1,6 @@
 syntax = "proto3";
 package osmosis.cosmwasmpool.v1beta1;
 
-import "gogoproto/gogo.proto";
-import "cosmos/base/v1beta1/coin.proto";
-
 option go_package = "github.com/osmosis-labs/osmosis/v23/x/cosmwasmpool/types";
 
 service Msg {}
diff --git a/proto/osmosis/downtimedetector/v1beta1/downtime_duration.proto b/proto/osmosis/downtimedetector/v1beta1/downtime_duration.proto
index 51f08bc5f74..814f29af15a 100644
--- a/proto/osmosis/downtimedetector/v1beta1/downtime_duration.proto
+++ b/proto/osmosis/downtimedetector/v1beta1/downtime_duration.proto
@@ -1,12 +1,6 @@
 syntax = "proto3";
 package osmosis.downtimedetector.v1beta1;
 
-import "gogoproto/gogo.proto";
-import "google/protobuf/any.proto";
-import "cosmos_proto/cosmos.proto";
-import "google/protobuf/duration.proto";
-import "google/protobuf/timestamp.proto";
-
 option go_package = "github.com/osmosis-labs/osmosis/v23/x/downtime-detector/types";
 
 enum Downtime {
diff --git a/proto/osmosis/downtimedetector/v1beta1/query.yml b/proto/osmosis/downtimedetector/v1beta1/query.yml
index 8b7be51e669..c26c7bc6b8f 100644
--- a/proto/osmosis/downtimedetector/v1beta1/query.yml
+++ b/proto/osmosis/downtimedetector/v1beta1/query.yml
@@ -1,8 +1,8 @@
-keeper: 
+keeper:
   path: "github.com/osmosis-labs/osmosis/v23/x/downtime-detector"
   struct: "Keeper"
 client_path: "github.com/osmosis-labs/osmosis/v23/x/downtime-detector/client"
 queries:
   RecoveredSinceDowntimeOfLength:
     proto_wrapper:
-      query_func: "k.RecoveredSinceDowntimeOfLength"
\ No newline at end of file
+      query_func: "k.RecoveredSinceDowntimeOfLength"
diff --git a/proto/osmosis/ibcratelimit/v1beta1/query.yml b/proto/osmosis/ibcratelimit/v1beta1/query.yml
index 815d2f2269c..1c7ee99c48c 100644
--- a/proto/osmosis/ibcratelimit/v1beta1/query.yml
+++ b/proto/osmosis/ibcratelimit/v1beta1/query.yml
@@ -1,4 +1,4 @@
-keeper: 
+keeper:
   path: "github.com/osmosis-labs/osmosis/v23/x/ibc-rate-limit"
   struct: "Keeper"
 client_path: "github.com/osmosis-labs/osmosis/v23/x/ibc-rate-limit/client"
@@ -7,4 +7,4 @@ queries:
     proto_wrapper:
       query_func: "k.GetParams"
     cli:
-      cmd: "GetParams"
\ No newline at end of file
+      cmd: "GetParams"
diff --git a/proto/osmosis/tokenfactory/v1beta1/query.proto b/proto/osmosis/tokenfactory/v1beta1/query.proto
index 9db59a9c129..9d8ccf53268 100644
--- a/proto/osmosis/tokenfactory/v1beta1/query.proto
+++ b/proto/osmosis/tokenfactory/v1beta1/query.proto
@@ -40,6 +40,17 @@ service Query {
     option (google.api.http).get =
         "/osmosis/tokenfactory/v1beta1/denoms/{denom}/before_send_hook";
   }
+
+  // AllBeforeSendHooksAddresses defines a gRPC query method for
+  // getting all addresses with before send hook registered.
+  // The response returns two arrays, an array with a list of denom and an array
+  // of before send hook addresses. The idx of denom corresponds to before send
+  // hook addresse's idx.
+  rpc AllBeforeSendHooksAddresses(QueryAllBeforeSendHooksAddressesRequest)
+      returns (QueryAllBeforeSendHooksAddressesResponse) {
+    option (google.api.http).get =
+        "/osmosis/tokenfactory/v1beta1/all_before_send_hooks";
+  }
 }
 
 // QueryParamsRequest is the request type for the Query/Params RPC method.
@@ -87,4 +98,14 @@ message QueryBeforeSendHookAddressRequest {
 message QueryBeforeSendHookAddressResponse {
   string cosmwasm_address = 1
       [ (gogoproto.moretags) = "yaml:\"cosmwasm_address\"" ];
+}
+
+message QueryAllBeforeSendHooksAddressesRequest {}
+
+// QueryAllBeforeSendHooksAddressesResponse defines the response structure for
+// the AllBeforeSendHooksAddresses gRPC query.
+message QueryAllBeforeSendHooksAddressesResponse {
+  repeated string denoms = 1 [ (gogoproto.moretags) = "yaml:\"denoms\"" ];
+  repeated string before_send_hook_addresses = 2
+      [ (gogoproto.moretags) = "yaml:\"before_send_addresses\"" ];
 }
\ No newline at end of file
diff --git a/proto/osmosis/twap/v1beta1/query.yml b/proto/osmosis/twap/v1beta1/query.yml
index d0b3ec24e6f..3f3f8370ee4 100644
--- a/proto/osmosis/twap/v1beta1/query.yml
+++ b/proto/osmosis/twap/v1beta1/query.yml
@@ -1,4 +1,4 @@
-keeper: 
+keeper:
   path: "github.com/osmosis-labs/osmosis/v23/x/twap"
   struct: "Keeper"
 client_path: "github.com/osmosis-labs/osmosis/v23/x/twap/client"
@@ -31,4 +31,4 @@ queries:
     proto_wrapper:
       query_func: "k.GetParams"
     cli:
-      cmd: "GetArithmeticTwapToNow"
\ No newline at end of file
+      cmd: "GetArithmeticTwapToNow"
diff --git a/tests/e2e/configurer/chain/commands.go b/tests/e2e/configurer/chain/commands.go
index 4764aad9a87..876617248a3 100644
--- a/tests/e2e/configurer/chain/commands.go
+++ b/tests/e2e/configurer/chain/commands.go
@@ -111,16 +111,38 @@ func (n *NodeConfig) CreateConcentratedPosition(from, lowerTick, upperTick strin
 	cmd := []string{"osmosisd", "tx", "concentratedliquidity", "create-position", fmt.Sprint(poolId), lowerTick, upperTick, tokens, fmt.Sprintf("%d", token0MinAmt), fmt.Sprintf("%d", token1MinAmt), fmt.Sprintf("--from=%s", from), "--gas=500000", "--fees=1250uosmo", "-o json"}
 	resp, _, err := n.containerManager.ExecTxCmdWithSuccessStringJSON(n.t, n.chainId, n.Name, cmd, "\"code\":0,")
 	require.NoError(n.t, err)
+	response := formatNonJsonResponse(resp.String())
 
-	positionID, err := extractPositionIdFromResponse(resp.Bytes())
-	require.NoError(n.t, err)
+	// Extract the position_id from the response
+	r := regexp.MustCompile(`"position_id","value":"(\d+)"`)
+	matches := r.FindStringSubmatch(response)
 
-	liquidity, err := extractLiquidityFromResponse(resp.Bytes())
-	require.NoError(n.t, err)
+	// Check if we found a match
+	if len(matches) < 2 {
+		return 0, sdk.ZeroDec()
+	}
+
+	// Convert the position_id from string to int
+	positionID, err := strconv.Atoi(matches[1])
+	if err != nil {
+		return 0, sdk.ZeroDec()
+	}
+
+	// Extract the liquidity from the response
+	r = regexp.MustCompile(`"liquidity","value":"(\d+\.\d+)"`)
+	matches = r.FindStringSubmatch(response)
+
+	// Check if we found a match
+	if len(matches) < 2 {
+		return 0, sdk.ZeroDec()
+	}
+
+	// Convert the liquidity from string to Dec
+	liquidityStr := matches[1]
 
 	n.LogActionF("successfully created concentrated position from %s to %s", lowerTick, upperTick)
 
-	return positionID, liquidity
+	return uint64(positionID), sdk.MustNewDecFromStr(liquidityStr)
 }
 
 func (n *NodeConfig) StoreWasmCode(wasmFile, from string) int {
@@ -404,16 +426,19 @@ func (n *NodeConfig) LockTokens(tokens string, duration string, from string) int
 
 	resp, _, err := n.containerManager.ExecTxCmd(n.t, n.chainId, n.Name, cmd)
 	require.NoError(n.t, err)
+	response := formatNonJsonResponse(resp.String())
 
 	// Extract the lock ID from the response
-	startIndex := strings.Index(resp.String(), `[{"key":"period_lock_id","value":"`) + len(`[{"key":"period_lock_id","value":"`)
-	endIndex := strings.Index(resp.String()[startIndex:], `"`)
+	r := regexp.MustCompile(`period_lock_id value: "(\d+)"`)
+	matches := r.FindStringSubmatch(response)
 
-	// Extract the lock ID substring
-	lockIDStr := resp.String()[startIndex : startIndex+endIndex]
+	// Check if we found a match
+	if len(matches) < 2 {
+		require.Fail(n.t, "period_lock_id not found")
+	}
 
 	// Convert the lock ID from string to int
-	lockID, err := strconv.Atoi(lockIDStr)
+	lockID, err := strconv.Atoi(matches[1])
 	require.NoError(n.t, err)
 
 	n.LogActionF("successfully created lock")
@@ -829,15 +854,19 @@ func AllValsVoteOnProposal(chain *Config, propNumber int) {
 }
 
 func extractProposalIdFromResponse(response string) (int, error) {
+	response = formatNonJsonResponse(response)
+
 	// Extract the proposal ID from the response
-	startIndex := strings.Index(response, `[{"key":"proposal_id","value":"`) + len(`[{"key":"proposal_id","value":"`)
-	endIndex := strings.Index(response[startIndex:], `"`)
+	r := regexp.MustCompile(`proposal_id value: "(\d+)"`)
+	matches := r.FindStringSubmatch(response)
 
-	// Extract the proposal ID substring
-	proposalIDStr := response[startIndex : startIndex+endIndex]
+	// Check if we found a match
+	if len(matches) < 2 {
+		return 0, errors.New("proposal_id not found")
+	}
 
 	// Convert the proposal ID from string to int
-	proposalID, err := strconv.Atoi(proposalIDStr)
+	proposalID, err := strconv.Atoi(matches[1])
 	if err != nil {
 		return 0, err
 	}
@@ -846,71 +875,40 @@ func extractProposalIdFromResponse(response string) (int, error) {
 }
 
 func extractPoolIdFromResponse(response string) (uint64, error) {
-	// Extract the pool ID from the response
-	startIndex := strings.Index(response, `{"key":"pool_id","value":"`) + len(`{"key":"pool_id","value":"`)
-	endIndex := strings.Index(response[startIndex:], `"`)
-
-	// Extract the pool ID substring
-	codeIdStr := response[startIndex : startIndex+endIndex]
-
-	// Convert the pool ID from string to int
-	poolID, err := strconv.ParseUint(codeIdStr, 10, 64)
-	if err != nil {
-		return 0, err
-	}
-
-	return poolID, nil
-}
+	response = formatNonJsonResponse(response)
 
-func extractPositionIdFromResponse(responseBytes []byte) (uint64, error) {
-	var txResponse map[string]interface{}
-	err := json.Unmarshal(responseBytes, &txResponse)
-	if err != nil {
-		return 0, err
-	}
+	// Extract the pool ID from the response
+	//fmt.Println(response)
+	r := regexp.MustCompile(`pool_id value: "(\d+)"`)
+	matches := r.FindStringSubmatch(response)
 
-	positionIDString, err := GetPositionID(txResponse)
-	if err != nil {
-		return 0, err
+	// Check if we found a match
+	if len(matches) < 2 {
+		return 0, errors.New("pool_id not found")
 	}
 
-	positionID, err := strconv.ParseUint(positionIDString, 10, 64)
+	// Convert the pool ID from string to uint64
+	poolID, err := strconv.ParseUint(matches[1], 10, 64)
 	if err != nil {
 		return 0, err
 	}
 
-	return positionID, nil
+	return poolID, nil
 }
 
-func extractLiquidityFromResponse(responseBytes []byte) (osmomath.Dec, error) {
-	var txResponse map[string]interface{}
-	err := json.Unmarshal(responseBytes, &txResponse)
-	if err != nil {
-		return osmomath.Dec{}, err
-	}
+func extractCodeIdFromResponse(response string) (int, error) {
+	response = formatNonJsonResponse(response)
 
-	liquidityString, err := GetLiquidity(txResponse)
-	if err != nil {
-		return osmomath.Dec{}, err
-	}
+	r := regexp.MustCompile(`code_id value: "(\d+)"`)
+	matches := r.FindStringSubmatch(response)
 
-	positionID, err := osmomath.NewDecFromStr(liquidityString)
-	if err != nil {
-		return osmomath.Dec{}, err
+	// Check if we found a match
+	if len(matches) < 2 {
+		return 0, errors.New("code_id not found")
 	}
 
-	return positionID, nil
-}
-
-func extractCodeIdFromResponse(response string) (int, error) {
-	startIndex := strings.Index(response, `{"key":"code_id","value":"`) + len(`{"key":"code_id","value":"`)
-	endIndex := strings.Index(response[startIndex:], `"`)
-
-	// Extract the proposal ID substring
-	codeIdStr := response[startIndex : startIndex+endIndex]
-
-	// Convert the proposal ID from string to int
-	codeId, err := strconv.Atoi(codeIdStr)
+	// Convert the code ID from string to int
+	codeId, err := strconv.Atoi(matches[1])
 	if err != nil {
 		return 0, err
 	}
@@ -938,3 +936,9 @@ func pullMnemonicFromResponse(response string) (string, error) {
 
 	return mnemonicMatch, nil
 }
+
+func formatNonJsonResponse(resp string) string {
+	resp = strings.ReplaceAll(resp, "\n", " ")
+	resp = strings.ReplaceAll(resp, "-", " ")
+	return strings.Join(strings.Fields(resp), " ")
+}
diff --git a/tests/e2e/initialization/init.Dockerfile b/tests/e2e/initialization/init.Dockerfile
index 96b4fa96b61..db22281e219 100644
--- a/tests/e2e/initialization/init.Dockerfile
+++ b/tests/e2e/initialization/init.Dockerfile
@@ -1,7 +1,7 @@
 # syntax=docker/dockerfile:1
 
 ## Build Image
-FROM golang:1.20.9-alpine3.18 as build
+FROM golang:1.21.8-alpine3.18 as build
 
 ARG E2E_SCRIPT_NAME
 
diff --git a/tests/localosmosis/README.md b/tests/localosmosis/README.md
index 416af4ff4ca..9039e2aa03a 100644
--- a/tests/localosmosis/README.md
+++ b/tests/localosmosis/README.md
@@ -268,7 +268,7 @@ services:
     #     dockerfile: Dockerfile
     #     args:
     #     RUNNER_IMAGE: alpine:3.17
-    #     GO_VERSION: 1.20
+    #     GO_VERSION: 1.21
 ```
 
 2. Checkout the Osmosis repository to a different `ref` that includes the new version, and then rebuild and restart LocalOsmosis using `make localnet-start`. Make sure to don't delete your `~/.osmosisd-local` folder.
diff --git a/tests/localosmosis/docker-compose.yml b/tests/localosmosis/docker-compose.yml
index 9127788b0ee..56cf57821a9 100644
--- a/tests/localosmosis/docker-compose.yml
+++ b/tests/localosmosis/docker-compose.yml
@@ -7,8 +7,8 @@ services:
       context: ../../
       dockerfile: Dockerfile
       args:
-        RUNNER_IMAGE: golang:1.20.3-alpine3.17
-        GO_VERSION: "1.20"
+        RUNNER_IMAGE: golang:1.21.7-alpine3.19
+        GO_VERSION: "1.21"
     volumes:
       - ./scripts/uosmoUionBalancerPool.json:/osmosis/uosmoUionBalancerPool.json
       - ./scripts/uosmoUusdcBalancerPool.json:/osmosis/uosmoUusdcBalancerPool.json
diff --git a/tests/localosmosis/scripts/setup.sh b/tests/localosmosis/scripts/setup.sh
index e53d3f9783a..9ea2b2440ca 100755
--- a/tests/localosmosis/scripts/setup.sh
+++ b/tests/localosmosis/scripts/setup.sh
@@ -25,64 +25,64 @@ edit_genesis () {
     GENESIS=$CONFIG_FOLDER/genesis.json
 
     # Update staking module
-    dasel put string -f $GENESIS '.app_state.staking.params.bond_denom' 'uosmo'
-    dasel put string -f $GENESIS '.app_state.staking.params.unbonding_time' '240s'
+    dasel put -t string -f $GENESIS '.app_state.staking.params.bond_denom' -v 'uosmo'
+    dasel put -t string -f $GENESIS '.app_state.staking.params.unbonding_time' -v '240s'
 
     # Update bank module
-    dasel put string -f $GENESIS '.app_state.bank.denom_metadata.[0].description' 'Registered denom uion for localosmosis testing'
-    dasel put string -f $GENESIS '.app_state.bank.denom_metadata.[0].denom_units.[0].denom' 'uion'
-    dasel put string -f $GENESIS '.app_state.bank.denom_metadata.[0].denom_units.[0].exponent' 0
-    dasel put string -f $GENESIS '.app_state.bank.denom_metadata.[0].base' 'uion'
-    dasel put string -f $GENESIS '.app_state.bank.denom_metadata.[0].display' 'uion'
-    dasel put string -f $GENESIS '.app_state.bank.denom_metadata.[0].name' 'uion'
-    dasel put string -f $GENESIS '.app_state.bank.denom_metadata.[0].symbol' 'uion'
-
-    dasel put string -f $GENESIS '.app_state.bank.denom_metadata.[1].description' 'Registered denom uosmo for localosmosis testing'
-    dasel put string -f $GENESIS '.app_state.bank.denom_metadata.[1].denom_units.[0].denom' 'uosmo'
-    dasel put string -f $GENESIS '.app_state.bank.denom_metadata.[1].denom_units.[0].exponent' 0
-    dasel put string -f $GENESIS '.app_state.bank.denom_metadata.[1].base' 'uosmo'
-    dasel put string -f $GENESIS '.app_state.bank.denom_metadata.[1].display' 'uosmo'
-    dasel put string -f $GENESIS '.app_state.bank.denom_metadata.[1].name' 'uosmo'
-    dasel put string -f $GENESIS '.app_state.bank.denom_metadata.[1].symbol' 'uosmo'
+    dasel put -t string -f $GENESIS '.app_state.bank.denom_metadata.[].description' -v 'Registered denom uion for localosmosis testing'
+    dasel put -t string -f $GENESIS '.app_state.bank.denom_metadata.[0].denom_units.[].denom' -v 'uion'
+    dasel put -t string -f $GENESIS '.app_state.bank.denom_metadata.[0].denom_units.[0].exponent' -v 0
+    dasel put -t string -f $GENESIS '.app_state.bank.denom_metadata.[0].base' -v 'uion'
+    dasel put -t string -f $GENESIS '.app_state.bank.denom_metadata.[0].display' -v 'uion'
+    dasel put -t string -f $GENESIS '.app_state.bank.denom_metadata.[0].name' -v 'uion'
+    dasel put -t string -f $GENESIS '.app_state.bank.denom_metadata.[0].symbol' -v 'uion'
+
+    dasel put -t string -f $GENESIS '.app_state.bank.denom_metadata.[].description' -v 'Registered denom uosmo for localosmosis testing'
+    dasel put -t string -f $GENESIS '.app_state.bank.denom_metadata.[1].denom_units.[].denom' -v 'uosmo'
+    dasel put -t string -f $GENESIS '.app_state.bank.denom_metadata.[1].denom_units.[0].exponent' -v 0
+    dasel put -t string -f $GENESIS '.app_state.bank.denom_metadata.[1].base' -v 'uosmo'
+    dasel put -t string -f $GENESIS '.app_state.bank.denom_metadata.[1].display' -v 'uosmo'
+    dasel put -t string -f $GENESIS '.app_state.bank.denom_metadata.[1].name' -v 'uosmo'
+    dasel put -t string -f $GENESIS '.app_state.bank.denom_metadata.[1].symbol' -v 'uosmo'
 
     # Update crisis module
-    dasel put string -f $GENESIS '.app_state.crisis.constant_fee.denom' 'uosmo'
+    dasel put -t string -f $GENESIS '.app_state.crisis.constant_fee.denom' -v 'uosmo'
 
     # Update gov module
-    dasel put string -f $GENESIS '.app_state.gov.voting_params.voting_period' '60s'
-    dasel put string -f $GENESIS '.app_state.gov.deposit_params.min_deposit.[0].denom' 'uosmo'
+    dasel put -t string -f $GENESIS '.app_state.gov.voting_params.voting_period' -v '60s'
+    dasel put -t string -f $GENESIS '.app_state.gov.params.min_deposit.[0].denom' -v 'uosmo'
 
     # Update epochs module
-    dasel put string -f $GENESIS '.app_state.epochs.epochs.[1].duration' "60s"
+    dasel put -t string -f $GENESIS '.app_state.epochs.epochs.[1].duration' -v "60s"
 
     # Update poolincentives module
-    dasel put string -f $GENESIS '.app_state.poolincentives.lockable_durations.[0]' "120s"
-    dasel put string -f $GENESIS '.app_state.poolincentives.lockable_durations.[1]' "180s"
-    dasel put string -f $GENESIS '.app_state.poolincentives.lockable_durations.[2]' "240s"
-    dasel put string -f $GENESIS '.app_state.poolincentives.params.minted_denom' "uosmo"
+    dasel put -t string -f $GENESIS '.app_state.poolincentives.lockable_durations.[0]' -v "120s"
+    dasel put -t string -f $GENESIS '.app_state.poolincentives.lockable_durations.[1]' -v "180s"
+    dasel put -t string -f $GENESIS '.app_state.poolincentives.lockable_durations.[2]' -v "240s"
+    dasel put -t string -f $GENESIS '.app_state.poolincentives.params.minted_denom' -v "uosmo"
 
     # Update incentives module
-    dasel put string -f $GENESIS '.app_state.incentives.lockable_durations.[0]' "1s"
-    dasel put string -f $GENESIS '.app_state.incentives.lockable_durations.[1]' "120s"
-    dasel put string -f $GENESIS '.app_state.incentives.lockable_durations.[2]' "180s"
-    dasel put string -f $GENESIS '.app_state.incentives.lockable_durations.[3]' "240s"
-    dasel put string -f $GENESIS '.app_state.incentives.params.distr_epoch_identifier' "hour"
+    dasel put -t string -f $GENESIS '.app_state.incentives.lockable_durations.[0]' -v "1s"
+    dasel put -t string -f $GENESIS '.app_state.incentives.lockable_durations.[1]' -v "120s"
+    dasel put -t string -f $GENESIS '.app_state.incentives.lockable_durations.[2]' -v "180s"
+    dasel put -t string -f $GENESIS '.app_state.incentives.lockable_durations.[3]' -v "240s"
+    dasel put -t string -f $GENESIS '.app_state.incentives.params.distr_epoch_identifier' -v "hour"
 
     # Update mint module
-    dasel put string -f $GENESIS '.app_state.mint.params.mint_denom' "uosmo"
-    dasel put string -f $GENESIS '.app_state.mint.params.epoch_identifier' "hour"
+    dasel put -t string -f $GENESIS '.app_state.mint.params.mint_denom' -v "uosmo"
+    dasel put -t string -f $GENESIS '.app_state.mint.params.epoch_identifier' -v "hour"
 
     # Update poolmanager module
-    dasel put string -f $GENESIS '.app_state.poolmanager.params.pool_creation_fee.[0].denom' "uosmo"
+    dasel put -t string -f $GENESIS '.app_state.poolmanager.params.pool_creation_fee.[0].denom' -v "uosmo"
 
     # Update txfee basedenom
-    dasel put string -f $GENESIS '.app_state.txfees.basedenom' "uosmo"
+    dasel put -t string -f $GENESIS '.app_state.txfees.basedenom' -v "uosmo"
 
     # Update wasm permission (Nobody or Everybody)
-    dasel put string -f $GENESIS '.app_state.wasm.params.code_upload_access.permission' "Everybody"
+    dasel put -t string -f $GENESIS '.app_state.wasm.params.code_upload_access.permission' -v "Everybody"
 
     # Update concentrated-liquidity (enable pool creation)
-    dasel put bool -f $GENESIS '.app_state.concentratedliquidity.params.is_permissionless_pool_creation_enabled' true
+    dasel put -t bool -f $GENESIS '.app_state.concentratedliquidity.params.is_permissionless_pool_creation_enabled' -v true
 }
 
 add_genesis_accounts () {
@@ -111,39 +111,39 @@ add_genesis_accounts () {
 edit_config () {
 
     # Remove seeds
-    dasel put string -f $CONFIG_FOLDER/config.toml '.p2p.seeds' ''
+    dasel put -t string -f $CONFIG_FOLDER/config.toml '.p2p.seeds' -v ''
 
     # Expose the rpc
-    dasel put string -f $CONFIG_FOLDER/config.toml '.rpc.laddr' "tcp://0.0.0.0:26657"
+    dasel put -t string -f $CONFIG_FOLDER/config.toml '.rpc.laddr' -v "tcp://0.0.0.0:26657"
     
     # Expose pprof for debugging
     # To make the change enabled locally, make sure to add 'EXPOSE 6060' to the root Dockerfile
     # and rebuild the image.
-    dasel put string -f $CONFIG_FOLDER/config.toml '.rpc.pprof_laddr' "0.0.0.0:6060"
+    dasel put -t string -f $CONFIG_FOLDER/config.toml '.rpc.pprof_laddr' -v "0.0.0.0:6060"
 }
 
 enable_cors () {
 
     # Enable cors on RPC
-    dasel put string -f $CONFIG_FOLDER/config.toml -v "*" '.rpc.cors_allowed_origins.[]'
-    dasel put string -f $CONFIG_FOLDER/config.toml -v "Accept-Encoding" '.rpc.cors_allowed_headers.[]'
-    dasel put string -f $CONFIG_FOLDER/config.toml -v "DELETE" '.rpc.cors_allowed_methods.[]'
-    dasel put string -f $CONFIG_FOLDER/config.toml -v "OPTIONS" '.rpc.cors_allowed_methods.[]'
-    dasel put string -f $CONFIG_FOLDER/config.toml -v "PATCH" '.rpc.cors_allowed_methods.[]'
-    dasel put string -f $CONFIG_FOLDER/config.toml -v "PUT" '.rpc.cors_allowed_methods.[]'
+    dasel put -t string -f $CONFIG_FOLDER/config.toml -v "*" '.rpc.cors_allowed_origins.[]'
+    dasel put -t string -f $CONFIG_FOLDER/config.toml -v "Accept-Encoding" '.rpc.cors_allowed_headers.[]'
+    dasel put -t string -f $CONFIG_FOLDER/config.toml -v "DELETE" '.rpc.cors_allowed_methods.[]'
+    dasel put -t string -f $CONFIG_FOLDER/config.toml -v "OPTIONS" '.rpc.cors_allowed_methods.[]'
+    dasel put -t string -f $CONFIG_FOLDER/config.toml -v "PATCH" '.rpc.cors_allowed_methods.[]'
+    dasel put -t string -f $CONFIG_FOLDER/config.toml -v "PUT" '.rpc.cors_allowed_methods.[]'
 
     # Enable unsafe cors and swagger on the api
-    dasel put bool -f $CONFIG_FOLDER/app.toml -v "true" '.api.swagger'
-    dasel put bool -f $CONFIG_FOLDER/app.toml -v "true" '.api.enabled-unsafe-cors'
+    dasel put -t bool -f $CONFIG_FOLDER/app.toml -v "true" '.api.swagger'
+    dasel put -t bool -f $CONFIG_FOLDER/app.toml -v "true" '.api.enabled-unsafe-cors'
 
     # Enable cors on gRPC Web
-    dasel put bool -f $CONFIG_FOLDER/app.toml -v "true" '.grpc-web.enable-unsafe-cors'
+    dasel put -t bool -f $CONFIG_FOLDER/app.toml -v "true" '.grpc-web.enable-unsafe-cors'
 
     # Enable SQS & route caching
-    dasel put string -f $CONFIG_FOLDER/app.toml -v "true" '.osmosis-sqs.is-enabled'
-    dasel put string -f $CONFIG_FOLDER/app.toml -v "true" '.osmosis-sqs.route-cache-enabled'
+    dasel put -t string -f $CONFIG_FOLDER/app.toml -v "true" '.osmosis-sqs.is-enabled'
+    dasel put -t string -f $CONFIG_FOLDER/app.toml -v "true" '.osmosis-sqs.route-cache-enabled'
 
-    dasel put string -f $CONFIG_FOLDER/app.toml -v "redis" '.osmosis-sqs.db-host'
+    dasel put -t string -f $CONFIG_FOLDER/app.toml -v "redis" '.osmosis-sqs.db-host'
 }
 
 run_with_retries() {
diff --git a/tests/localosmosis/state_export/Dockerfile b/tests/localosmosis/state_export/Dockerfile
index 13f7da2b551..6d7778ceae9 100644
--- a/tests/localosmosis/state_export/Dockerfile
+++ b/tests/localosmosis/state_export/Dockerfile
@@ -1,7 +1,7 @@
 # syntax=docker/dockerfile:1
 
-ARG GO_VERSION="1.20"
-ARG RUNNER_IMAGE="alpine:3.17"
+ARG GO_VERSION="1.21"
+ARG RUNNER_IMAGE="alpine:3.19"
 
 # --------------------------------------------------------
 # Builder
diff --git a/tests/localosmosis/state_export/docker-compose.yml b/tests/localosmosis/state_export/docker-compose.yml
index 6385e26b5ab..44bb516e631 100644
--- a/tests/localosmosis/state_export/docker-compose.yml
+++ b/tests/localosmosis/state_export/docker-compose.yml
@@ -7,8 +7,8 @@ services:
       context: ../../../
       dockerfile: Dockerfile
       args:
-        RUNNER_IMAGE: alpine:3.17
-        GO_VERSION: "1.20"
+        RUNNER_IMAGE: alpine:3.19
+        GO_VERSION: "1.21"
     volumes:
       - ./scripts/start.sh:/osmosis/start.sh
       - ./scripts/testnetify.py:/osmosis/testnetify.py
diff --git a/tests/localrelayer/docker-compose.yml b/tests/localrelayer/docker-compose.yml
index 937ef96f5bf..7a72d758c2f 100644
--- a/tests/localrelayer/docker-compose.yml
+++ b/tests/localrelayer/docker-compose.yml
@@ -7,8 +7,8 @@ services:
       context: ../../
       dockerfile: Dockerfile
       args:
-        RUNNER_IMAGE: alpine:3.17
-        GO_VERSION: "1.20"
+        RUNNER_IMAGE: alpine:3.19
+        GO_VERSION: "1.21"
     volumes:
       - ./scripts/setup_chain.sh:/osmosis/setup.sh
       - $HOME/.osmosisd-local-a/:/osmosis/.osmosisd/
@@ -58,8 +58,8 @@ services:
       context: ../../
       dockerfile: Dockerfile
       args:
-        RUNNER_IMAGE: alpine:3.17
-        GO_VERSION: "1.20"
+        RUNNER_IMAGE: alpine:3.19
+        GO_VERSION: "1.21"
     volumes:
       - ./scripts/setup_chain.sh:/osmosis/setup.sh
       - $HOME/.osmosisd-local-b/:/osmosis/.osmosisd/
diff --git a/tests/localrelayer/scripts/setup_chain.sh b/tests/localrelayer/scripts/setup_chain.sh
index 3301a59b960..c6fab78946e 100755
--- a/tests/localrelayer/scripts/setup_chain.sh
+++ b/tests/localrelayer/scripts/setup_chain.sh
@@ -26,44 +26,44 @@ edit_genesis () {
     GENESIS=$CONFIG_FOLDER/genesis.json
 
     # Update staking module
-    dasel put string -f $GENESIS '.app_state.staking.params.bond_denom' 'uosmo'
-    dasel put string -f $GENESIS '.app_state.staking.params.unbonding_time' '240s'
+    dasel put -t string -f $GENESIS '.app_state.staking.params.bond_denom' -v 'uosmo'
+    dasel put -t string -f $GENESIS '.app_state.staking.params.unbonding_time' -v '240s'
 
     # Update crisis module
-    dasel put string -f $GENESIS '.app_state.crisis.constant_fee.denom' 'uosmo'
+    dasel put -t string -f $GENESIS '.app_state.crisis.constant_fee.denom' -v 'uosmo'
 
     # Update gov module
-    dasel put string -f $GENESIS '.app_state.gov.voting_params.voting_period' '60s'
-    dasel put string -f $GENESIS '.app_state.gov.deposit_params.min_deposit.[0].denom' 'uosmo'
+    dasel put -t string -f $GENESIS '.app_state.gov.voting_params.voting_period' -v '60s'
+    dasel put -t string -f $GENESIS '.app_state.gov.params.min_deposit.[0].denom' -v 'uosmo'
 
     # Update epochs module
-    dasel put string -f $GENESIS '.app_state.epochs.epochs.[1].duration' "60s"
+    dasel put -t string -f $GENESIS '.app_state.epochs.epochs.[1].duration' -v "60s"
 
     # Update poolincentives module
-    dasel put string -f $GENESIS '.app_state.poolincentives.lockable_durations.[0]' "120s"
-    dasel put string -f $GENESIS '.app_state.poolincentives.lockable_durations.[1]' "180s"
-    dasel put string -f $GENESIS '.app_state.poolincentives.lockable_durations.[2]' "240s"
-    dasel put string -f $GENESIS '.app_state.poolincentives.params.minted_denom' "uosmo"
+    dasel put -t string -f $GENESIS '.app_state.poolincentives.lockable_durations.[0]' -v "120s"
+    dasel put -t string -f $GENESIS '.app_state.poolincentives.lockable_durations.[1]' -v "180s"
+    dasel put -t string -f $GENESIS '.app_state.poolincentives.lockable_durations.[2]' -v "240s"
+    dasel put -t string -f $GENESIS '.app_state.poolincentives.params.minted_denom' -v "uosmo"
 
     # Update incentives module
-    dasel put string -f $GENESIS '.app_state.incentives.lockable_durations.[0]' "1s"
-    dasel put string -f $GENESIS '.app_state.incentives.lockable_durations.[1]' "120s"
-    dasel put string -f $GENESIS '.app_state.incentives.lockable_durations.[2]' "180s"
-    dasel put string -f $GENESIS '.app_state.incentives.lockable_durations.[3]' "240s"
-    dasel put string -f $GENESIS '.app_state.incentives.params.distr_epoch_identifier' "day"
+    dasel put -t string -f $GENESIS '.app_state.incentives.lockable_durations.[0]' -v "1s"
+    dasel put -t string -f $GENESIS '.app_state.incentives.lockable_durations.[1]' -v "120s"
+    dasel put -t string -f $GENESIS '.app_state.incentives.lockable_durations.[2]' -v "180s"
+    dasel put -t string -f $GENESIS '.app_state.incentives.lockable_durations.[3]' -v "240s"
+    dasel put -t string -f $GENESIS '.app_state.incentives.params.distr_epoch_identifier' -v "day"
 
     # Update mint module
-    dasel put string -f $GENESIS '.app_state.mint.params.mint_denom' "uosmo"
-    dasel put string -f $GENESIS '.app_state.mint.params.epoch_identifier' "day"
+    dasel put -t string -f $GENESIS '.app_state.mint.params.mint_denom' -v "uosmo"
+    dasel put -t string -f $GENESIS '.app_state.mint.params.epoch_identifier' -v "day"
 
     # Update gamm module
-    dasel put string -f $GENESIS '.app_state.gamm.params.pool_creation_fee.[0].denom' "uosmo"
+    dasel put -t string -f $GENESIS '.app_state.gamm.params.pool_creation_fee.[0].denom' -v "uosmo"
 
     # Update txfee basedenom
-    dasel put string -f $GENESIS '.app_state.txfees.basedenom' "uosmo"
+    dasel put -t string -f $GENESIS '.app_state.txfees.basedenom' -v "uosmo"
 
     # Update wasm permission (Nobody or Everybody)
-    dasel put string -f $GENESIS '.app_state.wasm.params.code_upload_access.permission' "Everybody"
+    dasel put -t string -f $GENESIS '.app_state.wasm.params.code_upload_access.permission' -v "Everybody"
 }
 
 add_genesis_accounts () {
@@ -92,10 +92,10 @@ add_genesis_accounts () {
 
 edit_config () {
     # Remove seeds
-    dasel put string -f $CONFIG_FOLDER/config.toml '.p2p.seeds' ''
+    dasel put -t string -f $CONFIG_FOLDER/config.toml '.p2p.seeds' -v ''
 
     # Expose the rpc
-    dasel put string -f $CONFIG_FOLDER/config.toml '.rpc.laddr' "tcp://0.0.0.0:26657"
+    dasel put -t string -f $CONFIG_FOLDER/config.toml '.rpc.laddr' -v "tcp://0.0.0.0:26657"
 }
 
 if [[ ! -d $CONFIG_FOLDER ]]
diff --git a/x/bridge/types/bridge.pb.go b/x/bridge/types/bridge.pb.go
new file mode 100644
index 00000000000..787cebd77c2
--- /dev/null
+++ b/x/bridge/types/bridge.pb.go
@@ -0,0 +1,912 @@
+// Code generated by protoc-gen-gogo. DO NOT EDIT.
+// source: osmosis/bridge/v1beta1/bridge.proto
+
+package types
+
+import (
+	fmt "fmt"
+	_ "github.com/cosmos/gogoproto/gogoproto"
+	proto "github.com/cosmos/gogoproto/proto"
+	io "io"
+	math "math"
+	math_bits "math/bits"
+)
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the proto package it is being compiled against.
+// A compilation error at this line likely means your copy of the
+// proto package needs to be updated.
+const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
+
+type AssetStatus int32
+
+const (
+	AssetStatus_ASSET_STATUS_UNSPECIFIED      AssetStatus = 0
+	AssetStatus_ASSET_STATUS_OK               AssetStatus = 1
+	AssetStatus_ASSET_STATUS_BLOCKED_INBOUND  AssetStatus = 2
+	AssetStatus_ASSET_STATUS_BLOCKED_OUTBOUND AssetStatus = 3
+	AssetStatus_ASSET_STATUS_BLOCKED_BOTH     AssetStatus = 4
+)
+
+var AssetStatus_name = map[int32]string{
+	0: "ASSET_STATUS_UNSPECIFIED",
+	1: "ASSET_STATUS_OK",
+	2: "ASSET_STATUS_BLOCKED_INBOUND",
+	3: "ASSET_STATUS_BLOCKED_OUTBOUND",
+	4: "ASSET_STATUS_BLOCKED_BOTH",
+}
+
+var AssetStatus_value = map[string]int32{
+	"ASSET_STATUS_UNSPECIFIED":      0,
+	"ASSET_STATUS_OK":               1,
+	"ASSET_STATUS_BLOCKED_INBOUND":  2,
+	"ASSET_STATUS_BLOCKED_OUTBOUND": 3,
+	"ASSET_STATUS_BLOCKED_BOTH":     4,
+}
+
+func (x AssetStatus) String() string {
+	return proto.EnumName(AssetStatus_name, int32(x))
+}
+
+func (AssetStatus) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_f999ddf08452f1f3, []int{0}
+}
+
+// Params defines params for x/bridge module.
+type Params struct {
+	// Signers used to sign inbound and release outbound transactions
+	Signers []string `protobuf:"bytes,1,rep,name=signers,proto3" json:"signers,omitempty" yaml:"signers"`
+	// Assets is a list used to create tokenfactory denoms
+	// for corresponding trading pairs
+	Assets []AssetWithStatus `protobuf:"bytes,2,rep,name=assets,proto3" json:"assets" yaml:"assets"`
+}
+
+func (m *Params) Reset()         { *m = Params{} }
+func (m *Params) String() string { return proto.CompactTextString(m) }
+func (*Params) ProtoMessage()    {}
+func (*Params) Descriptor() ([]byte, []int) {
+	return fileDescriptor_f999ddf08452f1f3, []int{0}
+}
+func (m *Params) XXX_Unmarshal(b []byte) error {
+	return m.Unmarshal(b)
+}
+func (m *Params) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	if deterministic {
+		return xxx_messageInfo_Params.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalToSizedBuffer(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
+	}
+}
+func (m *Params) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Params.Merge(m, src)
+}
+func (m *Params) XXX_Size() int {
+	return m.Size()
+}
+func (m *Params) XXX_DiscardUnknown() {
+	xxx_messageInfo_Params.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Params proto.InternalMessageInfo
+
+func (m *Params) GetSigners() []string {
+	if m != nil {
+		return m.Signers
+	}
+	return nil
+}
+
+func (m *Params) GetAssets() []AssetWithStatus {
+	if m != nil {
+		return m.Assets
+	}
+	return nil
+}
+
+// AssetWithStatus defines a pair of the asset and its current status.
+type AssetWithStatus struct {
+	Asset       Asset       `protobuf:"bytes,1,opt,name=asset,proto3" json:"asset" yaml:"asset"`
+	AssetStatus AssetStatus `protobuf:"varint,2,opt,name=asset_status,json=assetStatus,proto3,enum=osmosis.bridge.v1beta1.AssetStatus" json:"asset_status,omitempty" yaml:"asset_status"`
+}
+
+func (m *AssetWithStatus) Reset()         { *m = AssetWithStatus{} }
+func (m *AssetWithStatus) String() string { return proto.CompactTextString(m) }
+func (*AssetWithStatus) ProtoMessage()    {}
+func (*AssetWithStatus) Descriptor() ([]byte, []int) {
+	return fileDescriptor_f999ddf08452f1f3, []int{1}
+}
+func (m *AssetWithStatus) XXX_Unmarshal(b []byte) error {
+	return m.Unmarshal(b)
+}
+func (m *AssetWithStatus) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	if deterministic {
+		return xxx_messageInfo_AssetWithStatus.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalToSizedBuffer(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
+	}
+}
+func (m *AssetWithStatus) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AssetWithStatus.Merge(m, src)
+}
+func (m *AssetWithStatus) XXX_Size() int {
+	return m.Size()
+}
+func (m *AssetWithStatus) XXX_DiscardUnknown() {
+	xxx_messageInfo_AssetWithStatus.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AssetWithStatus proto.InternalMessageInfo
+
+func (m *AssetWithStatus) GetAsset() Asset {
+	if m != nil {
+		return m.Asset
+	}
+	return Asset{}
+}
+
+func (m *AssetWithStatus) GetAssetStatus() AssetStatus {
+	if m != nil {
+		return m.AssetStatus
+	}
+	return AssetStatus_ASSET_STATUS_UNSPECIFIED
+}
+
+// Asset defines a pair of the source chain name and its Osmosis representation
+// denoted by denom. It also includes a precision used for coins representation.
+type Asset struct {
+	// SourceChain is a source chain name
+	SourceChain string `protobuf:"bytes,1,opt,name=source_chain,json=sourceChain,proto3" json:"source_chain,omitempty" yaml:"source_chain"`
+	// Denom is the Osmosis representation of the SourceChain
+	Denom string `protobuf:"bytes,2,opt,name=denom,proto3" json:"denom,omitempty" yaml:"denom"`
+	// Precision used for coins representation
+	Precision uint64 `protobuf:"varint,3,opt,name=precision,proto3" json:"precision,omitempty" yaml:"precision"`
+}
+
+func (m *Asset) Reset()         { *m = Asset{} }
+func (m *Asset) String() string { return proto.CompactTextString(m) }
+func (*Asset) ProtoMessage()    {}
+func (*Asset) Descriptor() ([]byte, []int) {
+	return fileDescriptor_f999ddf08452f1f3, []int{2}
+}
+func (m *Asset) XXX_Unmarshal(b []byte) error {
+	return m.Unmarshal(b)
+}
+func (m *Asset) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	if deterministic {
+		return xxx_messageInfo_Asset.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalToSizedBuffer(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
+	}
+}
+func (m *Asset) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Asset.Merge(m, src)
+}
+func (m *Asset) XXX_Size() int {
+	return m.Size()
+}
+func (m *Asset) XXX_DiscardUnknown() {
+	xxx_messageInfo_Asset.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Asset proto.InternalMessageInfo
+
+func (m *Asset) GetSourceChain() string {
+	if m != nil {
+		return m.SourceChain
+	}
+	return ""
+}
+
+func (m *Asset) GetDenom() string {
+	if m != nil {
+		return m.Denom
+	}
+	return ""
+}
+
+func (m *Asset) GetPrecision() uint64 {
+	if m != nil {
+		return m.Precision
+	}
+	return 0
+}
+
+func init() {
+	proto.RegisterEnum("osmosis.bridge.v1beta1.AssetStatus", AssetStatus_name, AssetStatus_value)
+	proto.RegisterType((*Params)(nil), "osmosis.bridge.v1beta1.Params")
+	proto.RegisterType((*AssetWithStatus)(nil), "osmosis.bridge.v1beta1.AssetWithStatus")
+	proto.RegisterType((*Asset)(nil), "osmosis.bridge.v1beta1.Asset")
+}
+
+func init() {
+	proto.RegisterFile("osmosis/bridge/v1beta1/bridge.proto", fileDescriptor_f999ddf08452f1f3)
+}
+
+var fileDescriptor_f999ddf08452f1f3 = []byte{
+	// 496 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x93, 0x41, 0x6e, 0xda, 0x4c,
+	0x14, 0xc7, 0x19, 0x08, 0x7c, 0x62, 0xe0, 0x4b, 0xac, 0x09, 0x6d, 0xdd, 0x2a, 0xd8, 0xee, 0x44,
+	0x6a, 0xad, 0xaa, 0xb5, 0x15, 0x67, 0x97, 0x1d, 0x06, 0xaa, 0xa2, 0x44, 0x38, 0xb2, 0x4d, 0x2b,
+	0x75, 0x63, 0xd9, 0xc4, 0x32, 0x96, 0x62, 0x06, 0x79, 0x4c, 0xd4, 0x5c, 0xa2, 0xea, 0x0d, 0xba,
+	0xe9, 0x35, 0xba, 0xcf, 0x32, 0xcb, 0xae, 0xac, 0x0a, 0x6e, 0xc0, 0x09, 0x2a, 0xec, 0xa1, 0x38,
+	0x15, 0xca, 0x6e, 0xde, 0xfb, 0xff, 0xe6, 0xf7, 0xde, 0x08, 0x0c, 0x8f, 0x09, 0x8d, 0x08, 0x0d,
+	0xa9, 0xea, 0xc5, 0xe1, 0x55, 0xe0, 0xab, 0x37, 0x27, 0x9e, 0x9f, 0xb8, 0x27, 0xac, 0x54, 0x66,
+	0x31, 0x49, 0x08, 0x7a, 0xca, 0x20, 0x85, 0x75, 0x19, 0xf4, 0xa2, 0x15, 0x90, 0x80, 0x64, 0x88,
+	0xba, 0x3e, 0xe5, 0x34, 0xfe, 0x0a, 0x60, 0xed, 0xd2, 0x8d, 0xdd, 0x88, 0xa2, 0xb7, 0xf0, 0x3f,
+	0x1a, 0x06, 0x53, 0x3f, 0xa6, 0x3c, 0x90, 0x2a, 0x72, 0x5d, 0x47, 0xab, 0x54, 0xdc, 0xbf, 0x75,
+	0xa3, 0xeb, 0x33, 0xcc, 0x02, 0x6c, 0x6e, 0x10, 0xf4, 0x11, 0xd6, 0x5c, 0x4a, 0xfd, 0x84, 0xf2,
+	0x65, 0xa9, 0x22, 0x37, 0xb4, 0xd7, 0xca, 0xee, 0xb9, 0x4a, 0x67, 0x4d, 0x7d, 0x0a, 0x93, 0x89,
+	0x95, 0xb8, 0xc9, 0x9c, 0xea, 0x4f, 0xee, 0x52, 0xb1, 0xb4, 0x4a, 0xc5, 0xff, 0x73, 0x73, 0x2e,
+	0xc1, 0x26, 0xb3, 0xe1, 0x9f, 0x00, 0x1e, 0xfc, 0x73, 0x05, 0x0d, 0x60, 0x35, 0x4b, 0x79, 0x20,
+	0x01, 0xb9, 0xa1, 0xb5, 0x1f, 0x1d, 0xa5, 0xb7, 0xd8, 0x80, 0x66, 0x61, 0x00, 0x36, 0x73, 0x03,
+	0x72, 0x60, 0x33, 0x3b, 0x38, 0x34, 0x53, 0xf3, 0x65, 0x09, 0xc8, 0xfb, 0xda, 0xf1, 0xa3, 0x46,
+	0xb6, 0xf8, 0xb3, 0x55, 0x2a, 0x1e, 0x16, 0x9c, 0x4c, 0x81, 0xcd, 0x86, 0xbb, 0xa5, 0xf0, 0x77,
+	0x00, 0xab, 0xd9, 0x2d, 0x74, 0x06, 0x9b, 0x94, 0xcc, 0xe3, 0xb1, 0xef, 0x8c, 0x27, 0x6e, 0x38,
+	0xcd, 0x96, 0xaf, 0x17, 0x2d, 0xc5, 0x14, 0x9b, 0x8d, 0xbc, 0xec, 0xae, 0x2b, 0xf4, 0x0a, 0x56,
+	0xaf, 0xfc, 0x29, 0x89, 0xb2, 0xfd, 0xea, 0x3a, 0xb7, 0x7d, 0x4e, 0xd6, 0xc6, 0x66, 0x1e, 0x23,
+	0x0d, 0xd6, 0x67, 0xb1, 0x3f, 0x0e, 0x69, 0x48, 0xa6, 0x7c, 0x45, 0x02, 0xf2, 0x9e, 0xde, 0x5a,
+	0xa5, 0x22, 0x97, 0xb3, 0x7f, 0x23, 0x6c, 0x6e, 0xb1, 0x37, 0x3f, 0x00, 0x6c, 0x14, 0xde, 0x85,
+	0x8e, 0x20, 0xdf, 0xb1, 0xac, 0xbe, 0xed, 0x58, 0x76, 0xc7, 0x1e, 0x59, 0xce, 0x68, 0x68, 0x5d,
+	0xf6, 0xbb, 0x83, 0xf7, 0x83, 0x7e, 0x8f, 0x2b, 0xa1, 0x43, 0x78, 0xf0, 0x20, 0x35, 0xce, 0x39,
+	0x80, 0x24, 0x78, 0xf4, 0xa0, 0xa9, 0x5f, 0x18, 0xdd, 0xf3, 0x7e, 0xcf, 0x19, 0x0c, 0x75, 0x63,
+	0x34, 0xec, 0x71, 0x65, 0xf4, 0x12, 0xb6, 0x77, 0x12, 0xc6, 0xc8, 0xce, 0x91, 0x0a, 0x6a, 0xc3,
+	0xe7, 0x3b, 0x11, 0xdd, 0xb0, 0x3f, 0x70, 0x7b, 0xfa, 0xc5, 0xdd, 0x42, 0x00, 0xf7, 0x0b, 0x01,
+	0xfc, 0x5e, 0x08, 0xe0, 0xdb, 0x52, 0x28, 0xdd, 0x2f, 0x85, 0xd2, 0xaf, 0xa5, 0x50, 0xfa, 0xac,
+	0x05, 0x61, 0x32, 0x99, 0x7b, 0xca, 0x98, 0x44, 0x2a, 0xfb, 0xdd, 0xde, 0x5d, 0xbb, 0x1e, 0xdd,
+	0x14, 0xea, 0x8d, 0x76, 0xaa, 0x7e, 0xd9, 0x7c, 0x24, 0xc9, 0xed, 0xcc, 0xa7, 0x5e, 0x2d, 0xfb,
+	0xbb, 0x9f, 0xfe, 0x09, 0x00, 0x00, 0xff, 0xff, 0x39, 0x7b, 0x24, 0x48, 0x43, 0x03, 0x00, 0x00,
+}
+
+func (m *Params) Marshal() (dAtA []byte, err error) {
+	size := m.Size()
+	dAtA = make([]byte, size)
+	n, err := m.MarshalToSizedBuffer(dAtA[:size])
+	if err != nil {
+		return nil, err
+	}
+	return dAtA[:n], nil
+}
+
+func (m *Params) MarshalTo(dAtA []byte) (int, error) {
+	size := m.Size()
+	return m.MarshalToSizedBuffer(dAtA[:size])
+}
+
+func (m *Params) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+	i := len(dAtA)
+	_ = i
+	var l int
+	_ = l
+	if len(m.Assets) > 0 {
+		for iNdEx := len(m.Assets) - 1; iNdEx >= 0; iNdEx-- {
+			{
+				size, err := m.Assets[iNdEx].MarshalToSizedBuffer(dAtA[:i])
+				if err != nil {
+					return 0, err
+				}
+				i -= size
+				i = encodeVarintBridge(dAtA, i, uint64(size))
+			}
+			i--
+			dAtA[i] = 0x12
+		}
+	}
+	if len(m.Signers) > 0 {
+		for iNdEx := len(m.Signers) - 1; iNdEx >= 0; iNdEx-- {
+			i -= len(m.Signers[iNdEx])
+			copy(dAtA[i:], m.Signers[iNdEx])
+			i = encodeVarintBridge(dAtA, i, uint64(len(m.Signers[iNdEx])))
+			i--
+			dAtA[i] = 0xa
+		}
+	}
+	return len(dAtA) - i, nil
+}
+
+func (m *AssetWithStatus) Marshal() (dAtA []byte, err error) {
+	size := m.Size()
+	dAtA = make([]byte, size)
+	n, err := m.MarshalToSizedBuffer(dAtA[:size])
+	if err != nil {
+		return nil, err
+	}
+	return dAtA[:n], nil
+}
+
+func (m *AssetWithStatus) MarshalTo(dAtA []byte) (int, error) {
+	size := m.Size()
+	return m.MarshalToSizedBuffer(dAtA[:size])
+}
+
+func (m *AssetWithStatus) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+	i := len(dAtA)
+	_ = i
+	var l int
+	_ = l
+	if m.AssetStatus != 0 {
+		i = encodeVarintBridge(dAtA, i, uint64(m.AssetStatus))
+		i--
+		dAtA[i] = 0x10
+	}
+	{
+		size, err := m.Asset.MarshalToSizedBuffer(dAtA[:i])
+		if err != nil {
+			return 0, err
+		}
+		i -= size
+		i = encodeVarintBridge(dAtA, i, uint64(size))
+	}
+	i--
+	dAtA[i] = 0xa
+	return len(dAtA) - i, nil
+}
+
+func (m *Asset) Marshal() (dAtA []byte, err error) {
+	size := m.Size()
+	dAtA = make([]byte, size)
+	n, err := m.MarshalToSizedBuffer(dAtA[:size])
+	if err != nil {
+		return nil, err
+	}
+	return dAtA[:n], nil
+}
+
+func (m *Asset) MarshalTo(dAtA []byte) (int, error) {
+	size := m.Size()
+	return m.MarshalToSizedBuffer(dAtA[:size])
+}
+
+func (m *Asset) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+	i := len(dAtA)
+	_ = i
+	var l int
+	_ = l
+	if m.Precision != 0 {
+		i = encodeVarintBridge(dAtA, i, uint64(m.Precision))
+		i--
+		dAtA[i] = 0x18
+	}
+	if len(m.Denom) > 0 {
+		i -= len(m.Denom)
+		copy(dAtA[i:], m.Denom)
+		i = encodeVarintBridge(dAtA, i, uint64(len(m.Denom)))
+		i--
+		dAtA[i] = 0x12
+	}
+	if len(m.SourceChain) > 0 {
+		i -= len(m.SourceChain)
+		copy(dAtA[i:], m.SourceChain)
+		i = encodeVarintBridge(dAtA, i, uint64(len(m.SourceChain)))
+		i--
+		dAtA[i] = 0xa
+	}
+	return len(dAtA) - i, nil
+}
+
+func encodeVarintBridge(dAtA []byte, offset int, v uint64) int {
+	offset -= sovBridge(v)
+	base := offset
+	for v >= 1<<7 {
+		dAtA[offset] = uint8(v&0x7f | 0x80)
+		v >>= 7
+		offset++
+	}
+	dAtA[offset] = uint8(v)
+	return base
+}
+func (m *Params) Size() (n int) {
+	if m == nil {
+		return 0
+	}
+	var l int
+	_ = l
+	if len(m.Signers) > 0 {
+		for _, s := range m.Signers {
+			l = len(s)
+			n += 1 + l + sovBridge(uint64(l))
+		}
+	}
+	if len(m.Assets) > 0 {
+		for _, e := range m.Assets {
+			l = e.Size()
+			n += 1 + l + sovBridge(uint64(l))
+		}
+	}
+	return n
+}
+
+func (m *AssetWithStatus) Size() (n int) {
+	if m == nil {
+		return 0
+	}
+	var l int
+	_ = l
+	l = m.Asset.Size()
+	n += 1 + l + sovBridge(uint64(l))
+	if m.AssetStatus != 0 {
+		n += 1 + sovBridge(uint64(m.AssetStatus))
+	}
+	return n
+}
+
+func (m *Asset) Size() (n int) {
+	if m == nil {
+		return 0
+	}
+	var l int
+	_ = l
+	l = len(m.SourceChain)
+	if l > 0 {
+		n += 1 + l + sovBridge(uint64(l))
+	}
+	l = len(m.Denom)
+	if l > 0 {
+		n += 1 + l + sovBridge(uint64(l))
+	}
+	if m.Precision != 0 {
+		n += 1 + sovBridge(uint64(m.Precision))
+	}
+	return n
+}
+
+func sovBridge(x uint64) (n int) {
+	return (math_bits.Len64(x|1) + 6) / 7
+}
+func sozBridge(x uint64) (n int) {
+	return sovBridge(uint64((x << 1) ^ uint64((int64(x) >> 63))))
+}
+func (m *Params) Unmarshal(dAtA []byte) error {
+	l := len(dAtA)
+	iNdEx := 0
+	for iNdEx < l {
+		preIndex := iNdEx
+		var wire uint64
+		for shift := uint(0); ; shift += 7 {
+			if shift >= 64 {
+				return ErrIntOverflowBridge
+			}
+			if iNdEx >= l {
+				return io.ErrUnexpectedEOF
+			}
+			b := dAtA[iNdEx]
+			iNdEx++
+			wire |= uint64(b&0x7F) << shift
+			if b < 0x80 {
+				break
+			}
+		}
+		fieldNum := int32(wire >> 3)
+		wireType := int(wire & 0x7)
+		if wireType == 4 {
+			return fmt.Errorf("proto: Params: wiretype end group for non-group")
+		}
+		if fieldNum <= 0 {
+			return fmt.Errorf("proto: Params: illegal tag %d (wire type %d)", fieldNum, wire)
+		}
+		switch fieldNum {
+		case 1:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Signers", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowBridge
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				stringLen |= uint64(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			intStringLen := int(stringLen)
+			if intStringLen < 0 {
+				return ErrInvalidLengthBridge
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex < 0 {
+				return ErrInvalidLengthBridge
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.Signers = append(m.Signers, string(dAtA[iNdEx:postIndex]))
+			iNdEx = postIndex
+		case 2:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Assets", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowBridge
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthBridge
+			}
+			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthBridge
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.Assets = append(m.Assets, AssetWithStatus{})
+			if err := m.Assets[len(m.Assets)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
+		default:
+			iNdEx = preIndex
+			skippy, err := skipBridge(dAtA[iNdEx:])
+			if err != nil {
+				return err
+			}
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
+				return ErrInvalidLengthBridge
+			}
+			if (iNdEx + skippy) > l {
+				return io.ErrUnexpectedEOF
+			}
+			iNdEx += skippy
+		}
+	}
+
+	if iNdEx > l {
+		return io.ErrUnexpectedEOF
+	}
+	return nil
+}
+func (m *AssetWithStatus) Unmarshal(dAtA []byte) error {
+	l := len(dAtA)
+	iNdEx := 0
+	for iNdEx < l {
+		preIndex := iNdEx
+		var wire uint64
+		for shift := uint(0); ; shift += 7 {
+			if shift >= 64 {
+				return ErrIntOverflowBridge
+			}
+			if iNdEx >= l {
+				return io.ErrUnexpectedEOF
+			}
+			b := dAtA[iNdEx]
+			iNdEx++
+			wire |= uint64(b&0x7F) << shift
+			if b < 0x80 {
+				break
+			}
+		}
+		fieldNum := int32(wire >> 3)
+		wireType := int(wire & 0x7)
+		if wireType == 4 {
+			return fmt.Errorf("proto: AssetWithStatus: wiretype end group for non-group")
+		}
+		if fieldNum <= 0 {
+			return fmt.Errorf("proto: AssetWithStatus: illegal tag %d (wire type %d)", fieldNum, wire)
+		}
+		switch fieldNum {
+		case 1:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Asset", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowBridge
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthBridge
+			}
+			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthBridge
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			if err := m.Asset.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
+		case 2:
+			if wireType != 0 {
+				return fmt.Errorf("proto: wrong wireType = %d for field AssetStatus", wireType)
+			}
+			m.AssetStatus = 0
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowBridge
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				m.AssetStatus |= AssetStatus(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+		default:
+			iNdEx = preIndex
+			skippy, err := skipBridge(dAtA[iNdEx:])
+			if err != nil {
+				return err
+			}
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
+				return ErrInvalidLengthBridge
+			}
+			if (iNdEx + skippy) > l {
+				return io.ErrUnexpectedEOF
+			}
+			iNdEx += skippy
+		}
+	}
+
+	if iNdEx > l {
+		return io.ErrUnexpectedEOF
+	}
+	return nil
+}
+func (m *Asset) Unmarshal(dAtA []byte) error {
+	l := len(dAtA)
+	iNdEx := 0
+	for iNdEx < l {
+		preIndex := iNdEx
+		var wire uint64
+		for shift := uint(0); ; shift += 7 {
+			if shift >= 64 {
+				return ErrIntOverflowBridge
+			}
+			if iNdEx >= l {
+				return io.ErrUnexpectedEOF
+			}
+			b := dAtA[iNdEx]
+			iNdEx++
+			wire |= uint64(b&0x7F) << shift
+			if b < 0x80 {
+				break
+			}
+		}
+		fieldNum := int32(wire >> 3)
+		wireType := int(wire & 0x7)
+		if wireType == 4 {
+			return fmt.Errorf("proto: Asset: wiretype end group for non-group")
+		}
+		if fieldNum <= 0 {
+			return fmt.Errorf("proto: Asset: illegal tag %d (wire type %d)", fieldNum, wire)
+		}
+		switch fieldNum {
+		case 1:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field SourceChain", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowBridge
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				stringLen |= uint64(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			intStringLen := int(stringLen)
+			if intStringLen < 0 {
+				return ErrInvalidLengthBridge
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex < 0 {
+				return ErrInvalidLengthBridge
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.SourceChain = string(dAtA[iNdEx:postIndex])
+			iNdEx = postIndex
+		case 2:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Denom", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowBridge
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				stringLen |= uint64(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			intStringLen := int(stringLen)
+			if intStringLen < 0 {
+				return ErrInvalidLengthBridge
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex < 0 {
+				return ErrInvalidLengthBridge
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.Denom = string(dAtA[iNdEx:postIndex])
+			iNdEx = postIndex
+		case 3:
+			if wireType != 0 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Precision", wireType)
+			}
+			m.Precision = 0
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowBridge
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				m.Precision |= uint64(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+		default:
+			iNdEx = preIndex
+			skippy, err := skipBridge(dAtA[iNdEx:])
+			if err != nil {
+				return err
+			}
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
+				return ErrInvalidLengthBridge
+			}
+			if (iNdEx + skippy) > l {
+				return io.ErrUnexpectedEOF
+			}
+			iNdEx += skippy
+		}
+	}
+
+	if iNdEx > l {
+		return io.ErrUnexpectedEOF
+	}
+	return nil
+}
+func skipBridge(dAtA []byte) (n int, err error) {
+	l := len(dAtA)
+	iNdEx := 0
+	depth := 0
+	for iNdEx < l {
+		var wire uint64
+		for shift := uint(0); ; shift += 7 {
+			if shift >= 64 {
+				return 0, ErrIntOverflowBridge
+			}
+			if iNdEx >= l {
+				return 0, io.ErrUnexpectedEOF
+			}
+			b := dAtA[iNdEx]
+			iNdEx++
+			wire |= (uint64(b) & 0x7F) << shift
+			if b < 0x80 {
+				break
+			}
+		}
+		wireType := int(wire & 0x7)
+		switch wireType {
+		case 0:
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return 0, ErrIntOverflowBridge
+				}
+				if iNdEx >= l {
+					return 0, io.ErrUnexpectedEOF
+				}
+				iNdEx++
+				if dAtA[iNdEx-1] < 0x80 {
+					break
+				}
+			}
+		case 1:
+			iNdEx += 8
+		case 2:
+			var length int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return 0, ErrIntOverflowBridge
+				}
+				if iNdEx >= l {
+					return 0, io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				length |= (int(b) & 0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if length < 0 {
+				return 0, ErrInvalidLengthBridge
+			}
+			iNdEx += length
+		case 3:
+			depth++
+		case 4:
+			if depth == 0 {
+				return 0, ErrUnexpectedEndOfGroupBridge
+			}
+			depth--
+		case 5:
+			iNdEx += 4
+		default:
+			return 0, fmt.Errorf("proto: illegal wireType %d", wireType)
+		}
+		if iNdEx < 0 {
+			return 0, ErrInvalidLengthBridge
+		}
+		if depth == 0 {
+			return iNdEx, nil
+		}
+	}
+	return 0, io.ErrUnexpectedEOF
+}
+
+var (
+	ErrInvalidLengthBridge        = fmt.Errorf("proto: negative length found during unmarshaling")
+	ErrIntOverflowBridge          = fmt.Errorf("proto: integer overflow")
+	ErrUnexpectedEndOfGroupBridge = fmt.Errorf("proto: unexpected end of group")
+)
diff --git a/x/bridge/types/events.pb.go b/x/bridge/types/events.pb.go
new file mode 100644
index 00000000000..977ad016e66
--- /dev/null
+++ b/x/bridge/types/events.pb.go
@@ -0,0 +1,1567 @@
+// Code generated by protoc-gen-gogo. DO NOT EDIT.
+// source: osmosis/bridge/v1beta1/events.proto
+
+package types
+
+import (
+	cosmossdk_io_math "cosmossdk.io/math"
+	fmt "fmt"
+	_ "github.com/cosmos/gogoproto/gogoproto"
+	proto "github.com/cosmos/gogoproto/proto"
+	io "io"
+	math "math"
+	math_bits "math/bits"
+)
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the proto package it is being compiled against.
+// A compilation error at this line likely means your copy of the
+// proto package needs to be updated.
+const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
+
+type EventInboundTransfer struct {
+	// Sender is a sender's address
+	Sender string `protobuf:"bytes,1,opt,name=sender,proto3" json:"sender,omitempty"`
+	// DestAddr is a destination Osmosis address
+	DestAddr string `protobuf:"bytes,2,opt,name=dest_addr,json=destAddr,proto3" json:"dest_addr,omitempty"`
+	// Asset contains a source chain and a target denom
+	Asset Asset `protobuf:"bytes,3,opt,name=asset,proto3" json:"asset"`
+	// Amount of coins to transfer
+	Amount cosmossdk_io_math.Int `protobuf:"bytes,4,opt,name=amount,proto3,customtype=cosmossdk.io/math.Int" json:"amount"`
+}
+
+func (m *EventInboundTransfer) Reset()         { *m = EventInboundTransfer{} }
+func (m *EventInboundTransfer) String() string { return proto.CompactTextString(m) }
+func (*EventInboundTransfer) ProtoMessage()    {}
+func (*EventInboundTransfer) Descriptor() ([]byte, []int) {
+	return fileDescriptor_61b63bd2a1c2ae24, []int{0}
+}
+func (m *EventInboundTransfer) XXX_Unmarshal(b []byte) error {
+	return m.Unmarshal(b)
+}
+func (m *EventInboundTransfer) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	if deterministic {
+		return xxx_messageInfo_EventInboundTransfer.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalToSizedBuffer(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
+	}
+}
+func (m *EventInboundTransfer) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_EventInboundTransfer.Merge(m, src)
+}
+func (m *EventInboundTransfer) XXX_Size() int {
+	return m.Size()
+}
+func (m *EventInboundTransfer) XXX_DiscardUnknown() {
+	xxx_messageInfo_EventInboundTransfer.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_EventInboundTransfer proto.InternalMessageInfo
+
+func (m *EventInboundTransfer) GetSender() string {
+	if m != nil {
+		return m.Sender
+	}
+	return ""
+}
+
+func (m *EventInboundTransfer) GetDestAddr() string {
+	if m != nil {
+		return m.DestAddr
+	}
+	return ""
+}
+
+func (m *EventInboundTransfer) GetAsset() Asset {
+	if m != nil {
+		return m.Asset
+	}
+	return Asset{}
+}
+
+type EventOutboundTransfer struct {
+	// Sender is a sender's address
+	Sender string `protobuf:"bytes,1,opt,name=sender,proto3" json:"sender,omitempty"`
+	// DestAddr is a destination Osmosis address
+	DestAddr string `protobuf:"bytes,2,opt,name=dest_addr,json=destAddr,proto3" json:"dest_addr,omitempty"`
+	// Asset contains a source chain and a target denom
+	Asset Asset `protobuf:"bytes,3,opt,name=asset,proto3" json:"asset"`
+	// Amount of coins to transfer
+	Amount cosmossdk_io_math.Int `protobuf:"bytes,4,opt,name=amount,proto3,customtype=cosmossdk.io/math.Int" json:"amount"`
+}
+
+func (m *EventOutboundTransfer) Reset()         { *m = EventOutboundTransfer{} }
+func (m *EventOutboundTransfer) String() string { return proto.CompactTextString(m) }
+func (*EventOutboundTransfer) ProtoMessage()    {}
+func (*EventOutboundTransfer) Descriptor() ([]byte, []int) {
+	return fileDescriptor_61b63bd2a1c2ae24, []int{1}
+}
+func (m *EventOutboundTransfer) XXX_Unmarshal(b []byte) error {
+	return m.Unmarshal(b)
+}
+func (m *EventOutboundTransfer) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	if deterministic {
+		return xxx_messageInfo_EventOutboundTransfer.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalToSizedBuffer(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
+	}
+}
+func (m *EventOutboundTransfer) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_EventOutboundTransfer.Merge(m, src)
+}
+func (m *EventOutboundTransfer) XXX_Size() int {
+	return m.Size()
+}
+func (m *EventOutboundTransfer) XXX_DiscardUnknown() {
+	xxx_messageInfo_EventOutboundTransfer.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_EventOutboundTransfer proto.InternalMessageInfo
+
+func (m *EventOutboundTransfer) GetSender() string {
+	if m != nil {
+		return m.Sender
+	}
+	return ""
+}
+
+func (m *EventOutboundTransfer) GetDestAddr() string {
+	if m != nil {
+		return m.DestAddr
+	}
+	return ""
+}
+
+func (m *EventOutboundTransfer) GetAsset() Asset {
+	if m != nil {
+		return m.Asset
+	}
+	return Asset{}
+}
+
+type EventUpdateParams struct {
+	NewSigners     []string          `protobuf:"bytes,1,rep,name=new_signers,json=newSigners,proto3" json:"new_signers,omitempty"`
+	CreatedSigners []string          `protobuf:"bytes,2,rep,name=created_signers,json=createdSigners,proto3" json:"created_signers,omitempty"`
+	DeletedSigners []string          `protobuf:"bytes,3,rep,name=deleted_signers,json=deletedSigners,proto3" json:"deleted_signers,omitempty"`
+	NewAssets      []AssetWithStatus `protobuf:"bytes,4,rep,name=new_assets,json=newAssets,proto3" json:"new_assets"`
+	CreatedAssets  []AssetWithStatus `protobuf:"bytes,5,rep,name=created_assets,json=createdAssets,proto3" json:"created_assets"`
+	DeletedAssets  []AssetWithStatus `protobuf:"bytes,6,rep,name=deleted_assets,json=deletedAssets,proto3" json:"deleted_assets"`
+}
+
+func (m *EventUpdateParams) Reset()         { *m = EventUpdateParams{} }
+func (m *EventUpdateParams) String() string { return proto.CompactTextString(m) }
+func (*EventUpdateParams) ProtoMessage()    {}
+func (*EventUpdateParams) Descriptor() ([]byte, []int) {
+	return fileDescriptor_61b63bd2a1c2ae24, []int{2}
+}
+func (m *EventUpdateParams) XXX_Unmarshal(b []byte) error {
+	return m.Unmarshal(b)
+}
+func (m *EventUpdateParams) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	if deterministic {
+		return xxx_messageInfo_EventUpdateParams.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalToSizedBuffer(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
+	}
+}
+func (m *EventUpdateParams) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_EventUpdateParams.Merge(m, src)
+}
+func (m *EventUpdateParams) XXX_Size() int {
+	return m.Size()
+}
+func (m *EventUpdateParams) XXX_DiscardUnknown() {
+	xxx_messageInfo_EventUpdateParams.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_EventUpdateParams proto.InternalMessageInfo
+
+func (m *EventUpdateParams) GetNewSigners() []string {
+	if m != nil {
+		return m.NewSigners
+	}
+	return nil
+}
+
+func (m *EventUpdateParams) GetCreatedSigners() []string {
+	if m != nil {
+		return m.CreatedSigners
+	}
+	return nil
+}
+
+func (m *EventUpdateParams) GetDeletedSigners() []string {
+	if m != nil {
+		return m.DeletedSigners
+	}
+	return nil
+}
+
+func (m *EventUpdateParams) GetNewAssets() []AssetWithStatus {
+	if m != nil {
+		return m.NewAssets
+	}
+	return nil
+}
+
+func (m *EventUpdateParams) GetCreatedAssets() []AssetWithStatus {
+	if m != nil {
+		return m.CreatedAssets
+	}
+	return nil
+}
+
+func (m *EventUpdateParams) GetDeletedAssets() []AssetWithStatus {
+	if m != nil {
+		return m.DeletedAssets
+	}
+	return nil
+}
+
+type EventChangeAssetStatus struct {
+	// Sender is a sender's address
+	Sender string `protobuf:"bytes,1,opt,name=sender,proto3" json:"sender,omitempty"`
+	// NewAssetStatus is a pair of the asset and its new status
+	OldAssetStatus AssetWithStatus `protobuf:"bytes,2,opt,name=old_asset_status,json=oldAssetStatus,proto3" json:"old_asset_status"`
+	NewAssetStatus AssetWithStatus `protobuf:"bytes,3,opt,name=new_asset_status,json=newAssetStatus,proto3" json:"new_asset_status"`
+}
+
+func (m *EventChangeAssetStatus) Reset()         { *m = EventChangeAssetStatus{} }
+func (m *EventChangeAssetStatus) String() string { return proto.CompactTextString(m) }
+func (*EventChangeAssetStatus) ProtoMessage()    {}
+func (*EventChangeAssetStatus) Descriptor() ([]byte, []int) {
+	return fileDescriptor_61b63bd2a1c2ae24, []int{3}
+}
+func (m *EventChangeAssetStatus) XXX_Unmarshal(b []byte) error {
+	return m.Unmarshal(b)
+}
+func (m *EventChangeAssetStatus) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	if deterministic {
+		return xxx_messageInfo_EventChangeAssetStatus.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalToSizedBuffer(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
+	}
+}
+func (m *EventChangeAssetStatus) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_EventChangeAssetStatus.Merge(m, src)
+}
+func (m *EventChangeAssetStatus) XXX_Size() int {
+	return m.Size()
+}
+func (m *EventChangeAssetStatus) XXX_DiscardUnknown() {
+	xxx_messageInfo_EventChangeAssetStatus.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_EventChangeAssetStatus proto.InternalMessageInfo
+
+func (m *EventChangeAssetStatus) GetSender() string {
+	if m != nil {
+		return m.Sender
+	}
+	return ""
+}
+
+func (m *EventChangeAssetStatus) GetOldAssetStatus() AssetWithStatus {
+	if m != nil {
+		return m.OldAssetStatus
+	}
+	return AssetWithStatus{}
+}
+
+func (m *EventChangeAssetStatus) GetNewAssetStatus() AssetWithStatus {
+	if m != nil {
+		return m.NewAssetStatus
+	}
+	return AssetWithStatus{}
+}
+
+func init() {
+	proto.RegisterType((*EventInboundTransfer)(nil), "osmosis.bridge.v1beta1.EventInboundTransfer")
+	proto.RegisterType((*EventOutboundTransfer)(nil), "osmosis.bridge.v1beta1.EventOutboundTransfer")
+	proto.RegisterType((*EventUpdateParams)(nil), "osmosis.bridge.v1beta1.EventUpdateParams")
+	proto.RegisterType((*EventChangeAssetStatus)(nil), "osmosis.bridge.v1beta1.EventChangeAssetStatus")
+}
+
+func init() {
+	proto.RegisterFile("osmosis/bridge/v1beta1/events.proto", fileDescriptor_61b63bd2a1c2ae24)
+}
+
+var fileDescriptor_61b63bd2a1c2ae24 = []byte{
+	// 493 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x94, 0x41, 0x6f, 0xd3, 0x30,
+	0x14, 0xc7, 0xeb, 0xa5, 0xab, 0xa8, 0x2b, 0xc6, 0x88, 0xb6, 0x2a, 0x1a, 0x5a, 0x5a, 0x95, 0xc3,
+	0x7a, 0x21, 0xd1, 0x3a, 0x71, 0xe0, 0xb8, 0x21, 0x0e, 0x93, 0x26, 0x81, 0xba, 0xa1, 0x4a, 0x5c,
+	0x2a, 0xa7, 0x7e, 0xa4, 0x11, 0x8d, 0x5d, 0xf9, 0x39, 0x2d, 0xdc, 0xf8, 0x08, 0x7c, 0x21, 0x38,
+	0xef, 0xb8, 0x23, 0xe2, 0x30, 0xa1, 0xf4, 0x8b, 0xa0, 0x38, 0xce, 0xe8, 0x81, 0x21, 0xd1, 0x1b,
+	0xb7, 0xf8, 0xef, 0x9f, 0x7f, 0x7e, 0x2f, 0xb6, 0x4c, 0x9f, 0x4a, 0x4c, 0x25, 0x26, 0x18, 0x46,
+	0x2a, 0xe1, 0x31, 0x84, 0x8b, 0xe3, 0x08, 0x34, 0x3b, 0x0e, 0x61, 0x01, 0x42, 0x63, 0x30, 0x57,
+	0x52, 0x4b, 0xb7, 0x6d, 0xa1, 0xa0, 0x84, 0x02, 0x0b, 0x1d, 0xec, 0xc5, 0x32, 0x96, 0x06, 0x09,
+	0x8b, 0xaf, 0x92, 0x3e, 0xb8, 0x4f, 0x69, 0x17, 0x1b, 0xa8, 0xf7, 0x95, 0xd0, 0xbd, 0x57, 0xc5,
+	0x1e, 0xe7, 0x22, 0x92, 0x99, 0xe0, 0x57, 0x8a, 0x09, 0x7c, 0x0f, 0xca, 0x6d, 0xd3, 0x06, 0x82,
+	0xe0, 0xa0, 0x3c, 0xd2, 0x25, 0xfd, 0xe6, 0xd0, 0x8e, 0xdc, 0x27, 0xb4, 0xc9, 0x01, 0xf5, 0x98,
+	0x71, 0xae, 0xbc, 0x2d, 0x33, 0xf5, 0xa0, 0x08, 0x4e, 0x39, 0x57, 0xee, 0x0b, 0xba, 0xcd, 0x10,
+	0x41, 0x7b, 0x4e, 0x97, 0xf4, 0x5b, 0x83, 0xc3, 0xe0, 0xcf, 0x05, 0x07, 0xa7, 0x05, 0x74, 0x56,
+	0xbf, 0xbe, 0xed, 0xd4, 0x86, 0xe5, 0x0a, 0xf7, 0x39, 0x6d, 0xb0, 0x54, 0x66, 0x42, 0x7b, 0xf5,
+	0x42, 0x7a, 0x76, 0x58, 0x4c, 0xfe, 0xb8, 0xed, 0xec, 0x4f, 0x8c, 0x03, 0xf9, 0x87, 0x20, 0x91,
+	0x61, 0xca, 0xf4, 0x34, 0x38, 0x17, 0x7a, 0x68, 0xe1, 0xde, 0x37, 0x42, 0xf7, 0x4d, 0xfd, 0xaf,
+	0x33, 0xfd, 0x5f, 0x36, 0xf0, 0xd9, 0xa1, 0x8f, 0x4d, 0x03, 0x6f, 0xe7, 0x9c, 0x69, 0x78, 0xc3,
+	0x14, 0x4b, 0xd1, 0xed, 0xd0, 0x96, 0x80, 0xe5, 0x18, 0x93, 0x58, 0x80, 0x42, 0x8f, 0x74, 0x9d,
+	0x7e, 0x73, 0x48, 0x05, 0x2c, 0x2f, 0xcb, 0xc4, 0x3d, 0xa2, 0x8f, 0x26, 0x0a, 0x98, 0x06, 0x7e,
+	0x07, 0x6d, 0x19, 0x68, 0xc7, 0xc6, 0x6b, 0x20, 0x87, 0x19, 0xac, 0x83, 0x4e, 0x09, 0xda, 0xb8,
+	0x02, 0x2f, 0x68, 0xe1, 0x1f, 0x9b, 0x66, 0xd0, 0xab, 0x77, 0x9d, 0x7e, 0x6b, 0x70, 0xf4, 0xd7,
+	0xfe, 0x47, 0x89, 0x9e, 0x5e, 0x6a, 0xa6, 0x33, 0xb4, 0x7f, 0xa2, 0x29, 0x60, 0x69, 0x66, 0xd0,
+	0xbd, 0xa2, 0x55, 0x21, 0x95, 0x71, 0x7b, 0x13, 0xe3, 0x43, 0x2b, 0xf9, 0x6d, 0xad, 0x9a, 0xb1,
+	0xd6, 0xc6, 0x46, 0x56, 0x2b, 0x29, 0xad, 0xbd, 0x9c, 0xd0, 0xb6, 0x39, 0x82, 0x97, 0x53, 0x26,
+	0x62, 0x30, 0x69, 0xc9, 0xdf, 0x7b, 0x89, 0x46, 0x74, 0x57, 0xce, 0x6c, 0x11, 0x63, 0x34, 0xac,
+	0xb9, 0x4b, 0xff, 0x5c, 0xca, 0x8e, 0x9c, 0xf1, 0xf5, 0x0d, 0x47, 0x74, 0xf7, 0xee, 0x14, 0x2a,
+	0xb1, 0xb3, 0x91, 0xb8, 0x3a, 0x0b, 0x9b, 0x5e, 0x5c, 0xe7, 0x3e, 0xb9, 0xc9, 0x7d, 0xf2, 0x33,
+	0xf7, 0xc9, 0x97, 0x95, 0x5f, 0xbb, 0x59, 0xf9, 0xb5, 0xef, 0x2b, 0xbf, 0xf6, 0x6e, 0x10, 0x27,
+	0x7a, 0x9a, 0x45, 0xc1, 0x44, 0xa6, 0xa1, 0xdd, 0xe2, 0xd9, 0x8c, 0x45, 0x58, 0x0d, 0xc2, 0xc5,
+	0xe0, 0x24, 0xfc, 0x58, 0xbd, 0x22, 0xfa, 0xd3, 0x1c, 0x30, 0x6a, 0x98, 0xd7, 0xe3, 0xe4, 0x57,
+	0x00, 0x00, 0x00, 0xff, 0xff, 0x95, 0x46, 0x44, 0x09, 0xb7, 0x04, 0x00, 0x00,
+}
+
+func (m *EventInboundTransfer) Marshal() (dAtA []byte, err error) {
+	size := m.Size()
+	dAtA = make([]byte, size)
+	n, err := m.MarshalToSizedBuffer(dAtA[:size])
+	if err != nil {
+		return nil, err
+	}
+	return dAtA[:n], nil
+}
+
+func (m *EventInboundTransfer) MarshalTo(dAtA []byte) (int, error) {
+	size := m.Size()
+	return m.MarshalToSizedBuffer(dAtA[:size])
+}
+
+func (m *EventInboundTransfer) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+	i := len(dAtA)
+	_ = i
+	var l int
+	_ = l
+	{
+		size := m.Amount.Size()
+		i -= size
+		if _, err := m.Amount.MarshalTo(dAtA[i:]); err != nil {
+			return 0, err
+		}
+		i = encodeVarintEvents(dAtA, i, uint64(size))
+	}
+	i--
+	dAtA[i] = 0x22
+	{
+		size, err := m.Asset.MarshalToSizedBuffer(dAtA[:i])
+		if err != nil {
+			return 0, err
+		}
+		i -= size
+		i = encodeVarintEvents(dAtA, i, uint64(size))
+	}
+	i--
+	dAtA[i] = 0x1a
+	if len(m.DestAddr) > 0 {
+		i -= len(m.DestAddr)
+		copy(dAtA[i:], m.DestAddr)
+		i = encodeVarintEvents(dAtA, i, uint64(len(m.DestAddr)))
+		i--
+		dAtA[i] = 0x12
+	}
+	if len(m.Sender) > 0 {
+		i -= len(m.Sender)
+		copy(dAtA[i:], m.Sender)
+		i = encodeVarintEvents(dAtA, i, uint64(len(m.Sender)))
+		i--
+		dAtA[i] = 0xa
+	}
+	return len(dAtA) - i, nil
+}
+
+func (m *EventOutboundTransfer) Marshal() (dAtA []byte, err error) {
+	size := m.Size()
+	dAtA = make([]byte, size)
+	n, err := m.MarshalToSizedBuffer(dAtA[:size])
+	if err != nil {
+		return nil, err
+	}
+	return dAtA[:n], nil
+}
+
+func (m *EventOutboundTransfer) MarshalTo(dAtA []byte) (int, error) {
+	size := m.Size()
+	return m.MarshalToSizedBuffer(dAtA[:size])
+}
+
+func (m *EventOutboundTransfer) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+	i := len(dAtA)
+	_ = i
+	var l int
+	_ = l
+	{
+		size := m.Amount.Size()
+		i -= size
+		if _, err := m.Amount.MarshalTo(dAtA[i:]); err != nil {
+			return 0, err
+		}
+		i = encodeVarintEvents(dAtA, i, uint64(size))
+	}
+	i--
+	dAtA[i] = 0x22
+	{
+		size, err := m.Asset.MarshalToSizedBuffer(dAtA[:i])
+		if err != nil {
+			return 0, err
+		}
+		i -= size
+		i = encodeVarintEvents(dAtA, i, uint64(size))
+	}
+	i--
+	dAtA[i] = 0x1a
+	if len(m.DestAddr) > 0 {
+		i -= len(m.DestAddr)
+		copy(dAtA[i:], m.DestAddr)
+		i = encodeVarintEvents(dAtA, i, uint64(len(m.DestAddr)))
+		i--
+		dAtA[i] = 0x12
+	}
+	if len(m.Sender) > 0 {
+		i -= len(m.Sender)
+		copy(dAtA[i:], m.Sender)
+		i = encodeVarintEvents(dAtA, i, uint64(len(m.Sender)))
+		i--
+		dAtA[i] = 0xa
+	}
+	return len(dAtA) - i, nil
+}
+
+func (m *EventUpdateParams) Marshal() (dAtA []byte, err error) {
+	size := m.Size()
+	dAtA = make([]byte, size)
+	n, err := m.MarshalToSizedBuffer(dAtA[:size])
+	if err != nil {
+		return nil, err
+	}
+	return dAtA[:n], nil
+}
+
+func (m *EventUpdateParams) MarshalTo(dAtA []byte) (int, error) {
+	size := m.Size()
+	return m.MarshalToSizedBuffer(dAtA[:size])
+}
+
+func (m *EventUpdateParams) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+	i := len(dAtA)
+	_ = i
+	var l int
+	_ = l
+	if len(m.DeletedAssets) > 0 {
+		for iNdEx := len(m.DeletedAssets) - 1; iNdEx >= 0; iNdEx-- {
+			{
+				size, err := m.DeletedAssets[iNdEx].MarshalToSizedBuffer(dAtA[:i])
+				if err != nil {
+					return 0, err
+				}
+				i -= size
+				i = encodeVarintEvents(dAtA, i, uint64(size))
+			}
+			i--
+			dAtA[i] = 0x32
+		}
+	}
+	if len(m.CreatedAssets) > 0 {
+		for iNdEx := len(m.CreatedAssets) - 1; iNdEx >= 0; iNdEx-- {
+			{
+				size, err := m.CreatedAssets[iNdEx].MarshalToSizedBuffer(dAtA[:i])
+				if err != nil {
+					return 0, err
+				}
+				i -= size
+				i = encodeVarintEvents(dAtA, i, uint64(size))
+			}
+			i--
+			dAtA[i] = 0x2a
+		}
+	}
+	if len(m.NewAssets) > 0 {
+		for iNdEx := len(m.NewAssets) - 1; iNdEx >= 0; iNdEx-- {
+			{
+				size, err := m.NewAssets[iNdEx].MarshalToSizedBuffer(dAtA[:i])
+				if err != nil {
+					return 0, err
+				}
+				i -= size
+				i = encodeVarintEvents(dAtA, i, uint64(size))
+			}
+			i--
+			dAtA[i] = 0x22
+		}
+	}
+	if len(m.DeletedSigners) > 0 {
+		for iNdEx := len(m.DeletedSigners) - 1; iNdEx >= 0; iNdEx-- {
+			i -= len(m.DeletedSigners[iNdEx])
+			copy(dAtA[i:], m.DeletedSigners[iNdEx])
+			i = encodeVarintEvents(dAtA, i, uint64(len(m.DeletedSigners[iNdEx])))
+			i--
+			dAtA[i] = 0x1a
+		}
+	}
+	if len(m.CreatedSigners) > 0 {
+		for iNdEx := len(m.CreatedSigners) - 1; iNdEx >= 0; iNdEx-- {
+			i -= len(m.CreatedSigners[iNdEx])
+			copy(dAtA[i:], m.CreatedSigners[iNdEx])
+			i = encodeVarintEvents(dAtA, i, uint64(len(m.CreatedSigners[iNdEx])))
+			i--
+			dAtA[i] = 0x12
+		}
+	}
+	if len(m.NewSigners) > 0 {
+		for iNdEx := len(m.NewSigners) - 1; iNdEx >= 0; iNdEx-- {
+			i -= len(m.NewSigners[iNdEx])
+			copy(dAtA[i:], m.NewSigners[iNdEx])
+			i = encodeVarintEvents(dAtA, i, uint64(len(m.NewSigners[iNdEx])))
+			i--
+			dAtA[i] = 0xa
+		}
+	}
+	return len(dAtA) - i, nil
+}
+
+func (m *EventChangeAssetStatus) Marshal() (dAtA []byte, err error) {
+	size := m.Size()
+	dAtA = make([]byte, size)
+	n, err := m.MarshalToSizedBuffer(dAtA[:size])
+	if err != nil {
+		return nil, err
+	}
+	return dAtA[:n], nil
+}
+
+func (m *EventChangeAssetStatus) MarshalTo(dAtA []byte) (int, error) {
+	size := m.Size()
+	return m.MarshalToSizedBuffer(dAtA[:size])
+}
+
+func (m *EventChangeAssetStatus) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+	i := len(dAtA)
+	_ = i
+	var l int
+	_ = l
+	{
+		size, err := m.NewAssetStatus.MarshalToSizedBuffer(dAtA[:i])
+		if err != nil {
+			return 0, err
+		}
+		i -= size
+		i = encodeVarintEvents(dAtA, i, uint64(size))
+	}
+	i--
+	dAtA[i] = 0x1a
+	{
+		size, err := m.OldAssetStatus.MarshalToSizedBuffer(dAtA[:i])
+		if err != nil {
+			return 0, err
+		}
+		i -= size
+		i = encodeVarintEvents(dAtA, i, uint64(size))
+	}
+	i--
+	dAtA[i] = 0x12
+	if len(m.Sender) > 0 {
+		i -= len(m.Sender)
+		copy(dAtA[i:], m.Sender)
+		i = encodeVarintEvents(dAtA, i, uint64(len(m.Sender)))
+		i--
+		dAtA[i] = 0xa
+	}
+	return len(dAtA) - i, nil
+}
+
+func encodeVarintEvents(dAtA []byte, offset int, v uint64) int {
+	offset -= sovEvents(v)
+	base := offset
+	for v >= 1<<7 {
+		dAtA[offset] = uint8(v&0x7f | 0x80)
+		v >>= 7
+		offset++
+	}
+	dAtA[offset] = uint8(v)
+	return base
+}
+func (m *EventInboundTransfer) Size() (n int) {
+	if m == nil {
+		return 0
+	}
+	var l int
+	_ = l
+	l = len(m.Sender)
+	if l > 0 {
+		n += 1 + l + sovEvents(uint64(l))
+	}
+	l = len(m.DestAddr)
+	if l > 0 {
+		n += 1 + l + sovEvents(uint64(l))
+	}
+	l = m.Asset.Size()
+	n += 1 + l + sovEvents(uint64(l))
+	l = m.Amount.Size()
+	n += 1 + l + sovEvents(uint64(l))
+	return n
+}
+
+func (m *EventOutboundTransfer) Size() (n int) {
+	if m == nil {
+		return 0
+	}
+	var l int
+	_ = l
+	l = len(m.Sender)
+	if l > 0 {
+		n += 1 + l + sovEvents(uint64(l))
+	}
+	l = len(m.DestAddr)
+	if l > 0 {
+		n += 1 + l + sovEvents(uint64(l))
+	}
+	l = m.Asset.Size()
+	n += 1 + l + sovEvents(uint64(l))
+	l = m.Amount.Size()
+	n += 1 + l + sovEvents(uint64(l))
+	return n
+}
+
+func (m *EventUpdateParams) Size() (n int) {
+	if m == nil {
+		return 0
+	}
+	var l int
+	_ = l
+	if len(m.NewSigners) > 0 {
+		for _, s := range m.NewSigners {
+			l = len(s)
+			n += 1 + l + sovEvents(uint64(l))
+		}
+	}
+	if len(m.CreatedSigners) > 0 {
+		for _, s := range m.CreatedSigners {
+			l = len(s)
+			n += 1 + l + sovEvents(uint64(l))
+		}
+	}
+	if len(m.DeletedSigners) > 0 {
+		for _, s := range m.DeletedSigners {
+			l = len(s)
+			n += 1 + l + sovEvents(uint64(l))
+		}
+	}
+	if len(m.NewAssets) > 0 {
+		for _, e := range m.NewAssets {
+			l = e.Size()
+			n += 1 + l + sovEvents(uint64(l))
+		}
+	}
+	if len(m.CreatedAssets) > 0 {
+		for _, e := range m.CreatedAssets {
+			l = e.Size()
+			n += 1 + l + sovEvents(uint64(l))
+		}
+	}
+	if len(m.DeletedAssets) > 0 {
+		for _, e := range m.DeletedAssets {
+			l = e.Size()
+			n += 1 + l + sovEvents(uint64(l))
+		}
+	}
+	return n
+}
+
+func (m *EventChangeAssetStatus) Size() (n int) {
+	if m == nil {
+		return 0
+	}
+	var l int
+	_ = l
+	l = len(m.Sender)
+	if l > 0 {
+		n += 1 + l + sovEvents(uint64(l))
+	}
+	l = m.OldAssetStatus.Size()
+	n += 1 + l + sovEvents(uint64(l))
+	l = m.NewAssetStatus.Size()
+	n += 1 + l + sovEvents(uint64(l))
+	return n
+}
+
+func sovEvents(x uint64) (n int) {
+	return (math_bits.Len64(x|1) + 6) / 7
+}
+func sozEvents(x uint64) (n int) {
+	return sovEvents(uint64((x << 1) ^ uint64((int64(x) >> 63))))
+}
+func (m *EventInboundTransfer) Unmarshal(dAtA []byte) error {
+	l := len(dAtA)
+	iNdEx := 0
+	for iNdEx < l {
+		preIndex := iNdEx
+		var wire uint64
+		for shift := uint(0); ; shift += 7 {
+			if shift >= 64 {
+				return ErrIntOverflowEvents
+			}
+			if iNdEx >= l {
+				return io.ErrUnexpectedEOF
+			}
+			b := dAtA[iNdEx]
+			iNdEx++
+			wire |= uint64(b&0x7F) << shift
+			if b < 0x80 {
+				break
+			}
+		}
+		fieldNum := int32(wire >> 3)
+		wireType := int(wire & 0x7)
+		if wireType == 4 {
+			return fmt.Errorf("proto: EventInboundTransfer: wiretype end group for non-group")
+		}
+		if fieldNum <= 0 {
+			return fmt.Errorf("proto: EventInboundTransfer: illegal tag %d (wire type %d)", fieldNum, wire)
+		}
+		switch fieldNum {
+		case 1:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Sender", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowEvents
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				stringLen |= uint64(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			intStringLen := int(stringLen)
+			if intStringLen < 0 {
+				return ErrInvalidLengthEvents
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex < 0 {
+				return ErrInvalidLengthEvents
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.Sender = string(dAtA[iNdEx:postIndex])
+			iNdEx = postIndex
+		case 2:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field DestAddr", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowEvents
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				stringLen |= uint64(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			intStringLen := int(stringLen)
+			if intStringLen < 0 {
+				return ErrInvalidLengthEvents
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex < 0 {
+				return ErrInvalidLengthEvents
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.DestAddr = string(dAtA[iNdEx:postIndex])
+			iNdEx = postIndex
+		case 3:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Asset", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowEvents
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthEvents
+			}
+			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthEvents
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			if err := m.Asset.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
+		case 4:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Amount", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowEvents
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				stringLen |= uint64(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			intStringLen := int(stringLen)
+			if intStringLen < 0 {
+				return ErrInvalidLengthEvents
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex < 0 {
+				return ErrInvalidLengthEvents
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			if err := m.Amount.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
+		default:
+			iNdEx = preIndex
+			skippy, err := skipEvents(dAtA[iNdEx:])
+			if err != nil {
+				return err
+			}
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
+				return ErrInvalidLengthEvents
+			}
+			if (iNdEx + skippy) > l {
+				return io.ErrUnexpectedEOF
+			}
+			iNdEx += skippy
+		}
+	}
+
+	if iNdEx > l {
+		return io.ErrUnexpectedEOF
+	}
+	return nil
+}
+func (m *EventOutboundTransfer) Unmarshal(dAtA []byte) error {
+	l := len(dAtA)
+	iNdEx := 0
+	for iNdEx < l {
+		preIndex := iNdEx
+		var wire uint64
+		for shift := uint(0); ; shift += 7 {
+			if shift >= 64 {
+				return ErrIntOverflowEvents
+			}
+			if iNdEx >= l {
+				return io.ErrUnexpectedEOF
+			}
+			b := dAtA[iNdEx]
+			iNdEx++
+			wire |= uint64(b&0x7F) << shift
+			if b < 0x80 {
+				break
+			}
+		}
+		fieldNum := int32(wire >> 3)
+		wireType := int(wire & 0x7)
+		if wireType == 4 {
+			return fmt.Errorf("proto: EventOutboundTransfer: wiretype end group for non-group")
+		}
+		if fieldNum <= 0 {
+			return fmt.Errorf("proto: EventOutboundTransfer: illegal tag %d (wire type %d)", fieldNum, wire)
+		}
+		switch fieldNum {
+		case 1:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Sender", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowEvents
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				stringLen |= uint64(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			intStringLen := int(stringLen)
+			if intStringLen < 0 {
+				return ErrInvalidLengthEvents
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex < 0 {
+				return ErrInvalidLengthEvents
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.Sender = string(dAtA[iNdEx:postIndex])
+			iNdEx = postIndex
+		case 2:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field DestAddr", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowEvents
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				stringLen |= uint64(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			intStringLen := int(stringLen)
+			if intStringLen < 0 {
+				return ErrInvalidLengthEvents
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex < 0 {
+				return ErrInvalidLengthEvents
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.DestAddr = string(dAtA[iNdEx:postIndex])
+			iNdEx = postIndex
+		case 3:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Asset", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowEvents
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthEvents
+			}
+			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthEvents
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			if err := m.Asset.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
+		case 4:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Amount", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowEvents
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				stringLen |= uint64(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			intStringLen := int(stringLen)
+			if intStringLen < 0 {
+				return ErrInvalidLengthEvents
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex < 0 {
+				return ErrInvalidLengthEvents
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			if err := m.Amount.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
+		default:
+			iNdEx = preIndex
+			skippy, err := skipEvents(dAtA[iNdEx:])
+			if err != nil {
+				return err
+			}
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
+				return ErrInvalidLengthEvents
+			}
+			if (iNdEx + skippy) > l {
+				return io.ErrUnexpectedEOF
+			}
+			iNdEx += skippy
+		}
+	}
+
+	if iNdEx > l {
+		return io.ErrUnexpectedEOF
+	}
+	return nil
+}
+func (m *EventUpdateParams) Unmarshal(dAtA []byte) error {
+	l := len(dAtA)
+	iNdEx := 0
+	for iNdEx < l {
+		preIndex := iNdEx
+		var wire uint64
+		for shift := uint(0); ; shift += 7 {
+			if shift >= 64 {
+				return ErrIntOverflowEvents
+			}
+			if iNdEx >= l {
+				return io.ErrUnexpectedEOF
+			}
+			b := dAtA[iNdEx]
+			iNdEx++
+			wire |= uint64(b&0x7F) << shift
+			if b < 0x80 {
+				break
+			}
+		}
+		fieldNum := int32(wire >> 3)
+		wireType := int(wire & 0x7)
+		if wireType == 4 {
+			return fmt.Errorf("proto: EventUpdateParams: wiretype end group for non-group")
+		}
+		if fieldNum <= 0 {
+			return fmt.Errorf("proto: EventUpdateParams: illegal tag %d (wire type %d)", fieldNum, wire)
+		}
+		switch fieldNum {
+		case 1:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field NewSigners", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowEvents
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				stringLen |= uint64(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			intStringLen := int(stringLen)
+			if intStringLen < 0 {
+				return ErrInvalidLengthEvents
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex < 0 {
+				return ErrInvalidLengthEvents
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.NewSigners = append(m.NewSigners, string(dAtA[iNdEx:postIndex]))
+			iNdEx = postIndex
+		case 2:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field CreatedSigners", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowEvents
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				stringLen |= uint64(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			intStringLen := int(stringLen)
+			if intStringLen < 0 {
+				return ErrInvalidLengthEvents
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex < 0 {
+				return ErrInvalidLengthEvents
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.CreatedSigners = append(m.CreatedSigners, string(dAtA[iNdEx:postIndex]))
+			iNdEx = postIndex
+		case 3:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field DeletedSigners", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowEvents
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				stringLen |= uint64(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			intStringLen := int(stringLen)
+			if intStringLen < 0 {
+				return ErrInvalidLengthEvents
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex < 0 {
+				return ErrInvalidLengthEvents
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.DeletedSigners = append(m.DeletedSigners, string(dAtA[iNdEx:postIndex]))
+			iNdEx = postIndex
+		case 4:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field NewAssets", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowEvents
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthEvents
+			}
+			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthEvents
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.NewAssets = append(m.NewAssets, AssetWithStatus{})
+			if err := m.NewAssets[len(m.NewAssets)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
+		case 5:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field CreatedAssets", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowEvents
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthEvents
+			}
+			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthEvents
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.CreatedAssets = append(m.CreatedAssets, AssetWithStatus{})
+			if err := m.CreatedAssets[len(m.CreatedAssets)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
+		case 6:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field DeletedAssets", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowEvents
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthEvents
+			}
+			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthEvents
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.DeletedAssets = append(m.DeletedAssets, AssetWithStatus{})
+			if err := m.DeletedAssets[len(m.DeletedAssets)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
+		default:
+			iNdEx = preIndex
+			skippy, err := skipEvents(dAtA[iNdEx:])
+			if err != nil {
+				return err
+			}
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
+				return ErrInvalidLengthEvents
+			}
+			if (iNdEx + skippy) > l {
+				return io.ErrUnexpectedEOF
+			}
+			iNdEx += skippy
+		}
+	}
+
+	if iNdEx > l {
+		return io.ErrUnexpectedEOF
+	}
+	return nil
+}
+func (m *EventChangeAssetStatus) Unmarshal(dAtA []byte) error {
+	l := len(dAtA)
+	iNdEx := 0
+	for iNdEx < l {
+		preIndex := iNdEx
+		var wire uint64
+		for shift := uint(0); ; shift += 7 {
+			if shift >= 64 {
+				return ErrIntOverflowEvents
+			}
+			if iNdEx >= l {
+				return io.ErrUnexpectedEOF
+			}
+			b := dAtA[iNdEx]
+			iNdEx++
+			wire |= uint64(b&0x7F) << shift
+			if b < 0x80 {
+				break
+			}
+		}
+		fieldNum := int32(wire >> 3)
+		wireType := int(wire & 0x7)
+		if wireType == 4 {
+			return fmt.Errorf("proto: EventChangeAssetStatus: wiretype end group for non-group")
+		}
+		if fieldNum <= 0 {
+			return fmt.Errorf("proto: EventChangeAssetStatus: illegal tag %d (wire type %d)", fieldNum, wire)
+		}
+		switch fieldNum {
+		case 1:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Sender", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowEvents
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				stringLen |= uint64(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			intStringLen := int(stringLen)
+			if intStringLen < 0 {
+				return ErrInvalidLengthEvents
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex < 0 {
+				return ErrInvalidLengthEvents
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.Sender = string(dAtA[iNdEx:postIndex])
+			iNdEx = postIndex
+		case 2:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field OldAssetStatus", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowEvents
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthEvents
+			}
+			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthEvents
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			if err := m.OldAssetStatus.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
+		case 3:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field NewAssetStatus", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowEvents
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthEvents
+			}
+			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthEvents
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			if err := m.NewAssetStatus.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
+		default:
+			iNdEx = preIndex
+			skippy, err := skipEvents(dAtA[iNdEx:])
+			if err != nil {
+				return err
+			}
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
+				return ErrInvalidLengthEvents
+			}
+			if (iNdEx + skippy) > l {
+				return io.ErrUnexpectedEOF
+			}
+			iNdEx += skippy
+		}
+	}
+
+	if iNdEx > l {
+		return io.ErrUnexpectedEOF
+	}
+	return nil
+}
+func skipEvents(dAtA []byte) (n int, err error) {
+	l := len(dAtA)
+	iNdEx := 0
+	depth := 0
+	for iNdEx < l {
+		var wire uint64
+		for shift := uint(0); ; shift += 7 {
+			if shift >= 64 {
+				return 0, ErrIntOverflowEvents
+			}
+			if iNdEx >= l {
+				return 0, io.ErrUnexpectedEOF
+			}
+			b := dAtA[iNdEx]
+			iNdEx++
+			wire |= (uint64(b) & 0x7F) << shift
+			if b < 0x80 {
+				break
+			}
+		}
+		wireType := int(wire & 0x7)
+		switch wireType {
+		case 0:
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return 0, ErrIntOverflowEvents
+				}
+				if iNdEx >= l {
+					return 0, io.ErrUnexpectedEOF
+				}
+				iNdEx++
+				if dAtA[iNdEx-1] < 0x80 {
+					break
+				}
+			}
+		case 1:
+			iNdEx += 8
+		case 2:
+			var length int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return 0, ErrIntOverflowEvents
+				}
+				if iNdEx >= l {
+					return 0, io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				length |= (int(b) & 0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if length < 0 {
+				return 0, ErrInvalidLengthEvents
+			}
+			iNdEx += length
+		case 3:
+			depth++
+		case 4:
+			if depth == 0 {
+				return 0, ErrUnexpectedEndOfGroupEvents
+			}
+			depth--
+		case 5:
+			iNdEx += 4
+		default:
+			return 0, fmt.Errorf("proto: illegal wireType %d", wireType)
+		}
+		if iNdEx < 0 {
+			return 0, ErrInvalidLengthEvents
+		}
+		if depth == 0 {
+			return iNdEx, nil
+		}
+	}
+	return 0, io.ErrUnexpectedEOF
+}
+
+var (
+	ErrInvalidLengthEvents        = fmt.Errorf("proto: negative length found during unmarshaling")
+	ErrIntOverflowEvents          = fmt.Errorf("proto: integer overflow")
+	ErrUnexpectedEndOfGroupEvents = fmt.Errorf("proto: unexpected end of group")
+)
diff --git a/x/bridge/types/genesis.pb.go b/x/bridge/types/genesis.pb.go
new file mode 100644
index 00000000000..430cb05244a
--- /dev/null
+++ b/x/bridge/types/genesis.pb.go
@@ -0,0 +1,324 @@
+// Code generated by protoc-gen-gogo. DO NOT EDIT.
+// source: osmosis/bridge/v1beta1/genesis.proto
+
+package types
+
+import (
+	fmt "fmt"
+	_ "github.com/cosmos/gogoproto/gogoproto"
+	proto "github.com/cosmos/gogoproto/proto"
+	io "io"
+	math "math"
+	math_bits "math/bits"
+)
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the proto package it is being compiled against.
+// A compilation error at this line likely means your copy of the
+// proto package needs to be updated.
+const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
+
+// GenesisState defines the mint module's genesis state.
+type GenesisState struct {
+	// Params defines params for x/bridge module.
+	Params Params `protobuf:"bytes,1,opt,name=params,proto3" json:"params"`
+}
+
+func (m *GenesisState) Reset()         { *m = GenesisState{} }
+func (m *GenesisState) String() string { return proto.CompactTextString(m) }
+func (*GenesisState) ProtoMessage()    {}
+func (*GenesisState) Descriptor() ([]byte, []int) {
+	return fileDescriptor_597144059d669411, []int{0}
+}
+func (m *GenesisState) XXX_Unmarshal(b []byte) error {
+	return m.Unmarshal(b)
+}
+func (m *GenesisState) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	if deterministic {
+		return xxx_messageInfo_GenesisState.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalToSizedBuffer(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
+	}
+}
+func (m *GenesisState) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GenesisState.Merge(m, src)
+}
+func (m *GenesisState) XXX_Size() int {
+	return m.Size()
+}
+func (m *GenesisState) XXX_DiscardUnknown() {
+	xxx_messageInfo_GenesisState.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GenesisState proto.InternalMessageInfo
+
+func (m *GenesisState) GetParams() Params {
+	if m != nil {
+		return m.Params
+	}
+	return Params{}
+}
+
+func init() {
+	proto.RegisterType((*GenesisState)(nil), "osmosis.bridge.v1beta1.GenesisState")
+}
+
+func init() {
+	proto.RegisterFile("osmosis/bridge/v1beta1/genesis.proto", fileDescriptor_597144059d669411)
+}
+
+var fileDescriptor_597144059d669411 = []byte{
+	// 208 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0xc9, 0x2f, 0xce, 0xcd,
+	0x2f, 0xce, 0x2c, 0xd6, 0x4f, 0x2a, 0xca, 0x4c, 0x49, 0x4f, 0xd5, 0x2f, 0x33, 0x4c, 0x4a, 0x2d,
+	0x49, 0x34, 0xd4, 0x4f, 0x4f, 0xcd, 0x4b, 0x2d, 0xce, 0x2c, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9,
+	0x17, 0x12, 0x83, 0xaa, 0xd2, 0x83, 0xa8, 0xd2, 0x83, 0xaa, 0x92, 0x12, 0x49, 0xcf, 0x4f, 0xcf,
+	0x07, 0x2b, 0xd1, 0x07, 0xb1, 0x20, 0xaa, 0xa5, 0x94, 0x71, 0x98, 0x09, 0xd5, 0x0c, 0x56, 0xa4,
+	0xe4, 0xc3, 0xc5, 0xe3, 0x0e, 0xb1, 0x23, 0xb8, 0x24, 0xb1, 0x24, 0x55, 0xc8, 0x86, 0x8b, 0xad,
+	0x20, 0xb1, 0x28, 0x31, 0xb7, 0x58, 0x82, 0x51, 0x81, 0x51, 0x83, 0xdb, 0x48, 0x4e, 0x0f, 0xbb,
+	0x9d, 0x7a, 0x01, 0x60, 0x55, 0x4e, 0x2c, 0x27, 0xee, 0xc9, 0x33, 0x04, 0x41, 0xf5, 0x38, 0xf9,
+	0x9c, 0x78, 0x24, 0xc7, 0x78, 0xe1, 0x91, 0x1c, 0xe3, 0x83, 0x47, 0x72, 0x8c, 0x13, 0x1e, 0xcb,
+	0x31, 0x5c, 0x78, 0x2c, 0xc7, 0x70, 0xe3, 0xb1, 0x1c, 0x43, 0x94, 0x51, 0x7a, 0x66, 0x49, 0x46,
+	0x69, 0x92, 0x5e, 0x72, 0x7e, 0xae, 0x3e, 0xd4, 0x44, 0xdd, 0x9c, 0xc4, 0xa4, 0x62, 0x18, 0x47,
+	0xbf, 0xcc, 0xc8, 0x58, 0xbf, 0x02, 0xe6, 0xd4, 0x92, 0xca, 0x82, 0xd4, 0xe2, 0x24, 0x36, 0xb0,
+	0x13, 0x8d, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0xab, 0xd8, 0xd8, 0x14, 0x1d, 0x01, 0x00, 0x00,
+}
+
+func (m *GenesisState) Marshal() (dAtA []byte, err error) {
+	size := m.Size()
+	dAtA = make([]byte, size)
+	n, err := m.MarshalToSizedBuffer(dAtA[:size])
+	if err != nil {
+		return nil, err
+	}
+	return dAtA[:n], nil
+}
+
+func (m *GenesisState) MarshalTo(dAtA []byte) (int, error) {
+	size := m.Size()
+	return m.MarshalToSizedBuffer(dAtA[:size])
+}
+
+func (m *GenesisState) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+	i := len(dAtA)
+	_ = i
+	var l int
+	_ = l
+	{
+		size, err := m.Params.MarshalToSizedBuffer(dAtA[:i])
+		if err != nil {
+			return 0, err
+		}
+		i -= size
+		i = encodeVarintGenesis(dAtA, i, uint64(size))
+	}
+	i--
+	dAtA[i] = 0xa
+	return len(dAtA) - i, nil
+}
+
+func encodeVarintGenesis(dAtA []byte, offset int, v uint64) int {
+	offset -= sovGenesis(v)
+	base := offset
+	for v >= 1<<7 {
+		dAtA[offset] = uint8(v&0x7f | 0x80)
+		v >>= 7
+		offset++
+	}
+	dAtA[offset] = uint8(v)
+	return base
+}
+func (m *GenesisState) Size() (n int) {
+	if m == nil {
+		return 0
+	}
+	var l int
+	_ = l
+	l = m.Params.Size()
+	n += 1 + l + sovGenesis(uint64(l))
+	return n
+}
+
+func sovGenesis(x uint64) (n int) {
+	return (math_bits.Len64(x|1) + 6) / 7
+}
+func sozGenesis(x uint64) (n int) {
+	return sovGenesis(uint64((x << 1) ^ uint64((int64(x) >> 63))))
+}
+func (m *GenesisState) Unmarshal(dAtA []byte) error {
+	l := len(dAtA)
+	iNdEx := 0
+	for iNdEx < l {
+		preIndex := iNdEx
+		var wire uint64
+		for shift := uint(0); ; shift += 7 {
+			if shift >= 64 {
+				return ErrIntOverflowGenesis
+			}
+			if iNdEx >= l {
+				return io.ErrUnexpectedEOF
+			}
+			b := dAtA[iNdEx]
+			iNdEx++
+			wire |= uint64(b&0x7F) << shift
+			if b < 0x80 {
+				break
+			}
+		}
+		fieldNum := int32(wire >> 3)
+		wireType := int(wire & 0x7)
+		if wireType == 4 {
+			return fmt.Errorf("proto: GenesisState: wiretype end group for non-group")
+		}
+		if fieldNum <= 0 {
+			return fmt.Errorf("proto: GenesisState: illegal tag %d (wire type %d)", fieldNum, wire)
+		}
+		switch fieldNum {
+		case 1:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Params", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowGenesis
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthGenesis
+			}
+			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthGenesis
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			if err := m.Params.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
+		default:
+			iNdEx = preIndex
+			skippy, err := skipGenesis(dAtA[iNdEx:])
+			if err != nil {
+				return err
+			}
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
+				return ErrInvalidLengthGenesis
+			}
+			if (iNdEx + skippy) > l {
+				return io.ErrUnexpectedEOF
+			}
+			iNdEx += skippy
+		}
+	}
+
+	if iNdEx > l {
+		return io.ErrUnexpectedEOF
+	}
+	return nil
+}
+func skipGenesis(dAtA []byte) (n int, err error) {
+	l := len(dAtA)
+	iNdEx := 0
+	depth := 0
+	for iNdEx < l {
+		var wire uint64
+		for shift := uint(0); ; shift += 7 {
+			if shift >= 64 {
+				return 0, ErrIntOverflowGenesis
+			}
+			if iNdEx >= l {
+				return 0, io.ErrUnexpectedEOF
+			}
+			b := dAtA[iNdEx]
+			iNdEx++
+			wire |= (uint64(b) & 0x7F) << shift
+			if b < 0x80 {
+				break
+			}
+		}
+		wireType := int(wire & 0x7)
+		switch wireType {
+		case 0:
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return 0, ErrIntOverflowGenesis
+				}
+				if iNdEx >= l {
+					return 0, io.ErrUnexpectedEOF
+				}
+				iNdEx++
+				if dAtA[iNdEx-1] < 0x80 {
+					break
+				}
+			}
+		case 1:
+			iNdEx += 8
+		case 2:
+			var length int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return 0, ErrIntOverflowGenesis
+				}
+				if iNdEx >= l {
+					return 0, io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				length |= (int(b) & 0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if length < 0 {
+				return 0, ErrInvalidLengthGenesis
+			}
+			iNdEx += length
+		case 3:
+			depth++
+		case 4:
+			if depth == 0 {
+				return 0, ErrUnexpectedEndOfGroupGenesis
+			}
+			depth--
+		case 5:
+			iNdEx += 4
+		default:
+			return 0, fmt.Errorf("proto: illegal wireType %d", wireType)
+		}
+		if iNdEx < 0 {
+			return 0, ErrInvalidLengthGenesis
+		}
+		if depth == 0 {
+			return iNdEx, nil
+		}
+	}
+	return 0, io.ErrUnexpectedEOF
+}
+
+var (
+	ErrInvalidLengthGenesis        = fmt.Errorf("proto: negative length found during unmarshaling")
+	ErrIntOverflowGenesis          = fmt.Errorf("proto: integer overflow")
+	ErrUnexpectedEndOfGroupGenesis = fmt.Errorf("proto: unexpected end of group")
+)
diff --git a/x/bridge/types/query.pb.go b/x/bridge/types/query.pb.go
new file mode 100644
index 00000000000..83285cc026a
--- /dev/null
+++ b/x/bridge/types/query.pb.go
@@ -0,0 +1,537 @@
+// Code generated by protoc-gen-gogo. DO NOT EDIT.
+// source: osmosis/bridge/v1beta1/query.proto
+
+package types
+
+import (
+	context "context"
+	fmt "fmt"
+	_ "github.com/cosmos/gogoproto/gogoproto"
+	grpc1 "github.com/cosmos/gogoproto/grpc"
+	proto "github.com/cosmos/gogoproto/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	grpc "google.golang.org/grpc"
+	codes "google.golang.org/grpc/codes"
+	status "google.golang.org/grpc/status"
+	io "io"
+	math "math"
+	math_bits "math/bits"
+)
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the proto package it is being compiled against.
+// A compilation error at this line likely means your copy of the
+// proto package needs to be updated.
+const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
+
+// QueryParamsRequest is the request type for the Query/Params RPC method.
+type QueryParamsRequest struct {
+}
+
+func (m *QueryParamsRequest) Reset()         { *m = QueryParamsRequest{} }
+func (m *QueryParamsRequest) String() string { return proto.CompactTextString(m) }
+func (*QueryParamsRequest) ProtoMessage()    {}
+func (*QueryParamsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_05fd16bccc7396b4, []int{0}
+}
+func (m *QueryParamsRequest) XXX_Unmarshal(b []byte) error {
+	return m.Unmarshal(b)
+}
+func (m *QueryParamsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	if deterministic {
+		return xxx_messageInfo_QueryParamsRequest.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalToSizedBuffer(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
+	}
+}
+func (m *QueryParamsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_QueryParamsRequest.Merge(m, src)
+}
+func (m *QueryParamsRequest) XXX_Size() int {
+	return m.Size()
+}
+func (m *QueryParamsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_QueryParamsRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_QueryParamsRequest proto.InternalMessageInfo
+
+// QueryParamsResponse is the response type for the Query/Params RPC method.
+type QueryParamsResponse struct {
+	Params Params `protobuf:"bytes,1,opt,name=params,proto3" json:"params" yaml:"params"`
+}
+
+func (m *QueryParamsResponse) Reset()         { *m = QueryParamsResponse{} }
+func (m *QueryParamsResponse) String() string { return proto.CompactTextString(m) }
+func (*QueryParamsResponse) ProtoMessage()    {}
+func (*QueryParamsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_05fd16bccc7396b4, []int{1}
+}
+func (m *QueryParamsResponse) XXX_Unmarshal(b []byte) error {
+	return m.Unmarshal(b)
+}
+func (m *QueryParamsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	if deterministic {
+		return xxx_messageInfo_QueryParamsResponse.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalToSizedBuffer(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
+	}
+}
+func (m *QueryParamsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_QueryParamsResponse.Merge(m, src)
+}
+func (m *QueryParamsResponse) XXX_Size() int {
+	return m.Size()
+}
+func (m *QueryParamsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_QueryParamsResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_QueryParamsResponse proto.InternalMessageInfo
+
+func (m *QueryParamsResponse) GetParams() Params {
+	if m != nil {
+		return m.Params
+	}
+	return Params{}
+}
+
+func init() {
+	proto.RegisterType((*QueryParamsRequest)(nil), "osmosis.bridge.v1beta1.QueryParamsRequest")
+	proto.RegisterType((*QueryParamsResponse)(nil), "osmosis.bridge.v1beta1.QueryParamsResponse")
+}
+
+func init() {
+	proto.RegisterFile("osmosis/bridge/v1beta1/query.proto", fileDescriptor_05fd16bccc7396b4)
+}
+
+var fileDescriptor_05fd16bccc7396b4 = []byte{
+	// 302 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0xca, 0x2f, 0xce, 0xcd,
+	0x2f, 0xce, 0x2c, 0xd6, 0x4f, 0x2a, 0xca, 0x4c, 0x49, 0x4f, 0xd5, 0x2f, 0x33, 0x4c, 0x4a, 0x2d,
+	0x49, 0x34, 0xd4, 0x2f, 0x2c, 0x4d, 0x2d, 0xaa, 0xd4, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12,
+	0x83, 0xaa, 0xd1, 0x83, 0xa8, 0xd1, 0x83, 0xaa, 0x91, 0x12, 0x49, 0xcf, 0x4f, 0xcf, 0x07, 0x2b,
+	0xd1, 0x07, 0xb1, 0x20, 0xaa, 0xa5, 0x64, 0xd2, 0xf3, 0xf3, 0xd3, 0x73, 0x52, 0xf5, 0x13, 0x0b,
+	0x32, 0xf5, 0x13, 0xf3, 0xf2, 0xf2, 0x4b, 0x12, 0x4b, 0x32, 0xf3, 0xf3, 0x8a, 0xa1, 0xb2, 0xca,
+	0x38, 0xec, 0x83, 0x1a, 0x0d, 0x56, 0xa4, 0x24, 0xc2, 0x25, 0x14, 0x08, 0xb2, 0x3f, 0x20, 0xb1,
+	0x28, 0x31, 0xb7, 0x38, 0x28, 0xb5, 0xb0, 0x34, 0xb5, 0xb8, 0x44, 0x29, 0x85, 0x4b, 0x18, 0x45,
+	0xb4, 0xb8, 0x20, 0x3f, 0xaf, 0x38, 0x55, 0xc8, 0x97, 0x8b, 0xad, 0x00, 0x2c, 0x22, 0xc1, 0xa8,
+	0xc0, 0xa8, 0xc1, 0x6d, 0x24, 0xa7, 0x87, 0xdd, 0xb9, 0x7a, 0x10, 0x7d, 0x4e, 0xa2, 0x27, 0xee,
+	0xc9, 0x33, 0x7c, 0xba, 0x27, 0xcf, 0x5b, 0x99, 0x98, 0x9b, 0x63, 0xa5, 0x04, 0xd1, 0xab, 0x14,
+	0x04, 0x35, 0xc4, 0x68, 0x32, 0x23, 0x17, 0x2b, 0xd8, 0x1a, 0xa1, 0x4e, 0x46, 0x2e, 0x36, 0x88,
+	0x1e, 0x21, 0x2d, 0x5c, 0x66, 0x62, 0x3a, 0x53, 0x4a, 0x9b, 0x28, 0xb5, 0x10, 0xc7, 0x2b, 0xa9,
+	0x35, 0x5d, 0x7e, 0x32, 0x99, 0x49, 0x41, 0x48, 0x4e, 0x1f, 0x47, 0xb8, 0x40, 0x5c, 0xe5, 0xe4,
+	0x73, 0xe2, 0x91, 0x1c, 0xe3, 0x85, 0x47, 0x72, 0x8c, 0x0f, 0x1e, 0xc9, 0x31, 0x4e, 0x78, 0x2c,
+	0xc7, 0x70, 0xe1, 0xb1, 0x1c, 0xc3, 0x8d, 0xc7, 0x72, 0x0c, 0x51, 0x46, 0xe9, 0x99, 0x25, 0x19,
+	0xa5, 0x49, 0x7a, 0xc9, 0xf9, 0xb9, 0x30, 0x33, 0x74, 0x73, 0x12, 0x93, 0x8a, 0xe1, 0x06, 0x96,
+	0x19, 0x19, 0xeb, 0x57, 0xc0, 0x8c, 0x2d, 0xa9, 0x2c, 0x48, 0x2d, 0x4e, 0x62, 0x03, 0x07, 0xb3,
+	0x31, 0x20, 0x00, 0x00, 0xff, 0xff, 0xef, 0x43, 0x48, 0x0e, 0xfd, 0x01, 0x00, 0x00,
+}
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ context.Context
+var _ grpc.ClientConn
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the grpc package it is being compiled against.
+const _ = grpc.SupportPackageIsVersion4
+
+// QueryClient is the client API for Query service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
+type QueryClient interface {
+	// Params returns x/bridge module params.
+	Params(ctx context.Context, in *QueryParamsRequest, opts ...grpc.CallOption) (*QueryParamsResponse, error)
+}
+
+type queryClient struct {
+	cc grpc1.ClientConn
+}
+
+func NewQueryClient(cc grpc1.ClientConn) QueryClient {
+	return &queryClient{cc}
+}
+
+func (c *queryClient) Params(ctx context.Context, in *QueryParamsRequest, opts ...grpc.CallOption) (*QueryParamsResponse, error) {
+	out := new(QueryParamsResponse)
+	err := c.cc.Invoke(ctx, "/osmosis.bridge.v1beta1.Query/Params", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+// QueryServer is the server API for Query service.
+type QueryServer interface {
+	// Params returns x/bridge module params.
+	Params(context.Context, *QueryParamsRequest) (*QueryParamsResponse, error)
+}
+
+// UnimplementedQueryServer can be embedded to have forward compatible implementations.
+type UnimplementedQueryServer struct {
+}
+
+func (*UnimplementedQueryServer) Params(ctx context.Context, req *QueryParamsRequest) (*QueryParamsResponse, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method Params not implemented")
+}
+
+func RegisterQueryServer(s grpc1.Server, srv QueryServer) {
+	s.RegisterService(&_Query_serviceDesc, srv)
+}
+
+func _Query_Params_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(QueryParamsRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(QueryServer).Params(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/osmosis.bridge.v1beta1.Query/Params",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(QueryServer).Params(ctx, req.(*QueryParamsRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+var _Query_serviceDesc = grpc.ServiceDesc{
+	ServiceName: "osmosis.bridge.v1beta1.Query",
+	HandlerType: (*QueryServer)(nil),
+	Methods: []grpc.MethodDesc{
+		{
+			MethodName: "Params",
+			Handler:    _Query_Params_Handler,
+		},
+	},
+	Streams:  []grpc.StreamDesc{},
+	Metadata: "osmosis/bridge/v1beta1/query.proto",
+}
+
+func (m *QueryParamsRequest) Marshal() (dAtA []byte, err error) {
+	size := m.Size()
+	dAtA = make([]byte, size)
+	n, err := m.MarshalToSizedBuffer(dAtA[:size])
+	if err != nil {
+		return nil, err
+	}
+	return dAtA[:n], nil
+}
+
+func (m *QueryParamsRequest) MarshalTo(dAtA []byte) (int, error) {
+	size := m.Size()
+	return m.MarshalToSizedBuffer(dAtA[:size])
+}
+
+func (m *QueryParamsRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+	i := len(dAtA)
+	_ = i
+	var l int
+	_ = l
+	return len(dAtA) - i, nil
+}
+
+func (m *QueryParamsResponse) Marshal() (dAtA []byte, err error) {
+	size := m.Size()
+	dAtA = make([]byte, size)
+	n, err := m.MarshalToSizedBuffer(dAtA[:size])
+	if err != nil {
+		return nil, err
+	}
+	return dAtA[:n], nil
+}
+
+func (m *QueryParamsResponse) MarshalTo(dAtA []byte) (int, error) {
+	size := m.Size()
+	return m.MarshalToSizedBuffer(dAtA[:size])
+}
+
+func (m *QueryParamsResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+	i := len(dAtA)
+	_ = i
+	var l int
+	_ = l
+	{
+		size, err := m.Params.MarshalToSizedBuffer(dAtA[:i])
+		if err != nil {
+			return 0, err
+		}
+		i -= size
+		i = encodeVarintQuery(dAtA, i, uint64(size))
+	}
+	i--
+	dAtA[i] = 0xa
+	return len(dAtA) - i, nil
+}
+
+func encodeVarintQuery(dAtA []byte, offset int, v uint64) int {
+	offset -= sovQuery(v)
+	base := offset
+	for v >= 1<<7 {
+		dAtA[offset] = uint8(v&0x7f | 0x80)
+		v >>= 7
+		offset++
+	}
+	dAtA[offset] = uint8(v)
+	return base
+}
+func (m *QueryParamsRequest) Size() (n int) {
+	if m == nil {
+		return 0
+	}
+	var l int
+	_ = l
+	return n
+}
+
+func (m *QueryParamsResponse) Size() (n int) {
+	if m == nil {
+		return 0
+	}
+	var l int
+	_ = l
+	l = m.Params.Size()
+	n += 1 + l + sovQuery(uint64(l))
+	return n
+}
+
+func sovQuery(x uint64) (n int) {
+	return (math_bits.Len64(x|1) + 6) / 7
+}
+func sozQuery(x uint64) (n int) {
+	return sovQuery(uint64((x << 1) ^ uint64((int64(x) >> 63))))
+}
+func (m *QueryParamsRequest) Unmarshal(dAtA []byte) error {
+	l := len(dAtA)
+	iNdEx := 0
+	for iNdEx < l {
+		preIndex := iNdEx
+		var wire uint64
+		for shift := uint(0); ; shift += 7 {
+			if shift >= 64 {
+				return ErrIntOverflowQuery
+			}
+			if iNdEx >= l {
+				return io.ErrUnexpectedEOF
+			}
+			b := dAtA[iNdEx]
+			iNdEx++
+			wire |= uint64(b&0x7F) << shift
+			if b < 0x80 {
+				break
+			}
+		}
+		fieldNum := int32(wire >> 3)
+		wireType := int(wire & 0x7)
+		if wireType == 4 {
+			return fmt.Errorf("proto: QueryParamsRequest: wiretype end group for non-group")
+		}
+		if fieldNum <= 0 {
+			return fmt.Errorf("proto: QueryParamsRequest: illegal tag %d (wire type %d)", fieldNum, wire)
+		}
+		switch fieldNum {
+		default:
+			iNdEx = preIndex
+			skippy, err := skipQuery(dAtA[iNdEx:])
+			if err != nil {
+				return err
+			}
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
+				return ErrInvalidLengthQuery
+			}
+			if (iNdEx + skippy) > l {
+				return io.ErrUnexpectedEOF
+			}
+			iNdEx += skippy
+		}
+	}
+
+	if iNdEx > l {
+		return io.ErrUnexpectedEOF
+	}
+	return nil
+}
+func (m *QueryParamsResponse) Unmarshal(dAtA []byte) error {
+	l := len(dAtA)
+	iNdEx := 0
+	for iNdEx < l {
+		preIndex := iNdEx
+		var wire uint64
+		for shift := uint(0); ; shift += 7 {
+			if shift >= 64 {
+				return ErrIntOverflowQuery
+			}
+			if iNdEx >= l {
+				return io.ErrUnexpectedEOF
+			}
+			b := dAtA[iNdEx]
+			iNdEx++
+			wire |= uint64(b&0x7F) << shift
+			if b < 0x80 {
+				break
+			}
+		}
+		fieldNum := int32(wire >> 3)
+		wireType := int(wire & 0x7)
+		if wireType == 4 {
+			return fmt.Errorf("proto: QueryParamsResponse: wiretype end group for non-group")
+		}
+		if fieldNum <= 0 {
+			return fmt.Errorf("proto: QueryParamsResponse: illegal tag %d (wire type %d)", fieldNum, wire)
+		}
+		switch fieldNum {
+		case 1:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Params", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowQuery
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthQuery
+			}
+			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthQuery
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			if err := m.Params.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
+		default:
+			iNdEx = preIndex
+			skippy, err := skipQuery(dAtA[iNdEx:])
+			if err != nil {
+				return err
+			}
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
+				return ErrInvalidLengthQuery
+			}
+			if (iNdEx + skippy) > l {
+				return io.ErrUnexpectedEOF
+			}
+			iNdEx += skippy
+		}
+	}
+
+	if iNdEx > l {
+		return io.ErrUnexpectedEOF
+	}
+	return nil
+}
+func skipQuery(dAtA []byte) (n int, err error) {
+	l := len(dAtA)
+	iNdEx := 0
+	depth := 0
+	for iNdEx < l {
+		var wire uint64
+		for shift := uint(0); ; shift += 7 {
+			if shift >= 64 {
+				return 0, ErrIntOverflowQuery
+			}
+			if iNdEx >= l {
+				return 0, io.ErrUnexpectedEOF
+			}
+			b := dAtA[iNdEx]
+			iNdEx++
+			wire |= (uint64(b) & 0x7F) << shift
+			if b < 0x80 {
+				break
+			}
+		}
+		wireType := int(wire & 0x7)
+		switch wireType {
+		case 0:
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return 0, ErrIntOverflowQuery
+				}
+				if iNdEx >= l {
+					return 0, io.ErrUnexpectedEOF
+				}
+				iNdEx++
+				if dAtA[iNdEx-1] < 0x80 {
+					break
+				}
+			}
+		case 1:
+			iNdEx += 8
+		case 2:
+			var length int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return 0, ErrIntOverflowQuery
+				}
+				if iNdEx >= l {
+					return 0, io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				length |= (int(b) & 0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if length < 0 {
+				return 0, ErrInvalidLengthQuery
+			}
+			iNdEx += length
+		case 3:
+			depth++
+		case 4:
+			if depth == 0 {
+				return 0, ErrUnexpectedEndOfGroupQuery
+			}
+			depth--
+		case 5:
+			iNdEx += 4
+		default:
+			return 0, fmt.Errorf("proto: illegal wireType %d", wireType)
+		}
+		if iNdEx < 0 {
+			return 0, ErrInvalidLengthQuery
+		}
+		if depth == 0 {
+			return iNdEx, nil
+		}
+	}
+	return 0, io.ErrUnexpectedEOF
+}
+
+var (
+	ErrInvalidLengthQuery        = fmt.Errorf("proto: negative length found during unmarshaling")
+	ErrIntOverflowQuery          = fmt.Errorf("proto: integer overflow")
+	ErrUnexpectedEndOfGroupQuery = fmt.Errorf("proto: unexpected end of group")
+)
diff --git a/x/bridge/types/query.pb.gw.go b/x/bridge/types/query.pb.gw.go
new file mode 100644
index 00000000000..0b136e32836
--- /dev/null
+++ b/x/bridge/types/query.pb.gw.go
@@ -0,0 +1,153 @@
+// Code generated by protoc-gen-grpc-gateway. DO NOT EDIT.
+// source: osmosis/bridge/v1beta1/query.proto
+
+/*
+Package types is a reverse proxy.
+
+It translates gRPC into RESTful JSON APIs.
+*/
+package types
+
+import (
+	"context"
+	"io"
+	"net/http"
+
+	"github.com/golang/protobuf/descriptor"
+	"github.com/golang/protobuf/proto"
+	"github.com/grpc-ecosystem/grpc-gateway/runtime"
+	"github.com/grpc-ecosystem/grpc-gateway/utilities"
+	"google.golang.org/grpc"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/grpclog"
+	"google.golang.org/grpc/metadata"
+	"google.golang.org/grpc/status"
+)
+
+// Suppress "imported and not used" errors
+var _ codes.Code
+var _ io.Reader
+var _ status.Status
+var _ = runtime.String
+var _ = utilities.NewDoubleArray
+var _ = descriptor.ForMessage
+var _ = metadata.Join
+
+func request_Query_Params_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
+	var protoReq QueryParamsRequest
+	var metadata runtime.ServerMetadata
+
+	msg, err := client.Params(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
+	return msg, metadata, err
+
+}
+
+func local_request_Query_Params_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
+	var protoReq QueryParamsRequest
+	var metadata runtime.ServerMetadata
+
+	msg, err := server.Params(ctx, &protoReq)
+	return msg, metadata, err
+
+}
+
+// RegisterQueryHandlerServer registers the http handlers for service Query to "mux".
+// UnaryRPC     :call QueryServer directly.
+// StreamingRPC :currently unsupported pending https://github.com/grpc/grpc-go/issues/906.
+// Note that using this registration option will cause many gRPC library features to stop working. Consider using RegisterQueryHandlerFromEndpoint instead.
+func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, server QueryServer) error {
+
+	mux.Handle("GET", pattern_Query_Params_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+		ctx, cancel := context.WithCancel(req.Context())
+		defer cancel()
+		var stream runtime.ServerTransportStream
+		ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)
+		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
+		rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req)
+		if err != nil {
+			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
+			return
+		}
+		resp, md, err := local_request_Query_Params_0(rctx, inboundMarshaler, server, req, pathParams)
+		md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())
+		ctx = runtime.NewServerMetadataContext(ctx, md)
+		if err != nil {
+			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
+			return
+		}
+
+		forward_Query_Params_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+
+	})
+
+	return nil
+}
+
+// RegisterQueryHandlerFromEndpoint is same as RegisterQueryHandler but
+// automatically dials to "endpoint" and closes the connection when "ctx" gets done.
+func RegisterQueryHandlerFromEndpoint(ctx context.Context, mux *runtime.ServeMux, endpoint string, opts []grpc.DialOption) (err error) {
+	conn, err := grpc.Dial(endpoint, opts...)
+	if err != nil {
+		return err
+	}
+	defer func() {
+		if err != nil {
+			if cerr := conn.Close(); cerr != nil {
+				grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr)
+			}
+			return
+		}
+		go func() {
+			<-ctx.Done()
+			if cerr := conn.Close(); cerr != nil {
+				grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr)
+			}
+		}()
+	}()
+
+	return RegisterQueryHandler(ctx, mux, conn)
+}
+
+// RegisterQueryHandler registers the http handlers for service Query to "mux".
+// The handlers forward requests to the grpc endpoint over "conn".
+func RegisterQueryHandler(ctx context.Context, mux *runtime.ServeMux, conn *grpc.ClientConn) error {
+	return RegisterQueryHandlerClient(ctx, mux, NewQueryClient(conn))
+}
+
+// RegisterQueryHandlerClient registers the http handlers for service Query
+// to "mux". The handlers forward requests to the grpc endpoint over the given implementation of "QueryClient".
+// Note: the gRPC framework executes interceptors within the gRPC handler. If the passed in "QueryClient"
+// doesn't go through the normal gRPC flow (creating a gRPC client etc.) then it will be up to the passed in
+// "QueryClient" to call the correct interceptors.
+func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, client QueryClient) error {
+
+	mux.Handle("GET", pattern_Query_Params_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+		ctx, cancel := context.WithCancel(req.Context())
+		defer cancel()
+		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
+		rctx, err := runtime.AnnotateContext(ctx, mux, req)
+		if err != nil {
+			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
+			return
+		}
+		resp, md, err := request_Query_Params_0(rctx, inboundMarshaler, client, req, pathParams)
+		ctx = runtime.NewServerMetadataContext(ctx, md)
+		if err != nil {
+			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
+			return
+		}
+
+		forward_Query_Params_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+
+	})
+
+	return nil
+}
+
+var (
+	pattern_Query_Params_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"osmosis", "bridge", "v1beta1", "params"}, "", runtime.AssumeColonVerbOpt(false)))
+)
+
+var (
+	forward_Query_Params_0 = runtime.ForwardResponseMessage
+)
diff --git a/x/bridge/types/tx.pb.go b/x/bridge/types/tx.pb.go
new file mode 100644
index 00000000000..ec9830618c8
--- /dev/null
+++ b/x/bridge/types/tx.pb.go
@@ -0,0 +1,1973 @@
+// Code generated by protoc-gen-gogo. DO NOT EDIT.
+// source: osmosis/bridge/v1beta1/tx.proto
+
+package types
+
+import (
+	context "context"
+	cosmossdk_io_math "cosmossdk.io/math"
+	fmt "fmt"
+	_ "github.com/cosmos/cosmos-sdk/types"
+	_ "github.com/cosmos/cosmos-sdk/types/tx/amino"
+	_ "github.com/cosmos/gogoproto/gogoproto"
+	grpc1 "github.com/cosmos/gogoproto/grpc"
+	proto "github.com/cosmos/gogoproto/proto"
+	grpc "google.golang.org/grpc"
+	codes "google.golang.org/grpc/codes"
+	status "google.golang.org/grpc/status"
+	io "io"
+	math "math"
+	math_bits "math/bits"
+)
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the proto package it is being compiled against.
+// A compilation error at this line likely means your copy of the
+// proto package needs to be updated.
+const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
+
+// MsgInboundTransfer defines the message structure for the InboundTransfer gRPC
+// service method. It allows a sender to perform an inbound cross-chain
+// transfer, i.e., to transfer their tokens from the source chain to Osmosis and
+// get the equivalent amount of the corresponding token (specified in subdenom)
+// on Osmosis in return. The tokens are minted through the x/tokenfactory module
+// to the destination address.
+type MsgInboundTransfer struct {
+	// Sender is a sender's address
+	Sender string `protobuf:"bytes,1,opt,name=sender,proto3" json:"sender,omitempty" yaml:"sender"`
+	// DestAddr is a destination Osmosis address
+	DestAddr string `protobuf:"bytes,2,opt,name=dest_addr,json=destAddr,proto3" json:"dest_addr,omitempty" yaml:"dest_addr"`
+	// Asset contains a source chain and a target denom
+	Asset Asset `protobuf:"bytes,3,opt,name=asset,proto3" json:"asset" yaml:"asset"`
+	// Amount of coins to transfer
+	Amount cosmossdk_io_math.Int `protobuf:"bytes,4,opt,name=amount,proto3,customtype=cosmossdk.io/math.Int" json:"amount" yaml:"amount"`
+}
+
+func (m *MsgInboundTransfer) Reset()         { *m = MsgInboundTransfer{} }
+func (m *MsgInboundTransfer) String() string { return proto.CompactTextString(m) }
+func (*MsgInboundTransfer) ProtoMessage()    {}
+func (*MsgInboundTransfer) Descriptor() ([]byte, []int) {
+	return fileDescriptor_8e478e3238c885a8, []int{0}
+}
+func (m *MsgInboundTransfer) XXX_Unmarshal(b []byte) error {
+	return m.Unmarshal(b)
+}
+func (m *MsgInboundTransfer) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	if deterministic {
+		return xxx_messageInfo_MsgInboundTransfer.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalToSizedBuffer(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
+	}
+}
+func (m *MsgInboundTransfer) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MsgInboundTransfer.Merge(m, src)
+}
+func (m *MsgInboundTransfer) XXX_Size() int {
+	return m.Size()
+}
+func (m *MsgInboundTransfer) XXX_DiscardUnknown() {
+	xxx_messageInfo_MsgInboundTransfer.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_MsgInboundTransfer proto.InternalMessageInfo
+
+func (m *MsgInboundTransfer) GetSender() string {
+	if m != nil {
+		return m.Sender
+	}
+	return ""
+}
+
+func (m *MsgInboundTransfer) GetDestAddr() string {
+	if m != nil {
+		return m.DestAddr
+	}
+	return ""
+}
+
+func (m *MsgInboundTransfer) GetAsset() Asset {
+	if m != nil {
+		return m.Asset
+	}
+	return Asset{}
+}
+
+type MsgInboundTransferResponse struct {
+}
+
+func (m *MsgInboundTransferResponse) Reset()         { *m = MsgInboundTransferResponse{} }
+func (m *MsgInboundTransferResponse) String() string { return proto.CompactTextString(m) }
+func (*MsgInboundTransferResponse) ProtoMessage()    {}
+func (*MsgInboundTransferResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_8e478e3238c885a8, []int{1}
+}
+func (m *MsgInboundTransferResponse) XXX_Unmarshal(b []byte) error {
+	return m.Unmarshal(b)
+}
+func (m *MsgInboundTransferResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	if deterministic {
+		return xxx_messageInfo_MsgInboundTransferResponse.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalToSizedBuffer(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
+	}
+}
+func (m *MsgInboundTransferResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MsgInboundTransferResponse.Merge(m, src)
+}
+func (m *MsgInboundTransferResponse) XXX_Size() int {
+	return m.Size()
+}
+func (m *MsgInboundTransferResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_MsgInboundTransferResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_MsgInboundTransferResponse proto.InternalMessageInfo
+
+// MsgOutboundTransfer defines the message structure for the OutboundTransfer
+// gRPC service method. It allows a sender to perform an outbound cross-chain
+// transfer, i.e., to transfer their tokens from Osmosis to the destination
+// chain. The tokens are burned through the x/tokenfactory module from the
+// sender's address.
+type MsgOutboundTransfer struct {
+	// Sender is a sender's Osmosis address
+	Sender string `protobuf:"bytes,1,opt,name=sender,proto3" json:"sender,omitempty" yaml:"sender"`
+	// DestAddr is a destination address
+	DestAddr string `protobuf:"bytes,2,opt,name=dest_addr,json=destAddr,proto3" json:"dest_addr,omitempty" yaml:"dest_addr"`
+	// Asset contains a target chain and a source denom
+	Asset Asset `protobuf:"bytes,3,opt,name=asset,proto3" json:"asset" yaml:"asset"`
+	// Amount of coins to transfer
+	Amount cosmossdk_io_math.Int `protobuf:"bytes,4,opt,name=amount,proto3,customtype=cosmossdk.io/math.Int" json:"amount" yaml:"amount"`
+}
+
+func (m *MsgOutboundTransfer) Reset()         { *m = MsgOutboundTransfer{} }
+func (m *MsgOutboundTransfer) String() string { return proto.CompactTextString(m) }
+func (*MsgOutboundTransfer) ProtoMessage()    {}
+func (*MsgOutboundTransfer) Descriptor() ([]byte, []int) {
+	return fileDescriptor_8e478e3238c885a8, []int{2}
+}
+func (m *MsgOutboundTransfer) XXX_Unmarshal(b []byte) error {
+	return m.Unmarshal(b)
+}
+func (m *MsgOutboundTransfer) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	if deterministic {
+		return xxx_messageInfo_MsgOutboundTransfer.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalToSizedBuffer(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
+	}
+}
+func (m *MsgOutboundTransfer) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MsgOutboundTransfer.Merge(m, src)
+}
+func (m *MsgOutboundTransfer) XXX_Size() int {
+	return m.Size()
+}
+func (m *MsgOutboundTransfer) XXX_DiscardUnknown() {
+	xxx_messageInfo_MsgOutboundTransfer.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_MsgOutboundTransfer proto.InternalMessageInfo
+
+func (m *MsgOutboundTransfer) GetSender() string {
+	if m != nil {
+		return m.Sender
+	}
+	return ""
+}
+
+func (m *MsgOutboundTransfer) GetDestAddr() string {
+	if m != nil {
+		return m.DestAddr
+	}
+	return ""
+}
+
+func (m *MsgOutboundTransfer) GetAsset() Asset {
+	if m != nil {
+		return m.Asset
+	}
+	return Asset{}
+}
+
+type MsgOutboundTransferResponse struct {
+}
+
+func (m *MsgOutboundTransferResponse) Reset()         { *m = MsgOutboundTransferResponse{} }
+func (m *MsgOutboundTransferResponse) String() string { return proto.CompactTextString(m) }
+func (*MsgOutboundTransferResponse) ProtoMessage()    {}
+func (*MsgOutboundTransferResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_8e478e3238c885a8, []int{3}
+}
+func (m *MsgOutboundTransferResponse) XXX_Unmarshal(b []byte) error {
+	return m.Unmarshal(b)
+}
+func (m *MsgOutboundTransferResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	if deterministic {
+		return xxx_messageInfo_MsgOutboundTransferResponse.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalToSizedBuffer(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
+	}
+}
+func (m *MsgOutboundTransferResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MsgOutboundTransferResponse.Merge(m, src)
+}
+func (m *MsgOutboundTransferResponse) XXX_Size() int {
+	return m.Size()
+}
+func (m *MsgOutboundTransferResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_MsgOutboundTransferResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_MsgOutboundTransferResponse proto.InternalMessageInfo
+
+// MsgUpdateParams allows to update module params. It contains UpdateParams
+// instead of just Params to forbid status updating using this method.
+// All new assets introduced with this method have ASSET_STATUS_BLOCKED_BOTH
+// status by default.
+type MsgUpdateParams struct {
+	// Sender is a sender's address
+	Sender string `protobuf:"bytes,1,opt,name=sender,proto3" json:"sender,omitempty" yaml:"sender"`
+	// NewParams should be fully populated
+	NewParams Params `protobuf:"bytes,2,opt,name=new_params,json=newParams,proto3" json:"new_params" yaml:"new_params"`
+}
+
+func (m *MsgUpdateParams) Reset()         { *m = MsgUpdateParams{} }
+func (m *MsgUpdateParams) String() string { return proto.CompactTextString(m) }
+func (*MsgUpdateParams) ProtoMessage()    {}
+func (*MsgUpdateParams) Descriptor() ([]byte, []int) {
+	return fileDescriptor_8e478e3238c885a8, []int{4}
+}
+func (m *MsgUpdateParams) XXX_Unmarshal(b []byte) error {
+	return m.Unmarshal(b)
+}
+func (m *MsgUpdateParams) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	if deterministic {
+		return xxx_messageInfo_MsgUpdateParams.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalToSizedBuffer(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
+	}
+}
+func (m *MsgUpdateParams) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MsgUpdateParams.Merge(m, src)
+}
+func (m *MsgUpdateParams) XXX_Size() int {
+	return m.Size()
+}
+func (m *MsgUpdateParams) XXX_DiscardUnknown() {
+	xxx_messageInfo_MsgUpdateParams.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_MsgUpdateParams proto.InternalMessageInfo
+
+func (m *MsgUpdateParams) GetSender() string {
+	if m != nil {
+		return m.Sender
+	}
+	return ""
+}
+
+func (m *MsgUpdateParams) GetNewParams() Params {
+	if m != nil {
+		return m.NewParams
+	}
+	return Params{}
+}
+
+type MsgUpdateParamsResponse struct {
+}
+
+func (m *MsgUpdateParamsResponse) Reset()         { *m = MsgUpdateParamsResponse{} }
+func (m *MsgUpdateParamsResponse) String() string { return proto.CompactTextString(m) }
+func (*MsgUpdateParamsResponse) ProtoMessage()    {}
+func (*MsgUpdateParamsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_8e478e3238c885a8, []int{5}
+}
+func (m *MsgUpdateParamsResponse) XXX_Unmarshal(b []byte) error {
+	return m.Unmarshal(b)
+}
+func (m *MsgUpdateParamsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	if deterministic {
+		return xxx_messageInfo_MsgUpdateParamsResponse.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalToSizedBuffer(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
+	}
+}
+func (m *MsgUpdateParamsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MsgUpdateParamsResponse.Merge(m, src)
+}
+func (m *MsgUpdateParamsResponse) XXX_Size() int {
+	return m.Size()
+}
+func (m *MsgUpdateParamsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_MsgUpdateParamsResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_MsgUpdateParamsResponse proto.InternalMessageInfo
+
+// MsgChangeAssetStatus changes the status of the provided asset.
+type MsgChangeAssetStatus struct {
+	// Sender is a sender's address
+	Sender string `protobuf:"bytes,1,opt,name=sender,proto3" json:"sender,omitempty" yaml:"sender"`
+	// NewAssetStatus is a pair of the asset and its new status.
+	// The asset should be known; otherwise, the method will failed.
+	NewAssetStatus AssetWithStatus `protobuf:"bytes,2,opt,name=new_asset_status,json=newAssetStatus,proto3" json:"new_asset_status" yaml:"new_asset_status"`
+}
+
+func (m *MsgChangeAssetStatus) Reset()         { *m = MsgChangeAssetStatus{} }
+func (m *MsgChangeAssetStatus) String() string { return proto.CompactTextString(m) }
+func (*MsgChangeAssetStatus) ProtoMessage()    {}
+func (*MsgChangeAssetStatus) Descriptor() ([]byte, []int) {
+	return fileDescriptor_8e478e3238c885a8, []int{6}
+}
+func (m *MsgChangeAssetStatus) XXX_Unmarshal(b []byte) error {
+	return m.Unmarshal(b)
+}
+func (m *MsgChangeAssetStatus) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	if deterministic {
+		return xxx_messageInfo_MsgChangeAssetStatus.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalToSizedBuffer(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
+	}
+}
+func (m *MsgChangeAssetStatus) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MsgChangeAssetStatus.Merge(m, src)
+}
+func (m *MsgChangeAssetStatus) XXX_Size() int {
+	return m.Size()
+}
+func (m *MsgChangeAssetStatus) XXX_DiscardUnknown() {
+	xxx_messageInfo_MsgChangeAssetStatus.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_MsgChangeAssetStatus proto.InternalMessageInfo
+
+func (m *MsgChangeAssetStatus) GetSender() string {
+	if m != nil {
+		return m.Sender
+	}
+	return ""
+}
+
+func (m *MsgChangeAssetStatus) GetNewAssetStatus() AssetWithStatus {
+	if m != nil {
+		return m.NewAssetStatus
+	}
+	return AssetWithStatus{}
+}
+
+type MsgChangeAssetStatusResponse struct {
+}
+
+func (m *MsgChangeAssetStatusResponse) Reset()         { *m = MsgChangeAssetStatusResponse{} }
+func (m *MsgChangeAssetStatusResponse) String() string { return proto.CompactTextString(m) }
+func (*MsgChangeAssetStatusResponse) ProtoMessage()    {}
+func (*MsgChangeAssetStatusResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_8e478e3238c885a8, []int{7}
+}
+func (m *MsgChangeAssetStatusResponse) XXX_Unmarshal(b []byte) error {
+	return m.Unmarshal(b)
+}
+func (m *MsgChangeAssetStatusResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	if deterministic {
+		return xxx_messageInfo_MsgChangeAssetStatusResponse.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalToSizedBuffer(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
+	}
+}
+func (m *MsgChangeAssetStatusResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MsgChangeAssetStatusResponse.Merge(m, src)
+}
+func (m *MsgChangeAssetStatusResponse) XXX_Size() int {
+	return m.Size()
+}
+func (m *MsgChangeAssetStatusResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_MsgChangeAssetStatusResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_MsgChangeAssetStatusResponse proto.InternalMessageInfo
+
+func init() {
+	proto.RegisterType((*MsgInboundTransfer)(nil), "osmosis.bridge.v1beta1.MsgInboundTransfer")
+	proto.RegisterType((*MsgInboundTransferResponse)(nil), "osmosis.bridge.v1beta1.MsgInboundTransferResponse")
+	proto.RegisterType((*MsgOutboundTransfer)(nil), "osmosis.bridge.v1beta1.MsgOutboundTransfer")
+	proto.RegisterType((*MsgOutboundTransferResponse)(nil), "osmosis.bridge.v1beta1.MsgOutboundTransferResponse")
+	proto.RegisterType((*MsgUpdateParams)(nil), "osmosis.bridge.v1beta1.MsgUpdateParams")
+	proto.RegisterType((*MsgUpdateParamsResponse)(nil), "osmosis.bridge.v1beta1.MsgUpdateParamsResponse")
+	proto.RegisterType((*MsgChangeAssetStatus)(nil), "osmosis.bridge.v1beta1.MsgChangeAssetStatus")
+	proto.RegisterType((*MsgChangeAssetStatusResponse)(nil), "osmosis.bridge.v1beta1.MsgChangeAssetStatusResponse")
+}
+
+func init() { proto.RegisterFile("osmosis/bridge/v1beta1/tx.proto", fileDescriptor_8e478e3238c885a8) }
+
+var fileDescriptor_8e478e3238c885a8 = []byte{
+	// 654 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x95, 0xcd, 0x6e, 0xd3, 0x4e,
+	0x14, 0xc5, 0xe3, 0xf6, 0xff, 0xaf, 0xe8, 0xb4, 0xd0, 0xc6, 0x04, 0x9a, 0x9a, 0xd6, 0x2e, 0x06,
+	0xd4, 0x52, 0x88, 0xad, 0xba, 0xac, 0xb2, 0x6b, 0x90, 0x90, 0x2a, 0x11, 0x81, 0x0c, 0x08, 0xc4,
+	0xa6, 0x1a, 0xc7, 0x83, 0x63, 0x51, 0xcf, 0x04, 0xcf, 0xb8, 0x69, 0x5f, 0x81, 0x15, 0xef, 0x81,
+	0x90, 0xd8, 0xf2, 0x06, 0x5d, 0x96, 0x1d, 0x62, 0x61, 0xa1, 0x76, 0xc1, 0x3e, 0x4f, 0x80, 0x3c,
+	0x33, 0xf9, 0xc0, 0xf9, 0x50, 0xb3, 0x66, 0x13, 0x39, 0xf6, 0xef, 0x9e, 0x7b, 0xcf, 0xb9, 0xe3,
+	0x04, 0x18, 0x84, 0x46, 0x84, 0x86, 0xd4, 0xf6, 0xe2, 0xd0, 0x0f, 0x90, 0x7d, 0xb4, 0xe3, 0x21,
+	0x06, 0x77, 0x6c, 0x76, 0x6c, 0xb5, 0x62, 0xc2, 0x88, 0x7a, 0x53, 0x02, 0x96, 0x00, 0x2c, 0x09,
+	0x68, 0xa5, 0x80, 0x04, 0x84, 0x23, 0x76, 0x76, 0x25, 0x68, 0xad, 0x08, 0xa3, 0x10, 0x13, 0x9b,
+	0x7f, 0xca, 0x5b, 0x7a, 0x83, 0x2b, 0xd8, 0x1e, 0xa4, 0x7d, 0xf9, 0x06, 0x09, 0xb1, 0x7c, 0x7e,
+	0x67, 0xcc, 0x04, 0xb2, 0x1f, 0x87, 0xcc, 0xcf, 0x33, 0x40, 0xad, 0xd3, 0x60, 0x1f, 0x7b, 0x24,
+	0xc1, 0xfe, 0xcb, 0x18, 0x62, 0xfa, 0x0e, 0xc5, 0xea, 0x7d, 0x30, 0x47, 0x11, 0xf6, 0x51, 0x5c,
+	0x56, 0x36, 0x94, 0xad, 0xf9, 0x5a, 0xb1, 0x93, 0x1a, 0x57, 0x4f, 0x60, 0x74, 0x58, 0x35, 0xc5,
+	0x7d, 0xd3, 0x95, 0x80, 0xba, 0x03, 0xe6, 0x7d, 0x44, 0xd9, 0x01, 0xf4, 0xfd, 0xb8, 0x3c, 0xc3,
+	0xe9, 0x52, 0x27, 0x35, 0x96, 0x05, 0xdd, 0x7b, 0x64, 0xba, 0x57, 0xb2, 0xeb, 0x3d, 0xdf, 0x8f,
+	0xd5, 0x7d, 0xf0, 0x3f, 0xa4, 0x14, 0xb1, 0xf2, 0xec, 0x86, 0xb2, 0xb5, 0xe0, 0xac, 0x5b, 0xa3,
+	0xa3, 0xb0, 0xf6, 0x32, 0xa8, 0x56, 0x3a, 0x4d, 0x8d, 0x42, 0x27, 0x35, 0x16, 0x85, 0x22, 0xaf,
+	0x34, 0x5d, 0xa1, 0xa0, 0x3e, 0x01, 0x73, 0x30, 0x22, 0x09, 0x66, 0xe5, 0xff, 0x78, 0x6b, 0x2b,
+	0x83, 0x7f, 0xa6, 0xc6, 0x0d, 0x11, 0x0e, 0xf5, 0xdf, 0x5b, 0x21, 0xb1, 0x23, 0xc8, 0x9a, 0xd6,
+	0x3e, 0x66, 0x7d, 0x17, 0xa2, 0xc8, 0x74, 0x65, 0x75, 0xf5, 0xee, 0xc7, 0xdf, 0x5f, 0xb7, 0xf3,
+	0x3b, 0x0b, 0x45, 0x2a, 0x15, 0x26, 0x63, 0x31, 0xd7, 0x80, 0x36, 0x1c, 0x96, 0x8b, 0x68, 0x8b,
+	0x60, 0x8a, 0xcc, 0x2f, 0x33, 0xe0, 0x7a, 0x9d, 0x06, 0xcf, 0x12, 0xf6, 0x8f, 0x87, 0x79, 0x2f,
+	0x0b, 0x73, 0x23, 0x17, 0x26, 0x91, 0xb1, 0xf4, 0xd3, 0x5c, 0x07, 0xb7, 0x46, 0xc4, 0xd5, 0x8b,
+	0xf3, 0x9b, 0x02, 0x96, 0xea, 0x34, 0x78, 0xd5, 0xf2, 0x21, 0x43, 0xcf, 0x61, 0x0c, 0x23, 0x3a,
+	0x4d, 0x94, 0x6f, 0x00, 0xc0, 0xa8, 0x7d, 0xd0, 0xe2, 0x85, 0x3c, 0xcb, 0x05, 0x47, 0x1f, 0x17,
+	0x8e, 0x90, 0xaf, 0xad, 0xca, 0x74, 0x8a, 0x42, 0xb2, 0x5f, 0x6f, 0xba, 0xf3, 0x18, 0xb5, 0x05,
+	0x55, 0xbd, 0x9d, 0xd9, 0x5b, 0xcb, 0xd9, 0x4b, 0xf8, 0x98, 0x15, 0x89, 0xaf, 0x82, 0x95, 0xdc,
+	0xe8, 0x3d, 0x5b, 0xa9, 0x02, 0x4a, 0x75, 0x1a, 0x3c, 0x6e, 0x42, 0x1c, 0x20, 0xbe, 0x94, 0x17,
+	0x0c, 0xb2, 0x64, 0x2a, 0x6f, 0x31, 0x58, 0xce, 0x66, 0xe3, 0x5b, 0x3b, 0xa0, 0xbc, 0x5c, 0x3a,
+	0xdc, 0x9c, 0xb8, 0xfe, 0xd7, 0x21, 0x6b, 0x8a, 0x6e, 0x35, 0x43, 0x5a, 0x5d, 0xe9, 0x5b, 0x1d,
+	0x94, 0x33, 0xdd, 0x6b, 0x18, 0xb5, 0x07, 0xc6, 0xab, 0x6e, 0x66, 0xae, 0xcd, 0x9c, 0xeb, 0x06,
+	0x77, 0x51, 0xe1, 0x95, 0x15, 0x59, 0xa9, 0x83, 0xb5, 0x51, 0xfe, 0xba, 0x01, 0x38, 0xdf, 0x67,
+	0xc1, 0x6c, 0x9d, 0x06, 0xea, 0x07, 0xb0, 0x94, 0xff, 0xd9, 0xd9, 0x1e, 0x37, 0xfd, 0xf0, 0x5b,
+	0xa7, 0x39, 0x97, 0x67, 0xbb, 0xad, 0x55, 0x06, 0x96, 0x87, 0xde, 0xce, 0x07, 0x13, 0x74, 0xf2,
+	0xb0, 0xb6, 0x3b, 0x05, 0xdc, 0xeb, 0xda, 0x04, 0x8b, 0x7f, 0x1d, 0xe2, 0xcd, 0x09, 0x22, 0x83,
+	0xa0, 0x66, 0x5f, 0x12, 0xec, 0x75, 0x6a, 0x83, 0xe2, 0xf0, 0xb9, 0x7a, 0x38, 0x41, 0x65, 0x88,
+	0xd6, 0x1e, 0x4d, 0x43, 0x77, 0x1b, 0xd7, 0x9e, 0x9e, 0x9e, 0xeb, 0xca, 0xd9, 0xb9, 0xae, 0xfc,
+	0x3a, 0xd7, 0x95, 0x4f, 0x17, 0x7a, 0xe1, 0xec, 0x42, 0x2f, 0xfc, 0xb8, 0xd0, 0x0b, 0x6f, 0x9d,
+	0x20, 0x64, 0xcd, 0xc4, 0xb3, 0x1a, 0x24, 0xb2, 0xa5, 0x72, 0xe5, 0x10, 0x7a, 0xb4, 0xfb, 0xc5,
+	0x3e, 0x72, 0x76, 0xed, 0xe3, 0xee, 0x79, 0x62, 0x27, 0x2d, 0x44, 0xbd, 0x39, 0xfe, 0xdf, 0xb4,
+	0xfb, 0x27, 0x00, 0x00, 0xff, 0xff, 0x72, 0x89, 0xa4, 0xf5, 0x44, 0x07, 0x00, 0x00,
+}
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ context.Context
+var _ grpc.ClientConn
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the grpc package it is being compiled against.
+const _ = grpc.SupportPackageIsVersion4
+
+// MsgClient is the client API for Msg service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
+type MsgClient interface {
+	// InboundTransfer is used for inbound transfers (<other_chain> -> OSMO).
+	InboundTransfer(ctx context.Context, in *MsgInboundTransfer, opts ...grpc.CallOption) (*MsgInboundTransferResponse, error)
+	// OutboundTransfer is used for outbound transfers (OSMO -> <other_chain>).
+	OutboundTransfer(ctx context.Context, in *MsgOutboundTransfer, opts ...grpc.CallOption) (*MsgOutboundTransferResponse, error)
+	// UpdateParams is used for updating module params.
+	UpdateParams(ctx context.Context, in *MsgUpdateParams, opts ...grpc.CallOption) (*MsgUpdateParamsResponse, error)
+	// ChangeAssetStatus will change the provided asset's status.
+	ChangeAssetStatus(ctx context.Context, in *MsgChangeAssetStatus, opts ...grpc.CallOption) (*MsgChangeAssetStatusResponse, error)
+}
+
+type msgClient struct {
+	cc grpc1.ClientConn
+}
+
+func NewMsgClient(cc grpc1.ClientConn) MsgClient {
+	return &msgClient{cc}
+}
+
+func (c *msgClient) InboundTransfer(ctx context.Context, in *MsgInboundTransfer, opts ...grpc.CallOption) (*MsgInboundTransferResponse, error) {
+	out := new(MsgInboundTransferResponse)
+	err := c.cc.Invoke(ctx, "/osmosis.bridge.v1beta1.Msg/InboundTransfer", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *msgClient) OutboundTransfer(ctx context.Context, in *MsgOutboundTransfer, opts ...grpc.CallOption) (*MsgOutboundTransferResponse, error) {
+	out := new(MsgOutboundTransferResponse)
+	err := c.cc.Invoke(ctx, "/osmosis.bridge.v1beta1.Msg/OutboundTransfer", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *msgClient) UpdateParams(ctx context.Context, in *MsgUpdateParams, opts ...grpc.CallOption) (*MsgUpdateParamsResponse, error) {
+	out := new(MsgUpdateParamsResponse)
+	err := c.cc.Invoke(ctx, "/osmosis.bridge.v1beta1.Msg/UpdateParams", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *msgClient) ChangeAssetStatus(ctx context.Context, in *MsgChangeAssetStatus, opts ...grpc.CallOption) (*MsgChangeAssetStatusResponse, error) {
+	out := new(MsgChangeAssetStatusResponse)
+	err := c.cc.Invoke(ctx, "/osmosis.bridge.v1beta1.Msg/ChangeAssetStatus", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+// MsgServer is the server API for Msg service.
+type MsgServer interface {
+	// InboundTransfer is used for inbound transfers (<other_chain> -> OSMO).
+	InboundTransfer(context.Context, *MsgInboundTransfer) (*MsgInboundTransferResponse, error)
+	// OutboundTransfer is used for outbound transfers (OSMO -> <other_chain>).
+	OutboundTransfer(context.Context, *MsgOutboundTransfer) (*MsgOutboundTransferResponse, error)
+	// UpdateParams is used for updating module params.
+	UpdateParams(context.Context, *MsgUpdateParams) (*MsgUpdateParamsResponse, error)
+	// ChangeAssetStatus will change the provided asset's status.
+	ChangeAssetStatus(context.Context, *MsgChangeAssetStatus) (*MsgChangeAssetStatusResponse, error)
+}
+
+// UnimplementedMsgServer can be embedded to have forward compatible implementations.
+type UnimplementedMsgServer struct {
+}
+
+func (*UnimplementedMsgServer) InboundTransfer(ctx context.Context, req *MsgInboundTransfer) (*MsgInboundTransferResponse, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method InboundTransfer not implemented")
+}
+func (*UnimplementedMsgServer) OutboundTransfer(ctx context.Context, req *MsgOutboundTransfer) (*MsgOutboundTransferResponse, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method OutboundTransfer not implemented")
+}
+func (*UnimplementedMsgServer) UpdateParams(ctx context.Context, req *MsgUpdateParams) (*MsgUpdateParamsResponse, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method UpdateParams not implemented")
+}
+func (*UnimplementedMsgServer) ChangeAssetStatus(ctx context.Context, req *MsgChangeAssetStatus) (*MsgChangeAssetStatusResponse, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method ChangeAssetStatus not implemented")
+}
+
+func RegisterMsgServer(s grpc1.Server, srv MsgServer) {
+	s.RegisterService(&_Msg_serviceDesc, srv)
+}
+
+func _Msg_InboundTransfer_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(MsgInboundTransfer)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(MsgServer).InboundTransfer(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/osmosis.bridge.v1beta1.Msg/InboundTransfer",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(MsgServer).InboundTransfer(ctx, req.(*MsgInboundTransfer))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _Msg_OutboundTransfer_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(MsgOutboundTransfer)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(MsgServer).OutboundTransfer(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/osmosis.bridge.v1beta1.Msg/OutboundTransfer",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(MsgServer).OutboundTransfer(ctx, req.(*MsgOutboundTransfer))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _Msg_UpdateParams_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(MsgUpdateParams)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(MsgServer).UpdateParams(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/osmosis.bridge.v1beta1.Msg/UpdateParams",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(MsgServer).UpdateParams(ctx, req.(*MsgUpdateParams))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _Msg_ChangeAssetStatus_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(MsgChangeAssetStatus)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(MsgServer).ChangeAssetStatus(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/osmosis.bridge.v1beta1.Msg/ChangeAssetStatus",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(MsgServer).ChangeAssetStatus(ctx, req.(*MsgChangeAssetStatus))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+var _Msg_serviceDesc = grpc.ServiceDesc{
+	ServiceName: "osmosis.bridge.v1beta1.Msg",
+	HandlerType: (*MsgServer)(nil),
+	Methods: []grpc.MethodDesc{
+		{
+			MethodName: "InboundTransfer",
+			Handler:    _Msg_InboundTransfer_Handler,
+		},
+		{
+			MethodName: "OutboundTransfer",
+			Handler:    _Msg_OutboundTransfer_Handler,
+		},
+		{
+			MethodName: "UpdateParams",
+			Handler:    _Msg_UpdateParams_Handler,
+		},
+		{
+			MethodName: "ChangeAssetStatus",
+			Handler:    _Msg_ChangeAssetStatus_Handler,
+		},
+	},
+	Streams:  []grpc.StreamDesc{},
+	Metadata: "osmosis/bridge/v1beta1/tx.proto",
+}
+
+func (m *MsgInboundTransfer) Marshal() (dAtA []byte, err error) {
+	size := m.Size()
+	dAtA = make([]byte, size)
+	n, err := m.MarshalToSizedBuffer(dAtA[:size])
+	if err != nil {
+		return nil, err
+	}
+	return dAtA[:n], nil
+}
+
+func (m *MsgInboundTransfer) MarshalTo(dAtA []byte) (int, error) {
+	size := m.Size()
+	return m.MarshalToSizedBuffer(dAtA[:size])
+}
+
+func (m *MsgInboundTransfer) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+	i := len(dAtA)
+	_ = i
+	var l int
+	_ = l
+	{
+		size := m.Amount.Size()
+		i -= size
+		if _, err := m.Amount.MarshalTo(dAtA[i:]); err != nil {
+			return 0, err
+		}
+		i = encodeVarintTx(dAtA, i, uint64(size))
+	}
+	i--
+	dAtA[i] = 0x22
+	{
+		size, err := m.Asset.MarshalToSizedBuffer(dAtA[:i])
+		if err != nil {
+			return 0, err
+		}
+		i -= size
+		i = encodeVarintTx(dAtA, i, uint64(size))
+	}
+	i--
+	dAtA[i] = 0x1a
+	if len(m.DestAddr) > 0 {
+		i -= len(m.DestAddr)
+		copy(dAtA[i:], m.DestAddr)
+		i = encodeVarintTx(dAtA, i, uint64(len(m.DestAddr)))
+		i--
+		dAtA[i] = 0x12
+	}
+	if len(m.Sender) > 0 {
+		i -= len(m.Sender)
+		copy(dAtA[i:], m.Sender)
+		i = encodeVarintTx(dAtA, i, uint64(len(m.Sender)))
+		i--
+		dAtA[i] = 0xa
+	}
+	return len(dAtA) - i, nil
+}
+
+func (m *MsgInboundTransferResponse) Marshal() (dAtA []byte, err error) {
+	size := m.Size()
+	dAtA = make([]byte, size)
+	n, err := m.MarshalToSizedBuffer(dAtA[:size])
+	if err != nil {
+		return nil, err
+	}
+	return dAtA[:n], nil
+}
+
+func (m *MsgInboundTransferResponse) MarshalTo(dAtA []byte) (int, error) {
+	size := m.Size()
+	return m.MarshalToSizedBuffer(dAtA[:size])
+}
+
+func (m *MsgInboundTransferResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+	i := len(dAtA)
+	_ = i
+	var l int
+	_ = l
+	return len(dAtA) - i, nil
+}
+
+func (m *MsgOutboundTransfer) Marshal() (dAtA []byte, err error) {
+	size := m.Size()
+	dAtA = make([]byte, size)
+	n, err := m.MarshalToSizedBuffer(dAtA[:size])
+	if err != nil {
+		return nil, err
+	}
+	return dAtA[:n], nil
+}
+
+func (m *MsgOutboundTransfer) MarshalTo(dAtA []byte) (int, error) {
+	size := m.Size()
+	return m.MarshalToSizedBuffer(dAtA[:size])
+}
+
+func (m *MsgOutboundTransfer) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+	i := len(dAtA)
+	_ = i
+	var l int
+	_ = l
+	{
+		size := m.Amount.Size()
+		i -= size
+		if _, err := m.Amount.MarshalTo(dAtA[i:]); err != nil {
+			return 0, err
+		}
+		i = encodeVarintTx(dAtA, i, uint64(size))
+	}
+	i--
+	dAtA[i] = 0x22
+	{
+		size, err := m.Asset.MarshalToSizedBuffer(dAtA[:i])
+		if err != nil {
+			return 0, err
+		}
+		i -= size
+		i = encodeVarintTx(dAtA, i, uint64(size))
+	}
+	i--
+	dAtA[i] = 0x1a
+	if len(m.DestAddr) > 0 {
+		i -= len(m.DestAddr)
+		copy(dAtA[i:], m.DestAddr)
+		i = encodeVarintTx(dAtA, i, uint64(len(m.DestAddr)))
+		i--
+		dAtA[i] = 0x12
+	}
+	if len(m.Sender) > 0 {
+		i -= len(m.Sender)
+		copy(dAtA[i:], m.Sender)
+		i = encodeVarintTx(dAtA, i, uint64(len(m.Sender)))
+		i--
+		dAtA[i] = 0xa
+	}
+	return len(dAtA) - i, nil
+}
+
+func (m *MsgOutboundTransferResponse) Marshal() (dAtA []byte, err error) {
+	size := m.Size()
+	dAtA = make([]byte, size)
+	n, err := m.MarshalToSizedBuffer(dAtA[:size])
+	if err != nil {
+		return nil, err
+	}
+	return dAtA[:n], nil
+}
+
+func (m *MsgOutboundTransferResponse) MarshalTo(dAtA []byte) (int, error) {
+	size := m.Size()
+	return m.MarshalToSizedBuffer(dAtA[:size])
+}
+
+func (m *MsgOutboundTransferResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+	i := len(dAtA)
+	_ = i
+	var l int
+	_ = l
+	return len(dAtA) - i, nil
+}
+
+func (m *MsgUpdateParams) Marshal() (dAtA []byte, err error) {
+	size := m.Size()
+	dAtA = make([]byte, size)
+	n, err := m.MarshalToSizedBuffer(dAtA[:size])
+	if err != nil {
+		return nil, err
+	}
+	return dAtA[:n], nil
+}
+
+func (m *MsgUpdateParams) MarshalTo(dAtA []byte) (int, error) {
+	size := m.Size()
+	return m.MarshalToSizedBuffer(dAtA[:size])
+}
+
+func (m *MsgUpdateParams) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+	i := len(dAtA)
+	_ = i
+	var l int
+	_ = l
+	{
+		size, err := m.NewParams.MarshalToSizedBuffer(dAtA[:i])
+		if err != nil {
+			return 0, err
+		}
+		i -= size
+		i = encodeVarintTx(dAtA, i, uint64(size))
+	}
+	i--
+	dAtA[i] = 0x12
+	if len(m.Sender) > 0 {
+		i -= len(m.Sender)
+		copy(dAtA[i:], m.Sender)
+		i = encodeVarintTx(dAtA, i, uint64(len(m.Sender)))
+		i--
+		dAtA[i] = 0xa
+	}
+	return len(dAtA) - i, nil
+}
+
+func (m *MsgUpdateParamsResponse) Marshal() (dAtA []byte, err error) {
+	size := m.Size()
+	dAtA = make([]byte, size)
+	n, err := m.MarshalToSizedBuffer(dAtA[:size])
+	if err != nil {
+		return nil, err
+	}
+	return dAtA[:n], nil
+}
+
+func (m *MsgUpdateParamsResponse) MarshalTo(dAtA []byte) (int, error) {
+	size := m.Size()
+	return m.MarshalToSizedBuffer(dAtA[:size])
+}
+
+func (m *MsgUpdateParamsResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+	i := len(dAtA)
+	_ = i
+	var l int
+	_ = l
+	return len(dAtA) - i, nil
+}
+
+func (m *MsgChangeAssetStatus) Marshal() (dAtA []byte, err error) {
+	size := m.Size()
+	dAtA = make([]byte, size)
+	n, err := m.MarshalToSizedBuffer(dAtA[:size])
+	if err != nil {
+		return nil, err
+	}
+	return dAtA[:n], nil
+}
+
+func (m *MsgChangeAssetStatus) MarshalTo(dAtA []byte) (int, error) {
+	size := m.Size()
+	return m.MarshalToSizedBuffer(dAtA[:size])
+}
+
+func (m *MsgChangeAssetStatus) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+	i := len(dAtA)
+	_ = i
+	var l int
+	_ = l
+	{
+		size, err := m.NewAssetStatus.MarshalToSizedBuffer(dAtA[:i])
+		if err != nil {
+			return 0, err
+		}
+		i -= size
+		i = encodeVarintTx(dAtA, i, uint64(size))
+	}
+	i--
+	dAtA[i] = 0x12
+	if len(m.Sender) > 0 {
+		i -= len(m.Sender)
+		copy(dAtA[i:], m.Sender)
+		i = encodeVarintTx(dAtA, i, uint64(len(m.Sender)))
+		i--
+		dAtA[i] = 0xa
+	}
+	return len(dAtA) - i, nil
+}
+
+func (m *MsgChangeAssetStatusResponse) Marshal() (dAtA []byte, err error) {
+	size := m.Size()
+	dAtA = make([]byte, size)
+	n, err := m.MarshalToSizedBuffer(dAtA[:size])
+	if err != nil {
+		return nil, err
+	}
+	return dAtA[:n], nil
+}
+
+func (m *MsgChangeAssetStatusResponse) MarshalTo(dAtA []byte) (int, error) {
+	size := m.Size()
+	return m.MarshalToSizedBuffer(dAtA[:size])
+}
+
+func (m *MsgChangeAssetStatusResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+	i := len(dAtA)
+	_ = i
+	var l int
+	_ = l
+	return len(dAtA) - i, nil
+}
+
+func encodeVarintTx(dAtA []byte, offset int, v uint64) int {
+	offset -= sovTx(v)
+	base := offset
+	for v >= 1<<7 {
+		dAtA[offset] = uint8(v&0x7f | 0x80)
+		v >>= 7
+		offset++
+	}
+	dAtA[offset] = uint8(v)
+	return base
+}
+func (m *MsgInboundTransfer) Size() (n int) {
+	if m == nil {
+		return 0
+	}
+	var l int
+	_ = l
+	l = len(m.Sender)
+	if l > 0 {
+		n += 1 + l + sovTx(uint64(l))
+	}
+	l = len(m.DestAddr)
+	if l > 0 {
+		n += 1 + l + sovTx(uint64(l))
+	}
+	l = m.Asset.Size()
+	n += 1 + l + sovTx(uint64(l))
+	l = m.Amount.Size()
+	n += 1 + l + sovTx(uint64(l))
+	return n
+}
+
+func (m *MsgInboundTransferResponse) Size() (n int) {
+	if m == nil {
+		return 0
+	}
+	var l int
+	_ = l
+	return n
+}
+
+func (m *MsgOutboundTransfer) Size() (n int) {
+	if m == nil {
+		return 0
+	}
+	var l int
+	_ = l
+	l = len(m.Sender)
+	if l > 0 {
+		n += 1 + l + sovTx(uint64(l))
+	}
+	l = len(m.DestAddr)
+	if l > 0 {
+		n += 1 + l + sovTx(uint64(l))
+	}
+	l = m.Asset.Size()
+	n += 1 + l + sovTx(uint64(l))
+	l = m.Amount.Size()
+	n += 1 + l + sovTx(uint64(l))
+	return n
+}
+
+func (m *MsgOutboundTransferResponse) Size() (n int) {
+	if m == nil {
+		return 0
+	}
+	var l int
+	_ = l
+	return n
+}
+
+func (m *MsgUpdateParams) Size() (n int) {
+	if m == nil {
+		return 0
+	}
+	var l int
+	_ = l
+	l = len(m.Sender)
+	if l > 0 {
+		n += 1 + l + sovTx(uint64(l))
+	}
+	l = m.NewParams.Size()
+	n += 1 + l + sovTx(uint64(l))
+	return n
+}
+
+func (m *MsgUpdateParamsResponse) Size() (n int) {
+	if m == nil {
+		return 0
+	}
+	var l int
+	_ = l
+	return n
+}
+
+func (m *MsgChangeAssetStatus) Size() (n int) {
+	if m == nil {
+		return 0
+	}
+	var l int
+	_ = l
+	l = len(m.Sender)
+	if l > 0 {
+		n += 1 + l + sovTx(uint64(l))
+	}
+	l = m.NewAssetStatus.Size()
+	n += 1 + l + sovTx(uint64(l))
+	return n
+}
+
+func (m *MsgChangeAssetStatusResponse) Size() (n int) {
+	if m == nil {
+		return 0
+	}
+	var l int
+	_ = l
+	return n
+}
+
+func sovTx(x uint64) (n int) {
+	return (math_bits.Len64(x|1) + 6) / 7
+}
+func sozTx(x uint64) (n int) {
+	return sovTx(uint64((x << 1) ^ uint64((int64(x) >> 63))))
+}
+func (m *MsgInboundTransfer) Unmarshal(dAtA []byte) error {
+	l := len(dAtA)
+	iNdEx := 0
+	for iNdEx < l {
+		preIndex := iNdEx
+		var wire uint64
+		for shift := uint(0); ; shift += 7 {
+			if shift >= 64 {
+				return ErrIntOverflowTx
+			}
+			if iNdEx >= l {
+				return io.ErrUnexpectedEOF
+			}
+			b := dAtA[iNdEx]
+			iNdEx++
+			wire |= uint64(b&0x7F) << shift
+			if b < 0x80 {
+				break
+			}
+		}
+		fieldNum := int32(wire >> 3)
+		wireType := int(wire & 0x7)
+		if wireType == 4 {
+			return fmt.Errorf("proto: MsgInboundTransfer: wiretype end group for non-group")
+		}
+		if fieldNum <= 0 {
+			return fmt.Errorf("proto: MsgInboundTransfer: illegal tag %d (wire type %d)", fieldNum, wire)
+		}
+		switch fieldNum {
+		case 1:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Sender", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowTx
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				stringLen |= uint64(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			intStringLen := int(stringLen)
+			if intStringLen < 0 {
+				return ErrInvalidLengthTx
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex < 0 {
+				return ErrInvalidLengthTx
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.Sender = string(dAtA[iNdEx:postIndex])
+			iNdEx = postIndex
+		case 2:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field DestAddr", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowTx
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				stringLen |= uint64(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			intStringLen := int(stringLen)
+			if intStringLen < 0 {
+				return ErrInvalidLengthTx
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex < 0 {
+				return ErrInvalidLengthTx
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.DestAddr = string(dAtA[iNdEx:postIndex])
+			iNdEx = postIndex
+		case 3:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Asset", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowTx
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthTx
+			}
+			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthTx
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			if err := m.Asset.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
+		case 4:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Amount", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowTx
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				stringLen |= uint64(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			intStringLen := int(stringLen)
+			if intStringLen < 0 {
+				return ErrInvalidLengthTx
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex < 0 {
+				return ErrInvalidLengthTx
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			if err := m.Amount.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
+		default:
+			iNdEx = preIndex
+			skippy, err := skipTx(dAtA[iNdEx:])
+			if err != nil {
+				return err
+			}
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
+				return ErrInvalidLengthTx
+			}
+			if (iNdEx + skippy) > l {
+				return io.ErrUnexpectedEOF
+			}
+			iNdEx += skippy
+		}
+	}
+
+	if iNdEx > l {
+		return io.ErrUnexpectedEOF
+	}
+	return nil
+}
+func (m *MsgInboundTransferResponse) Unmarshal(dAtA []byte) error {
+	l := len(dAtA)
+	iNdEx := 0
+	for iNdEx < l {
+		preIndex := iNdEx
+		var wire uint64
+		for shift := uint(0); ; shift += 7 {
+			if shift >= 64 {
+				return ErrIntOverflowTx
+			}
+			if iNdEx >= l {
+				return io.ErrUnexpectedEOF
+			}
+			b := dAtA[iNdEx]
+			iNdEx++
+			wire |= uint64(b&0x7F) << shift
+			if b < 0x80 {
+				break
+			}
+		}
+		fieldNum := int32(wire >> 3)
+		wireType := int(wire & 0x7)
+		if wireType == 4 {
+			return fmt.Errorf("proto: MsgInboundTransferResponse: wiretype end group for non-group")
+		}
+		if fieldNum <= 0 {
+			return fmt.Errorf("proto: MsgInboundTransferResponse: illegal tag %d (wire type %d)", fieldNum, wire)
+		}
+		switch fieldNum {
+		default:
+			iNdEx = preIndex
+			skippy, err := skipTx(dAtA[iNdEx:])
+			if err != nil {
+				return err
+			}
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
+				return ErrInvalidLengthTx
+			}
+			if (iNdEx + skippy) > l {
+				return io.ErrUnexpectedEOF
+			}
+			iNdEx += skippy
+		}
+	}
+
+	if iNdEx > l {
+		return io.ErrUnexpectedEOF
+	}
+	return nil
+}
+func (m *MsgOutboundTransfer) Unmarshal(dAtA []byte) error {
+	l := len(dAtA)
+	iNdEx := 0
+	for iNdEx < l {
+		preIndex := iNdEx
+		var wire uint64
+		for shift := uint(0); ; shift += 7 {
+			if shift >= 64 {
+				return ErrIntOverflowTx
+			}
+			if iNdEx >= l {
+				return io.ErrUnexpectedEOF
+			}
+			b := dAtA[iNdEx]
+			iNdEx++
+			wire |= uint64(b&0x7F) << shift
+			if b < 0x80 {
+				break
+			}
+		}
+		fieldNum := int32(wire >> 3)
+		wireType := int(wire & 0x7)
+		if wireType == 4 {
+			return fmt.Errorf("proto: MsgOutboundTransfer: wiretype end group for non-group")
+		}
+		if fieldNum <= 0 {
+			return fmt.Errorf("proto: MsgOutboundTransfer: illegal tag %d (wire type %d)", fieldNum, wire)
+		}
+		switch fieldNum {
+		case 1:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Sender", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowTx
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				stringLen |= uint64(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			intStringLen := int(stringLen)
+			if intStringLen < 0 {
+				return ErrInvalidLengthTx
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex < 0 {
+				return ErrInvalidLengthTx
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.Sender = string(dAtA[iNdEx:postIndex])
+			iNdEx = postIndex
+		case 2:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field DestAddr", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowTx
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				stringLen |= uint64(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			intStringLen := int(stringLen)
+			if intStringLen < 0 {
+				return ErrInvalidLengthTx
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex < 0 {
+				return ErrInvalidLengthTx
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.DestAddr = string(dAtA[iNdEx:postIndex])
+			iNdEx = postIndex
+		case 3:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Asset", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowTx
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthTx
+			}
+			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthTx
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			if err := m.Asset.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
+		case 4:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Amount", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowTx
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				stringLen |= uint64(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			intStringLen := int(stringLen)
+			if intStringLen < 0 {
+				return ErrInvalidLengthTx
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex < 0 {
+				return ErrInvalidLengthTx
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			if err := m.Amount.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
+		default:
+			iNdEx = preIndex
+			skippy, err := skipTx(dAtA[iNdEx:])
+			if err != nil {
+				return err
+			}
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
+				return ErrInvalidLengthTx
+			}
+			if (iNdEx + skippy) > l {
+				return io.ErrUnexpectedEOF
+			}
+			iNdEx += skippy
+		}
+	}
+
+	if iNdEx > l {
+		return io.ErrUnexpectedEOF
+	}
+	return nil
+}
+func (m *MsgOutboundTransferResponse) Unmarshal(dAtA []byte) error {
+	l := len(dAtA)
+	iNdEx := 0
+	for iNdEx < l {
+		preIndex := iNdEx
+		var wire uint64
+		for shift := uint(0); ; shift += 7 {
+			if shift >= 64 {
+				return ErrIntOverflowTx
+			}
+			if iNdEx >= l {
+				return io.ErrUnexpectedEOF
+			}
+			b := dAtA[iNdEx]
+			iNdEx++
+			wire |= uint64(b&0x7F) << shift
+			if b < 0x80 {
+				break
+			}
+		}
+		fieldNum := int32(wire >> 3)
+		wireType := int(wire & 0x7)
+		if wireType == 4 {
+			return fmt.Errorf("proto: MsgOutboundTransferResponse: wiretype end group for non-group")
+		}
+		if fieldNum <= 0 {
+			return fmt.Errorf("proto: MsgOutboundTransferResponse: illegal tag %d (wire type %d)", fieldNum, wire)
+		}
+		switch fieldNum {
+		default:
+			iNdEx = preIndex
+			skippy, err := skipTx(dAtA[iNdEx:])
+			if err != nil {
+				return err
+			}
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
+				return ErrInvalidLengthTx
+			}
+			if (iNdEx + skippy) > l {
+				return io.ErrUnexpectedEOF
+			}
+			iNdEx += skippy
+		}
+	}
+
+	if iNdEx > l {
+		return io.ErrUnexpectedEOF
+	}
+	return nil
+}
+func (m *MsgUpdateParams) Unmarshal(dAtA []byte) error {
+	l := len(dAtA)
+	iNdEx := 0
+	for iNdEx < l {
+		preIndex := iNdEx
+		var wire uint64
+		for shift := uint(0); ; shift += 7 {
+			if shift >= 64 {
+				return ErrIntOverflowTx
+			}
+			if iNdEx >= l {
+				return io.ErrUnexpectedEOF
+			}
+			b := dAtA[iNdEx]
+			iNdEx++
+			wire |= uint64(b&0x7F) << shift
+			if b < 0x80 {
+				break
+			}
+		}
+		fieldNum := int32(wire >> 3)
+		wireType := int(wire & 0x7)
+		if wireType == 4 {
+			return fmt.Errorf("proto: MsgUpdateParams: wiretype end group for non-group")
+		}
+		if fieldNum <= 0 {
+			return fmt.Errorf("proto: MsgUpdateParams: illegal tag %d (wire type %d)", fieldNum, wire)
+		}
+		switch fieldNum {
+		case 1:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Sender", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowTx
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				stringLen |= uint64(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			intStringLen := int(stringLen)
+			if intStringLen < 0 {
+				return ErrInvalidLengthTx
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex < 0 {
+				return ErrInvalidLengthTx
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.Sender = string(dAtA[iNdEx:postIndex])
+			iNdEx = postIndex
+		case 2:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field NewParams", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowTx
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthTx
+			}
+			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthTx
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			if err := m.NewParams.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
+		default:
+			iNdEx = preIndex
+			skippy, err := skipTx(dAtA[iNdEx:])
+			if err != nil {
+				return err
+			}
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
+				return ErrInvalidLengthTx
+			}
+			if (iNdEx + skippy) > l {
+				return io.ErrUnexpectedEOF
+			}
+			iNdEx += skippy
+		}
+	}
+
+	if iNdEx > l {
+		return io.ErrUnexpectedEOF
+	}
+	return nil
+}
+func (m *MsgUpdateParamsResponse) Unmarshal(dAtA []byte) error {
+	l := len(dAtA)
+	iNdEx := 0
+	for iNdEx < l {
+		preIndex := iNdEx
+		var wire uint64
+		for shift := uint(0); ; shift += 7 {
+			if shift >= 64 {
+				return ErrIntOverflowTx
+			}
+			if iNdEx >= l {
+				return io.ErrUnexpectedEOF
+			}
+			b := dAtA[iNdEx]
+			iNdEx++
+			wire |= uint64(b&0x7F) << shift
+			if b < 0x80 {
+				break
+			}
+		}
+		fieldNum := int32(wire >> 3)
+		wireType := int(wire & 0x7)
+		if wireType == 4 {
+			return fmt.Errorf("proto: MsgUpdateParamsResponse: wiretype end group for non-group")
+		}
+		if fieldNum <= 0 {
+			return fmt.Errorf("proto: MsgUpdateParamsResponse: illegal tag %d (wire type %d)", fieldNum, wire)
+		}
+		switch fieldNum {
+		default:
+			iNdEx = preIndex
+			skippy, err := skipTx(dAtA[iNdEx:])
+			if err != nil {
+				return err
+			}
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
+				return ErrInvalidLengthTx
+			}
+			if (iNdEx + skippy) > l {
+				return io.ErrUnexpectedEOF
+			}
+			iNdEx += skippy
+		}
+	}
+
+	if iNdEx > l {
+		return io.ErrUnexpectedEOF
+	}
+	return nil
+}
+func (m *MsgChangeAssetStatus) Unmarshal(dAtA []byte) error {
+	l := len(dAtA)
+	iNdEx := 0
+	for iNdEx < l {
+		preIndex := iNdEx
+		var wire uint64
+		for shift := uint(0); ; shift += 7 {
+			if shift >= 64 {
+				return ErrIntOverflowTx
+			}
+			if iNdEx >= l {
+				return io.ErrUnexpectedEOF
+			}
+			b := dAtA[iNdEx]
+			iNdEx++
+			wire |= uint64(b&0x7F) << shift
+			if b < 0x80 {
+				break
+			}
+		}
+		fieldNum := int32(wire >> 3)
+		wireType := int(wire & 0x7)
+		if wireType == 4 {
+			return fmt.Errorf("proto: MsgChangeAssetStatus: wiretype end group for non-group")
+		}
+		if fieldNum <= 0 {
+			return fmt.Errorf("proto: MsgChangeAssetStatus: illegal tag %d (wire type %d)", fieldNum, wire)
+		}
+		switch fieldNum {
+		case 1:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Sender", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowTx
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				stringLen |= uint64(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			intStringLen := int(stringLen)
+			if intStringLen < 0 {
+				return ErrInvalidLengthTx
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex < 0 {
+				return ErrInvalidLengthTx
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.Sender = string(dAtA[iNdEx:postIndex])
+			iNdEx = postIndex
+		case 2:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field NewAssetStatus", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowTx
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthTx
+			}
+			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthTx
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			if err := m.NewAssetStatus.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
+		default:
+			iNdEx = preIndex
+			skippy, err := skipTx(dAtA[iNdEx:])
+			if err != nil {
+				return err
+			}
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
+				return ErrInvalidLengthTx
+			}
+			if (iNdEx + skippy) > l {
+				return io.ErrUnexpectedEOF
+			}
+			iNdEx += skippy
+		}
+	}
+
+	if iNdEx > l {
+		return io.ErrUnexpectedEOF
+	}
+	return nil
+}
+func (m *MsgChangeAssetStatusResponse) Unmarshal(dAtA []byte) error {
+	l := len(dAtA)
+	iNdEx := 0
+	for iNdEx < l {
+		preIndex := iNdEx
+		var wire uint64
+		for shift := uint(0); ; shift += 7 {
+			if shift >= 64 {
+				return ErrIntOverflowTx
+			}
+			if iNdEx >= l {
+				return io.ErrUnexpectedEOF
+			}
+			b := dAtA[iNdEx]
+			iNdEx++
+			wire |= uint64(b&0x7F) << shift
+			if b < 0x80 {
+				break
+			}
+		}
+		fieldNum := int32(wire >> 3)
+		wireType := int(wire & 0x7)
+		if wireType == 4 {
+			return fmt.Errorf("proto: MsgChangeAssetStatusResponse: wiretype end group for non-group")
+		}
+		if fieldNum <= 0 {
+			return fmt.Errorf("proto: MsgChangeAssetStatusResponse: illegal tag %d (wire type %d)", fieldNum, wire)
+		}
+		switch fieldNum {
+		default:
+			iNdEx = preIndex
+			skippy, err := skipTx(dAtA[iNdEx:])
+			if err != nil {
+				return err
+			}
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
+				return ErrInvalidLengthTx
+			}
+			if (iNdEx + skippy) > l {
+				return io.ErrUnexpectedEOF
+			}
+			iNdEx += skippy
+		}
+	}
+
+	if iNdEx > l {
+		return io.ErrUnexpectedEOF
+	}
+	return nil
+}
+func skipTx(dAtA []byte) (n int, err error) {
+	l := len(dAtA)
+	iNdEx := 0
+	depth := 0
+	for iNdEx < l {
+		var wire uint64
+		for shift := uint(0); ; shift += 7 {
+			if shift >= 64 {
+				return 0, ErrIntOverflowTx
+			}
+			if iNdEx >= l {
+				return 0, io.ErrUnexpectedEOF
+			}
+			b := dAtA[iNdEx]
+			iNdEx++
+			wire |= (uint64(b) & 0x7F) << shift
+			if b < 0x80 {
+				break
+			}
+		}
+		wireType := int(wire & 0x7)
+		switch wireType {
+		case 0:
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return 0, ErrIntOverflowTx
+				}
+				if iNdEx >= l {
+					return 0, io.ErrUnexpectedEOF
+				}
+				iNdEx++
+				if dAtA[iNdEx-1] < 0x80 {
+					break
+				}
+			}
+		case 1:
+			iNdEx += 8
+		case 2:
+			var length int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return 0, ErrIntOverflowTx
+				}
+				if iNdEx >= l {
+					return 0, io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				length |= (int(b) & 0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if length < 0 {
+				return 0, ErrInvalidLengthTx
+			}
+			iNdEx += length
+		case 3:
+			depth++
+		case 4:
+			if depth == 0 {
+				return 0, ErrUnexpectedEndOfGroupTx
+			}
+			depth--
+		case 5:
+			iNdEx += 4
+		default:
+			return 0, fmt.Errorf("proto: illegal wireType %d", wireType)
+		}
+		if iNdEx < 0 {
+			return 0, ErrInvalidLengthTx
+		}
+		if depth == 0 {
+			return iNdEx, nil
+		}
+	}
+	return 0, io.ErrUnexpectedEOF
+}
+
+var (
+	ErrInvalidLengthTx        = fmt.Errorf("proto: negative length found during unmarshaling")
+	ErrIntOverflowTx          = fmt.Errorf("proto: integer overflow")
+	ErrUnexpectedEndOfGroupTx = fmt.Errorf("proto: unexpected end of group")
+)
diff --git a/x/concentrated-liquidity/client/queryproto/query.pb.go b/x/concentrated-liquidity/client/queryproto/query.pb.go
index 5addd00b2d8..2ad25d50967 100644
--- a/x/concentrated-liquidity/client/queryproto/query.pb.go
+++ b/x/concentrated-liquidity/client/queryproto/query.pb.go
@@ -22,8 +22,6 @@ import (
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
-	_ "google.golang.org/protobuf/types/known/durationpb"
-	_ "google.golang.org/protobuf/types/known/timestamppb"
 	io "io"
 	math "math"
 	math_bits "math/bits"
@@ -1761,156 +1759,155 @@ func init() {
 }
 
 var fileDescriptor_5da291368ba4d8e3 = []byte{
-	// 2373 bytes of a gzipped FileDescriptorProto
+	// 2354 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x5a, 0x4d, 0x6c, 0x1c, 0x49,
-	0x15, 0x4e, 0x39, 0x3f, 0xbb, 0xf3, 0xe2, 0x38, 0x49, 0xd9, 0xb1, 0x9d, 0xc9, 0x66, 0x26, 0x5b,
-	0x10, 0xd6, 0x22, 0xc9, 0x0c, 0xf9, 0x23, 0xe4, 0x6f, 0x13, 0x8f, 0xbd, 0x8e, 0x46, 0xeb, 0x78,
-	0x9d, 0x4e, 0x0c, 0x08, 0x21, 0x7a, 0x7b, 0xba, 0xcb, 0xe3, 0xd6, 0xf4, 0x74, 0x8d, 0xbb, 0xab,
-	0x93, 0x98, 0x25, 0xd2, 0x6a, 0xf7, 0x88, 0x04, 0x8b, 0xb8, 0x22, 0x24, 0xc4, 0x05, 0xad, 0x38,
-	0x72, 0x81, 0x0b, 0x82, 0x03, 0x8a, 0x38, 0xac, 0x56, 0x42, 0x48, 0x68, 0x0f, 0xb3, 0x90, 0x70,
-	0x40, 0x5a, 0x40, 0xc2, 0x5c, 0x38, 0xa2, 0xae, 0xae, 0xea, 0xe9, 0x19, 0xf7, 0xd8, 0x3d, 0xe3,
-	0x70, 0xe2, 0xe4, 0xa9, 0x7e, 0xf5, 0xde, 0xfb, 0xde, 0x4f, 0xbd, 0xae, 0xf7, 0xda, 0x70, 0x9e,
-	0xf9, 0x4d, 0xe6, 0xdb, 0x7e, 0xd9, 0x64, 0xae, 0x49, 0x5d, 0xee, 0x19, 0x9c, 0x5a, 0x8e, 0xbd,
-	0x1e, 0xd8, 0x96, 0xcd, 0x37, 0xca, 0x0f, 0xcf, 0xd7, 0x28, 0x37, 0xce, 0x97, 0xd7, 0x03, 0xea,
-	0x6d, 0x94, 0x5a, 0x1e, 0xe3, 0x0c, 0x9f, 0x96, 0x2c, 0xa5, 0x54, 0x96, 0x92, 0x64, 0xc9, 0x4f,
-	0xd4, 0x59, 0x9d, 0x09, 0x8e, 0x72, 0xf8, 0x2b, 0x62, 0xce, 0x7f, 0x71, 0x7b, 0x7d, 0x2d, 0xc3,
-	0x33, 0x9a, 0xbe, 0xdc, 0x7b, 0x29, 0x1b, 0x36, 0x6e, 0x9b, 0x8d, 0xaa, 0xbb, 0xaa, 0x34, 0x14,
-	0x4c, 0xc1, 0x56, 0xae, 0x19, 0x3e, 0x8d, 0xf7, 0x98, 0xcc, 0x76, 0x15, 0x82, 0x24, 0x5d, 0xd8,
-	0x15, 0xef, 0x6a, 0x19, 0x75, 0xdb, 0x35, 0xb8, 0xcd, 0xd4, 0xde, 0x57, 0xea, 0x8c, 0xd5, 0x1d,
-	0x5a, 0x36, 0x5a, 0x76, 0xd9, 0x70, 0x5d, 0xc6, 0x05, 0x51, 0xe1, 0x3b, 0x2e, 0xa9, 0x62, 0x55,
-	0x0b, 0x56, 0xcb, 0x86, 0xbb, 0xa1, 0x48, 0x91, 0x12, 0x3d, 0xb2, 0x3f, 0x5a, 0x48, 0x52, 0xb1,
-	0x97, 0x8b, 0xdb, 0x4d, 0xea, 0x73, 0xa3, 0xd9, 0x52, 0x06, 0xf4, 0x6e, 0xb0, 0x02, 0x2f, 0x09,
-	0x2a, 0xa3, 0x5b, 0x5a, 0xcc, 0xb7, 0x13, 0x5c, 0x37, 0xb2, 0x71, 0xd9, 0x82, 0x68, 0x3f, 0xa4,
-	0xba, 0x47, 0x4d, 0xe6, 0x59, 0x11, 0x37, 0xf9, 0x25, 0x82, 0x89, 0x15, 0x9f, 0x7a, 0xcb, 0x52,
-	0xa8, 0xaf, 0xd1, 0xf5, 0x80, 0xfa, 0x1c, 0x9f, 0x85, 0x97, 0x0c, 0xcb, 0xf2, 0xa8, 0xef, 0x4f,
-	0xa3, 0x53, 0x68, 0x26, 0x57, 0xc1, 0x9b, 0xed, 0xe2, 0xd8, 0x86, 0xd1, 0x74, 0xae, 0x11, 0x49,
-	0x20, 0x9a, 0xda, 0x82, 0xcf, 0xc0, 0x4b, 0x2d, 0xc6, 0x1c, 0xdd, 0xb6, 0xa6, 0x47, 0x4e, 0xa1,
-	0x99, 0x7d, 0xc9, 0xdd, 0x92, 0x40, 0xb4, 0x03, 0xe1, 0xaf, 0xaa, 0x85, 0x17, 0x00, 0x3a, 0x01,
-	0x99, 0xde, 0x7b, 0x0a, 0xcd, 0x1c, 0xbc, 0xf0, 0x85, 0x92, 0xf4, 0x65, 0x18, 0xbd, 0x52, 0x94,
-	0x95, 0x12, 0x7a, 0x69, 0xd9, 0xa8, 0x53, 0x09, 0x4b, 0x4b, 0x70, 0x92, 0xdf, 0x22, 0x38, 0xd6,
-	0x83, 0xdd, 0x6f, 0x31, 0xd7, 0xa7, 0xf8, 0x6d, 0xc8, 0x29, 0x2f, 0x85, 0xf0, 0xf7, 0xce, 0x1c,
-	0xbc, 0x70, 0xa3, 0x94, 0x29, 0xbb, 0x4b, 0x0b, 0x81, 0xe3, 0x28, 0x81, 0x15, 0x8f, 0x1a, 0x0d,
-	0x8b, 0x3d, 0x72, 0x2b, 0xfb, 0x9e, 0xb6, 0x8b, 0x7b, 0xb4, 0x8e, 0x50, 0x7c, 0xa7, 0xcb, 0x86,
-	0x11, 0x61, 0xc3, 0x6b, 0x3b, 0xda, 0x10, 0xc1, 0xeb, 0x32, 0x62, 0x09, 0xc6, 0x63, 0x75, 0x1b,
-	0x55, 0x4b, 0xb9, 0xff, 0x0a, 0x1c, 0x54, 0xca, 0x42, 0xa7, 0x22, 0xe1, 0xd4, 0xc9, 0xcd, 0x76,
-	0x11, 0x2b, 0xa7, 0xc6, 0x44, 0xa2, 0x81, 0x5a, 0x55, 0x2d, 0xf2, 0x10, 0x26, 0xba, 0xe5, 0x49,
-	0x97, 0x7c, 0x0b, 0x5e, 0x56, 0xbb, 0x84, 0xb4, 0x17, 0xe3, 0x91, 0x58, 0x26, 0x59, 0x80, 0xa9,
-	0xa5, 0xa0, 0xb9, 0xcc, 0x98, 0xb3, 0x25, 0x95, 0x12, 0xc9, 0x81, 0x76, 0x4a, 0x0e, 0xf2, 0x4d,
-	0x98, 0xde, 0x2a, 0x47, 0xda, 0x70, 0x1b, 0xc6, 0x62, 0xbb, 0x4d, 0x16, 0xb8, 0x5c, 0xca, 0x3b,
-	0xbe, 0xd9, 0x2e, 0x1e, 0xeb, 0xf1, 0x8b, 0xa0, 0x13, 0xed, 0x90, 0x7a, 0x30, 0x27, 0xd6, 0x5f,
-	0x85, 0xd1, 0x50, 0x74, 0x0c, 0x6d, 0x21, 0x25, 0x8c, 0xc3, 0xa4, 0xe2, 0xf7, 0x11, 0x1c, 0x92,
-	0x82, 0x25, 0xd6, 0xcb, 0xb0, 0x3f, 0xb4, 0x48, 0xa5, 0xdf, 0x44, 0x29, 0x3a, 0xfc, 0x25, 0x75,
-	0xf8, 0x4b, 0xb3, 0xee, 0x46, 0x25, 0xf7, 0xfb, 0x5f, 0x9c, 0xdb, 0x1f, 0xf2, 0x55, 0xb5, 0x68,
-	0xf7, 0x8b, 0xcb, 0xab, 0xc3, 0x70, 0x68, 0x59, 0xd4, 0x5c, 0x09, 0x97, 0xac, 0xc0, 0x98, 0x7a,
-	0x20, 0x21, 0xce, 0xc1, 0x81, 0xa8, 0x2c, 0xcb, 0x84, 0x38, 0xbd, 0x43, 0x42, 0x44, 0xec, 0x32,
-	0xf2, 0x92, 0x95, 0x7c, 0x88, 0xe0, 0xc8, 0x03, 0xdb, 0x6c, 0x2c, 0xaa, 0x6d, 0x4b, 0x94, 0xe3,
-	0xb7, 0xe1, 0x50, 0xcc, 0xa6, 0xbb, 0x94, 0xcb, 0x12, 0x72, 0x3d, 0xe4, 0xfc, 0xa4, 0x5d, 0x3c,
-	0x11, 0xd9, 0xe3, 0x5b, 0x8d, 0x92, 0xcd, 0xca, 0x4d, 0x83, 0xaf, 0x95, 0x16, 0x69, 0xdd, 0x30,
-	0x37, 0xe6, 0xa9, 0xb9, 0xd9, 0x2e, 0x4e, 0x44, 0xa1, 0xec, 0x92, 0x40, 0xb4, 0x51, 0x27, 0xa9,
-	0xe1, 0x12, 0x40, 0xf8, 0x7a, 0xd0, 0x6d, 0xd7, 0xa2, 0x8f, 0x85, 0x9f, 0xf6, 0x56, 0x8e, 0x6d,
-	0xb6, 0x8b, 0x47, 0x23, 0xde, 0x0e, 0x8d, 0x68, 0xb9, 0xe8, 0x3d, 0x12, 0xfe, 0xfe, 0x07, 0x82,
-	0xa9, 0x18, 0xe8, 0x3c, 0x6d, 0xf1, 0xb5, 0xaf, 0xd9, 0x7c, 0x4d, 0x33, 0xdc, 0x3a, 0xc5, 0xab,
-	0x70, 0xa4, 0xa3, 0xd1, 0x68, 0xc6, 0xe9, 0xb5, 0x4b, 0xd8, 0x87, 0xe3, 0xf5, 0xac, 0x90, 0x19,
-	0x22, 0x77, 0xd8, 0x23, 0xea, 0xe9, 0x21, 0xac, 0xad, 0xc8, 0x3b, 0x34, 0xa2, 0xe5, 0xc4, 0x22,
-	0xf4, 0x6e, 0xc8, 0x15, 0xb4, 0x5a, 0x8a, 0x6b, 0x6f, 0x2f, 0x57, 0x87, 0x46, 0xb4, 0x9c, 0x58,
-	0x84, 0x5c, 0xe4, 0xd3, 0x11, 0x28, 0x24, 0x03, 0x53, 0x75, 0xe7, 0x6d, 0x8f, 0x9a, 0x61, 0x82,
-	0x0c, 0x73, 0x38, 0x71, 0x09, 0x5e, 0xe6, 0xac, 0x41, 0x5d, 0xdd, 0x8e, 0x72, 0x33, 0x57, 0x19,
-	0xdf, 0x6c, 0x17, 0x0f, 0x4b, 0x9f, 0x4b, 0x0a, 0xd1, 0x5e, 0x12, 0x3f, 0xab, 0x6e, 0x88, 0xda,
-	0xe7, 0x86, 0xc7, 0xfb, 0xa0, 0xee, 0xd0, 0x88, 0x96, 0x13, 0x0b, 0x61, 0xeb, 0x55, 0x18, 0x0d,
-	0x7c, 0xaa, 0x9b, 0x81, 0xb4, 0x76, 0xdf, 0x29, 0x34, 0xf3, 0x72, 0x65, 0x6a, 0xb3, 0x5d, 0x1c,
-	0x97, 0xd6, 0x26, 0xa8, 0x44, 0x83, 0xc0, 0xa7, 0x73, 0x41, 0xec, 0xa6, 0x1a, 0x0b, 0x5c, 0x2b,
-	0x62, 0xdc, 0xdf, 0xab, 0xb0, 0x43, 0x23, 0x5a, 0x4e, 0x2c, 0x92, 0x0a, 0x5d, 0xa6, 0x8b, 0x67,
-	0xd3, 0x07, 0xd2, 0x14, 0x2a, 0x6a, 0xa4, 0x70, 0x89, 0x55, 0xc4, 0xe2, 0x27, 0x7b, 0xa1, 0xd8,
-	0xd7, 0xc3, 0xf2, 0x9c, 0xad, 0x25, 0x33, 0xcb, 0x0a, 0xb3, 0x4e, 0x55, 0x85, 0x2b, 0x19, 0x4b,
-	0x70, 0xef, 0x01, 0x93, 0x67, 0xb0, 0x93, 0x5b, 0x22, 0x97, 0x7d, 0xfc, 0x2a, 0x8c, 0x9a, 0x81,
-	0xe7, 0x51, 0x97, 0x27, 0xb2, 0x4b, 0x3b, 0x28, 0x9f, 0x09, 0x5b, 0x1d, 0x38, 0xaa, 0xb6, 0xc4,
-	0xdc, 0x22, 0x32, 0xb9, 0xca, 0xad, 0x6c, 0x79, 0x3e, 0x1d, 0xf9, 0x64, 0x8b, 0x14, 0xa2, 0x1d,
-	0x91, 0xcf, 0x62, 0xa8, 0xf8, 0x3d, 0x04, 0x58, 0x6d, 0xf4, 0xd7, 0x3d, 0xae, 0xb7, 0x3c, 0xdb,
-	0xa4, 0x22, 0xa2, 0xb9, 0xca, 0x03, 0xa9, 0xaf, 0x5c, 0xb7, 0xf9, 0x5a, 0x50, 0x2b, 0x99, 0xac,
-	0x59, 0x96, 0xfe, 0x38, 0xe7, 0x18, 0x35, 0x5f, 0x2d, 0xc4, 0x5f, 0x01, 0xa3, 0x62, 0xd7, 0x23,
-	0x0c, 0xc7, 0xbb, 0x31, 0x74, 0x44, 0x77, 0x40, 0xdc, 0x5f, 0xf7, 0xf8, 0xb2, 0x78, 0xf4, 0x26,
-	0xbc, 0x12, 0x23, 0x5a, 0x8e, 0x4e, 0x86, 0x38, 0xf2, 0x43, 0xbd, 0x9f, 0x7e, 0x8d, 0xe0, 0x64,
-	0x1f, 0x69, 0x32, 0xdc, 0x35, 0xc8, 0x75, 0x3c, 0x1b, 0xc5, 0xf9, 0xf5, 0x8c, 0x71, 0xee, 0x53,
-	0x9b, 0xd4, 0xf5, 0x23, 0x66, 0xc0, 0xd7, 0x60, 0xb4, 0x16, 0x98, 0x0d, 0xca, 0xbb, 0x0a, 0x60,
-	0x22, 0x63, 0x93, 0x54, 0xa2, 0x1d, 0x8c, 0x96, 0x51, 0x11, 0xfc, 0x3a, 0x9c, 0x9c, 0x73, 0x0c,
-	0xbb, 0x69, 0xd4, 0x1c, 0x7a, 0xbf, 0xe5, 0x51, 0xc3, 0xd2, 0xe8, 0x23, 0xc3, 0xb3, 0xfc, 0x5d,
-	0xdf, 0x3d, 0x7e, 0x8c, 0xa0, 0xd0, 0x4f, 0xb4, 0x74, 0xce, 0x77, 0x60, 0xda, 0x54, 0x3b, 0x74,
-	0x5f, 0x6c, 0xd1, 0xbd, 0x68, 0x8f, 0xf4, 0xd5, 0xf1, 0xae, 0xb7, 0x9d, 0xf2, 0xcc, 0x1c, 0xb3,
-	0xdd, 0xca, 0x6b, 0xa1, 0x1b, 0x36, 0xdb, 0xc5, 0xa2, 0x8c, 0x7e, 0x1f, 0x41, 0x44, 0x9b, 0x34,
-	0x53, 0x51, 0x90, 0x15, 0xc8, 0xc7, 0xf8, 0xaa, 0xea, 0x42, 0xbc, 0x7b, 0xbb, 0xdf, 0x1f, 0x81,
-	0x13, 0xa9, 0x72, 0xa5, 0xd1, 0xeb, 0x30, 0xd1, 0xc1, 0x1a, 0x5f, 0xc4, 0x33, 0x18, 0xfc, 0x39,
-	0x69, 0xf0, 0x89, 0x5e, 0x83, 0x3b, 0x42, 0x88, 0x36, 0x6e, 0x6e, 0x55, 0x1d, 0xaa, 0x5c, 0x65,
-	0xde, 0x2a, 0xb5, 0x39, 0xb5, 0x92, 0x2a, 0x47, 0x06, 0x54, 0x99, 0x26, 0x84, 0x68, 0xe3, 0xf1,
-	0xe3, 0x8e, 0x4a, 0xb2, 0x08, 0x27, 0xc3, 0xab, 0xcc, 0xac, 0x69, 0x06, 0xcd, 0xc0, 0x31, 0x38,
-	0xf3, 0x7a, 0xf2, 0x6a, 0xa0, 0x73, 0xf6, 0x9b, 0x11, 0x28, 0xf4, 0x13, 0x27, 0xdd, 0xfa, 0x01,
-	0x82, 0x13, 0x5d, 0x91, 0xd7, 0xeb, 0x1e, 0x7b, 0xc4, 0xd7, 0xf4, 0xba, 0xc3, 0x6a, 0x86, 0x23,
-	0xdd, 0xfb, 0x4a, 0xaa, 0xad, 0xf3, 0xd4, 0x14, 0xe6, 0x5e, 0x0c, 0xcd, 0xfd, 0xf0, 0xd3, 0xe2,
-	0x99, 0x44, 0x0d, 0x92, 0x7d, 0x64, 0xf4, 0xe7, 0x9c, 0x6f, 0x35, 0xca, 0x7c, 0xa3, 0x45, 0x7d,
-	0xc5, 0xe3, 0x6b, 0xd3, 0x7e, 0x22, 0xab, 0xee, 0x08, 0x9d, 0x77, 0x84, 0x4a, 0xfc, 0x5d, 0x04,
-	0x13, 0x41, 0x2b, 0x6c, 0xfc, 0x7a, 0xb0, 0x44, 0x7e, 0xbf, 0x94, 0xb1, 0x0e, 0xac, 0x08, 0x11,
-	0x0f, 0x3c, 0xc3, 0x6c, 0x50, 0xaf, 0x37, 0x24, 0x69, 0xf2, 0x89, 0x86, 0xa3, 0xc7, 0x49, 0x34,
-	0xe4, 0x7d, 0x04, 0x85, 0xb0, 0x3e, 0x25, 0x7c, 0x28, 0x65, 0x0e, 0x15, 0x93, 0x21, 0x2f, 0x5d,
-	0x9f, 0x8d, 0x40, 0xb1, 0x2f, 0x0a, 0x19, 0xca, 0xa7, 0x08, 0xae, 0xa6, 0x86, 0x92, 0xb5, 0xc4,
-	0x39, 0xa3, 0xba, 0xa5, 0x5e, 0xab, 0x3a, 0x5b, 0xd5, 0x1d, 0xc3, 0xe7, 0x3a, 0xf7, 0x8c, 0x87,
-	0xd4, 0xf3, 0xff, 0x97, 0x81, 0xbe, 0xb0, 0x35, 0xd0, 0x6f, 0x49, 0x40, 0xf1, 0x6b, 0xfe, 0xad,
-	0xd5, 0x45, 0xc3, 0xe7, 0x0f, 0x14, 0x18, 0xfc, 0x04, 0x0e, 0xcb, 0x08, 0x71, 0x69, 0xe5, 0xae,
-	0x82, 0x5f, 0x90, 0xc1, 0x9f, 0xec, 0x0a, 0xbe, 0x12, 0x4d, 0xb4, 0xb1, 0x20, 0xb9, 0xdd, 0x27,
-	0xdf, 0x43, 0x30, 0x15, 0x1f, 0x4a, 0x4d, 0xb4, 0xfa, 0xc3, 0x05, 0xfb, 0x45, 0xb5, 0x46, 0x1f,
-	0x21, 0x98, 0xde, 0x0a, 0x48, 0xc6, 0xdd, 0x86, 0xa3, 0xbd, 0x83, 0x09, 0x55, 0x16, 0xbf, 0x9c,
-	0xd1, 0x5d, 0x3d, 0xb2, 0xe5, 0xbb, 0xf2, 0x88, 0xdd, 0xa3, 0xf2, 0xc5, 0x75, 0x56, 0xef, 0x22,
-	0x38, 0x33, 0xb7, 0x70, 0xf7, 0xae, 0xe8, 0xdb, 0xac, 0x45, 0xdb, 0x6d, 0x2c, 0x78, 0xac, 0x39,
-	0x97, 0x00, 0x19, 0x51, 0x94, 0xd7, 0xef, 0xc1, 0x44, 0xd2, 0x02, 0xbd, 0x3b, 0x04, 0xc5, 0x44,
-	0x79, 0x4f, 0xd9, 0x45, 0x34, 0x6c, 0x6e, 0x91, 0x4c, 0x6c, 0x38, 0x9b, 0x0d, 0x81, 0x74, 0xf3,
-	0x55, 0x18, 0x35, 0x57, 0x9b, 0xcd, 0x1e, 0xd5, 0x89, 0xeb, 0x42, 0x92, 0x4a, 0x34, 0x08, 0x97,
-	0x52, 0xd5, 0x5d, 0x38, 0xb9, 0xe2, 0x53, 0x6f, 0xc5, 0xad, 0x31, 0xd7, 0xb2, 0xdd, 0xfa, 0xee,
-	0x06, 0x45, 0xe4, 0xa7, 0x08, 0x0a, 0xfd, 0xe4, 0x49, 0xb0, 0xef, 0x22, 0xc8, 0xc7, 0x83, 0x16,
-	0xfd, 0x91, 0xcd, 0xd7, 0xf4, 0x16, 0xf5, 0x6c, 0x66, 0xe9, 0x0e, 0x33, 0x1b, 0x32, 0x3b, 0x6e,
-	0x66, 0xcc, 0x0e, 0x25, 0x3e, 0xbc, 0x4b, 0x2d, 0x0b, 0x29, 0x8b, 0xcc, 0x6c, 0xc8, 0x24, 0x99,
-	0x8a, 0xd5, 0x74, 0x93, 0x49, 0x1e, 0xa6, 0xef, 0x50, 0xfe, 0x80, 0x71, 0xc3, 0x89, 0xaf, 0x64,
-	0xaa, 0x8f, 0xfe, 0x01, 0x82, 0xe3, 0x29, 0x44, 0x09, 0x9e, 0xc3, 0x61, 0x1e, 0x52, 0xf4, 0xde,
-	0x2b, 0xe0, 0x36, 0xaf, 0xdc, 0x2f, 0xc9, 0xd2, 0x34, 0x93, 0xa1, 0x34, 0x45, 0x75, 0x69, 0x8c,
-	0x77, 0x69, 0x27, 0x9b, 0x08, 0x0a, 0x4b, 0x41, 0x73, 0x89, 0x3e, 0xe6, 0x55, 0xd7, 0xe6, 0xb6,
-	0xe1, 0xd8, 0xdf, 0xa6, 0xa2, 0xb7, 0x19, 0xee, 0xec, 0xdf, 0x82, 0x31, 0xd5, 0xcd, 0xe9, 0x16,
-	0x75, 0x59, 0x53, 0x76, 0x7b, 0x89, 0x41, 0x4b, 0x37, 0x9d, 0x68, 0xa3, 0xb2, 0xe7, 0x9b, 0x0f,
-	0x97, 0xb8, 0x06, 0x79, 0x37, 0x68, 0xea, 0x2e, 0x7d, 0x1c, 0xde, 0x41, 0x63, 0x44, 0xa2, 0x2b,
-	0xf1, 0x45, 0xbb, 0xb1, 0xaf, 0x72, 0x7a, 0xb3, 0x5d, 0x7c, 0x35, 0x12, 0xd6, 0x7f, 0x2f, 0xd1,
-	0xa6, 0xdc, 0x74, 0xc3, 0xc8, 0x8f, 0x46, 0xa0, 0xd8, 0xd7, 0xe8, 0xff, 0xfb, 0xd6, 0xeb, 0xc2,
-	0xbf, 0xf2, 0xb0, 0xff, 0x5e, 0x58, 0xd1, 0xf0, 0xcf, 0x10, 0x88, 0x21, 0x93, 0x8f, 0x2f, 0x66,
-	0x3e, 0x35, 0x9d, 0x19, 0x59, 0xfe, 0xd2, 0x60, 0x4c, 0x91, 0xe7, 0xc9, 0xa5, 0xf7, 0xfe, 0xf0,
-	0xd7, 0x1f, 0x8e, 0x94, 0xf0, 0xd9, 0x72, 0xd6, 0xa9, 0x76, 0x08, 0xf0, 0xe7, 0x08, 0x0e, 0x44,
-	0x63, 0x26, 0x9c, 0x59, 0x6d, 0x72, 0xca, 0x95, 0xbf, 0x3c, 0x20, 0x97, 0x44, 0x7b, 0x59, 0xa0,
-	0x2d, 0xe3, 0x73, 0x59, 0xd1, 0x46, 0x18, 0x3f, 0x42, 0x70, 0xa8, 0x6b, 0x02, 0x8d, 0xaf, 0x67,
-	0x7d, 0xc9, 0xa7, 0xcc, 0xdc, 0xf3, 0x37, 0x86, 0x63, 0x96, 0x36, 0x54, 0x84, 0x0d, 0x37, 0xf0,
-	0xb5, 0xf2, 0x60, 0xdf, 0x11, 0xfc, 0xf2, 0x3b, 0xb2, 0x3a, 0x3f, 0xc1, 0x9f, 0x21, 0x38, 0x96,
-	0xda, 0xdd, 0xe2, 0xb9, 0x41, 0x5b, 0xd8, 0x94, 0x4e, 0x3b, 0x3f, 0xbf, 0x3b, 0x21, 0xd2, 0xd0,
-	0x3b, 0xc2, 0xd0, 0x59, 0x7c, 0x2b, 0xa3, 0xa1, 0x9d, 0x0a, 0xa0, 0x86, 0x64, 0xba, 0x27, 0x6c,
-	0xfa, 0x77, 0x72, 0x1c, 0xd8, 0x3d, 0xbc, 0xc1, 0x6f, 0x0c, 0x0a, 0x35, 0x75, 0xbc, 0x96, 0x5f,
-	0xd8, 0xad, 0x18, 0x69, 0x73, 0x55, 0xd8, 0x3c, 0x87, 0x67, 0x07, 0xb6, 0xd9, 0x15, 0x63, 0x80,
-	0xce, 0xfd, 0x19, 0xff, 0x13, 0xc1, 0x64, 0x7a, 0x97, 0x8e, 0xb3, 0xc6, 0x67, 0xdb, 0xf9, 0x41,
-	0xfe, 0x8d, 0x5d, 0x4a, 0x19, 0x32, 0xcc, 0xfd, 0xc6, 0x01, 0xf8, 0x2f, 0x08, 0xc6, 0x53, 0xda,
-	0x73, 0x3c, 0x3b, 0x28, 0xce, 0x2d, 0x23, 0x83, 0x7c, 0x65, 0x37, 0x22, 0xa4, 0x9d, 0x73, 0xc2,
-	0xce, 0x9b, 0xf8, 0xfa, 0xc0, 0x76, 0x76, 0x5a, 0x72, 0xfc, 0x3b, 0x04, 0xa3, 0xc9, 0xef, 0x3e,
-	0xf8, 0xda, 0x80, 0x17, 0xa4, 0xc4, 0xc7, 0xa7, 0xfc, 0xf5, 0xa1, 0x78, 0xa5, 0x39, 0x37, 0x85,
-	0x39, 0x57, 0xf0, 0xe5, 0x01, 0xcb, 0x90, 0x5e, 0xdb, 0xd0, 0x6d, 0x0b, 0xff, 0x0d, 0xc1, 0x64,
-	0x7a, 0xdf, 0x9f, 0x39, 0x3b, 0xb7, 0x9d, 0x42, 0x64, 0xce, 0xce, 0xed, 0x87, 0x0f, 0x64, 0x56,
-	0x98, 0x79, 0x1d, 0x5f, 0x1d, 0xe0, 0xfd, 0xa6, 0x1b, 0xa1, 0xbc, 0x38, 0x2f, 0xff, 0x88, 0xe0,
-	0x48, 0x6f, 0x67, 0x84, 0x5f, 0x1f, 0xae, 0xed, 0x89, 0xcd, 0xbb, 0x35, 0x34, 0xbf, 0x34, 0xec,
-	0xb6, 0x30, 0xec, 0x1a, 0xfe, 0x4a, 0x79, 0xb8, 0x0f, 0xcb, 0x3e, 0xfe, 0x3b, 0x82, 0xa9, 0x3e,
-	0x0d, 0x7f, 0xe6, 0xb2, 0xba, 0xfd, 0xd8, 0x22, 0x73, 0x59, 0xdd, 0x61, 0xee, 0x30, 0xf0, 0x3b,
-	0x53, 0xbc, 0x3c, 0xa2, 0x28, 0xaa, 0x16, 0x1c, 0xff, 0x6a, 0x04, 0x3e, 0x9f, 0xa5, 0x1b, 0xc3,
-	0x5a, 0xd6, 0x62, 0x91, 0xbd, 0xb9, 0xcc, 0xdf, 0x7f, 0xa1, 0x32, 0xa5, 0x57, 0x6c, 0xe1, 0x15,
-	0x13, 0x1b, 0x59, 0x2b, 0x52, 0xa2, 0x7b, 0xd4, 0x1d, 0xdb, 0x6d, 0xe8, 0xab, 0x1e, 0x6b, 0xea,
-	0x49, 0xa6, 0xf2, 0x3b, 0x69, 0xdd, 0xed, 0x13, 0xfc, 0x1f, 0x04, 0x93, 0xe9, 0xfd, 0x60, 0xe6,
-	0xe3, 0xbe, 0x6d, 0x7b, 0x9a, 0xf9, 0xb8, 0x6f, 0xdf, 0x94, 0x92, 0x7b, 0xc2, 0x25, 0x6f, 0xe2,
-	0x6a, 0x46, 0x97, 0x04, 0x3e, 0xf5, 0xf4, 0x40, 0xc9, 0xd3, 0xd3, 0xee, 0x5a, 0x9f, 0x20, 0x38,
-	0xba, 0xa5, 0x91, 0xc4, 0x59, 0xcf, 0x6f, 0xbf, 0xfe, 0x34, 0x7f, 0x7b, 0x78, 0x01, 0x43, 0x1e,
-	0x8a, 0x3a, 0xe5, 0x7a, 0x4f, 0xd3, 0x2b, 0xae, 0x56, 0x7d, 0x9a, 0xb3, 0xcc, 0x35, 0x60, 0xfb,
-	0x8e, 0x36, 0x73, 0x0d, 0xd8, 0xa1, 0x47, 0x1c, 0xf8, 0x6a, 0xd5, 0xbf, 0x59, 0xad, 0xac, 0x3d,
-	0x7d, 0x56, 0x40, 0x1f, 0x3f, 0x2b, 0xa0, 0x3f, 0x3f, 0x2b, 0xa0, 0x0f, 0x9e, 0x17, 0xf6, 0x7c,
-	0xfc, 0xbc, 0xb0, 0xe7, 0x4f, 0xcf, 0x0b, 0x7b, 0xbe, 0xb1, 0xb4, 0xd3, 0x37, 0xae, 0x87, 0x17,
-	0x2e, 0x96, 0x1f, 0x77, 0x69, 0x3e, 0xd7, 0x51, 0x6d, 0x3a, 0x36, 0x75, 0x79, 0xf4, 0x4f, 0x4d,
-	0xd1, 0x3f, 0x10, 0x1c, 0x10, 0x7f, 0x2e, 0xfe, 0x37, 0x00, 0x00, 0xff, 0xff, 0x3c, 0xf4, 0x88,
-	0x4a, 0xe7, 0x25, 0x00, 0x00,
+	0x15, 0x4e, 0x39, 0x3f, 0x9b, 0x79, 0x71, 0x9c, 0xa4, 0xec, 0xd8, 0xce, 0x24, 0x99, 0xc9, 0x16,
+	0x84, 0xb5, 0x48, 0x32, 0x43, 0xfe, 0x08, 0xf9, 0xdb, 0xc4, 0x63, 0xaf, 0xa3, 0xd1, 0x3a, 0x5e,
+	0xa7, 0x13, 0x03, 0x42, 0x88, 0xde, 0x9e, 0xee, 0xf2, 0xb8, 0x35, 0x3d, 0x5d, 0xe3, 0xee, 0xea,
+	0x24, 0x66, 0x89, 0xb4, 0xda, 0x3d, 0x22, 0xc1, 0x22, 0xae, 0x08, 0x09, 0x71, 0x41, 0x2b, 0x8e,
+	0x5c, 0xe0, 0x82, 0xe0, 0x80, 0x22, 0x0e, 0xab, 0x95, 0x10, 0x12, 0xda, 0xc3, 0x2c, 0x24, 0x1c,
+	0x90, 0x16, 0x90, 0x30, 0x17, 0x8e, 0xa8, 0xab, 0xab, 0x7f, 0x66, 0xa6, 0xc7, 0xee, 0x19, 0x9b,
+	0x13, 0x27, 0x4f, 0xf5, 0xab, 0xf7, 0xde, 0xf7, 0x7e, 0xea, 0x75, 0xbd, 0xd7, 0x86, 0x8b, 0xcc,
+	0x6d, 0x32, 0xd7, 0x74, 0xcb, 0x3a, 0xb3, 0x75, 0x6a, 0x73, 0x47, 0xe3, 0xd4, 0xb0, 0xcc, 0x75,
+	0xcf, 0x34, 0x4c, 0xbe, 0x51, 0x7e, 0x7c, 0xb1, 0x46, 0xb9, 0x76, 0xb1, 0xbc, 0xee, 0x51, 0x67,
+	0xa3, 0xd4, 0x72, 0x18, 0x67, 0xf8, 0xac, 0x64, 0x29, 0xa5, 0xb2, 0x94, 0x24, 0x4b, 0x7e, 0xa2,
+	0xce, 0xea, 0x4c, 0x70, 0x94, 0xfd, 0x5f, 0x01, 0x73, 0xfe, 0x8b, 0x5b, 0xeb, 0x6b, 0x69, 0x8e,
+	0xd6, 0x74, 0xe5, 0xde, 0xab, 0xd9, 0xb0, 0x71, 0x53, 0x6f, 0xa8, 0xa6, 0xbd, 0x1a, 0xaa, 0x28,
+	0xe8, 0x82, 0xaf, 0x5c, 0xd3, 0x5c, 0x1a, 0x6d, 0xd2, 0x99, 0x69, 0x87, 0x10, 0x92, 0x74, 0x61,
+	0x58, 0xb4, 0xab, 0xa5, 0xd5, 0x4d, 0x5b, 0xe3, 0x26, 0x0b, 0xf7, 0x9e, 0xaa, 0x33, 0x56, 0xb7,
+	0x68, 0x59, 0x6b, 0x99, 0x65, 0xcd, 0xb6, 0x19, 0x17, 0xc4, 0x10, 0xe0, 0x09, 0x49, 0x15, 0xab,
+	0x9a, 0xb7, 0x5a, 0xd6, 0xec, 0x8d, 0x90, 0x14, 0x28, 0x51, 0x03, 0x07, 0x04, 0x0b, 0x49, 0xba,
+	0x92, 0xcd, 0xac, 0x16, 0x73, 0xcd, 0x04, 0x92, 0x5b, 0xd9, 0xb8, 0x4c, 0x41, 0x34, 0x1f, 0x53,
+	0xd5, 0xa1, 0x3a, 0x73, 0x8c, 0x80, 0x9b, 0xfc, 0x12, 0xc1, 0xc4, 0x8a, 0x4b, 0x9d, 0x65, 0x29,
+	0xd4, 0x55, 0xe8, 0xba, 0x47, 0x5d, 0x8e, 0xcf, 0xc3, 0x2b, 0x9a, 0x61, 0x38, 0xd4, 0x75, 0xa7,
+	0xd1, 0x19, 0x34, 0x93, 0xab, 0xe0, 0xcd, 0x76, 0x71, 0x6c, 0x43, 0x6b, 0x5a, 0x37, 0x88, 0x24,
+	0x10, 0x25, 0xdc, 0x82, 0xcf, 0xc1, 0x2b, 0x2d, 0xc6, 0x2c, 0xd5, 0x34, 0xa6, 0x47, 0xce, 0xa0,
+	0x99, 0x7d, 0xc9, 0xdd, 0x92, 0x40, 0x94, 0x03, 0xfe, 0xaf, 0xaa, 0x81, 0x17, 0x00, 0x62, 0x7f,
+	0x4e, 0xef, 0x3d, 0x83, 0x66, 0x0e, 0x5d, 0xfa, 0x42, 0x49, 0xba, 0xc2, 0x77, 0x7e, 0x29, 0xc8,
+	0x2a, 0x09, 0xbd, 0xb4, 0xac, 0xd5, 0xa9, 0x84, 0xa5, 0x24, 0x38, 0xc9, 0x6f, 0x11, 0x1c, 0xef,
+	0xc2, 0xee, 0xb6, 0x98, 0xed, 0x52, 0xfc, 0x36, 0xe4, 0x42, 0x2f, 0xf9, 0xf0, 0xf7, 0xce, 0x1c,
+	0xba, 0x74, 0xab, 0x94, 0x29, 0x3b, 0x4b, 0x0b, 0x9e, 0x65, 0x85, 0x02, 0x2b, 0x0e, 0xd5, 0x1a,
+	0x06, 0x7b, 0x62, 0x57, 0xf6, 0x3d, 0x6f, 0x17, 0xf7, 0x28, 0xb1, 0x50, 0x7c, 0xaf, 0xc3, 0x86,
+	0x11, 0x61, 0xc3, 0x6b, 0xdb, 0xda, 0x10, 0xc0, 0xeb, 0x30, 0x62, 0x09, 0xc6, 0x23, 0x75, 0x1b,
+	0x55, 0x23, 0x74, 0xff, 0x35, 0x38, 0x14, 0x2a, 0xf3, 0x9d, 0x8a, 0x84, 0x53, 0x27, 0x37, 0xdb,
+	0x45, 0x1c, 0x3a, 0x35, 0x22, 0x12, 0x05, 0xc2, 0x55, 0xd5, 0x20, 0x8f, 0x61, 0xa2, 0x53, 0x9e,
+	0x74, 0xc9, 0xb7, 0xe0, 0x60, 0xb8, 0x4b, 0x48, 0xdb, 0x1d, 0x8f, 0x44, 0x32, 0xc9, 0x02, 0x4c,
+	0x2d, 0x79, 0xcd, 0x65, 0xc6, 0xac, 0x9e, 0x54, 0x4a, 0x24, 0x07, 0xda, 0x2e, 0x39, 0xc8, 0x37,
+	0x61, 0xba, 0x57, 0x8e, 0xb4, 0xe1, 0x2e, 0x8c, 0x45, 0x76, 0xeb, 0xcc, 0xb3, 0xb9, 0x94, 0x77,
+	0x62, 0xb3, 0x5d, 0x3c, 0xde, 0xe5, 0x17, 0x41, 0x27, 0xca, 0xe1, 0xf0, 0xc1, 0x9c, 0x58, 0x7f,
+	0x15, 0x46, 0x7d, 0xd1, 0x11, 0xb4, 0x85, 0x94, 0x30, 0x0e, 0x93, 0x8a, 0xdf, 0x47, 0x70, 0x58,
+	0x0a, 0x96, 0x58, 0xaf, 0xc2, 0x7e, 0xdf, 0xa2, 0x30, 0xfd, 0x26, 0x4a, 0x41, 0x49, 0x28, 0x85,
+	0x25, 0xa1, 0x34, 0x6b, 0x6f, 0x54, 0x72, 0xbf, 0xff, 0xc5, 0x85, 0xfd, 0x3e, 0x5f, 0x55, 0x09,
+	0x76, 0xef, 0x5e, 0x5e, 0x1d, 0x81, 0xc3, 0xcb, 0xa2, 0x66, 0x4a, 0xb8, 0x64, 0x05, 0xc6, 0xc2,
+	0x07, 0x12, 0xe2, 0x1c, 0x1c, 0x08, 0xca, 0xaa, 0x4c, 0x88, 0xb3, 0xdb, 0x24, 0x44, 0xc0, 0x2e,
+	0x23, 0x2f, 0x59, 0xc9, 0x87, 0x08, 0x8e, 0x3e, 0x32, 0xf5, 0xc6, 0x62, 0xb8, 0x6d, 0x89, 0x72,
+	0xfc, 0x36, 0x1c, 0x8e, 0xd8, 0x54, 0x9b, 0x72, 0x59, 0x42, 0x6e, 0xfa, 0x9c, 0x9f, 0xb4, 0x8b,
+	0x27, 0x03, 0x7b, 0x5c, 0xa3, 0x51, 0x32, 0x59, 0xb9, 0xa9, 0xf1, 0xb5, 0xd2, 0x22, 0xad, 0x6b,
+	0xfa, 0xc6, 0x3c, 0xd5, 0x37, 0xdb, 0xc5, 0x89, 0x20, 0x94, 0x1d, 0x12, 0x88, 0x32, 0x6a, 0x25,
+	0x35, 0x5c, 0x01, 0x90, 0xe5, 0xdd, 0xa0, 0x4f, 0x85, 0x9f, 0xf6, 0x56, 0x8e, 0x6f, 0xb6, 0x8b,
+	0xc7, 0x02, 0xde, 0x98, 0x46, 0x94, 0x9c, 0xbf, 0xa8, 0x8a, 0xdf, 0xff, 0x40, 0x30, 0x15, 0x01,
+	0x9d, 0xa7, 0x2d, 0xbe, 0xf6, 0x35, 0x93, 0xaf, 0x29, 0x9a, 0x5d, 0xa7, 0x78, 0x15, 0x8e, 0xc6,
+	0x1a, 0xb5, 0x66, 0x94, 0x5e, 0x3b, 0x84, 0x7d, 0x24, 0x5a, 0xcf, 0x0a, 0x99, 0x3e, 0x72, 0x8b,
+	0x3d, 0xa1, 0x8e, 0xea, 0xc3, 0xea, 0x45, 0x1e, 0xd3, 0x88, 0x92, 0x13, 0x0b, 0xdf, 0xbb, 0x3e,
+	0x97, 0xd7, 0x6a, 0x85, 0x5c, 0x7b, 0xbb, 0xb9, 0x62, 0x1a, 0x51, 0x72, 0x62, 0xe1, 0x73, 0x91,
+	0x4f, 0x47, 0xa0, 0x90, 0x0c, 0x4c, 0xd5, 0x9e, 0x37, 0x1d, 0xaa, 0xfb, 0x09, 0x32, 0xcc, 0xe1,
+	0xc4, 0x25, 0x38, 0xc8, 0x59, 0x83, 0xda, 0xaa, 0x19, 0xe4, 0x66, 0xae, 0x32, 0xbe, 0xd9, 0x2e,
+	0x1e, 0x91, 0x3e, 0x97, 0x14, 0xa2, 0xbc, 0x22, 0x7e, 0x56, 0x6d, 0x1f, 0xb5, 0xcb, 0x35, 0x87,
+	0xf7, 0x41, 0x1d, 0xd3, 0x88, 0x92, 0x13, 0x0b, 0x61, 0xeb, 0x75, 0x18, 0xf5, 0x5c, 0xaa, 0xea,
+	0x9e, 0xb4, 0x76, 0xdf, 0x19, 0x34, 0x73, 0xb0, 0x32, 0xb5, 0xd9, 0x2e, 0x8e, 0x4b, 0x6b, 0x13,
+	0x54, 0xa2, 0x80, 0xe7, 0xd2, 0x39, 0x2f, 0x72, 0x53, 0x8d, 0x79, 0xb6, 0x11, 0x30, 0xee, 0xef,
+	0x56, 0x18, 0xd3, 0x88, 0x92, 0x13, 0x8b, 0xa4, 0x42, 0x9b, 0xa9, 0xe2, 0xd9, 0xf4, 0x81, 0x34,
+	0x85, 0x21, 0x35, 0x50, 0xb8, 0xc4, 0x2a, 0x62, 0xf1, 0x93, 0xbd, 0x50, 0xec, 0xeb, 0x61, 0x79,
+	0xce, 0xd6, 0x92, 0x99, 0x65, 0xf8, 0x59, 0x17, 0x56, 0x85, 0x6b, 0x19, 0x4b, 0x70, 0xf7, 0x01,
+	0x93, 0x67, 0x30, 0xce, 0x2d, 0x91, 0xcb, 0x2e, 0x7e, 0x15, 0x46, 0x75, 0xcf, 0x71, 0xa8, 0xcd,
+	0x13, 0xd9, 0xa5, 0x1c, 0x92, 0xcf, 0x84, 0xad, 0x16, 0x1c, 0x0b, 0xb7, 0x44, 0xdc, 0x22, 0x32,
+	0xb9, 0xca, 0x9d, 0x6c, 0x79, 0x3e, 0x1d, 0xf8, 0xa4, 0x47, 0x0a, 0x51, 0x8e, 0xca, 0x67, 0x11,
+	0x54, 0xfc, 0x1e, 0x02, 0x1c, 0x6e, 0x74, 0xd7, 0x1d, 0xae, 0xb6, 0x1c, 0x53, 0xa7, 0x22, 0xa2,
+	0xb9, 0xca, 0x23, 0xa9, 0xaf, 0x5c, 0x37, 0xf9, 0x9a, 0x57, 0x2b, 0xe9, 0xac, 0x59, 0x96, 0xfe,
+	0xb8, 0x60, 0x69, 0x35, 0x37, 0x5c, 0x88, 0xbf, 0x02, 0x46, 0xc5, 0xac, 0x07, 0x18, 0x4e, 0x74,
+	0x62, 0x88, 0x45, 0xc7, 0x20, 0x1e, 0xae, 0x3b, 0x7c, 0x59, 0x3c, 0x7a, 0x13, 0x4e, 0x45, 0x88,
+	0x96, 0x83, 0x93, 0x21, 0x8e, 0xfc, 0x50, 0xef, 0xa7, 0x5f, 0x23, 0x38, 0xdd, 0x47, 0x9a, 0x0c,
+	0x77, 0x0d, 0x72, 0xb1, 0x67, 0x83, 0x38, 0xbf, 0x9e, 0x31, 0xce, 0x7d, 0x6a, 0x53, 0x78, 0xfd,
+	0x88, 0x18, 0xf0, 0x0d, 0x18, 0xad, 0x79, 0x7a, 0x83, 0xf2, 0x8e, 0x02, 0x98, 0xc8, 0xd8, 0x24,
+	0x95, 0x28, 0x87, 0x82, 0x65, 0x50, 0x04, 0xbf, 0x0e, 0xa7, 0xe7, 0x2c, 0xcd, 0x6c, 0x6a, 0x35,
+	0x8b, 0x3e, 0x6c, 0x39, 0x54, 0x33, 0x14, 0xfa, 0x44, 0x73, 0x0c, 0x77, 0xc7, 0x77, 0x8f, 0x1f,
+	0x23, 0x28, 0xf4, 0x13, 0x2d, 0x9d, 0xf3, 0x1d, 0x98, 0xd6, 0xc3, 0x1d, 0xaa, 0x2b, 0xb6, 0xa8,
+	0x4e, 0xb0, 0x47, 0xfa, 0xea, 0x44, 0xc7, 0xdb, 0x2e, 0xf4, 0xcc, 0x1c, 0x33, 0xed, 0xca, 0x6b,
+	0xbe, 0x1b, 0x36, 0xdb, 0xc5, 0xa2, 0x8c, 0x7e, 0x1f, 0x41, 0x44, 0x99, 0xd4, 0x53, 0x51, 0x90,
+	0x15, 0xc8, 0x47, 0xf8, 0xaa, 0xe1, 0x85, 0x78, 0xe7, 0x76, 0xbf, 0x3f, 0x02, 0x27, 0x53, 0xe5,
+	0x4a, 0xa3, 0xd7, 0x61, 0x22, 0xc6, 0x1a, 0x5d, 0xc4, 0x33, 0x18, 0xfc, 0x39, 0x69, 0xf0, 0xc9,
+	0x6e, 0x83, 0x63, 0x21, 0x44, 0x19, 0xd7, 0x7b, 0x55, 0xfb, 0x2a, 0x57, 0x99, 0xb3, 0x4a, 0x4d,
+	0x4e, 0x8d, 0xa4, 0xca, 0x91, 0x01, 0x55, 0xa6, 0x09, 0x21, 0xca, 0x78, 0xf4, 0x38, 0x56, 0x49,
+	0x16, 0xe1, 0xb4, 0x7f, 0x95, 0x99, 0xd5, 0x75, 0xaf, 0xe9, 0x59, 0x1a, 0x67, 0x4e, 0x57, 0x5e,
+	0x0d, 0x74, 0xce, 0x7e, 0x33, 0x02, 0x85, 0x7e, 0xe2, 0xa4, 0x5b, 0x3f, 0x40, 0x70, 0xb2, 0x23,
+	0xf2, 0x6a, 0xdd, 0x61, 0x4f, 0xf8, 0x9a, 0x5a, 0xb7, 0x58, 0x4d, 0xb3, 0xa4, 0x7b, 0x4f, 0xa5,
+	0xda, 0x3a, 0x4f, 0x75, 0x61, 0xee, 0x65, 0xdf, 0xdc, 0x0f, 0x3f, 0x2d, 0x9e, 0x4b, 0xd4, 0x20,
+	0xd9, 0x06, 0x06, 0x7f, 0x2e, 0xb8, 0x46, 0xa3, 0xcc, 0x37, 0x5a, 0xd4, 0x0d, 0x79, 0x5c, 0x65,
+	0xda, 0x4d, 0x64, 0xd5, 0x3d, 0xa1, 0xf3, 0x9e, 0x50, 0x89, 0xbf, 0x8b, 0x60, 0xc2, 0x6b, 0x71,
+	0xb3, 0x49, 0xbb, 0xb0, 0x04, 0x7e, 0xbf, 0x92, 0xb1, 0x0e, 0xac, 0x08, 0x11, 0x8f, 0x1c, 0x4d,
+	0x6f, 0x50, 0xa7, 0x3b, 0x24, 0x69, 0xf2, 0x89, 0x82, 0x83, 0xc7, 0x49, 0x34, 0xe4, 0x7d, 0x04,
+	0x05, 0xbf, 0x3e, 0x25, 0x7c, 0x28, 0x65, 0x0e, 0x15, 0x93, 0x21, 0x2f, 0x5d, 0x9f, 0x8d, 0x40,
+	0xb1, 0x2f, 0x0a, 0x19, 0xca, 0xe7, 0x08, 0xae, 0xa7, 0x86, 0x92, 0xb5, 0xc4, 0x39, 0xa3, 0xaa,
+	0x11, 0xbe, 0x56, 0x55, 0xb6, 0xaa, 0x5a, 0x9a, 0xcb, 0x55, 0xee, 0x68, 0x8f, 0xa9, 0xe3, 0xfe,
+	0x2f, 0x03, 0x7d, 0xa9, 0x37, 0xd0, 0x6f, 0x49, 0x40, 0xd1, 0x6b, 0xfe, 0xad, 0xd5, 0x45, 0xcd,
+	0xe5, 0x8f, 0x42, 0x30, 0xf8, 0x19, 0x1c, 0x91, 0x11, 0xe2, 0xd2, 0xca, 0x1d, 0x05, 0xbf, 0x20,
+	0x83, 0x3f, 0xd9, 0x11, 0xfc, 0x50, 0x34, 0x51, 0xc6, 0xbc, 0xe4, 0x76, 0x97, 0x7c, 0x0f, 0xc1,
+	0x54, 0x74, 0x28, 0x15, 0xd1, 0xea, 0x0f, 0x17, 0xec, 0xdd, 0x6a, 0x8d, 0x3e, 0x42, 0x30, 0xdd,
+	0x0b, 0x48, 0xc6, 0xdd, 0x84, 0x63, 0xdd, 0x83, 0x89, 0xb0, 0x2c, 0x7e, 0x39, 0xa3, 0xbb, 0xba,
+	0x64, 0xcb, 0x77, 0xe5, 0x51, 0xb3, 0x4b, 0xe5, 0xee, 0x75, 0x56, 0xef, 0x22, 0x38, 0x37, 0xb7,
+	0x70, 0xff, 0xbe, 0xe8, 0xdb, 0x8c, 0x45, 0xd3, 0x6e, 0x2c, 0x38, 0xac, 0x39, 0x97, 0x00, 0x19,
+	0x50, 0x42, 0xaf, 0x3f, 0x80, 0x89, 0xa4, 0x05, 0x6a, 0x67, 0x08, 0x8a, 0x89, 0xf2, 0x9e, 0xb2,
+	0x8b, 0x28, 0x58, 0xef, 0x91, 0x4c, 0x4c, 0x38, 0x9f, 0x0d, 0x81, 0x74, 0xf3, 0x75, 0x18, 0xd5,
+	0x57, 0x9b, 0xcd, 0x2e, 0xd5, 0x89, 0xeb, 0x42, 0x92, 0x4a, 0x14, 0xf0, 0x97, 0x52, 0xd5, 0x7d,
+	0x38, 0xbd, 0xe2, 0x52, 0x67, 0xc5, 0xae, 0x31, 0xdb, 0x30, 0xed, 0xfa, 0xce, 0x06, 0x45, 0xe4,
+	0xa7, 0x08, 0x0a, 0xfd, 0xe4, 0x49, 0xb0, 0xef, 0x22, 0xc8, 0x47, 0x83, 0x16, 0xf5, 0x89, 0xc9,
+	0xd7, 0xd4, 0x16, 0x75, 0x4c, 0x66, 0xa8, 0x16, 0xd3, 0x1b, 0x32, 0x3b, 0x6e, 0x67, 0xcc, 0x8e,
+	0x50, 0xbc, 0x7f, 0x97, 0x5a, 0x16, 0x52, 0x16, 0x99, 0xde, 0x90, 0x49, 0x32, 0x15, 0xa9, 0xe9,
+	0x24, 0x93, 0x3c, 0x4c, 0xdf, 0xa3, 0xfc, 0x11, 0xe3, 0x9a, 0x15, 0x5d, 0xc9, 0xc2, 0x3e, 0xfa,
+	0x07, 0x08, 0x4e, 0xa4, 0x10, 0x25, 0x78, 0x0e, 0x47, 0xb8, 0x4f, 0x51, 0xbb, 0xaf, 0x80, 0x5b,
+	0xbc, 0x72, 0xbf, 0x24, 0x4b, 0xd3, 0x4c, 0x86, 0xd2, 0x14, 0xd4, 0xa5, 0x31, 0xde, 0xa1, 0x9d,
+	0x6c, 0x22, 0x28, 0x2c, 0x79, 0xcd, 0x25, 0xfa, 0x94, 0x57, 0x6d, 0x93, 0x9b, 0x9a, 0x65, 0x7e,
+	0x9b, 0x8a, 0xde, 0x66, 0xb8, 0xb3, 0x7f, 0x07, 0xc6, 0xc2, 0x6e, 0x4e, 0x35, 0xa8, 0xcd, 0x9a,
+	0xb2, 0xdb, 0x4b, 0x0c, 0x5a, 0x3a, 0xe9, 0x44, 0x19, 0x95, 0x3d, 0xdf, 0xbc, 0xbf, 0xc4, 0x35,
+	0xc8, 0xdb, 0x5e, 0x53, 0xb5, 0xe9, 0x53, 0xff, 0x0e, 0x1a, 0x21, 0x12, 0x5d, 0x89, 0x2b, 0xda,
+	0x8d, 0x7d, 0x95, 0xb3, 0x9b, 0xed, 0xe2, 0xab, 0x81, 0xb0, 0xfe, 0x7b, 0x89, 0x32, 0x65, 0xa7,
+	0x1b, 0x46, 0x7e, 0x34, 0x02, 0xc5, 0xbe, 0x46, 0xff, 0xdf, 0xb7, 0x5e, 0x97, 0xfe, 0x95, 0x87,
+	0xfd, 0x0f, 0xfc, 0x8a, 0x86, 0x7f, 0x86, 0x40, 0x0c, 0x99, 0x5c, 0x7c, 0x39, 0xf3, 0xa9, 0x89,
+	0x67, 0x64, 0xf9, 0x2b, 0x83, 0x31, 0x05, 0x9e, 0x27, 0x57, 0xde, 0xfb, 0xc3, 0x5f, 0x7f, 0x38,
+	0x52, 0xc2, 0xe7, 0xcb, 0x59, 0xa7, 0xda, 0x3e, 0xc0, 0x9f, 0x23, 0x38, 0x10, 0x8c, 0x99, 0x70,
+	0x66, 0xb5, 0xc9, 0x29, 0x57, 0xfe, 0xea, 0x80, 0x5c, 0x12, 0xed, 0x55, 0x81, 0xb6, 0x8c, 0x2f,
+	0x64, 0x45, 0x1b, 0x60, 0xfc, 0x08, 0xc1, 0xe1, 0x8e, 0x09, 0x34, 0xbe, 0x99, 0xf5, 0x25, 0x9f,
+	0x32, 0x73, 0xcf, 0xdf, 0x1a, 0x8e, 0x59, 0xda, 0x50, 0x11, 0x36, 0xdc, 0xc2, 0x37, 0xca, 0x83,
+	0x7d, 0x47, 0x70, 0xcb, 0xef, 0xc8, 0xea, 0xfc, 0x0c, 0x7f, 0x86, 0xe0, 0x78, 0x6a, 0x77, 0x8b,
+	0xe7, 0x06, 0x6d, 0x61, 0x53, 0x3a, 0xed, 0xfc, 0xfc, 0xce, 0x84, 0x48, 0x43, 0xef, 0x09, 0x43,
+	0x67, 0xf1, 0x9d, 0x8c, 0x86, 0xc6, 0x15, 0x20, 0x1c, 0x92, 0xa9, 0x8e, 0xb0, 0xe9, 0xdf, 0xc9,
+	0x71, 0x60, 0xe7, 0xf0, 0x06, 0xbf, 0x31, 0x28, 0xd4, 0xd4, 0xf1, 0x5a, 0x7e, 0x61, 0xa7, 0x62,
+	0xa4, 0xcd, 0x55, 0x61, 0xf3, 0x1c, 0x9e, 0x1d, 0xd8, 0x66, 0x5b, 0x8c, 0x01, 0xe2, 0xfb, 0x33,
+	0xfe, 0x27, 0x82, 0xc9, 0xf4, 0x2e, 0x1d, 0x67, 0x8d, 0xcf, 0x96, 0xf3, 0x83, 0xfc, 0x1b, 0x3b,
+	0x94, 0x32, 0x64, 0x98, 0xfb, 0x8d, 0x03, 0xf0, 0x5f, 0x10, 0x8c, 0xa7, 0xb4, 0xe7, 0x78, 0x76,
+	0x50, 0x9c, 0x3d, 0x23, 0x83, 0x7c, 0x65, 0x27, 0x22, 0xa4, 0x9d, 0x73, 0xc2, 0xce, 0xdb, 0xf8,
+	0xe6, 0xc0, 0x76, 0xc6, 0x2d, 0x39, 0xfe, 0x1d, 0x82, 0xd1, 0xe4, 0x77, 0x1f, 0x7c, 0x63, 0xc0,
+	0x0b, 0x52, 0xe2, 0xe3, 0x53, 0xfe, 0xe6, 0x50, 0xbc, 0xd2, 0x9c, 0xdb, 0xc2, 0x9c, 0x6b, 0xf8,
+	0xea, 0x80, 0x65, 0x48, 0xad, 0x6d, 0xa8, 0xa6, 0x81, 0xff, 0x86, 0x60, 0x32, 0xbd, 0xef, 0xcf,
+	0x9c, 0x9d, 0x5b, 0x4e, 0x21, 0x32, 0x67, 0xe7, 0xd6, 0xc3, 0x07, 0x32, 0x2b, 0xcc, 0xbc, 0x89,
+	0xaf, 0x0f, 0xf0, 0x7e, 0x53, 0x35, 0x5f, 0x5e, 0x94, 0x97, 0x7f, 0x44, 0x70, 0xb4, 0xbb, 0x33,
+	0xc2, 0xaf, 0x0f, 0xd7, 0xf6, 0x44, 0xe6, 0xdd, 0x19, 0x9a, 0x5f, 0x1a, 0x76, 0x57, 0x18, 0x76,
+	0x03, 0x7f, 0xa5, 0x3c, 0xdc, 0x87, 0x65, 0x17, 0xff, 0x1d, 0xc1, 0x54, 0x9f, 0x86, 0x3f, 0x73,
+	0x59, 0xdd, 0x7a, 0x6c, 0x91, 0xb9, 0xac, 0x6e, 0x33, 0x77, 0x18, 0xf8, 0x9d, 0x29, 0x5e, 0x1e,
+	0x41, 0x14, 0xc3, 0x16, 0x1c, 0xff, 0x6a, 0x04, 0x3e, 0x9f, 0xa5, 0x1b, 0xc3, 0x4a, 0xd6, 0x62,
+	0x91, 0xbd, 0xb9, 0xcc, 0x3f, 0xdc, 0x55, 0x99, 0xd2, 0x2b, 0xa6, 0xf0, 0x8a, 0x8e, 0xb5, 0xac,
+	0x15, 0x29, 0xd1, 0x3d, 0xaa, 0x96, 0x69, 0x37, 0xd4, 0x55, 0x87, 0x35, 0xd5, 0x24, 0x53, 0xf9,
+	0x9d, 0xb4, 0xee, 0xf6, 0x19, 0xfe, 0x0f, 0x82, 0xc9, 0xf4, 0x7e, 0x30, 0xf3, 0x71, 0xdf, 0xb2,
+	0x3d, 0xcd, 0x7c, 0xdc, 0xb7, 0x6e, 0x4a, 0xc9, 0x03, 0xe1, 0x92, 0x37, 0x71, 0x35, 0xa3, 0x4b,
+	0x3c, 0x97, 0x3a, 0xaa, 0x17, 0xca, 0x53, 0xd3, 0xee, 0x5a, 0x9f, 0x20, 0x38, 0xd6, 0xd3, 0x48,
+	0xe2, 0xac, 0xe7, 0xb7, 0x5f, 0x7f, 0x9a, 0xbf, 0x3b, 0xbc, 0x80, 0x21, 0x0f, 0x45, 0x9d, 0x72,
+	0xb5, 0xab, 0xe9, 0x15, 0x57, 0xab, 0x3e, 0xcd, 0x59, 0xe6, 0x1a, 0xb0, 0x75, 0x47, 0x9b, 0xb9,
+	0x06, 0x6c, 0xd3, 0x23, 0x0e, 0x7c, 0xb5, 0xea, 0xdf, 0xac, 0x56, 0xd6, 0x9e, 0xbf, 0x28, 0xa0,
+	0x8f, 0x5f, 0x14, 0xd0, 0x9f, 0x5f, 0x14, 0xd0, 0x07, 0x2f, 0x0b, 0x7b, 0x3e, 0x7e, 0x59, 0xd8,
+	0xf3, 0xa7, 0x97, 0x85, 0x3d, 0xdf, 0x58, 0xda, 0xee, 0x1b, 0xd7, 0xe3, 0x4b, 0x97, 0xcb, 0x4f,
+	0x3b, 0x34, 0x5f, 0x88, 0x55, 0xeb, 0x96, 0x49, 0x6d, 0x1e, 0xfc, 0x4f, 0x52, 0xf0, 0x0f, 0x04,
+	0x07, 0xc4, 0x9f, 0xcb, 0xff, 0x0d, 0x00, 0x00, 0xff, 0xff, 0x00, 0x80, 0xf1, 0x24, 0xa7, 0x25,
+	0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/x/concentrated-liquidity/export_test.go b/x/concentrated-liquidity/export_test.go
index 269d61ddb7d..3b213bb3716 100644
--- a/x/concentrated-liquidity/export_test.go
+++ b/x/concentrated-liquidity/export_test.go
@@ -336,8 +336,8 @@ func (k Keeper) SetPoolHookContract(ctx sdk.Context, poolID uint64, actionPrefix
 	return k.setPoolHookContract(ctx, poolID, actionPrefix, cosmwasmAddress)
 }
 
-func (k Keeper) CallPoolActionListener(ctx sdk.Context, msgBz []byte, poolId uint64, actionPrefix string) (err error) {
-	return k.callPoolActionListener(ctx, msgBz, poolId, actionPrefix)
+func (k Keeper) CallPoolActionListener(ctx sdk.Context, msgBuilderFn func(poolId uint64) ([]byte, error), poolId uint64, actionPrefix string) (err error) {
+	return k.callPoolActionListener(ctx, msgBuilderFn, poolId, actionPrefix)
 }
 
 func (k Keeper) GetPoolHookContract(ctx sdk.Context, poolId uint64, actionPrefix string) string {
diff --git a/x/concentrated-liquidity/fuzz_test.go b/x/concentrated-liquidity/fuzz_test.go
index 19b51e8b3b5..67aa680d71e 100644
--- a/x/concentrated-liquidity/fuzz_test.go
+++ b/x/concentrated-liquidity/fuzz_test.go
@@ -64,7 +64,11 @@ func fuzz(t *testing.T, numSwaps int, numPositions int, numIterations int) {
 		currentSuite.iteration = i
 
 		t.Run(fmt.Sprintf("Fuzz %d, seed: %d", i, currentSeed), func(t *testing.T) {
-			t.Parallel()
+			// This is commented out temporarily to avoid issues with the wasmStoreKey being
+			// a global in the wasm light client.
+			// See https://github.com/cosmos/ibc-go/blob/modules/light-clients/08-wasm/v0.1.0%2Bibc-go-v7.3-wasmvm-v1.5/modules/light-clients/08-wasm/internal/ibcwasm/wasm.go#L15-L17
+			// Once we move to ibc v8 we can make these tests run in parallel again.
+			//t.Parallel()
 
 			currentSuite.individualFuzz(r, i, numSwaps, numPositions)
 		})
diff --git a/x/concentrated-liquidity/incentives_test.go b/x/concentrated-liquidity/incentives_test.go
index 5d2a81417f9..9d4ee0e9917 100644
--- a/x/concentrated-liquidity/incentives_test.go
+++ b/x/concentrated-liquidity/incentives_test.go
@@ -2277,12 +2277,12 @@ func (s *KeeperTestSuite) TestQueryAndCollectIncentives() {
 
 					// Add to uptime growth inside range
 					if tc.addedUptimeGrowthInside != nil {
-						s.addUptimeGrowthInsideRange(s.Ctx, validPoolId, ownerWithValidPosition, tc.currentTick, tc.positionParams.lowerTick, tc.positionParams.upperTick, tc.addedUptimeGrowthInside)
+						s.addUptimeGrowthInsideRange(s.Ctx, validPoolId, tc.currentTick, tc.positionParams.lowerTick, tc.positionParams.upperTick, tc.addedUptimeGrowthInside)
 					}
 
 					// Add to uptime growth outside range
 					if tc.addedUptimeGrowthOutside != nil {
-						s.addUptimeGrowthOutsideRange(s.Ctx, validPoolId, ownerWithValidPosition, tc.currentTick, tc.positionParams.lowerTick, tc.positionParams.upperTick, tc.addedUptimeGrowthOutside)
+						s.addUptimeGrowthOutsideRange(s.Ctx, validPoolId, tc.currentTick, tc.positionParams.lowerTick, tc.positionParams.upperTick, tc.addedUptimeGrowthOutside)
 					}
 				}
 
@@ -2868,11 +2868,11 @@ func (s *KeeperTestSuite) TestQueryAndClaimAllIncentives() {
 
 				clPool.SetCurrentTick(DefaultCurrTick)
 				if tc.growthOutside != nil {
-					s.addUptimeGrowthOutsideRange(s.Ctx, validPoolId, defaultSender, DefaultCurrTick, DefaultLowerTick, DefaultUpperTick, tc.growthOutside)
+					s.addUptimeGrowthOutsideRange(s.Ctx, validPoolId, DefaultCurrTick, DefaultLowerTick, DefaultUpperTick, tc.growthOutside)
 				}
 
 				if tc.growthInside != nil {
-					s.addUptimeGrowthInsideRange(s.Ctx, validPoolId, defaultSender, DefaultCurrTick, DefaultLowerTick, DefaultUpperTick, tc.growthInside)
+					s.addUptimeGrowthInsideRange(s.Ctx, validPoolId, DefaultCurrTick, DefaultLowerTick, DefaultUpperTick, tc.growthInside)
 				}
 
 				err = s.Clk.SetPool(s.Ctx, clPool)
diff --git a/x/concentrated-liquidity/keeper_test.go b/x/concentrated-liquidity/keeper_test.go
index 4c6fd9561e3..606cbcd0f72 100644
--- a/x/concentrated-liquidity/keeper_test.go
+++ b/x/concentrated-liquidity/keeper_test.go
@@ -235,7 +235,7 @@ func (s *KeeperTestSuite) addLiquidityToUptimeAccumulators(ctx sdk.Context, pool
 //   - If lowerTick <= currentTick < upperTick, we add to just the global accumulators.
 //
 //   - If lowerTick < upperTick <= currentTick, we add to the upper tick's trackers, but not the lower's.
-func (s *KeeperTestSuite) addUptimeGrowthInsideRange(ctx sdk.Context, poolId uint64, owner sdk.AccAddress, currentTick, lowerTick, upperTick int64, uptimeGrowthToAdd []sdk.DecCoins) {
+func (s *KeeperTestSuite) addUptimeGrowthInsideRange(ctx sdk.Context, poolId uint64, currentTick, lowerTick, upperTick int64, uptimeGrowthToAdd []sdk.DecCoins) {
 	s.Require().True(lowerTick <= upperTick)
 
 	// Add spread rewards and incentives to the pool
@@ -284,7 +284,7 @@ func (s *KeeperTestSuite) addUptimeGrowthInsideRange(ctx sdk.Context, poolId uin
 //   - If lowerTick < upperTick <= currentTick, we add to both lowerTick and upperTick's uptime trackers,
 //     the former to put the growth below the tick range and the latter to keep both ticks consistent (since
 //     lowerTick's uptime trackers are a subset of upperTick's in this case).
-func (s *KeeperTestSuite) addUptimeGrowthOutsideRange(ctx sdk.Context, poolId uint64, owner sdk.AccAddress, currentTick, lowerTick, upperTick int64, uptimeGrowthToAdd []sdk.DecCoins) {
+func (s *KeeperTestSuite) addUptimeGrowthOutsideRange(ctx sdk.Context, poolId uint64, currentTick, lowerTick, upperTick int64, uptimeGrowthToAdd []sdk.DecCoins) {
 	s.Require().True(lowerTick <= upperTick)
 
 	// Add spread rewards and incentives to the pool
diff --git a/x/concentrated-liquidity/math/tick.go b/x/concentrated-liquidity/math/tick.go
index 5acde23de19..86fd72a08d4 100644
--- a/x/concentrated-liquidity/math/tick.go
+++ b/x/concentrated-liquidity/math/tick.go
@@ -1,7 +1,6 @@
 package math
 
 import (
-	"errors"
 	"fmt"
 
 	"github.com/osmosis-labs/osmosis/osmomath"
@@ -254,10 +253,9 @@ func CalculateSqrtPriceToTick(sqrtPrice osmomath.BigDec) (tickIndex int64, err e
 	}
 
 	// We have a candidate bucket index `t`. We discern here if:
-	// * sqrtPrice in [TickToSqrtPrice(t - 1), TickToSqrtPrice(t))
-	// * sqrtPrice in [TickToSqrtPrice(t), TickToSqrtPrice(t + 1))
-	// * sqrtPrice in [TickToSqrtPrice(t+1), TickToSqrtPrice(t + 2))
-	// * sqrtPrice not in either.
+	// * sqrtPrice in [ TickToSqrtPrice(t - 1), TickToSqrtPrice(t)     ) => bucket t - 1
+	// * sqrtPrice in [ TickToSqrtPrice(t),     TickToSqrtPrice(t + 1) ) => bucket t
+	// * sqrtPrice in [ TickToSqrtPrice(t + 1), TickToSqrtPrice(t + 2) ) => bucket t + 1
 	// We handle boundary checks, by saying that if our candidate is the min tick,
 	// set the candidate to min tick + 1.
 	// If our candidate is at or above max tick - 1, set the candidate to max tick - 2.
@@ -274,34 +272,55 @@ func CalculateSqrtPriceToTick(sqrtPrice osmomath.BigDec) (tickIndex int64, err e
 		outOfBounds = true
 	}
 
-	sqrtPriceTmin1, errM1 := TickToSqrtPrice(tick - 1)
-	sqrtPriceT, errT := TickToSqrtPrice(tick)
-	sqrtPriceTplus1, errP1 := TickToSqrtPrice(tick + 1)
-	sqrtPriceTplus2, errP2 := TickToSqrtPrice(tick + 2)
-	if errM1 != nil || errT != nil || errP1 != nil || errP2 != nil {
-		return 0, errors.New("internal error in computing square roots within CalculateSqrtPriceToTick")
-	}
-
-	// We error if sqrtPriceT is above sqrtPriceTplus2 or below sqrtPriceTmin1.
-	// For cases where calculated tick does not fall on a limit (min/max tick), the upper end is exclusive.
-	// For cases where calculated tick falls on a limit, the upper end is inclusive, since the actual tick is
-	// already shifted and making it exclusive would make min/max tick impossible to reach by construction.
-	// We do this primary for code simplicity, as alternatives would require more branching and special cases.
-	if (!outOfBounds && sqrtPrice.GTE(sqrtPriceTplus2)) || (outOfBounds && sqrtPrice.GT(sqrtPriceTplus2)) || sqrtPrice.LT(sqrtPriceTmin1) {
-		return 0, types.SqrtPriceToTickError{OutOfBounds: outOfBounds}
+	sqrtPriceTplus1, err := TickToSqrtPrice(tick + 1)
+	if err != nil {
+		return 0, types.ErrCalculateSqrtPriceToTick
 	}
+	// code path where sqrtPrice is either in tick t + 1, or out of bounds.
+	if sqrtPrice.GTE(sqrtPriceTplus1) {
+		// out of bounds check
+		sqrtPriceTplus2, err := TickToSqrtPrice(tick + 2)
+		if err != nil {
+			return 0, types.ErrCalculateSqrtPriceToTick
+		}
+		// We error if sqrtPriceT is above sqrtPriceTplus2
+		// For cases where calculated tick does not fall on a limit (min/max tick), the upper end is exclusive.
+		// For cases where calculated tick falls on a limit, the upper end is inclusive, since the actual tick is
+		// already shifted and making it exclusive would make min/max tick impossible to reach by construction.
+		// We do this primary for code simplicity, as alternatives would require more branching and special cases.
+		if (!outOfBounds && sqrtPrice.GTE(sqrtPriceTplus2)) || (outOfBounds && sqrtPrice.GT(sqrtPriceTplus2)) {
+			return 0, types.SqrtPriceToTickError{OutOfBounds: outOfBounds}
+		}
 
-	// We expect this case to only be hit when the original provided sqrt price is exactly equal to the max sqrt price.
-	if sqrtPrice.Equal(sqrtPriceTplus2) {
-		return tick + 2, nil
+		// We expect this case to only be hit when the original provided sqrt price is exactly equal to the max sqrt price.
+		if sqrtPrice.Equal(sqrtPriceTplus2) {
+			return tick + 2, nil
+		}
+		// we are not out of bounds, therefore its tick t+1!
+		return tick + 1, nil
 	}
 
-	// The remaining cases handle shifting tick index by +/- 1.
-	if sqrtPrice.GTE(sqrtPriceTplus1) {
-		return tick + 1, nil
+	// code path where sqrtPrice is either in tick t - 1, t, or out of bounds.
+	// The out of bounds case here should never be possible, but we need to more rigorously check this
+	// to delete that sqrt call.
+	sqrtPriceT, err := TickToSqrtPrice(tick)
+	if err != nil {
+		return 0, types.ErrCalculateSqrtPriceToTick
 	}
+	// sqrtPriceT <= sqrtPrice < sqrtPriceTplus1, this were in bucket t
 	if sqrtPrice.GTE(sqrtPriceT) {
 		return tick, nil
 	}
+
+	// check we are not out of bounds from below.
+	// TODO: Validate this case is impossible, and delete it
+	sqrtPriceTmin1, err := TickToSqrtPrice(tick - 1)
+	if err != nil {
+		return 0, types.ErrCalculateSqrtPriceToTick
+	}
+	if sqrtPrice.LT(sqrtPriceTmin1) {
+		return 0, types.SqrtPriceToTickError{OutOfBounds: outOfBounds}
+	}
+
 	return tick - 1, nil
 }
diff --git a/x/concentrated-liquidity/model/position.pb.go b/x/concentrated-liquidity/model/position.pb.go
index ce2fd8cdbf4..4c307a17913 100644
--- a/x/concentrated-liquidity/model/position.pb.go
+++ b/x/concentrated-liquidity/model/position.pb.go
@@ -11,13 +11,11 @@ package model
 import (
 	cosmossdk_io_math "cosmossdk.io/math"
 	fmt "fmt"
-	_ "github.com/cosmos/cosmos-proto"
 	types "github.com/cosmos/cosmos-sdk/types"
 	_ "github.com/cosmos/gogoproto/gogoproto"
 	proto "github.com/cosmos/gogoproto/proto"
 	github_com_cosmos_gogoproto_types "github.com/cosmos/gogoproto/types"
 	types1 "github.com/osmosis-labs/osmosis/v23/x/lockup/types"
-	_ "google.golang.org/protobuf/types/known/durationpb"
 	_ "google.golang.org/protobuf/types/known/timestamppb"
 	io "io"
 	math "math"
@@ -278,52 +276,51 @@ func init() {
 }
 
 var fileDescriptor_1363e25aa5179fb1 = []byte{
-	// 713 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x55, 0xcd, 0x6e, 0xd3, 0x4a,
-	0x18, 0x8d, 0x6f, 0x7e, 0xda, 0x4e, 0xa4, 0xab, 0x2b, 0xb7, 0xb7, 0x72, 0x53, 0x88, 0x23, 0x23,
-	0xd4, 0x48, 0x50, 0x9b, 0xa4, 0x88, 0x4a, 0x2c, 0x03, 0x42, 0xaa, 0xd4, 0x45, 0x31, 0x45, 0x48,
-	0x08, 0x29, 0x1a, 0x7b, 0xa6, 0xe9, 0x10, 0x3b, 0xe3, 0x7a, 0x26, 0x2d, 0x91, 0x78, 0x02, 0x56,
-	0x5d, 0xf1, 0x02, 0xec, 0x78, 0x92, 0x2e, 0xbb, 0x44, 0x2c, 0x52, 0xd4, 0xbe, 0x41, 0x9f, 0x00,
-	0xcd, 0x8f, 0xed, 0x50, 0x95, 0xbf, 0x45, 0x57, 0xf6, 0x7c, 0xe7, 0x3b, 0xe7, 0xcc, 0xcc, 0xf9,
-	0x64, 0x83, 0x87, 0x94, 0xc5, 0x94, 0x11, 0xe6, 0x85, 0x74, 0x14, 0xe2, 0x11, 0x4f, 0x21, 0xc7,
-	0x28, 0x22, 0x07, 0x63, 0x82, 0x08, 0x9f, 0x78, 0x87, 0x9d, 0x00, 0x73, 0xd8, 0xf1, 0x12, 0xca,
-	0x08, 0x27, 0x74, 0xe4, 0x26, 0x29, 0xe5, 0xd4, 0xbc, 0xab, 0x59, 0xee, 0xb5, 0x2c, 0x57, 0xb3,
-	0x1a, 0x2b, 0xa1, 0xec, 0xeb, 0x4b, 0x92, 0xa7, 0x16, 0x4a, 0xa1, 0x61, 0x0f, 0x28, 0x1d, 0x44,
-	0xd8, 0x93, 0xab, 0x60, 0xbc, 0xe7, 0x71, 0x12, 0x63, 0xc6, 0x61, 0x9c, 0xe8, 0x86, 0xe6, 0xd5,
-	0x06, 0x34, 0x4e, 0x61, 0xb1, 0x85, 0xc6, 0xd2, 0x80, 0x0e, 0xa8, 0x12, 0x16, 0x6f, 0x19, 0x4b,
-	0x99, 0x78, 0x01, 0x64, 0x38, 0xdf, 0x7c, 0x48, 0x49, 0xc6, 0x5a, 0xc9, 0x8e, 0x1b, 0xd1, 0x70,
-	0x38, 0x4e, 0xe4, 0x43, 0x41, 0xce, 0x87, 0x32, 0x98, 0xdf, 0xd1, 0xc7, 0x34, 0x37, 0x41, 0x3d,
-	0x3b, 0x72, 0x9f, 0x20, 0xcb, 0x68, 0x19, 0xed, 0x4a, 0x6f, 0xf9, 0x72, 0x6a, 0x9b, 0x13, 0x18,
-	0x47, 0x8f, 0x9d, 0x19, 0xd0, 0xf1, 0x41, 0xb6, 0xda, 0x42, 0xe6, 0x7d, 0x30, 0x07, 0x11, 0x4a,
-	0x31, 0x63, 0xd6, 0x3f, 0x2d, 0xa3, 0xbd, 0xd0, 0x33, 0x2f, 0xa7, 0xf6, 0xbf, 0x8a, 0xa4, 0x01,
-	0xc7, 0xcf, 0x5a, 0xcc, 0x7b, 0x60, 0x2e, 0xa1, 0x34, 0x12, 0x16, 0x65, 0x69, 0x31, 0xd3, 0xad,
-	0x01, 0xc7, 0xaf, 0x89, 0xb7, 0x2d, 0x64, 0xde, 0x06, 0x20, 0xa2, 0x47, 0x38, 0xed, 0x73, 0x12,
-	0x0e, 0xad, 0x4a, 0xcb, 0x68, 0x97, 0xfd, 0x05, 0x59, 0xd9, 0x25, 0xe1, 0x50, 0xc0, 0xe3, 0x24,
-	0xc9, 0xe0, 0xaa, 0x82, 0x65, 0x45, 0xc2, 0x2f, 0xc1, 0xc2, 0x5b, 0x4a, 0x46, 0x7d, 0x71, 0xcf,
-	0x56, 0xad, 0x65, 0xb4, 0xeb, 0xdd, 0x86, 0xab, 0xee, 0xd8, 0xcd, 0xee, 0xd8, 0xdd, 0xcd, 0x42,
-	0xe8, 0xdd, 0x3a, 0x99, 0xda, 0xa5, 0xcb, 0xa9, 0xfd, 0x9f, 0xda, 0x4c, 0x4e, 0x75, 0x8e, 0xcf,
-	0x6c, 0xc3, 0x9f, 0x17, 0x6b, 0xd1, 0x2c, 0x64, 0xf3, 0xdc, 0xad, 0x39, 0x79, 0xe2, 0x4d, 0x41,
-	0xfd, 0x3a, 0xb5, 0x57, 0x55, 0x16, 0x0c, 0x0d, 0x5d, 0x42, 0xbd, 0x18, 0xf2, 0x7d, 0x77, 0x1b,
-	0x0f, 0x60, 0x38, 0x79, 0x8a, 0xc3, 0x42, 0x39, 0x67, 0x3b, 0x7e, 0xa1, 0xe4, 0x7c, 0xac, 0x82,
-	0xff, 0x9f, 0x8d, 0xa3, 0x28, 0x0b, 0xa4, 0x97, 0x62, 0x38, 0x44, 0xf4, 0x68, 0x64, 0x3e, 0x07,
-	0xf3, 0xd9, 0x75, 0xcb, 0x58, 0xea, 0x5d, 0xcf, 0xfd, 0xa3, 0x69, 0x74, 0x73, 0xad, 0x8a, 0xd8,
-	0xa0, 0x9f, 0xcb, 0x98, 0x01, 0xa8, 0x41, 0xc6, 0x30, 0x7f, 0x20, 0x23, 0xab, 0x77, 0x57, 0x5c,
-	0x3d, 0xaa, 0x62, 0x8a, 0x72, 0xfa, 0x13, 0x4a, 0x46, 0x3d, 0x4f, 0x50, 0x3f, 0x9f, 0xd9, 0x6b,
-	0x03, 0xc2, 0xf7, 0xc7, 0x81, 0x1b, 0xd2, 0x58, 0xcf, 0xb5, 0x7e, 0xac, 0x33, 0x34, 0xf4, 0xf8,
-	0x24, 0xc1, 0x4c, 0x12, 0x7c, 0xad, 0x9c, 0x7b, 0x74, 0x64, 0xd0, 0x37, 0xe1, 0xd1, 0x31, 0xdf,
-	0x03, 0x2b, 0x8c, 0x20, 0x89, 0x61, 0x10, 0xe1, 0x3e, 0x4b, 0x52, 0x0c, 0x51, 0x3f, 0xc5, 0x47,
-	0x30, 0x45, 0xcc, 0xaa, 0xb4, 0xca, 0xbf, 0x76, 0x5d, 0xd3, 0x81, 0xdb, 0x2a, 0x96, 0x9f, 0x09,
-	0x39, 0xfe, 0x72, 0x0e, 0xbd, 0x90, 0x88, 0xaf, 0x00, 0xf3, 0x00, 0x2c, 0x15, 0x24, 0x22, 0x83,
-	0x20, 0x87, 0x98, 0x59, 0xd5, 0xdf, 0x39, 0xdf, 0xd1, 0xce, 0xab, 0x57, 0x9d, 0x0b, 0x11, 0xc7,
-	0x5f, 0xcc, 0xcb, 0x5b, 0x79, 0x55, 0x58, 0xee, 0xd1, 0x74, 0x0f, 0x13, 0x8e, 0xd1, 0xac, 0x65,
-	0xed, 0x2f, 0x2d, 0xaf, 0x13, 0x71, 0xfc, 0xc5, 0xbc, 0x5c, 0x58, 0x3a, 0x9f, 0x0c, 0xb0, 0x9c,
-	0x0d, 0xd2, 0x2b, 0xc2, 0xf7, 0x77, 0x70, 0x4a, 0x28, 0xda, 0xa6, 0xe1, 0xf0, 0x26, 0x26, 0xf3,
-	0x11, 0xa8, 0x8a, 0x2f, 0x14, 0xd3, 0x83, 0xd9, 0xc8, 0xf5, 0xd4, 0xe7, 0xcb, 0x2d, 0xdc, 0x35,
-	0x55, 0xb5, 0xf7, 0xde, 0x9c, 0x9c, 0x37, 0x8d, 0xd3, 0xf3, 0xa6, 0xf1, 0xed, 0xbc, 0x69, 0x1c,
-	0x5f, 0x34, 0x4b, 0xa7, 0x17, 0xcd, 0xd2, 0x97, 0x8b, 0x66, 0xe9, 0x75, 0x6f, 0x66, 0xa8, 0xb4,
-	0xd8, 0x7a, 0x04, 0x03, 0x96, 0x2d, 0xbc, 0xc3, 0xee, 0x86, 0xf7, 0xee, 0x87, 0xbf, 0xc1, 0x7a,
-	0xf1, 0x3b, 0x88, 0x29, 0xc2, 0x51, 0x50, 0x93, 0xdf, 0x8b, 0x8d, 0xef, 0x01, 0x00, 0x00, 0xff,
-	0xff, 0xe7, 0xed, 0xb9, 0x6c, 0x3c, 0x06, 0x00, 0x00,
+	// 697 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x54, 0xcd, 0x6e, 0xd3, 0x4c,
+	0x14, 0x8d, 0xbf, 0xfc, 0xb4, 0x9d, 0x48, 0x9f, 0x90, 0x5b, 0x2a, 0x37, 0x85, 0x38, 0x32, 0x42,
+	0x8d, 0x04, 0xf5, 0x90, 0x14, 0x51, 0x89, 0x65, 0x40, 0x48, 0x95, 0xba, 0x28, 0xa6, 0x08, 0x09,
+	0x21, 0x45, 0x63, 0xcf, 0x34, 0x1d, 0x62, 0x67, 0x5c, 0xcf, 0xa4, 0x25, 0x12, 0x4f, 0xc0, 0xaa,
+	0x2b, 0x5e, 0x80, 0x1d, 0x4f, 0xd2, 0x65, 0x97, 0x88, 0x45, 0x8a, 0xda, 0x37, 0xe8, 0x13, 0xa0,
+	0x19, 0x8f, 0xed, 0x80, 0xca, 0xdf, 0xa2, 0x2b, 0xcf, 0xdc, 0x33, 0xe7, 0x9c, 0xeb, 0x7b, 0xaf,
+	0x2e, 0x78, 0xc8, 0x78, 0xc4, 0x38, 0xe5, 0x30, 0x60, 0xa3, 0x80, 0x8c, 0x44, 0x82, 0x04, 0xc1,
+	0x21, 0x3d, 0x18, 0x53, 0x4c, 0xc5, 0x04, 0x1e, 0x76, 0x7c, 0x22, 0x50, 0x07, 0xc6, 0x8c, 0x53,
+	0x41, 0xd9, 0xc8, 0x8d, 0x13, 0x26, 0x98, 0x79, 0x57, 0xb3, 0xdc, 0x2b, 0x59, 0xae, 0x66, 0x35,
+	0xec, 0x01, 0x63, 0x83, 0x90, 0x40, 0x45, 0xf2, 0xc7, 0x7b, 0x50, 0xd0, 0x88, 0x70, 0x81, 0xa2,
+	0x38, 0xd5, 0x69, 0x2c, 0x0d, 0xd8, 0x80, 0xa9, 0x23, 0x94, 0x27, 0x1d, 0x6d, 0x06, 0x4a, 0x1e,
+	0xfa, 0x88, 0x93, 0x3c, 0x83, 0x80, 0x51, 0xed, 0xde, 0x58, 0xc9, 0x72, 0x0e, 0x59, 0x30, 0x1c,
+	0xc7, 0xea, 0x93, 0x42, 0xce, 0x87, 0x32, 0x98, 0xdf, 0xd1, 0xb9, 0x9a, 0x9b, 0xa0, 0x9e, 0xe5,
+	0xdd, 0xa7, 0xd8, 0x32, 0x5a, 0x46, 0xbb, 0xd2, 0x5b, 0xbe, 0x9c, 0xda, 0xe6, 0x04, 0x45, 0xe1,
+	0x63, 0x67, 0x06, 0x74, 0x3c, 0x90, 0xdd, 0xb6, 0xb0, 0x79, 0x1f, 0xcc, 0x21, 0x8c, 0x13, 0xc2,
+	0xb9, 0xf5, 0x5f, 0xcb, 0x68, 0x2f, 0xf4, 0xcc, 0xcb, 0xa9, 0xfd, 0x7f, 0x4a, 0xd2, 0x80, 0xe3,
+	0x65, 0x4f, 0xcc, 0x7b, 0x60, 0x2e, 0x66, 0x2c, 0x94, 0x16, 0x65, 0x65, 0x31, 0xf3, 0x5a, 0x03,
+	0x8e, 0x57, 0x93, 0xa7, 0x2d, 0x6c, 0xde, 0x06, 0x20, 0x64, 0x47, 0x24, 0xe9, 0x0b, 0x1a, 0x0c,
+	0xad, 0x4a, 0xcb, 0x68, 0x97, 0xbd, 0x05, 0x15, 0xd9, 0xa5, 0xc1, 0x50, 0xc2, 0xe3, 0x38, 0xce,
+	0xe0, 0x6a, 0x0a, 0xab, 0x88, 0x82, 0x5f, 0x82, 0x85, 0xb7, 0x8c, 0x8e, 0xfa, 0xb2, 0x8e, 0x56,
+	0xad, 0x65, 0xb4, 0xeb, 0xdd, 0x86, 0x9b, 0x16, 0xd9, 0xcd, 0x8a, 0xec, 0xee, 0x66, 0x45, 0xee,
+	0xdd, 0x3a, 0x99, 0xda, 0xa5, 0xcb, 0xa9, 0x7d, 0x23, 0x4d, 0x26, 0xa7, 0x3a, 0xc7, 0x67, 0xb6,
+	0xe1, 0xcd, 0xcb, 0xbb, 0x7c, 0x2c, 0x65, 0xf3, 0xe6, 0x59, 0x73, 0xea, 0x8f, 0x37, 0x25, 0xf5,
+	0xeb, 0xd4, 0x5e, 0x4d, 0x7b, 0xc1, 0xf1, 0xd0, 0xa5, 0x0c, 0x46, 0x48, 0xec, 0xbb, 0xdb, 0x64,
+	0x80, 0x82, 0xc9, 0x53, 0x12, 0x14, 0xca, 0x39, 0xdb, 0xf1, 0x0a, 0x25, 0xe7, 0x63, 0x15, 0xdc,
+	0x7c, 0x36, 0x0e, 0xc3, 0xac, 0x21, 0xbd, 0x84, 0xa0, 0x21, 0x66, 0x47, 0x23, 0xf3, 0x39, 0x98,
+	0xcf, 0xca, 0xad, 0xda, 0x52, 0xef, 0x42, 0xf7, 0xaf, 0x46, 0xca, 0xcd, 0xb5, 0x2a, 0x32, 0x41,
+	0x2f, 0x97, 0x31, 0x7d, 0x50, 0x43, 0x9c, 0x13, 0xf1, 0x40, 0xb5, 0xac, 0xde, 0x5d, 0x71, 0xd3,
+	0xcc, 0x5d, 0x39, 0x45, 0x39, 0xfd, 0x09, 0xa3, 0xa3, 0x1e, 0x94, 0xd4, 0xcf, 0x67, 0xf6, 0xda,
+	0x80, 0x8a, 0xfd, 0xb1, 0xef, 0x06, 0x2c, 0x82, 0x7a, 0xe4, 0xd2, 0xcf, 0x3a, 0xc7, 0x43, 0x28,
+	0x26, 0x31, 0xe1, 0x8a, 0xe0, 0x69, 0xe5, 0xdc, 0xa3, 0xa3, 0x1a, 0x7d, 0x1d, 0x1e, 0x1d, 0xf3,
+	0x3d, 0xb0, 0x82, 0x10, 0xd1, 0x08, 0xf9, 0x21, 0xe9, 0xf3, 0x38, 0x21, 0x08, 0xf7, 0x13, 0x72,
+	0x84, 0x12, 0xcc, 0xad, 0x4a, 0xab, 0xfc, 0x7b, 0xd7, 0x35, 0xdd, 0x70, 0x3b, 0x6d, 0xcb, 0xaf,
+	0x84, 0x1c, 0x6f, 0x39, 0x87, 0x5e, 0x28, 0xc4, 0x4b, 0x01, 0xf3, 0x00, 0x2c, 0x15, 0x24, 0xaa,
+	0x1a, 0x41, 0x0f, 0x09, 0xb7, 0xaa, 0x7f, 0x72, 0xbe, 0xa3, 0x9d, 0x57, 0x7f, 0x76, 0x2e, 0x44,
+	0x1c, 0x6f, 0x31, 0x0f, 0x6f, 0xe5, 0x51, 0x69, 0xb9, 0xc7, 0x92, 0x3d, 0x42, 0x05, 0xc1, 0xb3,
+	0x96, 0xb5, 0x7f, 0xb4, 0xbc, 0x4a, 0xc4, 0xf1, 0x16, 0xf3, 0x70, 0x61, 0xe9, 0x7c, 0x32, 0xc0,
+	0x72, 0x36, 0x48, 0xaf, 0xa8, 0xd8, 0xdf, 0x21, 0x09, 0x65, 0x78, 0x9b, 0x05, 0xc3, 0xeb, 0x98,
+	0xcc, 0x47, 0xa0, 0x2a, 0x37, 0x14, 0xd7, 0x83, 0xd9, 0xc8, 0xf5, 0xd2, 0xf5, 0xe5, 0x16, 0xee,
+	0x9a, 0x9a, 0x3e, 0xef, 0xbd, 0x39, 0x39, 0x6f, 0x1a, 0xa7, 0xe7, 0x4d, 0xe3, 0xdb, 0x79, 0xd3,
+	0x38, 0xbe, 0x68, 0x96, 0x4e, 0x2f, 0x9a, 0xa5, 0x2f, 0x17, 0xcd, 0xd2, 0xeb, 0xde, 0xcc, 0x50,
+	0x69, 0xb1, 0xf5, 0x10, 0xf9, 0x3c, 0xbb, 0xc0, 0xc3, 0xee, 0x06, 0x7c, 0xf7, 0xc3, 0x4a, 0x5f,
+	0x2f, 0x76, 0x7a, 0xc4, 0x30, 0x09, 0xfd, 0x9a, 0xda, 0x17, 0x1b, 0xdf, 0x03, 0x00, 0x00, 0xff,
+	0xff, 0xdd, 0x34, 0xb8, 0x73, 0x01, 0x06, 0x00, 0x00,
 }
 
 func (m *Position) Marshal() (dAtA []byte, err error) {
diff --git a/x/concentrated-liquidity/model/tickInfo.pb.go b/x/concentrated-liquidity/model/tick_info.pb.go
similarity index 85%
rename from x/concentrated-liquidity/model/tickInfo.pb.go
rename to x/concentrated-liquidity/model/tick_info.pb.go
index c612a141fd3..fe0b2fa0020 100644
--- a/x/concentrated-liquidity/model/tickInfo.pb.go
+++ b/x/concentrated-liquidity/model/tick_info.pb.go
@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-gogo. DO NOT EDIT.
-// source: osmosis/concentratedliquidity/v1beta1/tickInfo.proto
+// source: osmosis/concentratedliquidity/v1beta1/tick_info.proto
 
 // this is a legacy package that requires additional migration logic
 // in order to use the correct package. Decision made to use legacy package path
@@ -11,7 +11,6 @@ package model
 import (
 	cosmossdk_io_math "cosmossdk.io/math"
 	fmt "fmt"
-	_ "github.com/cosmos/cosmos-proto"
 	github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types"
 	types "github.com/cosmos/cosmos-sdk/types"
 	_ "github.com/cosmos/gogoproto/gogoproto"
@@ -62,7 +61,7 @@ func (m *TickInfo) Reset()         { *m = TickInfo{} }
 func (m *TickInfo) String() string { return proto.CompactTextString(m) }
 func (*TickInfo) ProtoMessage()    {}
 func (*TickInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_a875fae329cc9559, []int{0}
+	return fileDescriptor_193d635744e474d2, []int{0}
 }
 func (m *TickInfo) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -113,7 +112,7 @@ func (m *UptimeTrackers) Reset()         { *m = UptimeTrackers{} }
 func (m *UptimeTrackers) String() string { return proto.CompactTextString(m) }
 func (*UptimeTrackers) ProtoMessage()    {}
 func (*UptimeTrackers) Descriptor() ([]byte, []int) {
-	return fileDescriptor_a875fae329cc9559, []int{1}
+	return fileDescriptor_193d635744e474d2, []int{1}
 }
 func (m *UptimeTrackers) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -157,7 +156,7 @@ func (m *UptimeTracker) Reset()         { *m = UptimeTracker{} }
 func (m *UptimeTracker) String() string { return proto.CompactTextString(m) }
 func (*UptimeTracker) ProtoMessage()    {}
 func (*UptimeTracker) Descriptor() ([]byte, []int) {
-	return fileDescriptor_a875fae329cc9559, []int{2}
+	return fileDescriptor_193d635744e474d2, []int{2}
 }
 func (m *UptimeTracker) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -200,46 +199,45 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("osmosis/concentratedliquidity/v1beta1/tickInfo.proto", fileDescriptor_a875fae329cc9559)
-}
-
-var fileDescriptor_a875fae329cc9559 = []byte{
-	// 545 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x94, 0x41, 0x8b, 0xd3, 0x40,
-	0x14, 0xc7, 0x1b, 0xb7, 0x88, 0xa6, 0x6e, 0x17, 0xb2, 0xab, 0xd4, 0x55, 0xd2, 0x12, 0x10, 0x0a,
-	0xd2, 0x84, 0x6d, 0xd7, 0x83, 0x8a, 0x97, 0x58, 0x58, 0x84, 0xc5, 0x85, 0x50, 0x2f, 0xa2, 0xc4,
-	0xe9, 0x64, 0xda, 0x0e, 0x4d, 0x32, 0x31, 0xef, 0xa5, 0x6b, 0x2f, 0xde, 0xbc, 0x7b, 0xf3, 0xe8,
-	0xdd, 0x4f, 0xd2, 0xe3, 0x1e, 0xc5, 0x43, 0x95, 0xf6, 0x1b, 0xf8, 0x09, 0x24, 0xc9, 0xa4, 0xb5,
-	0xc5, 0xc3, 0x22, 0xec, 0xa9, 0x9d, 0x97, 0xf7, 0xfe, 0xff, 0x1f, 0xef, 0x9f, 0x8c, 0x7a, 0x2c,
-	0x20, 0x10, 0xc0, 0xc1, 0xa2, 0x22, 0xa4, 0x2c, 0xc4, 0x98, 0x20, 0xf3, 0x7c, 0xfe, 0x3e, 0xe1,
-	0x1e, 0xc7, 0xa9, 0x35, 0x39, 0xea, 0x33, 0x24, 0x47, 0x16, 0x72, 0x3a, 0x7e, 0x11, 0x0e, 0x84,
-	0x19, 0xc5, 0x02, 0x85, 0xf6, 0x40, 0x4e, 0x99, 0xff, 0x9c, 0x32, 0xe5, 0xd4, 0xe1, 0x5d, 0x9a,
-	0xf5, 0xb9, 0xd9, 0x90, 0x95, 0x1f, 0x72, 0x85, 0xc3, 0x83, 0xa1, 0x18, 0x8a, 0xbc, 0x9e, 0xfe,
-	0x93, 0x55, 0x3d, 0xef, 0xb1, 0xfa, 0x04, 0xd8, 0xca, 0x9b, 0x0a, 0x1e, 0xe6, 0xcf, 0x8d, 0xaf,
-	0x65, 0xf5, 0x46, 0x4f, 0xa2, 0x68, 0x03, 0x75, 0x6f, 0x65, 0xe9, 0x0e, 0x63, 0x01, 0x50, 0x53,
-	0x1a, 0x4a, 0xf3, 0xa6, 0xfd, 0x6c, 0x36, 0xaf, 0x97, 0x7e, 0xcc, 0xeb, 0xf7, 0x72, 0x35, 0xf0,
-	0xc6, 0x26, 0x17, 0x56, 0x40, 0x70, 0x64, 0x9e, 0xb2, 0x21, 0xa1, 0xd3, 0x2e, 0xa3, 0xbf, 0xe7,
-	0xf5, 0x3b, 0x53, 0x12, 0xf8, 0x4f, 0x8c, 0x2d, 0x0d, 0xc3, 0xa9, 0xae, 0x2a, 0x27, 0x69, 0x41,
-	0x7b, 0xa7, 0xee, 0xae, 0x7b, 0x42, 0x86, 0xb5, 0x6b, 0x99, 0xcb, 0xd3, 0xcb, 0xb9, 0x1c, 0x6c,
-	0xbb, 0x84, 0x0c, 0x0d, 0xe7, 0xd6, 0xea, 0xfc, 0x92, 0xa1, 0x36, 0x53, 0xd4, 0xc7, 0x10, 0xc5,
-	0x8c, 0x78, 0x6e, 0xcc, 0xce, 0x49, 0xec, 0xa5, 0x28, 0xe7, 0x38, 0x72, 0x45, 0x14, 0x09, 0xe0,
-	0xc8, 0x5c, 0x8f, 0xc7, 0x8c, 0x22, 0x17, 0xa1, 0x2b, 0x06, 0xae, 0x4f, 0x00, 0x5d, 0x8c, 0xc9,
-	0x84, 0xc5, 0x40, 0xfc, 0xda, 0x4e, 0x63, 0xa7, 0x59, 0x69, 0xdf, 0x37, 0xe5, 0x7e, 0xd3, 0xdd,
-	0x15, 0x09, 0x98, 0x5d, 0x46, 0x9f, 0x0b, 0x1e, 0xda, 0x9d, 0x14, 0xf6, 0xdb, 0xcf, 0xfa, 0xc3,
-	0x21, 0xc7, 0x51, 0xd2, 0x37, 0xa9, 0x08, 0x64, 0x1e, 0xf2, 0xa7, 0x05, 0xde, 0xd8, 0xc2, 0x69,
-	0xc4, 0xa0, 0x98, 0x01, 0xa7, 0x9d, 0x33, 0x39, 0x19, 0xd2, 0x49, 0x46, 0x74, 0x26, 0x81, 0xba,
-	0x05, 0xcf, 0xd9, 0xe0, 0x94, 0x00, 0xf6, 0x0a, 0x18, 0xed, 0xa3, 0xba, 0x97, 0x44, 0xc8, 0x03,
-	0x96, 0x02, 0xd2, 0x31, 0x8b, 0xa1, 0x56, 0x6e, 0x28, 0xcd, 0x4a, 0xfb, 0x91, 0x79, 0xa9, 0x77,
-	0xc6, 0x7c, 0x95, 0x4d, 0xf7, 0xe4, 0xb0, 0xad, 0xa7, 0xe0, 0xeb, 0xb0, 0xb6, 0xb4, 0x0d, 0xa7,
-	0x9a, 0x6c, 0xf4, 0x1b, 0x42, 0xad, 0x6e, 0x2a, 0x68, 0x6f, 0xd5, 0xb2, 0xcf, 0x01, 0x6b, 0x4a,
-	0xb6, 0xa6, 0xe3, 0xff, 0xc1, 0xb0, 0xf7, 0x25, 0x45, 0xa5, 0x08, 0x13, 0xd0, 0x70, 0x32, 0x59,
-	0xe3, 0x8b, 0xa2, 0xee, 0x6e, 0x34, 0x6b, 0x9f, 0x14, 0xf5, 0xb6, 0xe4, 0x2c, 0x62, 0x4c, 0x10,
-	0xb8, 0xc7, 0x24, 0xc2, 0x15, 0x24, 0xb5, 0x9f, 0xfb, 0xc9, 0x8c, 0x72, 0x37, 0xfb, 0xcd, 0x6c,
-	0xa1, 0x2b, 0x17, 0x0b, 0x5d, 0xf9, 0xb5, 0xd0, 0x95, 0xcf, 0x4b, 0xbd, 0x74, 0xb1, 0xd4, 0x4b,
-	0xdf, 0x97, 0x7a, 0xe9, 0xb5, 0xfd, 0x97, 0xb6, 0x5c, 0x47, 0xcb, 0x27, 0x7d, 0x28, 0x0e, 0xd6,
-	0xa4, 0xdd, 0xb1, 0x3e, 0x6c, 0x5c, 0x09, 0xad, 0xf5, 0x9d, 0x10, 0x08, 0x8f, 0xf9, 0xfd, 0xeb,
-	0xd9, 0x17, 0xd9, 0xf9, 0x13, 0x00, 0x00, 0xff, 0xff, 0x33, 0x11, 0x34, 0x37, 0x41, 0x04, 0x00,
-	0x00,
+	proto.RegisterFile("osmosis/concentratedliquidity/v1beta1/tick_info.proto", fileDescriptor_193d635744e474d2)
+}
+
+var fileDescriptor_193d635744e474d2 = []byte{
+	// 541 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x93, 0x41, 0x8b, 0xd3, 0x40,
+	0x14, 0xc7, 0x1b, 0x77, 0x11, 0x4d, 0xdd, 0x2e, 0x64, 0x57, 0x29, 0xab, 0xa4, 0x25, 0x20, 0x14,
+	0xa4, 0x13, 0xb6, 0x75, 0x0f, 0x2a, 0x5e, 0x62, 0x61, 0x11, 0x16, 0x17, 0x42, 0xbd, 0x88, 0x12,
+	0xa7, 0x93, 0x69, 0x3b, 0x34, 0xc9, 0xc4, 0xbc, 0xd7, 0xae, 0xbd, 0x78, 0xf3, 0xee, 0xcd, 0xa3,
+	0x77, 0x3f, 0x49, 0x8f, 0x7b, 0x14, 0x0f, 0x55, 0xda, 0x6f, 0xe0, 0x27, 0x90, 0x24, 0x93, 0xd6,
+	0x16, 0x0f, 0x8b, 0xe0, 0x29, 0x99, 0xc9, 0xfb, 0xff, 0xff, 0x3f, 0xde, 0xcb, 0xd3, 0x4f, 0x24,
+	0x84, 0x12, 0x04, 0xd8, 0x4c, 0x46, 0x8c, 0x47, 0x98, 0x50, 0xe4, 0x7e, 0x20, 0xde, 0x8d, 0x85,
+	0x2f, 0x70, 0x6a, 0x4f, 0x8e, 0x7b, 0x1c, 0xe9, 0xb1, 0x8d, 0x82, 0x8d, 0x3c, 0x11, 0xf5, 0x25,
+	0x89, 0x13, 0x89, 0xd2, 0xb8, 0xaf, 0x64, 0xe4, 0xaf, 0x32, 0xa2, 0x64, 0x47, 0x87, 0x03, 0x39,
+	0x90, 0x99, 0xc2, 0x4e, 0xdf, 0x72, 0xf1, 0x91, 0xc9, 0x32, 0xb5, 0xdd, 0xa3, 0xc0, 0x57, 0x09,
+	0x4c, 0x8a, 0x28, 0xff, 0x6e, 0x7d, 0xd9, 0xd5, 0x6f, 0x74, 0x05, 0x1b, 0x3d, 0x8f, 0xfa, 0xd2,
+	0xe8, 0xeb, 0xfb, 0x2b, 0x5f, 0x6f, 0x90, 0x48, 0x80, 0xaa, 0x56, 0xd7, 0x1a, 0x37, 0x9d, 0xa7,
+	0xb3, 0x79, 0xad, 0xf4, 0x7d, 0x5e, 0xbb, 0x9b, 0xbb, 0x81, 0x3f, 0x22, 0x42, 0xda, 0x21, 0xc5,
+	0x21, 0x39, 0xe3, 0x03, 0xca, 0xa6, 0x1d, 0xce, 0x7e, 0xcd, 0x6b, 0x77, 0xa6, 0x34, 0x0c, 0x1e,
+	0x5b, 0x5b, 0x1e, 0x96, 0x5b, 0x59, 0xdd, 0x9c, 0xa6, 0x17, 0xc6, 0x5b, 0x7d, 0x6f, 0x5d, 0x13,
+	0x71, 0xac, 0x5e, 0xcb, 0x52, 0x9e, 0x5c, 0x2d, 0xe5, 0x70, 0x3b, 0x25, 0xe2, 0x68, 0xb9, 0xb7,
+	0x56, 0xe7, 0x17, 0x1c, 0x8d, 0x99, 0xa6, 0x3f, 0x82, 0x38, 0xe1, 0xd4, 0xf7, 0x12, 0x7e, 0x41,
+	0x13, 0x3f, 0x45, 0xb9, 0xc0, 0xa1, 0x27, 0xe3, 0x58, 0x82, 0x40, 0xee, 0xf9, 0x22, 0xe1, 0x0c,
+	0x85, 0x8c, 0x3c, 0xd9, 0xf7, 0x02, 0x0a, 0xe8, 0x61, 0x42, 0x27, 0x3c, 0x01, 0x1a, 0x54, 0x77,
+	0xea, 0x3b, 0x8d, 0x72, 0xeb, 0x1e, 0xc9, 0x39, 0x48, 0xda, 0xbb, 0xa2, 0xcd, 0xa4, 0xc3, 0xd9,
+	0x33, 0x29, 0x22, 0xa7, 0x9d, 0xc2, 0x7e, 0xfd, 0x51, 0x7b, 0x30, 0x10, 0x38, 0x1c, 0xf7, 0x08,
+	0x93, 0xa1, 0xad, 0x7a, 0x9d, 0x3f, 0x9a, 0xe0, 0x8f, 0x6c, 0x9c, 0xc6, 0x1c, 0x0a, 0x0d, 0xb8,
+	0xad, 0x9c, 0xc9, 0xcd, 0x90, 0x4e, 0x33, 0xa2, 0x73, 0x05, 0xd4, 0x29, 0x78, 0xce, 0xfb, 0x67,
+	0x14, 0xb0, 0x5b, 0xc0, 0x18, 0x1f, 0xf4, 0xfd, 0x71, 0x8c, 0x22, 0xe4, 0x29, 0x20, 0x1b, 0xf1,
+	0x04, 0xaa, 0xbb, 0x75, 0xad, 0x51, 0x6e, 0x9d, 0x90, 0x2b, 0xfd, 0x18, 0xe4, 0x65, 0xa6, 0xee,
+	0x2a, 0xb1, 0x63, 0xa6, 0xe0, 0xeb, 0x61, 0x6d, 0x79, 0x5b, 0x6e, 0x65, 0xbc, 0x51, 0x6f, 0x49,
+	0xbd, 0xb2, 0xe9, 0x60, 0xbc, 0xd1, 0x77, 0x03, 0x01, 0x58, 0xd5, 0xb2, 0x36, 0x3d, 0xfc, 0x17,
+	0x0c, 0xe7, 0x40, 0x51, 0x94, 0x8b, 0x61, 0x02, 0x5a, 0x6e, 0x66, 0x6b, 0x7d, 0xd6, 0xf4, 0xbd,
+	0x8d, 0x62, 0xe3, 0xa3, 0xa6, 0xdf, 0x56, 0x9c, 0xc5, 0x18, 0xc7, 0x08, 0xc2, 0xe7, 0x0a, 0xe1,
+	0x3f, 0x4c, 0xea, 0x20, 0xcf, 0x53, 0x33, 0xca, 0xd3, 0x9c, 0xd7, 0xb3, 0x85, 0xa9, 0x5d, 0x2e,
+	0x4c, 0xed, 0xe7, 0xc2, 0xd4, 0x3e, 0x2d, 0xcd, 0xd2, 0xe5, 0xd2, 0x2c, 0x7d, 0x5b, 0x9a, 0xa5,
+	0x57, 0xce, 0x1f, 0xde, 0xaa, 0x1d, 0xcd, 0x80, 0xf6, 0xa0, 0x38, 0xd8, 0x93, 0x56, 0xdb, 0x7e,
+	0xbf, 0xb1, 0xf8, 0xcd, 0xf5, 0xe6, 0x87, 0xd2, 0xe7, 0x41, 0xef, 0x7a, 0xb6, 0x91, 0xed, 0xdf,
+	0x01, 0x00, 0x00, 0xff, 0xff, 0xd5, 0xba, 0x2d, 0xca, 0x27, 0x04, 0x00, 0x00,
 }
 
 func (m *TickInfo) Marshal() (dAtA []byte, err error) {
diff --git a/x/concentrated-liquidity/model/tx.pb.go b/x/concentrated-liquidity/model/tx.pb.go
index b9d5b30228a..bcaeca8fe9a 100644
--- a/x/concentrated-liquidity/model/tx.pb.go
+++ b/x/concentrated-liquidity/model/tx.pb.go
@@ -7,7 +7,6 @@ import (
 	context "context"
 	cosmossdk_io_math "cosmossdk.io/math"
 	fmt "fmt"
-	_ "github.com/cosmos/cosmos-sdk/types"
 	_ "github.com/cosmos/gogoproto/gogoproto"
 	grpc1 "github.com/cosmos/gogoproto/grpc"
 	proto "github.com/cosmos/gogoproto/proto"
@@ -155,36 +154,35 @@ func init() {
 }
 
 var fileDescriptor_ce205b40e975faec = []byte{
-	// 457 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x93, 0xc1, 0x6e, 0xd3, 0x30,
-	0x18, 0xc7, 0x9b, 0xad, 0x14, 0x61, 0xb6, 0x03, 0x61, 0x82, 0x50, 0xa4, 0x64, 0x84, 0xcb, 0x38,
-	0xcc, 0x26, 0xdb, 0x6d, 0x70, 0xca, 0x06, 0x62, 0x12, 0x93, 0x50, 0x38, 0x20, 0x21, 0xa4, 0xe2,
-	0xd8, 0x26, 0xb3, 0x96, 0xe4, 0x0b, 0xb1, 0x37, 0xad, 0x6f, 0xc1, 0xf3, 0xf0, 0x04, 0x3b, 0x4e,
-	0x9c, 0xd0, 0x0e, 0x11, 0x6a, 0xdf, 0xa0, 0x4f, 0x80, 0x12, 0xa7, 0xa5, 0x45, 0xed, 0x09, 0x71,
-	0xcb, 0xdf, 0xff, 0x7f, 0x7e, 0xfe, 0xfc, 0xd9, 0x1f, 0x7a, 0x05, 0x2a, 0x03, 0x25, 0x15, 0x61,
-	0x90, 0x33, 0x91, 0xeb, 0x92, 0x6a, 0xc1, 0x53, 0xf9, 0xf5, 0x5c, 0x72, 0xa9, 0x87, 0xa4, 0x00,
-	0x48, 0x33, 0xe0, 0x22, 0x5d, 0xf0, 0xc9, 0x45, 0x10, 0x0b, 0x4d, 0x03, 0xa2, 0x2f, 0x71, 0x51,
-	0x82, 0x06, 0xfb, 0x65, 0x8b, 0xc1, 0x4b, 0x31, 0x78, 0x86, 0x59, 0xf0, 0x71, 0x8b, 0xe9, 0x6f,
-	0x25, 0x90, 0x40, 0x03, 0x22, 0xf5, 0x97, 0x61, 0xf6, 0x5d, 0xd6, 0x40, 0x49, 0x4c, 0x95, 0x98,
-	0xed, 0xc8, 0x40, 0xe6, 0xc6, 0xf7, 0xbf, 0xaf, 0xa1, 0x47, 0x27, 0x2a, 0x39, 0x2c, 0x05, 0xd5,
-	0xe2, 0x70, 0x8e, 0xfb, 0x0e, 0x20, 0xb5, 0x9f, 0xa1, 0x9e, 0x12, 0x39, 0x17, 0xa5, 0x63, 0x6d,
-	0x5b, 0x3b, 0x77, 0xc2, 0x7b, 0x93, 0xca, 0xdb, 0x1c, 0xd2, 0x2c, 0x3d, 0xf0, 0xcd, 0xba, 0x1f,
-	0xb5, 0x81, 0x3a, 0xca, 0x45, 0x0e, 0xd9, 0x73, 0x67, 0xed, 0xef, 0xa8, 0x59, 0xf7, 0xa3, 0x36,
-	0x30, 0x8b, 0x06, 0xce, 0xfa, 0xd2, 0x68, 0x30, 0x8d, 0x06, 0xf6, 0x01, 0xda, 0xd0, 0x92, 0x9d,
-	0x0d, 0x54, 0x41, 0x99, 0xcc, 0x13, 0xa7, 0xbb, 0x6d, 0xed, 0x74, 0xc3, 0x87, 0x93, 0xca, 0xbb,
-	0x6f, 0x7e, 0x98, 0x77, 0xfd, 0xe8, 0x6e, 0x2d, 0xdf, 0x1b, 0x65, 0x7f, 0x46, 0x9b, 0xaa, 0x28,
-	0x05, 0xe5, 0x83, 0x2f, 0x94, 0x69, 0x28, 0x9d, 0x5b, 0xcd, 0x6e, 0x2f, 0xae, 0x2a, 0xaf, 0x73,
-	0x53, 0x79, 0x8f, 0x4d, 0x67, 0x14, 0x3f, 0xc3, 0x12, 0x48, 0x46, 0xf5, 0x29, 0x7e, 0x2b, 0x12,
-	0xca, 0x86, 0x47, 0x82, 0x4d, 0x2a, 0x6f, 0xab, 0x3d, 0xe6, 0x3c, 0xc1, 0x8f, 0x36, 0x8c, 0x7e,
-	0x6d, 0xe4, 0x1b, 0xf4, 0x64, 0x65, 0xef, 0x22, 0xa1, 0x0a, 0xc8, 0x95, 0xb0, 0x9f, 0xa2, 0xdb,
-	0xf5, 0xcd, 0x0d, 0x24, 0x6f, 0x9a, 0xd8, 0x0d, 0xd1, 0xa8, 0xf2, 0x7a, 0x75, 0xe4, 0xf8, 0x28,
-	0xea, 0xd5, 0xd6, 0x31, 0xdf, 0xbb, 0xb1, 0xd0, 0xfa, 0x89, 0x4a, 0xec, 0x1f, 0x16, 0x7a, 0xb0,
-	0xe2, 0x2e, 0x3e, 0xe0, 0x7f, 0x79, 0x1e, 0x78, 0x65, 0xa1, 0xfd, 0xc1, 0x7f, 0x02, 0x4f, 0x3b,
-	0x10, 0x7e, 0xba, 0x1a, 0xb9, 0xd6, 0xf5, 0xc8, 0xb5, 0x7e, 0x8d, 0x5c, 0xeb, 0xdb, 0xd8, 0xed,
-	0x5c, 0x8f, 0xdd, 0xce, 0xcf, 0xb1, 0xdb, 0xf9, 0x18, 0x26, 0x52, 0x9f, 0x9e, 0xc7, 0x98, 0x41,
-	0x46, 0xda, 0x22, 0x76, 0x53, 0x1a, 0xab, 0xa9, 0x20, 0x17, 0x7b, 0xfb, 0xe4, 0x72, 0x61, 0x6c,
-	0x76, 0xff, 0xcc, 0x55, 0x53, 0x54, 0xdc, 0x6b, 0x1e, 0xf2, 0xfe, 0xef, 0x00, 0x00, 0x00, 0xff,
-	0xff, 0x13, 0xed, 0xef, 0x46, 0x85, 0x03, 0x00, 0x00,
+	// 444 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x93, 0x4f, 0x6e, 0xd4, 0x30,
+	0x14, 0xc6, 0xc7, 0xed, 0x30, 0x08, 0xd3, 0x2e, 0x08, 0x15, 0x84, 0x22, 0x25, 0x25, 0x6c, 0xca,
+	0xa2, 0x36, 0x69, 0x77, 0x85, 0x55, 0x5a, 0x10, 0x95, 0xa8, 0x84, 0xc2, 0x02, 0x09, 0x21, 0x0d,
+	0x8e, 0x6d, 0x52, 0xab, 0x49, 0x5e, 0x88, 0xdd, 0xaa, 0x73, 0x0b, 0xce, 0xc3, 0x09, 0xba, 0xac,
+	0x58, 0xa1, 0x2e, 0x22, 0x94, 0xb9, 0xc1, 0x9c, 0x00, 0xe5, 0xcf, 0x94, 0x19, 0x34, 0xb3, 0x42,
+	0xec, 0xf2, 0xf9, 0x7d, 0xfe, 0xe5, 0xe5, 0x7b, 0x79, 0xf8, 0x15, 0xe8, 0x14, 0xb4, 0xd2, 0x94,
+	0x43, 0xc6, 0x65, 0x66, 0x0a, 0x66, 0xa4, 0x48, 0xd4, 0xd7, 0x33, 0x25, 0x94, 0x19, 0xd1, 0x1c,
+	0x20, 0x49, 0x41, 0xc8, 0x64, 0xae, 0x4e, 0xcf, 0xfd, 0x48, 0x1a, 0xe6, 0x53, 0x73, 0x41, 0xf2,
+	0x02, 0x0c, 0x58, 0x2f, 0x3b, 0x0c, 0x59, 0x88, 0x21, 0x37, 0x98, 0xb9, 0x3a, 0xe9, 0x30, 0x9b,
+	0x1b, 0x31, 0xc4, 0xd0, 0x80, 0x68, 0xfd, 0xd4, 0x32, 0xbd, 0xef, 0x2b, 0xf8, 0xd1, 0xb1, 0x8e,
+	0x0f, 0x0a, 0xc9, 0x8c, 0x3c, 0x98, 0xb9, 0xf7, 0x0e, 0x20, 0xb1, 0x9e, 0xe1, 0x81, 0x96, 0x99,
+	0x90, 0x85, 0x8d, 0xb6, 0xd0, 0xf6, 0x9d, 0xe0, 0xde, 0xa4, 0x74, 0xd7, 0x47, 0x2c, 0x4d, 0xf6,
+	0xbd, 0xf6, 0xdc, 0x0b, 0x3b, 0x43, 0x6d, 0x15, 0x32, 0x83, 0xf4, 0xb9, 0xbd, 0xf2, 0xb7, 0xb5,
+	0x3d, 0xf7, 0xc2, 0xce, 0x70, 0x63, 0xf5, 0xed, 0xd5, 0x85, 0x56, 0x7f, 0x6a, 0xf5, 0xad, 0x7d,
+	0xbc, 0x66, 0x14, 0x3f, 0x1d, 0xea, 0x9c, 0x71, 0x95, 0xc5, 0x76, 0x7f, 0x0b, 0x6d, 0xf7, 0x83,
+	0x87, 0x93, 0xd2, 0xbd, 0xdf, 0x5e, 0x98, 0xad, 0x7a, 0xe1, 0xdd, 0x5a, 0xbe, 0x6f, 0x95, 0xf5,
+	0x19, 0xaf, 0xeb, 0xbc, 0x90, 0x4c, 0x0c, 0xbf, 0x30, 0x6e, 0xa0, 0xb0, 0x6f, 0x35, 0x6f, 0x7b,
+	0x71, 0x59, 0xba, 0xbd, 0xeb, 0xd2, 0x7d, 0xcc, 0x9b, 0x38, 0xb5, 0x38, 0x25, 0x0a, 0x68, 0xca,
+	0xcc, 0x09, 0x79, 0x2b, 0x63, 0xc6, 0x47, 0x87, 0x92, 0x4f, 0x4a, 0x77, 0xa3, 0xfb, 0xcc, 0x59,
+	0x82, 0x17, 0xae, 0xb5, 0xfa, 0x75, 0x2b, 0xdf, 0xe0, 0x27, 0x4b, 0xb3, 0x0b, 0xa5, 0xce, 0x21,
+	0xd3, 0xd2, 0x7a, 0x8a, 0x6f, 0xd7, 0x93, 0x19, 0x2a, 0xd1, 0x84, 0xd8, 0x0f, 0x70, 0x55, 0xba,
+	0x83, 0xda, 0x72, 0x74, 0x18, 0x0e, 0xea, 0xd2, 0x91, 0xd8, 0xbd, 0x46, 0x78, 0xf5, 0x58, 0xc7,
+	0xd6, 0x0f, 0x84, 0x1f, 0x2c, 0x99, 0xc5, 0x07, 0xf2, 0x2f, 0xe3, 0x27, 0x4b, 0x1b, 0xdd, 0x1c,
+	0xfe, 0x27, 0xf0, 0x34, 0x81, 0xe0, 0xd3, 0x65, 0xe5, 0xa0, 0xab, 0xca, 0x41, 0xbf, 0x2a, 0x07,
+	0x7d, 0x1b, 0x3b, 0xbd, 0xab, 0xb1, 0xd3, 0xfb, 0x39, 0x76, 0x7a, 0x1f, 0x83, 0x58, 0x99, 0x93,
+	0xb3, 0x88, 0x70, 0x48, 0x69, 0xd7, 0xc4, 0x4e, 0xc2, 0x22, 0x3d, 0x15, 0xf4, 0x7c, 0x77, 0x8f,
+	0x5e, 0xcc, 0xad, 0xc5, 0xce, 0x9f, 0xbd, 0x69, 0x9a, 0x8a, 0x06, 0xcd, 0x8f, 0xbc, 0xf7, 0x3b,
+	0x00, 0x00, 0xff, 0xff, 0xc0, 0x1d, 0x15, 0x10, 0x65, 0x03, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/x/concentrated-liquidity/msg_server_test.go b/x/concentrated-liquidity/msg_server_test.go
index 3764af1a46f..10d5b5b1a2d 100644
--- a/x/concentrated-liquidity/msg_server_test.go
+++ b/x/concentrated-liquidity/msg_server_test.go
@@ -636,8 +636,8 @@ func (s *KeeperTestSuite) TestTransferPositions_Events() {
 			}
 
 			if tc.hasIncentivesToClaim {
-				s.fundIncentiveAddr(s.Ctx, pool.GetIncentivesAddress(), tc.positionIds)
-				s.addUptimeGrowthInsideRange(s.Ctx, pool.GetId(), s.TestAccs[0], apptesting.DefaultLowerTick+1, DefaultLowerTick, DefaultUpperTick, expectedUptimes.hundredTokensMultiDenom)
+				s.fundIncentiveAddr(pool.GetIncentivesAddress(), tc.positionIds)
+				s.addUptimeGrowthInsideRange(s.Ctx, pool.GetId(), apptesting.DefaultLowerTick+1, DefaultLowerTick, DefaultUpperTick, expectedUptimes.hundredTokensMultiDenom)
 			}
 
 			if tc.hasSpreadRewardsToClaim {
diff --git a/x/concentrated-liquidity/pool_hooks.go b/x/concentrated-liquidity/pool_hooks.go
index 728c1cedd58..3ecbc744862 100644
--- a/x/concentrated-liquidity/pool_hooks.go
+++ b/x/concentrated-liquidity/pool_hooks.go
@@ -13,92 +13,78 @@ import (
 
 // --- Pool Hooks ---
 
+type msgBuilderFn func(poolId uint64) ([]byte, error)
+
 // BeforeCreatePosition is a hook that is called before a position is created.
 func (k Keeper) BeforeCreatePosition(ctx sdk.Context, poolId uint64, owner sdk.AccAddress, tokensProvided sdk.Coins, amount0Min osmomath.Int, amount1Min osmomath.Int, lowerTick int64, upperTick int64) error {
-	// Build and marshal the message to be passed to the contract
-	msg := types.BeforeCreatePositionMsg{PoolId: poolId, Owner: owner, TokensProvided: osmoutils.CWCoinsFromSDKCoins(tokensProvided), Amount0Min: amount0Min, Amount1Min: amount1Min, LowerTick: lowerTick, UpperTick: upperTick}
-	msgBz, err := json.Marshal(types.BeforeCreatePositionSudoMsg{BeforeCreatePosition: msg})
-	if err != nil {
-		return err
+	msgBuilderFn := func(poolId uint64) ([]byte, error) {
+		msg := types.BeforeCreatePositionMsg{PoolId: poolId, Owner: owner, TokensProvided: osmoutils.CWCoinsFromSDKCoins(tokensProvided), Amount0Min: amount0Min, Amount1Min: amount1Min, LowerTick: lowerTick, UpperTick: upperTick}
+		return json.Marshal(types.BeforeCreatePositionSudoMsg{BeforeCreatePosition: msg})
 	}
-	return k.callPoolActionListener(ctx, msgBz, poolId, types.BeforeActionPrefix(types.CreatePositionPrefix))
+	return k.callPoolActionListener(ctx, msgBuilderFn, poolId, types.BeforeActionPrefix(types.CreatePositionPrefix))
 }
 
 // AfterCreatePosition is a hook that is called after a position is created.
 func (k Keeper) AfterCreatePosition(ctx sdk.Context, poolId uint64, owner sdk.AccAddress, tokensProvided sdk.Coins, amount0Min osmomath.Int, amount1Min osmomath.Int, lowerTick int64, upperTick int64) error {
-	// Build and marshal the message to be passed to the contract
-	msg := types.AfterCreatePositionMsg{PoolId: poolId, Owner: owner, TokensProvided: osmoutils.CWCoinsFromSDKCoins(tokensProvided), Amount0Min: amount0Min, Amount1Min: amount1Min, LowerTick: lowerTick, UpperTick: upperTick}
-	msgBz, err := json.Marshal(types.AfterCreatePositionSudoMsg{AfterCreatePosition: msg})
-	if err != nil {
-		return err
+	msgBuilderFn := func(poolId uint64) ([]byte, error) {
+		msg := types.AfterCreatePositionMsg{PoolId: poolId, Owner: owner, TokensProvided: osmoutils.CWCoinsFromSDKCoins(tokensProvided), Amount0Min: amount0Min, Amount1Min: amount1Min, LowerTick: lowerTick, UpperTick: upperTick}
+		return json.Marshal(types.AfterCreatePositionSudoMsg{AfterCreatePosition: msg})
 	}
-	return k.callPoolActionListener(ctx, msgBz, poolId, types.AfterActionPrefix(types.CreatePositionPrefix))
+	return k.callPoolActionListener(ctx, msgBuilderFn, poolId, types.AfterActionPrefix(types.CreatePositionPrefix))
 }
 
 // BeforeWithdrawPosition is a hook that is called before liquidity is withdrawn from a position.
 func (k Keeper) BeforeWithdrawPosition(ctx sdk.Context, poolId uint64, owner sdk.AccAddress, positionId uint64, amountToWithdraw osmomath.Dec) error {
-	// Build and marshal the message to be passed to the contract
-	msg := types.BeforeWithdrawPositionMsg{PoolId: poolId, Owner: owner, PositionId: positionId, AmountToWithdraw: amountToWithdraw}
-	msgBz, err := json.Marshal(types.BeforeWithdrawPositionSudoMsg{BeforeWithdrawPosition: msg})
-	if err != nil {
-		return err
+	msgBuilderFn := func(poolId uint64) ([]byte, error) {
+		msg := types.BeforeWithdrawPositionMsg{PoolId: poolId, Owner: owner, PositionId: positionId, AmountToWithdraw: amountToWithdraw}
+		return json.Marshal(types.BeforeWithdrawPositionSudoMsg{BeforeWithdrawPosition: msg})
 	}
-	return k.callPoolActionListener(ctx, msgBz, poolId, types.BeforeActionPrefix(types.WithdrawPositionPrefix))
+	return k.callPoolActionListener(ctx, msgBuilderFn, poolId, types.BeforeActionPrefix(types.WithdrawPositionPrefix))
 }
 
 // AfterWithdrawPosition is a hook that is called after liquidity is withdrawn from a position.
 func (k Keeper) AfterWithdrawPosition(ctx sdk.Context, poolId uint64, owner sdk.AccAddress, positionId uint64, amountToWithdraw osmomath.Dec) error {
-	// Build and marshal the message to be passed to the contract
-	msg := types.AfterWithdrawPositionMsg{PoolId: poolId, Owner: owner, PositionId: positionId, AmountToWithdraw: amountToWithdraw}
-	msgBz, err := json.Marshal(types.AfterWithdrawPositionSudoMsg{AfterWithdrawPosition: msg})
-	if err != nil {
-		return err
+	msgBuilderFn := func(poolId uint64) ([]byte, error) {
+		msg := types.AfterWithdrawPositionMsg{PoolId: poolId, Owner: owner, PositionId: positionId, AmountToWithdraw: amountToWithdraw}
+		return json.Marshal(types.AfterWithdrawPositionSudoMsg{AfterWithdrawPosition: msg})
 	}
-	return k.callPoolActionListener(ctx, msgBz, poolId, types.AfterActionPrefix(types.WithdrawPositionPrefix))
+	return k.callPoolActionListener(ctx, msgBuilderFn, poolId, types.AfterActionPrefix(types.WithdrawPositionPrefix))
 }
 
 // BeforeSwapExactAmountIn is a hook that is called before a swap is executed (exact amount in).
 func (k Keeper) BeforeSwapExactAmountIn(ctx sdk.Context, poolId uint64, sender sdk.AccAddress, tokenIn sdk.Coin, tokenOutDenom string, tokenOutMinAmount osmomath.Int, spreadFactor osmomath.Dec) error {
-	// Build and marshal the message to be passed to the contract
-	msg := types.BeforeSwapExactAmountInMsg{PoolId: poolId, Sender: sender, TokenIn: osmoutils.CWCoinFromSDKCoin(tokenIn), TokenOutDenom: tokenOutDenom, TokenOutMinAmount: tokenOutMinAmount, SpreadFactor: spreadFactor}
-	msgBz, err := json.Marshal(types.BeforeSwapExactAmountInSudoMsg{BeforeSwapExactAmountIn: msg})
-	if err != nil {
-		return err
+	msgBuilderFn := func(poolId uint64) ([]byte, error) {
+		msg := types.BeforeSwapExactAmountInMsg{PoolId: poolId, Sender: sender, TokenIn: osmoutils.CWCoinFromSDKCoin(tokenIn), TokenOutDenom: tokenOutDenom, TokenOutMinAmount: tokenOutMinAmount, SpreadFactor: spreadFactor}
+		return json.Marshal(types.BeforeSwapExactAmountInSudoMsg{BeforeSwapExactAmountIn: msg})
 	}
-	return k.callPoolActionListener(ctx, msgBz, poolId, types.BeforeActionPrefix(types.SwapExactAmountInPrefix))
+	return k.callPoolActionListener(ctx, msgBuilderFn, poolId, types.BeforeActionPrefix(types.SwapExactAmountInPrefix))
 }
 
 // AfterSwapExactAmountIn is a hook that is called after a swap is executed (exact amount in).
 func (k Keeper) AfterSwapExactAmountIn(ctx sdk.Context, poolId uint64, sender sdk.AccAddress, tokenIn sdk.Coin, tokenOutDenom string, tokenOutMinAmount osmomath.Int, spreadFactor osmomath.Dec) error {
-	// Build and marshal the message to be passed to the contract
-	msg := types.AfterSwapExactAmountInMsg{PoolId: poolId, Sender: sender, TokenIn: osmoutils.CWCoinFromSDKCoin(tokenIn), TokenOutDenom: tokenOutDenom, TokenOutMinAmount: tokenOutMinAmount, SpreadFactor: spreadFactor}
-	msgBz, err := json.Marshal(types.AfterSwapExactAmountInSudoMsg{AfterSwapExactAmountIn: msg})
-	if err != nil {
-		return err
+	msgBuilderFn := func(poolId uint64) ([]byte, error) {
+		msg := types.AfterSwapExactAmountInMsg{PoolId: poolId, Sender: sender, TokenIn: osmoutils.CWCoinFromSDKCoin(tokenIn), TokenOutDenom: tokenOutDenom, TokenOutMinAmount: tokenOutMinAmount, SpreadFactor: spreadFactor}
+		return json.Marshal(types.AfterSwapExactAmountInSudoMsg{AfterSwapExactAmountIn: msg})
 	}
-	return k.callPoolActionListener(ctx, msgBz, poolId, types.AfterActionPrefix(types.SwapExactAmountInPrefix))
+	return k.callPoolActionListener(ctx, msgBuilderFn, poolId, types.AfterActionPrefix(types.SwapExactAmountInPrefix))
 }
 
 // BeforeSwapExactAmountOut is a hook that is called before a swap is executed (exact amount out).
 func (k Keeper) BeforeSwapExactAmountOut(ctx sdk.Context, poolId uint64, sender sdk.AccAddress, tokenInDenom string, tokenInMaxAmount osmomath.Int, tokenOut sdk.Coin, spreadFactor osmomath.Dec) error {
-	// Build and marshal the message to be passed to the contract
-	msg := types.BeforeSwapExactAmountOutMsg{PoolId: poolId, Sender: sender, TokenInDenom: tokenInDenom, TokenInMaxAmount: tokenInMaxAmount, TokenOut: osmoutils.CWCoinFromSDKCoin(tokenOut), SpreadFactor: spreadFactor}
-	msgBz, err := json.Marshal(types.BeforeSwapExactAmountOutSudoMsg{BeforeSwapExactAmountOut: msg})
-	if err != nil {
-		return err
+	msgBuilderFn := func(poolId uint64) ([]byte, error) {
+		msg := types.BeforeSwapExactAmountOutMsg{PoolId: poolId, Sender: sender, TokenInDenom: tokenInDenom, TokenInMaxAmount: tokenInMaxAmount, TokenOut: osmoutils.CWCoinFromSDKCoin(tokenOut), SpreadFactor: spreadFactor}
+		return json.Marshal(types.BeforeSwapExactAmountOutSudoMsg{BeforeSwapExactAmountOut: msg})
 	}
-	return k.callPoolActionListener(ctx, msgBz, poolId, types.BeforeActionPrefix(types.SwapExactAmountOutPrefix))
+	return k.callPoolActionListener(ctx, msgBuilderFn, poolId, types.BeforeActionPrefix(types.SwapExactAmountOutPrefix))
 }
 
 // AfterSwapExactAmountOut is a hook that is called after a swap is executed (exact amount out).
 func (k Keeper) AfterSwapExactAmountOut(ctx sdk.Context, poolId uint64, sender sdk.AccAddress, tokenInDenom string, tokenInMaxAmount osmomath.Int, tokenOut sdk.Coin, spreadFactor osmomath.Dec) error {
-	// Build and marshal the message to be passed to the contract
-	msg := types.AfterSwapExactAmountOutMsg{PoolId: poolId, Sender: sender, TokenInDenom: tokenInDenom, TokenInMaxAmount: tokenInMaxAmount, TokenOut: osmoutils.CWCoinFromSDKCoin(tokenOut), SpreadFactor: spreadFactor}
-	msgBz, err := json.Marshal(types.AfterSwapExactAmountOutSudoMsg{AfterSwapExactAmountOut: msg})
-	if err != nil {
-		return err
+	msgBuilderFn := func(poolId uint64) ([]byte, error) {
+		msg := types.AfterSwapExactAmountOutMsg{PoolId: poolId, Sender: sender, TokenInDenom: tokenInDenom, TokenInMaxAmount: tokenInMaxAmount, TokenOut: osmoutils.CWCoinFromSDKCoin(tokenOut), SpreadFactor: spreadFactor}
+		return json.Marshal(types.AfterSwapExactAmountOutSudoMsg{AfterSwapExactAmountOut: msg})
 	}
-	return k.callPoolActionListener(ctx, msgBz, poolId, types.AfterActionPrefix(types.SwapExactAmountOutPrefix))
+	return k.callPoolActionListener(ctx, msgBuilderFn, poolId, types.AfterActionPrefix(types.SwapExactAmountOutPrefix))
 }
 
 // callPoolActionListener processes and dispatches the passed in message to the contract corresponding to the hook
@@ -108,7 +94,7 @@ func (k Keeper) AfterSwapExactAmountOut(ctx sdk.Context, poolId uint64, sender s
 //
 // Since it is possible for this function to be triggered in begin block code, we need to directly meter its execution and set a limit.
 // If no contract is linked to the hook, this function is a no-op.
-func (k Keeper) callPoolActionListener(ctx sdk.Context, msgBz []byte, poolId uint64, actionPrefix string) (err error) {
+func (k Keeper) callPoolActionListener(ctx sdk.Context, msgBuilderFn msgBuilderFn, poolId uint64, actionPrefix string) (err error) {
 	defer func() {
 		if r := recover(); r != nil {
 			err = types.ContractHookOutOfGasError{GasLimit: k.GetParams(ctx).HookGasLimit}
@@ -120,6 +106,11 @@ func (k Keeper) callPoolActionListener(ctx sdk.Context, msgBz []byte, poolId uin
 		return nil
 	}
 
+	msgBz, err := msgBuilderFn(poolId)
+	if err != nil {
+		return err
+	}
+
 	cwAddr, err := sdk.AccAddressFromBech32(cosmwasmAddress)
 	if err != nil {
 		return err
diff --git a/x/concentrated-liquidity/pool_hooks_test.go b/x/concentrated-liquidity/pool_hooks_test.go
index 42d1781cba9..297883b6859 100644
--- a/x/concentrated-liquidity/pool_hooks_test.go
+++ b/x/concentrated-liquidity/pool_hooks_test.go
@@ -167,12 +167,15 @@ func (s *KeeperTestSuite) TestCallPoolActionListener() {
 			s.Require().NoError(err)
 
 			// Marshal test case msg to pass into contract
-			msgBz, err := json.Marshal(tc.msg)
-			s.Require().NoError(err)
+			msgBuilderFn := func(uint64) ([]byte, error) {
+				msgBz, err := json.Marshal(tc.msg)
+				s.Require().NoError(err)
+				return msgBz, nil
+			}
 
 			// --- System under test ---
 
-			err = s.Clk.CallPoolActionListener(s.Ctx, msgBz, validPoolId, validActionPrefix)
+			err = s.Clk.CallPoolActionListener(s.Ctx, msgBuilderFn, validPoolId, validActionPrefix)
 
 			// --- Assertions ---
 
diff --git a/x/concentrated-liquidity/position_test.go b/x/concentrated-liquidity/position_test.go
index fd91500e0ee..0a8d52eb1bc 100644
--- a/x/concentrated-liquidity/position_test.go
+++ b/x/concentrated-liquidity/position_test.go
@@ -2367,11 +2367,11 @@ func (s *KeeperTestSuite) TestTransferPositions() {
 
 			// For each position that is in range, add spread rewards and incentives to their respective addresses
 			totalSpreadRewards := s.fundSpreadRewardsAddr(s.Ctx, pool.GetSpreadRewardsAddress(), tc.inRangePositions)
-			totalIncentives := s.fundIncentiveAddr(s.Ctx, pool.GetIncentivesAddress(), tc.inRangePositions)
+			totalIncentives := s.fundIncentiveAddr(pool.GetIncentivesAddress(), tc.inRangePositions)
 			totalExpectedRewards := totalSpreadRewards.Add(totalIncentives...)
 
 			// Add spread rewards and incentives to the pool
-			s.addUptimeGrowthInsideRange(s.Ctx, pool.GetId(), oldOwner, apptesting.DefaultLowerTick+1, DefaultLowerTick, DefaultUpperTick, expectedUptimes.hundredTokensMultiDenom)
+			s.addUptimeGrowthInsideRange(s.Ctx, pool.GetId(), apptesting.DefaultLowerTick+1, DefaultLowerTick, DefaultUpperTick, expectedUptimes.hundredTokensMultiDenom)
 			s.AddToSpreadRewardAccumulator(pool.GetId(), sdk.NewDecCoin(ETH, osmomath.NewInt(10)))
 
 			// Move block time forward. In the event we have positions in range
@@ -2463,9 +2463,9 @@ func (s *KeeperTestSuite) TestTransferPositions() {
 
 				// Test that adding incentives/spread rewards and then claiming returns it to the new owner, and the old owner does not get anything
 				totalSpreadRewards := s.fundSpreadRewardsAddr(s.Ctx, pool.GetSpreadRewardsAddress(), tc.inRangePositions)
-				totalIncentives := s.fundIncentiveAddr(s.Ctx, pool.GetIncentivesAddress(), tc.inRangePositions)
+				totalIncentives := s.fundIncentiveAddr(pool.GetIncentivesAddress(), tc.inRangePositions)
 				totalExpectedRewards := totalSpreadRewards.Add(totalIncentives...)
-				s.addUptimeGrowthInsideRange(s.Ctx, pool.GetId(), oldOwner, apptesting.DefaultLowerTick+1, DefaultLowerTick, DefaultUpperTick, expectedUptimes.hundredTokensMultiDenom)
+				s.addUptimeGrowthInsideRange(s.Ctx, pool.GetId(), apptesting.DefaultLowerTick+1, DefaultLowerTick, DefaultUpperTick, expectedUptimes.hundredTokensMultiDenom)
 				s.AddToSpreadRewardAccumulator(pool.GetId(), sdk.NewDecCoin(ETH, osmomath.NewInt(10)))
 				for _, positionId := range tc.positionsToTransfer {
 					_, _, err := s.App.ConcentratedLiquidityKeeper.CollectIncentives(s.Ctx, newOwner, positionId)
@@ -2517,7 +2517,7 @@ func (s *KeeperTestSuite) TestTransferPositions() {
 //
 // Returns:
 // - totalExpectedRewards: The total expected rewards after funding all the positions.
-func (s *KeeperTestSuite) fundIncentiveAddr(ctx sdk.Context, incentivesAddress sdk.AccAddress, positionIds []uint64) (totalExpectedRewards sdk.Coins) {
+func (s *KeeperTestSuite) fundIncentiveAddr(incentivesAddress sdk.AccAddress, positionIds []uint64) (totalExpectedRewards sdk.Coins) {
 	expectedUptimes := getExpectedUptimes()
 	for i := 0; i < len(positionIds); i++ {
 		coinsToFundForIncentivesToUser := expectedIncentivesFromUptimeGrowth(expectedUptimes.hundredTokensMultiDenom, DefaultLiquidityAmt, time.Hour*24, defaultMultiplier)
diff --git a/x/concentrated-liquidity/swaps.go b/x/concentrated-liquidity/swaps.go
index 310f5d2eba8..a1cc5ea0574 100644
--- a/x/concentrated-liquidity/swaps.go
+++ b/x/concentrated-liquidity/swaps.go
@@ -494,7 +494,7 @@ func (k Keeper) computeOutAmtGivenIn(
 
 	// Coin amounts require int values
 	// Round amountIn up to avoid under charging
-	amountIn := (tokenInMin.Amount.ToLegacyDec().Sub(swapState.amountSpecifiedRemaining)).Ceil().TruncateInt()
+	amountIn := (tokenInMin.Amount.ToLegacyDec().SubMut(swapState.amountSpecifiedRemaining)).Ceil().TruncateInt()
 	// Round amountOut down to avoid over distributing.
 	amountOut := swapState.amountCalculated.TruncateInt()
 
@@ -622,7 +622,7 @@ func (k Keeper) computeInAmtGivenOut(
 	amountIn := swapState.amountCalculated.Ceil().TruncateInt()
 
 	// Round amount out down to avoid over charging the pool.
-	amountOut := desiredTokenOut.Amount.ToLegacyDec().Sub(swapState.amountSpecifiedRemaining).TruncateInt()
+	amountOut := desiredTokenOut.Amount.ToLegacyDec().SubMut(swapState.amountSpecifiedRemaining).TruncateInt()
 
 	ctx.Logger().Debug("final amount in", amountIn)
 	ctx.Logger().Debug("final amount out", amountOut)
diff --git a/x/concentrated-liquidity/types/errors.go b/x/concentrated-liquidity/types/errors.go
index ec9725552d8..c61a268551d 100644
--- a/x/concentrated-liquidity/types/errors.go
+++ b/x/concentrated-liquidity/types/errors.go
@@ -19,6 +19,7 @@ var (
 	ErrZeroLiquidity                      = errors.New("liquidity cannot be 0")
 	ErrNextTickInfoNil                    = errors.New("next tick info cannot be nil")
 	ErrPoolNil                            = errors.New("pool cannot be nil")
+	ErrCalculateSqrtPriceToTick           = errors.New("internal error in computing square roots within CalculateSqrtPriceToTick")
 )
 
 // x/concentrated-liquidity module sentinel errors.
diff --git a/x/concentrated-liquidity/types/genesis/genesis.pb.go b/x/concentrated-liquidity/types/genesis/genesis.pb.go
index c45f8f44f80..d3bb03d45cc 100644
--- a/x/concentrated-liquidity/types/genesis/genesis.pb.go
+++ b/x/concentrated-liquidity/types/genesis/genesis.pb.go
@@ -7,7 +7,6 @@ import (
 	fmt "fmt"
 	_ "github.com/cosmos/cosmos-proto"
 	types "github.com/cosmos/cosmos-sdk/codec/types"
-	_ "github.com/cosmos/cosmos-sdk/types"
 	_ "github.com/cosmos/gogoproto/gogoproto"
 	proto "github.com/cosmos/gogoproto/proto"
 	accum "github.com/osmosis-labs/osmosis/osmoutils/accum"
@@ -396,65 +395,64 @@ func init() {
 }
 
 var fileDescriptor_4cdf50d18c43a7c5 = []byte{
-	// 924 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x56, 0xcb, 0x6e, 0x23, 0x45,
-	0x14, 0x4d, 0x4f, 0x1c, 0x93, 0x94, 0x3d, 0x43, 0xa6, 0x94, 0x21, 0x3d, 0x41, 0x63, 0x9b, 0x1e,
-	0x45, 0x0a, 0xa0, 0x74, 0x6b, 0xec, 0x11, 0x12, 0x08, 0x16, 0xe9, 0xe1, 0x21, 0x83, 0x80, 0xa8,
-	0x08, 0x1b, 0x5e, 0x4d, 0xb9, 0xab, 0xe2, 0x14, 0xd3, 0xdd, 0xd5, 0x74, 0x95, 0x43, 0xbc, 0xe5,
-	0x0b, 0x10, 0x2b, 0x3e, 0x81, 0x0f, 0x40, 0x62, 0xcd, 0x6e, 0x84, 0x58, 0xcc, 0x0e, 0x56, 0x16,
-	0x4a, 0xfe, 0xc0, 0x5f, 0x80, 0xba, 0x1e, 0x7e, 0x04, 0x4f, 0x70, 0xd8, 0x75, 0xf9, 0xde, 0x73,
-	0xee, 0xa9, 0xfb, 0x2a, 0x83, 0x0e, 0x17, 0x29, 0x17, 0x4c, 0x04, 0x31, 0xcf, 0x62, 0x9a, 0xc9,
-	0x02, 0x4b, 0x4a, 0x12, 0xf6, 0xed, 0x80, 0x11, 0x26, 0x87, 0xc1, 0xe9, 0x83, 0x1e, 0x95, 0xf8,
-	0x41, 0xd0, 0xa7, 0x19, 0x15, 0x4c, 0xf8, 0x79, 0xc1, 0x25, 0x87, 0xbb, 0x06, 0xe4, 0x2f, 0x04,
-	0xf9, 0x06, 0xb4, 0xb3, 0xd5, 0xe7, 0x7d, 0xae, 0x10, 0x41, 0xf9, 0xa5, 0xc1, 0x3b, 0x77, 0x63,
-	0x85, 0x8e, 0xb4, 0x41, 0x1f, 0x8c, 0xa9, 0xa1, 0x4f, 0x41, 0x0f, 0x0b, 0x3a, 0x09, 0x1d, 0x73,
-	0x96, 0x59, 0x68, 0x9f, 0xf3, 0x7e, 0x42, 0x03, 0x75, 0xea, 0x0d, 0x8e, 0x03, 0x9c, 0x0d, 0x8d,
-	0xe9, 0x25, 0x7b, 0x0f, 0x1c, 0xc7, 0x83, 0x74, 0x02, 0x56, 0x27, 0xe3, 0xf2, 0xca, 0xd5, 0x57,
-	0xcd, 0x71, 0x81, 0x53, 0xab, 0xe4, 0xe1, 0x72, 0x69, 0xc9, 0xb9, 0x60, 0x92, 0xf1, 0xec, 0x7a,
-	0x28, 0xc9, 0xe2, 0xc7, 0xdd, 0xec, 0xd8, 0x26, 0xe4, 0xcd, 0xe5, 0x50, 0x4c, 0x19, 0xd9, 0x29,
-	0x8d, 0x0a, 0x1a, 0xf3, 0x82, 0x68, 0xb4, 0xf7, 0x87, 0x03, 0xd6, 0xdf, 0x1d, 0x24, 0xc9, 0x11,
-	0x8b, 0x1f, 0xc3, 0x57, 0xc1, 0x73, 0x39, 0xe7, 0x49, 0xc4, 0x88, 0xeb, 0xb4, 0x9c, 0xbd, 0x4a,
-	0x08, 0xc7, 0xa3, 0xe6, 0xad, 0x21, 0x4e, 0x93, 0x37, 0x3c, 0x63, 0xf0, 0x50, 0xb5, 0xfc, 0xea,
-	0x12, 0xf8, 0x10, 0x80, 0x52, 0x49, 0xc4, 0x32, 0x42, 0xcf, 0xdc, 0x1b, 0x2d, 0x67, 0x6f, 0x35,
-	0xbc, 0x33, 0x1e, 0x35, 0x6f, 0x6b, 0xff, 0xa9, 0xcd, 0x43, 0x1b, 0x5a, 0x32, 0xa1, 0x67, 0xf0,
-	0x4b, 0x50, 0x61, 0xd9, 0x31, 0x77, 0x57, 0x5b, 0xce, 0x5e, 0xad, 0x1d, 0xf8, 0x4b, 0xb5, 0x82,
-	0x7f, 0x64, 0xae, 0x1c, 0xba, 0x4f, 0x46, 0xcd, 0x95, 0xf1, 0xa8, 0xb9, 0x39, 0x17, 0xe4, 0x98,
-	0x7b, 0x48, 0xd1, 0x7a, 0xbf, 0x56, 0xc0, 0xfa, 0x21, 0xe7, 0xc9, 0xdb, 0x58, 0x62, 0xd8, 0x01,
-	0x95, 0x52, 0xab, 0xba, 0x4b, 0xad, 0xbd, 0xe5, 0xeb, 0xf2, 0xfb, 0xb6, 0xfc, 0xfe, 0x41, 0x36,
-	0x0c, 0x37, 0x7e, 0xff, 0x65, 0x7f, 0xad, 0x44, 0x74, 0x91, 0x72, 0x86, 0x9f, 0x83, 0xb5, 0x92,
-	0x55, 0xb8, 0x37, 0x5a, 0xab, 0xd7, 0x50, 0x68, 0x73, 0x18, 0x6e, 0x19, 0x85, 0xf5, 0xa9, 0x42,
-	0xe1, 0x21, 0xcd, 0x09, 0x7f, 0x72, 0xc0, 0x5d, 0x91, 0x17, 0x14, 0x93, 0xa8, 0xa0, 0xdf, 0xe1,
-	0x82, 0x44, 0xaa, 0xc3, 0x06, 0x09, 0x96, 0xbc, 0x30, 0x39, 0x69, 0x2f, 0x19, 0xf1, 0xa0, 0x44,
-	0x7e, 0xdc, 0xfb, 0x86, 0xc6, 0x32, 0xdc, 0x33, 0x41, 0x5b, 0x3a, 0xe8, 0x33, 0x43, 0x78, 0x68,
-	0x5b, 0xdb, 0x90, 0x32, 0x1d, 0x4c, 0x2d, 0xf0, 0x47, 0x07, 0x6c, 0x4f, 0x7a, 0x44, 0xcc, 0x82,
-	0x84, 0x5b, 0x51, 0xa9, 0xf8, 0x3f, 0xc2, 0x76, 0x8d, 0xb0, 0x7b, 0x5a, 0xd8, 0xe2, 0x00, 0x1e,
-	0x7a, 0x61, 0x6a, 0x98, 0xd1, 0x24, 0x20, 0x03, 0xb7, 0x2f, 0xf7, 0xad, 0x70, 0xd7, 0x94, 0x9a,
-	0xd7, 0x96, 0x54, 0xd3, 0xb5, 0x78, 0xa4, 0xe0, 0x61, 0xa5, 0x54, 0x84, 0x36, 0xd9, 0xfc, 0xcf,
-	0xc2, 0xfb, 0xed, 0x06, 0xa8, 0x1f, 0x9a, 0x79, 0x54, 0xdd, 0xf3, 0x01, 0x58, 0xb7, 0xf3, 0x69,
-	0x3a, 0x68, 0xd9, 0x5e, 0xb0, 0x34, 0x68, 0x42, 0x50, 0x4e, 0x56, 0xc2, 0xcb, 0x5e, 0x25, 0x6a,
-	0x52, 0xe6, 0x26, 0xcb, 0x18, 0x3c, 0x54, 0x2d, 0xbf, 0xba, 0x04, 0x7e, 0x0d, 0x76, 0x16, 0x54,
-	0xd0, 0xdc, 0xdf, 0x74, 0xc9, 0xbd, 0x89, 0x16, 0xbd, 0xa3, 0x6c, 0xec, 0xb9, 0x5b, 0xfe, 0xbb,
-	0xd8, 0xda, 0x0c, 0x3f, 0x05, 0x5b, 0x83, 0x5c, 0xb2, 0x94, 0xce, 0x51, 0xdb, 0x42, 0x2f, 0xc5,
-	0x0d, 0x35, 0xc1, 0x0c, 0xab, 0xf0, 0xfe, 0xac, 0x80, 0xfa, 0x7b, 0x7a, 0xd5, 0x7f, 0x22, 0xb1,
-	0xa4, 0xf0, 0x11, 0xa8, 0xea, 0xbd, 0x68, 0x32, 0xb8, 0xfb, 0x1f, 0x19, 0x3c, 0x54, 0xce, 0x26,
-	0x82, 0x81, 0x42, 0x04, 0x36, 0xd4, 0xf2, 0x21, 0x58, 0xe2, 0x6b, 0x4e, 0xa5, 0x5d, 0x05, 0x86,
-	0x71, 0x3d, 0xb7, 0xab, 0xe1, 0x2b, 0x70, 0xd3, 0xd6, 0x46, 0xf3, 0xae, 0x2a, 0xde, 0xce, 0x35,
-	0x2b, 0x3c, 0xc3, 0x5d, 0xcf, 0x67, 0x9b, 0xe7, 0x1d, 0xb0, 0x99, 0xd1, 0x33, 0x19, 0x4d, 0x82,
-	0x30, 0xe2, 0x56, 0x54, 0xe1, 0x5f, 0x1c, 0x8f, 0x9a, 0xdb, 0xba, 0xf0, 0x97, 0x3d, 0x3c, 0x74,
-	0xab, 0xfc, 0xc9, 0x92, 0x77, 0x09, 0xfc, 0x02, 0xb8, 0xca, 0xe9, 0xf2, 0x10, 0x94, 0x74, 0x6b,
-	0x8a, 0xee, 0xfe, 0x78, 0xd4, 0x6c, 0xce, 0xd0, 0x2d, 0xf0, 0xf4, 0xd0, 0x9d, 0xd2, 0x74, 0x69,
-	0x10, 0xba, 0x04, 0xfe, 0xec, 0x80, 0xf6, 0xe2, 0x89, 0x8c, 0xcc, 0xb6, 0x8f, 0x52, 0xd6, 0x2f,
-	0xb0, 0x92, 0x27, 0x4f, 0x0a, 0x2a, 0x4e, 0x78, 0x42, 0xdc, 0xaa, 0x0a, 0xfc, 0xd6, 0x78, 0xd4,
-	0x7c, 0xfd, 0xaa, 0xa9, 0xbe, 0x8a, 0xc3, 0x43, 0xfb, 0x0b, 0x27, 0x5e, 0x2d, 0x62, 0xf2, 0xa1,
-	0x05, 0x1c, 0x4d, 0xfc, 0xbf, 0x77, 0x40, 0x6d, 0x66, 0xaf, 0xc0, 0xfb, 0xa0, 0x92, 0xe1, 0x94,
-	0xaa, 0xb6, 0xda, 0x08, 0x9f, 0x1f, 0x8f, 0x9a, 0x35, 0x93, 0x04, 0x9c, 0x52, 0x0f, 0x29, 0x23,
-	0xfc, 0x08, 0xdc, 0xd4, 0xed, 0x1d, 0xf3, 0x4c, 0xd2, 0x4c, 0xaa, 0xd1, 0xab, 0xb5, 0x5f, 0x7e,
-	0x46, 0x7b, 0xcf, 0xe8, 0x78, 0xa4, 0x01, 0xa8, 0xae, 0x3c, 0xcc, 0x29, 0x24, 0x4f, 0xce, 0x1b,
-	0xce, 0xd3, 0xf3, 0x86, 0xf3, 0xf7, 0x79, 0xc3, 0xf9, 0xe1, 0xa2, 0xb1, 0xf2, 0xf4, 0xa2, 0xb1,
-	0xf2, 0xd7, 0x45, 0x63, 0xe5, 0xb3, 0xf7, 0xfb, 0x4c, 0x9e, 0x0c, 0x7a, 0x7e, 0xcc, 0xd3, 0xc0,
-	0x90, 0xef, 0x27, 0xb8, 0x27, 0xec, 0x21, 0x38, 0x6d, 0x77, 0x82, 0xb3, 0xb9, 0x17, 0x7a, 0x7f,
-	0xfa, 0x44, 0xcb, 0x61, 0x4e, 0x85, 0xfd, 0x8f, 0xd4, 0xab, 0xaa, 0xf7, 0xa9, 0xf3, 0x4f, 0x00,
-	0x00, 0x00, 0xff, 0xff, 0xd3, 0x46, 0xd5, 0x6e, 0x5b, 0x09, 0x00, 0x00,
+	// 912 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x56, 0x4d, 0x6f, 0xe3, 0x44,
+	0x18, 0xae, 0x5b, 0xb7, 0xb4, 0x93, 0xec, 0xd2, 0x1d, 0x75, 0xa9, 0xb7, 0x68, 0xe3, 0xe0, 0x55,
+	0xa5, 0x02, 0xaa, 0xad, 0x4d, 0x16, 0x24, 0x10, 0x1c, 0xea, 0xe5, 0x43, 0x01, 0x01, 0xd5, 0x50,
+	0x2e, 0x7c, 0x99, 0x89, 0x3d, 0x4d, 0x87, 0xb5, 0x3d, 0xc6, 0x33, 0x29, 0xcd, 0x95, 0x5f, 0x80,
+	0x38, 0xf1, 0x13, 0xf8, 0x01, 0x48, 0x9c, 0xb9, 0xad, 0x10, 0x87, 0xbd, 0xc1, 0x29, 0x42, 0xed,
+	0x3f, 0xc8, 0x2f, 0x40, 0x9e, 0x8f, 0x7c, 0x94, 0x6c, 0x49, 0xf7, 0x36, 0x93, 0xf7, 0x7d, 0x9e,
+	0xf7, 0x99, 0xf7, 0xcb, 0x01, 0x6d, 0xc6, 0x33, 0xc6, 0x29, 0x0f, 0x62, 0x96, 0xc7, 0x24, 0x17,
+	0x25, 0x16, 0x24, 0x49, 0xe9, 0x77, 0x7d, 0x9a, 0x50, 0x31, 0x08, 0x4e, 0xef, 0x77, 0x89, 0xc0,
+	0xf7, 0x83, 0x1e, 0xc9, 0x09, 0xa7, 0xdc, 0x2f, 0x4a, 0x26, 0x18, 0xdc, 0xd5, 0x20, 0x7f, 0x2e,
+	0xc8, 0xd7, 0xa0, 0x9d, 0xad, 0x1e, 0xeb, 0x31, 0x89, 0x08, 0xaa, 0x93, 0x02, 0xef, 0xdc, 0x89,
+	0x25, 0x3a, 0x52, 0x06, 0x75, 0x31, 0xa6, 0x1e, 0x63, 0xbd, 0x94, 0x04, 0xf2, 0xd6, 0xed, 0x1f,
+	0x07, 0x38, 0x1f, 0x68, 0xd3, 0x4b, 0x46, 0x27, 0x8e, 0xe3, 0x7e, 0x36, 0xd6, 0x25, 0x6f, 0xda,
+	0xe5, 0x95, 0xab, 0x9f, 0x52, 0xe0, 0x12, 0x67, 0x26, 0xd2, 0x83, 0xc5, 0x9e, 0x5d, 0x30, 0x4e,
+	0x05, 0x65, 0xb9, 0x46, 0xbd, 0xb6, 0x18, 0x4a, 0xd0, 0xf8, 0x51, 0x44, 0xf3, 0x63, 0xf3, 0xe2,
+	0xb7, 0x16, 0x83, 0x51, 0x69, 0xa4, 0xa7, 0x24, 0x2a, 0x49, 0xcc, 0xca, 0x44, 0xa1, 0xbd, 0x3f,
+	0x2d, 0xb0, 0xfe, 0x5e, 0x3f, 0x4d, 0x8f, 0x68, 0xfc, 0x08, 0xbe, 0x0a, 0x9e, 0x2b, 0x18, 0x4b,
+	0x23, 0x9a, 0x38, 0x56, 0xd3, 0xda, 0xb3, 0x43, 0x38, 0x1a, 0xba, 0x37, 0x07, 0x38, 0x4b, 0xdf,
+	0xf4, 0xb4, 0xc1, 0x43, 0x6b, 0xd5, 0xa9, 0x93, 0xc0, 0x07, 0x00, 0x68, 0x29, 0x09, 0x39, 0x73,
+	0x96, 0x9b, 0xd6, 0xde, 0x4a, 0x78, 0x7b, 0x34, 0x74, 0x6f, 0x29, 0xff, 0x89, 0xcd, 0x43, 0x1b,
+	0xd5, 0xa5, 0x53, 0x9d, 0xe1, 0x57, 0xc0, 0xae, 0xb4, 0x3b, 0x2b, 0x4d, 0x6b, 0xaf, 0xd6, 0x0a,
+	0xfc, 0x85, 0x6a, 0xed, 0x1f, 0x49, 0xfc, 0x31, 0x0b, 0x9d, 0xc7, 0x43, 0x77, 0x69, 0x34, 0x74,
+	0x37, 0x67, 0x82, 0x1c, 0x33, 0x0f, 0x49, 0x5a, 0xef, 0x37, 0x1b, 0xac, 0x1f, 0x32, 0x96, 0xbe,
+	0x83, 0x05, 0x86, 0x6d, 0x60, 0x57, 0x5a, 0xe5, 0x5b, 0x6a, 0xad, 0x2d, 0x5f, 0xd5, 0xdf, 0x37,
+	0xf5, 0xf7, 0x0f, 0xf2, 0x41, 0xb8, 0xf1, 0xc7, 0xaf, 0xfb, 0xab, 0x15, 0xa2, 0x83, 0xa4, 0x33,
+	0xfc, 0x02, 0xac, 0x56, 0xac, 0xdc, 0x59, 0x6e, 0xae, 0x5c, 0x43, 0xa1, 0xc9, 0x61, 0xb8, 0xa5,
+	0x15, 0xd6, 0x27, 0x0a, 0xb9, 0x87, 0x14, 0x27, 0xfc, 0xd9, 0x02, 0x77, 0x78, 0x51, 0x12, 0x9c,
+	0x44, 0x25, 0xf9, 0x1e, 0x97, 0x49, 0x24, 0x5b, 0xac, 0x9f, 0x62, 0xc1, 0x4a, 0x9d, 0x93, 0xd6,
+	0x82, 0x11, 0x0f, 0x2a, 0xe4, 0x27, 0xdd, 0x6f, 0x49, 0x2c, 0xc2, 0x3d, 0x1d, 0xb4, 0xa9, 0x82,
+	0x3e, 0x35, 0x84, 0x87, 0xb6, 0x95, 0x0d, 0x49, 0xd3, 0xc1, 0xc4, 0x02, 0x7f, 0xb2, 0xc0, 0xf6,
+	0xb8, 0x47, 0xf8, 0x34, 0x88, 0x3b, 0xb6, 0x4c, 0xc5, 0xb3, 0x08, 0xdb, 0xd5, 0xc2, 0xee, 0x2a,
+	0x61, 0xf3, 0x03, 0x78, 0xe8, 0x85, 0x89, 0x61, 0x4a, 0x13, 0x87, 0x14, 0xdc, 0xba, 0xdc, 0xb7,
+	0xdc, 0x59, 0x95, 0x6a, 0x5e, 0x5f, 0x50, 0x4d, 0xc7, 0xe0, 0x91, 0x84, 0x87, 0x76, 0xa5, 0x08,
+	0x6d, 0xd2, 0xd9, 0x9f, 0xb9, 0xf7, 0xfb, 0x32, 0xa8, 0x1f, 0xea, 0x81, 0x94, 0xdd, 0xf3, 0x21,
+	0x58, 0x37, 0x03, 0xaa, 0x3b, 0x68, 0xd1, 0x5e, 0x30, 0x34, 0x68, 0x4c, 0x50, 0x4d, 0x56, 0xca,
+	0xaa, 0x5e, 0x4d, 0xe4, 0xa4, 0xcc, 0x4c, 0x96, 0x36, 0x78, 0x68, 0xad, 0x3a, 0x75, 0x12, 0xf8,
+	0x0d, 0xd8, 0x99, 0x53, 0x41, 0xfd, 0x7e, 0xdd, 0x25, 0x77, 0xc7, 0x5a, 0xd4, 0x92, 0x32, 0xb1,
+	0x67, 0x5e, 0xf9, 0xdf, 0x62, 0x2b, 0x33, 0xfc, 0x0c, 0x6c, 0xf5, 0x0b, 0x41, 0x33, 0x32, 0x43,
+	0x6d, 0x0a, 0xbd, 0x10, 0x37, 0x54, 0x04, 0x53, 0xac, 0xdc, 0xfb, 0xcb, 0x06, 0xf5, 0xf7, 0xd5,
+	0x2e, 0xff, 0x54, 0x60, 0x41, 0xe0, 0x43, 0xb0, 0xa6, 0x16, 0xa3, 0xce, 0xe0, 0xee, 0xff, 0x64,
+	0xf0, 0x50, 0x3a, 0xeb, 0x08, 0x1a, 0x0a, 0x11, 0xd8, 0x90, 0xcb, 0x27, 0xc1, 0x02, 0x5f, 0x73,
+	0x2a, 0xcd, 0x2a, 0xd0, 0x8c, 0xeb, 0x85, 0x59, 0x0d, 0x5f, 0x83, 0x1b, 0xa6, 0x36, 0x8a, 0x77,
+	0x45, 0xf2, 0xb6, 0xaf, 0x59, 0xe1, 0x29, 0xee, 0x7a, 0x31, 0xdd, 0x3c, 0xef, 0x82, 0xcd, 0x9c,
+	0x9c, 0x89, 0x68, 0x1c, 0x84, 0x26, 0x8e, 0x2d, 0x0b, 0xff, 0xe2, 0x68, 0xe8, 0x6e, 0xab, 0xc2,
+	0x5f, 0xf6, 0xf0, 0xd0, 0xcd, 0xea, 0x27, 0x43, 0xde, 0x49, 0xe0, 0x97, 0xc0, 0x91, 0x4e, 0x97,
+	0x87, 0xa0, 0xa2, 0x5b, 0x95, 0x74, 0xf7, 0x46, 0x43, 0xd7, 0x9d, 0xa2, 0x9b, 0xe3, 0xe9, 0xa1,
+	0xdb, 0x95, 0xe9, 0xd2, 0x20, 0x74, 0x12, 0xf8, 0x8b, 0x05, 0x5a, 0xf3, 0x27, 0x32, 0xd2, 0xdb,
+	0x3e, 0xca, 0x68, 0xaf, 0xc4, 0x52, 0x9e, 0x38, 0x29, 0x09, 0x3f, 0x61, 0x69, 0xe2, 0xac, 0xc9,
+	0xc0, 0x6f, 0x8f, 0x86, 0xee, 0x1b, 0x57, 0x4d, 0xf5, 0x55, 0x1c, 0x1e, 0xda, 0x9f, 0x3b, 0xf1,
+	0x72, 0x11, 0x27, 0x1f, 0x19, 0xc0, 0xd1, 0xd8, 0xff, 0x07, 0x0b, 0xd4, 0xa6, 0xf6, 0x0a, 0xbc,
+	0x07, 0xec, 0x1c, 0x67, 0x44, 0xb6, 0xd5, 0x46, 0xf8, 0xfc, 0x68, 0xe8, 0xd6, 0x74, 0x12, 0x70,
+	0x46, 0x3c, 0x24, 0x8d, 0xf0, 0x63, 0x70, 0x43, 0xb5, 0x77, 0xcc, 0x72, 0x41, 0x72, 0x21, 0x47,
+	0xaf, 0xd6, 0x7a, 0xf9, 0x29, 0xed, 0x3d, 0xa5, 0xe3, 0xa1, 0x02, 0xa0, 0xba, 0xf4, 0xd0, 0xb7,
+	0x30, 0x79, 0x7c, 0xde, 0xb0, 0x9e, 0x9c, 0x37, 0xac, 0x7f, 0xce, 0x1b, 0xd6, 0x8f, 0x17, 0x8d,
+	0xa5, 0x27, 0x17, 0x8d, 0xa5, 0xbf, 0x2f, 0x1a, 0x4b, 0x9f, 0x7f, 0xd0, 0xa3, 0xe2, 0xa4, 0xdf,
+	0xf5, 0x63, 0x96, 0x05, 0x9a, 0x7c, 0x3f, 0xc5, 0x5d, 0x6e, 0x2e, 0xc1, 0x69, 0xab, 0x1d, 0x9c,
+	0xcd, 0x7c, 0xa1, 0xf7, 0x27, 0x9f, 0x68, 0x31, 0x28, 0x08, 0x37, 0x7f, 0x82, 0xba, 0x6b, 0xf2,
+	0xfb, 0xd4, 0xfe, 0x37, 0x00, 0x00, 0xff, 0xff, 0x45, 0x2a, 0xcc, 0xb2, 0x3c, 0x09, 0x00, 0x00,
 }
 
 func (m *FullTick) Marshal() (dAtA []byte, err error) {
diff --git a/x/concentrated-liquidity/types/incentive_record.pb.go b/x/concentrated-liquidity/types/incentive_record.pb.go
index 7159de0112e..367f1821e0d 100644
--- a/x/concentrated-liquidity/types/incentive_record.pb.go
+++ b/x/concentrated-liquidity/types/incentive_record.pb.go
@@ -6,7 +6,6 @@ package types
 import (
 	cosmossdk_io_math "cosmossdk.io/math"
 	fmt "fmt"
-	_ "github.com/cosmos/cosmos-proto"
 	types "github.com/cosmos/cosmos-sdk/types"
 	_ "github.com/cosmos/gogoproto/gogoproto"
 	proto "github.com/cosmos/gogoproto/proto"
@@ -176,43 +175,42 @@ func init() {
 }
 
 var fileDescriptor_bef31b586e827443 = []byte{
-	// 566 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x53, 0xcd, 0x6e, 0xd3, 0x4c,
-	0x14, 0x8d, 0xf3, 0xf5, 0x2b, 0xea, 0xa4, 0x05, 0xe1, 0x14, 0x9a, 0x86, 0x62, 0x57, 0x16, 0x48,
-	0x15, 0x52, 0xc6, 0x6a, 0xba, 0x0b, 0xac, 0x4c, 0x36, 0x91, 0xba, 0xb2, 0x40, 0x20, 0x84, 0x64,
-	0xc6, 0x9e, 0xc1, 0x1d, 0x35, 0xf6, 0x04, 0xcf, 0x24, 0xc2, 0x6f, 0x51, 0x24, 0x16, 0x3c, 0x03,
-	0x4f, 0xd2, 0x65, 0x57, 0x08, 0xb1, 0x48, 0x51, 0x22, 0x5e, 0x20, 0x4f, 0x80, 0x66, 0x3c, 0xce,
-	0x5f, 0xbb, 0x60, 0x65, 0x9f, 0xb9, 0xf7, 0xdc, 0x73, 0xef, 0x99, 0x3b, 0xe0, 0x05, 0xe3, 0x09,
-	0xe3, 0x94, 0xbb, 0x11, 0x4b, 0x23, 0x92, 0x8a, 0x0c, 0x09, 0x82, 0xfb, 0xf4, 0xd3, 0x90, 0x62,
-	0x2a, 0x72, 0x77, 0x74, 0x1c, 0x12, 0x81, 0x8e, 0x5d, 0xaa, 0x82, 0x74, 0x44, 0x82, 0x8c, 0x44,
-	0x2c, 0xc3, 0x70, 0x90, 0x31, 0xc1, 0xcc, 0xa7, 0x9a, 0x0d, 0x6f, 0x65, 0x43, 0xcd, 0x6e, 0xee,
-	0x47, 0x2a, 0x2f, 0x50, 0x24, 0xb7, 0x00, 0x45, 0x85, 0xe6, 0x6e, 0xcc, 0x62, 0x56, 0x9c, 0xcb,
-	0x3f, 0x7d, 0x6a, 0xc7, 0x8c, 0xc5, 0x7d, 0xe2, 0x2a, 0x14, 0x0e, 0x3f, 0xba, 0x82, 0x26, 0x84,
-	0x0b, 0x94, 0x0c, 0x74, 0x82, 0xb5, 0x9e, 0x80, 0x87, 0x19, 0x12, 0x94, 0xa5, 0x65, 0xbc, 0x10,
-	0x71, 0x43, 0xc4, 0xc9, 0x7c, 0x88, 0x88, 0x51, 0x1d, 0x77, 0x7e, 0x54, 0xc1, 0xbd, 0x5e, 0x39,
-	0x93, 0xaf, 0x46, 0x32, 0x3b, 0x60, 0x7b, 0x31, 0x26, 0xc5, 0x0d, 0xe3, 0xd0, 0x38, 0xda, 0xf0,
-	0xf6, 0x66, 0x63, 0xbb, 0x9e, 0xa3, 0xa4, 0xdf, 0x71, 0x96, 0xa3, 0x8e, 0x5f, 0x9b, 0xc3, 0x1e,
-	0x36, 0xf7, 0xc0, 0x9d, 0x01, 0x63, 0x7d, 0x49, 0xab, 0x4a, 0x9a, 0xbf, 0x29, 0x61, 0x0f, 0x9b,
-	0x5f, 0x0d, 0xf0, 0x60, 0xdd, 0xbc, 0x20, 0x64, 0x38, 0x6f, 0x6c, 0x1c, 0x1a, 0x47, 0xb5, 0x76,
-	0x07, 0xfe, 0x93, 0x85, 0x70, 0xad, 0x59, 0x8f, 0xe1, 0xdc, 0x7b, 0x72, 0x39, 0xb6, 0x2b, 0xb3,
-	0xb1, 0x7d, 0xb0, 0xde, 0xde, 0x92, 0x8c, 0xe3, 0xd7, 0xe9, 0x4d, 0xaa, 0xf9, 0x06, 0x80, 0x84,
-	0xa6, 0xc1, 0x70, 0x20, 0x8d, 0x6d, 0xfc, 0xaf, 0x5a, 0xd9, 0x87, 0x85, 0xa9, 0xb0, 0x34, 0x15,
-	0x76, 0xb5, 0xa9, 0xde, 0x63, 0xad, 0x74, 0xbf, 0x50, 0x5a, 0x50, 0x9d, 0x6f, 0xd7, 0xb6, 0xe1,
-	0x6f, 0x25, 0x34, 0x7d, 0x5d, 0xe0, 0x3f, 0x55, 0x50, 0xbf, 0xa5, 0x57, 0xf3, 0x8b, 0x01, 0xee,
-	0x66, 0x24, 0x41, 0x34, 0xa5, 0x69, 0x1c, 0xc8, 0x9b, 0x50, 0xfe, 0xd6, 0xda, 0x07, 0x50, 0xef,
-	0x83, 0xbc, 0xaa, 0xf9, 0xb8, 0x5d, 0x12, 0xbd, 0x64, 0x34, 0xf5, 0x4e, 0xb5, 0xf0, 0xc3, 0x42,
-	0x78, 0xb5, 0x02, 0x77, 0xbe, 0x5f, 0xdb, 0xcf, 0x62, 0x2a, 0xce, 0x86, 0x21, 0x8c, 0x58, 0xa2,
-	0x37, 0x4b, 0x7f, 0x5a, 0x1c, 0x9f, 0xbb, 0x22, 0x1f, 0x10, 0x5e, 0x56, 0xf3, 0x77, 0xe6, 0x7c,
-	0x09, 0xcd, 0x0f, 0x60, 0x87, 0x24, 0x94, 0x73, 0xca, 0xd2, 0x40, 0xda, 0xae, 0xae, 0x6e, 0xcb,
-	0x7b, 0x2e, 0x35, 0x7f, 0x8d, 0xed, 0x47, 0x45, 0x1d, 0x8e, 0xcf, 0x21, 0x65, 0x6e, 0x82, 0xc4,
-	0x19, 0x3c, 0x25, 0x31, 0x8a, 0xf2, 0x2e, 0x89, 0x66, 0x63, 0x7b, 0xb7, 0x68, 0x69, 0xa5, 0x82,
-	0xe3, 0x6f, 0x97, 0xd8, 0x47, 0x82, 0x98, 0x6f, 0x01, 0xe0, 0x02, 0x65, 0x22, 0x50, 0x36, 0xff,
-	0xa7, 0x06, 0x6e, 0xde, 0xb0, 0xf9, 0x55, 0xb9, 0xdc, 0xeb, 0x3e, 0x2f, 0xb8, 0xce, 0x85, 0xf2,
-	0x59, 0x1d, 0xc8, 0x74, 0xef, 0xfd, 0xe5, 0xc4, 0x32, 0xae, 0x26, 0x96, 0xf1, 0x7b, 0x62, 0x19,
-	0x17, 0x53, 0xab, 0x72, 0x35, 0xb5, 0x2a, 0x3f, 0xa7, 0x56, 0xe5, 0x9d, 0xb7, 0x64, 0x88, 0xde,
-	0xad, 0x56, 0x1f, 0x85, 0xbc, 0x04, 0xee, 0xa8, 0x7d, 0xe2, 0x7e, 0x5e, 0x79, 0xef, 0xad, 0xc5,
-	0x83, 0x57, 0x86, 0x85, 0x9b, 0xaa, 0xb7, 0x93, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x2c, 0xb3,
-	0x4f, 0xf8, 0x1e, 0x04, 0x00, 0x00,
+	// 557 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x93, 0x4f, 0x6f, 0xd3, 0x30,
+	0x18, 0xc6, 0x9b, 0x32, 0x86, 0xe6, 0x6e, 0x20, 0xd2, 0xc1, 0x4a, 0x19, 0xc9, 0x14, 0x81, 0x34,
+	0x21, 0xd5, 0xd6, 0xba, 0x5b, 0xe1, 0x14, 0x7a, 0xa9, 0xb4, 0x53, 0x04, 0x02, 0x21, 0xa4, 0xe0,
+	0xc4, 0x26, 0xb3, 0xd6, 0xc4, 0x25, 0x76, 0x2b, 0xf2, 0x2d, 0x86, 0xc4, 0x81, 0xcf, 0xc0, 0x27,
+	0xd9, 0x71, 0x27, 0x84, 0x38, 0x74, 0xa8, 0x15, 0x5f, 0xa0, 0x9f, 0x00, 0xd9, 0x49, 0xfa, 0x6f,
+	0x3b, 0x70, 0x6a, 0xdf, 0xbc, 0x7e, 0xde, 0xe7, 0xf1, 0xef, 0x4d, 0xc0, 0x4b, 0x2e, 0x62, 0x2e,
+	0x98, 0x40, 0x21, 0x4f, 0x42, 0x9a, 0xc8, 0x14, 0x4b, 0x4a, 0xfa, 0xec, 0xf3, 0x90, 0x11, 0x26,
+	0x33, 0x34, 0x3a, 0x0a, 0xa8, 0xc4, 0x47, 0x88, 0xe9, 0x26, 0x1b, 0x51, 0x3f, 0xa5, 0x21, 0x4f,
+	0x09, 0x1c, 0xa4, 0x5c, 0x72, 0xf3, 0x59, 0xa1, 0x86, 0x37, 0xaa, 0x61, 0xa1, 0x6e, 0xee, 0x46,
+	0x3c, 0xe2, 0x5a, 0x81, 0xd4, 0xbf, 0x5c, 0xdc, 0xb4, 0x23, 0xce, 0xa3, 0x3e, 0x45, 0xba, 0x0a,
+	0x86, 0x9f, 0x90, 0x64, 0x31, 0x15, 0x12, 0xc7, 0x83, 0xe2, 0x80, 0xb5, 0x7e, 0x80, 0x0c, 0x53,
+	0x2c, 0x19, 0x4f, 0xca, 0x7e, 0xa8, 0xed, 0x51, 0x80, 0x05, 0x9d, 0x27, 0x0d, 0x39, 0x2b, 0xfa,
+	0xce, 0xcf, 0x2a, 0xb8, 0xd7, 0x2b, 0x83, 0x7b, 0x3a, 0xb7, 0xd9, 0x01, 0xdb, 0x8b, 0xbb, 0x30,
+	0xd2, 0x30, 0x0e, 0x8c, 0xc3, 0x0d, 0x77, 0x6f, 0x36, 0xb6, 0xeb, 0x19, 0x8e, 0xfb, 0x1d, 0x67,
+	0xb9, 0xeb, 0x78, 0xb5, 0x79, 0xd9, 0x23, 0xe6, 0x1e, 0xb8, 0x33, 0xe0, 0xbc, 0xaf, 0x64, 0x55,
+	0x25, 0xf3, 0x36, 0x55, 0xd9, 0x23, 0xe6, 0x37, 0x03, 0x3c, 0x58, 0x27, 0xe4, 0x07, 0x9c, 0x64,
+	0x8d, 0x8d, 0x03, 0xe3, 0xb0, 0xd6, 0xee, 0xc0, 0xff, 0xe2, 0x04, 0xd7, 0xc2, 0xba, 0x9c, 0x64,
+	0xee, 0xd3, 0x8b, 0xb1, 0x5d, 0x99, 0x8d, 0xed, 0xfd, 0xf5, 0x78, 0x4b, 0x36, 0x8e, 0x57, 0x67,
+	0xd7, 0xa5, 0xe6, 0x5b, 0x00, 0x62, 0x96, 0xf8, 0xc3, 0x81, 0x02, 0xdb, 0xb8, 0xad, 0xa3, 0x3c,
+	0x82, 0x39, 0x54, 0x58, 0x42, 0x85, 0xdd, 0x02, 0xaa, 0xfb, 0xa4, 0x70, 0xba, 0x9f, 0x3b, 0x2d,
+	0xa4, 0xce, 0xf7, 0x2b, 0xdb, 0xf0, 0xb6, 0x62, 0x96, 0xbc, 0xc9, 0xeb, 0xbf, 0x55, 0x50, 0xbf,
+	0x21, 0xab, 0xf9, 0xd5, 0x00, 0x77, 0x53, 0x1a, 0x63, 0x96, 0xb0, 0x24, 0xf2, 0xd5, 0x26, 0x34,
+	0xdf, 0x5a, 0x7b, 0x1f, 0xe6, 0xab, 0x82, 0x6a, 0x55, 0xf3, 0xeb, 0x76, 0x69, 0xf8, 0x8a, 0xb3,
+	0xc4, 0x3d, 0x29, 0x8c, 0x1f, 0xe6, 0xc6, 0xab, 0x13, 0x84, 0xf3, 0xe3, 0xca, 0x7e, 0x1e, 0x31,
+	0x79, 0x3a, 0x0c, 0x60, 0xc8, 0x63, 0x54, 0x2c, 0x3d, 0xff, 0x69, 0x09, 0x72, 0x86, 0x64, 0x36,
+	0xa0, 0xa2, 0x9c, 0xe6, 0xed, 0xcc, 0xf5, 0xaa, 0x34, 0x3f, 0x82, 0x1d, 0x1a, 0x33, 0x21, 0x18,
+	0x4f, 0x7c, 0x85, 0x5d, 0xaf, 0x6e, 0xcb, 0x7d, 0xa1, 0x3c, 0x7f, 0x8f, 0xed, 0xc7, 0xf9, 0x1c,
+	0x41, 0xce, 0x20, 0xe3, 0x28, 0xc6, 0xf2, 0x14, 0x9e, 0xd0, 0x08, 0x87, 0x59, 0x97, 0x86, 0xb3,
+	0xb1, 0xbd, 0x9b, 0x47, 0x5a, 0x99, 0xe0, 0x78, 0xdb, 0x65, 0xed, 0x61, 0x49, 0xcd, 0x77, 0x00,
+	0x08, 0x89, 0x53, 0xe9, 0x6b, 0xcc, 0xb7, 0xf4, 0x85, 0x9b, 0xd7, 0x30, 0xbf, 0x2e, 0x5f, 0xee,
+	0x75, 0xce, 0x0b, 0xad, 0x73, 0xae, 0x39, 0xeb, 0x07, 0xea, 0xb8, 0xfb, 0xe1, 0x62, 0x62, 0x19,
+	0x97, 0x13, 0xcb, 0xf8, 0x33, 0xb1, 0x8c, 0xf3, 0xa9, 0x55, 0xb9, 0x9c, 0x5a, 0x95, 0x5f, 0x53,
+	0xab, 0xf2, 0xde, 0x5d, 0x02, 0x52, 0xbc, 0x5b, 0xad, 0x3e, 0x0e, 0x44, 0x59, 0xa0, 0x51, 0xfb,
+	0x18, 0x7d, 0x59, 0xf9, 0xa8, 0x5b, 0x8b, 0xaf, 0x5a, 0x03, 0x0b, 0x36, 0x75, 0xb6, 0xe3, 0x7f,
+	0x01, 0x00, 0x00, 0xff, 0xff, 0x26, 0xd5, 0x0f, 0x88, 0x03, 0x04, 0x00, 0x00,
 }
 
 func (m *IncentiveRecord) Marshal() (dAtA []byte, err error) {
diff --git a/x/concentrated-liquidity/types/params.pb.go b/x/concentrated-liquidity/types/params.pb.go
index e7ff94dc82e..054d8efebf9 100644
--- a/x/concentrated-liquidity/types/params.pb.go
+++ b/x/concentrated-liquidity/types/params.pb.go
@@ -6,7 +6,6 @@ package types
 import (
 	cosmossdk_io_math "cosmossdk.io/math"
 	fmt "fmt"
-	_ "github.com/cosmos/cosmos-proto"
 	_ "github.com/cosmos/gogoproto/gogoproto"
 	proto "github.com/cosmos/gogoproto/proto"
 	github_com_cosmos_gogoproto_types "github.com/cosmos/gogoproto/types"
@@ -150,47 +149,47 @@ func init() {
 }
 
 var fileDescriptor_42a3f6981164624c = []byte{
-	// 639 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x94, 0x4f, 0x6b, 0xd4, 0x4e,
-	0x18, 0xc7, 0x37, 0xbf, 0xed, 0xaf, 0x7f, 0xa2, 0x08, 0x06, 0x8b, 0xd9, 0xaa, 0x49, 0x48, 0x41,
-	0x97, 0x62, 0x13, 0x68, 0x6f, 0x7a, 0x10, 0xe2, 0x6a, 0x2f, 0x15, 0x6a, 0xaa, 0x08, 0x45, 0x18,
-	0x66, 0x27, 0xd3, 0xec, 0xb0, 0x49, 0x9e, 0x74, 0x66, 0x62, 0x5d, 0xc1, 0x93, 0x08, 0x1e, 0x3d,
-	0x78, 0xf0, 0x65, 0xf8, 0x32, 0x7a, 0xec, 0x51, 0x3c, 0x44, 0x69, 0x6f, 0x1e, 0xf7, 0x15, 0xc8,
-	0x66, 0xb2, 0x76, 0xd7, 0x56, 0xdc, 0x5b, 0x9e, 0xe7, 0xfb, 0x79, 0xfe, 0xe4, 0xcb, 0xc3, 0xe8,
-	0x6b, 0x20, 0x52, 0x10, 0x4c, 0xf8, 0x04, 0x32, 0x42, 0x33, 0xc9, 0xb1, 0xa4, 0x51, 0xc2, 0x0e,
-	0x0a, 0x16, 0x31, 0x39, 0xf0, 0x73, 0xcc, 0x71, 0x2a, 0xbc, 0x9c, 0x83, 0x04, 0xe3, 0x56, 0xcd,
-	0x7a, 0x17, 0xb2, 0x2b, 0xd7, 0x62, 0x88, 0xa1, 0x22, 0xfd, 0xd1, 0x97, 0x2a, 0x5a, 0x69, 0x91,
-	0xaa, 0x0a, 0x29, 0x41, 0x05, 0xb5, 0x64, 0xc5, 0x00, 0x71, 0x42, 0xfd, 0x2a, 0xea, 0x16, 0xfb,
-	0x7e, 0x54, 0x70, 0x2c, 0x19, 0x64, 0x4a, 0x77, 0xbf, 0x2c, 0xe8, 0xf3, 0x3b, 0xd5, 0x02, 0xc6,
-	0x9e, 0x7e, 0x1d, 0x17, 0xb2, 0x07, 0x9c, 0xbd, 0xa1, 0x11, 0x92, 0x8c, 0xf4, 0x91, 0xc8, 0x31,
-	0x61, 0x59, 0x6c, 0x6a, 0x4e, 0xb3, 0x3d, 0x17, 0xb8, 0xc3, 0xd2, 0xb6, 0x06, 0x38, 0x4d, 0xee,
-	0xb9, 0x7f, 0x01, 0xdd, 0x70, 0xf9, 0x4c, 0x79, 0xc6, 0x48, 0x7f, 0x57, 0xe5, 0x8d, 0x77, 0x9a,
-	0xde, 0x9a, 0xa8, 0x11, 0x39, 0xa7, 0x38, 0x42, 0xfb, 0x98, 0x48, 0xe0, 0xc2, 0xfc, 0xcf, 0x69,
-	0xb6, 0x97, 0x82, 0xad, 0xa3, 0xd2, 0x6e, 0x7c, 0x2b, 0xed, 0x1b, 0xea, 0x07, 0x44, 0xd4, 0xf7,
-	0x18, 0xf8, 0x29, 0x96, 0x3d, 0x6f, 0x9b, 0xc6, 0x98, 0x0c, 0x3a, 0x94, 0x0c, 0x4b, 0xdb, 0x39,
-	0xb7, 0xc1, 0x74, 0x37, 0x37, 0x9c, 0xf8, 0x8d, 0xdd, 0x4a, 0x7a, 0xac, 0x14, 0xe3, 0x93, 0xa6,
-	0xdb, 0x5d, 0x9c, 0xe0, 0x8c, 0x50, 0x8e, 0x44, 0x0f, 0x73, 0x2a, 0x10, 0xa7, 0x87, 0x98, 0x47,
-	0x28, 0x62, 0x82, 0x40, 0x91, 0x49, 0xb3, 0xe9, 0x68, 0xed, 0xa5, 0xe0, 0xc9, 0x6c, 0xbb, 0xdc,
-	0x56, 0xbb, 0xfc, 0xa3, 0xa7, 0x1b, 0xde, 0x1c, 0x13, 0xbb, 0x15, 0x10, 0x56, 0x7a, 0xa7, 0x96,
-	0xff, 0x30, 0xfe, 0xa0, 0x00, 0x49, 0x51, 0x44, 0x33, 0x48, 0x85, 0x39, 0x57, 0x39, 0x73, 0xb1,
-	0xf1, 0x93, 0xe0, 0x94, 0xf1, 0x4f, 0x47, 0x42, 0xa7, 0xca, 0x1b, 0xef, 0x35, 0xdd, 0x98, 0xa8,
-	0x29, 0x72, 0xc9, 0x52, 0x2a, 0xcc, 0xff, 0x9d, 0x66, 0xfb, 0xd2, 0x46, 0xcb, 0x53, 0xd7, 0xe1,
-	0x8d, 0xaf, 0xc3, 0xeb, 0xd4, 0xd7, 0x11, 0xdc, 0x1f, 0x19, 0xf0, 0xb3, 0xb4, 0x8d, 0xf1, 0xbd,
-	0xdc, 0x85, 0x94, 0x49, 0x9a, 0xe6, 0x72, 0x30, 0x2c, 0xed, 0xd6, 0xb9, 0x65, 0xea, 0xc6, 0xee,
-	0xe7, 0xef, 0xb6, 0x16, 0x5e, 0x3d, 0x13, 0x9e, 0xab, 0xbc, 0xf1, 0x41, 0xd3, 0xef, 0x30, 0x81,
-	0x72, 0xca, 0x53, 0x26, 0x04, 0x83, 0x2c, 0xa1, 0x42, 0xa0, 0x1c, 0x20, 0x41, 0x84, 0xd3, 0x6a,
-	0x02, 0xa2, 0x19, 0xee, 0x26, 0x34, 0x32, 0xe7, 0x1d, 0xad, 0xbd, 0x18, 0x6c, 0x0c, 0x4b, 0xdb,
-	0x53, 0x73, 0x66, 0x2c, 0x74, 0xc3, 0x55, 0x26, 0x76, 0xa6, 0xc0, 0x1d, 0x80, 0xe4, 0x61, 0x8d,
-	0x3d, 0x52, 0x94, 0xf1, 0x56, 0x5f, 0x2d, 0x32, 0x4e, 0x85, 0xe4, 0x8c, 0x48, 0x1a, 0x4d, 0xf4,
-	0x02, 0x8e, 0x0e, 0x7b, 0x4c, 0xd2, 0x84, 0x09, 0x69, 0x2e, 0x54, 0xd6, 0x7b, 0xc3, 0xd2, 0x5e,
-	0x53, 0x5b, 0xcc, 0x50, 0xe4, 0x86, 0xce, 0x24, 0xf5, 0x7b, 0x3a, 0xf0, 0x17, 0x63, 0xc4, 0x78,
-	0xa0, 0x5f, 0xe9, 0x01, 0xf4, 0x51, 0x8c, 0x05, 0x4a, 0x58, 0xca, 0xa4, 0xb9, 0xe8, 0x68, 0xed,
-	0xb9, 0xa0, 0x35, 0x2c, 0xed, 0x65, 0x35, 0x69, 0x5a, 0x77, 0xc3, 0xcb, 0xa3, 0xc4, 0x16, 0x16,
-	0xdb, 0xa3, 0x30, 0x78, 0x79, 0x74, 0x62, 0x69, 0xc7, 0x27, 0x96, 0xf6, 0xe3, 0xc4, 0xd2, 0x3e,
-	0x9e, 0x5a, 0x8d, 0xe3, 0x53, 0xab, 0xf1, 0xf5, 0xd4, 0x6a, 0xec, 0x05, 0x31, 0x93, 0xbd, 0xa2,
-	0xeb, 0x11, 0x48, 0xfd, 0xfa, 0x1d, 0x59, 0x4f, 0x70, 0x57, 0x8c, 0x03, 0xff, 0xd5, 0xc6, 0xa6,
-	0xff, 0x7a, 0xea, 0x19, 0x5a, 0x3f, 0x7b, 0x87, 0xe4, 0x20, 0xa7, 0xa2, 0x3b, 0x5f, 0xdd, 0xc2,
-	0xe6, 0xaf, 0x00, 0x00, 0x00, 0xff, 0xff, 0xb3, 0x74, 0x4d, 0x02, 0xb5, 0x04, 0x00, 0x00,
+	// 633 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x94, 0xcf, 0x6b, 0xd4, 0x5a,
+	0x14, 0xc7, 0x27, 0x6f, 0xfa, 0xfa, 0x23, 0xef, 0xf1, 0xe0, 0x05, 0x8b, 0x99, 0xaa, 0x49, 0x48,
+	0x41, 0x87, 0x62, 0x13, 0x68, 0x77, 0xba, 0x10, 0xe2, 0x68, 0x37, 0x15, 0x6a, 0xaa, 0x08, 0x45,
+	0xb8, 0xdc, 0xb9, 0xb9, 0xcd, 0x5c, 0x26, 0xc9, 0x49, 0xef, 0xb9, 0xb1, 0x8e, 0xe0, 0x4a, 0x04,
+	0x97, 0x2e, 0x5c, 0xf8, 0x67, 0xf8, 0x67, 0x74, 0xd9, 0xa5, 0xb8, 0x88, 0xd2, 0xee, 0x5c, 0xce,
+	0x5f, 0x20, 0x93, 0xcc, 0xd8, 0x19, 0x5b, 0xb1, 0xbb, 0xdc, 0xf3, 0xfd, 0x9c, 0x1f, 0xf9, 0x72,
+	0x38, 0xfa, 0x1a, 0x60, 0x0a, 0x28, 0xd0, 0x67, 0x90, 0x31, 0x9e, 0x29, 0x49, 0x15, 0x8f, 0x12,
+	0x71, 0x50, 0x88, 0x48, 0xa8, 0x81, 0x9f, 0x53, 0x49, 0x53, 0xf4, 0x72, 0x09, 0x0a, 0x8c, 0x1b,
+	0x63, 0xd6, 0xbb, 0x90, 0x5d, 0xb9, 0x12, 0x43, 0x0c, 0x15, 0xe9, 0x8f, 0xbe, 0xea, 0xa4, 0x15,
+	0x2b, 0x06, 0x88, 0x13, 0xee, 0x57, 0xaf, 0x6e, 0xb1, 0xef, 0x47, 0x85, 0xa4, 0x4a, 0x40, 0x56,
+	0xeb, 0xee, 0xa7, 0x05, 0x7d, 0x7e, 0xa7, 0xea, 0x62, 0xec, 0xe9, 0x57, 0x69, 0xa1, 0x7a, 0x20,
+	0xc5, 0x2b, 0x1e, 0x11, 0x25, 0x58, 0x9f, 0x60, 0x4e, 0x99, 0xc8, 0x62, 0x53, 0x73, 0x9a, 0xed,
+	0xb9, 0xc0, 0x1d, 0x96, 0xb6, 0x35, 0xa0, 0x69, 0x72, 0xc7, 0xfd, 0x0d, 0xe8, 0x86, 0xcb, 0x67,
+	0xca, 0x13, 0xc1, 0xfa, 0xbb, 0x75, 0xdc, 0x78, 0xa3, 0xe9, 0xad, 0xa9, 0x1c, 0xcc, 0x25, 0xa7,
+	0x11, 0xd9, 0xa7, 0x4c, 0x81, 0x44, 0xf3, 0x2f, 0xa7, 0xd9, 0x5e, 0x0a, 0xb6, 0x8e, 0x4a, 0xbb,
+	0xf1, 0xa5, 0xb4, 0xaf, 0xb1, 0xea, 0x47, 0x31, 0xea, 0x7b, 0x02, 0xfc, 0x94, 0xaa, 0x9e, 0xb7,
+	0xcd, 0x63, 0xca, 0x06, 0x1d, 0xce, 0x86, 0xa5, 0xed, 0x9c, 0x9b, 0x60, 0xb6, 0x9a, 0x1b, 0x4e,
+	0xfd, 0xc6, 0x6e, 0x25, 0x3d, 0xac, 0x15, 0xe3, 0x83, 0xa6, 0xdb, 0x5d, 0x9a, 0xd0, 0x8c, 0x71,
+	0x49, 0xb0, 0x47, 0x25, 0x47, 0x22, 0xf9, 0x21, 0x95, 0x11, 0x89, 0x04, 0x32, 0x28, 0x32, 0x65,
+	0x36, 0x1d, 0xad, 0xbd, 0x14, 0x3c, 0xba, 0xdc, 0x2c, 0x37, 0xeb, 0x59, 0xfe, 0x50, 0xd3, 0x0d,
+	0xaf, 0x4f, 0x88, 0xdd, 0x0a, 0x08, 0x2b, 0xbd, 0x33, 0x96, 0x7f, 0x31, 0xfe, 0xa0, 0x00, 0xc5,
+	0x49, 0xc4, 0x33, 0x48, 0xd1, 0x9c, 0xab, 0x9c, 0xb9, 0xd8, 0xf8, 0x69, 0x70, 0xc6, 0xf8, 0xc7,
+	0x23, 0xa1, 0x53, 0xc5, 0x8d, 0xb7, 0x9a, 0x6e, 0x4c, 0xe5, 0x14, 0xb9, 0x12, 0x29, 0x47, 0xf3,
+	0x6f, 0xa7, 0xd9, 0xfe, 0x67, 0xa3, 0xe5, 0xd5, 0xdb, 0xe1, 0x4d, 0xb6, 0xc3, 0xeb, 0x8c, 0xb7,
+	0x23, 0xb8, 0x3b, 0x32, 0xe0, 0x7b, 0x69, 0x1b, 0x93, 0x7d, 0xb9, 0x0d, 0xa9, 0x50, 0x3c, 0xcd,
+	0xd5, 0x60, 0x58, 0xda, 0xad, 0x73, 0xc3, 0x8c, 0x0b, 0xbb, 0x1f, 0xbf, 0xda, 0x5a, 0xf8, 0xff,
+	0x99, 0xf0, 0xb4, 0x8e, 0x1b, 0xef, 0x34, 0xfd, 0x96, 0x40, 0x92, 0x73, 0x99, 0x0a, 0x44, 0x01,
+	0x59, 0xc2, 0x11, 0x49, 0x0e, 0x90, 0x10, 0x26, 0x79, 0xd5, 0x81, 0xf0, 0x8c, 0x76, 0x13, 0x1e,
+	0x99, 0xf3, 0x8e, 0xd6, 0x5e, 0x0c, 0x36, 0x86, 0xa5, 0xed, 0xd5, 0x7d, 0x2e, 0x99, 0xe8, 0x86,
+	0xab, 0x02, 0x77, 0x66, 0xc0, 0x1d, 0x80, 0xe4, 0xfe, 0x18, 0x7b, 0x50, 0x53, 0xc6, 0x6b, 0x7d,
+	0xb5, 0xc8, 0x24, 0x47, 0x25, 0x05, 0x53, 0x3c, 0x9a, 0xaa, 0x05, 0x92, 0x1c, 0xf6, 0x84, 0xe2,
+	0x89, 0x40, 0x65, 0x2e, 0x54, 0xd6, 0x7b, 0xc3, 0xd2, 0x5e, 0xab, 0xa7, 0xb8, 0x44, 0x92, 0x1b,
+	0x3a, 0xd3, 0xd4, 0xcf, 0xee, 0x20, 0x9f, 0x4d, 0x10, 0xe3, 0x9e, 0xfe, 0x5f, 0x0f, 0xa0, 0x4f,
+	0x62, 0x8a, 0x24, 0x11, 0xa9, 0x50, 0xe6, 0xa2, 0xa3, 0xb5, 0xe7, 0x82, 0xd6, 0xb0, 0xb4, 0x97,
+	0xeb, 0x4e, 0xb3, 0xba, 0x1b, 0xfe, 0x3b, 0x0a, 0x6c, 0x51, 0xdc, 0x1e, 0x3d, 0x83, 0xe7, 0x47,
+	0x27, 0x96, 0x76, 0x7c, 0x62, 0x69, 0xdf, 0x4e, 0x2c, 0xed, 0xfd, 0xa9, 0xd5, 0x38, 0x3e, 0xb5,
+	0x1a, 0x9f, 0x4f, 0xad, 0xc6, 0x5e, 0x10, 0x0b, 0xd5, 0x2b, 0xba, 0x1e, 0x83, 0xd4, 0x1f, 0x1f,
+	0x8b, 0xf5, 0x84, 0x76, 0x71, 0xf2, 0xf0, 0x5f, 0x6c, 0x6c, 0xfa, 0x2f, 0x67, 0x6e, 0xcd, 0xfa,
+	0xd9, 0xb1, 0x51, 0x83, 0x9c, 0x63, 0x77, 0xbe, 0xda, 0x85, 0xcd, 0x1f, 0x01, 0x00, 0x00, 0xff,
+	0xff, 0x22, 0x60, 0x4b, 0x0d, 0x9a, 0x04, 0x00, 0x00,
 }
 
 func (m *Params) Marshal() (dAtA []byte, err error) {
diff --git a/x/concentrated-liquidity/types/tx.pb.go b/x/concentrated-liquidity/types/tx.pb.go
index 6d43ab6fb18..5530bab7e6b 100644
--- a/x/concentrated-liquidity/types/tx.pb.go
+++ b/x/concentrated-liquidity/types/tx.pb.go
@@ -16,8 +16,6 @@ import (
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
-	_ "google.golang.org/protobuf/types/known/durationpb"
-	_ "google.golang.org/protobuf/types/known/timestamppb"
 	io "io"
 	math "math"
 	math_bits "math/bits"
@@ -807,85 +805,83 @@ func init() {
 }
 
 var fileDescriptor_b181243e31403684 = []byte{
-	// 1243 bytes of a gzipped FileDescriptorProto
+	// 1215 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x58, 0xcf, 0x6f, 0xe3, 0x44,
-	0x1b, 0xae, 0x9b, 0x6e, 0xfa, 0x75, 0xfa, 0xf5, 0x47, 0xdc, 0x6e, 0x9b, 0xa6, 0x4b, 0x5c, 0x46,
-	0x20, 0x65, 0x41, 0xb1, 0x9b, 0x2e, 0x12, 0x10, 0xa4, 0x5d, 0x36, 0x45, 0x2b, 0x65, 0x45, 0xb4,
-	0x2b, 0x6f, 0x25, 0x24, 0x84, 0x14, 0x39, 0xf6, 0xc4, 0x1d, 0x35, 0xf1, 0x04, 0xcf, 0xa4, 0xd9,
+	0x1b, 0xee, 0x34, 0xdd, 0xf4, 0xeb, 0xf4, 0xeb, 0x8f, 0xb8, 0xdd, 0x36, 0x4d, 0x97, 0xb8, 0x8c,
+	0x40, 0xca, 0x82, 0x62, 0x37, 0x5d, 0x24, 0x20, 0x48, 0xbb, 0x6c, 0x8a, 0x56, 0xca, 0x8a, 0x68,
+	0x57, 0xde, 0x4a, 0x48, 0x08, 0x29, 0x72, 0xed, 0xa9, 0x3b, 0x6a, 0xe2, 0x09, 0x1e, 0xb7, 0xd9,
 	0xfe, 0x03, 0x20, 0x10, 0x07, 0x84, 0xc4, 0x11, 0x04, 0x37, 0xc4, 0x01, 0x21, 0x71, 0xe5, 0xc8,
 	0x61, 0x0f, 0x1c, 0xf6, 0xc0, 0x01, 0x71, 0x30, 0xa8, 0x3d, 0x20, 0xae, 0xb9, 0x23, 0x21, 0x7b,
-	0x9c, 0xb1, 0x1b, 0xa7, 0xb4, 0x49, 0xa1, 0x07, 0x2e, 0x6d, 0x3c, 0xf3, 0x3e, 0xef, 0x3c, 0xf3,
-	0x3c, 0xef, 0x3b, 0xe3, 0x04, 0xa8, 0x84, 0xb6, 0x09, 0xc5, 0x54, 0x33, 0x89, 0x63, 0x22, 0x87,
-	0xb9, 0x06, 0x43, 0x56, 0x0b, 0xbf, 0xdb, 0xc5, 0x16, 0x66, 0x47, 0xda, 0x61, 0xa9, 0x81, 0x98,
-	0x51, 0xd2, 0xd8, 0x63, 0xb5, 0xe3, 0x12, 0x46, 0xe4, 0xe7, 0xc3, 0x78, 0x75, 0x64, 0xbc, 0x1a,
-	0xc6, 0xe7, 0x56, 0x6d, 0x62, 0x93, 0x00, 0xa1, 0xf9, 0x9f, 0x38, 0x38, 0x97, 0x31, 0xda, 0xd8,
-	0x21, 0x5a, 0xf0, 0x37, 0x1c, 0x52, 0x6c, 0x42, 0xec, 0x16, 0xd2, 0x82, 0xa7, 0x46, 0xb7, 0xa9,
-	0x31, 0xdc, 0x46, 0x94, 0x19, 0xed, 0x4e, 0x18, 0x90, 0x1f, 0x0e, 0xb0, 0xba, 0xae, 0xc1, 0x30,
-	0x71, 0x06, 0xf3, 0x66, 0xc0, 0x48, 0x6b, 0x18, 0x14, 0x09, 0xba, 0x26, 0xc1, 0xe1, 0x3c, 0xfc,
-	0x7e, 0x06, 0x64, 0x6a, 0xd4, 0xde, 0x75, 0x91, 0xc1, 0xd0, 0x43, 0x42, 0xb1, 0x8f, 0x95, 0x5f,
-	0x04, 0xb3, 0x1d, 0x42, 0x5a, 0x75, 0x6c, 0x65, 0xa5, 0x2d, 0xa9, 0x30, 0x53, 0x91, 0xfb, 0x9e,
-	0xb2, 0x78, 0x64, 0xb4, 0x5b, 0x65, 0x18, 0x4e, 0x40, 0x3d, 0xed, 0x7f, 0xaa, 0x5a, 0xf2, 0x4d,
-	0x90, 0xa6, 0xc8, 0xb1, 0x90, 0x9b, 0x9d, 0xde, 0x92, 0x0a, 0x73, 0x95, 0x4c, 0xdf, 0x53, 0x16,
-	0x78, 0x2c, 0x1f, 0x87, 0x7a, 0x18, 0x20, 0xbf, 0x04, 0x40, 0x8b, 0xf4, 0x90, 0x5b, 0x67, 0xd8,
-	0x3c, 0xc8, 0xa6, 0xb6, 0xa4, 0x42, 0xaa, 0x72, 0xbd, 0xef, 0x29, 0x19, 0x1e, 0x1e, 0xcd, 0x41,
-	0x7d, 0x2e, 0x78, 0xd8, 0xc3, 0xe6, 0x81, 0x8f, 0xea, 0x76, 0x3a, 0x03, 0xd4, 0xcc, 0x30, 0x2a,
-	0x9a, 0x83, 0xfa, 0x5c, 0xf0, 0x10, 0xa0, 0x18, 0x58, 0x62, 0xe4, 0x00, 0x39, 0xb4, 0xde, 0x71,
-	0xc9, 0x21, 0xb6, 0x90, 0x95, 0xbd, 0xb6, 0x95, 0x2a, 0xcc, 0xef, 0x6c, 0xa8, 0x5c, 0x13, 0xd5,
-	0xd7, 0x64, 0x60, 0x89, 0xba, 0x4b, 0xb0, 0x53, 0xd9, 0x7e, 0xe2, 0x29, 0x53, 0x5f, 0xff, 0xaa,
-	0x14, 0x6c, 0xcc, 0xf6, 0xbb, 0x0d, 0xd5, 0x24, 0x6d, 0x2d, 0x14, 0x90, 0xff, 0x2b, 0x52, 0xeb,
-	0x40, 0x63, 0x47, 0x1d, 0x44, 0x03, 0x00, 0xd5, 0x17, 0xf9, 0x1a, 0x0f, 0xc3, 0x25, 0x64, 0x04,
-	0x32, 0xc1, 0x48, 0xbd, 0x8d, 0x9d, 0xba, 0xd1, 0x26, 0x5d, 0x87, 0x6d, 0x67, 0xd3, 0x81, 0x2e,
-	0xaf, 0xfa, 0xc9, 0x7f, 0xf1, 0x94, 0xeb, 0x3c, 0x15, 0xb5, 0x0e, 0x54, 0x4c, 0xb4, 0xb6, 0xc1,
-	0xf6, 0xd5, 0xaa, 0xc3, 0xfa, 0x9e, 0x92, 0xe5, 0xfb, 0x49, 0xe0, 0xa1, 0xce, 0x77, 0x52, 0xc3,
-	0xce, 0x5d, 0x3e, 0x32, 0x6a, 0x99, 0x52, 0x76, 0xf6, 0x52, 0xcb, 0x94, 0x12, 0xcb, 0x94, 0xca,
-	0xca, 0x87, 0xbf, 0x7f, 0xfb, 0x42, 0x4e, 0xf4, 0x40, 0xab, 0x68, 0x06, 0x75, 0x52, 0xec, 0x84,
-	0x85, 0x02, 0x7f, 0x48, 0x81, 0x8d, 0x44, 0xf9, 0xe8, 0x88, 0x76, 0x88, 0x43, 0x91, 0xfc, 0x32,
-	0x98, 0x1f, 0x44, 0x46, 0xa5, 0xb4, 0xd6, 0xf7, 0x14, 0x79, 0x50, 0x4a, 0x62, 0x12, 0xea, 0x60,
-	0xf0, 0x54, 0xb5, 0xe4, 0x2a, 0x98, 0x1d, 0x68, 0xc7, 0x6b, 0x4a, 0x3b, 0x6f, 0x53, 0x61, 0x71,
-	0x0a, 0xc5, 0x06, 0xf8, 0x28, 0x55, 0x29, 0xa8, 0xb7, 0x71, 0x53, 0x95, 0x44, 0xaa, 0x92, 0xdc,
-	0x02, 0x19, 0xd1, 0xca, 0x75, 0xae, 0x84, 0x5f, 0x53, 0x7e, 0xd2, 0x3b, 0x61, 0xd2, 0xcd, 0x64,
-	0xd2, 0x37, 0x91, 0x6d, 0x98, 0x47, 0x6f, 0x20, 0x33, 0x92, 0x3e, 0x91, 0x05, 0xea, 0xcb, 0x62,
-	0x8c, 0x6b, 0x69, 0x0d, 0xf5, 0x4a, 0x7a, 0xa2, 0x5e, 0x99, 0xbd, 0x58, 0xaf, 0xc0, 0x3f, 0x53,
-	0x60, 0xb9, 0x46, 0xed, 0xbb, 0x96, 0xb5, 0x47, 0xc4, 0x21, 0x30, 0xb1, 0x7b, 0x63, 0x1c, 0x08,
-	0xf7, 0x23, 0xa3, 0xb9, 0x3b, 0xdb, 0xe7, 0xb9, 0xb3, 0x14, 0x77, 0xa7, 0x1e, 0x77, 0xfa, 0x7e,
-	0xe4, 0xf4, 0xcc, 0x24, 0xb9, 0xe2, 0x56, 0x8f, 0x6c, 0xe3, 0x6b, 0x57, 0xd3, 0xc6, 0xe9, 0x7f,
-	0xbf, 0x8d, 0x0d, 0xcb, 0x2a, 0x32, 0x12, 0xb5, 0xf1, 0x1f, 0x12, 0xc8, 0x0e, 0xfb, 0xff, 0x1f,
-	0xed, 0x62, 0xf8, 0xfe, 0x34, 0x58, 0xa9, 0x51, 0xfb, 0x2d, 0xcc, 0xf6, 0x2d, 0xd7, 0xe8, 0x5d,
-	0x69, 0xb9, 0x63, 0x10, 0xf5, 0x79, 0xe8, 0x57, 0xb8, 0x9f, 0xdb, 0x17, 0x3b, 0x40, 0xd6, 0x87,
-	0x0f, 0x10, 0x9e, 0x04, 0xea, 0x4b, 0x62, 0x88, 0x9b, 0x5e, 0x7e, 0xd6, 0xf7, 0xfc, 0x46, 0xcc,
-	0xf3, 0x5e, 0xb8, 0xe1, 0xc8, 0xf5, 0xef, 0x24, 0xb0, 0x39, 0x42, 0x09, 0x61, 0x7c, 0xcc, 0x3f,
-	0xe9, 0x9f, 0xf3, 0x6f, 0xfa, 0x92, 0xfe, 0x7d, 0x21, 0x81, 0x75, 0xff, 0xca, 0x21, 0xad, 0x16,
-	0x32, 0xd9, 0xa3, 0x8e, 0x8b, 0x0c, 0x4b, 0x47, 0x3d, 0xc3, 0xb5, 0xa8, 0x5c, 0x06, 0xff, 0x8f,
-	0xd9, 0x44, 0xb3, 0xd2, 0x56, 0xaa, 0x30, 0x53, 0x59, 0xef, 0x7b, 0xca, 0x4a, 0xc2, 0x44, 0x0a,
-	0xf5, 0xf9, 0xc8, 0x45, 0x3a, 0x86, 0x8d, 0xe5, 0xbc, 0xaf, 0xed, 0x46, 0xfc, 0x5a, 0x24, 0xad,
-	0x22, 0xed, 0x14, 0x5d, 0x4e, 0x03, 0xfe, 0x28, 0x01, 0xe5, 0x0c, 0x8a, 0x42, 0xdc, 0xaf, 0x24,
-	0x90, 0x35, 0x79, 0x00, 0xb2, 0xea, 0x34, 0x88, 0xa9, 0x87, 0x09, 0x02, 0xde, 0x7f, 0xfb, 0xa2,
-	0xf2, 0xc8, 0x97, 0xaf, 0xef, 0x29, 0x0a, 0x27, 0x78, 0x56, 0x22, 0x38, 0xd6, 0xbb, 0xcc, 0x9a,
-	0x48, 0x73, 0x8a, 0x32, 0xfc, 0x52, 0x02, 0xab, 0xd1, 0x76, 0xaa, 0xc1, 0x8b, 0x2d, 0x3e, 0x44,
-	0x57, 0x26, 0x37, 0xf4, 0xe5, 0x7e, 0xe6, 0xb4, 0xdc, 0x3e, 0x93, 0x22, 0x16, 0x54, 0xa0, 0x37,
-	0x0d, 0x6e, 0x8c, 0xe2, 0x28, 0xf4, 0xfe, 0x4c, 0x02, 0xab, 0x91, 0x4c, 0x11, 0xf2, 0x7c, 0xad,
-	0x1f, 0x84, 0x5a, 0x6f, 0x0e, 0x6b, 0x1d, 0x5b, 0x7e, 0x2c, 0x9d, 0x57, 0x44, 0x8a, 0x98, 0x96,
-	0x3e, 0xbf, 0x26, 0x71, 0x9b, 0x08, 0x0f, 0xf1, 0x9b, 0x1e, 0x93, 0xdf, 0xa8, 0x24, 0x63, 0xf2,
-	0x13, 0x29, 0x22, 0x7e, 0xf0, 0x1b, 0x09, 0xe4, 0x6a, 0xd4, 0xbe, 0xd7, 0x75, 0x6c, 0xdc, 0x3c,
-	0xda, 0xdd, 0x37, 0x5c, 0x1b, 0x59, 0x83, 0x23, 0xe3, 0xca, 0x4a, 0xe1, 0xa6, 0x5f, 0x0a, 0xcf,
-	0xc5, 0x4a, 0xa1, 0xc9, 0xf9, 0x14, 0x4d, 0x4e, 0x48, 0x1c, 0x6e, 0x14, 0xee, 0x03, 0x78, 0x36,
-	0x5f, 0x51, 0x16, 0x15, 0xb0, 0xe4, 0xa0, 0x5e, 0x3d, 0x79, 0xf2, 0xe7, 0xfa, 0x9e, 0xb2, 0xc6,
-	0x49, 0x0c, 0x05, 0x40, 0x7d, 0xc1, 0x41, 0xe2, 0xb4, 0xac, 0x5a, 0xf0, 0x27, 0xde, 0x1f, 0x7b,
-	0xae, 0xe1, 0xd0, 0x26, 0x72, 0xaf, 0x5a, 0x14, 0xb9, 0x04, 0xe6, 0x7c, 0x8a, 0xa4, 0xe7, 0x20,
-	0x37, 0xbc, 0x4e, 0x56, 0xfb, 0x9e, 0xb2, 0x1c, 0xb1, 0x0f, 0xa6, 0xa0, 0xfe, 0x3f, 0x07, 0xf5,
-	0x1e, 0xf8, 0x1f, 0x93, 0x2d, 0xc5, 0x42, 0xf2, 0x31, 0x01, 0xf3, 0x41, 0x47, 0x25, 0x76, 0x35,
-	0x90, 0x6e, 0xe7, 0xbd, 0x59, 0x90, 0xaa, 0x51, 0x5b, 0xfe, 0x48, 0x02, 0x8b, 0x43, 0xdf, 0x1f,
-	0x5f, 0x51, 0x2f, 0xf4, 0x3d, 0x58, 0x4d, 0x7c, 0x75, 0xc8, 0xbd, 0x3e, 0x29, 0x52, 0x38, 0xfa,
-	0x89, 0x04, 0x96, 0x13, 0x97, 0x7b, 0xf9, 0xe2, 0x69, 0x87, 0xb1, 0xb9, 0xca, 0xe4, 0x58, 0x41,
-	0xea, 0x03, 0x09, 0x2c, 0x0c, 0xbd, 0x5d, 0x5f, 0x3c, 0xeb, 0x29, 0x60, 0xee, 0xce, 0x84, 0x40,
-	0xc1, 0xe5, 0x73, 0x09, 0xac, 0x8e, 0xbc, 0x3d, 0x6f, 0x8f, 0xa1, 0xfd, 0x08, 0x7c, 0xee, 0xde,
-	0xe5, 0xf0, 0x82, 0xe0, 0xa7, 0x12, 0xc8, 0x24, 0x2f, 0x9b, 0xd7, 0xc6, 0xce, 0x1e, 0x81, 0x73,
-	0xbb, 0x97, 0x00, 0x9f, 0xe2, 0x95, 0x6c, 0xf2, 0x31, 0x78, 0x25, 0xc0, 0xe3, 0xf0, 0x3a, 0xb3,
-	0x11, 0x2b, 0xef, 0x3c, 0x39, 0xce, 0x4b, 0x4f, 0x8f, 0xf3, 0xd2, 0x6f, 0xc7, 0x79, 0xe9, 0xe3,
-	0x93, 0xfc, 0xd4, 0xd3, 0x93, 0xfc, 0xd4, 0xcf, 0x27, 0xf9, 0xa9, 0xb7, 0x2b, 0xb1, 0x33, 0x3f,
-	0x5c, 0xa8, 0xd8, 0x32, 0x1a, 0x74, 0xf0, 0xa0, 0x1d, 0xee, 0xdc, 0xd2, 0x1e, 0x9f, 0xfa, 0x71,
-	0xab, 0x18, 0xfd, 0xba, 0x15, 0xdc, 0x09, 0x8d, 0x74, 0xf0, 0x43, 0xd1, 0xad, 0xbf, 0x02, 0x00,
-	0x00, 0xff, 0xff, 0xc2, 0x1f, 0xa4, 0x22, 0x0b, 0x13, 0x00, 0x00,
+	0x9c, 0xb1, 0x1b, 0xa7, 0xb4, 0x4e, 0x21, 0x07, 0x2e, 0x89, 0x3d, 0x33, 0xef, 0x33, 0xcf, 0x3c,
+	0xcf, 0xfb, 0xce, 0xd8, 0x86, 0x0a, 0x65, 0x6d, 0xca, 0x08, 0x53, 0x0d, 0x6a, 0x1b, 0xd8, 0x76,
+	0x1d, 0xdd, 0xc5, 0x66, 0x8b, 0xbc, 0x7b, 0x48, 0x4c, 0xe2, 0x1e, 0xab, 0x47, 0x95, 0x5d, 0xec,
+	0xea, 0x15, 0xd5, 0x7d, 0xac, 0x74, 0x1c, 0xea, 0x52, 0xe9, 0xf9, 0x70, 0xbc, 0x32, 0x74, 0xbc,
+	0x12, 0x8e, 0x2f, 0x2c, 0x5b, 0xd4, 0xa2, 0x41, 0x84, 0xea, 0x5f, 0xf1, 0xe0, 0x42, 0x4e, 0x6f,
+	0x13, 0x9b, 0xaa, 0xc1, 0x6f, 0xd8, 0x54, 0x34, 0x02, 0x40, 0x75, 0x57, 0x67, 0x58, 0xcc, 0x66,
+	0x50, 0x62, 0xf3, 0x7e, 0xf4, 0xfd, 0x14, 0xcc, 0x35, 0x98, 0xb5, 0xed, 0x60, 0xdd, 0xc5, 0x0f,
+	0x29, 0x23, 0x2e, 0xa1, 0xb6, 0xf4, 0x22, 0x9c, 0xee, 0x50, 0xda, 0x6a, 0x12, 0x33, 0x0f, 0x36,
+	0x40, 0x69, 0xaa, 0x26, 0xf5, 0x3c, 0x79, 0xfe, 0x58, 0x6f, 0xb7, 0xaa, 0x28, 0xec, 0x40, 0x5a,
+	0xd6, 0xbf, 0xaa, 0x9b, 0xd2, 0x4d, 0x98, 0x65, 0xd8, 0x36, 0xb1, 0x93, 0x9f, 0xdc, 0x00, 0xa5,
+	0x99, 0x5a, 0xae, 0xe7, 0xc9, 0x73, 0x7c, 0x2c, 0x6f, 0x47, 0x5a, 0x38, 0x40, 0x7a, 0x09, 0xc2,
+	0x16, 0xed, 0x62, 0xa7, 0xe9, 0x12, 0xe3, 0x20, 0x9f, 0xd9, 0x00, 0xa5, 0x4c, 0xed, 0x7a, 0xcf,
+	0x93, 0x73, 0x7c, 0x78, 0xd4, 0x87, 0xb4, 0x99, 0xe0, 0x66, 0x87, 0x18, 0x07, 0x7e, 0xd4, 0x61,
+	0xa7, 0xd3, 0x8f, 0x9a, 0x1a, 0x8c, 0x8a, 0xfa, 0x90, 0x36, 0x13, 0xdc, 0x04, 0x51, 0x2e, 0x5c,
+	0x70, 0xe9, 0x01, 0xb6, 0x59, 0xb3, 0xe3, 0xd0, 0x23, 0x62, 0x62, 0x33, 0x7f, 0x6d, 0x23, 0x53,
+	0x9a, 0xdd, 0x5a, 0x53, 0xb8, 0x26, 0x8a, 0xaf, 0x49, 0x5f, 0x51, 0x65, 0x9b, 0x12, 0xbb, 0xb6,
+	0xf9, 0xc4, 0x93, 0x27, 0xbe, 0xfe, 0x55, 0x2e, 0x59, 0xc4, 0xdd, 0x3f, 0xdc, 0x55, 0x0c, 0xda,
+	0x56, 0x43, 0x01, 0xf9, 0x5f, 0x99, 0x99, 0x07, 0xaa, 0x7b, 0xdc, 0xc1, 0x2c, 0x08, 0x60, 0xda,
+	0x3c, 0x9f, 0xe3, 0x61, 0x38, 0x85, 0x84, 0x61, 0x2e, 0x68, 0x69, 0xb6, 0x89, 0xdd, 0xd4, 0xdb,
+	0xf4, 0xd0, 0x76, 0x37, 0xf3, 0xd9, 0x40, 0x97, 0x57, 0x7d, 0xf0, 0x5f, 0x3c, 0xf9, 0x3a, 0x87,
+	0x62, 0xe6, 0x81, 0x42, 0xa8, 0xda, 0xd6, 0xdd, 0x7d, 0xa5, 0x6e, 0xbb, 0x3d, 0x4f, 0xce, 0xf3,
+	0xf5, 0x24, 0xe2, 0x91, 0xc6, 0x57, 0xd2, 0x20, 0xf6, 0x5d, 0xde, 0x32, 0x6c, 0x9a, 0x4a, 0x7e,
+	0xfa, 0x4a, 0xd3, 0x54, 0x12, 0xd3, 0x54, 0xaa, 0xf2, 0x87, 0xbf, 0x7f, 0xfb, 0x42, 0x41, 0xa4,
+	0x70, 0xab, 0x6c, 0x04, 0x79, 0x52, 0xee, 0x84, 0x89, 0x82, 0x7e, 0xc8, 0xc0, 0xb5, 0x44, 0xfa,
+	0x68, 0x98, 0x75, 0xa8, 0xcd, 0xb0, 0xf4, 0x32, 0x9c, 0xed, 0x8f, 0x8c, 0x52, 0x69, 0xa5, 0xe7,
+	0xc9, 0x52, 0x3f, 0x95, 0x44, 0x27, 0xd2, 0x60, 0xff, 0xae, 0x6e, 0x4a, 0x75, 0x38, 0xdd, 0xd7,
+	0x8e, 0xe7, 0x94, 0x7a, 0xd1, 0xa2, 0xc2, 0xe4, 0x14, 0x8a, 0xf5, 0xe3, 0x23, 0xa8, 0x4a, 0x90,
+	0x6f, 0x69, 0xa1, 0x2a, 0x02, 0xaa, 0x22, 0xb5, 0x60, 0x4e, 0x54, 0x62, 0x93, 0x2b, 0xe1, 0xe7,
+	0x94, 0x0f, 0x7a, 0x27, 0x04, 0x5d, 0x4f, 0x82, 0xbe, 0x89, 0x2d, 0xdd, 0x38, 0x7e, 0x03, 0x1b,
+	0x91, 0xf4, 0x09, 0x14, 0xa4, 0x2d, 0x8a, 0x36, 0xae, 0xa5, 0x39, 0x50, 0x2b, 0xd9, 0x91, 0x6a,
+	0x65, 0xfa, 0x72, 0xb5, 0x82, 0xfe, 0xcc, 0xc0, 0xc5, 0x06, 0xb3, 0xee, 0x9a, 0xe6, 0x0e, 0x15,
+	0x9b, 0xc0, 0xc8, 0xee, 0xa5, 0xd8, 0x10, 0xee, 0x47, 0x46, 0x73, 0x77, 0x36, 0x2f, 0x72, 0x67,
+	0x21, 0xee, 0x4e, 0x33, 0xee, 0xf4, 0xfd, 0xc8, 0xe9, 0xa9, 0x51, 0xb0, 0xe2, 0x56, 0x0f, 0x2d,
+	0xe3, 0x6b, 0xe3, 0x29, 0xe3, 0xec, 0xbf, 0x5f, 0xc6, 0xba, 0x69, 0x96, 0x5d, 0x1a, 0x95, 0xf1,
+	0x1f, 0x00, 0xe6, 0x07, 0xfd, 0xff, 0x8f, 0x56, 0x31, 0x7a, 0x7f, 0x12, 0x2e, 0x35, 0x98, 0xf5,
+	0x16, 0x71, 0xf7, 0x4d, 0x47, 0xef, 0x8e, 0x35, 0xdd, 0x09, 0x8c, 0xea, 0x3c, 0xf4, 0x2b, 0x5c,
+	0xcf, 0xed, 0xcb, 0x6d, 0x20, 0xab, 0x83, 0x1b, 0x08, 0x07, 0x41, 0xda, 0x82, 0x68, 0xe2, 0xa6,
+	0x57, 0x9f, 0xf5, 0x3d, 0xbf, 0x11, 0xf3, 0xbc, 0x1b, 0x2e, 0x38, 0x72, 0xfd, 0x3b, 0x00, 0xd7,
+	0x87, 0x28, 0x21, 0x8c, 0x8f, 0xf9, 0x07, 0xfe, 0x39, 0xff, 0x26, 0xaf, 0xe8, 0xdf, 0x17, 0x00,
+	0xae, 0xfa, 0x47, 0x0e, 0x6d, 0xb5, 0xb0, 0xe1, 0x3e, 0xea, 0x38, 0x58, 0x37, 0x35, 0xdc, 0xd5,
+	0x1d, 0x93, 0x49, 0x55, 0xf8, 0xff, 0x98, 0x4d, 0x2c, 0x0f, 0x36, 0x32, 0xa5, 0xa9, 0xda, 0x6a,
+	0xcf, 0x93, 0x97, 0x12, 0x26, 0x32, 0xa4, 0xcd, 0x46, 0x2e, 0xb2, 0x14, 0x36, 0x56, 0x8b, 0xbe,
+	0xb6, 0x6b, 0xf1, 0x63, 0x91, 0xb6, 0xca, 0xac, 0x53, 0x76, 0x38, 0x0d, 0xf4, 0x23, 0x80, 0xf2,
+	0x39, 0x14, 0x85, 0xb8, 0x5f, 0x01, 0x98, 0x37, 0xf8, 0x00, 0x6c, 0x36, 0x59, 0x30, 0xa6, 0x19,
+	0x02, 0x04, 0xbc, 0xff, 0xf6, 0x41, 0xe5, 0x91, 0x2f, 0x5f, 0xcf, 0x93, 0x65, 0x4e, 0xf0, 0x3c,
+	0x20, 0x94, 0xea, 0x59, 0x66, 0x45, 0xc0, 0x9c, 0xa1, 0x8c, 0xbe, 0x04, 0x70, 0x39, 0x5a, 0x4e,
+	0x3d, 0x78, 0x2e, 0x25, 0x47, 0x78, 0x6c, 0x72, 0x23, 0x5f, 0xee, 0x67, 0xce, 0xca, 0xed, 0x33,
+	0x29, 0x13, 0x41, 0x05, 0x79, 0x93, 0xf0, 0xc6, 0x30, 0x8e, 0x42, 0xef, 0xcf, 0x00, 0x5c, 0x8e,
+	0x64, 0x8a, 0x22, 0x2f, 0xd6, 0xfa, 0x41, 0xa8, 0xf5, 0xfa, 0xa0, 0xd6, 0xb1, 0xe9, 0x53, 0xe9,
+	0xbc, 0x24, 0x20, 0x62, 0x5a, 0xfa, 0xfc, 0xf6, 0xa8, 0xb3, 0x87, 0xc9, 0x00, 0xbf, 0xc9, 0x94,
+	0xfc, 0x86, 0x81, 0xa4, 0xe4, 0x27, 0x20, 0x22, 0x7e, 0xe8, 0x1b, 0x00, 0x0b, 0x0d, 0x66, 0xdd,
+	0x3b, 0xb4, 0x2d, 0xb2, 0x77, 0xbc, 0xbd, 0xaf, 0x3b, 0x16, 0x36, 0xfb, 0x5b, 0xc6, 0xd8, 0x52,
+	0xe1, 0xa6, 0x9f, 0x0a, 0xcf, 0xc5, 0x52, 0x61, 0x8f, 0xf3, 0x29, 0x1b, 0x9c, 0x90, 0xd8, 0xdc,
+	0x18, 0xda, 0x87, 0xe8, 0x7c, 0xbe, 0x22, 0x2d, 0x6a, 0x70, 0xc1, 0xc6, 0xdd, 0x66, 0x72, 0xe7,
+	0x2f, 0xf4, 0x3c, 0x79, 0x85, 0x93, 0x18, 0x18, 0x80, 0xb4, 0x39, 0x1b, 0x8b, 0xdd, 0xb2, 0x6e,
+	0xa2, 0x9f, 0x78, 0x7d, 0xec, 0x38, 0xba, 0xcd, 0xf6, 0xb0, 0x33, 0x6e, 0x51, 0xa4, 0x0a, 0x9c,
+	0xf1, 0x29, 0xd2, 0xae, 0x8d, 0x9d, 0xf0, 0x38, 0x59, 0xee, 0x79, 0xf2, 0x62, 0xc4, 0x3e, 0xe8,
+	0x42, 0xda, 0xff, 0x6c, 0xdc, 0x7d, 0xe0, 0x5f, 0x26, 0x4b, 0xca, 0x0d, 0xc9, 0xc7, 0x04, 0x2c,
+	0x06, 0x15, 0x95, 0x58, 0x55, 0x5f, 0xba, 0xad, 0xf7, 0xa6, 0x61, 0xa6, 0xc1, 0x2c, 0xe9, 0x23,
+	0x00, 0xe7, 0x07, 0xde, 0x1f, 0x5f, 0x51, 0x2e, 0xf5, 0x1a, 0xab, 0x24, 0x5e, 0x1d, 0x0a, 0xaf,
+	0x8f, 0x1a, 0x29, 0x1c, 0xfd, 0x04, 0xc0, 0xc5, 0xc4, 0xe1, 0x5e, 0xbd, 0x3c, 0xec, 0x60, 0x6c,
+	0xa1, 0x36, 0x7a, 0xac, 0x20, 0xf5, 0x01, 0x80, 0x73, 0x03, 0x4f, 0xd7, 0x97, 0x47, 0x3d, 0x13,
+	0x58, 0xb8, 0x33, 0x62, 0xa0, 0xe0, 0xf2, 0x39, 0x80, 0xcb, 0x43, 0x4f, 0xcf, 0xdb, 0x29, 0xb4,
+	0x1f, 0x12, 0x5f, 0xb8, 0x77, 0xb5, 0x78, 0x41, 0xf0, 0x53, 0x00, 0x73, 0xc9, 0xc3, 0xe6, 0xb5,
+	0xd4, 0xe8, 0x51, 0x70, 0x61, 0xfb, 0x0a, 0xc1, 0x67, 0x78, 0x25, 0x8b, 0x3c, 0x05, 0xaf, 0x44,
+	0x70, 0x1a, 0x5e, 0xe7, 0x16, 0x62, 0xed, 0x9d, 0x27, 0x27, 0x45, 0xf0, 0xf4, 0xa4, 0x08, 0x7e,
+	0x3b, 0x29, 0x82, 0x8f, 0x4f, 0x8b, 0x13, 0x4f, 0x4f, 0x8b, 0x13, 0x3f, 0x9f, 0x16, 0x27, 0xde,
+	0xae, 0xc5, 0xf6, 0xfc, 0x70, 0xa2, 0x72, 0x4b, 0xdf, 0x65, 0xfd, 0x1b, 0xf5, 0x68, 0xeb, 0x96,
+	0xfa, 0xf8, 0xcc, 0xb7, 0xa9, 0x72, 0xf4, 0x71, 0x2a, 0x38, 0x13, 0x76, 0xb3, 0xc1, 0x87, 0xa2,
+	0x5b, 0x7f, 0x05, 0x00, 0x00, 0xff, 0xff, 0xe1, 0xad, 0xa8, 0x1f, 0xca, 0x12, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/x/cosmwasmpool/client/queryproto/query.pb.go b/x/cosmwasmpool/client/queryproto/query.pb.go
index 46f74fda4c9..052b4caec3d 100644
--- a/x/cosmwasmpool/client/queryproto/query.pb.go
+++ b/x/cosmwasmpool/client/queryproto/query.pb.go
@@ -8,7 +8,6 @@ import (
 	fmt "fmt"
 	_ "github.com/cosmos/cosmos-proto"
 	types1 "github.com/cosmos/cosmos-sdk/codec/types"
-	_ "github.com/cosmos/cosmos-sdk/types"
 	query "github.com/cosmos/cosmos-sdk/types/query"
 	_ "github.com/cosmos/gogoproto/gogoproto"
 	grpc1 "github.com/cosmos/gogoproto/grpc"
@@ -18,7 +17,6 @@ import (
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
-	_ "google.golang.org/protobuf/types/known/timestamppb"
 	io "io"
 	math "math"
 	math_bits "math/bits"
@@ -330,47 +328,45 @@ func init() {
 }
 
 var fileDescriptor_733c758985c393b2 = []byte{
-	// 628 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x94, 0xcd, 0x6e, 0xd3, 0x4c,
-	0x14, 0x86, 0xe3, 0xfe, 0xe4, 0x53, 0xa7, 0x5f, 0x5b, 0x34, 0x8a, 0x44, 0x49, 0x23, 0x07, 0x99,
-	0xb6, 0x84, 0xa6, 0xb1, 0xd5, 0x44, 0x2c, 0xe8, 0xae, 0x06, 0x15, 0x85, 0x55, 0xb1, 0x10, 0x0b,
-	0x16, 0x44, 0x13, 0x7b, 0x6a, 0x2c, 0xd9, 0x1e, 0x37, 0x33, 0x29, 0xcd, 0x96, 0x3d, 0x02, 0xd4,
-	0x5b, 0xe1, 0x0a, 0x58, 0x55, 0xac, 0x2a, 0xb1, 0x61, 0x15, 0xa1, 0x84, 0x0b, 0x40, 0xbd, 0x02,
-	0x34, 0x3f, 0x4e, 0xd3, 0x28, 0x72, 0x23, 0x56, 0x89, 0xe7, 0x7d, 0xcf, 0x39, 0xcf, 0x39, 0x73,
-	0x6c, 0x50, 0x21, 0x34, 0x22, 0x34, 0xa0, 0x96, 0x4b, 0x68, 0xf4, 0x1e, 0xd1, 0x28, 0x21, 0x24,
-	0xb4, 0x4e, 0xf7, 0xda, 0x98, 0xa1, 0x3d, 0xeb, 0xa4, 0x8b, 0x3b, 0x3d, 0x33, 0xe9, 0x10, 0x46,
-	0x60, 0x49, 0x39, 0xcd, 0x71, 0xa7, 0xa9, 0x9c, 0xc5, 0x82, 0x4f, 0x7c, 0x22, 0x8c, 0x16, 0xff,
-	0x27, 0x63, 0x8a, 0x8f, 0x32, 0xb3, 0x27, 0xa8, 0x83, 0x22, 0xaa, 0xac, 0x5b, 0x99, 0x56, 0x76,
-	0xa6, 0x6c, 0xba, 0x2b, 0x7c, 0x56, 0x1b, 0x51, 0x3c, 0x52, 0x5d, 0x12, 0xc4, 0x4a, 0xdf, 0x19,
-	0xd7, 0x05, 0xfe, 0x58, 0x39, 0x3f, 0x88, 0x11, 0x0b, 0x48, 0xea, 0x2d, 0xf9, 0x84, 0xf8, 0x21,
-	0xb6, 0x50, 0x12, 0x58, 0x28, 0x8e, 0x09, 0x13, 0x62, 0x0a, 0x74, 0x4f, 0xa9, 0xe2, 0xa9, 0xdd,
-	0x3d, 0xb6, 0x50, 0xdc, 0x4b, 0x25, 0x59, 0xa4, 0x25, 0xfb, 0x95, 0x0f, 0x4a, 0x2a, 0x4f, 0x46,
-	0xb1, 0x20, 0xc2, 0x94, 0xa1, 0x28, 0x91, 0x06, 0x63, 0x0d, 0xac, 0x1c, 0x89, 0xbe, 0x1d, 0x7c,
-	0xd2, 0xc5, 0x94, 0x19, 0xaf, 0xc0, 0x6a, 0x7a, 0x40, 0x13, 0x12, 0x53, 0x0c, 0x6d, 0x90, 0x97,
-	0xa3, 0x59, 0xd7, 0xee, 0x6b, 0x95, 0xe5, 0xfa, 0xa6, 0x99, 0x35, 0x7a, 0x53, 0x46, 0xdb, 0x0b,
-	0x17, 0xfd, 0x72, 0xce, 0x51, 0x91, 0xc6, 0x6b, 0xf0, 0xff, 0x11, 0x21, 0x61, 0x5a, 0x05, 0x1e,
-	0x02, 0x70, 0xdd, 0xff, 0xfa, 0x9c, 0xc8, 0xbb, 0x6d, 0x2a, 0x74, 0x3e, 0x2c, 0x53, 0xde, 0xf5,
-	0x75, 0x52, 0x1f, 0xab, 0x58, 0x67, 0x2c, 0xd2, 0xf8, 0xa4, 0x81, 0x15, 0x95, 0x58, 0xd1, 0x3e,
-	0x06, 0x8b, 0x1c, 0x87, 0xc3, 0xce, 0x57, 0x96, 0xeb, 0x05, 0x53, 0x4e, 0xc0, 0x4c, 0x27, 0x60,
-	0x1e, 0xc4, 0x3d, 0x7b, 0xe9, 0xfb, 0xd7, 0xda, 0x22, 0x8f, 0x6b, 0x3a, 0xd2, 0x0d, 0x9f, 0x4f,
-	0x01, 0x7a, 0x78, 0x2b, 0x90, 0xac, 0x79, 0x83, 0xe8, 0x05, 0xd8, 0x78, 0x4a, 0x62, 0xd6, 0x41,
-	0x2e, 0x6b, 0xc6, 0xc7, 0xc4, 0xee, 0x89, 0x32, 0x5e, 0xda, 0x78, 0x15, 0xfc, 0xc7, 0x0b, 0xb6,
-	0x02, 0x4f, 0x4c, 0x73, 0xc1, 0x86, 0x57, 0xfd, 0xf2, 0x6a, 0x0f, 0x45, 0xe1, 0xbe, 0xa1, 0x04,
-	0xc3, 0xc9, 0x27, 0x22, 0xc6, 0x38, 0xd7, 0x40, 0x69, 0x7a, 0x32, 0xd5, 0xec, 0x21, 0xb8, 0xe3,
-	0x2a, 0xbd, 0x85, 0x3c, 0xaf, 0x83, 0xa9, 0xbc, 0xa4, 0x25, 0x7b, 0xe3, 0xaa, 0x5f, 0xbe, 0x2b,
-	0xd3, 0x4e, 0x3a, 0x0c, 0x67, 0x2d, 0x3d, 0x3a, 0x90, 0x27, 0x9c, 0xca, 0x25, 0x1e, 0xe6, 0x54,
-	0x73, 0x93, 0x54, 0x4a, 0x30, 0x9c, 0x3c, 0xff, 0xd7, 0xf4, 0xea, 0x7f, 0xe6, 0xc1, 0xe2, 0x4b,
-	0x3e, 0x0c, 0xf8, 0x51, 0x03, 0x62, 0x8a, 0x14, 0xee, 0xdc, 0xb2, 0x13, 0x63, 0x77, 0x5f, 0xac,
-	0xce, 0xe4, 0x95, 0x1d, 0x1a, 0xd5, 0x0f, 0x3f, 0x7e, 0x9f, 0xcf, 0x6d, 0xc1, 0x07, 0x56, 0xf6,
-	0xbb, 0x2b, 0x28, 0xbe, 0x68, 0x20, 0x2f, 0xd7, 0x0f, 0x56, 0x67, 0x59, 0xd2, 0x94, 0x68, 0x77,
-	0x36, 0xb3, 0x42, 0xda, 0x15, 0x48, 0xdb, 0x70, 0xd3, 0x9a, 0xe1, 0x73, 0x02, 0xbf, 0x69, 0xa0,
-	0x30, 0xed, 0x0e, 0xe1, 0x93, 0xec, 0xa2, 0x19, 0x4b, 0x54, 0xdc, 0xff, 0x97, 0x50, 0x45, 0xdf,
-	0x10, 0xf4, 0x35, 0x58, 0xcd, 0xa6, 0x1f, 0x2d, 0x4d, 0xc0, 0x93, 0xbc, 0xbd, 0x18, 0xe8, 0xda,
-	0xe5, 0x40, 0xd7, 0x7e, 0x0d, 0x74, 0xed, 0xf3, 0x50, 0xcf, 0x5d, 0x0e, 0xf5, 0xdc, 0xcf, 0xa1,
-	0x9e, 0x7b, 0xf3, 0xcc, 0x0f, 0xd8, 0xbb, 0x6e, 0xdb, 0x74, 0x49, 0x94, 0x26, 0xac, 0x85, 0xa8,
-	0x4d, 0x47, 0xd9, 0x4f, 0xeb, 0x0d, 0xeb, 0xec, 0x66, 0x0d, 0x37, 0x0c, 0x70, 0xcc, 0xe4, 0xe7,
-	0x50, 0xbe, 0x96, 0x79, 0xf1, 0xd3, 0xf8, 0x1b, 0x00, 0x00, 0xff, 0xff, 0x1f, 0x95, 0x8e, 0x67,
-	0xff, 0x05, 0x00, 0x00,
+	// 601 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x94, 0xcf, 0x6e, 0xd3, 0x40,
+	0x10, 0xc6, 0xe3, 0xb4, 0x09, 0xea, 0x96, 0xb6, 0x68, 0x15, 0x89, 0x92, 0x46, 0x0e, 0x32, 0xa5,
+	0x84, 0xa6, 0xf1, 0xaa, 0x89, 0x38, 0xd0, 0x5b, 0x0d, 0x2a, 0x0a, 0xa7, 0x62, 0x21, 0x0e, 0x1c,
+	0x88, 0x36, 0xf6, 0xd6, 0x58, 0xb2, 0xbd, 0x6e, 0xd6, 0x29, 0xe4, 0xca, 0x1d, 0x01, 0xea, 0xab,
+	0xf0, 0x04, 0x9c, 0x2a, 0x4e, 0x95, 0xb8, 0x70, 0x8a, 0x50, 0xc2, 0x03, 0xa0, 0x3e, 0x01, 0xda,
+	0x3f, 0x6e, 0xd3, 0x2a, 0x72, 0xa3, 0x9e, 0xe2, 0xdd, 0xf9, 0xe6, 0x9b, 0xdf, 0xce, 0xce, 0x06,
+	0xd4, 0x28, 0x0b, 0x29, 0xf3, 0x19, 0x72, 0x28, 0x0b, 0x3f, 0x60, 0x16, 0xc6, 0x94, 0x06, 0xe8,
+	0x68, 0xbb, 0x4b, 0x12, 0xbc, 0x8d, 0x0e, 0xfb, 0xa4, 0x37, 0x30, 0xe3, 0x1e, 0x4d, 0x28, 0xac,
+	0x28, 0xa5, 0x39, 0xa9, 0x34, 0x95, 0xb2, 0x5c, 0xf2, 0xa8, 0x47, 0x85, 0x10, 0xf1, 0x2f, 0x99,
+	0x53, 0x7e, 0x9c, 0xe9, 0x1e, 0xe3, 0x1e, 0x0e, 0x99, 0x92, 0x6e, 0x3a, 0x42, 0x8b, 0xba, 0x98,
+	0x11, 0x59, 0x77, 0x42, 0xe7, 0xf9, 0x11, 0x4e, 0x7c, 0x1a, 0x29, 0x6d, 0xc5, 0xa3, 0xd4, 0x0b,
+	0x08, 0xc2, 0xb1, 0x8f, 0x70, 0x14, 0xd1, 0x44, 0x04, 0x53, 0xa7, 0x7b, 0x2a, 0x2a, 0x56, 0xdd,
+	0xfe, 0x01, 0xc2, 0xd1, 0x20, 0x0d, 0xc9, 0x22, 0x1d, 0x09, 0x2a, 0x17, 0x32, 0x64, 0xac, 0x80,
+	0xa5, 0x7d, 0xc1, 0x63, 0x93, 0xc3, 0x3e, 0x61, 0x89, 0xf1, 0x1a, 0x2c, 0xa7, 0x1b, 0x2c, 0xa6,
+	0x11, 0x23, 0xd0, 0x02, 0x45, 0x89, 0xbc, 0xaa, 0xdd, 0xd7, 0x6a, 0x8b, 0xcd, 0x75, 0x33, 0xab,
+	0x25, 0xa6, 0xcc, 0xb6, 0xe6, 0x4f, 0x86, 0xd5, 0x9c, 0xad, 0x32, 0x8d, 0x37, 0xe0, 0xf6, 0x3e,
+	0xa5, 0x41, 0x5a, 0x05, 0xee, 0x01, 0x70, 0x71, 0xbc, 0xd5, 0xbc, 0xf0, 0xdd, 0x30, 0x15, 0x19,
+	0xef, 0x85, 0x29, 0xef, 0xe0, 0xc2, 0xd4, 0x23, 0x2a, 0xd7, 0x9e, 0xc8, 0x34, 0xbe, 0x68, 0x60,
+	0x49, 0x19, 0x2b, 0xda, 0x27, 0xa0, 0xc0, 0x71, 0x38, 0xec, 0x5c, 0x6d, 0xb1, 0x59, 0x32, 0x65,
+	0x5b, 0xcc, 0xb4, 0x2d, 0xe6, 0x6e, 0x34, 0xb0, 0x16, 0x7e, 0x7e, 0x6f, 0x14, 0x78, 0x5e, 0xdb,
+	0x96, 0x6a, 0xf8, 0x62, 0x0a, 0xd0, 0xa3, 0x6b, 0x81, 0x64, 0xcd, 0x4b, 0x44, 0x2f, 0xc1, 0xda,
+	0x33, 0x1a, 0x25, 0x3d, 0xec, 0x24, 0xed, 0xe8, 0x80, 0x5a, 0x03, 0x51, 0xc6, 0x4d, 0x0f, 0x5e,
+	0x07, 0xb7, 0x78, 0xc1, 0x8e, 0xef, 0x8a, 0x6e, 0xce, 0x5b, 0xf0, 0x6c, 0x58, 0x5d, 0x1e, 0xe0,
+	0x30, 0xd8, 0x31, 0x54, 0xc0, 0xb0, 0x8b, 0xb1, 0xc8, 0x31, 0x8e, 0x35, 0x50, 0x99, 0x6e, 0xa6,
+	0x0e, 0xbb, 0x07, 0xee, 0x38, 0x2a, 0xde, 0xc1, 0xae, 0xdb, 0x23, 0x4c, 0x5e, 0xd2, 0x82, 0xb5,
+	0x76, 0x36, 0xac, 0xde, 0x95, 0xb6, 0x57, 0x15, 0x86, 0xbd, 0x92, 0x6e, 0xed, 0xca, 0x1d, 0x4e,
+	0xe5, 0x50, 0x97, 0x70, 0xaa, 0xfc, 0x55, 0x2a, 0x15, 0x30, 0xec, 0x22, 0xff, 0x6a, 0xbb, 0xcd,
+	0x7f, 0x73, 0xa0, 0xf0, 0x8a, 0x37, 0x03, 0x7e, 0xd6, 0x80, 0xe8, 0x22, 0x83, 0x9b, 0xd7, 0xcc,
+	0xc4, 0xc4, 0xdd, 0x97, 0xeb, 0x33, 0x69, 0xe5, 0x09, 0x8d, 0xfa, 0xa7, 0x5f, 0x7f, 0x8f, 0xf3,
+	0x0f, 0xe1, 0x03, 0x94, 0xfd, 0xa6, 0x04, 0xc5, 0x37, 0x0d, 0x14, 0xe5, 0xf8, 0xc1, 0xfa, 0x2c,
+	0x43, 0x9a, 0x12, 0x6d, 0xcd, 0x26, 0x56, 0x48, 0x5b, 0x02, 0x69, 0x03, 0xae, 0xa3, 0x19, 0x9e,
+	0x39, 0xfc, 0xa1, 0x81, 0xd2, 0xb4, 0x3b, 0x84, 0x4f, 0xb3, 0x8b, 0x66, 0x0c, 0x51, 0x79, 0xe7,
+	0x26, 0xa9, 0x8a, 0xbe, 0x25, 0xe8, 0x1b, 0xb0, 0x9e, 0x4d, 0x7f, 0x3e, 0x34, 0x3e, 0x37, 0x79,
+	0x77, 0x32, 0xd2, 0xb5, 0xd3, 0x91, 0xae, 0xfd, 0x19, 0xe9, 0xda, 0xd7, 0xb1, 0x9e, 0x3b, 0x1d,
+	0xeb, 0xb9, 0xdf, 0x63, 0x3d, 0xf7, 0xf6, 0xb9, 0xe7, 0x27, 0xef, 0xfb, 0x5d, 0xd3, 0xa1, 0x61,
+	0x6a, 0xd8, 0x08, 0x70, 0x97, 0x9d, 0xbb, 0x1f, 0x35, 0x5b, 0xe8, 0xe3, 0xe5, 0x1a, 0x4e, 0xe0,
+	0x93, 0x28, 0x91, 0xff, 0x76, 0xf2, 0x59, 0x16, 0xc5, 0x4f, 0xeb, 0x7f, 0x00, 0x00, 0x00, 0xff,
+	0xff, 0xe5, 0x17, 0xff, 0xef, 0x97, 0x05, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/x/cosmwasmpool/cosmwasm/msg/instantiate_msg.pb.go b/x/cosmwasmpool/cosmwasm/msg/instantiate_msg.pb.go
index ce8b5a680ff..7ad8be137e4 100644
--- a/x/cosmwasmpool/cosmwasm/msg/instantiate_msg.pb.go
+++ b/x/cosmwasmpool/cosmwasm/msg/instantiate_msg.pb.go
@@ -5,8 +5,6 @@ package msg
 
 import (
 	fmt "fmt"
-	_ "github.com/cosmos/cosmos-sdk/types"
-	_ "github.com/cosmos/gogoproto/gogoproto"
 	proto "github.com/cosmos/gogoproto/proto"
 	io "io"
 	math "math"
@@ -80,22 +78,20 @@ func init() {
 }
 
 var fileDescriptor_834d7406456b7712 = []byte{
-	// 237 bytes of a gzipped FileDescriptorProto
+	// 206 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xb2, 0xc8, 0x2f, 0xce, 0xcd,
 	0x2f, 0xce, 0x2c, 0xd6, 0x4f, 0xce, 0x2f, 0xce, 0x2d, 0x4f, 0x2c, 0xce, 0x2d, 0xc8, 0xcf, 0xcf,
 	0xd1, 0x2f, 0x33, 0x4c, 0x4a, 0x2d, 0x49, 0x34, 0xd4, 0xcf, 0xcd, 0x4f, 0x49, 0xcd, 0xd1, 0xcf,
 	0xcc, 0x2b, 0x2e, 0x49, 0xcc, 0x2b, 0xc9, 0x4c, 0x2c, 0x49, 0x8d, 0xcf, 0x2d, 0x4e, 0xd7, 0x2b,
-	0x28, 0xca, 0x2f, 0xc9, 0x17, 0x92, 0x81, 0xea, 0xd4, 0x43, 0xd6, 0xa9, 0x07, 0xd5, 0x29, 0x25,
-	0x92, 0x9e, 0x9f, 0x9e, 0x0f, 0x56, 0xa8, 0x0f, 0x62, 0x41, 0xf4, 0x48, 0xc9, 0x25, 0x83, 0x35,
-	0xe9, 0x27, 0x25, 0x16, 0xa7, 0xc2, 0x2d, 0x49, 0xce, 0xcf, 0xcc, 0x83, 0xc8, 0x2b, 0xd9, 0x70,
-	0xf1, 0x79, 0x22, 0x2c, 0xf3, 0x2d, 0x4e, 0x17, 0xd2, 0xe2, 0x12, 0x04, 0x99, 0x1b, 0x9f, 0x58,
-	0x5c, 0x9c, 0x5a, 0x12, 0x9f, 0x92, 0x9a, 0x97, 0x9f, 0x5b, 0x2c, 0xc1, 0xa8, 0xc0, 0xac, 0xc1,
-	0x19, 0xc4, 0x0f, 0x92, 0x70, 0x04, 0x89, 0xbb, 0x80, 0x85, 0x9d, 0x22, 0x4f, 0x3c, 0x92, 0x63,
-	0xbc, 0xf0, 0x48, 0x8e, 0xf1, 0xc1, 0x23, 0x39, 0xc6, 0x09, 0x8f, 0xe5, 0x18, 0x2e, 0x3c, 0x96,
-	0x63, 0xb8, 0xf1, 0x58, 0x8e, 0x21, 0xca, 0x3e, 0x3d, 0xb3, 0x24, 0xa3, 0x34, 0x49, 0x2f, 0x39,
-	0x3f, 0x57, 0x1f, 0xea, 0x6c, 0xdd, 0x9c, 0xc4, 0xa4, 0x62, 0x18, 0x47, 0xbf, 0xcc, 0xc8, 0x58,
-	0xbf, 0x02, 0x35, 0x0c, 0x60, 0x1c, 0xfd, 0xdc, 0xe2, 0xf4, 0x24, 0x36, 0xb0, 0xfb, 0x8c, 0x01,
-	0x01, 0x00, 0x00, 0xff, 0xff, 0x91, 0x0a, 0xc9, 0x0d, 0x2f, 0x01, 0x00, 0x00,
+	0x28, 0xca, 0x2f, 0xc9, 0x17, 0x92, 0x81, 0xea, 0xd4, 0x43, 0xd6, 0xa9, 0x07, 0xd5, 0xa9, 0x64,
+	0xc3, 0xc5, 0xe7, 0x89, 0xd0, 0xe6, 0x5b, 0x9c, 0x2e, 0xa4, 0xc5, 0x25, 0x08, 0x52, 0x11, 0x9f,
+	0x58, 0x5c, 0x9c, 0x5a, 0x12, 0x9f, 0x92, 0x9a, 0x97, 0x9f, 0x5b, 0x2c, 0xc1, 0xa8, 0xc0, 0xac,
+	0xc1, 0x19, 0xc4, 0x0f, 0x92, 0x70, 0x04, 0x89, 0xbb, 0x80, 0x85, 0x9d, 0x22, 0x4f, 0x3c, 0x92,
+	0x63, 0xbc, 0xf0, 0x48, 0x8e, 0xf1, 0xc1, 0x23, 0x39, 0xc6, 0x09, 0x8f, 0xe5, 0x18, 0x2e, 0x3c,
+	0x96, 0x63, 0xb8, 0xf1, 0x58, 0x8e, 0x21, 0xca, 0x3e, 0x3d, 0xb3, 0x24, 0xa3, 0x34, 0x49, 0x2f,
+	0x39, 0x3f, 0x57, 0x1f, 0xea, 0x00, 0xdd, 0x9c, 0xc4, 0xa4, 0x62, 0x18, 0x47, 0xbf, 0xcc, 0xc8,
+	0x58, 0xbf, 0x02, 0xd5, 0x37, 0x30, 0x8e, 0x7e, 0x6e, 0x71, 0x7a, 0x12, 0x1b, 0xd8, 0xf5, 0xc6,
+	0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0xdd, 0x3b, 0xea, 0x47, 0xf9, 0x00, 0x00, 0x00,
 }
 
 func (m *InstantiateMsg) Marshal() (dAtA []byte, err error) {
diff --git a/x/cosmwasmpool/cosmwasm/msg/transmuter/transmuter_msgs.pb.go b/x/cosmwasmpool/cosmwasm/msg/transmuter/transmuter_msgs.pb.go
index bf3b904c7bc..1b34aee836b 100644
--- a/x/cosmwasmpool/cosmwasm/msg/transmuter/transmuter_msgs.pb.go
+++ b/x/cosmwasmpool/cosmwasm/msg/transmuter/transmuter_msgs.pb.go
@@ -5,7 +5,6 @@ package transmuter
 
 import (
 	fmt "fmt"
-	_ "github.com/cosmos/cosmos-sdk/types"
 	_ "github.com/cosmos/gogoproto/gogoproto"
 	proto "github.com/cosmos/gogoproto/proto"
 	io "io"
@@ -239,26 +238,26 @@ func init() {
 }
 
 var fileDescriptor_361e9d7404cffed5 = []byte{
-	// 301 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x91, 0x31, 0x4b, 0xc3, 0x40,
-	0x14, 0xc7, 0x13, 0x10, 0xd1, 0x28, 0x0e, 0xc5, 0x41, 0x43, 0x39, 0x25, 0x93, 0x08, 0xde, 0xd1,
-	0x76, 0x71, 0x2e, 0x64, 0x29, 0x14, 0xa4, 0xa3, 0x4b, 0x49, 0xd2, 0xe3, 0xbc, 0x90, 0xcb, 0x8b,
-	0x79, 0x97, 0x1a, 0xbf, 0x85, 0x1f, 0xab, 0x63, 0x47, 0x27, 0x91, 0xe4, 0x8b, 0x48, 0x92, 0xab,
-	0x44, 0xa8, 0x2e, 0x6e, 0xf7, 0x78, 0xf7, 0x7f, 0xbf, 0x1f, 0xfc, 0x9d, 0x7b, 0x40, 0x05, 0x28,
-	0x91, 0x45, 0x80, 0xea, 0x25, 0x40, 0x95, 0x01, 0x24, 0x6c, 0x3d, 0x0a, 0xb9, 0x0e, 0x46, 0x4c,
-	0xc1, 0x8a, 0x27, 0x4c, 0xe7, 0x41, 0x8a, 0xaa, 0xd0, 0x3c, 0x5f, 0x2a, 0x14, 0x48, 0xb3, 0x1c,
-	0x34, 0x0c, 0x86, 0x26, 0x49, 0xfb, 0x49, 0x6a, 0x92, 0xee, 0xb9, 0x00, 0x01, 0xed, 0x47, 0xd6,
-	0xbc, 0xba, 0x8c, 0x4b, 0xa2, 0x36, 0xc4, 0xc2, 0x00, 0xf9, 0x37, 0x24, 0x02, 0x99, 0x76, 0x7b,
-	0xef, 0xcc, 0x39, 0xf5, 0x55, 0xa6, 0x5f, 0x17, 0xfc, 0xb9, 0xe0, 0xa8, 0xbd, 0xd8, 0xb9, 0x9c,
-	0x81, 0x4c, 0x1f, 0x00, 0x12, 0xbf, 0xe4, 0x51, 0xa1, 0xf9, 0x1c, 0x85, 0x59, 0x0e, 0xe6, 0xce,
-	0x71, 0x0c, 0x32, 0x5d, 0x36, 0xdc, 0x0b, 0xfb, 0xda, 0xbe, 0x39, 0x19, 0xdf, 0xd2, 0xbf, 0xa4,
-	0x68, 0xff, 0xf6, 0xf4, 0x60, 0xf3, 0x71, 0x65, 0x2d, 0x8e, 0x62, 0x73, 0xdf, 0x1b, 0x3a, 0xee,
-	0x3e, 0x16, 0x66, 0x90, 0x22, 0x6f, 0x4c, 0xfc, 0x52, 0xea, 0x5f, 0x4d, 0x78, 0x29, 0xf5, 0x3f,
-	0x4d, 0xb8, 0xb9, 0xdf, 0x98, 0xec, 0x63, 0x75, 0x26, 0xd3, 0xd5, 0xa6, 0x22, 0xf6, 0xb6, 0x22,
-	0xf6, 0x67, 0x45, 0xec, 0xb7, 0x9a, 0x58, 0xdb, 0x9a, 0x58, 0xef, 0x35, 0xb1, 0x1e, 0x67, 0x42,
-	0xea, 0xa7, 0x22, 0xa4, 0x11, 0x28, 0x66, 0xe8, 0x77, 0x49, 0x10, 0xe2, 0x6e, 0x60, 0xeb, 0xf1,
-	0x84, 0x95, 0x3f, 0x9b, 0xde, 0x0d, 0x4c, 0xa1, 0xe8, 0x15, 0x1d, 0x1e, 0xb6, 0x85, 0x4c, 0xbe,
-	0x02, 0x00, 0x00, 0xff, 0xff, 0x78, 0xf9, 0x3d, 0x9f, 0x20, 0x02, 0x00, 0x00,
+	// 289 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x91, 0xc1, 0x4a, 0xf3, 0x40,
+	0x14, 0x85, 0x13, 0xf8, 0xf9, 0xd1, 0x28, 0x2e, 0x8a, 0x0b, 0x2d, 0x65, 0x94, 0xac, 0x44, 0x70,
+	0x86, 0xb6, 0x1b, 0xd7, 0x85, 0x6c, 0x0a, 0x05, 0xe9, 0xd2, 0x4d, 0x49, 0xd2, 0x61, 0x9c, 0x90,
+	0xc9, 0x8d, 0xb9, 0x37, 0x35, 0xbe, 0x85, 0x8f, 0xd5, 0x65, 0x97, 0xae, 0x44, 0x92, 0x17, 0x91,
+	0xb4, 0x53, 0x88, 0x50, 0xdd, 0xb8, 0x9b, 0xc3, 0xdc, 0x73, 0xce, 0x07, 0xc7, 0xbb, 0x07, 0x34,
+	0x80, 0x1a, 0x45, 0x0c, 0x68, 0x5e, 0x42, 0x34, 0x39, 0x40, 0x2a, 0x56, 0xc3, 0x48, 0x52, 0x38,
+	0x14, 0x06, 0x96, 0x32, 0x15, 0x54, 0x84, 0x19, 0x9a, 0x92, 0x64, 0xb1, 0x30, 0xa8, 0x90, 0xe7,
+	0x05, 0x10, 0xf4, 0x06, 0xd6, 0xc9, 0xbb, 0x4e, 0x6e, 0x9d, 0xfd, 0x73, 0x05, 0x0a, 0xb6, 0x87,
+	0xa2, 0x7d, 0xed, 0x3c, 0xfe, 0x99, 0x77, 0x1a, 0x98, 0x9c, 0x5e, 0xe7, 0xf2, 0xb9, 0x94, 0x48,
+	0x7e, 0xe2, 0x5d, 0x4e, 0x41, 0x67, 0x0f, 0x00, 0x69, 0x50, 0xc9, 0xb8, 0x24, 0x39, 0x43, 0x65,
+	0x3f, 0x7b, 0x33, 0xef, 0x38, 0x01, 0x9d, 0x2d, 0xda, 0xdc, 0x0b, 0xf7, 0xda, 0xbd, 0x39, 0x19,
+	0xdd, 0xf2, 0xdf, 0x4a, 0x79, 0x37, 0x7b, 0xf2, 0x6f, 0xfd, 0x71, 0xe5, 0xcc, 0x8f, 0x12, 0x9b,
+	0xef, 0x0f, 0xbc, 0xfe, 0xa1, 0x2e, 0xcc, 0x21, 0x43, 0xd9, 0x92, 0x04, 0x95, 0xa6, 0x1f, 0x49,
+	0x64, 0xa5, 0xe9, 0x8f, 0x24, 0xd2, 0xe6, 0xb7, 0x24, 0x87, 0xba, 0x76, 0x24, 0x93, 0xe5, 0xba,
+	0x66, 0xee, 0xa6, 0x66, 0xee, 0x67, 0xcd, 0xdc, 0xb7, 0x86, 0x39, 0x9b, 0x86, 0x39, 0xef, 0x0d,
+	0x73, 0x1e, 0xa7, 0x4a, 0xd3, 0x53, 0x19, 0xf1, 0x18, 0x8c, 0xb0, 0xed, 0x77, 0x69, 0x18, 0xe1,
+	0x5e, 0x88, 0xd5, 0x68, 0x2c, 0xaa, 0xef, 0x4b, 0xee, 0x85, 0x30, 0xa8, 0x3a, 0x43, 0x46, 0xff,
+	0xb7, 0x83, 0x8c, 0xbf, 0x02, 0x00, 0x00, 0xff, 0xff, 0x6d, 0xce, 0xc7, 0xac, 0x00, 0x02, 0x00,
+	0x00,
 }
 
 func (m *EmptyRequest) Marshal() (dAtA []byte, err error) {
diff --git a/x/cosmwasmpool/model/pool.pb.go b/x/cosmwasmpool/model/pool.pb.go
index 8cbd72a58d2..e47450cb4ad 100644
--- a/x/cosmwasmpool/model/pool.pb.go
+++ b/x/cosmwasmpool/model/pool.pb.go
@@ -8,7 +8,6 @@ import (
 	_ "github.com/cosmos/cosmos-proto"
 	_ "github.com/cosmos/gogoproto/gogoproto"
 	proto "github.com/cosmos/gogoproto/proto"
-	_ "google.golang.org/protobuf/types/known/timestamppb"
 	io "io"
 	math "math"
 	math_bits "math/bits"
@@ -89,29 +88,28 @@ func init() {
 }
 
 var fileDescriptor_a0cb64564a744af1 = []byte{
-	// 351 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x5c, 0x91, 0xcd, 0x4e, 0xf2, 0x40,
-	0x14, 0x86, 0x3b, 0xdf, 0x87, 0x18, 0x1b, 0x22, 0xda, 0x18, 0x41, 0x34, 0x2d, 0xe9, 0x8a, 0x0d,
-	0x9d, 0x20, 0x1b, 0xc3, 0x4e, 0x48, 0x4c, 0x58, 0x98, 0x98, 0x6e, 0x4c, 0xdc, 0x34, 0xd3, 0x1f,
-	0x6b, 0x93, 0x0e, 0x87, 0x70, 0x06, 0xd4, 0x3b, 0x70, 0xe9, 0xd2, 0x25, 0x17, 0xe1, 0x45, 0x18,
-	0x57, 0x2c, 0x5d, 0x11, 0x02, 0x77, 0xc0, 0x15, 0x98, 0xe9, 0x94, 0x04, 0xd9, 0xf5, 0x7d, 0xde,
-	0xa7, 0x99, 0x99, 0x73, 0xf4, 0x26, 0x20, 0x07, 0x4c, 0x90, 0x06, 0x80, 0xfc, 0x99, 0x21, 0x1f,
-	0x02, 0xa4, 0x74, 0xd2, 0xf2, 0x23, 0xc1, 0x5a, 0x94, 0x43, 0x18, 0xa5, 0x54, 0x22, 0x67, 0x38,
-	0x02, 0x01, 0xc6, 0x45, 0xae, 0x3b, 0xdb, 0xba, 0x93, 0xeb, 0xb5, 0xb3, 0x20, 0xab, 0xbd, 0xcc,
-	0xa5, 0x2a, 0xa8, 0x1f, 0x6b, 0x27, 0x31, 0xc4, 0xa0, 0xb8, 0xfc, 0xca, 0xa9, 0x15, 0x03, 0xc4,
-	0x69, 0x44, 0xb3, 0xe4, 0x8f, 0x1f, 0xa9, 0x48, 0x78, 0x84, 0x82, 0xf1, 0xa1, 0x12, 0xec, 0x05,
-	0xd1, 0x4b, 0x3d, 0x40, 0x7e, 0xcf, 0x90, 0xdf, 0x01, 0xa4, 0xc6, 0x8d, 0x7e, 0x14, 0xc0, 0x40,
-	0x8c, 0x58, 0x20, 0x3c, 0x16, 0x86, 0xa3, 0x08, 0xb1, 0x4a, 0xea, 0xa4, 0x71, 0xd0, 0x3d, 0x5f,
-	0xcf, 0xad, 0xca, 0x2b, 0xe3, 0x69, 0xc7, 0xde, 0x35, 0x6c, 0xb7, 0xbc, 0x41, 0xd7, 0x8a, 0x18,
-	0x15, 0x7d, 0x5f, 0x5e, 0xdd, 0x4b, 0xc2, 0xea, 0xbf, 0x3a, 0x69, 0x14, 0xdc, 0xa2, 0x8c, 0xfd,
-	0x50, 0x16, 0x01, 0x84, 0x91, 0x2c, 0xfe, 0xab, 0x42, 0xc6, 0x7e, 0x68, 0xf4, 0xf4, 0x72, 0x32,
-	0x40, 0xc1, 0x06, 0x22, 0x61, 0x22, 0xf2, 0x38, 0xc6, 0xd5, 0x42, 0x9d, 0x34, 0x4a, 0xdd, 0xda,
-	0x7a, 0x6e, 0x9d, 0xaa, 0x83, 0x77, 0x04, 0xdb, 0x3d, 0xdc, 0x22, 0xb7, 0x18, 0x77, 0x8e, 0xdf,
-	0xa6, 0x96, 0xf6, 0x31, 0xb5, 0xb4, 0xef, 0xcf, 0xe6, 0x9e, 0x7c, 0x50, 0xbf, 0xeb, 0x7e, 0x2d,
-	0x4d, 0x32, 0x5b, 0x9a, 0x64, 0xb1, 0x34, 0xc9, 0xfb, 0xca, 0xd4, 0x66, 0x2b, 0x53, 0xfb, 0x59,
-	0x99, 0xda, 0xc3, 0x55, 0x9c, 0x88, 0xa7, 0xb1, 0xef, 0x04, 0xc0, 0x69, 0x3e, 0xf7, 0x66, 0xca,
-	0x7c, 0xdc, 0x04, 0x3a, 0xb9, 0x6c, 0xd3, 0x97, 0xbf, 0x9b, 0xcb, 0x36, 0xe6, 0x17, 0xb3, 0xe9,
-	0xb5, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x0a, 0x7c, 0xb8, 0xca, 0xde, 0x01, 0x00, 0x00,
+	// 331 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xd2, 0xcd, 0x2f, 0xce, 0xcd,
+	0x2f, 0xce, 0x2c, 0xd6, 0x4f, 0xce, 0x2f, 0xce, 0x2d, 0x4f, 0x2c, 0xce, 0x2d, 0xc8, 0xcf, 0xcf,
+	0xd1, 0x2f, 0x33, 0x4c, 0x4a, 0x2d, 0x49, 0x34, 0xd4, 0xcf, 0xcd, 0x4f, 0x49, 0xcd, 0xd1, 0x07,
+	0x09, 0xe9, 0x15, 0x14, 0xe5, 0x97, 0xe4, 0x0b, 0xc9, 0x40, 0x95, 0xeb, 0x21, 0x2b, 0xd7, 0x83,
+	0x2a, 0x97, 0x92, 0x4c, 0x06, 0x4b, 0xc7, 0x83, 0xd5, 0xea, 0x43, 0x38, 0x10, 0x8d, 0x52, 0x22,
+	0xe9, 0xf9, 0xe9, 0xf9, 0x10, 0x71, 0x10, 0x0b, 0x22, 0xaa, 0xf4, 0x80, 0x91, 0x8b, 0xc7, 0x39,
+	0xbf, 0x38, 0x37, 0x3c, 0xb1, 0x38, 0x37, 0x20, 0x3f, 0x3f, 0x47, 0xc8, 0x8d, 0x4b, 0x20, 0x39,
+	0x3f, 0xaf, 0xa4, 0x28, 0x31, 0xb9, 0x24, 0x3e, 0x31, 0x25, 0xa5, 0x28, 0xb5, 0xb8, 0x58, 0x82,
+	0x51, 0x81, 0x51, 0x83, 0xd3, 0x49, 0xfa, 0xd3, 0x3d, 0x79, 0xf1, 0xca, 0xc4, 0xdc, 0x1c, 0x2b,
+	0x25, 0x74, 0x15, 0x4a, 0x41, 0xfc, 0x30, 0x21, 0x47, 0x88, 0x88, 0x90, 0x38, 0x17, 0x3b, 0xc8,
+	0x65, 0xf1, 0x99, 0x29, 0x12, 0x4c, 0x0a, 0x8c, 0x1a, 0x2c, 0x41, 0x6c, 0x20, 0xae, 0x67, 0x0a,
+	0x48, 0x22, 0x39, 0x3f, 0x25, 0x15, 0x24, 0xc1, 0x0c, 0x91, 0x00, 0x71, 0x3d, 0x53, 0x84, 0x9c,
+	0xb9, 0xf8, 0x33, 0xf3, 0x8a, 0x4b, 0x12, 0xf3, 0x4a, 0x32, 0x13, 0x4b, 0x52, 0xe3, 0x73, 0x8b,
+	0xd3, 0x25, 0x58, 0x14, 0x18, 0x35, 0x78, 0x9c, 0xa4, 0x3e, 0xdd, 0x93, 0x17, 0x83, 0x58, 0x8c,
+	0xa6, 0x40, 0x29, 0x88, 0x0f, 0x49, 0xc4, 0xb7, 0x38, 0xdd, 0x4a, 0xb0, 0x63, 0x81, 0x3c, 0xc3,
+	0x8c, 0x05, 0xf2, 0x0c, 0xa7, 0xb6, 0xe8, 0xb2, 0x82, 0x3c, 0xe4, 0xe9, 0x14, 0x74, 0xe2, 0x91,
+	0x1c, 0xe3, 0x85, 0x47, 0x72, 0x8c, 0x0f, 0x1e, 0xc9, 0x31, 0x4e, 0x78, 0x2c, 0xc7, 0x70, 0xe1,
+	0xb1, 0x1c, 0xc3, 0x8d, 0xc7, 0x72, 0x0c, 0x51, 0x16, 0xe9, 0x99, 0x25, 0x19, 0xa5, 0x49, 0x7a,
+	0xc9, 0xf9, 0xb9, 0xfa, 0xd0, 0x60, 0xd5, 0xcd, 0x49, 0x4c, 0x2a, 0x86, 0x71, 0xf4, 0xcb, 0x8c,
+	0x8c, 0xf5, 0x2b, 0x50, 0x23, 0x06, 0x1c, 0x21, 0x49, 0x6c, 0xe0, 0xd0, 0x33, 0x06, 0x04, 0x00,
+	0x00, 0xff, 0xff, 0xb3, 0x39, 0xc5, 0xc3, 0xbd, 0x01, 0x00, 0x00,
 }
 
 func (m *CosmWasmPool) Marshal() (dAtA []byte, err error) {
diff --git a/x/cosmwasmpool/model/tx.pb.go b/x/cosmwasmpool/model/tx.pb.go
index 93ad91745e0..82973003760 100644
--- a/x/cosmwasmpool/model/tx.pb.go
+++ b/x/cosmwasmpool/model/tx.pb.go
@@ -6,7 +6,6 @@ package model
 import (
 	context "context"
 	fmt "fmt"
-	_ "github.com/cosmos/cosmos-sdk/types"
 	_ "github.com/cosmos/gogoproto/gogoproto"
 	grpc1 "github.com/cosmos/gogoproto/grpc"
 	proto "github.com/cosmos/gogoproto/proto"
@@ -145,31 +144,30 @@ func init() {
 }
 
 var fileDescriptor_2ff1ac8555d314d1 = []byte{
-	// 379 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x92, 0xcf, 0xaa, 0xd3, 0x40,
-	0x14, 0xc6, 0x3b, 0x2a, 0x29, 0x0e, 0x5a, 0x71, 0x50, 0x29, 0x41, 0x93, 0x12, 0x37, 0x95, 0x62,
-	0x86, 0xb6, 0x1b, 0xd1, 0x5d, 0xda, 0x4d, 0x17, 0x05, 0xc9, 0x46, 0x70, 0x53, 0x26, 0xc9, 0x10,
-	0x03, 0x99, 0x9c, 0x92, 0x33, 0xd6, 0xfa, 0x02, 0xae, 0xdd, 0xf8, 0x26, 0x3e, 0x84, 0xcb, 0x2e,
-	0x5d, 0x85, 0x4b, 0xfa, 0x06, 0x7d, 0x82, 0x4b, 0xfe, 0xf4, 0xde, 0xde, 0x4b, 0xb9, 0x8b, 0xbb,
-	0x3b, 0x39, 0xe7, 0xf7, 0x9d, 0x7c, 0x7c, 0x73, 0xe8, 0x08, 0x50, 0x01, 0x26, 0xc8, 0x43, 0x40,
-	0xf5, 0x43, 0xa0, 0x5a, 0x03, 0xa4, 0x7c, 0x33, 0x0e, 0xa4, 0x16, 0x63, 0xae, 0x20, 0x92, 0x29,
-	0xd7, 0x5b, 0x77, 0x9d, 0x83, 0x06, 0xf6, 0xba, 0x85, 0xdd, 0x53, 0xd8, 0x6d, 0x61, 0xf3, 0x45,
-	0x0c, 0x31, 0xd4, 0x20, 0xaf, 0xaa, 0x46, 0x63, 0x5a, 0x61, 0x2d, 0xe2, 0x81, 0x40, 0x79, 0xb5,
-	0x37, 0x84, 0x24, 0x6b, 0xe6, 0xce, 0x5f, 0x42, 0x5f, 0x2e, 0x31, 0x9e, 0xe5, 0x52, 0x68, 0x39,
-	0x03, 0x54, 0x5f, 0x04, 0xaa, 0xcf, 0x00, 0x29, 0x1b, 0xd1, 0x6e, 0x08, 0x91, 0x5c, 0x25, 0x51,
-	0x9f, 0x0c, 0xc8, 0xf0, 0x91, 0xc7, 0x0e, 0x85, 0xdd, 0xfb, 0x29, 0x54, 0xfa, 0xd1, 0x69, 0x07,
-	0x8e, 0x6f, 0x54, 0xd5, 0x22, 0x62, 0x33, 0xfa, 0x2c, 0xc9, 0x50, 0x8b, 0x4c, 0x27, 0x42, 0xcb,
-	0x95, 0xc2, 0xb8, 0xff, 0x60, 0x40, 0x86, 0x4f, 0x3c, 0xf3, 0x50, 0xd8, 0xaf, 0x1a, 0xd1, 0x2d,
-	0xc0, 0xf1, 0x7b, 0x27, 0x9d, 0x25, 0xc6, 0xec, 0x1d, 0x35, 0x50, 0x66, 0x91, 0xcc, 0xfb, 0x0f,
-	0x07, 0x64, 0xf8, 0xd8, 0x7b, 0x7e, 0x28, 0xec, 0xa7, 0x8d, 0xb6, 0xe9, 0x3b, 0x7e, 0x0b, 0x38,
-	0x73, 0xfa, 0xe6, 0xac, 0x6b, 0x5f, 0xe2, 0x1a, 0x32, 0x94, 0xec, 0x2d, 0xed, 0x56, 0xe9, 0x5c,
-	0xbb, 0xa7, 0x65, 0x61, 0x1b, 0x15, 0xb2, 0x98, 0xfb, 0x46, 0x35, 0x5a, 0x44, 0x93, 0x3f, 0x84,
-	0xd2, 0xe3, 0x1a, 0xc8, 0xd9, 0x2f, 0x42, 0xd9, 0x99, 0x20, 0xa6, 0xee, 0x5d, 0xb9, 0xbb, 0x67,
-	0x7d, 0x98, 0x9f, 0xee, 0x21, 0x3a, 0x9a, 0xf7, 0xfc, 0x7f, 0xa5, 0x45, 0x76, 0xa5, 0x45, 0x2e,
-	0x4a, 0x8b, 0xfc, 0xde, 0x5b, 0x9d, 0xdd, 0xde, 0xea, 0xfc, 0xdf, 0x5b, 0x9d, 0xaf, 0x1f, 0xe2,
-	0x44, 0x7f, 0xfb, 0x1e, 0xb8, 0x21, 0x28, 0xde, 0xfe, 0xe0, 0x7d, 0x2a, 0x02, 0x3c, 0x7e, 0xf0,
-	0xcd, 0x64, 0xca, 0xb7, 0x37, 0xaf, 0xa9, 0xbe, 0xa2, 0xc0, 0xa8, 0xdf, 0x7b, 0x7a, 0x19, 0x00,
-	0x00, 0xff, 0xff, 0x41, 0x56, 0x86, 0xd9, 0x72, 0x02, 0x00, 0x00,
+	// 363 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x92, 0xc1, 0x4a, 0xf3, 0x40,
+	0x10, 0xc7, 0xbb, 0xdf, 0x27, 0x29, 0x2e, 0x5a, 0x71, 0x51, 0x29, 0x45, 0x93, 0x12, 0x2f, 0x95,
+	0x62, 0x96, 0xb6, 0x17, 0xd1, 0x5b, 0xda, 0x4b, 0x0f, 0x05, 0xc9, 0x45, 0xf0, 0x52, 0x36, 0xcd,
+	0x12, 0x03, 0xd9, 0x4c, 0xc9, 0xae, 0xb5, 0xbe, 0x80, 0x67, 0x2f, 0xbe, 0x89, 0x0f, 0xe1, 0xb1,
+	0x47, 0x4f, 0x41, 0xd2, 0x37, 0xe8, 0x13, 0x48, 0x9a, 0x14, 0xab, 0x14, 0x0f, 0xde, 0x66, 0x67,
+	0x7e, 0xff, 0xdd, 0xff, 0xce, 0x0c, 0x6e, 0x82, 0x14, 0x20, 0x03, 0x49, 0x47, 0x20, 0xc5, 0x03,
+	0x93, 0x62, 0x0c, 0x10, 0xd2, 0x49, 0xcb, 0xe5, 0x8a, 0xb5, 0xa8, 0x00, 0x8f, 0x87, 0x54, 0x4d,
+	0xad, 0x71, 0x0c, 0x0a, 0xc8, 0x71, 0x01, 0x5b, 0xeb, 0xb0, 0x55, 0xc0, 0xb5, 0x03, 0x1f, 0x7c,
+	0x58, 0x82, 0x34, 0x8b, 0x72, 0x8d, 0xf9, 0x8a, 0xf0, 0xe1, 0x40, 0xfa, 0xdd, 0x98, 0x33, 0xc5,
+	0xbb, 0x20, 0xc5, 0x0d, 0x93, 0xe2, 0x1a, 0x20, 0x24, 0x4d, 0x5c, 0x1e, 0x81, 0xc7, 0x87, 0x81,
+	0x57, 0x45, 0x75, 0xd4, 0xd8, 0xb2, 0xc9, 0x22, 0x31, 0x2a, 0x8f, 0x4c, 0x84, 0x97, 0x66, 0x51,
+	0x30, 0x1d, 0x2d, 0x8b, 0xfa, 0x1e, 0xe9, 0xe2, 0xbd, 0x20, 0x92, 0x8a, 0x45, 0x2a, 0x60, 0x8a,
+	0x0f, 0x85, 0xf4, 0xab, 0xff, 0xea, 0xa8, 0xb1, 0x63, 0xd7, 0x16, 0x89, 0x71, 0x94, 0x8b, 0x7e,
+	0x00, 0xa6, 0x53, 0x59, 0xcb, 0x0c, 0xa4, 0x4f, 0xce, 0xb0, 0x26, 0x79, 0xe4, 0xf1, 0xb8, 0xfa,
+	0xbf, 0x8e, 0x1a, 0xdb, 0xf6, 0xfe, 0x22, 0x31, 0x76, 0x73, 0x6d, 0x9e, 0x37, 0x9d, 0x02, 0x30,
+	0x7b, 0xf8, 0x64, 0xa3, 0x6b, 0x87, 0xcb, 0x31, 0x44, 0x92, 0x93, 0x53, 0x5c, 0xce, 0x7e, 0xff,
+	0xe5, 0x1e, 0xa7, 0x89, 0xa1, 0x65, 0x48, 0xbf, 0xe7, 0x68, 0x59, 0xa9, 0xef, 0xb5, 0x5f, 0x10,
+	0xc6, 0xab, 0x6b, 0x20, 0x26, 0x4f, 0x08, 0x93, 0x0d, 0x8d, 0xe8, 0x58, 0xbf, 0xf5, 0xd5, 0xda,
+	0xe8, 0xa3, 0x76, 0xf5, 0x07, 0xd1, 0xca, 0xbc, 0xed, 0xbc, 0xa5, 0x3a, 0x9a, 0xa5, 0x3a, 0xfa,
+	0x48, 0x75, 0xf4, 0x3c, 0xd7, 0x4b, 0xb3, 0xb9, 0x5e, 0x7a, 0x9f, 0xeb, 0xa5, 0xdb, 0x0b, 0x3f,
+	0x50, 0x77, 0xf7, 0xae, 0x35, 0x02, 0x41, 0x8b, 0x07, 0xce, 0x43, 0xe6, 0xca, 0xd5, 0x81, 0x4e,
+	0xda, 0x1d, 0x3a, 0xfd, 0xbe, 0x2d, 0xcb, 0x2d, 0x71, 0xb5, 0xe5, 0xbc, 0x3b, 0x9f, 0x01, 0x00,
+	0x00, 0xff, 0xff, 0xfb, 0x9c, 0xe0, 0x76, 0x52, 0x02, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/x/cosmwasmpool/types/genesis.pb.go b/x/cosmwasmpool/types/genesis.pb.go
index 3f7a7c4a8a0..eef8497505f 100644
--- a/x/cosmwasmpool/types/genesis.pb.go
+++ b/x/cosmwasmpool/types/genesis.pb.go
@@ -7,10 +7,8 @@ import (
 	fmt "fmt"
 	_ "github.com/cosmos/cosmos-proto"
 	types "github.com/cosmos/cosmos-sdk/codec/types"
-	_ "github.com/cosmos/cosmos-sdk/types"
 	_ "github.com/cosmos/gogoproto/gogoproto"
 	proto "github.com/cosmos/gogoproto/proto"
-	_ "google.golang.org/protobuf/types/known/durationpb"
 	io "io"
 	math "math"
 	math_bits "math/bits"
@@ -90,27 +88,25 @@ func init() {
 }
 
 var fileDescriptor_8fd7fc7fdf8fd2f4 = []byte{
-	// 307 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x8f, 0xb1, 0x4e, 0xeb, 0x30,
-	0x14, 0x86, 0xe3, 0x7b, 0x69, 0x25, 0x52, 0xa6, 0xaa, 0x43, 0xa9, 0x90, 0xa9, 0x10, 0x43, 0x41,
-	0xaa, 0xad, 0xa6, 0x42, 0x62, 0x25, 0x0b, 0x62, 0xab, 0xc2, 0xc6, 0x82, 0xec, 0x60, 0x4c, 0xa4,
-	0x24, 0x27, 0x8a, 0x9d, 0x42, 0x1e, 0x81, 0x8d, 0x87, 0xe1, 0x21, 0x2a, 0xa6, 0x8e, 0x4c, 0x08,
-	0x25, 0x2f, 0x82, 0x1a, 0x3b, 0x08, 0x18, 0xba, 0xf9, 0xe8, 0xff, 0x7e, 0x9f, 0xf3, 0xb9, 0xa7,
-	0xa0, 0x12, 0x50, 0x91, 0xa2, 0x21, 0xa8, 0xe4, 0x91, 0xa9, 0x24, 0x03, 0x88, 0xe9, 0x72, 0xc6,
-	0x85, 0x66, 0x33, 0x2a, 0x45, 0x2a, 0x54, 0xa4, 0x48, 0x96, 0x83, 0x86, 0xfe, 0x81, 0x65, 0xc9,
-	0x4f, 0x96, 0x58, 0x76, 0x34, 0x90, 0x20, 0xa1, 0x01, 0xe9, 0xe6, 0x65, 0x3a, 0xa3, 0x7d, 0x09,
-	0x20, 0x63, 0x41, 0x9b, 0x89, 0x17, 0xf7, 0x94, 0xa5, 0x65, 0x1b, 0x85, 0xcd, 0x7f, 0xb7, 0xa6,
-	0x63, 0x06, 0x1b, 0xe1, 0xbf, 0xad, 0xbb, 0x22, 0x67, 0x3a, 0x82, 0xb4, 0xcd, 0x0d, 0x4d, 0x39,
-	0x53, 0xe2, 0xfb, 0xd8, 0x10, 0xa2, 0x36, 0x3f, 0xd9, 0x6a, 0x95, 0xb1, 0x9c, 0x25, 0x76, 0xd5,
-	0xd1, 0x33, 0x72, 0xf7, 0x2e, 0x8d, 0xe6, 0xb5, 0x66, 0x5a, 0xf4, 0x7d, 0xb7, 0x6b, 0x80, 0x21,
-	0x1a, 0xa3, 0x49, 0xcf, 0x3b, 0x26, 0xdb, 0xb4, 0xc9, 0xa2, 0x61, 0xfd, 0x9d, 0xd5, 0xc7, 0xa1,
-	0x13, 0xd8, 0x66, 0xff, 0xcc, 0xed, 0x6c, 0x20, 0x35, 0xfc, 0x37, 0xfe, 0x3f, 0xe9, 0x79, 0x03,
-	0x62, 0x7c, 0x48, 0xeb, 0x43, 0x2e, 0xd2, 0xd2, 0xdf, 0x7d, 0x7b, 0x9d, 0x76, 0x16, 0x00, 0xf1,
-	0x55, 0x60, 0x68, 0x3f, 0x58, 0x55, 0x18, 0xad, 0x2b, 0x8c, 0x3e, 0x2b, 0x8c, 0x5e, 0x6a, 0xec,
-	0xac, 0x6b, 0xec, 0xbc, 0xd7, 0xd8, 0xb9, 0x39, 0x97, 0x91, 0x7e, 0x28, 0x38, 0x09, 0x21, 0xa1,
-	0xf6, 0x9c, 0x69, 0xcc, 0xb8, 0x6a, 0x07, 0xba, 0xf4, 0xe6, 0xf4, 0xe9, 0xb7, 0xae, 0x2e, 0x33,
-	0xa1, 0x78, 0xb7, 0xd9, 0x39, 0xff, 0x0a, 0x00, 0x00, 0xff, 0xff, 0x02, 0x36, 0x1b, 0x96, 0xe9,
-	0x01, 0x00, 0x00,
+	// 283 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xd2, 0xca, 0x2f, 0xce, 0xcd,
+	0x2f, 0xce, 0x2c, 0xd6, 0x4f, 0xce, 0x2f, 0xce, 0x2d, 0x4f, 0x2c, 0xce, 0x2d, 0xc8, 0xcf, 0xcf,
+	0xd1, 0x2f, 0x33, 0x4c, 0x4a, 0x2d, 0x49, 0x34, 0xd4, 0x4f, 0x4f, 0xcd, 0x4b, 0x2d, 0xce, 0x2c,
+	0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x92, 0x81, 0xaa, 0xd5, 0x43, 0x56, 0xab, 0x07, 0x55,
+	0x2b, 0x25, 0x92, 0x9e, 0x9f, 0x9e, 0x0f, 0x56, 0xa8, 0x0f, 0x62, 0x41, 0xf4, 0x48, 0x49, 0xa6,
+	0xe7, 0xe7, 0xa7, 0xe7, 0xa4, 0xea, 0x83, 0x79, 0x49, 0xa5, 0x69, 0xfa, 0x89, 0x79, 0x95, 0x30,
+	0xa9, 0x64, 0xb0, 0x79, 0xf1, 0x10, 0x3d, 0x10, 0x0e, 0x54, 0x4a, 0x13, 0xaf, 0xab, 0x0a, 0x12,
+	0x8b, 0x12, 0x73, 0xa1, 0x4a, 0x95, 0x3a, 0x19, 0xb9, 0x78, 0xdc, 0x21, 0xce, 0x0c, 0x2e, 0x49,
+	0x2c, 0x49, 0x15, 0x72, 0xe2, 0x62, 0x83, 0x28, 0x90, 0x60, 0x54, 0x60, 0xd4, 0xe0, 0x36, 0x52,
+	0xd1, 0xc3, 0xe7, 0x6c, 0xbd, 0x00, 0xb0, 0x5a, 0x27, 0x96, 0x13, 0xf7, 0xe4, 0x19, 0x82, 0xa0,
+	0x3a, 0x85, 0x4c, 0xb9, 0x58, 0x41, 0x8a, 0x8a, 0x25, 0x98, 0x14, 0x98, 0x35, 0xb8, 0x8d, 0x44,
+	0xf4, 0x20, 0xbe, 0xd0, 0x83, 0xf9, 0x42, 0xcf, 0x31, 0xaf, 0xd2, 0x89, 0xf3, 0xd4, 0x16, 0x5d,
+	0xd6, 0x80, 0xfc, 0xfc, 0x1c, 0xcf, 0x20, 0x88, 0x6a, 0xa7, 0xa0, 0x13, 0x8f, 0xe4, 0x18, 0x2f,
+	0x3c, 0x92, 0x63, 0x7c, 0xf0, 0x48, 0x8e, 0x71, 0xc2, 0x63, 0x39, 0x86, 0x0b, 0x8f, 0xe5, 0x18,
+	0x6e, 0x3c, 0x96, 0x63, 0x88, 0xb2, 0x48, 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf,
+	0xd5, 0x87, 0x3a, 0x47, 0x37, 0x27, 0x31, 0xa9, 0x18, 0xc6, 0xd1, 0x2f, 0x33, 0x32, 0xd6, 0xaf,
+	0x40, 0xf5, 0x6e, 0x49, 0x65, 0x41, 0x6a, 0x71, 0x12, 0x1b, 0xd8, 0x4e, 0x63, 0x40, 0x00, 0x00,
+	0x00, 0xff, 0xff, 0xac, 0x98, 0xd5, 0x29, 0xa9, 0x01, 0x00, 0x00,
 }
 
 func (m *GenesisState) Marshal() (dAtA []byte, err error) {
diff --git a/x/cosmwasmpool/types/params.pb.go b/x/cosmwasmpool/types/params.pb.go
index 1aa4ca378fd..ac88bbfd133 100644
--- a/x/cosmwasmpool/types/params.pb.go
+++ b/x/cosmwasmpool/types/params.pb.go
@@ -5,10 +5,8 @@ package types
 
 import (
 	fmt "fmt"
-	_ "github.com/cosmos/cosmos-proto"
 	_ "github.com/cosmos/gogoproto/gogoproto"
 	proto "github.com/cosmos/gogoproto/proto"
-	_ "google.golang.org/protobuf/types/known/durationpb"
 	io "io"
 	math "math"
 	math_bits "math/bits"
@@ -92,26 +90,24 @@ func init() {
 }
 
 var fileDescriptor_6cf69242a2b5e68e = []byte{
-	// 299 bytes of a gzipped FileDescriptorProto
+	// 267 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xd2, 0xcc, 0x2f, 0xce, 0xcd,
 	0x2f, 0xce, 0x2c, 0xd6, 0x4f, 0xce, 0x2f, 0xce, 0x2d, 0x4f, 0x2c, 0xce, 0x2d, 0xc8, 0xcf, 0xcf,
 	0xd1, 0x2f, 0x33, 0x4c, 0x4a, 0x2d, 0x49, 0x34, 0xd4, 0x2f, 0x48, 0x2c, 0x4a, 0xcc, 0x2d, 0xd6,
 	0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x92, 0x81, 0x2a, 0xd5, 0x43, 0x56, 0xaa, 0x07, 0x55, 0x2a,
-	0x25, 0x92, 0x9e, 0x9f, 0x9e, 0x0f, 0x56, 0xa8, 0x0f, 0x62, 0x41, 0xf4, 0x48, 0x49, 0x26, 0x83,
-	0x35, 0xc5, 0x43, 0x24, 0x20, 0x1c, 0xa8, 0x94, 0x5c, 0x7a, 0x7e, 0x7e, 0x7a, 0x4e, 0xaa, 0x3e,
-	0x98, 0x97, 0x54, 0x9a, 0xa6, 0x9f, 0x52, 0x5a, 0x94, 0x58, 0x92, 0x99, 0x9f, 0x07, 0x91, 0x57,
-	0x5a, 0xca, 0xc8, 0xc5, 0x16, 0x00, 0xb6, 0x5f, 0xc8, 0x83, 0x4b, 0x30, 0x39, 0x3f, 0x25, 0x35,
-	0x3e, 0x33, 0x25, 0xbe, 0x3c, 0x23, 0xb3, 0x24, 0x35, 0x27, 0xb3, 0xb8, 0x44, 0x82, 0x51, 0x81,
-	0x59, 0x83, 0xc5, 0x49, 0xe6, 0xd3, 0x3d, 0x79, 0x89, 0xca, 0xc4, 0xdc, 0x1c, 0x2b, 0x25, 0x0c,
-	0x25, 0x4a, 0x41, 0xfc, 0x20, 0x31, 0xcf, 0x94, 0x70, 0x98, 0x88, 0x50, 0x20, 0x97, 0x08, 0xc8,
-	0xd5, 0xf1, 0xb9, 0x99, 0xe9, 0x10, 0xcb, 0xe2, 0x73, 0x32, 0x73, 0x33, 0x4b, 0x24, 0x98, 0x14,
-	0x18, 0x35, 0x58, 0x9c, 0xe4, 0x3f, 0xdd, 0x93, 0x97, 0x86, 0x18, 0x86, 0x4d, 0x95, 0x52, 0x90,
-	0x10, 0x48, 0xd8, 0x17, 0x26, 0xea, 0x03, 0x12, 0x74, 0x0a, 0x3a, 0xf1, 0x48, 0x8e, 0xf1, 0xc2,
-	0x23, 0x39, 0xc6, 0x07, 0x8f, 0xe4, 0x18, 0x27, 0x3c, 0x96, 0x63, 0xb8, 0xf0, 0x58, 0x8e, 0xe1,
-	0xc6, 0x63, 0x39, 0x86, 0x28, 0x8b, 0xf4, 0xcc, 0x92, 0x8c, 0xd2, 0x24, 0xbd, 0xe4, 0xfc, 0x5c,
-	0x7d, 0x68, 0xd8, 0xe9, 0xe6, 0x24, 0x26, 0x15, 0xc3, 0x38, 0xfa, 0x65, 0x46, 0xc6, 0xfa, 0x15,
-	0xa8, 0x21, 0x5f, 0x52, 0x59, 0x90, 0x5a, 0x9c, 0xc4, 0x06, 0x0e, 0x02, 0x63, 0x40, 0x00, 0x00,
-	0x00, 0xff, 0xff, 0x66, 0xe2, 0x7e, 0x69, 0x9e, 0x01, 0x00, 0x00,
+	0x25, 0x92, 0x9e, 0x9f, 0x9e, 0x0f, 0x56, 0xa8, 0x0f, 0x62, 0x41, 0xf4, 0x28, 0x2d, 0x65, 0xe4,
+	0x62, 0x0b, 0x00, 0x1b, 0x22, 0xe4, 0xc1, 0x25, 0x98, 0x9c, 0x9f, 0x92, 0x1a, 0x9f, 0x99, 0x12,
+	0x5f, 0x9e, 0x91, 0x59, 0x92, 0x9a, 0x93, 0x59, 0x5c, 0x22, 0xc1, 0xa8, 0xc0, 0xac, 0xc1, 0xe2,
+	0x24, 0xf3, 0xe9, 0x9e, 0xbc, 0x44, 0x65, 0x62, 0x6e, 0x8e, 0x95, 0x12, 0x86, 0x12, 0xa5, 0x20,
+	0x7e, 0x90, 0x98, 0x67, 0x4a, 0x38, 0x4c, 0x44, 0x28, 0x90, 0x4b, 0x04, 0x64, 0x75, 0x7c, 0x6e,
+	0x66, 0x7a, 0x51, 0x62, 0x49, 0x66, 0x7e, 0x5e, 0x7c, 0x4e, 0x66, 0x6e, 0x66, 0x89, 0x04, 0x93,
+	0x02, 0xa3, 0x06, 0x8b, 0x93, 0xfc, 0xa7, 0x7b, 0xf2, 0xd2, 0x10, 0xc3, 0xb0, 0xa9, 0x52, 0x0a,
+	0x12, 0x02, 0x09, 0xfb, 0xc2, 0x44, 0x7d, 0x40, 0x82, 0x4e, 0x41, 0x27, 0x1e, 0xc9, 0x31, 0x5e,
+	0x78, 0x24, 0xc7, 0xf8, 0xe0, 0x91, 0x1c, 0xe3, 0x84, 0xc7, 0x72, 0x0c, 0x17, 0x1e, 0xcb, 0x31,
+	0xdc, 0x78, 0x2c, 0xc7, 0x10, 0x65, 0x91, 0x9e, 0x59, 0x92, 0x51, 0x9a, 0xa4, 0x97, 0x9c, 0x9f,
+	0xab, 0x0f, 0x0d, 0x00, 0xdd, 0x9c, 0xc4, 0xa4, 0x62, 0x18, 0x47, 0xbf, 0xcc, 0xc8, 0x58, 0xbf,
+	0x02, 0x35, 0xf8, 0x4a, 0x2a, 0x0b, 0x52, 0x8b, 0x93, 0xd8, 0xc0, 0x41, 0x60, 0x0c, 0x08, 0x00,
+	0x00, 0xff, 0xff, 0xd0, 0x47, 0xd6, 0x73, 0x63, 0x01, 0x00, 0x00,
 }
 
 func (m *Params) Marshal() (dAtA []byte, err error) {
diff --git a/x/cosmwasmpool/types/tx.pb.go b/x/cosmwasmpool/types/tx.pb.go
index 009721a21ef..2450faba5c3 100644
--- a/x/cosmwasmpool/types/tx.pb.go
+++ b/x/cosmwasmpool/types/tx.pb.go
@@ -6,8 +6,6 @@ package types
 import (
 	context "context"
 	fmt "fmt"
-	_ "github.com/cosmos/cosmos-sdk/types"
-	_ "github.com/cosmos/gogoproto/gogoproto"
 	grpc1 "github.com/cosmos/gogoproto/grpc"
 	proto "github.com/cosmos/gogoproto/proto"
 	grpc "google.golang.org/grpc"
@@ -30,19 +28,17 @@ func init() {
 }
 
 var fileDescriptor_93020a1fe95e1be8 = []byte{
-	// 179 bytes of a gzipped FileDescriptorProto
+	// 148 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0xcd, 0x2f, 0xce, 0xcd,
 	0x2f, 0xce, 0x2c, 0xd6, 0x4f, 0xce, 0x2f, 0xce, 0x2d, 0x4f, 0x2c, 0xce, 0x2d, 0xc8, 0xcf, 0xcf,
 	0xd1, 0x2f, 0x33, 0x4c, 0x4a, 0x2d, 0x49, 0x34, 0xd4, 0x2f, 0xa9, 0xd0, 0x2b, 0x28, 0xca, 0x2f,
-	0xc9, 0x17, 0x92, 0x81, 0x2a, 0xd3, 0x43, 0x56, 0xa6, 0x07, 0x55, 0x26, 0x25, 0x92, 0x9e, 0x9f,
-	0x9e, 0x0f, 0x56, 0xa8, 0x0f, 0x62, 0x41, 0xf4, 0x48, 0xc9, 0x25, 0x83, 0x35, 0xe9, 0x27, 0x25,
-	0x16, 0xa7, 0xc2, 0x4d, 0x4c, 0xce, 0xcf, 0xcc, 0x83, 0xc8, 0x1b, 0xb1, 0x72, 0x31, 0xfb, 0x16,
-	0xa7, 0x3b, 0x05, 0x9d, 0x78, 0x24, 0xc7, 0x78, 0xe1, 0x91, 0x1c, 0xe3, 0x83, 0x47, 0x72, 0x8c,
-	0x13, 0x1e, 0xcb, 0x31, 0x5c, 0x78, 0x2c, 0xc7, 0x70, 0xe3, 0xb1, 0x1c, 0x43, 0x94, 0x45, 0x7a,
-	0x66, 0x49, 0x46, 0x69, 0x92, 0x5e, 0x72, 0x7e, 0xae, 0x3e, 0xd4, 0x7e, 0xdd, 0x9c, 0xc4, 0xa4,
-	0x62, 0x18, 0x47, 0xbf, 0xcc, 0xc8, 0x58, 0xbf, 0x02, 0xd5, 0xe5, 0x25, 0x95, 0x05, 0xa9, 0xc5,
-	0x49, 0x6c, 0x60, 0x1b, 0x8c, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0x1d, 0xb7, 0x19, 0xeb, 0xde,
-	0x00, 0x00, 0x00,
+	0xc9, 0x17, 0x92, 0x81, 0x2a, 0xd3, 0x43, 0x56, 0xa6, 0x07, 0x55, 0x66, 0xc4, 0xca, 0xc5, 0xec,
+	0x5b, 0x9c, 0xee, 0x14, 0x74, 0xe2, 0x91, 0x1c, 0xe3, 0x85, 0x47, 0x72, 0x8c, 0x0f, 0x1e, 0xc9,
+	0x31, 0x4e, 0x78, 0x2c, 0xc7, 0x70, 0xe1, 0xb1, 0x1c, 0xc3, 0x8d, 0xc7, 0x72, 0x0c, 0x51, 0x16,
+	0xe9, 0x99, 0x25, 0x19, 0xa5, 0x49, 0x7a, 0xc9, 0xf9, 0xb9, 0xfa, 0x50, 0x93, 0x74, 0x73, 0x12,
+	0x93, 0x8a, 0x61, 0x1c, 0xfd, 0x32, 0x23, 0x63, 0xfd, 0x0a, 0x54, 0x37, 0x94, 0x54, 0x16, 0xa4,
+	0x16, 0x27, 0xb1, 0x81, 0xed, 0x37, 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, 0x8a, 0xa7, 0x4f, 0x59,
+	0xa8, 0x00, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/x/downtime-detector/types/downtime_duration.pb.go b/x/downtime-detector/types/downtime_duration.pb.go
index 963545852d6..f71097b164a 100644
--- a/x/downtime-detector/types/downtime_duration.pb.go
+++ b/x/downtime-detector/types/downtime_duration.pb.go
@@ -5,12 +5,7 @@ package types
 
 import (
 	fmt "fmt"
-	_ "github.com/cosmos/cosmos-proto"
-	_ "github.com/cosmos/cosmos-sdk/codec/types"
-	_ "github.com/cosmos/gogoproto/gogoproto"
 	proto "github.com/cosmos/gogoproto/proto"
-	_ "google.golang.org/protobuf/types/known/durationpb"
-	_ "google.golang.org/protobuf/types/known/timestamppb"
 	math "math"
 )
 
@@ -128,30 +123,26 @@ func init() {
 }
 
 var fileDescriptor_0e46a3f710ad43a8 = []byte{
-	// 386 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x5c, 0x92, 0x3d, 0x6f, 0xe2, 0x40,
-	0x10, 0x86, 0xed, 0xe3, 0x8e, 0xe3, 0x0c, 0x1c, 0x83, 0x8f, 0xfb, 0xa2, 0xf0, 0x5d, 0x1d, 0x09,
-	0xaf, 0x3f, 0x00, 0x91, 0x22, 0x45, 0x22, 0x8a, 0x4d, 0xb1, 0x89, 0x94, 0x0f, 0x45, 0x4a, 0x63,
-	0xd9, 0xe0, 0x38, 0x96, 0x30, 0x8b, 0xf0, 0x42, 0xc2, 0xbf, 0xc8, 0x6f, 0x4a, 0x95, 0x92, 0x32,
-	0x65, 0x04, 0x7f, 0x24, 0xc2, 0x36, 0x8e, 0xc6, 0x9d, 0xe7, 0x99, 0x79, 0xbd, 0xef, 0x3b, 0x1a,
-	0x65, 0xc0, 0xe3, 0x88, 0xc7, 0x61, 0x4c, 0xc6, 0xfc, 0x61, 0x2a, 0xc2, 0xc8, 0x1f, 0xfb, 0xc2,
-	0x1f, 0x09, 0x3e, 0x27, 0x4b, 0xd3, 0xf3, 0x85, 0x6b, 0xe6, 0x0d, 0x67, 0xbc, 0x98, 0xbb, 0x22,
-	0xe4, 0x53, 0x7d, 0x36, 0xe7, 0x82, 0xab, 0xff, 0x33, 0xa5, 0x5e, 0x54, 0xea, 0x99, 0xb2, 0xdd,
-	0x0a, 0x78, 0xc0, 0x93, 0x61, 0xb2, 0xfb, 0x4a, 0x75, 0xed, 0xbf, 0x01, 0xe7, 0xc1, 0xc4, 0x27,
-	0x49, 0xe5, 0x2d, 0xee, 0x88, 0x3b, 0x5d, 0xed, 0x5b, 0xa3, 0xe4, 0x9f, 0x4e, 0xaa, 0x49, 0x8b,
-	0xac, 0xa5, 0x15, 0x55, 0xd8, 0x4d, 0xfb, 0x5f, 0xb1, 0xbf, 0x73, 0x14, 0x0b, 0x37, 0x9a, 0xa5,
-	0x03, 0x07, 0xcf, 0x25, 0xa5, 0x32, 0xcc, 0x9c, 0xaa, 0xa0, 0xd4, 0x86, 0xd7, 0x17, 0xc7, 0x57,
-	0xa7, 0xe7, 0x67, 0x8e, 0x6d, 0x5c, 0x82, 0xa4, 0x36, 0x94, 0x6a, 0x4e, 0x4c, 0x06, 0x32, 0x02,
-	0x16, 0x83, 0x4f, 0x08, 0xd8, 0x0c, 0x4a, 0x08, 0x74, 0x19, 0x7c, 0x46, 0xa0, 0xc7, 0xe0, 0x0b,
-	0x7a, 0xc6, 0x34, 0x18, 0x94, 0x11, 0xb1, 0x0c, 0x06, 0x5f, 0x0b, 0x56, 0x18, 0x54, 0x10, 0xe9,
-	0x1a, 0x0c, 0xbe, 0x21, 0xd2, 0x33, 0x18, 0x28, 0xd8, 0x2e, 0x85, 0xaa, 0xda, 0x54, 0xea, 0x1f,
-	0xc0, 0xe9, 0x51, 0xa8, 0xe1, 0x04, 0x14, 0xea, 0x68, 0xc6, 0xda, 0xcd, 0x7c, 0xc7, 0xa1, 0x28,
-	0x34, 0x70, 0x28, 0x0a, 0x80, 0x43, 0x51, 0x68, 0x22, 0xd0, 0xa7, 0xa0, 0x22, 0x70, 0x48, 0xe1,
-	0x07, 0x8e, 0x6d, 0x51, 0x68, 0x61, 0x32, 0xa0, 0xf0, 0x13, 0x2f, 0xa2, 0x4b, 0xe1, 0x17, 0x5e,
-	0x44, 0x9f, 0xc2, 0x6f, 0xbc, 0x88, 0x01, 0x85, 0x3f, 0x27, 0x37, 0x2f, 0x1b, 0x4d, 0x5e, 0x6f,
-	0x34, 0xf9, 0x6d, 0xa3, 0xc9, 0x4f, 0x5b, 0x4d, 0x5a, 0x6f, 0x35, 0xe9, 0x75, 0xab, 0x49, 0xb7,
-	0x47, 0x41, 0x28, 0xee, 0x17, 0x9e, 0x3e, 0xe2, 0x11, 0xc9, 0x0e, 0xb3, 0x33, 0x71, 0xbd, 0x78,
-	0x5f, 0x90, 0xa5, 0x65, 0x93, 0xc7, 0xfc, 0x98, 0x3b, 0xf9, 0x99, 0x8b, 0xd5, 0xcc, 0x8f, 0xbd,
-	0x72, 0x72, 0x24, 0xf6, 0x7b, 0x00, 0x00, 0x00, 0xff, 0xff, 0xc4, 0x2e, 0xa0, 0x2e, 0x0f, 0x03,
-	0x00, 0x00,
+	// 326 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x5c, 0x92, 0xcb, 0x4e, 0xf2, 0x50,
+	0x14, 0x85, 0xdb, 0x9f, 0x5f, 0xc4, 0x02, 0xb2, 0xa8, 0xd7, 0x51, 0xe3, 0xd8, 0x84, 0x5e, 0x81,
+	0xe0, 0xc0, 0x81, 0x86, 0xc1, 0x76, 0x70, 0x34, 0xf1, 0x12, 0x13, 0x27, 0x84, 0x42, 0xa3, 0x4d,
+	0x84, 0x43, 0xe8, 0x01, 0xf5, 0x2d, 0x7c, 0x26, 0x47, 0x0e, 0x19, 0x3a, 0x34, 0xf4, 0x45, 0x8c,
+	0xa6, 0xd6, 0x6c, 0x86, 0xe7, 0xdb, 0x7b, 0xe5, 0xec, 0xb5, 0xb2, 0x8c, 0x8e, 0x4c, 0x46, 0x32,
+	0x89, 0x13, 0x67, 0x28, 0x9f, 0xc6, 0x2a, 0x1e, 0x45, 0xc3, 0x48, 0x45, 0x03, 0x25, 0xa7, 0xce,
+	0xdc, 0x0b, 0x23, 0xd5, 0xf7, 0xf2, 0x41, 0x6f, 0x38, 0x9b, 0xf6, 0x55, 0x2c, 0xc7, 0xf6, 0x64,
+	0x2a, 0x95, 0x34, 0x0f, 0x32, 0xa5, 0xbd, 0xaa, 0xb4, 0x33, 0xe5, 0xe1, 0x5b, 0xc1, 0x28, 0x75,
+	0xb3, 0xa1, 0x09, 0xa3, 0xd2, 0xbd, 0xb9, 0x3c, 0xb9, 0x3e, 0xbb, 0x38, 0xef, 0x05, 0xee, 0x15,
+	0x34, 0xb3, 0x66, 0x94, 0x73, 0xe2, 0x09, 0xe8, 0x0c, 0xf8, 0x02, 0xff, 0x18, 0x08, 0x04, 0x0a,
+	0x0c, 0x34, 0x05, 0xfe, 0x33, 0xd0, 0x12, 0x58, 0x63, 0xdf, 0x78, 0xae, 0x40, 0x91, 0x11, 0xdf,
+	0x15, 0x58, 0x5f, 0x39, 0x45, 0xa0, 0xc4, 0x48, 0xd3, 0x15, 0xd8, 0x60, 0xa4, 0xe5, 0x0a, 0x18,
+	0xfc, 0x5c, 0x42, 0xd9, 0xac, 0x1b, 0xd5, 0x3f, 0xd0, 0x6b, 0x11, 0x2a, 0xdc, 0x01, 0xa1, 0xca,
+	0x76, 0xfc, 0xef, 0x9d, 0x4d, 0x6e, 0x8a, 0x50, 0xe3, 0xa6, 0x08, 0xe0, 0xa6, 0x08, 0x75, 0x06,
+	0xda, 0x04, 0x93, 0x81, 0x23, 0xc2, 0x16, 0xb7, 0xed, 0x13, 0xb6, 0x39, 0xe9, 0x10, 0x76, 0x78,
+	0x10, 0x4d, 0xc2, 0x2e, 0x0f, 0xa2, 0x4d, 0xd8, 0xe3, 0x41, 0x74, 0x08, 0xfb, 0xa7, 0xb7, 0xef,
+	0x4b, 0x4b, 0x5f, 0x2c, 0x2d, 0xfd, 0x73, 0x69, 0xe9, 0xaf, 0xa9, 0xa5, 0x2d, 0x52, 0x4b, 0xfb,
+	0x48, 0x2d, 0xed, 0xee, 0xf8, 0x3e, 0x56, 0x0f, 0xb3, 0xd0, 0x1e, 0xc8, 0x91, 0x93, 0x75, 0xa1,
+	0xf1, 0xd8, 0x0f, 0x93, 0xdf, 0x87, 0x33, 0xf7, 0x03, 0xe7, 0x39, 0xef, 0x4f, 0x23, 0x6f, 0x96,
+	0x7a, 0x99, 0x44, 0x49, 0x58, 0xfc, 0xa9, 0x51, 0xf0, 0x15, 0x00, 0x00, 0xff, 0xff, 0xae, 0x2b,
+	0x74, 0x5d, 0x82, 0x02, 0x00, 0x00,
 }
diff --git a/x/epochs/go.mod b/x/epochs/go.mod
index afbcd56ad61..6024353b7a1 100644
--- a/x/epochs/go.mod
+++ b/x/epochs/go.mod
@@ -9,7 +9,7 @@ require (
 	github.com/cosmos/gogoproto v1.4.11
 	github.com/golang/protobuf v1.5.3
 	github.com/grpc-ecosystem/grpc-gateway v1.16.0
-	github.com/osmosis-labs/osmosis/osmoutils v0.0.9-0.20240222004208-b602d1901059
+	github.com/osmosis-labs/osmosis/osmoutils v0.0.9-0.20240306055140-d7dfe8e8669e
 	github.com/spf13/cobra v1.8.0
 	github.com/stretchr/testify v1.8.4
 	golang.org/x/exp v0.0.0-20230905200255-921286631fa9
@@ -24,7 +24,7 @@ require (
 	cosmossdk.io/depinject v1.0.0-alpha.4 // indirect
 	cosmossdk.io/errors v1.0.1 // indirect
 	cosmossdk.io/log v1.3.0 // indirect
-	cosmossdk.io/math v1.2.0 // indirect
+	cosmossdk.io/math v1.2.1-0.20240219164559-72eae6dc50e4 // indirect
 	cosmossdk.io/tools/rosetta v0.2.1 // indirect
 	filippo.io/edwards25519 v1.0.0 // indirect
 	github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect
@@ -115,7 +115,7 @@ require (
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/mtibben/percent v0.2.1 // indirect
 	github.com/opencontainers/runc v1.1.12 // indirect
-	github.com/osmosis-labs/osmosis/osmomath v0.0.8 // indirect
+	github.com/osmosis-labs/osmosis/osmomath v0.0.9-0.20240306055140-d7dfe8e8669e // 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
@@ -157,11 +157,10 @@ require (
 	google.golang.org/genproto v0.0.0-20240102182953-50ed04b92917 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20240108191215-35c7eff3a6b1 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
-	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	nhooyr.io/websocket v1.8.7 // indirect
 	pgregory.net/rapid v0.5.5 // indirect
-	sigs.k8s.io/yaml v1.3.0 // indirect
+	sigs.k8s.io/yaml v1.4.0 // indirect
 )
 
 replace (
@@ -175,9 +174,9 @@ replace (
 	// v1.0.0-beta.3 is incompatible, so we use v1.0.0-beta.2
 	github.com/cosmos/cosmos-proto => github.com/cosmos/cosmos-proto v1.0.0-beta.2
 
-	// Our cosmos-sdk branch is: https://github.com/osmosis-labs/cosmos-sdk/tree/osmo-v23/v0.47.5-iavl-v1, current branch: osmo-v23/v0.47.5-iavl-v1. Direct commit link: https://github.com/osmosis-labs/cosmos-sdk/commit/d44a3847e089de47cbba0f31a0cebed64ad2806f
+	// Our cosmos-sdk branch is: https://github.com/osmosis-labs/cosmos-sdk/tree/osmo/v0.47.5, current branch: osmo/v0.47.5. Direct commit link: https://github.com/osmosis-labs/cosmos-sdk/commit/76d3c64545bad5bc930756eca88eacaed30f9f3e
 	// https://github.com/osmosis-labs/cosmos-sdk/releases/tag/v0.47.5-v23-osmo-1
-	github.com/cosmos/cosmos-sdk => github.com/osmosis-labs/cosmos-sdk v0.47.5-v23-osmo-2-iavl-v1
+	github.com/cosmos/cosmos-sdk => github.com/osmosis-labs/cosmos-sdk v0.47.6-0.20240309220415-76d3c64545ba
 	github.com/cosmos/gogoproto => github.com/cosmos/gogoproto v1.4.10
 	github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1
 
diff --git a/x/epochs/go.sum b/x/epochs/go.sum
index bd1ca2849e4..cd4cebc4e7e 100644
--- a/x/epochs/go.sum
+++ b/x/epochs/go.sum
@@ -527,8 +527,8 @@ cosmossdk.io/errors v1.0.1 h1:bzu+Kcr0kS/1DuPBtUFdWjzLqyUuCiyHjyJB6srBV/0=
 cosmossdk.io/errors v1.0.1/go.mod h1:MeelVSZThMi4bEakzhhhE/CKqVv3nOJDA25bIqRDu/U=
 cosmossdk.io/log v1.3.0 h1:L0Z0XstClo2kOU4h3V1iDoE5Ji64sg5HLOogzGg67Oo=
 cosmossdk.io/log v1.3.0/go.mod h1:HIDyvWLqZe2ovlWabsDN4aPMpY/nUEquAhgfTf2ZzB8=
-cosmossdk.io/math v1.2.0 h1:8gudhTkkD3NxOP2YyyJIYYmt6dQ55ZfJkDOaxXpy7Ig=
-cosmossdk.io/math v1.2.0/go.mod h1:l2Gnda87F0su8a/7FEKJfFdJrM0JZRXQaohlgJeyQh0=
+cosmossdk.io/math v1.2.1-0.20240219164559-72eae6dc50e4 h1:YVXqcsZcHmFWA2IPSqOFbOpmbEAm8gAsr5FmEV3kv5s=
+cosmossdk.io/math v1.2.1-0.20240219164559-72eae6dc50e4/go.mod h1:vnRTxewy+M7BtXBNFybkuhSH4WfedVAAnERHgVFhp3k=
 cosmossdk.io/tools/rosetta v0.2.1 h1:ddOMatOH+pbxWbrGJKRAawdBkPYLfKXutK9IETnjYxw=
 cosmossdk.io/tools/rosetta v0.2.1/go.mod h1:Pqdc1FdvkNV3LcNIkYWt2RQY6IP1ge6YWZk8MhhO9Hw=
 filippo.io/edwards25519 v1.0.0 h1:0wAIcmJUqRdI8IJ/3eGi5/HwXZWPujYXXlkrQogz0Ek=
@@ -1230,10 +1230,10 @@ github.com/osmosis-labs/cometbft v0.37.4-v23-osmo-2 h1:967/6vaO8l/eSzkB5rcCAZjxl
 github.com/osmosis-labs/cometbft v0.37.4-v23-osmo-2/go.mod h1:Cmg5Hp4sNpapm7j+x0xRyt2g0juQfmB752ous+pA0G8=
 github.com/osmosis-labs/cosmos-sdk v0.47.5-v23-osmo-2-iavl-v1 h1:znGVTrQKVV2bKzZPSvC+RwX7tu+hf+WUCkgPHWGOiEc=
 github.com/osmosis-labs/cosmos-sdk v0.47.5-v23-osmo-2-iavl-v1/go.mod h1:4WHIpz3iRefLvpqKD9oRNWD10AQbDt0tj6MmWcuY1QI=
-github.com/osmosis-labs/osmosis/osmomath v0.0.8 h1:jm6D5UgzQ0GQGtyFezs7tQRgwakf3cTBsE8oJIQdPZE=
-github.com/osmosis-labs/osmosis/osmomath v0.0.8/go.mod h1:4iPfmy6R0qbImLe5urBLS0thndfLxfmHOdnYboDS1Qo=
-github.com/osmosis-labs/osmosis/osmoutils v0.0.9-0.20240222004208-b602d1901059 h1:2PyAblTdr9l5GacEuQY/CitAAUdA60UH43qD9FChdXQ=
-github.com/osmosis-labs/osmosis/osmoutils v0.0.9-0.20240222004208-b602d1901059/go.mod h1:uClYVpeXbVKOHRA0n55kfP1jJz1lv66k+V5N0w/vi5M=
+github.com/osmosis-labs/osmosis/osmomath v0.0.9-0.20240306055140-d7dfe8e8669e h1:wMbjfdBY8T8dfiC/llpyvrTmZ+85eO3BVGTXFoGYP8Q=
+github.com/osmosis-labs/osmosis/osmomath v0.0.9-0.20240306055140-d7dfe8e8669e/go.mod h1:u3sHQAPLDss2DovMB/4SCkiau85jVGv6Vsp8L7kSCcM=
+github.com/osmosis-labs/osmosis/osmoutils v0.0.9-0.20240306055140-d7dfe8e8669e h1:fn4rXlW2Qp6Zga/1bBrXxUwZ5fF+HKX221TFxNTpkJ8=
+github.com/osmosis-labs/osmosis/osmoutils v0.0.9-0.20240306055140-d7dfe8e8669e/go.mod h1:c/lE4YlUAEGRszC+l0rSd5ypkzlgyx3FHDg8RZNwmYA=
 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=
@@ -2233,6 +2233,6 @@ rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4=
 rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
 rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
 sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
-sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
-sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8=
+sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=
+sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=
 sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod h1:hI742Nqp5OhwiqlzhgfbWU4mW4yO10fP+LoT9WOswdU=
diff --git a/x/gamm/pool-models/balancer/amm.go b/x/gamm/pool-models/balancer/amm.go
index 9f53d5c9a51..ef4b44098af 100644
--- a/x/gamm/pool-models/balancer/amm.go
+++ b/x/gamm/pool-models/balancer/amm.go
@@ -107,8 +107,8 @@ func solveConstantFunctionInvariant(
 
 	// amountY = balanceY * (1 - (y ^ weightRatio))
 	yToWeightRatio := osmomath.Pow(y, weightRatio)
-	paranthetical := osmomath.OneDec().Sub(yToWeightRatio)
-	amountY := tokenBalanceUnknownBefore.Mul(paranthetical)
+	paranthetical := oneDec.Sub(yToWeightRatio)
+	amountY := paranthetical.MulMut(tokenBalanceUnknownBefore)
 	return amountY
 }
 
diff --git a/x/gamm/pool-models/balancer/constants.go b/x/gamm/pool-models/balancer/constants.go
index 731a085966c..bae34ab02f4 100644
--- a/x/gamm/pool-models/balancer/constants.go
+++ b/x/gamm/pool-models/balancer/constants.go
@@ -19,4 +19,5 @@ var (
 	GuaranteedWeightPrecision int64 = 1 << 30
 
 	PoolTypeName string = "Balancer"
+	oneDec              = osmomath.OneDec()
 )
diff --git a/x/gamm/pool-models/balancer/pool.go b/x/gamm/pool-models/balancer/pool.go
index 77cfed679d7..f81f61bd3e8 100644
--- a/x/gamm/pool-models/balancer/pool.go
+++ b/x/gamm/pool-models/balancer/pool.go
@@ -500,9 +500,9 @@ func (p Pool) CalcOutAmtGivenIn(
 		return sdk.Coin{}, err
 	}
 
-	tokenAmountInAfterFee := tokenIn.Amount.ToLegacyDec().Mul(osmomath.OneDec().Sub(spreadFactor))
+	tokenAmountInAfterFee := tokenIn.Amount.ToLegacyDec().MulMut(oneDec.Sub(spreadFactor))
 	poolTokenInBalance := poolAssetIn.Token.Amount.ToLegacyDec()
-	poolPostSwapInBalance := poolTokenInBalance.Add(tokenAmountInAfterFee)
+	poolPostSwapInBalance := tokenAmountInAfterFee.AddMut(poolTokenInBalance)
 
 	// deduct spread factor on the tokensIn
 	// delta balanceOut is positive(tokens inside the pool decreases)
diff --git a/x/ibc-hooks/go.mod b/x/ibc-hooks/go.mod
index cae643b6d6b..566da00d736 100644
--- a/x/ibc-hooks/go.mod
+++ b/x/ibc-hooks/go.mod
@@ -11,8 +11,8 @@ require (
 	github.com/cosmos/gogoproto v1.4.11
 	github.com/cosmos/ibc-go/v7 v7.3.2
 	github.com/grpc-ecosystem/grpc-gateway v1.16.0
-	github.com/osmosis-labs/osmosis/osmomath v0.0.8
-	github.com/osmosis-labs/osmosis/osmoutils v0.0.9-0.20240222004208-b602d1901059
+	github.com/osmosis-labs/osmosis/osmomath v0.0.9-0.20240306055140-d7dfe8e8669e
+	github.com/osmosis-labs/osmosis/osmoutils v0.0.9-0.20240306055140-d7dfe8e8669e
 	github.com/spf13/cobra v1.8.0
 	google.golang.org/grpc v1.60.1
 	google.golang.org/protobuf v1.32.0
@@ -28,7 +28,7 @@ require (
 	cosmossdk.io/core v0.5.1 // indirect
 	cosmossdk.io/depinject v1.0.0-alpha.4 // indirect
 	cosmossdk.io/log v1.3.0 // indirect
-	cosmossdk.io/math v1.2.0 // indirect
+	cosmossdk.io/math v1.2.1-0.20240219164559-72eae6dc50e4 // indirect
 	cosmossdk.io/tools/rosetta v0.2.1 // indirect
 	filippo.io/edwards25519 v1.0.0 // indirect
 	github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect
@@ -194,7 +194,7 @@ require (
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	nhooyr.io/websocket v1.8.7 // indirect
 	pgregory.net/rapid v0.5.5 // indirect
-	sigs.k8s.io/yaml v1.3.0 // indirect
+	sigs.k8s.io/yaml v1.4.0 // indirect
 )
 
 replace (
@@ -207,9 +207,9 @@ replace (
 
 	// v1.0.0-beta.3 is incompatible, so we use v1.0.0-beta.2
 	github.com/cosmos/cosmos-proto => github.com/cosmos/cosmos-proto v1.0.0-beta.2
-	// Our cosmos-sdk branch is: https://github.com/osmosis-labs/cosmos-sdk/tree/osmo-v23/v0.47.5-iavl-v1, current branch: osmo-v23/v0.47.5-iavl-v1. Direct commit link: https://github.com/osmosis-labs/cosmos-sdk/commit/d44a3847e089de47cbba0f31a0cebed64ad2806f
+	// Our cosmos-sdk branch is: https://github.com/osmosis-labs/cosmos-sdk/tree/osmo/v0.47.5, current branch: osmo/v0.47.5. Direct commit link: https://github.com/osmosis-labs/cosmos-sdk/commit/76d3c64545bad5bc930756eca88eacaed30f9f3e
 	// https://github.com/osmosis-labs/cosmos-sdk/releases/tag/v0.47.5-v23-osmo-1
-	github.com/cosmos/cosmos-sdk => github.com/osmosis-labs/cosmos-sdk v0.47.5-v23-osmo-2-iavl-v1
+	github.com/cosmos/cosmos-sdk => github.com/osmosis-labs/cosmos-sdk v0.47.6-0.20240309220415-76d3c64545ba
 	github.com/cosmos/gogoproto => github.com/cosmos/gogoproto v1.4.10
 	github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1
 
diff --git a/x/ibc-hooks/go.sum b/x/ibc-hooks/go.sum
index bf7d123d158..ee1d8963afb 100644
--- a/x/ibc-hooks/go.sum
+++ b/x/ibc-hooks/go.sum
@@ -527,8 +527,8 @@ cosmossdk.io/errors v1.0.1 h1:bzu+Kcr0kS/1DuPBtUFdWjzLqyUuCiyHjyJB6srBV/0=
 cosmossdk.io/errors v1.0.1/go.mod h1:MeelVSZThMi4bEakzhhhE/CKqVv3nOJDA25bIqRDu/U=
 cosmossdk.io/log v1.3.0 h1:L0Z0XstClo2kOU4h3V1iDoE5Ji64sg5HLOogzGg67Oo=
 cosmossdk.io/log v1.3.0/go.mod h1:HIDyvWLqZe2ovlWabsDN4aPMpY/nUEquAhgfTf2ZzB8=
-cosmossdk.io/math v1.2.0 h1:8gudhTkkD3NxOP2YyyJIYYmt6dQ55ZfJkDOaxXpy7Ig=
-cosmossdk.io/math v1.2.0/go.mod h1:l2Gnda87F0su8a/7FEKJfFdJrM0JZRXQaohlgJeyQh0=
+cosmossdk.io/math v1.2.1-0.20240219164559-72eae6dc50e4 h1:YVXqcsZcHmFWA2IPSqOFbOpmbEAm8gAsr5FmEV3kv5s=
+cosmossdk.io/math v1.2.1-0.20240219164559-72eae6dc50e4/go.mod h1:vnRTxewy+M7BtXBNFybkuhSH4WfedVAAnERHgVFhp3k=
 cosmossdk.io/tools/rosetta v0.2.1 h1:ddOMatOH+pbxWbrGJKRAawdBkPYLfKXutK9IETnjYxw=
 cosmossdk.io/tools/rosetta v0.2.1/go.mod h1:Pqdc1FdvkNV3LcNIkYWt2RQY6IP1ge6YWZk8MhhO9Hw=
 filippo.io/edwards25519 v1.0.0 h1:0wAIcmJUqRdI8IJ/3eGi5/HwXZWPujYXXlkrQogz0Ek=
@@ -1241,10 +1241,10 @@ github.com/osmosis-labs/cometbft v0.37.4-v23-osmo-2 h1:967/6vaO8l/eSzkB5rcCAZjxl
 github.com/osmosis-labs/cometbft v0.37.4-v23-osmo-2/go.mod h1:Cmg5Hp4sNpapm7j+x0xRyt2g0juQfmB752ous+pA0G8=
 github.com/osmosis-labs/cosmos-sdk v0.47.5-v23-osmo-2-iavl-v1 h1:znGVTrQKVV2bKzZPSvC+RwX7tu+hf+WUCkgPHWGOiEc=
 github.com/osmosis-labs/cosmos-sdk v0.47.5-v23-osmo-2-iavl-v1/go.mod h1:4WHIpz3iRefLvpqKD9oRNWD10AQbDt0tj6MmWcuY1QI=
-github.com/osmosis-labs/osmosis/osmomath v0.0.8 h1:jm6D5UgzQ0GQGtyFezs7tQRgwakf3cTBsE8oJIQdPZE=
-github.com/osmosis-labs/osmosis/osmomath v0.0.8/go.mod h1:4iPfmy6R0qbImLe5urBLS0thndfLxfmHOdnYboDS1Qo=
-github.com/osmosis-labs/osmosis/osmoutils v0.0.9-0.20240222004208-b602d1901059 h1:2PyAblTdr9l5GacEuQY/CitAAUdA60UH43qD9FChdXQ=
-github.com/osmosis-labs/osmosis/osmoutils v0.0.9-0.20240222004208-b602d1901059/go.mod h1:uClYVpeXbVKOHRA0n55kfP1jJz1lv66k+V5N0w/vi5M=
+github.com/osmosis-labs/osmosis/osmomath v0.0.9-0.20240306055140-d7dfe8e8669e h1:wMbjfdBY8T8dfiC/llpyvrTmZ+85eO3BVGTXFoGYP8Q=
+github.com/osmosis-labs/osmosis/osmomath v0.0.9-0.20240306055140-d7dfe8e8669e/go.mod h1:u3sHQAPLDss2DovMB/4SCkiau85jVGv6Vsp8L7kSCcM=
+github.com/osmosis-labs/osmosis/osmoutils v0.0.9-0.20240306055140-d7dfe8e8669e h1:fn4rXlW2Qp6Zga/1bBrXxUwZ5fF+HKX221TFxNTpkJ8=
+github.com/osmosis-labs/osmosis/osmoutils v0.0.9-0.20240306055140-d7dfe8e8669e/go.mod h1:c/lE4YlUAEGRszC+l0rSd5ypkzlgyx3FHDg8RZNwmYA=
 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=
@@ -2252,6 +2252,6 @@ rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4=
 rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
 rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
 sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
-sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
-sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8=
+sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=
+sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=
 sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod h1:hI742Nqp5OhwiqlzhgfbWU4mW4yO10fP+LoT9WOswdU=
diff --git a/x/incentives/keeper/bench_test.go b/x/incentives/keeper/bench_test.go
index 3d46a579c94..126da6ee329 100644
--- a/x/incentives/keeper/bench_test.go
+++ b/x/incentives/keeper/bench_test.go
@@ -49,7 +49,6 @@ func genRewardCoins(r *rand.Rand, coins sdk.Coins) (res sdk.Coins) {
 // genQueryCondition takes coins and durations and returns a QueryConditon struct.
 func genQueryCondition(
 	r *rand.Rand,
-	blocktime time.Time,
 	coins sdk.Coins,
 	durationOptions []time.Duration,
 ) lockuptypes.QueryCondition {
@@ -104,7 +103,7 @@ func benchmarkDistributionLogic(b *testing.B, numAccts, numDenoms, numGauges, nu
 
 		// isPerpetual := r.Int()%2 == 0
 		isPerpetual := true
-		distributeTo := genQueryCondition(r, ctx.BlockTime(), simCoins, durationOptions)
+		distributeTo := genQueryCondition(r, simCoins, durationOptions)
 		rewards := genRewardCoins(r, simCoins)
 		startTime := ctx.BlockTime().Add(time.Duration(-1) * time.Second)
 		durationMillisecs := distributeTo.Duration.Milliseconds()
diff --git a/x/incentives/keeper/hooks_test.go b/x/incentives/keeper/hooks_test.go
index a010be9e52e..895cd8a04bd 100644
--- a/x/incentives/keeper/hooks_test.go
+++ b/x/incentives/keeper/hooks_test.go
@@ -98,10 +98,10 @@ func (s *KeeperTestSuite) TestAfterEpochEnd_Group_General() {
 	s.SetupVolumeForPools(nonPerpetualGroupPoolIDs, equalPoolVolumes, nonPerpetualPoolIDToVolumeMap)
 
 	// Calculate the expected distribution
-	perpetualPoolIDToExpectedDistributionMap := s.computeExpectedDistributonAmountsFromVolume(defaultCoins, perpetualPoolIDToVolumeMap, volumeA)
+	perpetualPoolIDToExpectedDistributionMap := s.computeExpectedDistributonAmountsFromVolume(perpetualPoolIDToVolumeMap, volumeA)
 
 	// Calculate the expected distribution
-	nonPerpetualPoolIDToExpectedDistributionMap := s.computeExpectedDistributonAmountsFromVolume(defaultCoins, nonPerpetualPoolIDToVolumeMap, volumeB)
+	nonPerpetualPoolIDToExpectedDistributionMap := s.computeExpectedDistributonAmountsFromVolume(nonPerpetualPoolIDToVolumeMap, volumeB)
 
 	distrEpochIdentifier := s.App.IncentivesKeeper.GetParams(s.Ctx).DistrEpochIdentifier
 
@@ -124,7 +124,7 @@ func (s *KeeperTestSuite) TestAfterEpochEnd_Group_General() {
 	s.SetupVolumeForPools(nonPerpetualGroupPoolIDs, equalPoolVolumes, nonPerpetualPoolIDToVolumeMap)
 
 	// Only non-perpetual distributes
-	nonPerpetualPoolIDToExpectedDistributionMap = s.computeExpectedDistributonAmountsFromVolume(defaultCoins, nonPerpetualPoolIDToVolumeMap, volumeB)
+	nonPerpetualPoolIDToExpectedDistributionMap = s.computeExpectedDistributonAmountsFromVolume(nonPerpetualPoolIDToVolumeMap, volumeB)
 
 	// System under test
 	err = s.App.IncentivesKeeper.AfterEpochEnd(s.Ctx, distrEpochIdentifier, 2)
@@ -152,12 +152,12 @@ func (s *KeeperTestSuite) TestAfterEpochEnd_Group_General() {
 	s.SetupVolumeForPools(nonPerpetualGroupPoolIDs, unevenPoolVolumes, currentEpochNonPerpetualPoolVolumeMap)
 
 	// Both groups distribute
-	currentEpochExpectedDistributionsOne := s.computeExpectedDistributonAmountsFromVolume(defaultCoins, currentEpochPerpetualPoolVolumeMap, volumeB)
+	currentEpochExpectedDistributionsOne := s.computeExpectedDistributonAmountsFromVolume(currentEpochPerpetualPoolVolumeMap, volumeB)
 
 	// Merge previous and current
 	perpetualPoolIDToExpectedDistributionMap = osmoutils.MergeCoinMaps(currentEpochExpectedDistributionsOne, perpetualPoolIDToExpectedDistributionMap)
 
-	currentEpochExpectedDistributionsTwo := s.computeExpectedDistributonAmountsFromVolume(defaultCoins, currentEpochNonPerpetualPoolVolumeMap, volumeA)
+	currentEpochExpectedDistributionsTwo := s.computeExpectedDistributonAmountsFromVolume(currentEpochNonPerpetualPoolVolumeMap, volumeA)
 
 	// Merge previous and current
 	nonPerpetualPoolIDToExpectedDistributionMap = osmoutils.MergeCoinMaps(currentEpochExpectedDistributionsTwo, nonPerpetualPoolIDToExpectedDistributionMap)
@@ -232,7 +232,7 @@ func (s *KeeperTestSuite) TestAfterEpochEnd_Group_OverlappingPoolsInGroups() {
 	s.Require().NoError(err)
 
 	// Calculate the expected distribution
-	poolIDToExpectedDistributionMap := s.computeExpectedDistributonAmountsFromVolume(defaultCoins, poolIDToVolumeMap, oneMillionVolumeAmt)
+	poolIDToExpectedDistributionMap := s.computeExpectedDistributonAmountsFromVolume(poolIDToVolumeMap, oneMillionVolumeAmt)
 
 	// Double the expected amounts by merging because we have two groups distributing the same amount to the same pools.
 	poolIDToExpectedDistributionMap = osmoutils.MergeCoinMaps(poolIDToExpectedDistributionMap, poolIDToExpectedDistributionMap)
@@ -291,11 +291,11 @@ func (s *KeeperTestSuite) TestAfterEpochEnd_Group_NoVolumeOnePool_SkipSilent() {
 	s.Require().NoError(err)
 
 	// First group should distribute because it has volume.
-	poolIDToExpectedDistributionMap := s.computeExpectedDistributonAmountsFromVolume(defaultCoins, poolIDToVolumeMap, oneMillionVolumeAmt)
+	poolIDToExpectedDistributionMap := s.computeExpectedDistributonAmountsFromVolume(poolIDToVolumeMap, oneMillionVolumeAmt)
 	s.validateDistributionForGroup(poolIDsGroupOne, poolIDToExpectedDistributionMap)
 
 	// Second group should not distribute because it has no volume.
-	poolIDToExpectedDistributionMap = s.computeExpectedDistributonAmountsFromVolume(defaultCoins, map[uint64]osmomath.Int{
+	poolIDToExpectedDistributionMap = s.computeExpectedDistributonAmountsFromVolume(map[uint64]osmomath.Int{
 		poolAndGaugeInfoTwo.ConcentratedPoolID: osmomath.ZeroInt(),
 		poolAndGaugeInfoTwo.StableSwapPoolID:   osmomath.ZeroInt(),
 	}, oneMillionVolumeAmt)
@@ -331,7 +331,7 @@ func (s *KeeperTestSuite) Test_AfterEpochEnd_Group_ChangeVolumeBetween() {
 	distrEpochIdentifier := s.App.IncentivesKeeper.GetParams(s.Ctx).DistrEpochIdentifier
 
 	// Estimate the expected distribution
-	poolIDToExpectedDistributionMap := s.computeExpectedDistributonAmountsFromVolume(defaultCoins, poolIDToVolumeMap, volumeA)
+	poolIDToExpectedDistributionMap := s.computeExpectedDistributonAmountsFromVolume(poolIDToVolumeMap, volumeA)
 
 	// System under test
 	err = s.App.IncentivesKeeper.AfterEpochEnd(s.Ctx, distrEpochIdentifier, 1)
@@ -346,7 +346,7 @@ func (s *KeeperTestSuite) Test_AfterEpochEnd_Group_ChangeVolumeBetween() {
 	s.SetupVolumeForPools(poolIDsGroup, equalPoolVolumes, currentEpochPerpetualPoolVolumeMap)
 
 	// Estimate the expected distribution
-	currentEpochExpectedDistributionsOne := s.computeExpectedDistributonAmountsFromVolume(defaultCoins, currentEpochPerpetualPoolVolumeMap, volumeB)
+	currentEpochExpectedDistributionsOne := s.computeExpectedDistributonAmountsFromVolume(currentEpochPerpetualPoolVolumeMap, volumeB)
 
 	// System under test
 	err = s.App.IncentivesKeeper.AfterEpochEnd(s.Ctx, distrEpochIdentifier, 2)
@@ -391,7 +391,7 @@ func (s *KeeperTestSuite) Test_AfterEpochEnd_Group_CreateGroupsBetween() {
 	distrEpochIdentifier := s.App.IncentivesKeeper.GetParams(s.Ctx).DistrEpochIdentifier
 
 	// Estimate the expected distribution
-	poolIDToExpectedDistributionMap := s.computeExpectedDistributonAmountsFromVolume(defaultCoins, poolIDToVolumeMap, volumeA)
+	poolIDToExpectedDistributionMap := s.computeExpectedDistributonAmountsFromVolume(poolIDToVolumeMap, volumeA)
 
 	// System under test
 	err = s.App.IncentivesKeeper.AfterEpochEnd(s.Ctx, distrEpochIdentifier, 1)
@@ -539,7 +539,7 @@ func (s *KeeperTestSuite) validateDistributionForGroup(groupPoolIDs []uint64, po
 
 // computes the expected distribution values for each pool in the map based on the volume each one has and the total volume.
 // The expected distribution is calculated pro-rata based on the volume of each pool.
-func (*KeeperTestSuite) computeExpectedDistributonAmountsFromVolume(coinsDistributed sdk.Coins, poolIDToVolumeMap map[uint64]math.Int, totalVolume osmomath.Int) map[uint64]sdk.Coins {
+func (*KeeperTestSuite) computeExpectedDistributonAmountsFromVolume(poolIDToVolumeMap map[uint64]math.Int, totalVolume osmomath.Int) map[uint64]sdk.Coins {
 	totalVolumeDec := totalVolume.ToLegacyDec()
 	poolIDToExpectedDistributionMapOne := map[uint64]sdk.Coins{}
 	for poolID, volume := range poolIDToVolumeMap {
diff --git a/x/lockup/keeper/migration_test.go b/x/lockup/keeper/migration_test.go
index 16dd7b67f10..cb5e175863f 100644
--- a/x/lockup/keeper/migration_test.go
+++ b/x/lockup/keeper/migration_test.go
@@ -42,7 +42,7 @@ func (s *KeeperTestSuite) TestLockupMergeMigration() {
 			if rand.Intn(3) == 0 {
 				duration = baseDuration
 			}
-			amount := rand.Int63n(100000)
+			amount := rand.Int63n(99999) + 1 // ensure amount is never 0
 			add(addr, denom, baseDuration, amount)
 			s.LockTokens(addr, sdk.Coins{sdk.NewInt64Coin(denom, amount)}, duration)
 		}
diff --git a/x/protorev/keeper/keeper.go b/x/protorev/keeper/keeper.go
index 7c2fb8bf64a..5e78a79ce6e 100644
--- a/x/protorev/keeper/keeper.go
+++ b/x/protorev/keeper/keeper.go
@@ -15,9 +15,10 @@ import (
 
 type (
 	Keeper struct {
-		cdc        codec.BinaryCodec
-		storeKey   storetypes.StoreKey
-		paramstore paramtypes.Subspace
+		cdc          codec.BinaryCodec
+		storeKey     storetypes.StoreKey
+		transientKey *storetypes.TransientStoreKey
+		paramstore   paramtypes.Subspace
 
 		accountKeeper               types.AccountKeeper
 		bankKeeper                  types.BankKeeper
@@ -32,6 +33,7 @@ type (
 func NewKeeper(
 	cdc codec.BinaryCodec,
 	storeKey storetypes.StoreKey,
+	transientKey *storetypes.TransientStoreKey,
 	ps paramtypes.Subspace,
 	accountKeeper types.AccountKeeper,
 	bankKeeper types.BankKeeper,
@@ -49,6 +51,7 @@ func NewKeeper(
 	return Keeper{
 		cdc:                         cdc,
 		storeKey:                    storeKey,
+		transientKey:                transientKey,
 		paramstore:                  ps,
 		accountKeeper:               accountKeeper,
 		bankKeeper:                  bankKeeper,
diff --git a/x/protorev/keeper/protorev.go b/x/protorev/keeper/protorev.go
index 1412cd2d79a..41822b0ed23 100644
--- a/x/protorev/keeper/protorev.go
+++ b/x/protorev/keeper/protorev.go
@@ -199,8 +199,7 @@ func (k Keeper) DeleteAllPoolsForBaseDenom(ctx sdk.Context, baseDenom string) {
 
 // SetSwapsToBackrun sets the swaps to backrun, updated via hooks
 func (k Keeper) SetSwapsToBackrun(ctx sdk.Context, swapsToBackrun types.Route) error {
-	store := prefix.NewStore(ctx.KVStore(k.storeKey), types.KeyPrefixSwapsToBackrun)
-
+	store := prefix.NewStore(ctx.TransientStore(k.transientKey), types.KeyPrefixSwapsToBackrun)
 	bz, err := swapsToBackrun.Marshal()
 	if err != nil {
 		return err
@@ -213,7 +212,7 @@ func (k Keeper) SetSwapsToBackrun(ctx sdk.Context, swapsToBackrun types.Route) e
 
 // GetSwapsToBackrun returns the swaps to backrun, updated via hooks
 func (k Keeper) GetSwapsToBackrun(ctx sdk.Context) (types.Route, error) {
-	store := prefix.NewStore(ctx.KVStore(k.storeKey), types.KeyPrefixSwapsToBackrun)
+	store := prefix.NewStore(ctx.TransientStore(k.transientKey), types.KeyPrefixSwapsToBackrun)
 	bz := store.Get(types.KeyPrefixSwapsToBackrun)
 
 	swapsToBackrun := types.Route{}
@@ -227,7 +226,7 @@ func (k Keeper) GetSwapsToBackrun(ctx sdk.Context) (types.Route, error) {
 
 // DeleteSwapsToBackrun deletes the swaps to backrun
 func (k Keeper) DeleteSwapsToBackrun(ctx sdk.Context) {
-	store := prefix.NewStore(ctx.KVStore(k.storeKey), types.KeyPrefixSwapsToBackrun)
+	store := prefix.NewStore(ctx.TransientStore(k.transientKey), types.KeyPrefixSwapsToBackrun)
 	store.Delete(types.KeyPrefixSwapsToBackrun)
 }
 
diff --git a/x/protorev/keeper/routes.go b/x/protorev/keeper/routes.go
index fd2f5598c56..483baa21616 100644
--- a/x/protorev/keeper/routes.go
+++ b/x/protorev/keeper/routes.go
@@ -191,7 +191,7 @@ func (k Keeper) BuildTwoPoolRoute(
 	}
 
 	if pool1 == pool2 {
-		return RouteMetaData{}, fmt.Errorf("cannot be trading on the same pool twice")
+		return RouteMetaData{}, types.ErrRouteDoubleContainsPool
 	}
 
 	newRoute := poolmanagertypes.SwapAmountInRoutes{
diff --git a/x/protorev/types/errors.go b/x/protorev/types/errors.go
index ae8ddfe0f49..b23443c354a 100644
--- a/x/protorev/types/errors.go
+++ b/x/protorev/types/errors.go
@@ -10,3 +10,5 @@ type NoPoolForDenomPairError struct {
 func (e NoPoolForDenomPairError) Error() string {
 	return fmt.Sprintf("highest liquidity pool between base %s and match denom %s not found", e.BaseDenom, e.MatchDenom)
 }
+
+var ErrRouteDoubleContainsPool = fmt.Errorf("cannot be trading on the same pool twice")
diff --git a/x/protorev/types/keys.go b/x/protorev/types/keys.go
index 4630d20ed8e..8663f36a7cc 100644
--- a/x/protorev/types/keys.go
+++ b/x/protorev/types/keys.go
@@ -15,6 +15,8 @@ const (
 	// StoreKey defines the primary module store key
 	StoreKey = ModuleName
 
+	TransientStoreKey = "transient_" + ModuleName
+
 	// RouterKey defines the module's message routing key
 	RouterKey = ModuleName
 )
diff --git a/x/superfluid/keeper/hooks_test.go b/x/superfluid/keeper/hooks_test.go
index f711c4f90ff..fa9bfb9c09b 100644
--- a/x/superfluid/keeper/hooks_test.go
+++ b/x/superfluid/keeper/hooks_test.go
@@ -6,6 +6,8 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
 
+	distribution "github.com/cosmos/cosmos-sdk/x/distribution"
+
 	"github.com/osmosis-labs/osmosis/osmomath"
 	lockupkeeper "github.com/osmosis-labs/osmosis/v23/x/lockup/keeper"
 	lockuptypes "github.com/osmosis-labs/osmosis/v23/x/lockup/types"
@@ -67,7 +69,10 @@ func (s *KeeperTestSuite) TestSuperfluidAfterEpochEnd() {
 
 			// run epoch actions
 			// run begin block for each validator so that both validator gets block rewards
-			for _, valAddr := range valAddrs {
+			for i, valAddr := range valAddrs {
+				// ensure we are at a block height that is a multiple of the distribution block height
+				blockHeight := distribution.BlockMultipleToDistributeRewards * int64(i+1)
+				s.Ctx = s.Ctx.WithBlockHeight(blockHeight - 1)
 				s.BeginNewBlockWithProposer(true, valAddr)
 			}
 
@@ -81,10 +86,10 @@ func (s *KeeperTestSuite) TestSuperfluidAfterEpochEnd() {
 				intermediaryAcc := s.App.SuperfluidKeeper.GetIntermediaryAccount(s.Ctx, intermediaryAccAddr)
 				gauge, err := s.App.IncentivesKeeper.GetGaugeByID(s.Ctx, intermediaryAcc.GaugeId)
 				s.Require().NoError(err)
-				s.Require().Equal(gauge.Id, intermediaryAcc.GaugeId)
-				s.Require().Equal(gauge.IsPerpetual, true)
-				s.Require().Equal(gauge.Coins, tc.expRewards[index])
-				s.Require().Equal(gauge.DistributedCoins.String(), tc.expRewards[index].String())
+				s.Require().Equal(intermediaryAcc.GaugeId, gauge.Id)
+				s.Require().Equal(true, gauge.IsPerpetual)
+				s.Require().Equal(tc.expRewards[index], gauge.Coins)
+				s.Require().Equal(tc.expRewards[index].String(), gauge.DistributedCoins.String())
 			}
 
 			// check delegation changes
diff --git a/x/tokenfactory/client/cli/query.go b/x/tokenfactory/client/cli/query.go
index 33436a4eba8..f3eb9ac6a8a 100644
--- a/x/tokenfactory/client/cli/query.go
+++ b/x/tokenfactory/client/cli/query.go
@@ -21,6 +21,7 @@ func GetQueryCmd() *cobra.Command {
 
 	osmocli.AddQueryCmd(cmd, types.NewQueryClient, GetCmdDenomAuthorityMetadata)
 	osmocli.AddQueryCmd(cmd, types.NewQueryClient, GetCmdDenomsFromCreator)
+	osmocli.AddQueryCmd(cmd, types.NewQueryClient, GetCmdAllBeforeSendHooks)
 
 	cmd.AddCommand(
 		osmocli.GetParams[*types.QueryParamsRequest](
@@ -47,6 +48,12 @@ func GetCmdDenomsFromCreator() (*osmocli.QueryDescriptor, *types.QueryDenomsFrom
 		{{.CommandPrefix}} <address>`,
 	}, &types.QueryDenomsFromCreatorRequest{}
 }
+func GetCmdAllBeforeSendHooks() (*osmocli.QueryDescriptor, *types.QueryAllBeforeSendHooksAddressesRequest) {
+	return &osmocli.QueryDescriptor{
+		Use:   "all-before-send-hooks",
+		Short: "Returns a list of all before send hooks registered",
+	}, &types.QueryAllBeforeSendHooksAddressesRequest{}
+}
 
 // GetCmdDenomAuthorityMetadata returns the authority metadata for a queried denom
 func GetCmdDenomBeforeSendHook() *cobra.Command {
diff --git a/x/tokenfactory/keeper/before_send.go b/x/tokenfactory/keeper/before_send.go
index 16a8a08bd49..c8be986cc48 100644
--- a/x/tokenfactory/keeper/before_send.go
+++ b/x/tokenfactory/keeper/before_send.go
@@ -47,6 +47,24 @@ func (k Keeper) GetBeforeSendHook(ctx sdk.Context, denom string) string {
 	return string(bz)
 }
 
+func (k Keeper) GetAllBeforeSendHooks(ctx sdk.Context) ([]string, []string) {
+	denomsList := []string{}
+	beforeSendHooksList := []string{}
+
+	iterator := k.GetAllDenomsIterator(ctx)
+	defer iterator.Close()
+	for ; iterator.Valid(); iterator.Next() {
+		denom := string(iterator.Value())
+
+		beforeSendHook := k.GetBeforeSendHook(ctx, denom)
+		if beforeSendHook != "" {
+			denomsList = append(denomsList, denom)
+			beforeSendHooksList = append(beforeSendHooksList, beforeSendHook)
+		}
+	}
+	return denomsList, beforeSendHooksList
+}
+
 // Hooks wrapper struct for bank keeper
 type Hooks struct {
 	k Keeper
diff --git a/x/tokenfactory/keeper/before_send_test.go b/x/tokenfactory/keeper/before_send_test.go
index 7e3d31325eb..b4c3c93139f 100644
--- a/x/tokenfactory/keeper/before_send_test.go
+++ b/x/tokenfactory/keeper/before_send_test.go
@@ -113,6 +113,10 @@ func (s *KeeperTestSuite) TestBeforeSendHook() {
 			_, err = s.msgServer.SetBeforeSendHook(sdk.WrapSDKContext(s.Ctx), types.NewMsgSetBeforeSendHook(s.TestAccs[0].String(), denom, cosmwasmAddress.String()))
 			s.Require().NoError(err, "test: %v", tc.desc)
 
+			denoms, beforeSendHooks := s.App.TokenFactoryKeeper.GetAllBeforeSendHooks(s.Ctx)
+			s.Require().Equal(beforeSendHooks, []string{cosmwasmAddress.String()})
+			s.Require().Equal(denoms, []string{denom})
+
 			for _, sendTc := range tc.sendMsgs {
 				_, err := s.bankMsgServer.Send(sdk.WrapSDKContext(s.Ctx), sendTc.msg(denom))
 				if sendTc.expectPass {
diff --git a/x/tokenfactory/keeper/grpc_query.go b/x/tokenfactory/keeper/grpc_query.go
index d70bb747824..5808527f0be 100644
--- a/x/tokenfactory/keeper/grpc_query.go
+++ b/x/tokenfactory/keeper/grpc_query.go
@@ -50,3 +50,10 @@ func (k Keeper) BeforeSendHookAddress(ctx context.Context, req *types.QueryBefor
 
 	return &types.QueryBeforeSendHookAddressResponse{CosmwasmAddress: cosmwasmAddress}, nil
 }
+
+func (k Keeper) AllBeforeSendHooksAddresses(ctx context.Context, req *types.QueryAllBeforeSendHooksAddressesRequest) (*types.QueryAllBeforeSendHooksAddressesResponse, error) {
+	sdkCtx := sdk.UnwrapSDKContext(ctx)
+	denoms, beforesendHookAddresses := k.GetAllBeforeSendHooks(sdkCtx)
+
+	return &types.QueryAllBeforeSendHooksAddressesResponse{Denoms: denoms, BeforeSendHookAddresses: beforesendHookAddresses}, nil
+}
diff --git a/x/tokenfactory/types/query.pb.go b/x/tokenfactory/types/query.pb.go
index 556fd88aab8..16959b9aa78 100644
--- a/x/tokenfactory/types/query.pb.go
+++ b/x/tokenfactory/types/query.pb.go
@@ -387,6 +387,100 @@ func (m *QueryBeforeSendHookAddressResponse) GetCosmwasmAddress() string {
 	return ""
 }
 
+type QueryAllBeforeSendHooksAddressesRequest struct {
+}
+
+func (m *QueryAllBeforeSendHooksAddressesRequest) Reset() {
+	*m = QueryAllBeforeSendHooksAddressesRequest{}
+}
+func (m *QueryAllBeforeSendHooksAddressesRequest) String() string { return proto.CompactTextString(m) }
+func (*QueryAllBeforeSendHooksAddressesRequest) ProtoMessage()    {}
+func (*QueryAllBeforeSendHooksAddressesRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_6f22013ad0f72e3f, []int{8}
+}
+func (m *QueryAllBeforeSendHooksAddressesRequest) XXX_Unmarshal(b []byte) error {
+	return m.Unmarshal(b)
+}
+func (m *QueryAllBeforeSendHooksAddressesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	if deterministic {
+		return xxx_messageInfo_QueryAllBeforeSendHooksAddressesRequest.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalToSizedBuffer(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
+	}
+}
+func (m *QueryAllBeforeSendHooksAddressesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_QueryAllBeforeSendHooksAddressesRequest.Merge(m, src)
+}
+func (m *QueryAllBeforeSendHooksAddressesRequest) XXX_Size() int {
+	return m.Size()
+}
+func (m *QueryAllBeforeSendHooksAddressesRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_QueryAllBeforeSendHooksAddressesRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_QueryAllBeforeSendHooksAddressesRequest proto.InternalMessageInfo
+
+// QueryAllBeforeSendHooksAddressesResponse defines the response structure for
+// the AllBeforeSendHooksAddresses gRPC query.
+type QueryAllBeforeSendHooksAddressesResponse struct {
+	Denoms                  []string `protobuf:"bytes,1,rep,name=denoms,proto3" json:"denoms,omitempty" yaml:"denoms"`
+	BeforeSendHookAddresses []string `protobuf:"bytes,2,rep,name=before_send_hook_addresses,json=beforeSendHookAddresses,proto3" json:"before_send_hook_addresses,omitempty" yaml:"before_send_addresses"`
+}
+
+func (m *QueryAllBeforeSendHooksAddressesResponse) Reset() {
+	*m = QueryAllBeforeSendHooksAddressesResponse{}
+}
+func (m *QueryAllBeforeSendHooksAddressesResponse) String() string { return proto.CompactTextString(m) }
+func (*QueryAllBeforeSendHooksAddressesResponse) ProtoMessage()    {}
+func (*QueryAllBeforeSendHooksAddressesResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_6f22013ad0f72e3f, []int{9}
+}
+func (m *QueryAllBeforeSendHooksAddressesResponse) XXX_Unmarshal(b []byte) error {
+	return m.Unmarshal(b)
+}
+func (m *QueryAllBeforeSendHooksAddressesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	if deterministic {
+		return xxx_messageInfo_QueryAllBeforeSendHooksAddressesResponse.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalToSizedBuffer(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
+	}
+}
+func (m *QueryAllBeforeSendHooksAddressesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_QueryAllBeforeSendHooksAddressesResponse.Merge(m, src)
+}
+func (m *QueryAllBeforeSendHooksAddressesResponse) XXX_Size() int {
+	return m.Size()
+}
+func (m *QueryAllBeforeSendHooksAddressesResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_QueryAllBeforeSendHooksAddressesResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_QueryAllBeforeSendHooksAddressesResponse proto.InternalMessageInfo
+
+func (m *QueryAllBeforeSendHooksAddressesResponse) GetDenoms() []string {
+	if m != nil {
+		return m.Denoms
+	}
+	return nil
+}
+
+func (m *QueryAllBeforeSendHooksAddressesResponse) GetBeforeSendHookAddresses() []string {
+	if m != nil {
+		return m.BeforeSendHookAddresses
+	}
+	return nil
+}
+
 func init() {
 	proto.RegisterType((*QueryParamsRequest)(nil), "osmosis.tokenfactory.v1beta1.QueryParamsRequest")
 	proto.RegisterType((*QueryParamsResponse)(nil), "osmosis.tokenfactory.v1beta1.QueryParamsResponse")
@@ -396,6 +490,8 @@ func init() {
 	proto.RegisterType((*QueryDenomsFromCreatorResponse)(nil), "osmosis.tokenfactory.v1beta1.QueryDenomsFromCreatorResponse")
 	proto.RegisterType((*QueryBeforeSendHookAddressRequest)(nil), "osmosis.tokenfactory.v1beta1.QueryBeforeSendHookAddressRequest")
 	proto.RegisterType((*QueryBeforeSendHookAddressResponse)(nil), "osmosis.tokenfactory.v1beta1.QueryBeforeSendHookAddressResponse")
+	proto.RegisterType((*QueryAllBeforeSendHooksAddressesRequest)(nil), "osmosis.tokenfactory.v1beta1.QueryAllBeforeSendHooksAddressesRequest")
+	proto.RegisterType((*QueryAllBeforeSendHooksAddressesResponse)(nil), "osmosis.tokenfactory.v1beta1.QueryAllBeforeSendHooksAddressesResponse")
 }
 
 func init() {
@@ -403,50 +499,55 @@ func init() {
 }
 
 var fileDescriptor_6f22013ad0f72e3f = []byte{
-	// 674 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0x4d, 0x4f, 0x13, 0x5d,
-	0x14, 0xee, 0xbc, 0xaf, 0xd4, 0x70, 0xfd, 0x82, 0x2b, 0x7e, 0x55, 0x9c, 0xca, 0x95, 0x10, 0x30,
-	0xd8, 0x91, 0x8f, 0x85, 0x11, 0x09, 0x74, 0x50, 0x34, 0x41, 0x12, 0x1d, 0x57, 0xba, 0x69, 0x6e,
-	0xdb, 0x4b, 0x69, 0xe8, 0xcc, 0x29, 0x73, 0x6f, 0xd1, 0x86, 0xb0, 0x71, 0xe1, 0xda, 0xc4, 0xa5,
-	0xff, 0xc1, 0xdf, 0xc1, 0x92, 0x84, 0x8d, 0xab, 0x46, 0xc1, 0xf8, 0x03, 0xfa, 0x0b, 0xcc, 0xdc,
-	0x7b, 0x8a, 0x40, 0xcb, 0xa4, 0xe0, 0xaa, 0x93, 0x73, 0x9e, 0xf3, 0x9c, 0xe7, 0xb9, 0xe7, 0x9c,
-	0x94, 0x8c, 0x82, 0xf4, 0x41, 0x96, 0xa5, 0xa3, 0x60, 0x4d, 0x04, 0x2b, 0xbc, 0xa0, 0x20, 0xac,
-	0x3b, 0x1b, 0x13, 0x79, 0xa1, 0xf8, 0x84, 0xb3, 0x5e, 0x13, 0x61, 0x3d, 0x53, 0x0d, 0x41, 0x01,
-	0x1d, 0x44, 0x64, 0xe6, 0x30, 0x32, 0x83, 0xc8, 0xd4, 0x40, 0x09, 0x4a, 0xa0, 0x81, 0x4e, 0xf4,
-	0x65, 0x6a, 0x52, 0x83, 0x25, 0x80, 0x52, 0x45, 0x38, 0xbc, 0x5a, 0x76, 0x78, 0x10, 0x80, 0xe2,
-	0xaa, 0x0c, 0x81, 0xc4, 0xec, 0xfd, 0x82, 0xa6, 0x74, 0xf2, 0x5c, 0x0a, 0xd3, 0xea, 0xa0, 0x71,
-	0x95, 0x97, 0xca, 0x81, 0x06, 0x23, 0x76, 0x3a, 0x56, 0x27, 0xaf, 0xa9, 0x55, 0x08, 0xcb, 0xaa,
-	0xbe, 0x2c, 0x14, 0x2f, 0x72, 0xc5, 0xb1, 0x6a, 0x2c, 0xb6, 0xaa, 0xca, 0x43, 0xee, 0xa3, 0x18,
-	0x36, 0x40, 0xe8, 0xeb, 0x48, 0xc2, 0x2b, 0x1d, 0xf4, 0xc4, 0x7a, 0x4d, 0x48, 0xc5, 0xde, 0x92,
-	0xab, 0x47, 0xa2, 0xb2, 0x0a, 0x81, 0x14, 0xd4, 0x25, 0x49, 0x53, 0x7c, 0xd3, 0xba, 0x6b, 0x8d,
-	0x5e, 0x98, 0x1c, 0xce, 0xc4, 0x3d, 0x4e, 0xc6, 0x54, 0xbb, 0xe7, 0xb6, 0x1b, 0xe9, 0x84, 0x87,
-	0x95, 0xec, 0x25, 0x61, 0x9a, 0xfa, 0xa9, 0x08, 0xc0, 0xcf, 0x1e, 0x37, 0x80, 0x02, 0xe8, 0x08,
-	0xe9, 0x29, 0x46, 0x00, 0xdd, 0xa8, 0xd7, 0xed, 0x6b, 0x36, 0xd2, 0x17, 0xeb, 0xdc, 0xaf, 0x3c,
-	0x66, 0x3a, 0xcc, 0x3c, 0x93, 0x66, 0xdf, 0x2c, 0x72, 0x2f, 0x96, 0x0e, 0x95, 0x7f, 0xb2, 0x08,
-	0x3d, 0x78, 0xad, 0x9c, 0x8f, 0x69, 0xb4, 0x31, 0x1d, 0x6f, 0xa3, 0x33, 0xb5, 0x3b, 0x14, 0xd9,
-	0x6a, 0x36, 0xd2, 0xb7, 0x8c, 0xae, 0x76, 0x76, 0xe6, 0xf5, 0xb7, 0x0d, 0x88, 0x2d, 0x93, 0x3b,
-	0x7f, 0xf5, 0xca, 0xc5, 0x10, 0xfc, 0x85, 0x50, 0x70, 0x05, 0x61, 0xcb, 0xf9, 0x38, 0x39, 0x5f,
-	0x30, 0x11, 0xf4, 0x4e, 0x9b, 0x8d, 0xf4, 0x65, 0xd3, 0x03, 0x13, 0xcc, 0x6b, 0x41, 0xd8, 0x12,
-	0xb1, 0x4f, 0xa2, 0x43, 0xe7, 0x63, 0x24, 0xa9, 0x9f, 0x2a, 0x9a, 0xd9, 0xff, 0xa3, 0xbd, 0x6e,
-	0x7f, 0xb3, 0x91, 0xbe, 0x74, 0xe8, 0x29, 0x25, 0xf3, 0x10, 0xc0, 0x96, 0xc8, 0x90, 0x26, 0x73,
-	0xc5, 0x0a, 0x84, 0xe2, 0x8d, 0x08, 0x8a, 0x2f, 0x00, 0xd6, 0xb2, 0xc5, 0x62, 0x28, 0xa4, 0x3c,
-	0xed, 0x64, 0x2a, 0x38, 0xe7, 0x13, 0xc8, 0x50, 0xdd, 0x22, 0xe9, 0x8b, 0xae, 0xe1, 0x3d, 0x97,
-	0x7e, 0x8e, 0x9b, 0x1c, 0x12, 0xdf, 0x6e, 0x36, 0xd2, 0x37, 0xd0, 0xf6, 0x31, 0x04, 0xf3, 0xae,
-	0xb4, 0x42, 0xc8, 0x37, 0xb9, 0x9d, 0x24, 0x3d, 0xba, 0x1d, 0xfd, 0x6a, 0x91, 0xa4, 0x59, 0x3c,
-	0xfa, 0x30, 0x7e, 0xae, 0xed, 0x7b, 0x9f, 0x9a, 0x38, 0x45, 0x85, 0x71, 0xc0, 0xc6, 0x3f, 0xee,
-	0xfe, 0xfa, 0xf2, 0xdf, 0x08, 0x1d, 0x76, 0xba, 0x38, 0x3a, 0xfa, 0xdb, 0x22, 0xd7, 0x3b, 0xef,
-	0x13, 0x9d, 0xef, 0xa2, 0x77, 0xec, 0xd1, 0xa4, 0xb2, 0xff, 0xc0, 0x80, 0x6e, 0x9e, 0x6b, 0x37,
-	0x59, 0x3a, 0x17, 0xef, 0xc6, 0x2c, 0x8c, 0xb3, 0xa9, 0x7f, 0xb7, 0x9c, 0xf6, 0xdd, 0xa7, 0xbb,
-	0x16, 0xe9, 0x6f, 0x5b, 0x4a, 0x3a, 0xd3, 0xad, 0xc2, 0x0e, 0x97, 0x91, 0x7a, 0x72, 0xb6, 0x62,
-	0x74, 0xb6, 0xa0, 0x9d, 0xcd, 0xd2, 0x99, 0x6e, 0x9c, 0xe5, 0x56, 0x42, 0xf0, 0x73, 0x78, 0x64,
-	0xce, 0x26, 0x7e, 0x6c, 0xd1, 0x9f, 0x16, 0xb9, 0xd6, 0x71, 0xa1, 0xe9, 0x5c, 0x17, 0xe2, 0xe2,
-	0xee, 0x2a, 0x35, 0x7f, 0x76, 0x02, 0x74, 0xf8, 0x4c, 0x3b, 0x9c, 0xa3, 0xb3, 0xa7, 0x9a, 0x5d,
-	0x5e, 0x73, 0xe6, 0xa4, 0x08, 0x8a, 0xb9, 0x55, 0x80, 0x35, 0xd7, 0xdb, 0xde, 0xb3, 0xad, 0x9d,
-	0x3d, 0xdb, 0xfa, 0xb1, 0x67, 0x5b, 0x9f, 0xf7, 0xed, 0xc4, 0xce, 0xbe, 0x9d, 0xf8, 0xbe, 0x6f,
-	0x27, 0xde, 0x3d, 0x2a, 0x95, 0xd5, 0x6a, 0x2d, 0x9f, 0x29, 0x80, 0xdf, 0x6a, 0xf1, 0xa0, 0xc2,
-	0xf3, 0xf2, 0xa0, 0xdf, 0xc6, 0xe4, 0x94, 0xf3, 0xe1, 0x68, 0x57, 0x55, 0xaf, 0x0a, 0x99, 0x4f,
-	0xea, 0x3f, 0x9b, 0xa9, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x6b, 0x97, 0x75, 0xc8, 0x77, 0x07,
-	0x00, 0x00,
+	// 766 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x56, 0x4f, 0x4f, 0x13, 0x4f,
+	0x18, 0xee, 0xf2, 0xfb, 0x51, 0x65, 0xfc, 0x07, 0x23, 0x0a, 0x2e, 0xd8, 0x85, 0x91, 0x60, 0x31,
+	0xd8, 0x95, 0x3f, 0x26, 0x46, 0x24, 0xd0, 0x45, 0xd0, 0x04, 0x49, 0x74, 0x3d, 0x69, 0x62, 0x36,
+	0xb3, 0xed, 0x50, 0x1a, 0x76, 0x77, 0xca, 0xce, 0x14, 0x6d, 0x08, 0x17, 0x0f, 0x9e, 0x4d, 0x3c,
+	0xfa, 0x1d, 0x3c, 0xf1, 0x21, 0x38, 0x92, 0x70, 0xf1, 0xb4, 0x51, 0x30, 0x26, 0x5e, 0xfb, 0x09,
+	0x4c, 0x67, 0xa7, 0x15, 0xda, 0xb2, 0xb4, 0x70, 0xea, 0x66, 0xe6, 0x79, 0x9f, 0xf7, 0x79, 0xde,
+	0x77, 0xde, 0x37, 0x05, 0x49, 0xca, 0x5c, 0xca, 0xf2, 0x4c, 0xe7, 0x74, 0x9d, 0x78, 0xab, 0x38,
+	0xc3, 0xa9, 0x5f, 0xd2, 0x37, 0x27, 0x6c, 0xc2, 0xf1, 0x84, 0xbe, 0x51, 0x24, 0x7e, 0x29, 0x55,
+	0xf0, 0x29, 0xa7, 0x70, 0x50, 0x22, 0x53, 0x47, 0x91, 0x29, 0x89, 0x54, 0x7b, 0x73, 0x34, 0x47,
+	0x05, 0x50, 0xaf, 0x7c, 0x85, 0x31, 0xea, 0x60, 0x8e, 0xd2, 0x9c, 0x43, 0x74, 0x5c, 0xc8, 0xeb,
+	0xd8, 0xf3, 0x28, 0xc7, 0x3c, 0x4f, 0x3d, 0x26, 0x6f, 0xef, 0x65, 0x04, 0xa5, 0x6e, 0x63, 0x46,
+	0xc2, 0x54, 0xb5, 0xc4, 0x05, 0x9c, 0xcb, 0x7b, 0x02, 0x2c, 0xb1, 0xd3, 0x91, 0x3a, 0x71, 0x91,
+	0xaf, 0x51, 0x3f, 0xcf, 0x4b, 0x2b, 0x84, 0xe3, 0x2c, 0xe6, 0x58, 0x46, 0x8d, 0x45, 0x46, 0x15,
+	0xb0, 0x8f, 0x5d, 0x29, 0x06, 0xf5, 0x02, 0xf8, 0xaa, 0x22, 0xe1, 0xa5, 0x38, 0x34, 0xc9, 0x46,
+	0x91, 0x30, 0x8e, 0xde, 0x80, 0xeb, 0xc7, 0x4e, 0x59, 0x81, 0x7a, 0x8c, 0x40, 0x03, 0xc4, 0xc3,
+	0xe0, 0x7e, 0x65, 0x48, 0x49, 0x5e, 0x9a, 0x1c, 0x49, 0x45, 0x15, 0x27, 0x15, 0x46, 0x1b, 0xff,
+	0xef, 0x06, 0x5a, 0xcc, 0x94, 0x91, 0xe8, 0x05, 0x40, 0x82, 0xfa, 0x29, 0xf1, 0xa8, 0x9b, 0xae,
+	0x37, 0x20, 0x05, 0xc0, 0x51, 0xd0, 0x99, 0xad, 0x00, 0x44, 0xa2, 0x2e, 0xa3, 0xbb, 0x1c, 0x68,
+	0x97, 0x4b, 0xd8, 0x75, 0x1e, 0x23, 0x71, 0x8c, 0xcc, 0xf0, 0x1a, 0x7d, 0x53, 0xc0, 0x9d, 0x48,
+	0x3a, 0xa9, 0xfc, 0x93, 0x02, 0x60, 0xad, 0x5a, 0x96, 0x2b, 0xaf, 0xa5, 0x8d, 0xe9, 0x68, 0x1b,
+	0xcd, 0xa9, 0x8d, 0xe1, 0x8a, 0xad, 0x72, 0xa0, 0xdd, 0x0a, 0x75, 0x35, 0xb2, 0x23, 0xb3, 0xa7,
+	0xa1, 0x41, 0x68, 0x05, 0xdc, 0xfe, 0xa7, 0x97, 0x2d, 0xf9, 0xd4, 0x5d, 0xf0, 0x09, 0xe6, 0xd4,
+	0xaf, 0x3a, 0x1f, 0x07, 0x17, 0x32, 0xe1, 0x89, 0xf4, 0x0e, 0xcb, 0x81, 0x76, 0x35, 0xcc, 0x21,
+	0x2f, 0x90, 0x59, 0x85, 0xa0, 0x65, 0x90, 0x38, 0x89, 0x4e, 0x3a, 0x1f, 0x03, 0x71, 0x51, 0xaa,
+	0x4a, 0xcf, 0xfe, 0x4b, 0x76, 0x19, 0x3d, 0xe5, 0x40, 0xbb, 0x72, 0xa4, 0x94, 0x0c, 0x99, 0x12,
+	0x80, 0x96, 0xc1, 0xb0, 0x20, 0x33, 0xc8, 0x2a, 0xf5, 0xc9, 0x6b, 0xe2, 0x65, 0x9f, 0x53, 0xba,
+	0x9e, 0xce, 0x66, 0x7d, 0xc2, 0x58, 0xbb, 0x9d, 0x71, 0x64, 0x9f, 0x4f, 0x20, 0x93, 0xea, 0x96,
+	0x40, 0x77, 0x65, 0x1a, 0xde, 0x63, 0xe6, 0x5a, 0x38, 0xbc, 0x93, 0xc4, 0x03, 0xe5, 0x40, 0xeb,
+	0x93, 0xb6, 0xeb, 0x10, 0xc8, 0xbc, 0x56, 0x3d, 0x92, 0x7c, 0x68, 0x0c, 0xdc, 0x15, 0xd9, 0xd2,
+	0x8e, 0x73, 0x3c, 0x21, 0x93, 0x08, 0x52, 0x7b, 0xdb, 0x3b, 0x0a, 0x48, 0x9e, 0x8e, 0x6d, 0xbb,
+	0x7a, 0xf0, 0x1d, 0x50, 0x6d, 0x41, 0x67, 0x31, 0xe2, 0x65, 0xad, 0x35, 0x4a, 0xd7, 0xab, 0x82,
+	0x09, 0xeb, 0xef, 0x10, 0xe1, 0x43, 0xe5, 0x40, 0x1b, 0x0c, 0xc3, 0x8f, 0x62, 0x6b, 0x30, 0x64,
+	0xf6, 0xd9, 0xcd, 0xea, 0x45, 0xd8, 0xe4, 0xce, 0x45, 0xd0, 0x29, 0x64, 0xc3, 0xaf, 0x0a, 0x88,
+	0x87, 0xa3, 0x05, 0x1f, 0x44, 0xbf, 0xdc, 0xc6, 0xc9, 0x56, 0x27, 0xda, 0x88, 0x08, 0x6b, 0x80,
+	0xc6, 0x3f, 0xee, 0xff, 0xfa, 0xd2, 0x31, 0x0a, 0x47, 0xf4, 0x16, 0xd6, 0x0a, 0xfc, 0xad, 0x80,
+	0x9b, 0xcd, 0x27, 0x06, 0xce, 0xb7, 0x90, 0x3b, 0x72, 0x2d, 0xa8, 0xe9, 0x73, 0x30, 0x48, 0x37,
+	0xcf, 0x84, 0x9b, 0x34, 0x9c, 0x8b, 0x76, 0x13, 0x36, 0x55, 0xdf, 0x12, 0xbf, 0xdb, 0x7a, 0xe3,
+	0x74, 0xc3, 0x7d, 0x05, 0xf4, 0x34, 0x8c, 0x1d, 0x9c, 0x69, 0x55, 0x61, 0x93, 0xd9, 0x57, 0x9f,
+	0x9c, 0x2d, 0x58, 0x3a, 0x5b, 0x10, 0xce, 0x66, 0xe1, 0x4c, 0x2b, 0xce, 0xac, 0x55, 0x9f, 0xba,
+	0x96, 0x5c, 0x23, 0xfa, 0x96, 0xfc, 0xd8, 0x86, 0x3f, 0x15, 0x70, 0xa3, 0xe9, 0xc8, 0xc2, 0xb9,
+	0x16, 0xc4, 0x45, 0x6d, 0x0e, 0x75, 0xfe, 0xec, 0x04, 0xd2, 0xe1, 0xa2, 0x70, 0x38, 0x07, 0x67,
+	0xdb, 0xea, 0x5d, 0xfd, 0x54, 0xc2, 0x3f, 0x0a, 0x18, 0x88, 0x18, 0x7e, 0xb8, 0xd8, 0x82, 0xd0,
+	0xd3, 0x17, 0x8d, 0xba, 0x74, 0x5e, 0x1a, 0xe9, 0x7a, 0x46, 0xb8, 0x7e, 0x08, 0xa7, 0xa2, 0x5d,
+	0x63, 0xc7, 0xb1, 0xea, 0xad, 0x32, 0xc3, 0xdc, 0x3d, 0x48, 0x28, 0x7b, 0x07, 0x09, 0xe5, 0xc7,
+	0x41, 0x42, 0xf9, 0x7c, 0x98, 0x88, 0xed, 0x1d, 0x26, 0x62, 0xdf, 0x0f, 0x13, 0xb1, 0xb7, 0x8f,
+	0x72, 0x79, 0xbe, 0x56, 0xb4, 0x53, 0x19, 0xea, 0x56, 0x89, 0xef, 0x3b, 0xd8, 0x66, 0xb5, 0x2c,
+	0x9b, 0x93, 0x53, 0xfa, 0x87, 0xe3, 0xb9, 0x78, 0xa9, 0x40, 0x98, 0x1d, 0x17, 0x7f, 0x1d, 0xa6,
+	0xfe, 0x06, 0x00, 0x00, 0xff, 0xff, 0x35, 0xc3, 0xc1, 0x21, 0x45, 0x09, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -473,6 +574,12 @@ type QueryClient interface {
 	// BeforeSendHookAddress defines a gRPC query method for
 	// getting the address registered for the before send hook.
 	BeforeSendHookAddress(ctx context.Context, in *QueryBeforeSendHookAddressRequest, opts ...grpc.CallOption) (*QueryBeforeSendHookAddressResponse, error)
+	// AllBeforeSendHooksAddresses defines a gRPC query method for
+	// getting all addresses with before send hook registered.
+	// The response returns two arrays, an array with a list of denom and an array
+	// of before send hook addresses. The idx of denom corresponds to before send
+	// hook addresse's idx.
+	AllBeforeSendHooksAddresses(ctx context.Context, in *QueryAllBeforeSendHooksAddressesRequest, opts ...grpc.CallOption) (*QueryAllBeforeSendHooksAddressesResponse, error)
 }
 
 type queryClient struct {
@@ -519,6 +626,15 @@ func (c *queryClient) BeforeSendHookAddress(ctx context.Context, in *QueryBefore
 	return out, nil
 }
 
+func (c *queryClient) AllBeforeSendHooksAddresses(ctx context.Context, in *QueryAllBeforeSendHooksAddressesRequest, opts ...grpc.CallOption) (*QueryAllBeforeSendHooksAddressesResponse, error) {
+	out := new(QueryAllBeforeSendHooksAddressesResponse)
+	err := c.cc.Invoke(ctx, "/osmosis.tokenfactory.v1beta1.Query/AllBeforeSendHooksAddresses", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
 // QueryServer is the server API for Query service.
 type QueryServer interface {
 	// Params defines a gRPC query method that returns the tokenfactory module's
@@ -533,6 +649,12 @@ type QueryServer interface {
 	// BeforeSendHookAddress defines a gRPC query method for
 	// getting the address registered for the before send hook.
 	BeforeSendHookAddress(context.Context, *QueryBeforeSendHookAddressRequest) (*QueryBeforeSendHookAddressResponse, error)
+	// AllBeforeSendHooksAddresses defines a gRPC query method for
+	// getting all addresses with before send hook registered.
+	// The response returns two arrays, an array with a list of denom and an array
+	// of before send hook addresses. The idx of denom corresponds to before send
+	// hook addresse's idx.
+	AllBeforeSendHooksAddresses(context.Context, *QueryAllBeforeSendHooksAddressesRequest) (*QueryAllBeforeSendHooksAddressesResponse, error)
 }
 
 // UnimplementedQueryServer can be embedded to have forward compatible implementations.
@@ -551,6 +673,9 @@ func (*UnimplementedQueryServer) DenomsFromCreator(ctx context.Context, req *Que
 func (*UnimplementedQueryServer) BeforeSendHookAddress(ctx context.Context, req *QueryBeforeSendHookAddressRequest) (*QueryBeforeSendHookAddressResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method BeforeSendHookAddress not implemented")
 }
+func (*UnimplementedQueryServer) AllBeforeSendHooksAddresses(ctx context.Context, req *QueryAllBeforeSendHooksAddressesRequest) (*QueryAllBeforeSendHooksAddressesResponse, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method AllBeforeSendHooksAddresses not implemented")
+}
 
 func RegisterQueryServer(s grpc1.Server, srv QueryServer) {
 	s.RegisterService(&_Query_serviceDesc, srv)
@@ -628,6 +753,24 @@ func _Query_BeforeSendHookAddress_Handler(srv interface{}, ctx context.Context,
 	return interceptor(ctx, in, info, handler)
 }
 
+func _Query_AllBeforeSendHooksAddresses_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(QueryAllBeforeSendHooksAddressesRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(QueryServer).AllBeforeSendHooksAddresses(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/osmosis.tokenfactory.v1beta1.Query/AllBeforeSendHooksAddresses",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(QueryServer).AllBeforeSendHooksAddresses(ctx, req.(*QueryAllBeforeSendHooksAddressesRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 var _Query_serviceDesc = grpc.ServiceDesc{
 	ServiceName: "osmosis.tokenfactory.v1beta1.Query",
 	HandlerType: (*QueryServer)(nil),
@@ -648,6 +791,10 @@ var _Query_serviceDesc = grpc.ServiceDesc{
 			MethodName: "BeforeSendHookAddress",
 			Handler:    _Query_BeforeSendHookAddress_Handler,
 		},
+		{
+			MethodName: "AllBeforeSendHooksAddresses",
+			Handler:    _Query_AllBeforeSendHooksAddresses_Handler,
+		},
 	},
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "osmosis/tokenfactory/v1beta1/query.proto",
@@ -894,6 +1041,70 @@ func (m *QueryBeforeSendHookAddressResponse) MarshalToSizedBuffer(dAtA []byte) (
 	return len(dAtA) - i, nil
 }
 
+func (m *QueryAllBeforeSendHooksAddressesRequest) Marshal() (dAtA []byte, err error) {
+	size := m.Size()
+	dAtA = make([]byte, size)
+	n, err := m.MarshalToSizedBuffer(dAtA[:size])
+	if err != nil {
+		return nil, err
+	}
+	return dAtA[:n], nil
+}
+
+func (m *QueryAllBeforeSendHooksAddressesRequest) MarshalTo(dAtA []byte) (int, error) {
+	size := m.Size()
+	return m.MarshalToSizedBuffer(dAtA[:size])
+}
+
+func (m *QueryAllBeforeSendHooksAddressesRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+	i := len(dAtA)
+	_ = i
+	var l int
+	_ = l
+	return len(dAtA) - i, nil
+}
+
+func (m *QueryAllBeforeSendHooksAddressesResponse) Marshal() (dAtA []byte, err error) {
+	size := m.Size()
+	dAtA = make([]byte, size)
+	n, err := m.MarshalToSizedBuffer(dAtA[:size])
+	if err != nil {
+		return nil, err
+	}
+	return dAtA[:n], nil
+}
+
+func (m *QueryAllBeforeSendHooksAddressesResponse) MarshalTo(dAtA []byte) (int, error) {
+	size := m.Size()
+	return m.MarshalToSizedBuffer(dAtA[:size])
+}
+
+func (m *QueryAllBeforeSendHooksAddressesResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+	i := len(dAtA)
+	_ = i
+	var l int
+	_ = l
+	if len(m.BeforeSendHookAddresses) > 0 {
+		for iNdEx := len(m.BeforeSendHookAddresses) - 1; iNdEx >= 0; iNdEx-- {
+			i -= len(m.BeforeSendHookAddresses[iNdEx])
+			copy(dAtA[i:], m.BeforeSendHookAddresses[iNdEx])
+			i = encodeVarintQuery(dAtA, i, uint64(len(m.BeforeSendHookAddresses[iNdEx])))
+			i--
+			dAtA[i] = 0x12
+		}
+	}
+	if len(m.Denoms) > 0 {
+		for iNdEx := len(m.Denoms) - 1; iNdEx >= 0; iNdEx-- {
+			i -= len(m.Denoms[iNdEx])
+			copy(dAtA[i:], m.Denoms[iNdEx])
+			i = encodeVarintQuery(dAtA, i, uint64(len(m.Denoms[iNdEx])))
+			i--
+			dAtA[i] = 0xa
+		}
+	}
+	return len(dAtA) - i, nil
+}
+
 func encodeVarintQuery(dAtA []byte, offset int, v uint64) int {
 	offset -= sovQuery(v)
 	base := offset
@@ -1003,6 +1214,36 @@ func (m *QueryBeforeSendHookAddressResponse) Size() (n int) {
 	return n
 }
 
+func (m *QueryAllBeforeSendHooksAddressesRequest) Size() (n int) {
+	if m == nil {
+		return 0
+	}
+	var l int
+	_ = l
+	return n
+}
+
+func (m *QueryAllBeforeSendHooksAddressesResponse) Size() (n int) {
+	if m == nil {
+		return 0
+	}
+	var l int
+	_ = l
+	if len(m.Denoms) > 0 {
+		for _, s := range m.Denoms {
+			l = len(s)
+			n += 1 + l + sovQuery(uint64(l))
+		}
+	}
+	if len(m.BeforeSendHookAddresses) > 0 {
+		for _, s := range m.BeforeSendHookAddresses {
+			l = len(s)
+			n += 1 + l + sovQuery(uint64(l))
+		}
+	}
+	return n
+}
+
 func sovQuery(x uint64) (n int) {
 	return (math_bits.Len64(x|1) + 6) / 7
 }
@@ -1635,6 +1876,170 @@ func (m *QueryBeforeSendHookAddressResponse) Unmarshal(dAtA []byte) error {
 	}
 	return nil
 }
+func (m *QueryAllBeforeSendHooksAddressesRequest) Unmarshal(dAtA []byte) error {
+	l := len(dAtA)
+	iNdEx := 0
+	for iNdEx < l {
+		preIndex := iNdEx
+		var wire uint64
+		for shift := uint(0); ; shift += 7 {
+			if shift >= 64 {
+				return ErrIntOverflowQuery
+			}
+			if iNdEx >= l {
+				return io.ErrUnexpectedEOF
+			}
+			b := dAtA[iNdEx]
+			iNdEx++
+			wire |= uint64(b&0x7F) << shift
+			if b < 0x80 {
+				break
+			}
+		}
+		fieldNum := int32(wire >> 3)
+		wireType := int(wire & 0x7)
+		if wireType == 4 {
+			return fmt.Errorf("proto: QueryAllBeforeSendHooksAddressesRequest: wiretype end group for non-group")
+		}
+		if fieldNum <= 0 {
+			return fmt.Errorf("proto: QueryAllBeforeSendHooksAddressesRequest: illegal tag %d (wire type %d)", fieldNum, wire)
+		}
+		switch fieldNum {
+		default:
+			iNdEx = preIndex
+			skippy, err := skipQuery(dAtA[iNdEx:])
+			if err != nil {
+				return err
+			}
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
+				return ErrInvalidLengthQuery
+			}
+			if (iNdEx + skippy) > l {
+				return io.ErrUnexpectedEOF
+			}
+			iNdEx += skippy
+		}
+	}
+
+	if iNdEx > l {
+		return io.ErrUnexpectedEOF
+	}
+	return nil
+}
+func (m *QueryAllBeforeSendHooksAddressesResponse) Unmarshal(dAtA []byte) error {
+	l := len(dAtA)
+	iNdEx := 0
+	for iNdEx < l {
+		preIndex := iNdEx
+		var wire uint64
+		for shift := uint(0); ; shift += 7 {
+			if shift >= 64 {
+				return ErrIntOverflowQuery
+			}
+			if iNdEx >= l {
+				return io.ErrUnexpectedEOF
+			}
+			b := dAtA[iNdEx]
+			iNdEx++
+			wire |= uint64(b&0x7F) << shift
+			if b < 0x80 {
+				break
+			}
+		}
+		fieldNum := int32(wire >> 3)
+		wireType := int(wire & 0x7)
+		if wireType == 4 {
+			return fmt.Errorf("proto: QueryAllBeforeSendHooksAddressesResponse: wiretype end group for non-group")
+		}
+		if fieldNum <= 0 {
+			return fmt.Errorf("proto: QueryAllBeforeSendHooksAddressesResponse: illegal tag %d (wire type %d)", fieldNum, wire)
+		}
+		switch fieldNum {
+		case 1:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Denoms", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowQuery
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				stringLen |= uint64(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			intStringLen := int(stringLen)
+			if intStringLen < 0 {
+				return ErrInvalidLengthQuery
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex < 0 {
+				return ErrInvalidLengthQuery
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.Denoms = append(m.Denoms, string(dAtA[iNdEx:postIndex]))
+			iNdEx = postIndex
+		case 2:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field BeforeSendHookAddresses", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowQuery
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				stringLen |= uint64(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			intStringLen := int(stringLen)
+			if intStringLen < 0 {
+				return ErrInvalidLengthQuery
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex < 0 {
+				return ErrInvalidLengthQuery
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.BeforeSendHookAddresses = append(m.BeforeSendHookAddresses, string(dAtA[iNdEx:postIndex]))
+			iNdEx = postIndex
+		default:
+			iNdEx = preIndex
+			skippy, err := skipQuery(dAtA[iNdEx:])
+			if err != nil {
+				return err
+			}
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
+				return ErrInvalidLengthQuery
+			}
+			if (iNdEx + skippy) > l {
+				return io.ErrUnexpectedEOF
+			}
+			iNdEx += skippy
+		}
+	}
+
+	if iNdEx > l {
+		return io.ErrUnexpectedEOF
+	}
+	return nil
+}
 func skipQuery(dAtA []byte) (n int, err error) {
 	l := len(dAtA)
 	iNdEx := 0
diff --git a/x/tokenfactory/types/query.pb.gw.go b/x/tokenfactory/types/query.pb.gw.go
index 5d75e90baf7..5f9b20996ca 100644
--- a/x/tokenfactory/types/query.pb.gw.go
+++ b/x/tokenfactory/types/query.pb.gw.go
@@ -213,6 +213,24 @@ func local_request_Query_BeforeSendHookAddress_0(ctx context.Context, marshaler
 
 }
 
+func request_Query_AllBeforeSendHooksAddresses_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
+	var protoReq QueryAllBeforeSendHooksAddressesRequest
+	var metadata runtime.ServerMetadata
+
+	msg, err := client.AllBeforeSendHooksAddresses(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
+	return msg, metadata, err
+
+}
+
+func local_request_Query_AllBeforeSendHooksAddresses_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
+	var protoReq QueryAllBeforeSendHooksAddressesRequest
+	var metadata runtime.ServerMetadata
+
+	msg, err := server.AllBeforeSendHooksAddresses(ctx, &protoReq)
+	return msg, metadata, err
+
+}
+
 // RegisterQueryHandlerServer registers the http handlers for service Query to "mux".
 // UnaryRPC     :call QueryServer directly.
 // StreamingRPC :currently unsupported pending https://github.com/grpc/grpc-go/issues/906.
@@ -311,6 +329,29 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv
 
 	})
 
+	mux.Handle("GET", pattern_Query_AllBeforeSendHooksAddresses_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+		ctx, cancel := context.WithCancel(req.Context())
+		defer cancel()
+		var stream runtime.ServerTransportStream
+		ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)
+		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
+		rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req)
+		if err != nil {
+			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
+			return
+		}
+		resp, md, err := local_request_Query_AllBeforeSendHooksAddresses_0(rctx, inboundMarshaler, server, req, pathParams)
+		md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())
+		ctx = runtime.NewServerMetadataContext(ctx, md)
+		if err != nil {
+			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
+			return
+		}
+
+		forward_Query_AllBeforeSendHooksAddresses_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+
+	})
+
 	return nil
 }
 
@@ -432,6 +473,26 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie
 
 	})
 
+	mux.Handle("GET", pattern_Query_AllBeforeSendHooksAddresses_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+		ctx, cancel := context.WithCancel(req.Context())
+		defer cancel()
+		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
+		rctx, err := runtime.AnnotateContext(ctx, mux, req)
+		if err != nil {
+			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
+			return
+		}
+		resp, md, err := request_Query_AllBeforeSendHooksAddresses_0(rctx, inboundMarshaler, client, req, pathParams)
+		ctx = runtime.NewServerMetadataContext(ctx, md)
+		if err != nil {
+			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
+			return
+		}
+
+		forward_Query_AllBeforeSendHooksAddresses_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+
+	})
+
 	return nil
 }
 
@@ -443,6 +504,8 @@ var (
 	pattern_Query_DenomsFromCreator_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"osmosis", "tokenfactory", "v1beta1", "denoms_from_creator", "creator"}, "", runtime.AssumeColonVerbOpt(false)))
 
 	pattern_Query_BeforeSendHookAddress_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4, 2, 5}, []string{"osmosis", "tokenfactory", "v1beta1", "denoms", "denom", "before_send_hook"}, "", runtime.AssumeColonVerbOpt(false)))
+
+	pattern_Query_AllBeforeSendHooksAddresses_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"osmosis", "tokenfactory", "v1beta1", "all_before_send_hooks"}, "", runtime.AssumeColonVerbOpt(false)))
 )
 
 var (
@@ -453,4 +516,6 @@ var (
 	forward_Query_DenomsFromCreator_0 = runtime.ForwardResponseMessage
 
 	forward_Query_BeforeSendHookAddress_0 = runtime.ForwardResponseMessage
+
+	forward_Query_AllBeforeSendHooksAddresses_0 = runtime.ForwardResponseMessage
 )
diff --git a/x/twap/store.go b/x/twap/store.go
index c835a31c207..c07bb9e9786 100644
--- a/x/twap/store.go
+++ b/x/twap/store.go
@@ -12,14 +12,12 @@ import (
 )
 
 // NumRecordsToPrunePerBlock is the number of records to prune per block.
-// Two records are deleted per incentive record:
-// 1. by time index
-// 2. by pool index
-// Therefore, setting this to 1000 means 500 complete incentive records are deleted per block.
+// One record indexed by pool ID is deleted per incentive record.
+// Therefore, setting this to 200 means 200 complete incentive records are deleted per block.
 // The choice is somewhat arbitrary
 // However, th intuition is that the number should be low enough to not make blocks take longer but
 // not too small where it would take all the way to the next epoch.
-var NumRecordsToPrunePerBlock uint16 = 1000
+var NumRecordsToPrunePerBlock uint16 = 200
 
 type timeTooOldError struct {
 	Time time.Time
diff --git a/x/txfees/keeper/hooks.go b/x/txfees/keeper/hooks.go
index 745c1944090..2a3b1d63785 100644
--- a/x/txfees/keeper/hooks.go
+++ b/x/txfees/keeper/hooks.go
@@ -224,6 +224,8 @@ func (k Keeper) calculateDistributeAndTrackTakerFees(ctx sdk.Context, defaultFee
 func (k Keeper) swapNonNativeFeeToDenom(ctx sdk.Context, denomToSwapTo string, feeCollectorAddress sdk.AccAddress) sdk.Coin {
 	coinsToSwap := k.bankKeeper.GetAllBalances(ctx, feeCollectorAddress)
 	totalCoinOut := sdk.NewCoin(denomToSwapTo, osmomath.ZeroInt())
+	coinsNotSwapped := []string{}
+
 	for _, coin := range coinsToSwap {
 		if coin.Denom == denomToSwapTo {
 			continue
@@ -259,7 +261,7 @@ func (k Keeper) swapNonNativeFeeToDenom(ctx sdk.Context, denomToSwapTo string, f
 		}
 
 		// Do the swap of this fee token denom to base denom.
-		err = osmoutils.ApplyFuncIfNoError(ctx, func(cacheCtx sdk.Context) error {
+		err = osmoutils.ApplyFuncIfNoErrorLogToDebug(ctx, func(cacheCtx sdk.Context) error {
 			// We allow full slippage. There's not really an effective way to bound slippage until TWAP's land,
 			// but even then the point is a bit moot.
 			// The only thing that could be done is a costly griefing attack to reduce the amount of osmo given as tx fees.
@@ -269,7 +271,9 @@ func (k Keeper) swapNonNativeFeeToDenom(ctx sdk.Context, denomToSwapTo string, f
 			// We swap without charging a taker fee / sending to the non native fee collector, since these are funds that
 			// are accruing from the taker fee itself.
 			amtOutInt, err := k.poolManager.SwapExactAmountInNoTakerFee(cacheCtx, feeCollectorAddress, poolId, coin, denomToSwapTo, minAmountOut)
-			if err == nil {
+			if err != nil {
+				coinsNotSwapped = append(coinsNotSwapped, fmt.Sprintf("%s via pool %v", coin.String(), poolId))
+			} else {
 				totalCoinOut = totalCoinOut.Add(sdk.NewCoin(denomToSwapTo, amtOutInt))
 			}
 			return err
@@ -290,6 +294,9 @@ func (k Keeper) swapNonNativeFeeToDenom(ctx sdk.Context, denomToSwapTo string, f
 				},
 			})
 		}
+		if len(coinsNotSwapped) > 0 {
+			ctx.Logger().Info("The following non-native tokens were not swapped (see debug logs for further details): %s", coinsNotSwapped)
+		}
 	}
 	return totalCoinOut
 }
diff --git a/x/txfees/keeper/mempool-1559/code.go b/x/txfees/keeper/mempool-1559/code.go
index d41291ca1a3..21a8b221ac0 100644
--- a/x/txfees/keeper/mempool-1559/code.go
+++ b/x/txfees/keeper/mempool-1559/code.go
@@ -8,6 +8,8 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
+	"github.com/cometbft/cometbft/libs/log"
+
 	osmomath "github.com/osmosis-labs/osmosis/osmomath"
 )
 
@@ -109,14 +111,14 @@ var CurEipState = EipState{
 
 // startBlock is executed at the start of each block and is responsible for resetting the state
 // of the CurBaseFee when the node reaches the reset interval
-func (e *EipState) startBlock(height int64) {
+func (e *EipState) startBlock(height int64, logger log.Logger) {
 	e.lastBlockHeight = height
 	e.totalGasWantedThisBlock = 0
 
 	if e.CurBaseFee.Equal(sdk.NewDec(0)) {
 		// CurBaseFee has not been initialized yet. This only happens when the node has just started.
 		// Try to read the previous value from the backup file and if not available, set it to the default.
-		e.CurBaseFee = e.tryLoad()
+		e.CurBaseFee = e.tryLoad(logger)
 	}
 
 	// we reset the CurBaseFee every ResetInterval
@@ -217,24 +219,24 @@ func (e EipState) tryPersist() {
 
 // tryLoad reads eip1559 state from disk and initializes the CurEipState to
 // the previous state when a node is restarted
-func (e *EipState) tryLoad() osmomath.Dec {
+func (e *EipState) tryLoad(logger log.Logger) osmomath.Dec {
 	rwMtx.Lock()
 	defer rwMtx.Unlock()
 	bz, err := os.ReadFile(e.BackupFilePath)
 	if err != nil {
-		fmt.Println("Error reading eip1559 state", err)
-		fmt.Println("Setting eip1559 state to default value", MinBaseFee)
+		logger.Debug("Error reading eip1559 state", "err", err)
+		logger.Debug("Setting eip1559 state to default value", "MinBaseFee", MinBaseFee)
 		return MinBaseFee.Clone()
 	}
 
 	var loaded EipState
 	err = json.Unmarshal(bz, &loaded)
 	if err != nil {
-		fmt.Println("Error unmarshalling eip1559 state", err)
-		fmt.Println("Setting eip1559 state to default value", MinBaseFee)
+		logger.Debug("Error unmarshalling eip1559 state", "err", err)
+		logger.Debug("Setting eip1559 state to default value", "MinBaseFee", MinBaseFee)
 		return MinBaseFee.Clone()
 	}
 
-	fmt.Println("Loaded eip1559 state. CurBaseFee=", loaded.CurBaseFee)
+	logger.Info("Loaded eip1559 state", "CurBaseFee", loaded.CurBaseFee)
 	return loaded.CurBaseFee.Clone()
 }
diff --git a/x/txfees/keeper/mempool-1559/code_test.go b/x/txfees/keeper/mempool-1559/code_test.go
index af3512606d1..19832db0df2 100644
--- a/x/txfees/keeper/mempool-1559/code_test.go
+++ b/x/txfees/keeper/mempool-1559/code_test.go
@@ -33,7 +33,7 @@ func TestUpdateBaseFee(t *testing.T) {
 		ctx := sdk.NewContext(nil, tmproto.Header{Height: int64(i)}, false, log.NewNopLogger())
 
 		// start the new block
-		eip.startBlock(int64(i))
+		eip.startBlock(int64(i), ctx.Logger())
 
 		// generate transactions
 		if i%10 == 0 {
diff --git a/x/txfees/keeper/mempool-1559/state_compatible_update_logic.go b/x/txfees/keeper/mempool-1559/state_compatible_update_logic.go
index ad4c1bf65e5..fe3f9350be9 100644
--- a/x/txfees/keeper/mempool-1559/state_compatible_update_logic.go
+++ b/x/txfees/keeper/mempool-1559/state_compatible_update_logic.go
@@ -11,7 +11,7 @@ func DeliverTxCode(ctx sdk.Context, tx sdk.FeeTx) {
 // BeginBlockCode runs at the start of every block and it
 // reset the CurEipStates lastBlockHeight and totalGasWantedThisBlock
 func BeginBlockCode(ctx sdk.Context) {
-	CurEipState.startBlock(ctx.BlockHeight())
+	CurEipState.startBlock(ctx.BlockHeight(), ctx.Logger())
 }
 
 // EndBlockCode runs at the end of every block and it