diff --git a/Makefile b/Makefile
index b6b749271..8bf3b11ab 100644
--- a/Makefile
+++ b/Makefile
@@ -250,4 +250,4 @@ stop-docker-container:
 
 mocks:
 	@echo "Regenerate mocks..."
-	@go generate ./...
+	@go generate ./...
\ No newline at end of file
diff --git a/README.md b/README.md
index 566fa437a..d016795da 100644
--- a/README.md
+++ b/README.md
@@ -9,6 +9,12 @@ You can check the documentation here: https://docs.neutron.org/
 
 You can check out the build instructions here: https://docs.neutron.org/neutron/build-and-run/overview
 
+## Sync and join the network
+
+```bash
+bash contrib/statesync.bash
+```
+
 ## Examples
 
 You can check out the example contracts here: https://github.com/neutron-org/neutron-contracts
diff --git a/buf.work.yaml b/buf.work.yaml
index d050a7aac..dcc4fb9c9 100644
--- a/buf.work.yaml
+++ b/buf.work.yaml
@@ -6,4 +6,4 @@
 version: v1
 directories:
   - proto
-  # - third_party/proto
+  - third_party/proto
\ No newline at end of file
diff --git a/contracts/investors_vesting_vault.wasm b/contracts/investors_vesting_vault.wasm
new file mode 100644
index 000000000..befc864e5
Binary files /dev/null and b/contracts/investors_vesting_vault.wasm differ
diff --git a/contracts/neutron_voting_registry.wasm b/contracts/neutron_voting_registry.wasm
index bad786137..83ec36a45 100644
Binary files a/contracts/neutron_voting_registry.wasm and b/contracts/neutron_voting_registry.wasm differ
diff --git a/contracts/vesting_investors.wasm b/contracts/vesting_investors.wasm
new file mode 100644
index 000000000..3618a2aca
Binary files /dev/null and b/contracts/vesting_investors.wasm differ
diff --git a/contrib/prototools-docker/Dockerfile b/contrib/prototools-docker/Dockerfile
index 7d5af0d1f..02354cd87 100644
--- a/contrib/prototools-docker/Dockerfile
+++ b/contrib/prototools-docker/Dockerfile
@@ -39,7 +39,7 @@ RUN GO111MODULE=on go get \
 
 RUN upx --lzma /usr/local/bin/*
 
-FROM golang:1.17.3-alpine
+FROM golang:1.20.9-alpine
 ENV LD_LIBRARY_PATH=/lib64:/lib
 
 WORKDIR /work
diff --git a/contrib/statesync.bash b/contrib/statesync.bash
new file mode 100644
index 000000000..96d84b989
--- /dev/null
+++ b/contrib/statesync.bash
@@ -0,0 +1,73 @@
+#!/bin/bash
+# microtick and bitcanna contributed significantly here.
+# Pebbledb state sync script.
+# invoke like: bash contrib/statesync.bash
+
+## USAGE RUNDOWN
+# Not for use on live nodes
+# For use when testing.
+
+set -uxe
+
+# Set Golang environment variables.
+# ! Adapt as required, depending on your system configuration
+#export GOPATH=~/go
+#export PATH=$PATH:~/go/bin
+
+# Install with pebbledb (uncomment for incredible performance)
+#go mod edit -replace github.com/tendermint/tm-db=github.com/baabeetaa/tm-db@pebble
+#go mod tidy
+
+# go install -ldflags '-w -s -X github.com/cosmos/cosmos-sdk/types.DBBackend=pebbledb -X github.com/tendermint/tm-db.ForceSync=1' -tags pebbledb ./...
+
+# install (comment if using pebble for incredible performance)
+go install ./...
+
+
+# go install -ldflags '-w -s -X github.com/cosmos/cosmos-sdk/types.DBBackend=pebbledb -X github.com/tendermint/tm-db.ForceSync=1' -tags pebbledb ./...
+
+# NOTE: ABOVE YOU CAN USE ALTERNATIVE DATABASES, HERE ARE THE EXACT COMMANDS
+# go install -ldflags '-w -s -X github.com/cosmos/cosmos-sdk/types.DBBackend=rocksdb' -tags rocksdb ./...
+# go install -ldflags '-w -s -X github.com/cosmos/cosmos-sdk/types.DBBackend=badgerdb' -tags badgerdb ./...
+# go install -ldflags '-w -s -X github.com/cosmos/cosmos-sdk/types.DBBackend=boltdb' -tags boltdb ./...
+# go install -ldflags '-w -s -X github.com/cosmos/cosmos-sdk/types.DBBackend=pebbledb -X github.com/tendermint/tm-db.ForceSync=1' -tags pebbledb ./...
+
+
+# Initialize chain.
+neutrond init test
+
+# Get Genesis
+wget -O ~/.neutrond/config/genesis.json https://raw.githubusercontent.com/neutron-org/mainnet-assets/main/neutron-1-genesis.json
+
+
+# Get "trust_hash" and "trust_height".
+INTERVAL=100
+LATEST_HEIGHT=$(curl -s https://rpc-kralum.neutron-1.neutron.org/block | jq -r .result.block.header.height)
+BLOCK_HEIGHT=$((LATEST_HEIGHT - INTERVAL))
+TRUST_HASH=$(curl -s "https://rpc-kralum.neutron-1.neutron.org/block?height=$BLOCK_HEIGHT" | jq -r .result.block_id.hash)
+
+# Print out block and transaction hash from which to sync state.
+echo "trust_height: $BLOCK_HEIGHT"
+echo "trust_hash: $TRUST_HASH"
+
+# Export state sync variables.
+export NEUTROND_STATESYNC_ENABLE=true
+export NEUTROND_P2P_MAX_NUM_OUTBOUND_PEERS=500
+export NEUTROND_STATESYNC_RPC_SERVERS="https://rpc-kralum.neutron-1.neutron.org:443,https://rpc-kralum.neutron-1.neutron.org:443"
+export NEUTROND_STATESYNC_TRUST_HEIGHT=$BLOCK_HEIGHT
+export NEUTROND_STATESYNC_TRUST_HASH=$TRUST_HASH
+export NEUTROND_P2P_LADDR=tcp://0.0.0.0:7777
+export NEUTROND_RPC_LADDR=tcp://127.0.0.1:7711
+export NEUTROND_GRPC_ADDRESS=127.0.0.1:7712
+export NEUTROND_GRPC_WEB_ADDRESS=127.0.0.1:8014
+export NEUTROND_API_ADDRESS=tcp://127.0.0.1:8013
+export NEUTROND_NODE=tcp://127.0.0.1:8011
+export NEUTROND_P2P_MAX_NUM_INBOUND_PEERS=500
+export NEUTROND_RPC_PPROF_LADDR=127.0.0.1:6969
+
+# Fetch and set list of seeds from chain registry.
+NEUTROND_P2P_SEEDS=$(curl -s https://raw.githubusercontent.com/cosmos/chain-registry/master/neutron/chain.json | jq -r '[foreach .peers.seeds[] as $item (""; "\($item.id)@\($item.address)")] | join(",")')
+export NEUTROND_P2P_SEEDS
+
+# Start chain.
+neutrond start --x-crisis-skip-assert-invariants --iavl-disable-fastnode false 
diff --git a/network/init-neutrond.sh b/network/init-neutrond.sh
index 390284816..9503c3fef 100755
--- a/network/init-neutrond.sh
+++ b/network/init-neutrond.sh
@@ -23,6 +23,7 @@ CHAIN_DIR="$BASE_DIR/$CHAINID"
 GENESIS_PATH="$CHAIN_DIR/config/genesis.json"
 
 ADMIN_ADDRESS=$($BINARY keys show demowallet1 -a --home "$CHAIN_DIR" --keyring-backend test)
+SECOND_MULTISIG_ADDRESS=$($BINARY keys show demowallet2 -a --home "$CHAIN_DIR" --keyring-backend test)
 # MAIN_DAO
 DAO_CONTRACT=$CONTRACTS_BINARIES_DIR/cwd_core.wasm
 PRE_PROPOSAL_CONTRACT=$CONTRACTS_BINARIES_DIR/cwd_pre_propose_single.wasm
@@ -33,6 +34,9 @@ PROPOSAL_MULTIPLE_CONTRACT=$CONTRACTS_BINARIES_DIR/cwd_proposal_multiple.wasm
 VOTING_REGISTRY_CONTRACT=$CONTRACTS_BINARIES_DIR/neutron_voting_registry.wasm
 # VAULTS
 NEUTRON_VAULT_CONTRACT=$CONTRACTS_BINARIES_DIR/neutron_vault.wasm
+NEUTRON_INVESTORS_VAULT=$CONTRACTS_BINARIES_DIR/investors_vesting_vault.wasm
+# VESTING
+NEUTRON_VESTING_INVESTORS=$CONTRACTS_BINARIES_DIR/vesting_investors.wasm
 # RESERVE
 RESERVE_CONTRACT=$CONTRACTS_BINARIES_DIR/neutron_reserve.wasm
 DISTRIBUTION_CONTRACT=$CONTRACTS_BINARIES_DIR/neutron_distribution.wasm
@@ -99,6 +103,12 @@ DAO_CORE_LABEL="neutron.core"
 NEUTRON_VAULT_NAME="Neutron Vault"
 NEUTRON_VAULT_DESCRIPTION="Vault to put NTRN tokens to get voting power"
 NEUTRON_VAULT_LABEL="neutron.voting.vaults.neutron"
+NEUTRON_INVESTORS_VAULT_NAME="Neutron Investors Vault"
+NEUTRON_INVESTORS_VAULT_DESCRIPTION="Vault sourcing voting power form investors vesting"
+NEUTRON_INVESTORS_VAULT_LABEL="neutron.voting.vaults.investors"
+
+# VESTING (for tests purposes)
+NEUTRON_VESTING_INVESTORS_LABEL="neutron.vesting.investors"
 
 ## Reserve
 RESERVE_DISTRIBUTION_RATE=0
@@ -148,6 +158,9 @@ PROPOSAL_MULTIPLE_CONTRACT_BINARY_ID=$(store_binary     "$PROPOSAL_MULTIPLE_CONT
 VOTING_REGISTRY_CONTRACT_BINARY_ID=$(store_binary       "$VOTING_REGISTRY_CONTRACT")
 # VAULTS
 NEUTRON_VAULT_CONTRACT_BINARY_ID=$(store_binary         "$NEUTRON_VAULT_CONTRACT")
+NEUTRON_INVESTORS_VAULT_CONTRACT_BINARY_ID=$(store_binary "$NEUTRON_INVESTORS_VAULT")
+# VESTING
+NEUTRON_VESTING_INVESTORS_BINARY_ID=$(store_binary      "$NEUTRON_VESTING_INVESTORS")
 # RESERVE
 DISTRIBUTION_CONTRACT_BINARY_ID=$(store_binary          "$DISTRIBUTION_CONTRACT")
 RESERVE_CONTRACT_BINARY_ID=$(store_binary               "$RESERVE_CONTRACT")
@@ -177,31 +190,35 @@ INSTANCE_ID_COUNTER=1
 
 # VAULTS
 NEUTRON_VAULT_CONTRACT_ADDRESS=$(genaddr                "$NEUTRON_VAULT_CONTRACT_BINARY_ID") && (( INSTANCE_ID_COUNTER++ ))
+NEUTRON_INVESTORS_VAULT_CONTRACT_ADDRESS=$(genaddr      "$NEUTRON_INVESTORS_VAULT_CONTRACT_BINARY_ID") && (( INSTANCE_ID_COUNTER++ ))
+
+# VESTING
+NEUTRON_VESTING_INVESTORS_CONTRACT_ADDRRES=$(genaddr    "$NEUTRON_VESTING_INVESTORS_BINARY_ID") && (( INSTANCE_ID_COUNTER++ ))
 
 # MAIN_DAO
 DAO_CONTRACT_ADDRESS=$(genaddr                          "$DAO_CONTRACT_BINARY_ID") && (( INSTANCE_ID_COUNTER++ ))
+VOTING_REGISTRY_CONTRACT_ADDRESS=$(genaddr              "$VOTING_REGISTRY_CONTRACT_BINARY_ID") && (( INSTANCE_ID_COUNTER++ ))
 PROPOSAL_SINGLE_CONTRACT_ADDRESS=$(genaddr              "$PROPOSAL_CONTRACT_BINARY_ID") && (( INSTANCE_ID_COUNTER++ ))
 PRE_PROPOSAL_CONTRACT_ADDRESS=$(genaddr                 "$PRE_PROPOSAL_CONTRACT_BINARY_ID") && (( INSTANCE_ID_COUNTER++ ))
 PROPOSAL_MULTIPLE_CONTRACT_ADDRESS=$(genaddr            "$PROPOSAL_MULTIPLE_CONTRACT_BINARY_ID") && (( INSTANCE_ID_COUNTER++ ))
 PRE_PROPOSAL_MULTIPLE_CONTRACT_ADDRESS=$(genaddr        "$PRE_PROPOSAL_MULTIPLE_CONTRACT_BINARY_ID") && (( INSTANCE_ID_COUNTER++ ))
 PROPOSAL_OVERRULE_CONTRACT_ADDRESS=$(genaddr            "$PROPOSAL_CONTRACT_BINARY_ID") && (( INSTANCE_ID_COUNTER++ ))
 PRE_PROPOSAL_OVERRULE_CONTRACT_ADDRESS=$(genaddr        "$PRE_PROPOSAL_OVERRULE_CONTRACT_BINARY_ID") && (( INSTANCE_ID_COUNTER++ ))
-VOTING_REGISTRY_CONTRACT_ADDRESS=$(genaddr              "$VOTING_REGISTRY_CONTRACT_BINARY_ID") && (( INSTANCE_ID_COUNTER++ ))
 
 # RESERVE
 RESERVE_CONTRACT_ADDRESS=$(genaddr                     "$RESERVE_CONTRACT_BINARY_ID") && (( INSTANCE_ID_COUNTER++ ))
 DISTRIBUTION_CONTRACT_ADDRESS=$(genaddr                "$DISTRIBUTION_CONTRACT_BINARY_ID") && (( INSTANCE_ID_COUNTER++ ))
 # SUBDAOS
 SECURITY_SUBDAO_CORE_CONTRACT_ADDRESS=$(genaddr        "$SUBDAO_CORE_BINARY_ID") && (( INSTANCE_ID_COUNTER++ ))
-SECURITY_SUBDAO_PROPOSAL_CONTRACT_ADDRESS=$(genaddr    "$SUBDAO_PROPOSAL_BINARY_ID") && (( INSTANCE_ID_COUNTER++ ))
-SECURITY_SUBDAO_PRE_PROPOSE_CONTRACT_ADDRESS=$(genaddr "$SUBDAO_PROPOSAL_BINARY_ID") && (( INSTANCE_ID_COUNTER++ ))
 SECURITY_SUBDAO_VOTING_CONTRACT_ADDRESS=$(genaddr      "$CW4_VOTING_CONTRACT_BINARY_ID") && (( INSTANCE_ID_COUNTER++ ))
 SECURITY_SUBDAO_GROUP_CONTRACT_ADDRESS=$(genaddr       "$CW4_GROUP_CONTRACT_BINARY_ID") && (( INSTANCE_ID_COUNTER++ ))
+SECURITY_SUBDAO_PROPOSAL_CONTRACT_ADDRESS=$(genaddr    "$SUBDAO_PROPOSAL_BINARY_ID") && (( INSTANCE_ID_COUNTER++ ))
+SECURITY_SUBDAO_PRE_PROPOSE_CONTRACT_ADDRESS=$(genaddr "$SUBDAO_PROPOSAL_BINARY_ID") && (( INSTANCE_ID_COUNTER++ ))
 GRANTS_SUBDAO_CORE_CONTRACT_ADDRESS=$(genaddr          "$SUBDAO_CORE_BINARY_ID") && (( INSTANCE_ID_COUNTER++ ))
+GRANTS_SUBDAO_VOTING_CONTRACT_ADDRESS=$(genaddr        "$CW4_VOTING_CONTRACT_BINARY_ID") && (( INSTANCE_ID_COUNTER++ ))
 GRANTS_SUBDAO_PROPOSAL_CONTRACT_ADDRESS=$(genaddr      "$SUBDAO_PROPOSAL_BINARY_ID") && (( INSTANCE_ID_COUNTER++ ))
 GRANTS_SUBDAO_PRE_PROPOSE_CONTRACT_ADDRESS=$(genaddr   "$SUBDAO_PRE_PROPOSE_BINARY_ID") && (( INSTANCE_ID_COUNTER++ ))
 GRANTS_SUBDAO_TIMELOCK_CONTRACT_ADDRESS=$(genaddr      "$SUBDAO_TIMELOCK_BINARY_ID") && (( INSTANCE_ID_COUNTER++ ))
-GRANTS_SUBDAO_VOTING_CONTRACT_ADDRESS=$(genaddr        "$CW4_VOTING_CONTRACT_BINARY_ID") && (( INSTANCE_ID_COUNTER++ ))
 GRANTS_SUBDAO_GROUP_CONTRACT_ADDRESS=$(genaddr         "$CW4_GROUP_CONTRACT_BINARY_ID") && (( INSTANCE_ID_COUNTER++ ))
 
 function check_json() {
@@ -339,7 +356,8 @@ PROPOSAL_OVERRULE_INIT_MSG_BASE64=$(json_to_base64 "$PROPOSAL_OVERRULE_INIT_MSG"
 VOTING_REGISTRY_INIT_MSG='{
   "owner": "'"$DAO_CONTRACT_ADDRESS"'",
   "voting_vaults": [
-    "'"$NEUTRON_VAULT_CONTRACT_ADDRESS"'"
+    "'"$NEUTRON_VAULT_CONTRACT_ADDRESS"'",
+    "'"$NEUTRON_INVESTORS_VAULT_CONTRACT_ADDRESS"'"
   ]
 }'
 VOTING_REGISTRY_INIT_MSG_BASE64=$(json_to_base64 "$VOTING_REGISTRY_INIT_MSG")
@@ -410,6 +428,19 @@ NEUTRON_VAULT_INIT='{
   "description":  "'"$NEUTRON_VAULT_DESCRIPTION"'"
 }'
 
+NEUTRON_INVESTORS_VAULT_INIT='{
+     "vesting_contract_address": "'"$NEUTRON_VESTING_INVESTORS_CONTRACT_ADDRRES"'",
+     "owner": "'"$DAO_CONTRACT_ADDRESS"'",
+     "description": "'"$NEUTRON_INVESTORS_VAULT_DESCRIPTION"'",
+     "name": "'"$NEUTRON_INVESTORS_VAULT_NAME"'"
+}'
+
+# VESTING
+NEUTRON_VESTING_INVESTORS_INIT='{
+    "owner": "'"$ADMIN_ADDRESS"'",
+    "token_info_manager": "'"$ADMIN_ADDRESS"'"
+}'
+
 # CW4 MODULES FOR SUBDAOS
 
 CW4_VOTE_INIT_MSG='{
@@ -418,6 +449,10 @@ CW4_VOTE_INIT_MSG='{
     {
       "addr": "'"$ADMIN_ADDRESS"'",
       "weight": 1
+    },
+    {
+      "addr": "'"$SECOND_MULTISIG_ADDRESS"'",
+      "weight": 1
     }
   ]
 }'
@@ -492,12 +527,12 @@ SECURITY_SUBDAO_CORE_INIT_MSG='{
 # GRANTS_SUBDAO
 
 GRANTS_SUBDAO_TIMELOCK_INIT_MSG='{
-  "overrule_pre_propose": "'"$PROPOSAL_OVERRULE_CONTRACT_ADDRESS"'"
+  "overrule_pre_propose": "'"$PRE_PROPOSAL_OVERRULE_CONTRACT_ADDRESS"'"
 }'
 GRANTS_SUBDAO_TIMELOCK_INIT_MSG_BASE64=$(json_to_base64 "$GRANTS_SUBDAO_TIMELOCK_INIT_MSG")
 
 GRANTS_SUBDAO_PRE_PROPOSE_INIT_MSG='{
-  "open_proposal_submission": true,
+  "open_proposal_submission": false,
   "timelock_module_instantiate_info": {
     "admin": {
       "address": {
@@ -534,7 +569,7 @@ GRANTS_SUBDAO_PROPOSAL_INIT_MSG='{
    "close_proposal_on_execution_failure":false,
    "threshold":{
       "absolute_count":{
-         "threshold": "1"
+         "threshold": "2"
       }
    }
 }'
@@ -584,12 +619,14 @@ function init_contract() {
 # The following code is to add contracts instantiations messages to genesis
 # It affects the section of predicting contracts addresses at the beginning of the script
 # If you're to do any changes, please do it consistently in both sections
-init_contract "$NEUTRON_VAULT_CONTRACT_BINARY_ID"   "$NEUTRON_VAULT_INIT"             "$NEUTRON_VAULT_LABEL"
-init_contract "$DAO_CONTRACT_BINARY_ID"             "$DAO_INIT"                       "$DAO_CORE_LABEL"
-init_contract "$RESERVE_CONTRACT_BINARY_ID"         "$RESERVE_INIT"                   "$RESERVE_LABEL"
-init_contract "$DISTRIBUTION_CONTRACT_BINARY_ID"    "$DISTRIBUTION_INIT"              "$DISTRIBUTION_LABEL"
-init_contract "$SUBDAO_CORE_BINARY_ID"              "$SECURITY_SUBDAO_CORE_INIT_MSG"  "$SECURITY_SUBDAO_CORE_LABEL"
-init_contract "$SUBDAO_CORE_BINARY_ID"              "$GRANTS_SUBDAO_CORE_INIT_MSG"    "$GRANTS_SUBDAO_CORE_LABEL"
+init_contract "$NEUTRON_VAULT_CONTRACT_BINARY_ID"            "$NEUTRON_VAULT_INIT"             "$NEUTRON_VAULT_LABEL"
+init_contract "$NEUTRON_INVESTORS_VAULT_CONTRACT_BINARY_ID"  "$NEUTRON_INVESTORS_VAULT_INIT"   "$NEUTRON_INVESTORS_VAULT_LABEL"
+init_contract "$NEUTRON_VESTING_INVESTORS_BINARY_ID"         "$NEUTRON_VESTING_INVESTORS_INIT"  "$NEUTRON_VESTING_INVESTORS_LABEL"
+init_contract "$DAO_CONTRACT_BINARY_ID"                      "$DAO_INIT"                       "$DAO_CORE_LABEL"
+init_contract "$RESERVE_CONTRACT_BINARY_ID"                  "$RESERVE_INIT"                   "$RESERVE_LABEL"
+init_contract "$DISTRIBUTION_CONTRACT_BINARY_ID"             "$DISTRIBUTION_INIT"              "$DISTRIBUTION_LABEL"
+init_contract "$SUBDAO_CORE_BINARY_ID"                       "$SECURITY_SUBDAO_CORE_INIT_MSG"  "$SECURITY_SUBDAO_CORE_LABEL"
+init_contract "$SUBDAO_CORE_BINARY_ID"                       "$GRANTS_SUBDAO_CORE_INIT_MSG"    "$GRANTS_SUBDAO_CORE_LABEL"
 
 ADD_SUBDAOS_MSG='{
   "update_sub_daos": {
@@ -606,9 +643,47 @@ ADD_SUBDAOS_MSG='{
 }'
 check_json "$ADD_SUBDAOS_MSG"
 
+SET_VESTING_TOKEN_MSG='{
+    "set_vesting_token": {
+      "vesting_token": {
+         "native_token": {
+           "denom": "'"$STAKEDENOM"'"
+         }
+      }
+    }
+}'
+
+REGISTER_VESTING_ACCOUNTS_MSG='{
+  "register_vesting_accounts": {
+    "vesting_accounts": [
+      {
+        "address": "'"$ADMIN_ADDRESS"'",
+        "schedules": [
+          {
+            "end_point": {
+              "amount": "1000",
+              "time": 1814821200
+            },
+            "start_point": {
+              "amount": "0",
+              "time": 1720213200
+            }
+          }
+        ]
+      }
+    ]
+  }
+}'
+
 $BINARY add-wasm-message execute "$DAO_CONTRACT_ADDRESS" "$ADD_SUBDAOS_MSG" \
   --run-as "$DAO_CONTRACT_ADDRESS" --home "$CHAIN_DIR"
 
+$BINARY add-wasm-message execute "$NEUTRON_VESTING_INVESTORS_CONTRACT_ADDRRES" "$SET_VESTING_TOKEN_MSG" \
+  --run-as "$ADMIN_ADDRESS" --home "$CHAIN_DIR"
+
+$BINARY add-wasm-message execute "$NEUTRON_VESTING_INVESTORS_CONTRACT_ADDRRES" "$REGISTER_VESTING_ACCOUNTS_MSG" \
+  --amount 1000untrn --run-as "$ADMIN_ADDRESS" --home "$CHAIN_DIR"
+
 function set_genesis_param() {
   param_name=$1
   param_value=$2
diff --git a/proto/buf.lock b/proto/buf.lock
index 2f1d9f92f..f802501e0 100644
--- a/proto/buf.lock
+++ b/proto/buf.lock
@@ -16,18 +16,8 @@ deps:
     repository: gogo-proto
     commit: 5e5b9fdd01804356895f8f79a6f1ddc1
     digest: shake256:0b85da49e2e5f9ebc4806eae058e2f56096ff3b1c59d1fb7c190413dd15f45dd456f0b69ced9059341c80795d2b6c943de15b120a9e0308b499e43e4b5fc2952
-  - remote: buf.build
-    owner: cosmos
-    repository: ibc
-    commit: f6d24a1cded4439f95a8069c4572f08c
-    digest: shake256:af93995752551b1b45d22b636423fb87b58e3688eb19680606d007fb2255970acf434733d7679af2c9af8e42976dc13c0650537555b7fc3ccd2e9df8fd351e45
-  - remote: buf.build
-    owner: cosmos
-    repository: ics23
-    commit: 55085f7c710a45f58fa09947208eb70b
-    digest: shake256:9bf0bc495b5a11c88d163d39ef521bc4b00bc1374a05758c91d82821bdc61f09e8c2c51dda8452529bf80137f34d852561eacbe9550a59015d51cecb0dacb628
   - remote: buf.build
     owner: googleapis
     repository: googleapis
-    commit: cc916c31859748a68fd229a3c8d7a2e8
-    digest: shake256:469b049d0eb04203d5272062636c078decefc96fec69739159c25d85349c50c34c7706918a8b216c5c27f76939df48452148cff8c5c3ae77fa6ba5c25c1b8bf8
+    commit: 28151c0d0a1641bf938a7672c500e01d
+    digest: shake256:49215edf8ef57f7863004539deff8834cfb2195113f0b890dd1f67815d9353e28e668019165b9d872395871eeafcbab3ccfdb2b5f11734d3cca95be9e8d139de
diff --git a/proto/buf.yaml b/proto/buf.yaml
index 65944af23..fa8ad0cd0 100644
--- a/proto/buf.yaml
+++ b/proto/buf.yaml
@@ -5,7 +5,6 @@ deps:
   - buf.build/cosmos/cosmos-sdk:v0.47.0
   - buf.build/cosmos/gogo-proto
   - buf.build/googleapis/googleapis
-  - buf.build/cosmos/ibc
 #  - buf.build/osmosis-labs/osmosis
 breaking:
   use:
diff --git a/proto/neutron/contractmanager/genesis.proto b/proto/neutron/contractmanager/genesis.proto
index bcbd3ea87..d4a0ee3d3 100644
--- a/proto/neutron/contractmanager/genesis.proto
+++ b/proto/neutron/contractmanager/genesis.proto
@@ -14,4 +14,4 @@ message GenesisState {
   // List of the contract failures
   repeated Failure failures_list = 2 [ (gogoproto.nullable) = false ];
   // this line is used by starport scaffolding # genesis/proto/state
-}
+}
\ No newline at end of file
diff --git a/proto/neutron/contractmanager/query.proto b/proto/neutron/contractmanager/query.proto
index 973cd15ef..c2e059243 100644
--- a/proto/neutron/contractmanager/query.proto
+++ b/proto/neutron/contractmanager/query.proto
@@ -16,7 +16,7 @@ service Query {
   rpc Params(QueryParamsRequest) returns (QueryParamsResponse) {
     option (google.api.http).get = "/neutron/contractmanager/params";
   }
-  
+
   // Queries a Failure by contract address and failure ID.
   rpc AddressFailure(QueryFailuresRequest) returns (QueryFailuresResponse) {
     option (google.api.http).get = "/neutron/contractmanager/failures/{address}/{failure_id}";
@@ -60,4 +60,4 @@ message QueryFailuresResponse {
   cosmos.base.query.v1beta1.PageResponse pagination = 2;
 }
 
-// this line is used by starport scaffolding # 3
+// this line is used by starport scaffolding # 3
\ No newline at end of file
diff --git a/proto/neutron/cron/genesis.proto b/proto/neutron/cron/genesis.proto
index 2045b3c66..6cc3aca5a 100644
--- a/proto/neutron/cron/genesis.proto
+++ b/proto/neutron/cron/genesis.proto
@@ -13,4 +13,4 @@ message GenesisState {
   repeated Schedule scheduleList = 2 [ (gogoproto.nullable) = false ];
   Params params = 1 [ (gogoproto.nullable) = false ];
   // this line is used by starport scaffolding # genesis/proto/state
-}
+}
\ No newline at end of file
diff --git a/proto/neutron/feeburner/genesis.proto b/proto/neutron/feeburner/genesis.proto
index 9959a4be9..43175b7c5 100644
--- a/proto/neutron/feeburner/genesis.proto
+++ b/proto/neutron/feeburner/genesis.proto
@@ -12,6 +12,6 @@ option go_package = "github.com/neutron-org/neutron/x/feeburner/types";
 message GenesisState {
   Params params = 1 [ (gogoproto.nullable) = false ];
   TotalBurnedNeutronsAmount total_burned_neutrons_amount = 2
-      [ (gogoproto.nullable) = false ];
+  [ (gogoproto.nullable) = false ];
   // this line is used by starport scaffolding # genesis/proto/state
-}
+}
\ No newline at end of file
diff --git a/proto/neutron/feeburner/query.proto b/proto/neutron/feeburner/query.proto
index c0cce05ba..e275b26af 100644
--- a/proto/neutron/feeburner/query.proto
+++ b/proto/neutron/feeburner/query.proto
@@ -43,7 +43,7 @@ message QueryTotalBurnedNeutronsAmountRequest {}
 // Query/QueryTotalBurnedNeutronsAmount method.
 message QueryTotalBurnedNeutronsAmountResponse {
   TotalBurnedNeutronsAmount total_burned_neutrons_amount = 1
-      [ (gogoproto.nullable) = false ];
+  [ (gogoproto.nullable) = false ];
 }
 
-// this line is used by starport scaffolding # 3
+// this line is used by starport scaffolding # 3
\ No newline at end of file
diff --git a/proto/neutron/feerefunder/fee.proto b/proto/neutron/feerefunder/fee.proto
index f0142f7ca..7aae7ccfa 100644
--- a/proto/neutron/feerefunder/fee.proto
+++ b/proto/neutron/feerefunder/fee.proto
@@ -1,13 +1,11 @@
 syntax = "proto3";
 package neutron.feerefunder;
 
-// this line is used by starport scaffolding # proto/tx/import
-
-option go_package = "github.com/neutron-org/neutron/x/feerefunder/types";
-
 import "cosmos/base/v1beta1/coin.proto";
 import "gogoproto/gogo.proto";
 
+option go_package = "github.com/neutron-org/neutron/x/feerefunder/types";
+
 // Fee defines the ICS29 receive, acknowledgement and timeout fees
 message Fee {
   // the packet receive fee
diff --git a/proto/neutron/feerefunder/genesis.proto b/proto/neutron/feerefunder/genesis.proto
index 44c4d2cd5..3a8d3be2d 100644
--- a/proto/neutron/feerefunder/genesis.proto
+++ b/proto/neutron/feerefunder/genesis.proto
@@ -19,4 +19,4 @@ message FeeInfo {
   string payer = 1;
   PacketID packet_id = 2 [ (gogoproto.nullable) = false ];
   Fee fee = 3 [ (gogoproto.nullable) = false ];
-}
+}
\ No newline at end of file
diff --git a/proto/neutron/feerefunder/query.proto b/proto/neutron/feerefunder/query.proto
index 246c05c96..578781990 100644
--- a/proto/neutron/feerefunder/query.proto
+++ b/proto/neutron/feerefunder/query.proto
@@ -39,4 +39,4 @@ message FeeInfoRequest {
 
 message FeeInfoResponse { FeeInfo fee_info = 1; }
 
-// this line is used by starport scaffolding # 3
+// this line is used by starport scaffolding # 3
\ No newline at end of file
diff --git a/scripts/protocgen.sh b/scripts/protocgen.sh
index d3158031f..405bc227a 100755
--- a/scripts/protocgen.sh
+++ b/scripts/protocgen.sh
@@ -28,4 +28,4 @@ cd ..
 
 # move proto files to the right places
 cp -r github.com/neutron-org/neutron/x/* x/
-rm -rf github.com
+rm -rf github.com
\ No newline at end of file
diff --git a/third_party/proto/buf.gen.gogo.yaml b/third_party/proto/buf.gen.gogo.yaml
new file mode 100644
index 000000000..9c8ba0a4b
--- /dev/null
+++ b/third_party/proto/buf.gen.gogo.yaml
@@ -0,0 +1,8 @@
+version: v1
+plugins:
+  - name: gocosmos
+    out: ..
+    opt: plugins=grpc,Mgoogle/protobuf/any.proto=github.com/cosmos/cosmos-sdk/codec/types
+  - name: grpc-gateway
+    out: ..
+    opt: logtostderr=true,allow_colon_final_segments=true
diff --git a/third_party/proto/buf.gen.swagger.yaml b/third_party/proto/buf.gen.swagger.yaml
new file mode 100644
index 000000000..d0f7535b1
--- /dev/null
+++ b/third_party/proto/buf.gen.swagger.yaml
@@ -0,0 +1,5 @@
+version: v1
+plugins:
+  - name: swagger
+    out: ../tmp-swagger-gen
+    opt: logtostderr=true,fqn_for_swagger_name=true,simple_operation_ids=true
diff --git a/third_party/proto/buf.lock b/third_party/proto/buf.lock
new file mode 100644
index 000000000..1e11d0343
--- /dev/null
+++ b/third_party/proto/buf.lock
@@ -0,0 +1,23 @@
+# Generated by buf. DO NOT EDIT.
+version: v1
+deps:
+  - remote: buf.build
+    owner: cosmos
+    repository: cosmos-proto
+    commit: 1935555c206d4afb9e94615dfd0fad31
+  - remote: buf.build
+    owner: cosmos
+    repository: cosmos-sdk
+    commit: 2aa7ff2b23df473a85b7a7fe1884105d
+  - remote: buf.build
+    owner: cosmos
+    repository: gogo-proto
+    commit: 34d970b699f84aa382f3c29773a60836
+  - remote: buf.build
+    owner: cosmos
+    repository: ics23
+    commit: 55085f7c710a45f58fa09947208eb70b
+  - remote: buf.build
+    owner: googleapis
+    repository: googleapis
+    commit: 8d7204855ec14631a499bd7393ce1970
diff --git a/third_party/proto/buf.yaml b/third_party/proto/buf.yaml
new file mode 100644
index 000000000..a8622cbea
--- /dev/null
+++ b/third_party/proto/buf.yaml
@@ -0,0 +1,24 @@
+version: v1
+name: buf.build/cosmos/ibc
+deps:
+  # TODO: update sdk buf dependency when v0.47.0 is tagged and pushed to BSR
+  # see: (https://github.com/cosmos/cosmos-sdk/tree/main/proto#sdk-x-buf)
+  - buf.build/cosmos/cosmos-sdk:2aa7ff2b23df473a85b7a7fe1884105d
+  - buf.build/cosmos/cosmos-proto:1935555c206d4afb9e94615dfd0fad31
+  - buf.build/cosmos/gogo-proto:a14993478f40695898ed8a86931094b6656e8a5d
+  - buf.build/googleapis/googleapis:8d7204855ec14631a499bd7393ce1970
+  - buf.build/cosmos/ics23:b1abd8678aab07165efd453c96796a179eb3131f
+breaking:
+  use:
+    - FILE
+lint:
+  use:
+    - DEFAULT
+    - COMMENTS
+    - FILE_LOWER_SNAKE_CASE
+  except:
+    - UNARY_RPC
+    - COMMENT_FIELD
+    - SERVICE_SUFFIX
+    - PACKAGE_VERSION_SUFFIX
+    - RPC_REQUEST_STANDARD_NAME
diff --git a/third_party/proto/ibc/applications/fee/v1/ack.proto b/third_party/proto/ibc/applications/fee/v1/ack.proto
new file mode 100644
index 000000000..ec1342bbf
--- /dev/null
+++ b/third_party/proto/ibc/applications/fee/v1/ack.proto
@@ -0,0 +1,17 @@
+syntax = "proto3";
+
+package ibc.applications.fee.v1;
+
+option go_package = "github.com/cosmos/ibc-go/v7/modules/apps/29-fee/types";
+
+import "gogoproto/gogo.proto";
+
+// IncentivizedAcknowledgement is the acknowledgement format to be used by applications wrapped in the fee middleware
+message IncentivizedAcknowledgement {
+  // the underlying app acknowledgement bytes
+  bytes app_acknowledgement = 1 [(gogoproto.moretags) = "yaml:\"app_acknowledgement\""];
+  // the relayer address which submits the recv packet message
+  string forward_relayer_address = 2 [(gogoproto.moretags) = "yaml:\"forward_relayer_address\""];
+  // success flag of the base application callback
+  bool underlying_app_success = 3 [(gogoproto.moretags) = "yaml:\"underlying_app_successl\""];
+}
diff --git a/third_party/proto/ibc/applications/fee/v1/fee.proto b/third_party/proto/ibc/applications/fee/v1/fee.proto
new file mode 100644
index 000000000..1a025ddca
--- /dev/null
+++ b/third_party/proto/ibc/applications/fee/v1/fee.proto
@@ -0,0 +1,56 @@
+syntax = "proto3";
+
+package ibc.applications.fee.v1;
+
+option go_package = "github.com/cosmos/ibc-go/v7/modules/apps/29-fee/types";
+
+import "cosmos/base/v1beta1/coin.proto";
+import "gogoproto/gogo.proto";
+import "ibc/core/channel/v1/channel.proto";
+
+// Fee defines the ICS29 receive, acknowledgement and timeout fees
+message Fee {
+  // the packet receive fee
+  repeated cosmos.base.v1beta1.Coin recv_fee = 1 [
+    (gogoproto.moretags)     = "yaml:\"recv_fee\"",
+    (gogoproto.nullable)     = false,
+    (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"
+  ];
+  // the packet acknowledgement fee
+  repeated cosmos.base.v1beta1.Coin ack_fee = 2 [
+    (gogoproto.moretags)     = "yaml:\"ack_fee\"",
+    (gogoproto.nullable)     = false,
+    (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"
+  ];
+  // the packet timeout fee
+  repeated cosmos.base.v1beta1.Coin timeout_fee = 3 [
+    (gogoproto.moretags)     = "yaml:\"timeout_fee\"",
+    (gogoproto.nullable)     = false,
+    (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"
+  ];
+}
+
+// PacketFee contains ICS29 relayer fees, refund address and optional list of permitted relayers
+message PacketFee {
+  // fee encapsulates the recv, ack and timeout fees associated with an IBC packet
+  Fee fee = 1 [(gogoproto.nullable) = false];
+  // the refund address for unspent fees
+  string refund_address = 2 [(gogoproto.moretags) = "yaml:\"refund_address\""];
+  // optional list of relayers permitted to receive fees
+  repeated string relayers = 3;
+}
+
+// PacketFees contains a list of type PacketFee
+message PacketFees {
+  // list of packet fees
+  repeated PacketFee packet_fees = 1 [(gogoproto.moretags) = "yaml:\"packet_fees\"", (gogoproto.nullable) = false];
+}
+
+// IdentifiedPacketFees contains a list of type PacketFee and associated PacketId
+message IdentifiedPacketFees {
+  // unique packet identifier comprised of the channel ID, port ID and sequence
+  ibc.core.channel.v1.PacketId packet_id = 1
+      [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"packet_id\""];
+  // list of packet fees
+  repeated PacketFee packet_fees = 2 [(gogoproto.moretags) = "yaml:\"packet_fees\"", (gogoproto.nullable) = false];
+}
diff --git a/third_party/proto/ibc/applications/fee/v1/genesis.proto b/third_party/proto/ibc/applications/fee/v1/genesis.proto
new file mode 100644
index 000000000..6bba6cff6
--- /dev/null
+++ b/third_party/proto/ibc/applications/fee/v1/genesis.proto
@@ -0,0 +1,66 @@
+syntax = "proto3";
+
+package ibc.applications.fee.v1;
+
+option go_package = "github.com/cosmos/ibc-go/v7/modules/apps/29-fee/types";
+
+import "gogoproto/gogo.proto";
+import "ibc/applications/fee/v1/fee.proto";
+import "ibc/core/channel/v1/channel.proto";
+
+// GenesisState defines the ICS29 fee middleware genesis state
+message GenesisState {
+  // list of identified packet fees
+  repeated IdentifiedPacketFees identified_fees = 1
+      [(gogoproto.moretags) = "yaml:\"identified_fees\"", (gogoproto.nullable) = false];
+  // list of fee enabled channels
+  repeated FeeEnabledChannel fee_enabled_channels = 2
+      [(gogoproto.moretags) = "yaml:\"fee_enabled_channels\"", (gogoproto.nullable) = false];
+  // list of registered payees
+  repeated RegisteredPayee registered_payees = 3
+      [(gogoproto.moretags) = "yaml:\"registered_payees\"", (gogoproto.nullable) = false];
+  // list of registered counterparty payees
+  repeated RegisteredCounterpartyPayee registered_counterparty_payees = 4
+      [(gogoproto.moretags) = "yaml:\"registered_counterparty_payees\"", (gogoproto.nullable) = false];
+  // list of forward relayer addresses
+  repeated ForwardRelayerAddress forward_relayers = 5
+      [(gogoproto.moretags) = "yaml:\"forward_relayers\"", (gogoproto.nullable) = false];
+}
+
+// FeeEnabledChannel contains the PortID & ChannelID for a fee enabled channel
+message FeeEnabledChannel {
+  // unique port identifier
+  string port_id = 1 [(gogoproto.moretags) = "yaml:\"port_id\""];
+  // unique channel identifier
+  string channel_id = 2 [(gogoproto.moretags) = "yaml:\"channel_id\""];
+}
+
+// RegisteredPayee contains the relayer address and payee address for a specific channel
+message RegisteredPayee {
+  // unique channel identifier
+  string channel_id = 1 [(gogoproto.moretags) = "yaml:\"channel_id\""];
+  // the relayer address
+  string relayer = 2;
+  // the payee address
+  string payee = 3;
+}
+
+// RegisteredCounterpartyPayee contains the relayer address and counterparty payee address for a specific channel (used
+// for recv fee distribution)
+message RegisteredCounterpartyPayee {
+  // unique channel identifier
+  string channel_id = 1 [(gogoproto.moretags) = "yaml:\"channel_id\""];
+  // the relayer address
+  string relayer = 2;
+  // the counterparty payee address
+  string counterparty_payee = 3 [(gogoproto.moretags) = "yaml:\"counterparty_payee\""];
+}
+
+// ForwardRelayerAddress contains the forward relayer address and PacketId used for async acknowledgements
+message ForwardRelayerAddress {
+  // the forward relayer address
+  string address = 1;
+  // unique packet identifer comprised of the channel ID, port ID and sequence
+  ibc.core.channel.v1.PacketId packet_id = 2
+      [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"packet_id\""];
+}
diff --git a/third_party/proto/ibc/applications/fee/v1/metadata.proto b/third_party/proto/ibc/applications/fee/v1/metadata.proto
new file mode 100644
index 000000000..0c0a72c9c
--- /dev/null
+++ b/third_party/proto/ibc/applications/fee/v1/metadata.proto
@@ -0,0 +1,16 @@
+syntax = "proto3";
+
+package ibc.applications.fee.v1;
+
+option go_package = "github.com/cosmos/ibc-go/v7/modules/apps/29-fee/types";
+
+import "gogoproto/gogo.proto";
+
+// Metadata defines the ICS29 channel specific metadata encoded into the channel version bytestring
+// See ICS004: https://github.com/cosmos/ibc/tree/master/spec/core/ics-004-channel-and-packet-semantics#Versioning
+message Metadata {
+  // fee_version defines the ICS29 fee version
+  string fee_version = 1 [(gogoproto.moretags) = "yaml:\"fee_version\""];
+  // app_version defines the underlying application version, which may or may not be a JSON encoded bytestring
+  string app_version = 2 [(gogoproto.moretags) = "yaml:\"app_version\""];
+}
diff --git a/third_party/proto/ibc/applications/fee/v1/query.proto b/third_party/proto/ibc/applications/fee/v1/query.proto
new file mode 100644
index 000000000..871cfdac7
--- /dev/null
+++ b/third_party/proto/ibc/applications/fee/v1/query.proto
@@ -0,0 +1,222 @@
+syntax = "proto3";
+
+package ibc.applications.fee.v1;
+
+option go_package = "github.com/cosmos/ibc-go/v7/modules/apps/29-fee/types";
+
+import "gogoproto/gogo.proto";
+import "google/api/annotations.proto";
+import "cosmos/base/v1beta1/coin.proto";
+import "cosmos/base/query/v1beta1/pagination.proto";
+import "ibc/applications/fee/v1/fee.proto";
+import "ibc/applications/fee/v1/genesis.proto";
+import "ibc/core/channel/v1/channel.proto";
+
+// Query defines the ICS29 gRPC querier service.
+service Query {
+  // IncentivizedPackets returns all incentivized packets and their associated fees
+  rpc IncentivizedPackets(QueryIncentivizedPacketsRequest) returns (QueryIncentivizedPacketsResponse) {
+    option (google.api.http).get = "/ibc/apps/fee/v1/incentivized_packets";
+  }
+
+  // IncentivizedPacket returns all packet fees for a packet given its identifier
+  rpc IncentivizedPacket(QueryIncentivizedPacketRequest) returns (QueryIncentivizedPacketResponse) {
+    option (google.api.http).get =
+        "/ibc/apps/fee/v1/channels/{packet_id.channel_id}/ports/{packet_id.port_id}/sequences/"
+        "{packet_id.sequence}/incentivized_packet";
+  }
+
+  // Gets all incentivized packets for a specific channel
+  rpc IncentivizedPacketsForChannel(QueryIncentivizedPacketsForChannelRequest)
+      returns (QueryIncentivizedPacketsForChannelResponse) {
+    option (google.api.http).get = "/ibc/apps/fee/v1/channels/{channel_id}/ports/{port_id}/incentivized_packets";
+  }
+
+  // TotalRecvFees returns the total receive fees for a packet given its identifier
+  rpc TotalRecvFees(QueryTotalRecvFeesRequest) returns (QueryTotalRecvFeesResponse) {
+    option (google.api.http).get = "/ibc/apps/fee/v1/channels/{packet_id.channel_id}/ports/{packet_id.port_id}/"
+                                   "sequences/{packet_id.sequence}/total_recv_fees";
+  }
+
+  // TotalAckFees returns the total acknowledgement fees for a packet given its identifier
+  rpc TotalAckFees(QueryTotalAckFeesRequest) returns (QueryTotalAckFeesResponse) {
+    option (google.api.http).get = "/ibc/apps/fee/v1/channels/{packet_id.channel_id}/ports/{packet_id.port_id}/"
+                                   "sequences/{packet_id.sequence}/total_ack_fees";
+  }
+
+  // TotalTimeoutFees returns the total timeout fees for a packet given its identifier
+  rpc TotalTimeoutFees(QueryTotalTimeoutFeesRequest) returns (QueryTotalTimeoutFeesResponse) {
+    option (google.api.http).get = "/ibc/apps/fee/v1/channels/{packet_id.channel_id}/ports/{packet_id.port_id}/"
+                                   "sequences/{packet_id.sequence}/total_timeout_fees";
+  }
+
+  // Payee returns the registered payee address for a specific channel given the relayer address
+  rpc Payee(QueryPayeeRequest) returns (QueryPayeeResponse) {
+    option (google.api.http).get = "/ibc/apps/fee/v1/channels/{channel_id}/relayers/{relayer}/payee";
+  }
+
+  // CounterpartyPayee returns the registered counterparty payee for forward relaying
+  rpc CounterpartyPayee(QueryCounterpartyPayeeRequest) returns (QueryCounterpartyPayeeResponse) {
+    option (google.api.http).get = "/ibc/apps/fee/v1/channels/{channel_id}/relayers/{relayer}/counterparty_payee";
+  }
+
+  // FeeEnabledChannels returns a list of all fee enabled channels
+  rpc FeeEnabledChannels(QueryFeeEnabledChannelsRequest) returns (QueryFeeEnabledChannelsResponse) {
+    option (google.api.http).get = "/ibc/apps/fee/v1/fee_enabled";
+  }
+
+  // FeeEnabledChannel returns true if the provided port and channel identifiers belong to a fee enabled channel
+  rpc FeeEnabledChannel(QueryFeeEnabledChannelRequest) returns (QueryFeeEnabledChannelResponse) {
+    option (google.api.http).get = "/ibc/apps/fee/v1/channels/{channel_id}/ports/{port_id}/fee_enabled";
+  }
+}
+
+// QueryIncentivizedPacketsRequest defines the request type for the IncentivizedPackets rpc
+message QueryIncentivizedPacketsRequest {
+  // pagination defines an optional pagination for the request.
+  cosmos.base.query.v1beta1.PageRequest pagination = 1;
+  // block height at which to query
+  uint64 query_height = 2;
+}
+
+// QueryIncentivizedPacketsResponse defines the response type for the IncentivizedPackets rpc
+message QueryIncentivizedPacketsResponse {
+  // list of identified fees for incentivized packets
+  repeated ibc.applications.fee.v1.IdentifiedPacketFees incentivized_packets = 1 [(gogoproto.nullable) = false];
+}
+
+// QueryIncentivizedPacketRequest defines the request type for the IncentivizedPacket rpc
+message QueryIncentivizedPacketRequest {
+  // unique packet identifier comprised of channel ID, port ID and sequence
+  ibc.core.channel.v1.PacketId packet_id = 1 [(gogoproto.nullable) = false];
+  // block height at which to query
+  uint64 query_height = 2;
+}
+
+// QueryIncentivizedPacketsResponse defines the response type for the IncentivizedPacket rpc
+message QueryIncentivizedPacketResponse {
+  // the identified fees for the incentivized packet
+  ibc.applications.fee.v1.IdentifiedPacketFees incentivized_packet = 1 [(gogoproto.nullable) = false];
+}
+
+// QueryIncentivizedPacketsForChannelRequest defines the request type for querying for all incentivized packets
+// for a specific channel
+message QueryIncentivizedPacketsForChannelRequest {
+  // pagination defines an optional pagination for the request.
+  cosmos.base.query.v1beta1.PageRequest pagination = 1;
+  string                                port_id    = 2;
+  string                                channel_id = 3;
+  // Height to query at
+  uint64 query_height = 4;
+}
+
+// QueryIncentivizedPacketsResponse defines the response type for the incentivized packets RPC
+message QueryIncentivizedPacketsForChannelResponse {
+  // Map of all incentivized_packets
+  repeated ibc.applications.fee.v1.IdentifiedPacketFees incentivized_packets = 1;
+}
+
+// QueryTotalRecvFeesRequest defines the request type for the TotalRecvFees rpc
+message QueryTotalRecvFeesRequest {
+  // the packet identifier for the associated fees
+  ibc.core.channel.v1.PacketId packet_id = 1 [(gogoproto.nullable) = false];
+}
+
+// QueryTotalRecvFeesResponse defines the response type for the TotalRecvFees rpc
+message QueryTotalRecvFeesResponse {
+  // the total packet receive fees
+  repeated cosmos.base.v1beta1.Coin recv_fees = 1 [
+    (gogoproto.moretags)     = "yaml:\"recv_fees\"",
+    (gogoproto.nullable)     = false,
+    (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"
+  ];
+}
+
+// QueryTotalAckFeesRequest defines the request type for the TotalAckFees rpc
+message QueryTotalAckFeesRequest {
+  // the packet identifier for the associated fees
+  ibc.core.channel.v1.PacketId packet_id = 1 [(gogoproto.nullable) = false];
+}
+
+// QueryTotalAckFeesResponse defines the response type for the TotalAckFees rpc
+message QueryTotalAckFeesResponse {
+  // the total packet acknowledgement fees
+  repeated cosmos.base.v1beta1.Coin ack_fees = 1 [
+    (gogoproto.moretags)     = "yaml:\"ack_fees\"",
+    (gogoproto.nullable)     = false,
+    (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"
+  ];
+}
+
+// QueryTotalTimeoutFeesRequest defines the request type for the TotalTimeoutFees rpc
+message QueryTotalTimeoutFeesRequest {
+  // the packet identifier for the associated fees
+  ibc.core.channel.v1.PacketId packet_id = 1 [(gogoproto.nullable) = false];
+}
+
+// QueryTotalTimeoutFeesResponse defines the response type for the TotalTimeoutFees rpc
+message QueryTotalTimeoutFeesResponse {
+  // the total packet timeout fees
+  repeated cosmos.base.v1beta1.Coin timeout_fees = 1 [
+    (gogoproto.moretags)     = "yaml:\"timeout_fees\"",
+    (gogoproto.nullable)     = false,
+    (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"
+  ];
+}
+
+// QueryPayeeRequest defines the request type for the Payee rpc
+message QueryPayeeRequest {
+  // unique channel identifier
+  string channel_id = 1 [(gogoproto.moretags) = "yaml:\"channel_id\""];
+  // the relayer address to which the distribution address is registered
+  string relayer = 2;
+}
+
+// QueryPayeeResponse defines the response type for the Payee rpc
+message QueryPayeeResponse {
+  // the payee address to which packet fees are paid out
+  string payee_address = 1 [(gogoproto.moretags) = "yaml:\"payee_address\""];
+}
+
+// QueryCounterpartyPayeeRequest defines the request type for the CounterpartyPayee rpc
+message QueryCounterpartyPayeeRequest {
+  // unique channel identifier
+  string channel_id = 1 [(gogoproto.moretags) = "yaml:\"channel_id\""];
+  // the relayer address to which the counterparty is registered
+  string relayer = 2;
+}
+
+// QueryCounterpartyPayeeResponse defines the response type for the CounterpartyPayee rpc
+message QueryCounterpartyPayeeResponse {
+  // the counterparty payee address used to compensate forward relaying
+  string counterparty_payee = 1 [(gogoproto.moretags) = "yaml:\"counterparty_payee\""];
+}
+
+// QueryFeeEnabledChannelsRequest defines the request type for the FeeEnabledChannels rpc
+message QueryFeeEnabledChannelsRequest {
+  // pagination defines an optional pagination for the request.
+  cosmos.base.query.v1beta1.PageRequest pagination = 1;
+  // block height at which to query
+  uint64 query_height = 2;
+}
+
+// QueryFeeEnabledChannelsResponse defines the response type for the FeeEnabledChannels rpc
+message QueryFeeEnabledChannelsResponse {
+  // list of fee enabled channels
+  repeated ibc.applications.fee.v1.FeeEnabledChannel fee_enabled_channels = 1
+      [(gogoproto.moretags) = "yaml:\"fee_enabled_channels\"", (gogoproto.nullable) = false];
+}
+
+// QueryFeeEnabledChannelRequest defines the request type for the FeeEnabledChannel rpc
+message QueryFeeEnabledChannelRequest {
+  // unique port identifier
+  string port_id = 1 [(gogoproto.moretags) = "yaml:\"port_id\""];
+  // unique channel identifier
+  string channel_id = 2 [(gogoproto.moretags) = "yaml:\"channel_id\""];
+}
+
+// QueryFeeEnabledChannelResponse defines the response type for the FeeEnabledChannel rpc
+message QueryFeeEnabledChannelResponse {
+  // boolean flag representing the fee enabled channel status
+  bool fee_enabled = 1 [(gogoproto.moretags) = "yaml:\"fee_enabled\""];
+}
diff --git a/third_party/proto/ibc/applications/fee/v1/tx.proto b/third_party/proto/ibc/applications/fee/v1/tx.proto
new file mode 100644
index 000000000..3a46de74e
--- /dev/null
+++ b/third_party/proto/ibc/applications/fee/v1/tx.proto
@@ -0,0 +1,112 @@
+syntax = "proto3";
+
+package ibc.applications.fee.v1;
+
+option go_package = "github.com/cosmos/ibc-go/v7/modules/apps/29-fee/types";
+
+import "gogoproto/gogo.proto";
+import "ibc/applications/fee/v1/fee.proto";
+import "ibc/core/channel/v1/channel.proto";
+
+// Msg defines the ICS29 Msg service.
+service Msg {
+  // RegisterPayee defines a rpc handler method for MsgRegisterPayee
+  // RegisterPayee is called by the relayer on each channelEnd and allows them to set an optional
+  // payee to which reverse and timeout relayer packet fees will be paid out. The payee should be registered on
+  // the source chain from which packets originate as this is where fee distribution takes place. This function may be
+  // called more than once by a relayer, in which case, the latest payee is always used.
+  rpc RegisterPayee(MsgRegisterPayee) returns (MsgRegisterPayeeResponse);
+
+  // RegisterCounterpartyPayee defines a rpc handler method for MsgRegisterCounterpartyPayee
+  // RegisterCounterpartyPayee is called by the relayer on each channelEnd and allows them to specify the counterparty
+  // payee address before relaying. This ensures they will be properly compensated for forward relaying since
+  // the destination chain must include the registered counterparty payee address in the acknowledgement. This function
+  // may be called more than once by a relayer, in which case, the latest counterparty payee address is always used.
+  rpc RegisterCounterpartyPayee(MsgRegisterCounterpartyPayee) returns (MsgRegisterCounterpartyPayeeResponse);
+
+  // PayPacketFee defines a rpc handler method for MsgPayPacketFee
+  // PayPacketFee is an open callback that may be called by any module/user that wishes to escrow funds in order to
+  // incentivize the relaying of the packet at the next sequence
+  // NOTE: This method is intended to be used within a multi msg transaction, where the subsequent msg that follows
+  // initiates the lifecycle of the incentivized packet
+  rpc PayPacketFee(MsgPayPacketFee) returns (MsgPayPacketFeeResponse);
+
+  // PayPacketFeeAsync defines a rpc handler method for MsgPayPacketFeeAsync
+  // PayPacketFeeAsync is an open callback that may be called by any module/user that wishes to escrow funds in order to
+  // incentivize the relaying of a known packet (i.e. at a particular sequence)
+  rpc PayPacketFeeAsync(MsgPayPacketFeeAsync) returns (MsgPayPacketFeeAsyncResponse);
+}
+
+// MsgRegisterPayee defines the request type for the RegisterPayee rpc
+message MsgRegisterPayee {
+  option (gogoproto.equal)           = false;
+  option (gogoproto.goproto_getters) = false;
+
+  // unique port identifier
+  string port_id = 1 [(gogoproto.moretags) = "yaml:\"port_id\""];
+  // unique channel identifier
+  string channel_id = 2 [(gogoproto.moretags) = "yaml:\"channel_id\""];
+  // the relayer address
+  string relayer = 3;
+  // the payee address
+  string payee = 4;
+}
+
+// MsgRegisterPayeeResponse defines the response type for the RegisterPayee rpc
+message MsgRegisterPayeeResponse {}
+
+// MsgRegisterCounterpartyPayee defines the request type for the RegisterCounterpartyPayee rpc
+message MsgRegisterCounterpartyPayee {
+  option (gogoproto.equal)           = false;
+  option (gogoproto.goproto_getters) = false;
+
+  // unique port identifier
+  string port_id = 1 [(gogoproto.moretags) = "yaml:\"port_id\""];
+  // unique channel identifier
+  string channel_id = 2 [(gogoproto.moretags) = "yaml:\"channel_id\""];
+  // the relayer address
+  string relayer = 3;
+  // the counterparty payee address
+  string counterparty_payee = 4 [(gogoproto.moretags) = "yaml:\"counterparty_payee\""];
+}
+
+// MsgRegisterCounterpartyPayeeResponse defines the response type for the RegisterCounterpartyPayee rpc
+message MsgRegisterCounterpartyPayeeResponse {}
+
+// MsgPayPacketFee defines the request type for the PayPacketFee rpc
+// This Msg can be used to pay for a packet at the next sequence send & should be combined with the Msg that will be
+// paid for
+message MsgPayPacketFee {
+  option (gogoproto.equal)           = false;
+  option (gogoproto.goproto_getters) = false;
+
+  // fee encapsulates the recv, ack and timeout fees associated with an IBC packet
+  ibc.applications.fee.v1.Fee fee = 1 [(gogoproto.nullable) = false];
+  // the source port unique identifier
+  string source_port_id = 2 [(gogoproto.moretags) = "yaml:\"source_port_id\""];
+  // the source channel unique identifer
+  string source_channel_id = 3 [(gogoproto.moretags) = "yaml:\"source_channel_id\""];
+  // account address to refund fee if necessary
+  string signer = 4;
+  // optional list of relayers permitted to the receive packet fees
+  repeated string relayers = 5;
+}
+
+// MsgPayPacketFeeResponse defines the response type for the PayPacketFee rpc
+message MsgPayPacketFeeResponse {}
+
+// MsgPayPacketFeeAsync defines the request type for the PayPacketFeeAsync rpc
+// This Msg can be used to pay for a packet at a specified sequence (instead of the next sequence send)
+message MsgPayPacketFeeAsync {
+  option (gogoproto.equal)           = false;
+  option (gogoproto.goproto_getters) = false;
+
+  // unique packet identifier comprised of the channel ID, port ID and sequence
+  ibc.core.channel.v1.PacketId packet_id = 1
+      [(gogoproto.moretags) = "yaml:\"packet_id\"", (gogoproto.nullable) = false];
+  // the packet fee associated with a particular IBC packet
+  PacketFee packet_fee = 2 [(gogoproto.moretags) = "yaml:\"packet_fee\"", (gogoproto.nullable) = false];
+}
+
+// MsgPayPacketFeeAsyncResponse defines the response type for the PayPacketFeeAsync rpc
+message MsgPayPacketFeeAsyncResponse {}
diff --git a/third_party/proto/ibc/applications/interchain_accounts/controller/v1/controller.proto b/third_party/proto/ibc/applications/interchain_accounts/controller/v1/controller.proto
new file mode 100644
index 000000000..a505b4637
--- /dev/null
+++ b/third_party/proto/ibc/applications/interchain_accounts/controller/v1/controller.proto
@@ -0,0 +1,14 @@
+syntax = "proto3";
+
+package ibc.applications.interchain_accounts.controller.v1;
+
+option go_package = "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/controller/types";
+
+import "gogoproto/gogo.proto";
+
+// Params defines the set of on-chain interchain accounts parameters.
+// The following parameters may be used to disable the controller submodule.
+message Params {
+  // controller_enabled enables or disables the controller submodule.
+  bool controller_enabled = 1 [(gogoproto.moretags) = "yaml:\"controller_enabled\""];
+}
diff --git a/third_party/proto/ibc/applications/interchain_accounts/controller/v1/query.proto b/third_party/proto/ibc/applications/interchain_accounts/controller/v1/query.proto
new file mode 100644
index 000000000..8c237a152
--- /dev/null
+++ b/third_party/proto/ibc/applications/interchain_accounts/controller/v1/query.proto
@@ -0,0 +1,43 @@
+syntax = "proto3";
+
+package ibc.applications.interchain_accounts.controller.v1;
+
+option go_package = "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/controller/types";
+
+import "ibc/applications/interchain_accounts/controller/v1/controller.proto";
+import "gogoproto/gogo.proto";
+import "google/api/annotations.proto";
+
+// Query provides defines the gRPC querier service.
+service Query {
+  // InterchainAccount returns the interchain account address for a given owner address on a given connection
+  rpc InterchainAccount(QueryInterchainAccountRequest) returns (QueryInterchainAccountResponse) {
+    option (google.api.http).get =
+        "/ibc/apps/interchain_accounts/controller/v1/owners/{owner}/connections/{connection_id}";
+  }
+
+  // Params queries all parameters of the ICA controller submodule.
+  rpc Params(QueryParamsRequest) returns (QueryParamsResponse) {
+    option (google.api.http).get = "/ibc/apps/interchain_accounts/controller/v1/params";
+  }
+}
+
+// QueryInterchainAccountRequest is the request type for the Query/InterchainAccount RPC method.
+message QueryInterchainAccountRequest {
+  string owner         = 1;
+  string connection_id = 2 [(gogoproto.moretags) = "yaml:\"connection_id\""];
+}
+
+// QueryInterchainAccountResponse the response type for the Query/InterchainAccount RPC method.
+message QueryInterchainAccountResponse {
+  string address = 1;
+}
+
+// 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 defines the parameters of the module.
+  Params params = 1;
+}
diff --git a/third_party/proto/ibc/applications/interchain_accounts/controller/v1/tx.proto b/third_party/proto/ibc/applications/interchain_accounts/controller/v1/tx.proto
new file mode 100644
index 000000000..284ffe705
--- /dev/null
+++ b/third_party/proto/ibc/applications/interchain_accounts/controller/v1/tx.proto
@@ -0,0 +1,51 @@
+syntax = "proto3";
+
+package ibc.applications.interchain_accounts.controller.v1;
+
+option go_package = "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/controller/types";
+
+import "gogoproto/gogo.proto";
+import "ibc/applications/interchain_accounts/v1/packet.proto";
+
+// Msg defines the 27-interchain-accounts/controller Msg service.
+service Msg {
+  // RegisterInterchainAccount defines a rpc handler for MsgRegisterInterchainAccount.
+  rpc RegisterInterchainAccount(MsgRegisterInterchainAccount) returns (MsgRegisterInterchainAccountResponse);
+  // SendTx defines a rpc handler for MsgSendTx.
+  rpc SendTx(MsgSendTx) returns (MsgSendTxResponse);
+}
+
+// MsgRegisterInterchainAccount defines the payload for Msg/RegisterAccount
+message MsgRegisterInterchainAccount {
+  option (gogoproto.equal)           = false;
+  option (gogoproto.goproto_getters) = false;
+
+  string owner         = 1;
+  string connection_id = 2 [(gogoproto.moretags) = "yaml:\"connection_id\""];
+  string version       = 3;
+}
+
+// MsgRegisterInterchainAccountResponse defines the response for Msg/RegisterAccount
+message MsgRegisterInterchainAccountResponse {
+  string channel_id = 1 [(gogoproto.moretags) = "yaml:\"channel_id\""];
+  string port_id    = 2 [(gogoproto.moretags) = "yaml:\"port_id\""];
+}
+
+// MsgSendTx defines the payload for Msg/SendTx
+message MsgSendTx {
+  option (gogoproto.equal)           = false;
+  option (gogoproto.goproto_getters) = false;
+
+  string owner         = 1;
+  string connection_id = 2 [(gogoproto.moretags) = "yaml:\"connection_id\""];
+  ibc.applications.interchain_accounts.v1.InterchainAccountPacketData packet_data = 3
+      [(gogoproto.moretags) = "yaml:\"packet_data\"", (gogoproto.nullable) = false];
+  // Relative timeout timestamp provided will be added to the current block time during transaction execution.
+  // The timeout timestamp must be non-zero.
+  uint64 relative_timeout = 4 [(gogoproto.moretags) = "yaml:\"relative_timeout\""];
+}
+
+// MsgSendTxResponse defines the response for MsgSendTx
+message MsgSendTxResponse {
+  uint64 sequence = 1;
+}
diff --git a/third_party/proto/ibc/applications/interchain_accounts/genesis/v1/genesis.proto b/third_party/proto/ibc/applications/interchain_accounts/genesis/v1/genesis.proto
new file mode 100644
index 000000000..2fed3763f
--- /dev/null
+++ b/third_party/proto/ibc/applications/interchain_accounts/genesis/v1/genesis.proto
@@ -0,0 +1,53 @@
+syntax = "proto3";
+
+package ibc.applications.interchain_accounts.genesis.v1;
+
+option go_package = "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/genesis/types";
+
+import "gogoproto/gogo.proto";
+import "ibc/applications/interchain_accounts/controller/v1/controller.proto";
+import "ibc/applications/interchain_accounts/host/v1/host.proto";
+
+// GenesisState defines the interchain accounts genesis state
+message GenesisState {
+  ControllerGenesisState controller_genesis_state = 1
+      [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"controller_genesis_state\""];
+  HostGenesisState host_genesis_state = 2
+      [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"host_genesis_state\""];
+}
+
+// ControllerGenesisState defines the interchain accounts controller genesis state
+message ControllerGenesisState {
+  repeated ActiveChannel active_channels = 1
+      [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"active_channels\""];
+  repeated RegisteredInterchainAccount interchain_accounts = 2
+      [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"interchain_accounts\""];
+  repeated string                                           ports  = 3;
+  ibc.applications.interchain_accounts.controller.v1.Params params = 4 [(gogoproto.nullable) = false];
+}
+
+// HostGenesisState defines the interchain accounts host genesis state
+message HostGenesisState {
+  repeated ActiveChannel active_channels = 1
+      [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"active_channels\""];
+  repeated RegisteredInterchainAccount interchain_accounts = 2
+      [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"interchain_accounts\""];
+  string                                              port   = 3;
+  ibc.applications.interchain_accounts.host.v1.Params params = 4 [(gogoproto.nullable) = false];
+}
+
+// ActiveChannel contains a connection ID, port ID and associated active channel ID, as well as a boolean flag to
+// indicate if the channel is middleware enabled
+message ActiveChannel {
+  string connection_id         = 1 [(gogoproto.moretags) = "yaml:\"connection_id\""];
+  string port_id               = 2 [(gogoproto.moretags) = "yaml:\"port_id\""];
+  string channel_id            = 3 [(gogoproto.moretags) = "yaml:\"channel_id\""];
+  bool   is_middleware_enabled = 4 [(gogoproto.moretags) = "yaml:\"is_middleware_enabled\""];
+}
+
+// RegisteredInterchainAccount contains a connection ID, port ID and associated interchain account address
+message RegisteredInterchainAccount {
+  string connection_id   = 1 [(gogoproto.moretags) = "yaml:\"connection_id\""];
+  string port_id         = 2 [(gogoproto.moretags) = "yaml:\"port_id\""];
+  string account_address = 3 [(gogoproto.moretags) = "yaml:\"account_address\""];
+}
\ No newline at end of file
diff --git a/third_party/proto/ibc/applications/interchain_accounts/host/v1/host.proto b/third_party/proto/ibc/applications/interchain_accounts/host/v1/host.proto
new file mode 100644
index 000000000..18cc1d13d
--- /dev/null
+++ b/third_party/proto/ibc/applications/interchain_accounts/host/v1/host.proto
@@ -0,0 +1,16 @@
+syntax = "proto3";
+
+package ibc.applications.interchain_accounts.host.v1;
+
+option go_package = "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host/types";
+
+import "gogoproto/gogo.proto";
+
+// Params defines the set of on-chain interchain accounts parameters.
+// The following parameters may be used to disable the host submodule.
+message Params {
+  // host_enabled enables or disables the host submodule.
+  bool host_enabled = 1 [(gogoproto.moretags) = "yaml:\"host_enabled\""];
+  // allow_messages defines a list of sdk message typeURLs allowed to be executed on a host chain.
+  repeated string allow_messages = 2 [(gogoproto.moretags) = "yaml:\"allow_messages\""];
+}
diff --git a/third_party/proto/ibc/applications/interchain_accounts/host/v1/query.proto b/third_party/proto/ibc/applications/interchain_accounts/host/v1/query.proto
new file mode 100644
index 000000000..b89ed8ed8
--- /dev/null
+++ b/third_party/proto/ibc/applications/interchain_accounts/host/v1/query.proto
@@ -0,0 +1,25 @@
+syntax = "proto3";
+
+package ibc.applications.interchain_accounts.host.v1;
+
+option go_package = "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host/types";
+
+import "google/api/annotations.proto";
+import "ibc/applications/interchain_accounts/host/v1/host.proto";
+
+// Query provides defines the gRPC querier service.
+service Query {
+  // Params queries all parameters of the ICA host submodule.
+  rpc Params(QueryParamsRequest) returns (QueryParamsResponse) {
+    option (google.api.http).get = "/ibc/apps/interchain_accounts/host/v1/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 defines the parameters of the module.
+  Params params = 1;
+}
diff --git a/third_party/proto/ibc/applications/interchain_accounts/v1/account.proto b/third_party/proto/ibc/applications/interchain_accounts/v1/account.proto
new file mode 100644
index 000000000..d60c27a9c
--- /dev/null
+++ b/third_party/proto/ibc/applications/interchain_accounts/v1/account.proto
@@ -0,0 +1,20 @@
+syntax = "proto3";
+
+package ibc.applications.interchain_accounts.v1;
+
+option go_package = "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/types";
+
+import "cosmos_proto/cosmos.proto";
+import "gogoproto/gogo.proto";
+import "cosmos/auth/v1beta1/auth.proto";
+
+// An InterchainAccount is defined as a BaseAccount & the address of the account owner on the controller chain
+message InterchainAccount {
+  option (gogoproto.goproto_getters)         = false;
+  option (gogoproto.goproto_stringer)        = false;
+  option (cosmos_proto.implements_interface) = "ibc.applications.interchain_accounts.v1.InterchainAccountI";
+
+  cosmos.auth.v1beta1.BaseAccount base_account = 1
+      [(gogoproto.embed) = true, (gogoproto.moretags) = "yaml:\"base_account\""];
+  string account_owner = 2 [(gogoproto.moretags) = "yaml:\"account_owner\""];
+}
diff --git a/third_party/proto/ibc/applications/interchain_accounts/v1/metadata.proto b/third_party/proto/ibc/applications/interchain_accounts/v1/metadata.proto
new file mode 100644
index 000000000..9ea7eeca3
--- /dev/null
+++ b/third_party/proto/ibc/applications/interchain_accounts/v1/metadata.proto
@@ -0,0 +1,25 @@
+syntax = "proto3";
+
+package ibc.applications.interchain_accounts.v1;
+
+option go_package = "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/types";
+
+import "gogoproto/gogo.proto";
+
+// Metadata defines a set of protocol specific data encoded into the ICS27 channel version bytestring
+// See ICS004: https://github.com/cosmos/ibc/tree/master/spec/core/ics-004-channel-and-packet-semantics#Versioning
+message Metadata {
+  // version defines the ICS27 protocol version
+  string version = 1;
+  // controller_connection_id is the connection identifier associated with the controller chain
+  string controller_connection_id = 2 [(gogoproto.moretags) = "yaml:\"controller_connection_id\""];
+  // host_connection_id is the connection identifier associated with the host chain
+  string host_connection_id = 3 [(gogoproto.moretags) = "yaml:\"host_connection_id\""];
+  // address defines the interchain account address to be fulfilled upon the OnChanOpenTry handshake step
+  // NOTE: the address field is empty on the OnChanOpenInit handshake step
+  string address = 4;
+  // encoding defines the supported codec format
+  string encoding = 5;
+  // tx_type defines the type of transactions the interchain account can execute
+  string tx_type = 6;
+}
diff --git a/third_party/proto/ibc/applications/interchain_accounts/v1/packet.proto b/third_party/proto/ibc/applications/interchain_accounts/v1/packet.proto
new file mode 100644
index 000000000..d2dcf518e
--- /dev/null
+++ b/third_party/proto/ibc/applications/interchain_accounts/v1/packet.proto
@@ -0,0 +1,31 @@
+syntax = "proto3";
+
+package ibc.applications.interchain_accounts.v1;
+
+option go_package = "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/types";
+
+import "google/protobuf/any.proto";
+import "gogoproto/gogo.proto";
+
+// Type defines a classification of message issued from a controller chain to its associated interchain accounts
+// host
+enum Type {
+  option (gogoproto.goproto_enum_prefix) = false;
+
+  // Default zero value enumeration
+  TYPE_UNSPECIFIED = 0 [(gogoproto.enumvalue_customname) = "UNSPECIFIED"];
+  // Execute a transaction on an interchain accounts host chain
+  TYPE_EXECUTE_TX = 1 [(gogoproto.enumvalue_customname) = "EXECUTE_TX"];
+}
+
+// InterchainAccountPacketData is comprised of a raw transaction, type of transaction and optional memo field.
+message InterchainAccountPacketData {
+  Type   type = 1;
+  bytes  data = 2;
+  string memo = 3;
+}
+
+// CosmosTx contains a list of sdk.Msg's. It should be used when sending transactions to an SDK host chain.
+message CosmosTx {
+  repeated google.protobuf.Any messages = 1;
+}
diff --git a/third_party/proto/ibc/applications/transfer/v1/authz.proto b/third_party/proto/ibc/applications/transfer/v1/authz.proto
new file mode 100644
index 000000000..8b27ac9cf
--- /dev/null
+++ b/third_party/proto/ibc/applications/transfer/v1/authz.proto
@@ -0,0 +1,31 @@
+syntax = "proto3";
+
+package ibc.applications.transfer.v1;
+
+option go_package = "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types";
+
+import "cosmos_proto/cosmos.proto";
+import "gogoproto/gogo.proto";
+import "cosmos/base/v1beta1/coin.proto";
+
+// Allocation defines the spend limit for a particular port and channel
+message Allocation {
+  // the port on which the packet will be sent
+  string source_port = 1 [(gogoproto.moretags) = "yaml:\"source_port\""];
+  // the channel by which the packet will be sent
+  string source_channel = 2 [(gogoproto.moretags) = "yaml:\"source_channel\""];
+  // spend limitation on the channel
+  repeated cosmos.base.v1beta1.Coin spend_limit = 3
+      [(gogoproto.nullable) = false, (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"];
+  // allow list of receivers, an empty allow list permits any receiver address
+  repeated string allow_list = 4;
+}
+
+// TransferAuthorization allows the grantee to spend up to spend_limit coins from
+// the granter's account for ibc transfer on a specific channel
+message TransferAuthorization {
+  option (cosmos_proto.implements_interface) = "cosmos.authz.v1beta1.Authorization";
+
+  // port and channel amounts
+  repeated Allocation allocations = 1 [(gogoproto.nullable) = false];
+}
diff --git a/third_party/proto/ibc/applications/transfer/v1/genesis.proto b/third_party/proto/ibc/applications/transfer/v1/genesis.proto
new file mode 100644
index 000000000..b3f013e1e
--- /dev/null
+++ b/third_party/proto/ibc/applications/transfer/v1/genesis.proto
@@ -0,0 +1,27 @@
+syntax = "proto3";
+
+package ibc.applications.transfer.v1;
+
+option go_package = "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types";
+
+import "ibc/applications/transfer/v1/transfer.proto";
+import "cosmos/base/v1beta1/coin.proto";
+import "gogoproto/gogo.proto";
+
+// GenesisState defines the ibc-transfer genesis state
+message GenesisState {
+  string              port_id      = 1 [(gogoproto.moretags) = "yaml:\"port_id\""];
+  repeated DenomTrace denom_traces = 2 [
+    (gogoproto.castrepeated) = "Traces",
+    (gogoproto.nullable)     = false,
+    (gogoproto.moretags)     = "yaml:\"denom_traces\""
+  ];
+  Params params = 3 [(gogoproto.nullable) = false];
+  // total_escrowed contains the total amount of tokens escrowed
+  // by the transfer module
+  repeated cosmos.base.v1beta1.Coin total_escrowed = 4 [
+    (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins",
+    (gogoproto.nullable)     = false,
+    (gogoproto.moretags)     = "yaml:\"total_escrowed\""
+  ];
+}
diff --git a/third_party/proto/ibc/applications/transfer/v1/query.proto b/third_party/proto/ibc/applications/transfer/v1/query.proto
new file mode 100644
index 000000000..66670407a
--- /dev/null
+++ b/third_party/proto/ibc/applications/transfer/v1/query.proto
@@ -0,0 +1,121 @@
+syntax = "proto3";
+
+package ibc.applications.transfer.v1;
+
+import "gogoproto/gogo.proto";
+import "cosmos/base/v1beta1/coin.proto";
+import "cosmos/base/query/v1beta1/pagination.proto";
+import "ibc/applications/transfer/v1/transfer.proto";
+import "google/api/annotations.proto";
+
+option go_package = "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types";
+
+// Query provides defines the gRPC querier service.
+service Query {
+  // DenomTraces queries all denomination traces.
+  rpc DenomTraces(QueryDenomTracesRequest) returns (QueryDenomTracesResponse) {
+    option (google.api.http).get = "/ibc/apps/transfer/v1/denom_traces";
+  }
+
+  // DenomTrace queries a denomination trace information.
+  rpc DenomTrace(QueryDenomTraceRequest) returns (QueryDenomTraceResponse) {
+    option (google.api.http).get = "/ibc/apps/transfer/v1/denom_traces/{hash=**}";
+  }
+
+  // Params queries all parameters of the ibc-transfer module.
+  rpc Params(QueryParamsRequest) returns (QueryParamsResponse) {
+    option (google.api.http).get = "/ibc/apps/transfer/v1/params";
+  }
+
+  // DenomHash queries a denomination hash information.
+  rpc DenomHash(QueryDenomHashRequest) returns (QueryDenomHashResponse) {
+    option (google.api.http).get = "/ibc/apps/transfer/v1/denom_hashes/{trace=**}";
+  }
+
+  // EscrowAddress returns the escrow address for a particular port and channel id.
+  rpc EscrowAddress(QueryEscrowAddressRequest) returns (QueryEscrowAddressResponse) {
+    option (google.api.http).get = "/ibc/apps/transfer/v1/channels/{channel_id}/ports/{port_id}/escrow_address";
+  }
+
+  // TotalEscrowForDenom returns the total amount of tokens in escrow based on the denom.
+  rpc TotalEscrowForDenom(QueryTotalEscrowForDenomRequest) returns (QueryTotalEscrowForDenomResponse) {
+    option (google.api.http).get = "/ibc/apps/transfer/v1/denoms/{denom=**}/total_escrow";
+  }
+}
+
+// QueryDenomTraceRequest is the request type for the Query/DenomTrace RPC
+// method
+message QueryDenomTraceRequest {
+  // hash (in hex format) or denom (full denom with ibc prefix) of the denomination trace information.
+  string hash = 1;
+}
+
+// QueryDenomTraceResponse is the response type for the Query/DenomTrace RPC
+// method.
+message QueryDenomTraceResponse {
+  // denom_trace returns the requested denomination trace information.
+  DenomTrace denom_trace = 1;
+}
+
+// QueryConnectionsRequest is the request type for the Query/DenomTraces RPC
+// method
+message QueryDenomTracesRequest {
+  // pagination defines an optional pagination for the request.
+  cosmos.base.query.v1beta1.PageRequest pagination = 1;
+}
+
+// QueryConnectionsResponse is the response type for the Query/DenomTraces RPC
+// method.
+message QueryDenomTracesResponse {
+  // denom_traces returns all denominations trace information.
+  repeated DenomTrace denom_traces = 1 [(gogoproto.castrepeated) = "Traces", (gogoproto.nullable) = false];
+  // pagination defines the pagination in the response.
+  cosmos.base.query.v1beta1.PageResponse pagination = 2;
+}
+
+// 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 defines the parameters of the module.
+  Params params = 1;
+}
+
+// QueryDenomHashRequest is the request type for the Query/DenomHash RPC
+// method
+message QueryDenomHashRequest {
+  // The denomination trace ([port_id]/[channel_id])+/[denom]
+  string trace = 1;
+}
+
+// QueryDenomHashResponse is the response type for the Query/DenomHash RPC
+// method.
+message QueryDenomHashResponse {
+  // hash (in hex format) of the denomination trace information.
+  string hash = 1;
+}
+
+// QueryEscrowAddressRequest is the request type for the EscrowAddress RPC method.
+message QueryEscrowAddressRequest {
+  // unique port identifier
+  string port_id = 1;
+  // unique channel identifier
+  string channel_id = 2;
+}
+
+// QueryEscrowAddressResponse is the response type of the EscrowAddress RPC method.
+message QueryEscrowAddressResponse {
+  // the escrow account address
+  string escrow_address = 1;
+}
+
+// QueryTotalEscrowForDenomRequest is the request type for TotalEscrowForDenom RPC method.
+message QueryTotalEscrowForDenomRequest {
+  string denom = 1;
+}
+
+// QueryTotalEscrowForDenomResponse is the response type for TotalEscrowForDenom RPC method.
+message QueryTotalEscrowForDenomResponse {
+  cosmos.base.v1beta1.Coin amount = 1 [(gogoproto.nullable) = false];
+}
diff --git a/third_party/proto/ibc/applications/transfer/v1/transfer.proto b/third_party/proto/ibc/applications/transfer/v1/transfer.proto
new file mode 100644
index 000000000..217107479
--- /dev/null
+++ b/third_party/proto/ibc/applications/transfer/v1/transfer.proto
@@ -0,0 +1,30 @@
+syntax = "proto3";
+
+package ibc.applications.transfer.v1;
+
+option go_package = "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types";
+
+import "gogoproto/gogo.proto";
+
+// DenomTrace contains the base denomination for ICS20 fungible tokens and the
+// source tracing information path.
+message DenomTrace {
+  // path defines the chain of port/channel identifiers used for tracing the
+  // source of the fungible token.
+  string path = 1;
+  // base denomination of the relayed fungible token.
+  string base_denom = 2;
+}
+
+// Params defines the set of IBC transfer parameters.
+// NOTE: To prevent a single token from being transferred, set the
+// TransfersEnabled parameter to true and then set the bank module's SendEnabled
+// parameter for the denomination to false.
+message Params {
+  // send_enabled enables or disables all cross-chain token transfers from this
+  // chain.
+  bool send_enabled = 1 [(gogoproto.moretags) = "yaml:\"send_enabled\""];
+  // receive_enabled enables or disables all cross-chain token transfers to this
+  // chain.
+  bool receive_enabled = 2 [(gogoproto.moretags) = "yaml:\"receive_enabled\""];
+}
diff --git a/third_party/proto/ibc/applications/transfer/v1/tx.proto b/third_party/proto/ibc/applications/transfer/v1/tx.proto
new file mode 100644
index 000000000..1c67aafb9
--- /dev/null
+++ b/third_party/proto/ibc/applications/transfer/v1/tx.proto
@@ -0,0 +1,49 @@
+syntax = "proto3";
+
+package ibc.applications.transfer.v1;
+
+option go_package = "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types";
+
+import "gogoproto/gogo.proto";
+import "cosmos/base/v1beta1/coin.proto";
+import "ibc/core/client/v1/client.proto";
+
+// Msg defines the ibc/transfer Msg service.
+service Msg {
+  // Transfer defines a rpc handler method for MsgTransfer.
+  rpc Transfer(MsgTransfer) returns (MsgTransferResponse);
+}
+
+// MsgTransfer defines a msg to transfer fungible tokens (i.e Coins) between
+// ICS20 enabled chains. See ICS Spec here:
+// https://github.com/cosmos/ibc/tree/master/spec/app/ics-020-fungible-token-transfer#data-structures
+message MsgTransfer {
+  option (gogoproto.equal)           = false;
+  option (gogoproto.goproto_getters) = false;
+
+  // the port on which the packet will be sent
+  string source_port = 1 [(gogoproto.moretags) = "yaml:\"source_port\""];
+  // the channel by which the packet will be sent
+  string source_channel = 2 [(gogoproto.moretags) = "yaml:\"source_channel\""];
+  // the tokens to be transferred
+  cosmos.base.v1beta1.Coin token = 3 [(gogoproto.nullable) = false];
+  // the sender address
+  string sender = 4;
+  // the recipient address on the destination chain
+  string receiver = 5;
+  // Timeout height relative to the current block height.
+  // The timeout is disabled when set to 0.
+  ibc.core.client.v1.Height timeout_height = 6
+      [(gogoproto.moretags) = "yaml:\"timeout_height\"", (gogoproto.nullable) = false];
+  // Timeout timestamp in absolute nanoseconds since unix epoch.
+  // The timeout is disabled when set to 0.
+  uint64 timeout_timestamp = 7 [(gogoproto.moretags) = "yaml:\"timeout_timestamp\""];
+  // optional memo
+  string memo = 8;
+}
+
+// MsgTransferResponse defines the Msg/Transfer response type.
+message MsgTransferResponse {
+  // sequence number of the transfer packet sent
+  uint64 sequence = 1;
+}
diff --git a/third_party/proto/ibc/applications/transfer/v2/packet.proto b/third_party/proto/ibc/applications/transfer/v2/packet.proto
new file mode 100644
index 000000000..7dc31347a
--- /dev/null
+++ b/third_party/proto/ibc/applications/transfer/v2/packet.proto
@@ -0,0 +1,21 @@
+syntax = "proto3";
+
+package ibc.applications.transfer.v2;
+
+option go_package = "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types";
+
+// FungibleTokenPacketData defines a struct for the packet payload
+// See FungibleTokenPacketData spec:
+// https://github.com/cosmos/ibc/tree/master/spec/app/ics-020-fungible-token-transfer#data-structures
+message FungibleTokenPacketData {
+  // the token denomination to be transferred
+  string denom = 1;
+  // the token amount to be transferred
+  string amount = 2;
+  // the sender address
+  string sender = 3;
+  // the recipient address on the destination chain
+  string receiver = 4;
+  // optional memo
+  string memo = 5;
+}
diff --git a/third_party/proto/ibc/core/channel/v1/channel.proto b/third_party/proto/ibc/core/channel/v1/channel.proto
new file mode 100644
index 000000000..5fbb0d423
--- /dev/null
+++ b/third_party/proto/ibc/core/channel/v1/channel.proto
@@ -0,0 +1,162 @@
+syntax = "proto3";
+
+package ibc.core.channel.v1;
+
+option go_package = "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types";
+
+import "gogoproto/gogo.proto";
+import "ibc/core/client/v1/client.proto";
+
+// Channel defines pipeline for exactly-once packet delivery between specific
+// modules on separate blockchains, which has at least one end capable of
+// sending packets and one end capable of receiving packets.
+message Channel {
+  option (gogoproto.goproto_getters) = false;
+
+  // current state of the channel end
+  State state = 1;
+  // whether the channel is ordered or unordered
+  Order ordering = 2;
+  // counterparty channel end
+  Counterparty counterparty = 3 [(gogoproto.nullable) = false];
+  // list of connection identifiers, in order, along which packets sent on
+  // this channel will travel
+  repeated string connection_hops = 4 [(gogoproto.moretags) = "yaml:\"connection_hops\""];
+  // opaque channel version, which is agreed upon during the handshake
+  string version = 5;
+}
+
+// IdentifiedChannel defines a channel with additional port and channel
+// identifier fields.
+message IdentifiedChannel {
+  option (gogoproto.goproto_getters) = false;
+
+  // current state of the channel end
+  State state = 1;
+  // whether the channel is ordered or unordered
+  Order ordering = 2;
+  // counterparty channel end
+  Counterparty counterparty = 3 [(gogoproto.nullable) = false];
+  // list of connection identifiers, in order, along which packets sent on
+  // this channel will travel
+  repeated string connection_hops = 4 [(gogoproto.moretags) = "yaml:\"connection_hops\""];
+  // opaque channel version, which is agreed upon during the handshake
+  string version = 5;
+  // port identifier
+  string port_id = 6;
+  // channel identifier
+  string channel_id = 7;
+}
+
+// State defines if a channel is in one of the following states:
+// CLOSED, INIT, TRYOPEN, OPEN or UNINITIALIZED.
+enum State {
+  option (gogoproto.goproto_enum_prefix) = false;
+
+  // Default State
+  STATE_UNINITIALIZED_UNSPECIFIED = 0 [(gogoproto.enumvalue_customname) = "UNINITIALIZED"];
+  // A channel has just started the opening handshake.
+  STATE_INIT = 1 [(gogoproto.enumvalue_customname) = "INIT"];
+  // A channel has acknowledged the handshake step on the counterparty chain.
+  STATE_TRYOPEN = 2 [(gogoproto.enumvalue_customname) = "TRYOPEN"];
+  // A channel has completed the handshake. Open channels are
+  // ready to send and receive packets.
+  STATE_OPEN = 3 [(gogoproto.enumvalue_customname) = "OPEN"];
+  // A channel has been closed and can no longer be used to send or receive
+  // packets.
+  STATE_CLOSED = 4 [(gogoproto.enumvalue_customname) = "CLOSED"];
+}
+
+// Order defines if a channel is ORDERED or UNORDERED
+enum Order {
+  option (gogoproto.goproto_enum_prefix) = false;
+
+  // zero-value for channel ordering
+  ORDER_NONE_UNSPECIFIED = 0 [(gogoproto.enumvalue_customname) = "NONE"];
+  // packets can be delivered in any order, which may differ from the order in
+  // which they were sent.
+  ORDER_UNORDERED = 1 [(gogoproto.enumvalue_customname) = "UNORDERED"];
+  // packets are delivered exactly in the order which they were sent
+  ORDER_ORDERED = 2 [(gogoproto.enumvalue_customname) = "ORDERED"];
+}
+
+// Counterparty defines a channel end counterparty
+message Counterparty {
+  option (gogoproto.goproto_getters) = false;
+
+  // port on the counterparty chain which owns the other end of the channel.
+  string port_id = 1 [(gogoproto.moretags) = "yaml:\"port_id\""];
+  // channel end on the counterparty chain
+  string channel_id = 2 [(gogoproto.moretags) = "yaml:\"channel_id\""];
+}
+
+// Packet defines a type that carries data across different chains through IBC
+message Packet {
+  option (gogoproto.goproto_getters) = false;
+
+  // number corresponds to the order of sends and receives, where a Packet
+  // with an earlier sequence number must be sent and received before a Packet
+  // with a later sequence number.
+  uint64 sequence = 1;
+  // identifies the port on the sending chain.
+  string source_port = 2 [(gogoproto.moretags) = "yaml:\"source_port\""];
+  // identifies the channel end on the sending chain.
+  string source_channel = 3 [(gogoproto.moretags) = "yaml:\"source_channel\""];
+  // identifies the port on the receiving chain.
+  string destination_port = 4 [(gogoproto.moretags) = "yaml:\"destination_port\""];
+  // identifies the channel end on the receiving chain.
+  string destination_channel = 5 [(gogoproto.moretags) = "yaml:\"destination_channel\""];
+  // actual opaque bytes transferred directly to the application module
+  bytes data = 6;
+  // block height after which the packet times out
+  ibc.core.client.v1.Height timeout_height = 7
+      [(gogoproto.moretags) = "yaml:\"timeout_height\"", (gogoproto.nullable) = false];
+  // block timestamp (in nanoseconds) after which the packet times out
+  uint64 timeout_timestamp = 8 [(gogoproto.moretags) = "yaml:\"timeout_timestamp\""];
+}
+
+// PacketState defines the generic type necessary to retrieve and store
+// packet commitments, acknowledgements, and receipts.
+// Caller is responsible for knowing the context necessary to interpret this
+// state as a commitment, acknowledgement, or a receipt.
+message PacketState {
+  option (gogoproto.goproto_getters) = false;
+
+  // channel port identifier.
+  string port_id = 1 [(gogoproto.moretags) = "yaml:\"port_id\""];
+  // channel unique identifier.
+  string channel_id = 2 [(gogoproto.moretags) = "yaml:\"channel_id\""];
+  // packet sequence.
+  uint64 sequence = 3;
+  // embedded data that represents packet state.
+  bytes data = 4;
+}
+
+// PacketId is an identifer for a unique Packet
+// Source chains refer to packets by source port/channel
+// Destination chains refer to packets by destination port/channel
+message PacketId {
+  option (gogoproto.goproto_getters) = false;
+
+  // channel port identifier
+  string port_id = 1 [(gogoproto.moretags) = "yaml:\"port_id\""];
+  // channel unique identifier
+  string channel_id = 2 [(gogoproto.moretags) = "yaml:\"channel_id\""];
+  // packet sequence
+  uint64 sequence = 3;
+}
+
+// Acknowledgement is the recommended acknowledgement format to be used by
+// app-specific protocols.
+// NOTE: The field numbers 21 and 22 were explicitly chosen to avoid accidental
+// conflicts with other protobuf message formats used for acknowledgements.
+// The first byte of any message with this format will be the non-ASCII values
+// `0xaa` (result) or `0xb2` (error). Implemented as defined by ICS:
+// https://github.com/cosmos/ibc/tree/master/spec/core/ics-004-channel-and-packet-semantics#acknowledgement-envelope
+message Acknowledgement {
+  // response contains either a result or an error and must be non-empty
+  oneof response {
+    bytes  result = 21;
+    string error  = 22;
+  }
+}
diff --git a/third_party/proto/ibc/core/channel/v1/genesis.proto b/third_party/proto/ibc/core/channel/v1/genesis.proto
new file mode 100644
index 000000000..65cc928aa
--- /dev/null
+++ b/third_party/proto/ibc/core/channel/v1/genesis.proto
@@ -0,0 +1,32 @@
+syntax = "proto3";
+
+package ibc.core.channel.v1;
+
+option go_package = "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types";
+
+import "gogoproto/gogo.proto";
+import "ibc/core/channel/v1/channel.proto";
+
+// GenesisState defines the ibc channel submodule's genesis state.
+message GenesisState {
+  repeated IdentifiedChannel channels = 1 [(gogoproto.casttype) = "IdentifiedChannel", (gogoproto.nullable) = false];
+  repeated PacketState       acknowledgements = 2 [(gogoproto.nullable) = false];
+  repeated PacketState       commitments      = 3 [(gogoproto.nullable) = false];
+  repeated PacketState       receipts         = 4 [(gogoproto.nullable) = false];
+  repeated PacketSequence    send_sequences   = 5
+      [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"send_sequences\""];
+  repeated PacketSequence recv_sequences = 6
+      [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"recv_sequences\""];
+  repeated PacketSequence ack_sequences = 7
+      [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"ack_sequences\""];
+  // the sequence for the next generated channel identifier
+  uint64 next_channel_sequence = 8 [(gogoproto.moretags) = "yaml:\"next_channel_sequence\""];
+}
+
+// PacketSequence defines the genesis type necessary to retrieve and store
+// next send and receive sequences.
+message PacketSequence {
+  string port_id    = 1 [(gogoproto.moretags) = "yaml:\"port_id\""];
+  string channel_id = 2 [(gogoproto.moretags) = "yaml:\"channel_id\""];
+  uint64 sequence   = 3;
+}
diff --git a/third_party/proto/ibc/core/channel/v1/query.proto b/third_party/proto/ibc/core/channel/v1/query.proto
new file mode 100644
index 000000000..2d5bdb2fc
--- /dev/null
+++ b/third_party/proto/ibc/core/channel/v1/query.proto
@@ -0,0 +1,376 @@
+syntax = "proto3";
+
+package ibc.core.channel.v1;
+
+option go_package = "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types";
+
+import "ibc/core/client/v1/client.proto";
+import "cosmos/base/query/v1beta1/pagination.proto";
+import "ibc/core/channel/v1/channel.proto";
+import "google/api/annotations.proto";
+import "google/protobuf/any.proto";
+import "gogoproto/gogo.proto";
+
+// Query provides defines the gRPC querier service
+service Query {
+  // Channel queries an IBC Channel.
+  rpc Channel(QueryChannelRequest) returns (QueryChannelResponse) {
+    option (google.api.http).get = "/ibc/core/channel/v1/channels/{channel_id}/ports/{port_id}";
+  }
+
+  // Channels queries all the IBC channels of a chain.
+  rpc Channels(QueryChannelsRequest) returns (QueryChannelsResponse) {
+    option (google.api.http).get = "/ibc/core/channel/v1/channels";
+  }
+
+  // ConnectionChannels queries all the channels associated with a connection
+  // end.
+  rpc ConnectionChannels(QueryConnectionChannelsRequest) returns (QueryConnectionChannelsResponse) {
+    option (google.api.http).get = "/ibc/core/channel/v1/connections/{connection}/channels";
+  }
+
+  // ChannelClientState queries for the client state for the channel associated
+  // with the provided channel identifiers.
+  rpc ChannelClientState(QueryChannelClientStateRequest) returns (QueryChannelClientStateResponse) {
+    option (google.api.http).get = "/ibc/core/channel/v1/channels/{channel_id}/"
+                                   "ports/{port_id}/client_state";
+  }
+
+  // ChannelConsensusState queries for the consensus state for the channel
+  // associated with the provided channel identifiers.
+  rpc ChannelConsensusState(QueryChannelConsensusStateRequest) returns (QueryChannelConsensusStateResponse) {
+    option (google.api.http).get = "/ibc/core/channel/v1/channels/{channel_id}/"
+                                   "ports/{port_id}/consensus_state/revision/"
+                                   "{revision_number}/height/{revision_height}";
+  }
+
+  // PacketCommitment queries a stored packet commitment hash.
+  rpc PacketCommitment(QueryPacketCommitmentRequest) returns (QueryPacketCommitmentResponse) {
+    option (google.api.http).get = "/ibc/core/channel/v1/channels/{channel_id}/ports/{port_id}/"
+                                   "packet_commitments/{sequence}";
+  }
+
+  // PacketCommitments returns all the packet commitments hashes associated
+  // with a channel.
+  rpc PacketCommitments(QueryPacketCommitmentsRequest) returns (QueryPacketCommitmentsResponse) {
+    option (google.api.http).get = "/ibc/core/channel/v1/channels/{channel_id}/"
+                                   "ports/{port_id}/packet_commitments";
+  }
+
+  // PacketReceipt queries if a given packet sequence has been received on the
+  // queried chain
+  rpc PacketReceipt(QueryPacketReceiptRequest) returns (QueryPacketReceiptResponse) {
+    option (google.api.http).get = "/ibc/core/channel/v1/channels/{channel_id}/"
+                                   "ports/{port_id}/packet_receipts/{sequence}";
+  }
+
+  // PacketAcknowledgement queries a stored packet acknowledgement hash.
+  rpc PacketAcknowledgement(QueryPacketAcknowledgementRequest) returns (QueryPacketAcknowledgementResponse) {
+    option (google.api.http).get = "/ibc/core/channel/v1/channels/{channel_id}/"
+                                   "ports/{port_id}/packet_acks/{sequence}";
+  }
+
+  // PacketAcknowledgements returns all the packet acknowledgements associated
+  // with a channel.
+  rpc PacketAcknowledgements(QueryPacketAcknowledgementsRequest) returns (QueryPacketAcknowledgementsResponse) {
+    option (google.api.http).get = "/ibc/core/channel/v1/channels/{channel_id}/"
+                                   "ports/{port_id}/packet_acknowledgements";
+  }
+
+  // UnreceivedPackets returns all the unreceived IBC packets associated with a
+  // channel and sequences.
+  rpc UnreceivedPackets(QueryUnreceivedPacketsRequest) returns (QueryUnreceivedPacketsResponse) {
+    option (google.api.http).get = "/ibc/core/channel/v1/channels/{channel_id}/ports/{port_id}/"
+                                   "packet_commitments/"
+                                   "{packet_commitment_sequences}/unreceived_packets";
+  }
+
+  // UnreceivedAcks returns all the unreceived IBC acknowledgements associated
+  // with a channel and sequences.
+  rpc UnreceivedAcks(QueryUnreceivedAcksRequest) returns (QueryUnreceivedAcksResponse) {
+    option (google.api.http).get = "/ibc/core/channel/v1/channels/{channel_id}/"
+                                   "ports/{port_id}/packet_commitments/"
+                                   "{packet_ack_sequences}/unreceived_acks";
+  }
+
+  // NextSequenceReceive returns the next receive sequence for a given channel.
+  rpc NextSequenceReceive(QueryNextSequenceReceiveRequest) returns (QueryNextSequenceReceiveResponse) {
+    option (google.api.http).get = "/ibc/core/channel/v1/channels/{channel_id}/"
+                                   "ports/{port_id}/next_sequence";
+  }
+}
+
+// QueryChannelRequest is the request type for the Query/Channel RPC method
+message QueryChannelRequest {
+  // port unique identifier
+  string port_id = 1;
+  // channel unique identifier
+  string channel_id = 2;
+}
+
+// QueryChannelResponse is the response type for the Query/Channel RPC method.
+// Besides the Channel end, it includes a proof and the height from which the
+// proof was retrieved.
+message QueryChannelResponse {
+  // channel associated with the request identifiers
+  ibc.core.channel.v1.Channel channel = 1;
+  // merkle proof of existence
+  bytes proof = 2;
+  // height at which the proof was retrieved
+  ibc.core.client.v1.Height proof_height = 3 [(gogoproto.nullable) = false];
+}
+
+// QueryChannelsRequest is the request type for the Query/Channels RPC method
+message QueryChannelsRequest {
+  // pagination request
+  cosmos.base.query.v1beta1.PageRequest pagination = 1;
+}
+
+// QueryChannelsResponse is the response type for the Query/Channels RPC method.
+message QueryChannelsResponse {
+  // list of stored channels of the chain.
+  repeated ibc.core.channel.v1.IdentifiedChannel channels = 1;
+  // pagination response
+  cosmos.base.query.v1beta1.PageResponse pagination = 2;
+  // query block height
+  ibc.core.client.v1.Height height = 3 [(gogoproto.nullable) = false];
+}
+
+// QueryConnectionChannelsRequest is the request type for the
+// Query/QueryConnectionChannels RPC method
+message QueryConnectionChannelsRequest {
+  // connection unique identifier
+  string connection = 1;
+  // pagination request
+  cosmos.base.query.v1beta1.PageRequest pagination = 2;
+}
+
+// QueryConnectionChannelsResponse is the Response type for the
+// Query/QueryConnectionChannels RPC method
+message QueryConnectionChannelsResponse {
+  // list of channels associated with a connection.
+  repeated ibc.core.channel.v1.IdentifiedChannel channels = 1;
+  // pagination response
+  cosmos.base.query.v1beta1.PageResponse pagination = 2;
+  // query block height
+  ibc.core.client.v1.Height height = 3 [(gogoproto.nullable) = false];
+}
+
+// QueryChannelClientStateRequest is the request type for the Query/ClientState
+// RPC method
+message QueryChannelClientStateRequest {
+  // port unique identifier
+  string port_id = 1;
+  // channel unique identifier
+  string channel_id = 2;
+}
+
+// QueryChannelClientStateResponse is the Response type for the
+// Query/QueryChannelClientState RPC method
+message QueryChannelClientStateResponse {
+  // client state associated with the channel
+  ibc.core.client.v1.IdentifiedClientState identified_client_state = 1;
+  // merkle proof of existence
+  bytes proof = 2;
+  // height at which the proof was retrieved
+  ibc.core.client.v1.Height proof_height = 3 [(gogoproto.nullable) = false];
+}
+
+// QueryChannelConsensusStateRequest is the request type for the
+// Query/ConsensusState RPC method
+message QueryChannelConsensusStateRequest {
+  // port unique identifier
+  string port_id = 1;
+  // channel unique identifier
+  string channel_id = 2;
+  // revision number of the consensus state
+  uint64 revision_number = 3;
+  // revision height of the consensus state
+  uint64 revision_height = 4;
+}
+
+// QueryChannelClientStateResponse is the Response type for the
+// Query/QueryChannelClientState RPC method
+message QueryChannelConsensusStateResponse {
+  // consensus state associated with the channel
+  google.protobuf.Any consensus_state = 1;
+  // client ID associated with the consensus state
+  string client_id = 2;
+  // merkle proof of existence
+  bytes proof = 3;
+  // height at which the proof was retrieved
+  ibc.core.client.v1.Height proof_height = 4 [(gogoproto.nullable) = false];
+}
+
+// QueryPacketCommitmentRequest is the request type for the
+// Query/PacketCommitment RPC method
+message QueryPacketCommitmentRequest {
+  // port unique identifier
+  string port_id = 1;
+  // channel unique identifier
+  string channel_id = 2;
+  // packet sequence
+  uint64 sequence = 3;
+}
+
+// QueryPacketCommitmentResponse defines the client query response for a packet
+// which also includes a proof and the height from which the proof was
+// retrieved
+message QueryPacketCommitmentResponse {
+  // packet associated with the request fields
+  bytes commitment = 1;
+  // merkle proof of existence
+  bytes proof = 2;
+  // height at which the proof was retrieved
+  ibc.core.client.v1.Height proof_height = 3 [(gogoproto.nullable) = false];
+}
+
+// QueryPacketCommitmentsRequest is the request type for the
+// Query/QueryPacketCommitments RPC method
+message QueryPacketCommitmentsRequest {
+  // port unique identifier
+  string port_id = 1;
+  // channel unique identifier
+  string channel_id = 2;
+  // pagination request
+  cosmos.base.query.v1beta1.PageRequest pagination = 3;
+}
+
+// QueryPacketCommitmentsResponse is the request type for the
+// Query/QueryPacketCommitments RPC method
+message QueryPacketCommitmentsResponse {
+  repeated ibc.core.channel.v1.PacketState commitments = 1;
+  // pagination response
+  cosmos.base.query.v1beta1.PageResponse pagination = 2;
+  // query block height
+  ibc.core.client.v1.Height height = 3 [(gogoproto.nullable) = false];
+}
+
+// QueryPacketReceiptRequest is the request type for the
+// Query/PacketReceipt RPC method
+message QueryPacketReceiptRequest {
+  // port unique identifier
+  string port_id = 1;
+  // channel unique identifier
+  string channel_id = 2;
+  // packet sequence
+  uint64 sequence = 3;
+}
+
+// QueryPacketReceiptResponse defines the client query response for a packet
+// receipt which also includes a proof, and the height from which the proof was
+// retrieved
+message QueryPacketReceiptResponse {
+  // success flag for if receipt exists
+  bool received = 2;
+  // merkle proof of existence
+  bytes proof = 3;
+  // height at which the proof was retrieved
+  ibc.core.client.v1.Height proof_height = 4 [(gogoproto.nullable) = false];
+}
+
+// QueryPacketAcknowledgementRequest is the request type for the
+// Query/PacketAcknowledgement RPC method
+message QueryPacketAcknowledgementRequest {
+  // port unique identifier
+  string port_id = 1;
+  // channel unique identifier
+  string channel_id = 2;
+  // packet sequence
+  uint64 sequence = 3;
+}
+
+// QueryPacketAcknowledgementResponse defines the client query response for a
+// packet which also includes a proof and the height from which the
+// proof was retrieved
+message QueryPacketAcknowledgementResponse {
+  // packet associated with the request fields
+  bytes acknowledgement = 1;
+  // merkle proof of existence
+  bytes proof = 2;
+  // height at which the proof was retrieved
+  ibc.core.client.v1.Height proof_height = 3 [(gogoproto.nullable) = false];
+}
+
+// QueryPacketAcknowledgementsRequest is the request type for the
+// Query/QueryPacketCommitments RPC method
+message QueryPacketAcknowledgementsRequest {
+  // port unique identifier
+  string port_id = 1;
+  // channel unique identifier
+  string channel_id = 2;
+  // pagination request
+  cosmos.base.query.v1beta1.PageRequest pagination = 3;
+  // list of packet sequences
+  repeated uint64 packet_commitment_sequences = 4;
+}
+
+// QueryPacketAcknowledgemetsResponse is the request type for the
+// Query/QueryPacketAcknowledgements RPC method
+message QueryPacketAcknowledgementsResponse {
+  repeated ibc.core.channel.v1.PacketState acknowledgements = 1;
+  // pagination response
+  cosmos.base.query.v1beta1.PageResponse pagination = 2;
+  // query block height
+  ibc.core.client.v1.Height height = 3 [(gogoproto.nullable) = false];
+}
+
+// QueryUnreceivedPacketsRequest is the request type for the
+// Query/UnreceivedPackets RPC method
+message QueryUnreceivedPacketsRequest {
+  // port unique identifier
+  string port_id = 1;
+  // channel unique identifier
+  string channel_id = 2;
+  // list of packet sequences
+  repeated uint64 packet_commitment_sequences = 3;
+}
+
+// QueryUnreceivedPacketsResponse is the response type for the
+// Query/UnreceivedPacketCommitments RPC method
+message QueryUnreceivedPacketsResponse {
+  // list of unreceived packet sequences
+  repeated uint64 sequences = 1;
+  // query block height
+  ibc.core.client.v1.Height height = 2 [(gogoproto.nullable) = false];
+}
+
+// QueryUnreceivedAcks is the request type for the
+// Query/UnreceivedAcks RPC method
+message QueryUnreceivedAcksRequest {
+  // port unique identifier
+  string port_id = 1;
+  // channel unique identifier
+  string channel_id = 2;
+  // list of acknowledgement sequences
+  repeated uint64 packet_ack_sequences = 3;
+}
+
+// QueryUnreceivedAcksResponse is the response type for the
+// Query/UnreceivedAcks RPC method
+message QueryUnreceivedAcksResponse {
+  // list of unreceived acknowledgement sequences
+  repeated uint64 sequences = 1;
+  // query block height
+  ibc.core.client.v1.Height height = 2 [(gogoproto.nullable) = false];
+}
+
+// QueryNextSequenceReceiveRequest is the request type for the
+// Query/QueryNextSequenceReceiveRequest RPC method
+message QueryNextSequenceReceiveRequest {
+  // port unique identifier
+  string port_id = 1;
+  // channel unique identifier
+  string channel_id = 2;
+}
+
+// QuerySequenceResponse is the request type for the
+// Query/QueryNextSequenceReceiveResponse RPC method
+message QueryNextSequenceReceiveResponse {
+  // next sequence receive number
+  uint64 next_sequence_receive = 1;
+  // merkle proof of existence
+  bytes proof = 2;
+  // height at which the proof was retrieved
+  ibc.core.client.v1.Height proof_height = 3 [(gogoproto.nullable) = false];
+}
diff --git a/third_party/proto/ibc/core/channel/v1/tx.proto b/third_party/proto/ibc/core/channel/v1/tx.proto
new file mode 100644
index 000000000..a67a37555
--- /dev/null
+++ b/third_party/proto/ibc/core/channel/v1/tx.proto
@@ -0,0 +1,246 @@
+syntax = "proto3";
+
+package ibc.core.channel.v1;
+
+option go_package = "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types";
+
+import "gogoproto/gogo.proto";
+import "ibc/core/client/v1/client.proto";
+import "ibc/core/channel/v1/channel.proto";
+
+// Msg defines the ibc/channel Msg service.
+service Msg {
+  // ChannelOpenInit defines a rpc handler method for MsgChannelOpenInit.
+  rpc ChannelOpenInit(MsgChannelOpenInit) returns (MsgChannelOpenInitResponse);
+
+  // ChannelOpenTry defines a rpc handler method for MsgChannelOpenTry.
+  rpc ChannelOpenTry(MsgChannelOpenTry) returns (MsgChannelOpenTryResponse);
+
+  // ChannelOpenAck defines a rpc handler method for MsgChannelOpenAck.
+  rpc ChannelOpenAck(MsgChannelOpenAck) returns (MsgChannelOpenAckResponse);
+
+  // ChannelOpenConfirm defines a rpc handler method for MsgChannelOpenConfirm.
+  rpc ChannelOpenConfirm(MsgChannelOpenConfirm) returns (MsgChannelOpenConfirmResponse);
+
+  // ChannelCloseInit defines a rpc handler method for MsgChannelCloseInit.
+  rpc ChannelCloseInit(MsgChannelCloseInit) returns (MsgChannelCloseInitResponse);
+
+  // ChannelCloseConfirm defines a rpc handler method for
+  // MsgChannelCloseConfirm.
+  rpc ChannelCloseConfirm(MsgChannelCloseConfirm) returns (MsgChannelCloseConfirmResponse);
+
+  // RecvPacket defines a rpc handler method for MsgRecvPacket.
+  rpc RecvPacket(MsgRecvPacket) returns (MsgRecvPacketResponse);
+
+  // Timeout defines a rpc handler method for MsgTimeout.
+  rpc Timeout(MsgTimeout) returns (MsgTimeoutResponse);
+
+  // TimeoutOnClose defines a rpc handler method for MsgTimeoutOnClose.
+  rpc TimeoutOnClose(MsgTimeoutOnClose) returns (MsgTimeoutOnCloseResponse);
+
+  // Acknowledgement defines a rpc handler method for MsgAcknowledgement.
+  rpc Acknowledgement(MsgAcknowledgement) returns (MsgAcknowledgementResponse);
+}
+
+// ResponseResultType defines the possible outcomes of the execution of a message
+enum ResponseResultType {
+  option (gogoproto.goproto_enum_prefix) = false;
+
+  // Default zero value enumeration
+  RESPONSE_RESULT_TYPE_UNSPECIFIED = 0 [(gogoproto.enumvalue_customname) = "UNSPECIFIED"];
+  // The message did not call the IBC application callbacks (because, for example, the packet had already been relayed)
+  RESPONSE_RESULT_TYPE_NOOP = 1 [(gogoproto.enumvalue_customname) = "NOOP"];
+  // The message was executed successfully
+  RESPONSE_RESULT_TYPE_SUCCESS = 2 [(gogoproto.enumvalue_customname) = "SUCCESS"];
+}
+
+// MsgChannelOpenInit defines an sdk.Msg to initialize a channel handshake. It
+// is called by a relayer on Chain A.
+message MsgChannelOpenInit {
+  option (gogoproto.equal)           = false;
+  option (gogoproto.goproto_getters) = false;
+
+  string  port_id = 1 [(gogoproto.moretags) = "yaml:\"port_id\""];
+  Channel channel = 2 [(gogoproto.nullable) = false];
+  string  signer  = 3;
+}
+
+// MsgChannelOpenInitResponse defines the Msg/ChannelOpenInit response type.
+message MsgChannelOpenInitResponse {
+  string channel_id = 1 [(gogoproto.moretags) = "yaml:\"channel_id\""];
+  string version    = 2;
+}
+
+// MsgChannelOpenInit defines a msg sent by a Relayer to try to open a channel
+// on Chain B. The version field within the Channel field has been deprecated. Its
+// value will be ignored by core IBC.
+message MsgChannelOpenTry {
+  option (gogoproto.equal)           = false;
+  option (gogoproto.goproto_getters) = false;
+
+  string port_id = 1 [(gogoproto.moretags) = "yaml:\"port_id\""];
+  // Deprecated: this field is unused. Crossing hello's are no longer supported in core IBC.
+  string previous_channel_id = 2 [deprecated = true, (gogoproto.moretags) = "yaml:\"previous_channel_id\""];
+  // NOTE: the version field within the channel has been deprecated. Its value will be ignored by core IBC.
+  Channel                   channel              = 3 [(gogoproto.nullable) = false];
+  string                    counterparty_version = 4 [(gogoproto.moretags) = "yaml:\"counterparty_version\""];
+  bytes                     proof_init           = 5 [(gogoproto.moretags) = "yaml:\"proof_init\""];
+  ibc.core.client.v1.Height proof_height         = 6
+      [(gogoproto.moretags) = "yaml:\"proof_height\"", (gogoproto.nullable) = false];
+  string signer = 7;
+}
+
+// MsgChannelOpenTryResponse defines the Msg/ChannelOpenTry response type.
+message MsgChannelOpenTryResponse {
+  string version    = 1;
+  string channel_id = 2 [(gogoproto.moretags) = "yaml:\"channel_id\""];
+}
+
+// MsgChannelOpenAck defines a msg sent by a Relayer to Chain A to acknowledge
+// the change of channel state to TRYOPEN on Chain B.
+message MsgChannelOpenAck {
+  option (gogoproto.equal)           = false;
+  option (gogoproto.goproto_getters) = false;
+
+  string                    port_id                 = 1 [(gogoproto.moretags) = "yaml:\"port_id\""];
+  string                    channel_id              = 2 [(gogoproto.moretags) = "yaml:\"channel_id\""];
+  string                    counterparty_channel_id = 3 [(gogoproto.moretags) = "yaml:\"counterparty_channel_id\""];
+  string                    counterparty_version    = 4 [(gogoproto.moretags) = "yaml:\"counterparty_version\""];
+  bytes                     proof_try               = 5 [(gogoproto.moretags) = "yaml:\"proof_try\""];
+  ibc.core.client.v1.Height proof_height            = 6
+      [(gogoproto.moretags) = "yaml:\"proof_height\"", (gogoproto.nullable) = false];
+  string signer = 7;
+}
+
+// MsgChannelOpenAckResponse defines the Msg/ChannelOpenAck response type.
+message MsgChannelOpenAckResponse {}
+
+// MsgChannelOpenConfirm defines a msg sent by a Relayer to Chain B to
+// acknowledge the change of channel state to OPEN on Chain A.
+message MsgChannelOpenConfirm {
+  option (gogoproto.equal)           = false;
+  option (gogoproto.goproto_getters) = false;
+
+  string                    port_id      = 1 [(gogoproto.moretags) = "yaml:\"port_id\""];
+  string                    channel_id   = 2 [(gogoproto.moretags) = "yaml:\"channel_id\""];
+  bytes                     proof_ack    = 3 [(gogoproto.moretags) = "yaml:\"proof_ack\""];
+  ibc.core.client.v1.Height proof_height = 4
+      [(gogoproto.moretags) = "yaml:\"proof_height\"", (gogoproto.nullable) = false];
+  string signer = 5;
+}
+
+// MsgChannelOpenConfirmResponse defines the Msg/ChannelOpenConfirm response
+// type.
+message MsgChannelOpenConfirmResponse {}
+
+// MsgChannelCloseInit defines a msg sent by a Relayer to Chain A
+// to close a channel with Chain B.
+message MsgChannelCloseInit {
+  option (gogoproto.equal)           = false;
+  option (gogoproto.goproto_getters) = false;
+
+  string port_id    = 1 [(gogoproto.moretags) = "yaml:\"port_id\""];
+  string channel_id = 2 [(gogoproto.moretags) = "yaml:\"channel_id\""];
+  string signer     = 3;
+}
+
+// MsgChannelCloseInitResponse defines the Msg/ChannelCloseInit response type.
+message MsgChannelCloseInitResponse {}
+
+// MsgChannelCloseConfirm defines a msg sent by a Relayer to Chain B
+// to acknowledge the change of channel state to CLOSED on Chain A.
+message MsgChannelCloseConfirm {
+  option (gogoproto.equal)           = false;
+  option (gogoproto.goproto_getters) = false;
+
+  string                    port_id      = 1 [(gogoproto.moretags) = "yaml:\"port_id\""];
+  string                    channel_id   = 2 [(gogoproto.moretags) = "yaml:\"channel_id\""];
+  bytes                     proof_init   = 3 [(gogoproto.moretags) = "yaml:\"proof_init\""];
+  ibc.core.client.v1.Height proof_height = 4
+      [(gogoproto.moretags) = "yaml:\"proof_height\"", (gogoproto.nullable) = false];
+  string signer = 5;
+}
+
+// MsgChannelCloseConfirmResponse defines the Msg/ChannelCloseConfirm response
+// type.
+message MsgChannelCloseConfirmResponse {}
+
+// MsgRecvPacket receives incoming IBC packet
+message MsgRecvPacket {
+  option (gogoproto.equal)           = false;
+  option (gogoproto.goproto_getters) = false;
+
+  Packet                    packet           = 1 [(gogoproto.nullable) = false];
+  bytes                     proof_commitment = 2 [(gogoproto.moretags) = "yaml:\"proof_commitment\""];
+  ibc.core.client.v1.Height proof_height     = 3
+      [(gogoproto.moretags) = "yaml:\"proof_height\"", (gogoproto.nullable) = false];
+  string signer = 4;
+}
+
+// MsgRecvPacketResponse defines the Msg/RecvPacket response type.
+message MsgRecvPacketResponse {
+  option (gogoproto.goproto_getters) = false;
+
+  ResponseResultType result = 1;
+}
+
+// MsgTimeout receives timed-out packet
+message MsgTimeout {
+  option (gogoproto.equal)           = false;
+  option (gogoproto.goproto_getters) = false;
+
+  Packet                    packet           = 1 [(gogoproto.nullable) = false];
+  bytes                     proof_unreceived = 2 [(gogoproto.moretags) = "yaml:\"proof_unreceived\""];
+  ibc.core.client.v1.Height proof_height     = 3
+      [(gogoproto.moretags) = "yaml:\"proof_height\"", (gogoproto.nullable) = false];
+  uint64 next_sequence_recv = 4 [(gogoproto.moretags) = "yaml:\"next_sequence_recv\""];
+  string signer             = 5;
+}
+
+// MsgTimeoutResponse defines the Msg/Timeout response type.
+message MsgTimeoutResponse {
+  option (gogoproto.goproto_getters) = false;
+
+  ResponseResultType result = 1;
+}
+
+// MsgTimeoutOnClose timed-out packet upon counterparty channel closure.
+message MsgTimeoutOnClose {
+  option (gogoproto.equal)           = false;
+  option (gogoproto.goproto_getters) = false;
+
+  Packet                    packet           = 1 [(gogoproto.nullable) = false];
+  bytes                     proof_unreceived = 2 [(gogoproto.moretags) = "yaml:\"proof_unreceived\""];
+  bytes                     proof_close      = 3 [(gogoproto.moretags) = "yaml:\"proof_close\""];
+  ibc.core.client.v1.Height proof_height     = 4
+      [(gogoproto.moretags) = "yaml:\"proof_height\"", (gogoproto.nullable) = false];
+  uint64 next_sequence_recv = 5 [(gogoproto.moretags) = "yaml:\"next_sequence_recv\""];
+  string signer             = 6;
+}
+
+// MsgTimeoutOnCloseResponse defines the Msg/TimeoutOnClose response type.
+message MsgTimeoutOnCloseResponse {
+  option (gogoproto.goproto_getters) = false;
+
+  ResponseResultType result = 1;
+}
+
+// MsgAcknowledgement receives incoming IBC acknowledgement
+message MsgAcknowledgement {
+  option (gogoproto.equal)           = false;
+  option (gogoproto.goproto_getters) = false;
+
+  Packet                    packet          = 1 [(gogoproto.nullable) = false];
+  bytes                     acknowledgement = 2;
+  bytes                     proof_acked     = 3 [(gogoproto.moretags) = "yaml:\"proof_acked\""];
+  ibc.core.client.v1.Height proof_height    = 4
+      [(gogoproto.moretags) = "yaml:\"proof_height\"", (gogoproto.nullable) = false];
+  string signer = 5;
+}
+
+// MsgAcknowledgementResponse defines the Msg/Acknowledgement response type.
+message MsgAcknowledgementResponse {
+  option (gogoproto.goproto_getters) = false;
+
+  ResponseResultType result = 1;
+}
diff --git a/third_party/proto/ibc/core/client/v1/client.proto b/third_party/proto/ibc/core/client/v1/client.proto
new file mode 100644
index 000000000..15b47e555
--- /dev/null
+++ b/third_party/proto/ibc/core/client/v1/client.proto
@@ -0,0 +1,105 @@
+syntax = "proto3";
+
+package ibc.core.client.v1;
+
+option go_package = "github.com/cosmos/ibc-go/v7/modules/core/02-client/types";
+
+import "gogoproto/gogo.proto";
+import "google/protobuf/any.proto";
+import "cosmos/upgrade/v1beta1/upgrade.proto";
+import "cosmos_proto/cosmos.proto";
+
+// IdentifiedClientState defines a client state with an additional client
+// identifier field.
+message IdentifiedClientState {
+  // client identifier
+  string client_id = 1 [(gogoproto.moretags) = "yaml:\"client_id\""];
+  // client state
+  google.protobuf.Any client_state = 2 [(gogoproto.moretags) = "yaml:\"client_state\""];
+}
+
+// ConsensusStateWithHeight defines a consensus state with an additional height
+// field.
+message ConsensusStateWithHeight {
+  // consensus state height
+  Height height = 1 [(gogoproto.nullable) = false];
+  // consensus state
+  google.protobuf.Any consensus_state = 2 [(gogoproto.moretags) = "yaml:\"consensus_state\""];
+}
+
+// ClientConsensusStates defines all the stored consensus states for a given
+// client.
+message ClientConsensusStates {
+  // client identifier
+  string client_id = 1 [(gogoproto.moretags) = "yaml:\"client_id\""];
+  // consensus states and their heights associated with the client
+  repeated ConsensusStateWithHeight consensus_states = 2
+      [(gogoproto.moretags) = "yaml:\"consensus_states\"", (gogoproto.nullable) = false];
+}
+
+// ClientUpdateProposal is a governance proposal. If it passes, the substitute
+// client's latest consensus state is copied over to the subject client. The proposal
+// handler may fail if the subject and the substitute do not match in client and
+// chain parameters (with exception to latest height, frozen height, and chain-id).
+message ClientUpdateProposal {
+  option (gogoproto.goproto_getters)         = false;
+  option (cosmos_proto.implements_interface) = "cosmos.gov.v1beta1.Content";
+  // the title of the update proposal
+  string title = 1;
+  // the description of the proposal
+  string description = 2;
+  // the client identifier for the client to be updated if the proposal passes
+  string subject_client_id = 3 [(gogoproto.moretags) = "yaml:\"subject_client_id\""];
+  // the substitute client identifier for the client standing in for the subject
+  // client
+  string substitute_client_id = 4 [(gogoproto.moretags) = "yaml:\"substitute_client_id\""];
+}
+
+// UpgradeProposal is a gov Content type for initiating an IBC breaking
+// upgrade.
+message UpgradeProposal {
+  option (gogoproto.goproto_getters)         = false;
+  option (gogoproto.goproto_stringer)        = false;
+  option (gogoproto.equal)                   = true;
+  option (cosmos_proto.implements_interface) = "cosmos.gov.v1beta1.Content";
+
+  string                      title       = 1;
+  string                      description = 2;
+  cosmos.upgrade.v1beta1.Plan plan        = 3 [(gogoproto.nullable) = false];
+
+  // An UpgradedClientState must be provided to perform an IBC breaking upgrade.
+  // This will make the chain commit to the correct upgraded (self) client state
+  // before the upgrade occurs, so that connecting chains can verify that the
+  // new upgraded client is valid by verifying a proof on the previous version
+  // of the chain. This will allow IBC connections to persist smoothly across
+  // planned chain upgrades
+  google.protobuf.Any upgraded_client_state = 4 [(gogoproto.moretags) = "yaml:\"upgraded_client_state\""];
+}
+
+// Height is a monotonically increasing data type
+// that can be compared against another Height for the purposes of updating and
+// freezing clients
+//
+// Normally the RevisionHeight is incremented at each height while keeping
+// RevisionNumber the same. However some consensus algorithms may choose to
+// reset the height in certain conditions e.g. hard forks, state-machine
+// breaking changes In these cases, the RevisionNumber is incremented so that
+// height continues to be monitonically increasing even as the RevisionHeight
+// gets reset
+message Height {
+  option (gogoproto.goproto_getters)  = false;
+  option (gogoproto.goproto_stringer) = false;
+
+  // the revision that the client is currently on
+  uint64 revision_number = 1 [(gogoproto.moretags) = "yaml:\"revision_number\""];
+  // the height within the given revision
+  uint64 revision_height = 2 [(gogoproto.moretags) = "yaml:\"revision_height\""];
+}
+
+// Params defines the set of IBC light client parameters.
+message Params {
+  // allowed_clients defines the list of allowed client state types which can be created
+  // and interacted with. If a client type is removed from the allowed clients list, usage
+  // of this client will be disabled until it is added again to the list.
+  repeated string allowed_clients = 1 [(gogoproto.moretags) = "yaml:\"allowed_clients\""];
+}
diff --git a/third_party/proto/ibc/core/client/v1/genesis.proto b/third_party/proto/ibc/core/client/v1/genesis.proto
new file mode 100644
index 000000000..788212441
--- /dev/null
+++ b/third_party/proto/ibc/core/client/v1/genesis.proto
@@ -0,0 +1,48 @@
+syntax = "proto3";
+
+package ibc.core.client.v1;
+
+option go_package = "github.com/cosmos/ibc-go/v7/modules/core/02-client/types";
+
+import "ibc/core/client/v1/client.proto";
+import "gogoproto/gogo.proto";
+
+// GenesisState defines the ibc client submodule's genesis state.
+message GenesisState {
+  // client states with their corresponding identifiers
+  repeated IdentifiedClientState clients = 1
+      [(gogoproto.nullable) = false, (gogoproto.castrepeated) = "IdentifiedClientStates"];
+  // consensus states from each client
+  repeated ClientConsensusStates clients_consensus = 2 [
+    (gogoproto.nullable)     = false,
+    (gogoproto.castrepeated) = "ClientsConsensusStates",
+    (gogoproto.moretags)     = "yaml:\"clients_consensus\""
+  ];
+  // metadata from each client
+  repeated IdentifiedGenesisMetadata clients_metadata = 3
+      [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"clients_metadata\""];
+  Params params = 4 [(gogoproto.nullable) = false];
+  // create localhost on initialization
+  bool create_localhost = 5 [(gogoproto.moretags) = "yaml:\"create_localhost\""];
+  // the sequence for the next generated client identifier
+  uint64 next_client_sequence = 6 [(gogoproto.moretags) = "yaml:\"next_client_sequence\""];
+}
+
+// GenesisMetadata defines the genesis type for metadata that clients may return
+// with ExportMetadata
+message GenesisMetadata {
+  option (gogoproto.goproto_getters) = false;
+
+  // store key of metadata without clientID-prefix
+  bytes key = 1;
+  // metadata value
+  bytes value = 2;
+}
+
+// IdentifiedGenesisMetadata has the client metadata with the corresponding
+// client id.
+message IdentifiedGenesisMetadata {
+  string                   client_id       = 1 [(gogoproto.moretags) = "yaml:\"client_id\""];
+  repeated GenesisMetadata client_metadata = 2
+      [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"client_metadata\""];
+}
diff --git a/third_party/proto/ibc/core/client/v1/query.proto b/third_party/proto/ibc/core/client/v1/query.proto
new file mode 100644
index 000000000..0d26cf62e
--- /dev/null
+++ b/third_party/proto/ibc/core/client/v1/query.proto
@@ -0,0 +1,207 @@
+syntax = "proto3";
+
+package ibc.core.client.v1;
+
+option go_package = "github.com/cosmos/ibc-go/v7/modules/core/02-client/types";
+
+import "cosmos/base/query/v1beta1/pagination.proto";
+import "ibc/core/client/v1/client.proto";
+import "google/protobuf/any.proto";
+import "google/api/annotations.proto";
+import "gogoproto/gogo.proto";
+
+// Query provides defines the gRPC querier service
+service Query {
+  // ClientState queries an IBC light client.
+  rpc ClientState(QueryClientStateRequest) returns (QueryClientStateResponse) {
+    option (google.api.http).get = "/ibc/core/client/v1/client_states/{client_id}";
+  }
+
+  // ClientStates queries all the IBC light clients of a chain.
+  rpc ClientStates(QueryClientStatesRequest) returns (QueryClientStatesResponse) {
+    option (google.api.http).get = "/ibc/core/client/v1/client_states";
+  }
+
+  // ConsensusState queries a consensus state associated with a client state at
+  // a given height.
+  rpc ConsensusState(QueryConsensusStateRequest) returns (QueryConsensusStateResponse) {
+    option (google.api.http).get = "/ibc/core/client/v1/consensus_states/"
+                                   "{client_id}/revision/{revision_number}/"
+                                   "height/{revision_height}";
+  }
+
+  // ConsensusStates queries all the consensus state associated with a given
+  // client.
+  rpc ConsensusStates(QueryConsensusStatesRequest) returns (QueryConsensusStatesResponse) {
+    option (google.api.http).get = "/ibc/core/client/v1/consensus_states/{client_id}";
+  }
+
+  // ConsensusStateHeights queries the height of every consensus states associated with a given client.
+  rpc ConsensusStateHeights(QueryConsensusStateHeightsRequest) returns (QueryConsensusStateHeightsResponse) {
+    option (google.api.http).get = "/ibc/core/client/v1/consensus_states/{client_id}/heights";
+  }
+
+  // Status queries the status of an IBC client.
+  rpc ClientStatus(QueryClientStatusRequest) returns (QueryClientStatusResponse) {
+    option (google.api.http).get = "/ibc/core/client/v1/client_status/{client_id}";
+  }
+
+  // ClientParams queries all parameters of the ibc client submodule.
+  rpc ClientParams(QueryClientParamsRequest) returns (QueryClientParamsResponse) {
+    option (google.api.http).get = "/ibc/core/client/v1/params";
+  }
+
+  // UpgradedClientState queries an Upgraded IBC light client.
+  rpc UpgradedClientState(QueryUpgradedClientStateRequest) returns (QueryUpgradedClientStateResponse) {
+    option (google.api.http).get = "/ibc/core/client/v1/upgraded_client_states";
+  }
+
+  // UpgradedConsensusState queries an Upgraded IBC consensus state.
+  rpc UpgradedConsensusState(QueryUpgradedConsensusStateRequest) returns (QueryUpgradedConsensusStateResponse) {
+    option (google.api.http).get = "/ibc/core/client/v1/upgraded_consensus_states";
+  }
+}
+
+// QueryClientStateRequest is the request type for the Query/ClientState RPC
+// method
+message QueryClientStateRequest {
+  // client state unique identifier
+  string client_id = 1;
+}
+
+// QueryClientStateResponse is the response type for the Query/ClientState RPC
+// method. Besides the client state, it includes a proof and the height from
+// which the proof was retrieved.
+message QueryClientStateResponse {
+  // client state associated with the request identifier
+  google.protobuf.Any client_state = 1;
+  // merkle proof of existence
+  bytes proof = 2;
+  // height at which the proof was retrieved
+  ibc.core.client.v1.Height proof_height = 3 [(gogoproto.nullable) = false];
+}
+
+// QueryClientStatesRequest is the request type for the Query/ClientStates RPC
+// method
+message QueryClientStatesRequest {
+  // pagination request
+  cosmos.base.query.v1beta1.PageRequest pagination = 1;
+}
+
+// QueryClientStatesResponse is the response type for the Query/ClientStates RPC
+// method.
+message QueryClientStatesResponse {
+  // list of stored ClientStates of the chain.
+  repeated IdentifiedClientState client_states = 1
+      [(gogoproto.nullable) = false, (gogoproto.castrepeated) = "IdentifiedClientStates"];
+  // pagination response
+  cosmos.base.query.v1beta1.PageResponse pagination = 2;
+}
+
+// QueryConsensusStateRequest is the request type for the Query/ConsensusState
+// RPC method. Besides the consensus state, it includes a proof and the height
+// from which the proof was retrieved.
+message QueryConsensusStateRequest {
+  // client identifier
+  string client_id = 1;
+  // consensus state revision number
+  uint64 revision_number = 2;
+  // consensus state revision height
+  uint64 revision_height = 3;
+  // latest_height overrrides the height field and queries the latest stored
+  // ConsensusState
+  bool latest_height = 4;
+}
+
+// QueryConsensusStateResponse is the response type for the Query/ConsensusState
+// RPC method
+message QueryConsensusStateResponse {
+  // consensus state associated with the client identifier at the given height
+  google.protobuf.Any consensus_state = 1;
+  // merkle proof of existence
+  bytes proof = 2;
+  // height at which the proof was retrieved
+  ibc.core.client.v1.Height proof_height = 3 [(gogoproto.nullable) = false];
+}
+
+// QueryConsensusStatesRequest is the request type for the Query/ConsensusStates
+// RPC method.
+message QueryConsensusStatesRequest {
+  // client identifier
+  string client_id = 1;
+  // pagination request
+  cosmos.base.query.v1beta1.PageRequest pagination = 2;
+}
+
+// QueryConsensusStatesResponse is the response type for the
+// Query/ConsensusStates RPC method
+message QueryConsensusStatesResponse {
+  // consensus states associated with the identifier
+  repeated ConsensusStateWithHeight consensus_states = 1 [(gogoproto.nullable) = false];
+  // pagination response
+  cosmos.base.query.v1beta1.PageResponse pagination = 2;
+}
+
+// QueryConsensusStateHeightsRequest is the request type for Query/ConsensusStateHeights
+// RPC method.
+message QueryConsensusStateHeightsRequest {
+  // client identifier
+  string client_id = 1;
+  // pagination request
+  cosmos.base.query.v1beta1.PageRequest pagination = 2;
+}
+
+// QueryConsensusStateHeightsResponse is the response type for the
+// Query/ConsensusStateHeights RPC method
+message QueryConsensusStateHeightsResponse {
+  // consensus state heights
+  repeated Height consensus_state_heights = 1 [(gogoproto.nullable) = false];
+  // pagination response
+  cosmos.base.query.v1beta1.PageResponse pagination = 2;
+}
+
+// QueryClientStatusRequest is the request type for the Query/ClientStatus RPC
+// method
+message QueryClientStatusRequest {
+  // client unique identifier
+  string client_id = 1;
+}
+
+// QueryClientStatusResponse is the response type for the Query/ClientStatus RPC
+// method. It returns the current status of the IBC client.
+message QueryClientStatusResponse {
+  string status = 1;
+}
+
+// QueryClientParamsRequest is the request type for the Query/ClientParams RPC
+// method.
+message QueryClientParamsRequest {}
+
+// QueryClientParamsResponse is the response type for the Query/ClientParams RPC
+// method.
+message QueryClientParamsResponse {
+  // params defines the parameters of the module.
+  Params params = 1;
+}
+
+// QueryUpgradedClientStateRequest is the request type for the
+// Query/UpgradedClientState RPC method
+message QueryUpgradedClientStateRequest {}
+
+// QueryUpgradedClientStateResponse is the response type for the
+// Query/UpgradedClientState RPC method.
+message QueryUpgradedClientStateResponse {
+  // client state associated with the request identifier
+  google.protobuf.Any upgraded_client_state = 1;
+}
+
+// QueryUpgradedConsensusStateRequest is the request type for the
+// Query/UpgradedConsensusState RPC method
+message QueryUpgradedConsensusStateRequest {}
+
+// QueryUpgradedConsensusStateResponse is the response type for the
+// Query/UpgradedConsensusState RPC method.
+message QueryUpgradedConsensusStateResponse {
+  // Consensus state associated with the request identifier
+  google.protobuf.Any upgraded_consensus_state = 1;
+}
diff --git a/third_party/proto/ibc/core/client/v1/tx.proto b/third_party/proto/ibc/core/client/v1/tx.proto
new file mode 100644
index 000000000..23302d5e3
--- /dev/null
+++ b/third_party/proto/ibc/core/client/v1/tx.proto
@@ -0,0 +1,100 @@
+syntax = "proto3";
+
+package ibc.core.client.v1;
+
+option go_package = "github.com/cosmos/ibc-go/v7/modules/core/02-client/types";
+
+import "gogoproto/gogo.proto";
+import "google/protobuf/any.proto";
+
+// Msg defines the ibc/client Msg service.
+service Msg {
+  // CreateClient defines a rpc handler method for MsgCreateClient.
+  rpc CreateClient(MsgCreateClient) returns (MsgCreateClientResponse);
+
+  // UpdateClient defines a rpc handler method for MsgUpdateClient.
+  rpc UpdateClient(MsgUpdateClient) returns (MsgUpdateClientResponse);
+
+  // UpgradeClient defines a rpc handler method for MsgUpgradeClient.
+  rpc UpgradeClient(MsgUpgradeClient) returns (MsgUpgradeClientResponse);
+
+  // SubmitMisbehaviour defines a rpc handler method for MsgSubmitMisbehaviour.
+  rpc SubmitMisbehaviour(MsgSubmitMisbehaviour) returns (MsgSubmitMisbehaviourResponse);
+}
+
+// MsgCreateClient defines a message to create an IBC client
+message MsgCreateClient {
+  option (gogoproto.equal)           = false;
+  option (gogoproto.goproto_getters) = false;
+
+  // light client state
+  google.protobuf.Any client_state = 1 [(gogoproto.moretags) = "yaml:\"client_state\""];
+  // consensus state associated with the client that corresponds to a given
+  // height.
+  google.protobuf.Any consensus_state = 2 [(gogoproto.moretags) = "yaml:\"consensus_state\""];
+  // signer address
+  string signer = 3;
+}
+
+// MsgCreateClientResponse defines the Msg/CreateClient response type.
+message MsgCreateClientResponse {}
+
+// MsgUpdateClient defines an sdk.Msg to update a IBC client state using
+// the given client message.
+message MsgUpdateClient {
+  option (gogoproto.equal)           = false;
+  option (gogoproto.goproto_getters) = false;
+
+  // client unique identifier
+  string client_id = 1 [(gogoproto.moretags) = "yaml:\"client_id\""];
+  // client message to update the light client
+  google.protobuf.Any client_message = 2;
+  // signer address
+  string signer = 3;
+}
+
+// MsgUpdateClientResponse defines the Msg/UpdateClient response type.
+message MsgUpdateClientResponse {}
+
+// MsgUpgradeClient defines an sdk.Msg to upgrade an IBC client to a new client
+// state
+message MsgUpgradeClient {
+  option (gogoproto.equal)           = false;
+  option (gogoproto.goproto_getters) = false;
+
+  // client unique identifier
+  string client_id = 1 [(gogoproto.moretags) = "yaml:\"client_id\""];
+  // upgraded client state
+  google.protobuf.Any client_state = 2 [(gogoproto.moretags) = "yaml:\"client_state\""];
+  // upgraded consensus state, only contains enough information to serve as a
+  // basis of trust in update logic
+  google.protobuf.Any consensus_state = 3 [(gogoproto.moretags) = "yaml:\"consensus_state\""];
+  // proof that old chain committed to new client
+  bytes proof_upgrade_client = 4 [(gogoproto.moretags) = "yaml:\"proof_upgrade_client\""];
+  // proof that old chain committed to new consensus state
+  bytes proof_upgrade_consensus_state = 5 [(gogoproto.moretags) = "yaml:\"proof_upgrade_consensus_state\""];
+  // signer address
+  string signer = 6;
+}
+
+// MsgUpgradeClientResponse defines the Msg/UpgradeClient response type.
+message MsgUpgradeClientResponse {}
+
+// MsgSubmitMisbehaviour defines an sdk.Msg type that submits Evidence for
+// light client misbehaviour.
+// Warning: DEPRECATED
+message MsgSubmitMisbehaviour {
+  option (gogoproto.equal)           = false;
+  option (gogoproto.goproto_getters) = false;
+
+  // client unique identifier
+  string client_id = 1 [(gogoproto.moretags) = "yaml:\"client_id\"", deprecated = true];
+  // misbehaviour used for freezing the light client
+  google.protobuf.Any misbehaviour = 2 [deprecated = true];
+  // signer address
+  string signer = 3 [deprecated = true];
+}
+
+// MsgSubmitMisbehaviourResponse defines the Msg/SubmitMisbehaviour response
+// type.
+message MsgSubmitMisbehaviourResponse {}
diff --git a/third_party/proto/ibc/core/commitment/v1/commitment.proto b/third_party/proto/ibc/core/commitment/v1/commitment.proto
new file mode 100644
index 000000000..4840ff3e0
--- /dev/null
+++ b/third_party/proto/ibc/core/commitment/v1/commitment.proto
@@ -0,0 +1,41 @@
+syntax = "proto3";
+
+package ibc.core.commitment.v1;
+
+option go_package = "github.com/cosmos/ibc-go/v7/modules/core/23-commitment/types";
+
+import "gogoproto/gogo.proto";
+import "cosmos/ics23/v1/proofs.proto";
+
+// MerkleRoot defines a merkle root hash.
+// In the Cosmos SDK, the AppHash of a block header becomes the root.
+message MerkleRoot {
+  option (gogoproto.goproto_getters) = false;
+
+  bytes hash = 1;
+}
+
+// MerklePrefix is merkle path prefixed to the key.
+// The constructed key from the Path and the key will be append(Path.KeyPath,
+// append(Path.KeyPrefix, key...))
+message MerklePrefix {
+  bytes key_prefix = 1 [(gogoproto.moretags) = "yaml:\"key_prefix\""];
+}
+
+// MerklePath is the path used to verify commitment proofs, which can be an
+// arbitrary structured object (defined by a commitment type).
+// MerklePath is represented from root-to-leaf
+message MerklePath {
+  option (gogoproto.goproto_stringer) = false;
+
+  repeated string key_path = 1 [(gogoproto.moretags) = "yaml:\"key_path\""];
+}
+
+// MerkleProof is a wrapper type over a chain of CommitmentProofs.
+// It demonstrates membership or non-membership for an element or set of
+// elements, verifiable in conjunction with a known commitment root. Proofs
+// should be succinct.
+// MerkleProofs are ordered from leaf-to-root
+message MerkleProof {
+  repeated cosmos.ics23.v1.CommitmentProof proofs = 1;
+}
diff --git a/third_party/proto/ibc/core/connection/v1/connection.proto b/third_party/proto/ibc/core/connection/v1/connection.proto
new file mode 100644
index 000000000..ba367c14d
--- /dev/null
+++ b/third_party/proto/ibc/core/connection/v1/connection.proto
@@ -0,0 +1,114 @@
+syntax = "proto3";
+
+package ibc.core.connection.v1;
+
+option go_package = "github.com/cosmos/ibc-go/v7/modules/core/03-connection/types";
+
+import "gogoproto/gogo.proto";
+import "ibc/core/commitment/v1/commitment.proto";
+
+// ICS03 - Connection Data Structures as defined in
+// https://github.com/cosmos/ibc/blob/master/spec/core/ics-003-connection-semantics#data-structures
+
+// ConnectionEnd defines a stateful object on a chain connected to another
+// separate one.
+// NOTE: there must only be 2 defined ConnectionEnds to establish
+// a connection between two chains.
+message ConnectionEnd {
+  option (gogoproto.goproto_getters) = false;
+  // client associated with this connection.
+  string client_id = 1 [(gogoproto.moretags) = "yaml:\"client_id\""];
+  // IBC version which can be utilised to determine encodings or protocols for
+  // channels or packets utilising this connection.
+  repeated Version versions = 2;
+  // current state of the connection end.
+  State state = 3;
+  // counterparty chain associated with this connection.
+  Counterparty counterparty = 4 [(gogoproto.nullable) = false];
+  // delay period that must pass before a consensus state can be used for
+  // packet-verification NOTE: delay period logic is only implemented by some
+  // clients.
+  uint64 delay_period = 5 [(gogoproto.moretags) = "yaml:\"delay_period\""];
+}
+
+// IdentifiedConnection defines a connection with additional connection
+// identifier field.
+message IdentifiedConnection {
+  option (gogoproto.goproto_getters) = false;
+  // connection identifier.
+  string id = 1 [(gogoproto.moretags) = "yaml:\"id\""];
+  // client associated with this connection.
+  string client_id = 2 [(gogoproto.moretags) = "yaml:\"client_id\""];
+  // IBC version which can be utilised to determine encodings or protocols for
+  // channels or packets utilising this connection
+  repeated Version versions = 3;
+  // current state of the connection end.
+  State state = 4;
+  // counterparty chain associated with this connection.
+  Counterparty counterparty = 5 [(gogoproto.nullable) = false];
+  // delay period associated with this connection.
+  uint64 delay_period = 6 [(gogoproto.moretags) = "yaml:\"delay_period\""];
+}
+
+// State defines if a connection is in one of the following states:
+// INIT, TRYOPEN, OPEN or UNINITIALIZED.
+enum State {
+  option (gogoproto.goproto_enum_prefix) = false;
+
+  // Default State
+  STATE_UNINITIALIZED_UNSPECIFIED = 0 [(gogoproto.enumvalue_customname) = "UNINITIALIZED"];
+  // A connection end has just started the opening handshake.
+  STATE_INIT = 1 [(gogoproto.enumvalue_customname) = "INIT"];
+  // A connection end has acknowledged the handshake step on the counterparty
+  // chain.
+  STATE_TRYOPEN = 2 [(gogoproto.enumvalue_customname) = "TRYOPEN"];
+  // A connection end has completed the handshake.
+  STATE_OPEN = 3 [(gogoproto.enumvalue_customname) = "OPEN"];
+}
+
+// Counterparty defines the counterparty chain associated with a connection end.
+message Counterparty {
+  option (gogoproto.goproto_getters) = false;
+
+  // identifies the client on the counterparty chain associated with a given
+  // connection.
+  string client_id = 1 [(gogoproto.moretags) = "yaml:\"client_id\""];
+  // identifies the connection end on the counterparty chain associated with a
+  // given connection.
+  string connection_id = 2 [(gogoproto.moretags) = "yaml:\"connection_id\""];
+  // commitment merkle prefix of the counterparty chain.
+  ibc.core.commitment.v1.MerklePrefix prefix = 3 [(gogoproto.nullable) = false];
+}
+
+// ClientPaths define all the connection paths for a client state.
+message ClientPaths {
+  // list of connection paths
+  repeated string paths = 1;
+}
+
+// ConnectionPaths define all the connection paths for a given client state.
+message ConnectionPaths {
+  // client state unique identifier
+  string client_id = 1 [(gogoproto.moretags) = "yaml:\"client_id\""];
+  // list of connection paths
+  repeated string paths = 2;
+}
+
+// Version defines the versioning scheme used to negotiate the IBC verison in
+// the connection handshake.
+message Version {
+  option (gogoproto.goproto_getters) = false;
+
+  // unique version identifier
+  string identifier = 1;
+  // list of features compatible with the specified identifier
+  repeated string features = 2;
+}
+
+// Params defines the set of Connection parameters.
+message Params {
+  // maximum expected time per block (in nanoseconds), used to enforce block delay. This parameter should reflect the
+  // largest amount of time that the chain might reasonably take to produce the next block under normal operating
+  // conditions. A safe choice is 3-5x the expected time per block.
+  uint64 max_expected_time_per_block = 1 [(gogoproto.moretags) = "yaml:\"max_expected_time_per_block\""];
+}
diff --git a/third_party/proto/ibc/core/connection/v1/genesis.proto b/third_party/proto/ibc/core/connection/v1/genesis.proto
new file mode 100644
index 000000000..122c5a465
--- /dev/null
+++ b/third_party/proto/ibc/core/connection/v1/genesis.proto
@@ -0,0 +1,18 @@
+syntax = "proto3";
+
+package ibc.core.connection.v1;
+
+option go_package = "github.com/cosmos/ibc-go/v7/modules/core/03-connection/types";
+
+import "gogoproto/gogo.proto";
+import "ibc/core/connection/v1/connection.proto";
+
+// GenesisState defines the ibc connection submodule's genesis state.
+message GenesisState {
+  repeated IdentifiedConnection connections             = 1 [(gogoproto.nullable) = false];
+  repeated ConnectionPaths      client_connection_paths = 2
+      [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"client_connection_paths\""];
+  // the sequence for the next generated connection identifier
+  uint64 next_connection_sequence = 3 [(gogoproto.moretags) = "yaml:\"next_connection_sequence\""];
+  Params params                   = 4 [(gogoproto.nullable) = false];
+}
diff --git a/third_party/proto/ibc/core/connection/v1/query.proto b/third_party/proto/ibc/core/connection/v1/query.proto
new file mode 100644
index 000000000..3c76b2389
--- /dev/null
+++ b/third_party/proto/ibc/core/connection/v1/query.proto
@@ -0,0 +1,152 @@
+syntax = "proto3";
+
+package ibc.core.connection.v1;
+
+option go_package = "github.com/cosmos/ibc-go/v7/modules/core/03-connection/types";
+
+import "gogoproto/gogo.proto";
+import "cosmos/base/query/v1beta1/pagination.proto";
+import "ibc/core/client/v1/client.proto";
+import "ibc/core/connection/v1/connection.proto";
+import "google/api/annotations.proto";
+import "google/protobuf/any.proto";
+
+// Query provides defines the gRPC querier service
+service Query {
+  // Connection queries an IBC connection end.
+  rpc Connection(QueryConnectionRequest) returns (QueryConnectionResponse) {
+    option (google.api.http).get = "/ibc/core/connection/v1/connections/{connection_id}";
+  }
+
+  // Connections queries all the IBC connections of a chain.
+  rpc Connections(QueryConnectionsRequest) returns (QueryConnectionsResponse) {
+    option (google.api.http).get = "/ibc/core/connection/v1/connections";
+  }
+
+  // ClientConnections queries the connection paths associated with a client
+  // state.
+  rpc ClientConnections(QueryClientConnectionsRequest) returns (QueryClientConnectionsResponse) {
+    option (google.api.http).get = "/ibc/core/connection/v1/client_connections/{client_id}";
+  }
+
+  // ConnectionClientState queries the client state associated with the
+  // connection.
+  rpc ConnectionClientState(QueryConnectionClientStateRequest) returns (QueryConnectionClientStateResponse) {
+    option (google.api.http).get = "/ibc/core/connection/v1/connections/{connection_id}/client_state";
+  }
+
+  // ConnectionConsensusState queries the consensus state associated with the
+  // connection.
+  rpc ConnectionConsensusState(QueryConnectionConsensusStateRequest) returns (QueryConnectionConsensusStateResponse) {
+    option (google.api.http).get = "/ibc/core/connection/v1/connections/{connection_id}/consensus_state/"
+                                   "revision/{revision_number}/height/{revision_height}";
+  }
+
+  // ConnectionParams queries all parameters of the ibc connection submodule.
+  rpc ConnectionParams(QueryConnectionParamsRequest) returns (QueryConnectionParamsResponse) {
+    option (google.api.http).get = "/ibc/core/connection/v1/params";
+  }
+}
+
+// QueryConnectionRequest is the request type for the Query/Connection RPC
+// method
+message QueryConnectionRequest {
+  // connection unique identifier
+  string connection_id = 1;
+}
+
+// QueryConnectionResponse is the response type for the Query/Connection RPC
+// method. Besides the connection end, it includes a proof and the height from
+// which the proof was retrieved.
+message QueryConnectionResponse {
+  // connection associated with the request identifier
+  ibc.core.connection.v1.ConnectionEnd connection = 1;
+  // merkle proof of existence
+  bytes proof = 2;
+  // height at which the proof was retrieved
+  ibc.core.client.v1.Height proof_height = 3 [(gogoproto.nullable) = false];
+}
+
+// QueryConnectionsRequest is the request type for the Query/Connections RPC
+// method
+message QueryConnectionsRequest {
+  cosmos.base.query.v1beta1.PageRequest pagination = 1;
+}
+
+// QueryConnectionsResponse is the response type for the Query/Connections RPC
+// method.
+message QueryConnectionsResponse {
+  // list of stored connections of the chain.
+  repeated ibc.core.connection.v1.IdentifiedConnection connections = 1;
+  // pagination response
+  cosmos.base.query.v1beta1.PageResponse pagination = 2;
+  // query block height
+  ibc.core.client.v1.Height height = 3 [(gogoproto.nullable) = false];
+}
+
+// QueryClientConnectionsRequest is the request type for the
+// Query/ClientConnections RPC method
+message QueryClientConnectionsRequest {
+  // client identifier associated with a connection
+  string client_id = 1;
+}
+
+// QueryClientConnectionsResponse is the response type for the
+// Query/ClientConnections RPC method
+message QueryClientConnectionsResponse {
+  // slice of all the connection paths associated with a client.
+  repeated string connection_paths = 1;
+  // merkle proof of existence
+  bytes proof = 2;
+  // height at which the proof was generated
+  ibc.core.client.v1.Height proof_height = 3 [(gogoproto.nullable) = false];
+}
+
+// QueryConnectionClientStateRequest is the request type for the
+// Query/ConnectionClientState RPC method
+message QueryConnectionClientStateRequest {
+  // connection identifier
+  string connection_id = 1 [(gogoproto.moretags) = "yaml:\"connection_id\""];
+}
+
+// QueryConnectionClientStateResponse is the response type for the
+// Query/ConnectionClientState RPC method
+message QueryConnectionClientStateResponse {
+  // client state associated with the channel
+  ibc.core.client.v1.IdentifiedClientState identified_client_state = 1;
+  // merkle proof of existence
+  bytes proof = 2;
+  // height at which the proof was retrieved
+  ibc.core.client.v1.Height proof_height = 3 [(gogoproto.nullable) = false];
+}
+
+// QueryConnectionConsensusStateRequest is the request type for the
+// Query/ConnectionConsensusState RPC method
+message QueryConnectionConsensusStateRequest {
+  // connection identifier
+  string connection_id   = 1 [(gogoproto.moretags) = "yaml:\"connection_id\""];
+  uint64 revision_number = 2;
+  uint64 revision_height = 3;
+}
+
+// QueryConnectionConsensusStateResponse is the response type for the
+// Query/ConnectionConsensusState RPC method
+message QueryConnectionConsensusStateResponse {
+  // consensus state associated with the channel
+  google.protobuf.Any consensus_state = 1;
+  // client ID associated with the consensus state
+  string client_id = 2;
+  // merkle proof of existence
+  bytes proof = 3;
+  // height at which the proof was retrieved
+  ibc.core.client.v1.Height proof_height = 4 [(gogoproto.nullable) = false];
+}
+
+// QueryConnectionParamsRequest is the request type for the Query/ConnectionParams RPC method.
+message QueryConnectionParamsRequest {}
+
+// QueryConnectionParamsResponse is the response type for the Query/ConnectionParams RPC method.
+message QueryConnectionParamsResponse {
+  // params defines the parameters of the module.
+  Params params = 1;
+}
\ No newline at end of file
diff --git a/third_party/proto/ibc/core/connection/v1/tx.proto b/third_party/proto/ibc/core/connection/v1/tx.proto
new file mode 100644
index 000000000..af8f505c4
--- /dev/null
+++ b/third_party/proto/ibc/core/connection/v1/tx.proto
@@ -0,0 +1,122 @@
+syntax = "proto3";
+
+package ibc.core.connection.v1;
+
+option go_package = "github.com/cosmos/ibc-go/v7/modules/core/03-connection/types";
+
+import "gogoproto/gogo.proto";
+import "google/protobuf/any.proto";
+import "ibc/core/client/v1/client.proto";
+import "ibc/core/connection/v1/connection.proto";
+
+// Msg defines the ibc/connection Msg service.
+service Msg {
+  // ConnectionOpenInit defines a rpc handler method for MsgConnectionOpenInit.
+  rpc ConnectionOpenInit(MsgConnectionOpenInit) returns (MsgConnectionOpenInitResponse);
+
+  // ConnectionOpenTry defines a rpc handler method for MsgConnectionOpenTry.
+  rpc ConnectionOpenTry(MsgConnectionOpenTry) returns (MsgConnectionOpenTryResponse);
+
+  // ConnectionOpenAck defines a rpc handler method for MsgConnectionOpenAck.
+  rpc ConnectionOpenAck(MsgConnectionOpenAck) returns (MsgConnectionOpenAckResponse);
+
+  // ConnectionOpenConfirm defines a rpc handler method for
+  // MsgConnectionOpenConfirm.
+  rpc ConnectionOpenConfirm(MsgConnectionOpenConfirm) returns (MsgConnectionOpenConfirmResponse);
+}
+
+// MsgConnectionOpenInit defines the msg sent by an account on Chain A to
+// initialize a connection with Chain B.
+message MsgConnectionOpenInit {
+  option (gogoproto.equal)           = false;
+  option (gogoproto.goproto_getters) = false;
+
+  string       client_id    = 1 [(gogoproto.moretags) = "yaml:\"client_id\""];
+  Counterparty counterparty = 2 [(gogoproto.nullable) = false];
+  Version      version      = 3;
+  uint64       delay_period = 4 [(gogoproto.moretags) = "yaml:\"delay_period\""];
+  string       signer       = 5;
+}
+
+// MsgConnectionOpenInitResponse defines the Msg/ConnectionOpenInit response
+// type.
+message MsgConnectionOpenInitResponse {}
+
+// MsgConnectionOpenTry defines a msg sent by a Relayer to try to open a
+// connection on Chain B.
+message MsgConnectionOpenTry {
+  option (gogoproto.equal)           = false;
+  option (gogoproto.goproto_getters) = false;
+
+  string client_id = 1 [(gogoproto.moretags) = "yaml:\"client_id\""];
+  // Deprecated: this field is unused. Crossing hellos are no longer supported in core IBC.
+  string previous_connection_id = 2 [deprecated = true, (gogoproto.moretags) = "yaml:\"previous_connection_id\""];
+  google.protobuf.Any       client_state          = 3 [(gogoproto.moretags) = "yaml:\"client_state\""];
+  Counterparty              counterparty          = 4 [(gogoproto.nullable) = false];
+  uint64                    delay_period          = 5 [(gogoproto.moretags) = "yaml:\"delay_period\""];
+  repeated Version          counterparty_versions = 6 [(gogoproto.moretags) = "yaml:\"counterparty_versions\""];
+  ibc.core.client.v1.Height proof_height          = 7
+      [(gogoproto.moretags) = "yaml:\"proof_height\"", (gogoproto.nullable) = false];
+  // proof of the initialization the connection on Chain A: `UNITIALIZED ->
+  // INIT`
+  bytes proof_init = 8 [(gogoproto.moretags) = "yaml:\"proof_init\""];
+  // proof of client state included in message
+  bytes proof_client = 9 [(gogoproto.moretags) = "yaml:\"proof_client\""];
+  // proof of client consensus state
+  bytes                     proof_consensus  = 10 [(gogoproto.moretags) = "yaml:\"proof_consensus\""];
+  ibc.core.client.v1.Height consensus_height = 11
+      [(gogoproto.moretags) = "yaml:\"consensus_height\"", (gogoproto.nullable) = false];
+  string signer = 12;
+  // optional proof data for host state machines that are unable to introspect their own consensus state
+  bytes host_consensus_state_proof = 13;
+}
+
+// MsgConnectionOpenTryResponse defines the Msg/ConnectionOpenTry response type.
+message MsgConnectionOpenTryResponse {}
+
+// MsgConnectionOpenAck defines a msg sent by a Relayer to Chain A to
+// acknowledge the change of connection state to TRYOPEN on Chain B.
+message MsgConnectionOpenAck {
+  option (gogoproto.equal)           = false;
+  option (gogoproto.goproto_getters) = false;
+
+  string              connection_id              = 1 [(gogoproto.moretags) = "yaml:\"connection_id\""];
+  string              counterparty_connection_id = 2 [(gogoproto.moretags) = "yaml:\"counterparty_connection_id\""];
+  Version             version                    = 3;
+  google.protobuf.Any client_state               = 4 [(gogoproto.moretags) = "yaml:\"client_state\""];
+  ibc.core.client.v1.Height proof_height         = 5
+      [(gogoproto.moretags) = "yaml:\"proof_height\"", (gogoproto.nullable) = false];
+  // proof of the initialization the connection on Chain B: `UNITIALIZED ->
+  // TRYOPEN`
+  bytes proof_try = 6 [(gogoproto.moretags) = "yaml:\"proof_try\""];
+  // proof of client state included in message
+  bytes proof_client = 7 [(gogoproto.moretags) = "yaml:\"proof_client\""];
+  // proof of client consensus state
+  bytes                     proof_consensus  = 8 [(gogoproto.moretags) = "yaml:\"proof_consensus\""];
+  ibc.core.client.v1.Height consensus_height = 9
+      [(gogoproto.moretags) = "yaml:\"consensus_height\"", (gogoproto.nullable) = false];
+  string signer = 10;
+  // optional proof data for host state machines that are unable to introspect their own consensus state
+  bytes host_consensus_state_proof = 11;
+}
+
+// MsgConnectionOpenAckResponse defines the Msg/ConnectionOpenAck response type.
+message MsgConnectionOpenAckResponse {}
+
+// MsgConnectionOpenConfirm defines a msg sent by a Relayer to Chain B to
+// acknowledge the change of connection state to OPEN on Chain A.
+message MsgConnectionOpenConfirm {
+  option (gogoproto.equal)           = false;
+  option (gogoproto.goproto_getters) = false;
+
+  string connection_id = 1 [(gogoproto.moretags) = "yaml:\"connection_id\""];
+  // proof for the change of the connection state on Chain A: `INIT -> OPEN`
+  bytes                     proof_ack    = 2 [(gogoproto.moretags) = "yaml:\"proof_ack\""];
+  ibc.core.client.v1.Height proof_height = 3
+      [(gogoproto.moretags) = "yaml:\"proof_height\"", (gogoproto.nullable) = false];
+  string signer = 4;
+}
+
+// MsgConnectionOpenConfirmResponse defines the Msg/ConnectionOpenConfirm
+// response type.
+message MsgConnectionOpenConfirmResponse {}
diff --git a/third_party/proto/ibc/core/types/v1/genesis.proto b/third_party/proto/ibc/core/types/v1/genesis.proto
new file mode 100644
index 000000000..4e07551f8
--- /dev/null
+++ b/third_party/proto/ibc/core/types/v1/genesis.proto
@@ -0,0 +1,23 @@
+syntax = "proto3";
+
+package ibc.core.types.v1;
+
+option go_package = "github.com/cosmos/ibc-go/v7/modules/core/types";
+
+import "gogoproto/gogo.proto";
+import "ibc/core/client/v1/genesis.proto";
+import "ibc/core/connection/v1/genesis.proto";
+import "ibc/core/channel/v1/genesis.proto";
+
+// GenesisState defines the ibc module's genesis state.
+message GenesisState {
+  // ICS002 - Clients genesis state
+  ibc.core.client.v1.GenesisState client_genesis = 1
+      [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"client_genesis\""];
+  // ICS003 - Connections genesis state
+  ibc.core.connection.v1.GenesisState connection_genesis = 2
+      [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"connection_genesis\""];
+  // ICS004 - Channel genesis state
+  ibc.core.channel.v1.GenesisState channel_genesis = 3
+      [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"channel_genesis\""];
+}
diff --git a/third_party/proto/ibc/lightclients/localhost/v2/localhost.proto b/third_party/proto/ibc/lightclients/localhost/v2/localhost.proto
new file mode 100644
index 000000000..ec970eb00
--- /dev/null
+++ b/third_party/proto/ibc/lightclients/localhost/v2/localhost.proto
@@ -0,0 +1,16 @@
+syntax = "proto3";
+
+package ibc.lightclients.localhost.v2;
+
+option go_package = "github.com/cosmos/ibc-go/v7/modules/light-clients/09-localhost;localhost";
+
+import "ibc/core/client/v1/client.proto";
+import "gogoproto/gogo.proto";
+
+// ClientState defines the 09-localhost client state
+message ClientState {
+  option (gogoproto.goproto_getters) = false;
+
+  // the latest block height
+  ibc.core.client.v1.Height latest_height = 1 [(gogoproto.nullable) = false];
+}
diff --git a/third_party/proto/ibc/lightclients/solomachine/v2/solomachine.proto b/third_party/proto/ibc/lightclients/solomachine/v2/solomachine.proto
new file mode 100644
index 000000000..250313319
--- /dev/null
+++ b/third_party/proto/ibc/lightclients/solomachine/v2/solomachine.proto
@@ -0,0 +1,189 @@
+syntax = "proto3";
+
+package ibc.lightclients.solomachine.v2;
+
+option go_package = "github.com/cosmos/ibc-go/v7/modules/core/02-client/migrations/v7";
+
+import "ibc/core/connection/v1/connection.proto";
+import "ibc/core/channel/v1/channel.proto";
+import "gogoproto/gogo.proto";
+import "google/protobuf/any.proto";
+
+// ClientState defines a solo machine client that tracks the current consensus
+// state and if the client is frozen.
+message ClientState {
+  option (gogoproto.goproto_getters) = false;
+  // latest sequence of the client state
+  uint64 sequence = 1;
+  // frozen sequence of the solo machine
+  bool           is_frozen       = 2 [(gogoproto.moretags) = "yaml:\"is_frozen\""];
+  ConsensusState consensus_state = 3 [(gogoproto.moretags) = "yaml:\"consensus_state\""];
+  // when set to true, will allow governance to update a solo machine client.
+  // The client will be unfrozen if it is frozen.
+  bool allow_update_after_proposal = 4 [(gogoproto.moretags) = "yaml:\"allow_update_after_proposal\""];
+}
+
+// ConsensusState defines a solo machine consensus state. The sequence of a
+// consensus state is contained in the "height" key used in storing the
+// consensus state.
+message ConsensusState {
+  option (gogoproto.goproto_getters) = false;
+  // public key of the solo machine
+  google.protobuf.Any public_key = 1 [(gogoproto.moretags) = "yaml:\"public_key\""];
+  // diversifier allows the same public key to be re-used across different solo
+  // machine clients (potentially on different chains) without being considered
+  // misbehaviour.
+  string diversifier = 2;
+  uint64 timestamp   = 3;
+}
+
+// Header defines a solo machine consensus header
+message Header {
+  option (gogoproto.goproto_getters) = false;
+  // sequence to update solo machine public key at
+  uint64              sequence        = 1;
+  uint64              timestamp       = 2;
+  bytes               signature       = 3;
+  google.protobuf.Any new_public_key  = 4 [(gogoproto.moretags) = "yaml:\"new_public_key\""];
+  string              new_diversifier = 5 [(gogoproto.moretags) = "yaml:\"new_diversifier\""];
+}
+
+// Misbehaviour defines misbehaviour for a solo machine which consists
+// of a sequence and two signatures over different messages at that sequence.
+message Misbehaviour {
+  option (gogoproto.goproto_getters) = false;
+  string           client_id         = 1 [(gogoproto.moretags) = "yaml:\"client_id\""];
+  uint64           sequence          = 2;
+  SignatureAndData signature_one     = 3 [(gogoproto.moretags) = "yaml:\"signature_one\""];
+  SignatureAndData signature_two     = 4 [(gogoproto.moretags) = "yaml:\"signature_two\""];
+}
+
+// SignatureAndData contains a signature and the data signed over to create that
+// signature.
+message SignatureAndData {
+  option (gogoproto.goproto_getters) = false;
+  bytes    signature                 = 1;
+  DataType data_type                 = 2 [(gogoproto.moretags) = "yaml:\"data_type\""];
+  bytes    data                      = 3;
+  uint64   timestamp                 = 4;
+}
+
+// TimestampedSignatureData contains the signature data and the timestamp of the
+// signature.
+message TimestampedSignatureData {
+  option (gogoproto.goproto_getters) = false;
+  bytes  signature_data              = 1 [(gogoproto.moretags) = "yaml:\"signature_data\""];
+  uint64 timestamp                   = 2;
+}
+
+// SignBytes defines the signed bytes used for signature verification.
+message SignBytes {
+  option (gogoproto.goproto_getters) = false;
+
+  uint64 sequence    = 1;
+  uint64 timestamp   = 2;
+  string diversifier = 3;
+  // type of the data used
+  DataType data_type = 4 [(gogoproto.moretags) = "yaml:\"data_type\""];
+  // marshaled data
+  bytes data = 5;
+}
+
+// DataType defines the type of solo machine proof being created. This is done
+// to preserve uniqueness of different data sign byte encodings.
+enum DataType {
+  option (gogoproto.goproto_enum_prefix) = false;
+
+  // Default State
+  DATA_TYPE_UNINITIALIZED_UNSPECIFIED = 0 [(gogoproto.enumvalue_customname) = "UNSPECIFIED"];
+  // Data type for client state verification
+  DATA_TYPE_CLIENT_STATE = 1 [(gogoproto.enumvalue_customname) = "CLIENT"];
+  // Data type for consensus state verification
+  DATA_TYPE_CONSENSUS_STATE = 2 [(gogoproto.enumvalue_customname) = "CONSENSUS"];
+  // Data type for connection state verification
+  DATA_TYPE_CONNECTION_STATE = 3 [(gogoproto.enumvalue_customname) = "CONNECTION"];
+  // Data type for channel state verification
+  DATA_TYPE_CHANNEL_STATE = 4 [(gogoproto.enumvalue_customname) = "CHANNEL"];
+  // Data type for packet commitment verification
+  DATA_TYPE_PACKET_COMMITMENT = 5 [(gogoproto.enumvalue_customname) = "PACKETCOMMITMENT"];
+  // Data type for packet acknowledgement verification
+  DATA_TYPE_PACKET_ACKNOWLEDGEMENT = 6 [(gogoproto.enumvalue_customname) = "PACKETACKNOWLEDGEMENT"];
+  // Data type for packet receipt absence verification
+  DATA_TYPE_PACKET_RECEIPT_ABSENCE = 7 [(gogoproto.enumvalue_customname) = "PACKETRECEIPTABSENCE"];
+  // Data type for next sequence recv verification
+  DATA_TYPE_NEXT_SEQUENCE_RECV = 8 [(gogoproto.enumvalue_customname) = "NEXTSEQUENCERECV"];
+  // Data type for header verification
+  DATA_TYPE_HEADER = 9 [(gogoproto.enumvalue_customname) = "HEADER"];
+}
+
+// HeaderData returns the SignBytes data for update verification.
+message HeaderData {
+  option (gogoproto.goproto_getters) = false;
+
+  // header public key
+  google.protobuf.Any new_pub_key = 1 [(gogoproto.moretags) = "yaml:\"new_pub_key\""];
+  // header diversifier
+  string new_diversifier = 2 [(gogoproto.moretags) = "yaml:\"new_diversifier\""];
+}
+
+// ClientStateData returns the SignBytes data for client state verification.
+message ClientStateData {
+  option (gogoproto.goproto_getters) = false;
+
+  bytes               path         = 1;
+  google.protobuf.Any client_state = 2 [(gogoproto.moretags) = "yaml:\"client_state\""];
+}
+
+// ConsensusStateData returns the SignBytes data for consensus state
+// verification.
+message ConsensusStateData {
+  option (gogoproto.goproto_getters) = false;
+
+  bytes               path            = 1;
+  google.protobuf.Any consensus_state = 2 [(gogoproto.moretags) = "yaml:\"consensus_state\""];
+}
+
+// ConnectionStateData returns the SignBytes data for connection state
+// verification.
+message ConnectionStateData {
+  option (gogoproto.goproto_getters) = false;
+
+  bytes                                path       = 1;
+  ibc.core.connection.v1.ConnectionEnd connection = 2;
+}
+
+// ChannelStateData returns the SignBytes data for channel state
+// verification.
+message ChannelStateData {
+  option (gogoproto.goproto_getters) = false;
+
+  bytes                       path    = 1;
+  ibc.core.channel.v1.Channel channel = 2;
+}
+
+// PacketCommitmentData returns the SignBytes data for packet commitment
+// verification.
+message PacketCommitmentData {
+  bytes path       = 1;
+  bytes commitment = 2;
+}
+
+// PacketAcknowledgementData returns the SignBytes data for acknowledgement
+// verification.
+message PacketAcknowledgementData {
+  bytes path            = 1;
+  bytes acknowledgement = 2;
+}
+
+// PacketReceiptAbsenceData returns the SignBytes data for
+// packet receipt absence verification.
+message PacketReceiptAbsenceData {
+  bytes path = 1;
+}
+
+// NextSequenceRecvData returns the SignBytes data for verification of the next
+// sequence to be received.
+message NextSequenceRecvData {
+  bytes  path          = 1;
+  uint64 next_seq_recv = 2 [(gogoproto.moretags) = "yaml:\"next_seq_recv\""];
+}
diff --git a/third_party/proto/ibc/lightclients/solomachine/v3/solomachine.proto b/third_party/proto/ibc/lightclients/solomachine/v3/solomachine.proto
new file mode 100644
index 000000000..40e76b722
--- /dev/null
+++ b/third_party/proto/ibc/lightclients/solomachine/v3/solomachine.proto
@@ -0,0 +1,99 @@
+syntax = "proto3";
+
+package ibc.lightclients.solomachine.v3;
+
+option go_package = "github.com/cosmos/ibc-go/v7/modules/light-clients/06-solomachine;solomachine";
+
+import "gogoproto/gogo.proto";
+import "google/protobuf/any.proto";
+
+// ClientState defines a solo machine client that tracks the current consensus
+// state and if the client is frozen.
+message ClientState {
+  option (gogoproto.goproto_getters) = false;
+  // latest sequence of the client state
+  uint64 sequence = 1;
+  // frozen sequence of the solo machine
+  bool           is_frozen       = 2 [(gogoproto.moretags) = "yaml:\"is_frozen\""];
+  ConsensusState consensus_state = 3 [(gogoproto.moretags) = "yaml:\"consensus_state\""];
+}
+
+// ConsensusState defines a solo machine consensus state. The sequence of a
+// consensus state is contained in the "height" key used in storing the
+// consensus state.
+message ConsensusState {
+  option (gogoproto.goproto_getters) = false;
+  // public key of the solo machine
+  google.protobuf.Any public_key = 1 [(gogoproto.moretags) = "yaml:\"public_key\""];
+  // diversifier allows the same public key to be re-used across different solo
+  // machine clients (potentially on different chains) without being considered
+  // misbehaviour.
+  string diversifier = 2;
+  uint64 timestamp   = 3;
+}
+
+// Header defines a solo machine consensus header
+message Header {
+  option (gogoproto.goproto_getters) = false;
+
+  uint64              timestamp       = 1;
+  bytes               signature       = 2;
+  google.protobuf.Any new_public_key  = 3 [(gogoproto.moretags) = "yaml:\"new_public_key\""];
+  string              new_diversifier = 4 [(gogoproto.moretags) = "yaml:\"new_diversifier\""];
+}
+
+// Misbehaviour defines misbehaviour for a solo machine which consists
+// of a sequence and two signatures over different messages at that sequence.
+message Misbehaviour {
+  option (gogoproto.goproto_getters) = false;
+
+  uint64           sequence      = 1;
+  SignatureAndData signature_one = 2 [(gogoproto.moretags) = "yaml:\"signature_one\""];
+  SignatureAndData signature_two = 3 [(gogoproto.moretags) = "yaml:\"signature_two\""];
+}
+
+// SignatureAndData contains a signature and the data signed over to create that
+// signature.
+message SignatureAndData {
+  option (gogoproto.goproto_getters) = false;
+
+  bytes  signature = 1;
+  bytes  path      = 2;
+  bytes  data      = 3;
+  uint64 timestamp = 4;
+}
+
+// TimestampedSignatureData contains the signature data and the timestamp of the
+// signature.
+message TimestampedSignatureData {
+  option (gogoproto.goproto_getters) = false;
+
+  bytes  signature_data = 1 [(gogoproto.moretags) = "yaml:\"signature_data\""];
+  uint64 timestamp      = 2;
+}
+
+// SignBytes defines the signed bytes used for signature verification.
+message SignBytes {
+  option (gogoproto.goproto_getters) = false;
+
+  // the sequence number
+  uint64 sequence = 1;
+  // the proof timestamp
+  uint64 timestamp = 2;
+  // the public key diversifier
+  string diversifier = 3;
+  // the standardised path bytes
+  bytes path = 4;
+  // the marshaled data bytes
+  bytes data = 5;
+}
+
+// HeaderData returns the SignBytes data for update verification.
+message HeaderData {
+  option (gogoproto.goproto_getters) = false;
+
+  // header public key
+  google.protobuf.Any new_pub_key = 1 [(gogoproto.moretags) = "yaml:\"new_pub_key\""];
+  // header diversifier
+  string new_diversifier = 2 [(gogoproto.moretags) = "yaml:\"new_diversifier\""];
+}
diff --git a/third_party/proto/ibc/lightclients/tendermint/v1/tendermint.proto b/third_party/proto/ibc/lightclients/tendermint/v1/tendermint.proto
new file mode 100644
index 000000000..83fa59c9f
--- /dev/null
+++ b/third_party/proto/ibc/lightclients/tendermint/v1/tendermint.proto
@@ -0,0 +1,115 @@
+syntax = "proto3";
+
+package ibc.lightclients.tendermint.v1;
+
+option go_package = "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint;tendermint";
+
+import "tendermint/types/validator.proto";
+import "tendermint/types/types.proto";
+import "cosmos/ics23/v1/proofs.proto";
+import "google/protobuf/duration.proto";
+import "google/protobuf/timestamp.proto";
+import "ibc/core/client/v1/client.proto";
+import "ibc/core/commitment/v1/commitment.proto";
+import "gogoproto/gogo.proto";
+
+// ClientState from Tendermint tracks the current validator set, latest height,
+// and a possible frozen height.
+message ClientState {
+  option (gogoproto.goproto_getters) = false;
+
+  string   chain_id    = 1;
+  Fraction trust_level = 2 [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"trust_level\""];
+  // duration of the period since the LastestTimestamp during which the
+  // submitted headers are valid for upgrade
+  google.protobuf.Duration trusting_period = 3
+      [(gogoproto.nullable) = false, (gogoproto.stdduration) = true, (gogoproto.moretags) = "yaml:\"trusting_period\""];
+  // duration of the staking unbonding period
+  google.protobuf.Duration unbonding_period = 4 [
+    (gogoproto.nullable)    = false,
+    (gogoproto.stdduration) = true,
+    (gogoproto.moretags)    = "yaml:\"unbonding_period\""
+  ];
+  // defines how much new (untrusted) header's Time can drift into the future.
+  google.protobuf.Duration max_clock_drift = 5
+      [(gogoproto.nullable) = false, (gogoproto.stdduration) = true, (gogoproto.moretags) = "yaml:\"max_clock_drift\""];
+  // Block height when the client was frozen due to a misbehaviour
+  ibc.core.client.v1.Height frozen_height = 6
+      [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"frozen_height\""];
+  // Latest height the client was updated to
+  ibc.core.client.v1.Height latest_height = 7
+      [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"latest_height\""];
+
+  // Proof specifications used in verifying counterparty state
+  repeated cosmos.ics23.v1.ProofSpec proof_specs = 8 [(gogoproto.moretags) = "yaml:\"proof_specs\""];
+
+  // Path at which next upgraded client will be committed.
+  // Each element corresponds to the key for a single CommitmentProof in the
+  // chained proof. NOTE: ClientState must stored under
+  // `{upgradePath}/{upgradeHeight}/clientState` ConsensusState must be stored
+  // under `{upgradepath}/{upgradeHeight}/consensusState` For SDK chains using
+  // the default upgrade module, upgrade_path should be []string{"upgrade",
+  // "upgradedIBCState"}`
+  repeated string upgrade_path = 9 [(gogoproto.moretags) = "yaml:\"upgrade_path\""];
+
+  // allow_update_after_expiry is deprecated
+  bool allow_update_after_expiry = 10 [deprecated = true, (gogoproto.moretags) = "yaml:\"allow_update_after_expiry\""];
+  // allow_update_after_misbehaviour is deprecated
+  bool allow_update_after_misbehaviour = 11
+      [deprecated = true, (gogoproto.moretags) = "yaml:\"allow_update_after_misbehaviour\""];
+}
+
+// ConsensusState defines the consensus state from Tendermint.
+message ConsensusState {
+  option (gogoproto.goproto_getters) = false;
+
+  // timestamp that corresponds to the block height in which the ConsensusState
+  // was stored.
+  google.protobuf.Timestamp timestamp = 1 [(gogoproto.nullable) = false, (gogoproto.stdtime) = true];
+  // commitment root (i.e app hash)
+  ibc.core.commitment.v1.MerkleRoot root                 = 2 [(gogoproto.nullable) = false];
+  bytes                             next_validators_hash = 3 [
+    (gogoproto.casttype) = "github.com/cometbft/cometbft/libs/bytes.HexBytes",
+    (gogoproto.moretags) = "yaml:\"next_validators_hash\""
+  ];
+}
+
+// Misbehaviour is a wrapper over two conflicting Headers
+// that implements Misbehaviour interface expected by ICS-02
+message Misbehaviour {
+  option (gogoproto.goproto_getters) = false;
+
+  // ClientID is deprecated
+  string client_id = 1 [deprecated = true, (gogoproto.moretags) = "yaml:\"client_id\""];
+  Header header_1  = 2 [(gogoproto.customname) = "Header1", (gogoproto.moretags) = "yaml:\"header_1\""];
+  Header header_2  = 3 [(gogoproto.customname) = "Header2", (gogoproto.moretags) = "yaml:\"header_2\""];
+}
+
+// Header defines the Tendermint client consensus Header.
+// It encapsulates all the information necessary to update from a trusted
+// Tendermint ConsensusState. The inclusion of TrustedHeight and
+// TrustedValidators allows this update to process correctly, so long as the
+// ConsensusState for the TrustedHeight exists, this removes race conditions
+// among relayers The SignedHeader and ValidatorSet are the new untrusted update
+// fields for the client. The TrustedHeight is the height of a stored
+// ConsensusState on the client that will be used to verify the new untrusted
+// header. The Trusted ConsensusState must be within the unbonding period of
+// current time in order to correctly verify, and the TrustedValidators must
+// hash to TrustedConsensusState.NextValidatorsHash since that is the last
+// trusted validator set at the TrustedHeight.
+message Header {
+  .tendermint.types.SignedHeader signed_header = 1
+      [(gogoproto.embed) = true, (gogoproto.moretags) = "yaml:\"signed_header\""];
+
+  .tendermint.types.ValidatorSet validator_set  = 2 [(gogoproto.moretags) = "yaml:\"validator_set\""];
+  ibc.core.client.v1.Height      trusted_height = 3
+      [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"trusted_height\""];
+  .tendermint.types.ValidatorSet trusted_validators = 4 [(gogoproto.moretags) = "yaml:\"trusted_validators\""];
+}
+
+// Fraction defines the protobuf message type for tmmath.Fraction that only
+// supports positive values.
+message Fraction {
+  uint64 numerator   = 1;
+  uint64 denominator = 2;
+}
diff --git a/x/contractmanager/genesis.go b/x/contractmanager/genesis.go
index 785cadda6..798fd7648 100644
--- a/x/contractmanager/genesis.go
+++ b/x/contractmanager/genesis.go
@@ -26,7 +26,6 @@ func ExportGenesis(ctx sdk.Context, k keeper.Keeper) *types.GenesisState {
 	genesis.Params = k.GetParams(ctx)
 
 	genesis.FailuresList = k.GetAllFailures(ctx)
-	// this line is used by starport scaffolding # genesis/module/export
 
 	return genesis
 }
diff --git a/x/contractmanager/genesis_test.go b/x/contractmanager/genesis_test.go
index e7633402a..c72623f9f 100644
--- a/x/contractmanager/genesis_test.go
+++ b/x/contractmanager/genesis_test.go
@@ -46,7 +46,6 @@ func TestGenesis(t *testing.T) {
 				SudoPayload: payload2,
 			},
 		},
-		// this line is used by starport scaffolding # genesis/test/state
 	}
 
 	k, ctx := keepertest.ContractManagerKeeper(t, nil)
@@ -58,5 +57,4 @@ func TestGenesis(t *testing.T) {
 	nullify.Fill(got)
 
 	require.ElementsMatch(t, genesisState.FailuresList, got.FailuresList)
-	// this line is used by starport scaffolding # genesis/test/assert
 }
diff --git a/x/contractmanager/types/genesis.go b/x/contractmanager/types/genesis.go
index 5efa35466..5b63d3c65 100644
--- a/x/contractmanager/types/genesis.go
+++ b/x/contractmanager/types/genesis.go
@@ -11,8 +11,7 @@ const DefaultIndex uint64 = 1
 func DefaultGenesis() *GenesisState {
 	return &GenesisState{
 		FailuresList: []Failure{},
-		// this line is used by starport scaffolding # genesis/types/default
-		Params: DefaultParams(),
+		Params:       DefaultParams(),
 	}
 }
 
@@ -29,7 +28,6 @@ func (gs GenesisState) Validate() error {
 		}
 		failureIndexMap[index] = struct{}{}
 	}
-	// this line is used by starport scaffolding # genesis/types/validate
 
 	return gs.Params.Validate()
 }
diff --git a/x/contractmanager/types/genesis_test.go b/x/contractmanager/types/genesis_test.go
index 5eb32e5d8..79490ce99 100644
--- a/x/contractmanager/types/genesis_test.go
+++ b/x/contractmanager/types/genesis_test.go
@@ -36,7 +36,6 @@ func TestGenesisState_Validate(t *testing.T) {
 						Id:      1,
 					},
 				},
-				// this line is used by starport scaffolding # types/genesis/validField
 			},
 			valid: true,
 		},
@@ -60,7 +59,6 @@ func TestGenesisState_Validate(t *testing.T) {
 			},
 			valid: false,
 		},
-		// this line is used by starport scaffolding # types/genesis/testcase
 	} {
 		t.Run(tc.desc, func(t *testing.T) {
 			err := tc.genState.Validate()
diff --git a/x/cron/client/cli/query.go b/x/cron/client/cli/query.go
index 01c41d2a8..9f8e2aba8 100644
--- a/x/cron/client/cli/query.go
+++ b/x/cron/client/cli/query.go
@@ -23,7 +23,6 @@ func GetQueryCmd(_ string) *cobra.Command {
 	cmd.AddCommand(CmdQueryParams())
 	cmd.AddCommand(CmdListSchedule())
 	cmd.AddCommand(CmdShowSchedule())
-	// this line is used by starport scaffolding # 1
 
 	return cmd
 }
diff --git a/x/cron/client/cli/tx.go b/x/cron/client/cli/tx.go
index d29429dc1..c8d7a2986 100644
--- a/x/cron/client/cli/tx.go
+++ b/x/cron/client/cli/tx.go
@@ -19,7 +19,5 @@ func GetTxCmd() *cobra.Command {
 		RunE:                       client.ValidateCmd,
 	}
 
-	// this line is used by starport scaffolding # 1
-
 	return cmd
 }
diff --git a/x/cron/genesis.go b/x/cron/genesis.go
index 84a23b215..37c45ea79 100644
--- a/x/cron/genesis.go
+++ b/x/cron/genesis.go
@@ -2,6 +2,7 @@ package cron
 
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
+
 	"github.com/neutron-org/neutron/x/cron/keeper"
 	"github.com/neutron-org/neutron/x/cron/types"
 )
@@ -28,7 +29,5 @@ func ExportGenesis(ctx sdk.Context, k keeper.Keeper) *types.GenesisState {
 	genesis.Params = k.GetParams(ctx)
 	genesis.ScheduleList = k.GetAllSchedules(ctx)
 
-	// this line is used by starport scaffolding # genesis/module/export
-
 	return genesis
 }
diff --git a/x/cron/genesis_test.go b/x/cron/genesis_test.go
index fbfe980cb..1840df5e0 100644
--- a/x/cron/genesis_test.go
+++ b/x/cron/genesis_test.go
@@ -23,7 +23,6 @@ func TestGenesis(t *testing.T) {
 				LastExecuteHeight: uint64(ctx.BlockHeight()),
 			},
 		},
-		// this line is used by starport scaffolding # genesis/test/state
 	}
 
 	cron.InitGenesis(ctx, *k, genesisState)
@@ -35,5 +34,4 @@ func TestGenesis(t *testing.T) {
 
 	require.Equal(t, genesisState.Params, got.Params)
 	require.ElementsMatch(t, genesisState.ScheduleList, got.ScheduleList)
-	// this line is used by starport scaffolding # genesis/test/assert
 }
diff --git a/x/cron/module.go b/x/cron/module.go
index 3aa173d56..fb8aa0eb9 100644
--- a/x/cron/module.go
+++ b/x/cron/module.go
@@ -9,8 +9,6 @@ import (
 
 	"github.com/gorilla/mux"
 
-	// this line is used by starport scaffolding # 1
-
 	"github.com/grpc-ecosystem/grpc-gateway/runtime"
 	"github.com/spf13/cobra"
 
diff --git a/x/cron/module_simulation.go b/x/cron/module_simulation.go
index bd9023e3e..2f2fd4d65 100644
--- a/x/cron/module_simulation.go
+++ b/x/cron/module_simulation.go
@@ -19,10 +19,6 @@ var (
 	_ = baseapp.Paramspace
 )
 
-const (
-// this line is used by starport scaffolding # simapp/module/const
-)
-
 // GenerateGenesisState creates a randomized GenState of the module
 func (AppModule) GenerateGenesisState(simState *module.SimulationState) {
 	accs := make([]string, len(simState.Accounts))
diff --git a/x/cron/types/genesis.go b/x/cron/types/genesis.go
index 7835e0aa6..4fad02046 100644
--- a/x/cron/types/genesis.go
+++ b/x/cron/types/genesis.go
@@ -6,8 +6,7 @@ import "fmt"
 func DefaultGenesis() *GenesisState {
 	return &GenesisState{
 		ScheduleList: []Schedule{},
-		// this line is used by starport scaffolding # genesis/types/default
-		Params: DefaultParams(),
+		Params:       DefaultParams(),
 	}
 }
 
@@ -24,7 +23,6 @@ func (gs GenesisState) Validate() error {
 		}
 		scheduleIndexMap[index] = struct{}{}
 	}
-	// this line is used by starport scaffolding # genesis/types/validate
 
 	return gs.Params.Validate()
 }
diff --git a/x/cron/types/genesis_test.go b/x/cron/types/genesis_test.go
index 98da89fa4..5d080e4f8 100644
--- a/x/cron/types/genesis_test.go
+++ b/x/cron/types/genesis_test.go
@@ -24,7 +24,6 @@ func TestGenesisState_Validate(t *testing.T) {
 					SecurityAddress: "neutron17dtl0mjt3t77kpuhg2edqzjpszulwhgzcdvagh",
 					Limit:           1,
 				},
-				// this line is used by starport scaffolding # types/genesis/validField
 			},
 			valid: true,
 		},
@@ -35,11 +34,9 @@ func TestGenesisState_Validate(t *testing.T) {
 					SecurityAddress: "",
 					Limit:           0,
 				},
-				// this line is used by starport scaffolding # types/genesis/validField
 			},
 			valid: false,
 		},
-		// this line is used by starport scaffolding # types/genesis/testcase
 	} {
 		t.Run(tc.desc, func(t *testing.T) {
 			err := tc.genState.Validate()
diff --git a/x/feeburner/client/cli/query.go b/x/feeburner/client/cli/query.go
index 9147c9edb..7ef22a8fd 100644
--- a/x/feeburner/client/cli/query.go
+++ b/x/feeburner/client/cli/query.go
@@ -23,7 +23,6 @@ func GetQueryCmd(_ string) *cobra.Command {
 
 	cmd.AddCommand(CmdQueryParams())
 	cmd.AddCommand(CmdQueryTotalBurnedNeutronsAmount())
-	// this line is used by starport scaffolding # 1
 
 	return cmd
 }
diff --git a/x/feeburner/genesis.go b/x/feeburner/genesis.go
index 3af23ed5d..097b3076d 100644
--- a/x/feeburner/genesis.go
+++ b/x/feeburner/genesis.go
@@ -2,6 +2,7 @@ package feeburner
 
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
+
 	"github.com/neutron-org/neutron/x/feeburner/keeper"
 	"github.com/neutron-org/neutron/x/feeburner/types"
 )
@@ -20,7 +21,5 @@ func ExportGenesis(ctx sdk.Context, k keeper.Keeper) *types.GenesisState {
 	genesis := types.DefaultGenesis()
 	genesis.Params = k.GetParams(ctx)
 
-	// this line is used by starport scaffolding # genesis/module/export
-
 	return genesis
 }
diff --git a/x/feeburner/genesis_test.go b/x/feeburner/genesis_test.go
index e97b16db9..01c00bab6 100644
--- a/x/feeburner/genesis_test.go
+++ b/x/feeburner/genesis_test.go
@@ -17,8 +17,6 @@ func TestGenesis(t *testing.T) {
 
 	genesisState := types.GenesisState{
 		Params: types.DefaultParams(),
-
-		// this line is used by starport scaffolding # genesis/test/state
 	}
 
 	k, ctx := keeper.FeeburnerKeeper(t)
@@ -28,6 +26,4 @@ func TestGenesis(t *testing.T) {
 
 	nullify.Fill(&genesisState)
 	nullify.Fill(got)
-
-	// this line is used by starport scaffolding # genesis/test/assert
 }
diff --git a/x/feeburner/module.go b/x/feeburner/module.go
index 19b98ab10..b877be3a8 100644
--- a/x/feeburner/module.go
+++ b/x/feeburner/module.go
@@ -8,7 +8,6 @@ import (
 	"cosmossdk.io/core/appmodule"
 
 	"github.com/gorilla/mux"
-	// this line is used by starport scaffolding # 1
 
 	"github.com/grpc-ecosystem/grpc-gateway/runtime"
 	"github.com/spf13/cobra"
diff --git a/x/feeburner/module_simulation.go b/x/feeburner/module_simulation.go
index 80ab87783..167653864 100644
--- a/x/feeburner/module_simulation.go
+++ b/x/feeburner/module_simulation.go
@@ -21,10 +21,6 @@ var (
 	_ = baseapp.Paramspace
 )
 
-const (
-// this line is used by starport scaffolding # simapp/module/const
-)
-
 // GenerateGenesisState creates a randomized GenState of the module
 func (AppModule) GenerateGenesisState(simState *module.SimulationState) {
 	accs := make([]string, len(simState.Accounts))
@@ -33,7 +29,6 @@ func (AppModule) GenerateGenesisState(simState *module.SimulationState) {
 	}
 	feeburnerGenesis := types.GenesisState{
 		Params: types.DefaultParams(),
-		// this line is used by starport scaffolding # simapp/module/genesisState
 	}
 	simState.GenState[types.ModuleName] = simState.Cdc.MustMarshalJSON(&feeburnerGenesis)
 }
@@ -50,7 +45,5 @@ func (am AppModule) RegisterStoreDecoder(_ sdk.StoreDecoderRegistry) {}
 func (am AppModule) WeightedOperations(_ module.SimulationState) []simtypes.WeightedOperation {
 	operations := make([]simtypes.WeightedOperation, 0)
 
-	// this line is used by starport scaffolding # simapp/module/operation
-
 	return operations
 }
diff --git a/x/feeburner/types/genesis.go b/x/feeburner/types/genesis.go
index 0af9b4416..bdb9f4151 100644
--- a/x/feeburner/types/genesis.go
+++ b/x/feeburner/types/genesis.go
@@ -1,16 +1,11 @@
 package types
 
-import (
-// this line is used by starport scaffolding # genesis/types/import
-)
-
 // DefaultIndex is the default global index
 const DefaultIndex uint64 = 1
 
 // DefaultGenesis returns the default genesis state
 func DefaultGenesis() *GenesisState {
 	return &GenesisState{
-		// this line is used by starport scaffolding # genesis/types/default
 		Params: DefaultParams(),
 	}
 }
@@ -18,7 +13,5 @@ func DefaultGenesis() *GenesisState {
 // Validate performs basic genesis state validation returning an error upon any
 // failure.
 func (gs GenesisState) Validate() error {
-	// this line is used by starport scaffolding # genesis/types/validate
-
 	return gs.Params.Validate()
 }
diff --git a/x/feerefunder/genesis.go b/x/feerefunder/genesis.go
index ab40d2deb..32eeb56ee 100644
--- a/x/feerefunder/genesis.go
+++ b/x/feerefunder/genesis.go
@@ -27,7 +27,5 @@ func ExportGenesis(ctx sdk.Context, k keeper.Keeper) *types.GenesisState {
 
 	genesis.FeeInfos = k.GetAllFeeInfos(ctx)
 
-	// this line is used by starport scaffolding # genesis/module/export
-
 	return genesis
 }
diff --git a/x/feerefunder/types/genesis.go b/x/feerefunder/types/genesis.go
index 960ad57c4..89a8852ec 100644
--- a/x/feerefunder/types/genesis.go
+++ b/x/feerefunder/types/genesis.go
@@ -15,7 +15,6 @@ import (
 // DefaultGenesis returns the default genesis state
 func DefaultGenesis() *GenesisState {
 	return &GenesisState{
-		// this line is used by starport scaffolding # genesis/types/default
 		Params: DefaultParams(),
 	}
 }
@@ -23,7 +22,6 @@ func DefaultGenesis() *GenesisState {
 // Validate performs basic genesis state validation returning an error upon any
 // failure.
 func (gs GenesisState) Validate() error {
-	// this line is used by starport scaffolding # genesis/types/validate
 	for _, info := range gs.FeeInfos {
 		addr, err := sdk.AccAddressFromBech32(info.Payer)
 		if err != nil {
diff --git a/x/feerefunder/types/genesis_test.go b/x/feerefunder/types/genesis_test.go
index e657ba051..04dad2cf1 100644
--- a/x/feerefunder/types/genesis_test.go
+++ b/x/feerefunder/types/genesis_test.go
@@ -178,7 +178,6 @@ func TestGenesisState_Validate(t *testing.T) {
 			},
 			valid: true,
 		},
-		// this line is used by starport scaffolding # types/genesis/testcase
 	} {
 		t.Run(tc.desc, func(t *testing.T) {
 			err := tc.genState.Validate()
diff --git a/x/tokenfactory/types/codec.go b/x/tokenfactory/types/codec.go
index 176834acb..70141c555 100644
--- a/x/tokenfactory/types/codec.go
+++ b/x/tokenfactory/types/codec.go
@@ -6,7 +6,6 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	authzcodec "github.com/cosmos/cosmos-sdk/x/authz/codec"
 
-	// this line is used by starport scaffolding # 1
 	"github.com/cosmos/cosmos-sdk/types/msgservice"
 )
 
diff --git a/x/tokenfactory/types/genesis.go b/x/tokenfactory/types/genesis.go
index aef9370cc..fc265c124 100644
--- a/x/tokenfactory/types/genesis.go
+++ b/x/tokenfactory/types/genesis.go
@@ -5,8 +5,6 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
 
-// this line is used by starport scaffolding # genesis/types/import
-
 // DefaultIndex is the default capability global index
 const DefaultIndex uint64 = 1