diff --git a/proto/osmosis/concentrated-liquidity/tx.proto b/proto/osmosis/concentrated-liquidity/tx.proto
index c2a4437cb1a..e044fa44c80 100644
--- a/proto/osmosis/concentrated-liquidity/tx.proto
+++ b/proto/osmosis/concentrated-liquidity/tx.proto
@@ -2,6 +2,7 @@ syntax = "proto3";
 package osmosis.concentratedliquidity.v1beta1;
 
 import "gogoproto/gogo.proto";
+import "amino/amino.proto";
 import "google/protobuf/timestamp.proto";
 import "google/protobuf/duration.proto";
 import "cosmos/base/v1beta1/coin.proto";
@@ -26,6 +27,8 @@ service Msg {
 
 // ===================== MsgCreatePosition
 message MsgCreatePosition {
+  option (amino.name) = "osmosis/cl-create-position";
+
   uint64 pool_id = 1 [ (gogoproto.moretags) = "yaml:\"pool_id\"" ];
   string sender = 2 [ (gogoproto.moretags) = "yaml:\"sender\"" ];
   int64 lower_tick = 3 [ (gogoproto.moretags) = "yaml:\"lower_tick\"" ];
@@ -77,6 +80,8 @@ message MsgCreatePositionResponse {
 
 // ===================== MsgAddToPosition
 message MsgAddToPosition {
+  option (amino.name) = "osmosis/cl-add-to-position";
+
   uint64 position_id = 1 [ (gogoproto.moretags) = "yaml:\"position_id\"" ];
   string sender = 2 [ (gogoproto.moretags) = "yaml:\"sender\"" ];
   // amount0 represents the amount of token0 willing to put in.
@@ -127,6 +132,8 @@ message MsgAddToPositionResponse {
 
 // ===================== MsgWithdrawPosition
 message MsgWithdrawPosition {
+  option (amino.name) = "osmosis/cl-withdraw-position";
+
   uint64 position_id = 1 [ (gogoproto.moretags) = "yaml:\"position_id\"" ];
   string sender = 2 [ (gogoproto.moretags) = "yaml:\"sender\"" ];
   string liquidity_amount = 3 [
@@ -151,6 +158,8 @@ message MsgWithdrawPositionResponse {
 
 // ===================== MsgCollectSpreadRewards
 message MsgCollectSpreadRewards {
+  option (amino.name) = "osmosis/cl-col-sp-rewards";
+
   repeated uint64 position_ids = 1
       [ (gogoproto.moretags) = "yaml:\"position_ids\"" ];
   string sender = 2 [ (gogoproto.moretags) = "yaml:\"sender\"" ];
@@ -166,6 +175,8 @@ message MsgCollectSpreadRewardsResponse {
 
 // ===================== MsgCollectIncentives
 message MsgCollectIncentives {
+  option (amino.name) = "osmosis/cl-collect-incentives";
+
   repeated uint64 position_ids = 1
       [ (gogoproto.moretags) = "yaml:\"position_ids\"" ];
   string sender = 2 [ (gogoproto.moretags) = "yaml:\"sender\"" ];
@@ -186,6 +197,8 @@ message MsgCollectIncentivesResponse {
 
 // ===================== MsgFungifyChargedPositions
 message MsgFungifyChargedPositions {
+  option (amino.name) = "osmosis/cl-fungify-charged-positions";
+
   repeated uint64 position_ids = 1
       [ (gogoproto.moretags) = "yaml:\"position_ids\"" ];
   string sender = 2 [ (gogoproto.moretags) = "yaml:\"sender\"" ];
diff --git a/proto/osmosis/lockup/tx.proto b/proto/osmosis/lockup/tx.proto
index 79c23d4be8f..dfa0cfa1ae3 100644
--- a/proto/osmosis/lockup/tx.proto
+++ b/proto/osmosis/lockup/tx.proto
@@ -69,6 +69,8 @@ message MsgBeginUnlockingResponse {
 // MsgExtendLockup extends the existing lockup's duration.
 // The new duration is longer than the original.
 message MsgExtendLockup {
+  option (amino.name) = "osmosis/lockup/extend-lockup";
+
   string owner = 1 [ (gogoproto.moretags) = "yaml:\"owner\"" ];
   uint64 ID = 2;
 
@@ -89,6 +91,8 @@ message MsgExtendLockupResponse { bool success = 1; }
 // MsgForceUnlock unlocks locks immediately for
 // addresses registered via governance.
 message MsgForceUnlock {
+  option (amino.name) = "osmosis/lockup/force-unlock-tokens";
+
   string owner = 1 [ (gogoproto.moretags) = "yaml:\"owner\"" ];
   uint64 ID = 2;
   // Amount of unlocking coins. Unlock all if not set.
@@ -101,6 +105,8 @@ message MsgForceUnlock {
 message MsgForceUnlockResponse { bool success = 1; }
 
 message MsgSetRewardReceiverAddress {
+  option (amino.name) = "osmosis/lockup/set-reward-receiver-address";
+
   string owner = 1 [ (gogoproto.moretags) = "yaml:\"owner\"" ];
   uint64 lockID = 2;
   string reward_receiver = 3
diff --git a/proto/osmosis/poolmanager/v1beta1/tx.proto b/proto/osmosis/poolmanager/v1beta1/tx.proto
index 5fc166472c8..b2c369531e9 100644
--- a/proto/osmosis/poolmanager/v1beta1/tx.proto
+++ b/proto/osmosis/poolmanager/v1beta1/tx.proto
@@ -2,6 +2,7 @@ syntax = "proto3";
 package osmosis.poolmanager.v1beta1;
 
 import "gogoproto/gogo.proto";
+import "amino/amino.proto";
 import "cosmos/base/v1beta1/coin.proto";
 import "osmosis/poolmanager/v1beta1/swap_route.proto";
 
@@ -20,6 +21,8 @@ service Msg {
 
 // ===================== MsgSwapExactAmountIn
 message MsgSwapExactAmountIn {
+  option (amino.name) = "osmosis/poolmanager/swap-exact-amount-in";
+
   string sender = 1 [ (gogoproto.moretags) = "yaml:\"sender\"" ];
   repeated SwapAmountInRoute routes = 2 [ (gogoproto.nullable) = false ];
   cosmos.base.v1beta1.Coin token_in = 3 [
@@ -43,6 +46,8 @@ message MsgSwapExactAmountInResponse {
 
 // ===================== MsgSplitRouteSwapExactAmountIn
 message MsgSplitRouteSwapExactAmountIn {
+  option (amino.name) = "osmosis/poolmanager/split-amount-in";
+
   string sender = 1 [ (gogoproto.moretags) = "yaml:\"sender\"" ];
   repeated SwapAmountInSplitRoute routes = 2 [ (gogoproto.nullable) = false ];
   string token_in_denom = 3
@@ -64,6 +69,8 @@ message MsgSplitRouteSwapExactAmountInResponse {
 
 // ===================== MsgSwapExactAmountOut
 message MsgSwapExactAmountOut {
+  option (amino.name) = "osmosis/poolmanager/swap-exact-amount-out";
+
   string sender = 1 [ (gogoproto.moretags) = "yaml:\"sender\"" ];
   repeated SwapAmountOutRoute routes = 2 [ (gogoproto.nullable) = false ];
   string token_in_max_amount = 3 [
@@ -87,6 +94,8 @@ message MsgSwapExactAmountOutResponse {
 
 // ===================== MsgSplitRouteSwapExactAmountOut
 message MsgSplitRouteSwapExactAmountOut {
+  option (amino.name) = "osmosis/poolmanager/split-amount-out";
+
   string sender = 1 [ (gogoproto.moretags) = "yaml:\"sender\"" ];
   repeated SwapAmountOutSplitRoute routes = 2 [ (gogoproto.nullable) = false ];
   string token_out_denom = 3
diff --git a/proto/osmosis/protorev/v1beta1/tx.proto b/proto/osmosis/protorev/v1beta1/tx.proto
index 91a7dfdd7c7..1ecb47b4223 100644
--- a/proto/osmosis/protorev/v1beta1/tx.proto
+++ b/proto/osmosis/protorev/v1beta1/tx.proto
@@ -93,6 +93,8 @@ message MsgSetDeveloperAccountResponse {}
 
 // MsgSetPoolWeights defines the Msg/SetPoolWeights request type.
 message MsgSetPoolWeights {
+  option (amino.name) = "osmosis/MsgSetPoolWeights";
+
   // admin is the account that is authorized to set the pool weights.
   string admin = 1 [
     (gogoproto.moretags) = "yaml:\"admin\"",
@@ -110,6 +112,8 @@ message MsgSetPoolWeightsResponse {}
 
 // MsgSetMaxPoolPointsPerTx defines the Msg/SetMaxPoolPointsPerTx request type.
 message MsgSetMaxPoolPointsPerTx {
+  option (amino.name) = "osmosis/MsgSetMaxPoolPointsPerTx";
+
   // admin is the account that is authorized to set the max pool points per tx.
   string admin = 1 [
     (gogoproto.moretags) = "yaml:\"admin\"",
@@ -128,6 +132,8 @@ message MsgSetMaxPoolPointsPerTxResponse {}
 // MsgSetMaxPoolPointsPerBlock defines the Msg/SetMaxPoolPointsPerBlock request
 // type.
 message MsgSetMaxPoolPointsPerBlock {
+  option (amino.name) = "osmosis/MsgSetPoolWeights";
+
   // admin is the account that is authorized to set the max pool points per
   // block.
   string admin = 1 [
@@ -146,6 +152,8 @@ message MsgSetMaxPoolPointsPerBlockResponse {}
 
 // MsgSetBaseDenoms defines the Msg/SetBaseDenoms request type.
 message MsgSetBaseDenoms {
+  option (amino.name) = "osmosis/MsgSetBaseDenoms";
+
   // admin is the account that is authorized to set the base denoms.
   string admin = 1 [
     (gogoproto.moretags) = "yaml:\"admin\"",
diff --git a/proto/osmosis/superfluid/tx.proto b/proto/osmosis/superfluid/tx.proto
index af547f7ff49..41149d7f065 100644
--- a/proto/osmosis/superfluid/tx.proto
+++ b/proto/osmosis/superfluid/tx.proto
@@ -118,6 +118,8 @@ message MsgLockAndSuperfluidDelegateResponse { uint64 ID = 1; }
 // MsgCreateFullRangePositionAndSuperfluidDelegate creates a full range position
 // in a concentrated liquidity pool, then superfluid delegates.
 message MsgCreateFullRangePositionAndSuperfluidDelegate {
+  option (amino.name) = "osmosis/full-range-and-sf-delegate";
+
   string sender = 1 [ (gogoproto.moretags) = "yaml:\"sender\"" ];
   repeated cosmos.base.v1beta1.Coin coins = 2 [
     (gogoproto.nullable) = false,
@@ -153,6 +155,8 @@ message MsgUnPoolWhitelistedPoolResponse {
 // =====================
 // MsgUnlockAndMigrateSharesToFullRangeConcentratedPosition
 message MsgUnlockAndMigrateSharesToFullRangeConcentratedPosition {
+  option (amino.name) = "osmosis/unlock-and-migrate";
+
   string sender = 1 [ (gogoproto.moretags) = "yaml:\"sender\"" ];
   int64 lock_id = 2 [ (gogoproto.moretags) = "yaml:\"lock_id\"" ];
   cosmos.base.v1beta1.Coin shares_to_migrate = 3 [
@@ -192,6 +196,8 @@ message MsgUnlockAndMigrateSharesToFullRangeConcentratedPositionResponse {
 
 // ===================== MsgAddToConcentratedLiquiditySuperfluidPosition
 message MsgAddToConcentratedLiquiditySuperfluidPosition {
+  option (amino.name) = "osmosis/add-to-cl-superfluid-position";
+
   uint64 position_id = 1 [ (gogoproto.moretags) = "yaml:\"position_id\"" ];
   string sender = 2 [ (gogoproto.moretags) = "yaml:\"sender\"" ];
   cosmos.base.v1beta1.Coin token_desired0 = 3 [
diff --git a/proto/osmosis/tokenfactory/v1beta1/tx.proto b/proto/osmosis/tokenfactory/v1beta1/tx.proto
index 5fabed3e301..4957fff9169 100644
--- a/proto/osmosis/tokenfactory/v1beta1/tx.proto
+++ b/proto/osmosis/tokenfactory/v1beta1/tx.proto
@@ -89,6 +89,7 @@ message MsgChangeAdmin {
 // MsgChangeAdmin message.
 message MsgChangeAdminResponse {}
 
+<<<<<<< HEAD
 // // MsgSetBeforeSendHook is the sdk.Msg type for allowing an admin account to
 // // assign a CosmWasm contract to call with a BeforeSend hook
 // message MsgSetBeforeSendHook {
@@ -97,6 +98,18 @@ message MsgChangeAdminResponse {}
 //   string cosmwasm_address = 3
 //       [ (gogoproto.moretags) = "yaml:\"cosmwasm_address\"" ];
 // }
+=======
+// MsgSetBeforeSendHook is the sdk.Msg type for allowing an admin account to
+// assign a CosmWasm contract to call with a BeforeSend hook
+message MsgSetBeforeSendHook {
+  option (amino.name) = "osmosis/tokenfactory/set-beforesend-hook";
+
+  string sender = 1 [ (gogoproto.moretags) = "yaml:\"sender\"" ];
+  string denom = 2 [ (gogoproto.moretags) = "yaml:\"denom\"" ];
+  string cosmwasm_address = 3
+      [ (gogoproto.moretags) = "yaml:\"cosmwasm_address\"" ];
+}
+>>>>>>> 1e3149f0 ([Chore] Add amino name for tx msgs (#5784))
 
 // // MsgSetBeforeSendHookResponse defines the response structure for an
 // executed
@@ -118,6 +131,8 @@ message MsgSetDenomMetadata {
 message MsgSetDenomMetadataResponse {}
 
 message MsgForceTransfer {
+  option (amino.name) = "osmosis/tokenfactory/force-transfer";
+
   string sender = 1 [ (gogoproto.moretags) = "yaml:\"sender\"" ];
   cosmos.base.v1beta1.Coin amount = 2 [
     (gogoproto.moretags) = "yaml:\"amount\"",
diff --git a/x/concentrated-liquidity/types/tx.pb.go b/x/concentrated-liquidity/types/tx.pb.go
index 39d2bea0911..b45ff2f6c78 100644
--- a/x/concentrated-liquidity/types/tx.pb.go
+++ b/x/concentrated-liquidity/types/tx.pb.go
@@ -8,6 +8,7 @@ import (
 	fmt "fmt"
 	github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types"
 	types "github.com/cosmos/cosmos-sdk/types"
+	_ "github.com/cosmos/cosmos-sdk/types/tx/amino"
 	_ "github.com/gogo/protobuf/gogoproto"
 	grpc1 "github.com/gogo/protobuf/grpc"
 	proto "github.com/gogo/protobuf/proto"
@@ -705,74 +706,80 @@ func init() {
 }
 
 var fileDescriptor_1f1fff802923d7db = []byte{
-	// 1063 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x58, 0xcf, 0x6f, 0xe3, 0x44,
-	0x14, 0xee, 0x34, 0x69, 0xaa, 0x4e, 0xe9, 0x8f, 0xb8, 0xa5, 0xf5, 0x66, 0x51, 0x5c, 0x8d, 0x04,
-	0x04, 0xa1, 0xc6, 0x9b, 0x05, 0x01, 0x2a, 0x12, 0x6c, 0x53, 0xb4, 0x52, 0x90, 0x22, 0x56, 0xde,
-	0x95, 0x90, 0x76, 0x91, 0x2c, 0xc7, 0x9e, 0xba, 0xa3, 0x26, 0x1e, 0xe3, 0x99, 0xb4, 0xdb, 0x03,
-	0x12, 0x12, 0x27, 0x04, 0x07, 0x84, 0xc4, 0x11, 0xc4, 0x11, 0xf1, 0x3f, 0x70, 0xdf, 0x03, 0x87,
-	0xbd, 0x20, 0x21, 0x0e, 0x06, 0xb5, 0x77, 0x10, 0xf9, 0x0b, 0x90, 0x7f, 0x8d, 0xb3, 0x4e, 0x0a,
-	0x71, 0xda, 0x2d, 0x87, 0x3d, 0x25, 0x33, 0xf3, 0xbe, 0xef, 0xbd, 0xf9, 0xde, 0x9b, 0xe7, 0xb1,
-	0xe1, 0xcb, 0x94, 0xf5, 0x28, 0x23, 0x4c, 0x35, 0xa9, 0x63, 0x62, 0x87, 0x7b, 0x06, 0xc7, 0xd6,
-	0x76, 0x97, 0x7c, 0xdc, 0x27, 0x16, 0xe1, 0x27, 0x2a, 0x7f, 0x58, 0x77, 0x3d, 0xca, 0xa9, 0xf4,
-	0x62, 0x6c, 0x58, 0x1f, 0x36, 0x14, 0x76, 0xf5, 0xa3, 0x46, 0x07, 0x73, 0xa3, 0x51, 0x59, 0xb7,
-	0xa9, 0x4d, 0x43, 0x84, 0x1a, 0xfc, 0x8b, 0xc0, 0x15, 0xc5, 0xa6, 0xd4, 0xee, 0x62, 0x35, 0x1c,
-	0x75, 0xfa, 0xfb, 0x2a, 0x27, 0x3d, 0xcc, 0xb8, 0xd1, 0x73, 0x63, 0x83, 0x6a, 0xd6, 0xc0, 0xea,
-	0x7b, 0x06, 0x27, 0xd4, 0x49, 0xd6, 0xcd, 0xd0, 0xbd, 0xda, 0x31, 0x18, 0x56, 0x63, 0x5f, 0xaa,
-	0x49, 0x49, 0xbc, 0x8e, 0x7e, 0x2a, 0xc2, 0x72, 0x9b, 0xd9, 0x7b, 0x1e, 0x36, 0x38, 0xbe, 0x43,
-	0x19, 0x09, 0xb0, 0xd2, 0xab, 0x70, 0xde, 0xa5, 0xb4, 0xab, 0x13, 0x4b, 0x06, 0x5b, 0xa0, 0x56,
-	0x6c, 0x4a, 0x03, 0x5f, 0x59, 0x3e, 0x31, 0x7a, 0xdd, 0x1d, 0x14, 0x2f, 0x20, 0xad, 0x14, 0xfc,
-	0x6b, 0x59, 0xd2, 0x2b, 0xb0, 0xc4, 0xb0, 0x63, 0x61, 0x4f, 0x9e, 0xdd, 0x02, 0xb5, 0x85, 0x66,
-	0x79, 0xe0, 0x2b, 0x4b, 0x91, 0x6d, 0x34, 0x8f, 0xb4, 0xd8, 0x40, 0x7a, 0x1d, 0xc2, 0x2e, 0x3d,
-	0xc6, 0x9e, 0xce, 0x89, 0x79, 0x28, 0x17, 0xb6, 0x40, 0xad, 0xd0, 0x7c, 0x7e, 0xe0, 0x2b, 0xe5,
-	0xc8, 0x3c, 0x5d, 0x43, 0xda, 0x42, 0x38, 0xb8, 0x47, 0xcc, 0xc3, 0x00, 0xd5, 0x77, 0xdd, 0x04,
-	0x55, 0xcc, 0xa2, 0xd2, 0x35, 0xa4, 0x2d, 0x84, 0x83, 0x10, 0xc5, 0xe1, 0x0a, 0xa7, 0x87, 0xd8,
-	0x61, 0xba, 0xeb, 0xd1, 0x23, 0x62, 0x61, 0x4b, 0x9e, 0xdb, 0x2a, 0xd4, 0x16, 0x6f, 0x5e, 0xab,
-	0x47, 0x9a, 0xd4, 0x03, 0x4d, 0x12, 0xfd, 0xeb, 0x7b, 0x94, 0x38, 0xcd, 0x1b, 0x8f, 0x7c, 0x65,
-	0xe6, 0xc7, 0xdf, 0x95, 0x9a, 0x4d, 0xf8, 0x41, 0xbf, 0x53, 0x37, 0x69, 0x4f, 0x8d, 0x05, 0x8c,
-	0x7e, 0xb6, 0x99, 0x75, 0xa8, 0xf2, 0x13, 0x17, 0xb3, 0x10, 0xc0, 0xb4, 0xe5, 0xc8, 0xc7, 0x9d,
-	0xd8, 0x85, 0x74, 0x04, 0xcb, 0xe1, 0x8c, 0xde, 0x23, 0x8e, 0x6e, 0xf4, 0x68, 0xdf, 0xe1, 0x37,
-	0xe4, 0x52, 0xa8, 0xcb, 0xfb, 0x01, 0xf9, 0x6f, 0xbe, 0xf2, 0xd2, 0x04, 0xe4, 0x2d, 0x87, 0x0f,
-	0x7c, 0x45, 0x8e, 0x36, 0x38, 0x42, 0x88, 0xb4, 0x68, 0x6b, 0x6d, 0xe2, 0xec, 0x46, 0x33, 0xe3,
-	0xfc, 0x36, 0xe4, 0xf9, 0xcb, 0xf5, 0xdb, 0x18, 0xf1, 0xdb, 0x40, 0x7f, 0x17, 0xe0, 0xb5, 0x91,
-	0xfa, 0xd1, 0x30, 0x73, 0xa9, 0xc3, 0xb0, 0xf4, 0x26, 0x5c, 0x74, 0xe3, 0xb9, 0xb4, 0x96, 0x36,
-	0x06, 0xbe, 0x22, 0x25, 0xb5, 0x24, 0x16, 0x91, 0x06, 0x93, 0x51, 0xcb, 0x92, 0xee, 0xc3, 0xf9,
-	0x44, 0xbc, 0xa8, 0xa8, 0x6e, 0xe5, 0xde, 0x44, 0x5c, 0xae, 0x42, 0xb2, 0x84, 0x30, 0xe5, 0x6e,
-	0x84, 0x15, 0x78, 0x61, 0xee, 0x86, 0xe0, 0x6e, 0x48, 0xc7, 0xb0, 0x2c, 0x8e, 0xb6, 0x6e, 0x86,
-	0xa2, 0x04, 0x65, 0x97, 0x37, 0x0d, 0xef, 0x61, 0x33, 0x4d, 0xc3, 0x08, 0x21, 0xd2, 0x56, 0xc5,
-	0x5c, 0x24, 0xbc, 0x95, 0x39, 0x59, 0xa5, 0xa9, 0x4e, 0xd6, 0xfc, 0x64, 0x27, 0x0b, 0x7d, 0x5f,
-	0x84, 0xab, 0x6d, 0x66, 0xef, 0x5a, 0xd6, 0x3d, 0x2a, 0x5a, 0xc6, 0xd4, 0xa9, 0xce, 0xd1, 0x3e,
-	0x1e, 0xa4, 0x55, 0x11, 0x65, 0x6e, 0x37, 0x77, 0xe6, 0x56, 0x86, 0x33, 0xa7, 0x0f, 0x97, 0xc5,
-	0x83, 0xb4, 0x2c, 0x8a, 0x97, 0x42, 0x3e, 0x5c, 0x17, 0x63, 0xdb, 0xc2, 0xdc, 0xff, 0xd4, 0x16,
-	0x4a, 0x4f, 0xbf, 0x2d, 0x7c, 0x31, 0x0b, 0xe5, 0x6c, 0x89, 0x3c, 0xb3, 0x5d, 0x01, 0xfd, 0x05,
-	0xe0, 0x5a, 0x9b, 0xd9, 0x1f, 0x12, 0x7e, 0x60, 0x79, 0xc6, 0xf1, 0x95, 0x9e, 0x19, 0x0e, 0xd3,
-	0x66, 0x11, 0x27, 0x2c, 0xde, 0x60, 0x2b, 0x77, 0x43, 0xda, 0xcc, 0x36, 0xa4, 0x88, 0x0f, 0x69,
-	0x2b, 0x62, 0x2a, 0x2a, 0x00, 0xf4, 0x0b, 0x80, 0xd7, 0xc7, 0xec, 0x58, 0x94, 0xc0, 0x50, 0x26,
-	0xc1, 0x53, 0xcc, 0xe4, 0xec, 0x65, 0x67, 0xf2, 0x53, 0x00, 0x37, 0x83, 0xc7, 0x1d, 0xed, 0x76,
-	0xb1, 0xc9, 0xef, 0xba, 0x1e, 0x36, 0x2c, 0x0d, 0x1f, 0x1b, 0x9e, 0xc5, 0xa4, 0x1d, 0xf8, 0xdc,
-	0x50, 0xc2, 0x98, 0x0c, 0xb6, 0x0a, 0xb5, 0x62, 0x73, 0x73, 0xe0, 0x2b, 0x6b, 0x23, 0xe9, 0x64,
-	0x48, 0x5b, 0x4c, 0xf3, 0xc9, 0x72, 0x24, 0x14, 0xfd, 0x0c, 0xa0, 0x72, 0x4e, 0x08, 0x42, 0xde,
-	0x1f, 0x00, 0x94, 0xcd, 0xc8, 0x00, 0x5b, 0x3a, 0x0b, 0x6d, 0x74, 0x2f, 0x32, 0x0a, 0xe3, 0xfa,
-	0xd7, 0x5b, 0xd0, 0xdd, 0x40, 0xaf, 0x81, 0xaf, 0x28, 0x51, 0x00, 0xe7, 0x11, 0xa1, 0x5c, 0x17,
-	0xa5, 0x0d, 0x41, 0xf3, 0x44, 0xc8, 0xe8, 0x13, 0xb8, 0x9e, 0xee, 0xa6, 0x15, 0xde, 0x90, 0xc9,
-	0x11, 0xbe, 0x32, 0x35, 0xfd, 0x59, 0xf8, 0xc2, 0x38, 0xff, 0x42, 0xca, 0x6f, 0x01, 0x5c, 0x4f,
-	0x15, 0x20, 0xc2, 0xe0, 0xbf, 0x65, 0xfc, 0x20, 0x96, 0xf1, 0x7a, 0x56, 0xc6, 0x94, 0x24, 0x9f,
-	0x84, 0x6b, 0x82, 0x62, 0x48, 0xa7, 0x20, 0xbe, 0x7d, 0xea, 0xed, 0x63, 0x92, 0x89, 0x6f, 0x36,
-	0x67, 0x7c, 0xe3, 0x48, 0x72, 0xc6, 0x27, 0x28, 0xd2, 0xf8, 0xd0, 0x67, 0x00, 0x56, 0xda, 0xcc,
-	0xbe, 0xdd, 0x77, 0x6c, 0xb2, 0x7f, 0xb2, 0x77, 0x60, 0x78, 0x36, 0xb6, 0x92, 0x7e, 0x70, 0x65,
-	0x69, 0x3e, 0x80, 0xe8, 0xfc, 0x20, 0x44, 0xae, 0x9b, 0x70, 0xc5, 0xc1, 0xc7, 0xfa, 0x68, 0x4f,
-	0xae, 0x0c, 0x7c, 0x65, 0x23, 0x62, 0xce, 0x18, 0x20, 0x6d, 0xc9, 0xc1, 0xa2, 0xbf, 0xb5, 0xac,
-	0x9b, 0x7f, 0xce, 0xc1, 0x42, 0x9b, 0xd9, 0xd2, 0x97, 0x00, 0x2e, 0x67, 0xde, 0xaa, 0xde, 0xaa,
-	0x4f, 0xf4, 0x2a, 0x58, 0x1f, 0xb9, 0x4f, 0x57, 0x6e, 0x4d, 0x8b, 0x14, 0x5b, 0xfb, 0x1a, 0xc0,
-	0xd5, 0x91, 0xe7, 0xcf, 0xce, 0xe4, 0xb4, 0x59, 0x6c, 0xa5, 0x39, 0x3d, 0x56, 0x04, 0xf5, 0x39,
-	0x80, 0x4b, 0x99, 0x5b, 0xe4, 0xe4, 0xac, 0x4f, 0x00, 0x2b, 0xef, 0x4e, 0x09, 0x14, 0xb1, 0x7c,
-	0x07, 0xe0, 0xfa, 0xd8, 0xb6, 0xfe, 0x4e, 0x0e, 0xed, 0xc7, 0xe0, 0x2b, 0xb7, 0x2f, 0x86, 0x17,
-	0x01, 0x7e, 0x03, 0x60, 0x79, 0xb4, 0x4d, 0xbe, 0x9d, 0x9b, 0x3d, 0x05, 0x57, 0xf6, 0x2e, 0x00,
-	0x4e, 0xe2, 0x6a, 0x7e, 0xf4, 0xe8, 0xb4, 0x0a, 0x1e, 0x9f, 0x56, 0xc1, 0x1f, 0xa7, 0x55, 0xf0,
-	0xd5, 0x59, 0x75, 0xe6, 0xf1, 0x59, 0x75, 0xe6, 0xd7, 0xb3, 0xea, 0xcc, 0xfd, 0xe6, 0x50, 0xe7,
-	0x88, 0x1d, 0x6d, 0x77, 0x8d, 0x0e, 0x4b, 0x06, 0xea, 0x51, 0xe3, 0x0d, 0xf5, 0xe1, 0xb9, 0x1f,
-	0x50, 0x82, 0xce, 0xd2, 0x29, 0x85, 0x9f, 0x29, 0x5e, 0xfb, 0x27, 0x00, 0x00, 0xff, 0xff, 0xb7,
-	0x80, 0xf6, 0x45, 0x6f, 0x11, 0x00, 0x00,
+	// 1156 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x58, 0x4d, 0x6f, 0xe3, 0x44,
+	0x18, 0xae, 0x93, 0x34, 0x55, 0xa7, 0xf4, 0x23, 0x6e, 0x69, 0xd3, 0xec, 0x12, 0x97, 0x11, 0x1f,
+	0x59, 0x50, 0xe2, 0xcd, 0x82, 0x00, 0x05, 0x09, 0xb6, 0x29, 0x5a, 0x29, 0x48, 0x11, 0x2b, 0xef,
+	0x4a, 0x48, 0xbb, 0x48, 0x91, 0x63, 0x4f, 0xdd, 0x51, 0x13, 0x8f, 0xf1, 0x38, 0xcd, 0xf6, 0x27,
+	0xf0, 0x71, 0x40, 0x2b, 0x71, 0x04, 0xc1, 0x0d, 0x71, 0x40, 0xfc, 0x05, 0x6e, 0x7b, 0xe0, 0xb0,
+	0x17, 0x24, 0xc4, 0xc1, 0xa0, 0xf6, 0xc0, 0x0d, 0x89, 0xfc, 0x02, 0x64, 0x8f, 0x3d, 0x76, 0x9d,
+	0x14, 0xea, 0xb4, 0x74, 0x0f, 0x7b, 0x69, 0xe3, 0x99, 0xf7, 0x7d, 0xe6, 0x99, 0xe7, 0x7d, 0xe6,
+	0x1d, 0x27, 0xe0, 0x65, 0x42, 0xfb, 0x84, 0x62, 0x2a, 0x6b, 0xc4, 0xd4, 0x90, 0xe9, 0xd8, 0xaa,
+	0x83, 0xf4, 0x6a, 0x0f, 0x7f, 0x3c, 0xc0, 0x3a, 0x76, 0x0e, 0x65, 0xe7, 0x41, 0xcd, 0xb2, 0x89,
+	0x43, 0xc4, 0x17, 0x83, 0xc0, 0x5a, 0x3c, 0x90, 0xc7, 0xd5, 0x0e, 0xea, 0x5d, 0xe4, 0xa8, 0xf5,
+	0xd2, 0x9a, 0x41, 0x0c, 0xe2, 0x67, 0xc8, 0xde, 0x27, 0x96, 0x5c, 0x2a, 0xa8, 0x7d, 0x6c, 0x12,
+	0xd9, 0xff, 0x1b, 0x0c, 0x49, 0x06, 0x21, 0x46, 0x0f, 0xc9, 0xfe, 0x53, 0x77, 0xb0, 0x2b, 0x3b,
+	0xb8, 0x8f, 0xa8, 0xa3, 0xf6, 0xad, 0x20, 0xa0, 0x9c, 0x0c, 0xd0, 0x07, 0xb6, 0xea, 0x60, 0x62,
+	0x86, 0xf3, 0x9a, 0xcf, 0x48, 0xee, 0xaa, 0x14, 0xc9, 0xc1, 0xf2, 0xb2, 0x46, 0x70, 0x30, 0x0f,
+	0xdd, 0x1c, 0x28, 0xb4, 0xa9, 0xb1, 0x63, 0x23, 0xd5, 0x41, 0xb7, 0x09, 0xc5, 0x5e, 0xae, 0xf8,
+	0x2a, 0x98, 0xb3, 0x08, 0xe9, 0x75, 0xb0, 0x5e, 0x14, 0xb6, 0x84, 0x4a, 0xae, 0x29, 0x8e, 0x5c,
+	0x69, 0xe9, 0x50, 0xed, 0xf7, 0x1a, 0x30, 0x98, 0x80, 0x4a, 0xde, 0xfb, 0xd4, 0xd2, 0xc5, 0x6b,
+	0x20, 0x4f, 0x91, 0xa9, 0x23, 0xbb, 0x98, 0xd9, 0x12, 0x2a, 0xf3, 0xcd, 0xc2, 0xc8, 0x95, 0x16,
+	0x59, 0x2c, 0x1b, 0x87, 0x4a, 0x10, 0x20, 0xbe, 0x0e, 0x40, 0x8f, 0x0c, 0x91, 0xdd, 0x71, 0xb0,
+	0xb6, 0x5f, 0xcc, 0x6e, 0x09, 0x95, 0x6c, 0xf3, 0xd9, 0x91, 0x2b, 0x15, 0x58, 0x78, 0x34, 0x07,
+	0x95, 0x79, 0xff, 0xe1, 0x2e, 0xd6, 0xf6, 0xbd, 0xac, 0x81, 0x65, 0x85, 0x59, 0xb9, 0x64, 0x56,
+	0x34, 0x07, 0x95, 0x79, 0xff, 0xc1, 0xcf, 0x72, 0xc0, 0xb2, 0x43, 0xf6, 0x91, 0x49, 0x3b, 0x96,
+	0x4d, 0x0e, 0xb0, 0x8e, 0xf4, 0xe2, 0xec, 0x56, 0xb6, 0xb2, 0x70, 0x63, 0xb3, 0xc6, 0x34, 0xa9,
+	0x79, 0x9a, 0x84, 0x25, 0xa9, 0xed, 0x10, 0x6c, 0x36, 0xaf, 0x3f, 0x72, 0xa5, 0x99, 0xef, 0x7f,
+	0x97, 0x2a, 0x06, 0x76, 0xf6, 0x06, 0xdd, 0x9a, 0x46, 0xfa, 0x72, 0x20, 0x20, 0xfb, 0x57, 0xa5,
+	0xfa, 0xbe, 0xec, 0x1c, 0x5a, 0x88, 0xfa, 0x09, 0x54, 0x59, 0x62, 0x6b, 0xdc, 0x0e, 0x96, 0x10,
+	0x0f, 0x40, 0xc1, 0x1f, 0xe9, 0xf4, 0xb1, 0xd9, 0x51, 0xfb, 0x64, 0x60, 0x3a, 0xd7, 0x8b, 0x79,
+	0x5f, 0x97, 0xf7, 0x3d, 0xf0, 0xdf, 0x5c, 0xe9, 0xa5, 0x33, 0x80, 0xb7, 0x4c, 0x67, 0xe4, 0x4a,
+	0x45, 0xb6, 0xc1, 0x31, 0x40, 0xa8, 0xb0, 0xad, 0xb5, 0xb1, 0xb9, 0xcd, 0x46, 0x26, 0xad, 0x5b,
+	0x2f, 0xce, 0x5d, 0xec, 0xba, 0xf5, 0xb1, 0x75, 0xeb, 0x0d, 0xe9, 0xd3, 0x3f, 0x7f, 0x7c, 0xa5,
+	0xc4, 0x8f, 0x47, 0xaf, 0xaa, 0xf9, 0x4e, 0xaa, 0x5a, 0x81, 0x95, 0xe0, 0xdf, 0x59, 0xb0, 0x39,
+	0x66, 0x30, 0x05, 0x51, 0x8b, 0x98, 0x14, 0x89, 0x6f, 0x82, 0x85, 0x30, 0x32, 0x32, 0xdb, 0xfa,
+	0xc8, 0x95, 0xc4, 0xd0, 0x6c, 0x7c, 0x12, 0x2a, 0x20, 0x7c, 0x6a, 0xe9, 0xe2, 0x3d, 0x30, 0x17,
+	0xaa, 0xcb, 0x5c, 0x77, 0x33, 0xf5, 0x2e, 0x03, 0x3f, 0x73, 0x4d, 0x43, 0xc0, 0x08, 0xbb, 0xee,
+	0x5b, 0xf4, 0xdc, 0xd8, 0x75, 0x8e, 0x5d, 0x17, 0x87, 0xa0, 0xc0, 0xdb, 0x41, 0x87, 0x69, 0xe5,
+	0xf9, 0x32, 0x6d, 0x9d, 0xde, 0x43, 0x5a, 0x54, 0xa7, 0x31, 0x40, 0xa8, 0xac, 0xf0, 0x31, 0x26,
+	0xbc, 0x9e, 0x38, 0x7a, 0xf9, 0xa9, 0x8e, 0xde, 0xdc, 0xd9, 0x8e, 0x1e, 0xfc, 0x29, 0x07, 0x56,
+	0xda, 0xd4, 0xd8, 0xd6, 0xf5, 0xbb, 0x84, 0xf7, 0x94, 0xa9, 0x4b, 0x9d, 0xa2, 0xbf, 0xdc, 0x8f,
+	0x5c, 0xc1, 0x2a, 0xb7, 0x9d, 0xba, 0x72, 0xcb, 0xf1, 0xca, 0x75, 0xe2, 0xb6, 0xb8, 0x1f, 0xd9,
+	0x22, 0x77, 0x21, 0xe0, 0x71, 0x5f, 0x4c, 0xec, 0x1b, 0xb3, 0x4f, 0xa8, 0x6f, 0xe4, 0x9f, 0x40,
+	0xdf, 0x50, 0x75, 0xbd, 0xea, 0x90, 0xa8, 0x6f, 0x7c, 0x96, 0x01, 0xc5, 0xa4, 0x87, 0x9e, 0xda,
+	0xb6, 0x01, 0x1f, 0x66, 0xc0, 0x6a, 0x9b, 0x1a, 0x1f, 0x62, 0x67, 0x4f, 0xb7, 0xd5, 0xe1, 0xa5,
+	0x1e, 0x2a, 0x07, 0x44, 0xdd, 0x24, 0xa8, 0x68, 0xb0, 0xc1, 0x56, 0xea, 0x8e, 0xb5, 0x91, 0xec,
+	0x58, 0x0c, 0x0f, 0x2a, 0xcb, 0x7c, 0x88, 0x39, 0xa4, 0xf1, 0xbc, 0x67, 0x90, 0xab, 0x31, 0x83,
+	0x0c, 0x83, 0xbd, 0x47, 0x16, 0xf9, 0x45, 0x00, 0x57, 0x26, 0x88, 0xc2, 0x5d, 0x12, 0x2b, 0xb6,
+	0xf0, 0x3f, 0x16, 0x3b, 0x73, 0xd1, 0xc5, 0xfe, 0x46, 0x00, 0x1b, 0xde, 0x95, 0x49, 0x7a, 0x3d,
+	0xa4, 0x39, 0x77, 0x2c, 0x1b, 0xa9, 0xba, 0x82, 0x86, 0xaa, 0xad, 0x53, 0xb1, 0x01, 0x9e, 0x89,
+	0xd5, 0x94, 0x16, 0x85, 0xad, 0x6c, 0x25, 0xd7, 0xdc, 0x18, 0xb9, 0xd2, 0xea, 0x58, 0xc5, 0x29,
+	0x54, 0x16, 0xa2, 0x92, 0xd3, 0x14, 0x35, 0x6f, 0x94, 0x3d, 0xf5, 0x37, 0xe3, 0xd7, 0x3a, 0xe9,
+	0x55, 0xa9, 0x55, 0xb5, 0x19, 0x0d, 0xf8, 0xb3, 0x00, 0xa4, 0x53, 0x28, 0x72, 0xf9, 0xbf, 0x13,
+	0x40, 0x51, 0x63, 0x01, 0x48, 0xef, 0x50, 0x3f, 0xa6, 0x13, 0x00, 0xf8, 0xbc, 0xff, 0xf5, 0x55,
+	0xec, 0x8e, 0xa7, 0xe7, 0xc8, 0x95, 0x24, 0x46, 0xf0, 0x34, 0x20, 0x98, 0xea, 0x6d, 0x6d, 0x9d,
+	0xc3, 0x9c, 0xa0, 0x0c, 0xbf, 0x15, 0xc0, 0x5a, 0xb4, 0x9d, 0x96, 0xff, 0xea, 0x8e, 0x0f, 0xd0,
+	0xa5, 0xc9, 0x0d, 0x3d, 0xb9, 0x9f, 0x3b, 0x29, 0xb7, 0xc7, 0xa4, 0x8a, 0x39, 0x15, 0xe8, 0x66,
+	0xc0, 0xd5, 0x49, 0x1c, 0xb9, 0xde, 0x5f, 0x09, 0x60, 0x2d, 0x92, 0x29, 0xca, 0xfc, 0x6f, 0xad,
+	0x3f, 0x08, 0xb4, 0xbe, 0x92, 0xd4, 0x3a, 0xb6, 0x7c, 0x2a, 0x9d, 0x57, 0x39, 0x44, 0x4c, 0x4b,
+	0x8f, 0xdf, 0x2e, 0xb1, 0x77, 0x11, 0x4e, 0xf0, 0xcb, 0xa4, 0xe4, 0x37, 0x09, 0x24, 0x25, 0x3f,
+	0x0e, 0x11, 0xf1, 0x83, 0x3f, 0x08, 0xa0, 0xd4, 0xa6, 0xc6, 0xad, 0x81, 0x69, 0xe0, 0xdd, 0xc3,
+	0x9d, 0x3d, 0xd5, 0x36, 0x90, 0x1e, 0x36, 0x95, 0x4b, 0xb3, 0xc2, 0x35, 0xcf, 0x0a, 0x2f, 0xc4,
+	0xac, 0xb0, 0xcb, 0xf8, 0x54, 0x35, 0x46, 0x88, 0xb7, 0x3f, 0x0a, 0xf7, 0x00, 0x3c, 0x9d, 0x2f,
+	0xb7, 0x45, 0x13, 0x2c, 0x9b, 0x68, 0xd8, 0x19, 0xbf, 0x26, 0x4a, 0x23, 0x57, 0x5a, 0x67, 0x24,
+	0x12, 0x01, 0x50, 0x59, 0x34, 0x11, 0xef, 0xa7, 0x2d, 0xfd, 0xc6, 0x5f, 0xb3, 0x20, 0xdb, 0xa6,
+	0x86, 0xf8, 0xb9, 0x00, 0x96, 0x12, 0x5f, 0x15, 0xdf, 0xaa, 0x9d, 0xe9, 0x2b, 0x6f, 0x6d, 0xec,
+	0x3b, 0x40, 0xe9, 0xe6, 0xb4, 0x99, 0x7c, 0x6b, 0x0f, 0x05, 0xb0, 0x32, 0x76, 0x25, 0x36, 0xce,
+	0x0e, 0x9b, 0xcc, 0x2d, 0x35, 0xa7, 0xcf, 0xe5, 0xa4, 0x3e, 0x11, 0xc0, 0x62, 0xe2, 0xcd, 0xf7,
+	0xec, 0xa8, 0x27, 0x12, 0x4b, 0xef, 0x4e, 0x99, 0xc8, 0xb9, 0x7c, 0x2d, 0x80, 0xb5, 0x89, 0xd7,
+	0xc8, 0x3b, 0x29, 0xb4, 0x9f, 0x90, 0x5f, 0xba, 0x75, 0xbe, 0x7c, 0x4e, 0xf0, 0x4b, 0x01, 0x14,
+	0xc6, 0xbb, 0xee, 0xdb, 0xa9, 0xd1, 0xa3, 0xe4, 0xd2, 0xce, 0x39, 0x92, 0x43, 0x5e, 0xcd, 0x8f,
+	0x1e, 0x1d, 0x95, 0x85, 0xc7, 0x47, 0x65, 0xe1, 0x8f, 0xa3, 0xb2, 0xf0, 0xc5, 0x71, 0x79, 0xe6,
+	0xf1, 0x71, 0x79, 0xe6, 0xd7, 0xe3, 0xf2, 0xcc, 0xbd, 0x66, 0xac, 0xc9, 0x04, 0x0b, 0x55, 0x7b,
+	0x6a, 0x97, 0x86, 0x0f, 0xf2, 0x41, 0xfd, 0x0d, 0xf9, 0xc1, 0xa9, 0x3f, 0x14, 0x79, 0x4d, 0xa8,
+	0x9b, 0xf7, 0x7f, 0x7b, 0x79, 0xed, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x0e, 0x3c, 0x64, 0xbe,
+	0x57, 0x12, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/x/lockup/types/codec.go b/x/lockup/types/codec.go
index d15b1353f24..9429804a028 100644
--- a/x/lockup/types/codec.go
+++ b/x/lockup/types/codec.go
@@ -12,6 +12,9 @@ func RegisterCodec(cdc *codec.LegacyAmino) {
 	cdc.RegisterConcrete(&MsgLockTokens{}, "osmosis/lockup/lock-tokens", nil)
 	cdc.RegisterConcrete(&MsgBeginUnlockingAll{}, "osmosis/lockup/begin-unlock-tokens", nil)
 	cdc.RegisterConcrete(&MsgBeginUnlocking{}, "osmosis/lockup/begin-unlock-period-lock", nil)
+	cdc.RegisterConcrete(&MsgExtendLockup{}, "osmosis/lockup/extend-lockup", nil)
+	cdc.RegisterConcrete(&MsgForceUnlock{}, "osmosis/lockup/force-unlock-tokens", nil)
+	cdc.RegisterConcrete(&MsgSetRewardReceiverAddress{}, "osmosis/lockup/set-reward-receiver-address", nil)
 }
 
 func RegisterInterfaces(registry cdctypes.InterfaceRegistry) {
@@ -20,6 +23,9 @@ func RegisterInterfaces(registry cdctypes.InterfaceRegistry) {
 		&MsgLockTokens{},
 		&MsgBeginUnlockingAll{},
 		&MsgBeginUnlocking{},
+		&MsgExtendLockup{},
+		&MsgForceUnlock{},
+		&MsgSetRewardReceiverAddress{},
 	)
 	msgservice.RegisterMsgServiceDesc(registry, &_Msg_serviceDesc)
 }
diff --git a/x/lockup/types/tx.pb.go b/x/lockup/types/tx.pb.go
index 173bd097646..b76b81abd9a 100644
--- a/x/lockup/types/tx.pb.go
+++ b/x/lockup/types/tx.pb.go
@@ -677,57 +677,59 @@ func init() {
 func init() { proto.RegisterFile("osmosis/lockup/tx.proto", fileDescriptor_bcdad5af0d24735f) }
 
 var fileDescriptor_bcdad5af0d24735f = []byte{
-	// 791 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x56, 0x4d, 0x6f, 0xd3, 0x48,
-	0x18, 0x8e, 0x93, 0x7e, 0xbe, 0xed, 0x26, 0x5b, 0xab, 0xdb, 0xa6, 0xde, 0x5d, 0xbb, 0xeb, 0xdd,
-	0x6d, 0xb2, 0xbb, 0x8d, 0xbd, 0x49, 0x11, 0x87, 0x5e, 0x50, 0xd3, 0x82, 0x54, 0xa9, 0x91, 0x90,
-	0x69, 0x25, 0xc4, 0x81, 0xca, 0x71, 0x86, 0xa9, 0x95, 0xc4, 0x13, 0x79, 0xec, 0x7e, 0x48, 0xfc,
-	0x02, 0x4e, 0x1c, 0x39, 0x23, 0x71, 0x81, 0x0b, 0x12, 0x7f, 0xa2, 0xc7, 0x72, 0xe3, 0x80, 0x52,
-	0xd4, 0x1e, 0x90, 0x38, 0xf6, 0x17, 0x20, 0x8f, 0x3f, 0xe4, 0x7c, 0x34, 0x09, 0x48, 0x20, 0x2e,
-	0xb5, 0x67, 0xde, 0xe7, 0x7d, 0xe6, 0x79, 0x1e, 0xcf, 0x4c, 0x03, 0x8b, 0x84, 0x36, 0x09, 0x35,
-	0xa9, 0xda, 0x20, 0x46, 0xdd, 0x6d, 0xa9, 0xce, 0xb1, 0xd2, 0xb2, 0x89, 0x43, 0xf8, 0x74, 0x50,
-	0x50, 0xfc, 0x82, 0x30, 0x8f, 0x09, 0x26, 0xac, 0xa4, 0x7a, 0x6f, 0x3e, 0x4a, 0x98, 0xd3, 0x9b,
-	0xa6, 0x45, 0x54, 0xf6, 0x37, 0x98, 0x12, 0x31, 0x21, 0xb8, 0x81, 0x54, 0x36, 0xaa, 0xba, 0x8f,
-	0xd4, 0x9a, 0x6b, 0xeb, 0x8e, 0x49, 0xac, 0xb0, 0x6e, 0x30, 0x66, 0xb5, 0xaa, 0x53, 0xa4, 0x1e,
-	0x16, 0xab, 0xc8, 0xd1, 0x8b, 0xaa, 0x41, 0xcc, 0xb0, 0xbe, 0xd4, 0xa5, 0xc8, 0x7b, 0xf8, 0x25,
-	0xf9, 0x45, 0x12, 0x7e, 0xaa, 0x50, 0xbc, 0x43, 0x8c, 0xfa, 0x2e, 0xa9, 0x23, 0x8b, 0xf2, 0x2b,
-	0x30, 0x4e, 0x8e, 0x2c, 0x64, 0x67, 0xb9, 0x65, 0x2e, 0x3f, 0x5d, 0xfe, 0xf9, 0xaa, 0x2d, 0xcd,
-	0x9e, 0xe8, 0xcd, 0xc6, 0xba, 0xcc, 0xa6, 0x65, 0xcd, 0x2f, 0xf3, 0x07, 0x30, 0x15, 0xca, 0xc8,
-	0x26, 0x97, 0xb9, 0xfc, 0x4c, 0x69, 0x49, 0xf1, 0x75, 0x2a, 0xa1, 0x4e, 0x65, 0x2b, 0x00, 0x94,
-	0x8b, 0xa7, 0x6d, 0x29, 0xf1, 0xa9, 0x2d, 0xf1, 0x61, 0xcb, 0x2a, 0x69, 0x9a, 0x0e, 0x6a, 0xb6,
-	0x9c, 0x93, 0xab, 0xb6, 0x94, 0xf1, 0xf9, 0xc3, 0x9a, 0xfc, 0xec, 0x5c, 0xe2, 0xb4, 0x88, 0x9d,
-	0xd7, 0x61, 0xdc, 0x33, 0x43, 0xb3, 0xa9, 0xe5, 0x14, 0x5b, 0xc6, 0xb7, 0xab, 0x78, 0x76, 0x95,
-	0xc0, 0xae, 0xb2, 0x49, 0x4c, 0xab, 0xfc, 0xbf, 0xb7, 0xcc, 0xcb, 0x73, 0x29, 0x8f, 0x4d, 0xe7,
-	0xc0, 0xad, 0x2a, 0x06, 0x69, 0xaa, 0x41, 0x36, 0xfe, 0xa3, 0x40, 0x6b, 0x75, 0xd5, 0x39, 0x69,
-	0x21, 0xca, 0x1a, 0xa8, 0xe6, 0x33, 0xaf, 0x4b, 0x4f, 0x3e, 0xbe, 0xfe, 0x57, 0xe8, 0x13, 0x53,
-	0xc1, 0x61, 0xa9, 0xc8, 0x39, 0xf8, 0xa5, 0x23, 0x26, 0x0d, 0xd1, 0x16, 0xb1, 0x28, 0xe2, 0xd3,
-	0x90, 0xdc, 0xde, 0x62, 0x59, 0x8d, 0x69, 0xc9, 0xed, 0x2d, 0x19, 0xc3, 0x7c, 0x85, 0xe2, 0x32,
-	0xc2, 0xa6, 0xb5, 0x67, 0x79, 0x0c, 0xa6, 0x85, 0x37, 0x1a, 0x8d, 0x51, 0x63, 0x5d, 0xcf, 0x79,
-	0x4a, 0xe4, 0x2e, 0x25, 0x55, 0x8f, 0xae, 0xe0, 0x5a, 0x71, 0x45, 0xbb, 0xf0, 0x5b, 0xbf, 0x85,
-	0x22, 0x61, 0x37, 0x60, 0xd2, 0x6f, 0xa0, 0x59, 0x8e, 0xe5, 0x26, 0x28, 0x9d, 0xfb, 0x4f, 0xb9,
-	0x8b, 0x6c, 0x93, 0xd4, 0x3c, 0x4f, 0x5a, 0x08, 0x95, 0xdf, 0x73, 0x30, 0xd7, 0x43, 0x3b, 0xf2,
-	0x9e, 0xf0, 0xc3, 0x48, 0x86, 0x61, 0x7c, 0x8f, 0x2f, 0xb7, 0xea, 0xe5, 0x95, 0x1b, 0x94, 0x57,
-	0x8b, 0xd9, 0x2c, 0x78, 0xef, 0xf2, 0x3e, 0x2c, 0xf5, 0xb8, 0x8b, 0x12, 0xcb, 0xc2, 0x24, 0x75,
-	0x0d, 0x03, 0x51, 0xca, 0x7c, 0x4e, 0x69, 0xe1, 0x90, 0xcf, 0x43, 0xc6, 0x0d, 0xe1, 0x5e, 0x5e,
-	0x91, 0xc9, 0xee, 0x69, 0xf9, 0x0d, 0x07, 0x99, 0x0a, 0xc5, 0xb7, 0x8f, 0x1d, 0x64, 0xb1, 0x68,
-	0xdd, 0xd6, 0x57, 0xa7, 0x17, 0x3f, 0x61, 0xa9, 0x6f, 0x79, 0xc2, 0xe4, 0x35, 0x58, 0xec, 0x12,
-	0x3d, 0x3c, 0x14, 0xf9, 0x15, 0x07, 0xe9, 0x0a, 0xc5, 0x77, 0x88, 0x6d, 0x20, 0x3f, 0xcc, 0x1f,
-	0x78, 0x9f, 0xc8, 0x25, 0x58, 0xe8, 0x14, 0x3b, 0x82, 0xc3, 0xe7, 0x1c, 0xfc, 0x5a, 0xa1, 0xf8,
-	0x1e, 0x72, 0x34, 0x74, 0xa4, 0xdb, 0x35, 0x0d, 0x19, 0xc8, 0x3c, 0x44, 0xf6, 0x46, 0xad, 0x66,
-	0x7b, 0xdb, 0x62, 0x54, 0xbb, 0x0b, 0x30, 0xd1, 0x88, 0xef, 0x9a, 0x60, 0xc4, 0x6f, 0x42, 0xc6,
-	0x66, 0xc4, 0xfb, 0x76, 0xc0, 0xcc, 0xbe, 0xf3, 0x74, 0x59, 0xb8, 0x6a, 0x4b, 0x0b, 0x3e, 0x53,
-	0x17, 0x40, 0xd6, 0xd2, 0x76, 0x87, 0x16, 0xf9, 0x16, 0xfc, 0x39, 0x40, 0xe3, 0x70, 0x97, 0xa5,
-	0xb7, 0x63, 0x90, 0xaa, 0x50, 0xcc, 0x6b, 0x00, 0xb1, 0x7f, 0x03, 0xbf, 0x77, 0xdf, 0x16, 0x1d,
-	0xd7, 0x9f, 0xf0, 0xf7, 0xc0, 0x72, 0xb4, 0x2a, 0x86, 0xb9, 0xde, 0xab, 0xf0, 0xaf, 0x3e, 0xbd,
-	0x3d, 0x28, 0x61, 0x75, 0x14, 0x54, 0xb4, 0xd0, 0x43, 0x48, 0x77, 0xdd, 0x59, 0x7f, 0x0c, 0xed,
-	0x17, 0xfe, 0x19, 0x0a, 0x89, 0xf8, 0xef, 0xc3, 0x6c, 0xc7, 0x99, 0x96, 0xfa, 0xb4, 0xc6, 0x01,
-	0x42, 0x6e, 0x08, 0x20, 0x62, 0xde, 0x83, 0x99, 0xf8, 0x11, 0x12, 0xfb, 0xf4, 0xc5, 0xea, 0xc2,
-	0xca, 0xe0, 0x7a, 0x44, 0xfb, 0x18, 0xb2, 0xd7, 0xee, 0xdb, 0xff, 0xfa, 0x70, 0x5c, 0x07, 0x16,
-	0xd6, 0xbe, 0x00, 0x1c, 0xae, 0x5e, 0xde, 0x39, 0xbd, 0x10, 0xb9, 0xb3, 0x0b, 0x91, 0xfb, 0x70,
-	0x21, 0x72, 0x4f, 0x2f, 0xc5, 0xc4, 0xd9, 0xa5, 0x98, 0x78, 0x77, 0x29, 0x26, 0x1e, 0x94, 0x62,
-	0x07, 0x37, 0x20, 0x2e, 0x34, 0xf4, 0x2a, 0x0d, 0x07, 0xea, 0x61, 0xf1, 0xa6, 0x7a, 0x1c, 0xfd,
-	0x76, 0xf2, 0x0e, 0x72, 0x75, 0x82, 0x5d, 0x77, 0x6b, 0x9f, 0x03, 0x00, 0x00, 0xff, 0xff, 0xa0,
-	0x14, 0xce, 0x00, 0x5a, 0x09, 0x00, 0x00,
+	// 828 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x56, 0x4d, 0x4f, 0xe3, 0x46,
+	0x18, 0x8e, 0x13, 0x3e, 0x07, 0x9a, 0x14, 0x8b, 0x42, 0x70, 0xa9, 0x0d, 0x6e, 0x4b, 0x52, 0x8a,
+	0xed, 0x26, 0x54, 0x3d, 0xe4, 0x52, 0x11, 0x68, 0x25, 0x24, 0x22, 0x55, 0x2e, 0x48, 0x55, 0x0f,
+	0x45, 0x8e, 0x33, 0x18, 0x2b, 0x89, 0x27, 0xf2, 0xd8, 0x7c, 0x48, 0xfd, 0x05, 0x3d, 0xf5, 0xd8,
+	0x3f, 0xd0, 0xcb, 0x9e, 0xf6, 0x67, 0x70, 0x64, 0xb5, 0xab, 0xd5, 0x1e, 0x56, 0x61, 0x05, 0x87,
+	0x95, 0xf6, 0xc8, 0x2f, 0x58, 0xcd, 0x8c, 0x6d, 0x39, 0x4e, 0x48, 0xb2, 0x2b, 0xed, 0x6a, 0x2f,
+	0xb1, 0x67, 0xde, 0xe7, 0x7d, 0xe6, 0x7d, 0x9e, 0xbc, 0xf3, 0x26, 0x60, 0x19, 0xe1, 0x36, 0xc2,
+	0x36, 0xd6, 0x5a, 0xc8, 0x6c, 0xfa, 0x1d, 0xcd, 0xbb, 0x50, 0x3b, 0x2e, 0xf2, 0x10, 0x9f, 0x0d,
+	0x02, 0x2a, 0x0b, 0x08, 0x8b, 0x16, 0xb2, 0x10, 0x0d, 0x69, 0xe4, 0x8d, 0xa1, 0x84, 0x05, 0xa3,
+	0x6d, 0x3b, 0x48, 0xa3, 0x9f, 0xc1, 0x96, 0x68, 0x21, 0x64, 0xb5, 0xa0, 0x46, 0x57, 0x75, 0xff,
+	0x44, 0x6b, 0xf8, 0xae, 0xe1, 0xd9, 0xc8, 0x09, 0xe3, 0x26, 0x65, 0xd6, 0xea, 0x06, 0x86, 0xda,
+	0x59, 0xa9, 0x0e, 0x3d, 0xa3, 0xa4, 0x99, 0xc8, 0x0e, 0xe3, 0x2b, 0x89, 0x8a, 0xc8, 0x83, 0x85,
+	0xe4, 0xff, 0xd3, 0xe0, 0xb3, 0x1a, 0xb6, 0x0e, 0x90, 0xd9, 0x3c, 0x44, 0x4d, 0xe8, 0x60, 0x7e,
+	0x03, 0x4c, 0xa2, 0x73, 0x07, 0xba, 0x79, 0x6e, 0x8d, 0x2b, 0xce, 0x56, 0x3f, 0xbf, 0xef, 0x4a,
+	0xf3, 0x97, 0x46, 0xbb, 0x55, 0x91, 0xe9, 0xb6, 0xac, 0xb3, 0x30, 0x7f, 0x0a, 0x66, 0xc2, 0x32,
+	0xf2, 0xe9, 0x35, 0xae, 0x38, 0x57, 0x5e, 0x51, 0x59, 0x9d, 0x6a, 0x58, 0xa7, 0xba, 0x17, 0x00,
+	0xaa, 0xa5, 0xab, 0xae, 0x94, 0x7a, 0xd3, 0x95, 0xf8, 0x30, 0x65, 0x0b, 0xb5, 0x6d, 0x0f, 0xb6,
+	0x3b, 0xde, 0xe5, 0x7d, 0x57, 0xca, 0x31, 0xfe, 0x30, 0x26, 0xff, 0x77, 0x23, 0x71, 0x7a, 0xc4,
+	0xce, 0x1b, 0x60, 0x92, 0x88, 0xc1, 0xf9, 0xcc, 0x5a, 0x86, 0x1e, 0xc3, 0xe4, 0xaa, 0x44, 0xae,
+	0x1a, 0xc8, 0x55, 0x77, 0x91, 0xed, 0x54, 0x7f, 0x20, 0xc7, 0x3c, 0xba, 0x91, 0x8a, 0x96, 0xed,
+	0x9d, 0xfa, 0x75, 0xd5, 0x44, 0x6d, 0x2d, 0xf0, 0x86, 0x3d, 0x14, 0xdc, 0x68, 0x6a, 0xde, 0x65,
+	0x07, 0x62, 0x9a, 0x80, 0x75, 0xc6, 0x5c, 0x91, 0xfe, 0x79, 0xfd, 0x78, 0x53, 0x18, 0x60, 0x93,
+	0xe2, 0x51, 0x57, 0xe4, 0x02, 0xf8, 0xa2, 0xc7, 0x26, 0x1d, 0xe2, 0x0e, 0x72, 0x30, 0xe4, 0xb3,
+	0x20, 0xbd, 0xbf, 0x47, 0xbd, 0x9a, 0xd0, 0xd3, 0xfb, 0x7b, 0xb2, 0x05, 0x16, 0x6b, 0xd8, 0xaa,
+	0x42, 0xcb, 0x76, 0x8e, 0x1c, 0xc2, 0x60, 0x3b, 0xd6, 0x4e, 0xab, 0x35, 0xae, 0xad, 0x95, 0x02,
+	0xa9, 0x44, 0x4e, 0x54, 0x52, 0x27, 0x74, 0x8a, 0xef, 0xc4, 0x2b, 0x3a, 0x04, 0xab, 0x83, 0x0e,
+	0x8a, 0x0a, 0xfb, 0x11, 0x4c, 0xb3, 0x04, 0x9c, 0xe7, 0xa8, 0x6f, 0x82, 0xda, 0xdb, 0x7f, 0xea,
+	0x6f, 0xd0, 0xb5, 0x51, 0x83, 0x68, 0xd2, 0x43, 0xa8, 0xfc, 0x92, 0x03, 0x0b, 0x7d, 0xb4, 0x63,
+	0xf7, 0x04, 0x33, 0x23, 0x1d, 0x9a, 0xf1, 0x31, 0xbe, 0xb9, 0x2d, 0xe2, 0x57, 0x61, 0x98, 0x5f,
+	0x1d, 0x2a, 0x53, 0x21, 0xef, 0xf2, 0x31, 0x58, 0xe9, 0x53, 0x17, 0x39, 0x96, 0x07, 0xd3, 0xd8,
+	0x37, 0x4d, 0x88, 0x31, 0xd5, 0x39, 0xa3, 0x87, 0x4b, 0xbe, 0x08, 0x72, 0x7e, 0x08, 0x27, 0x7e,
+	0x45, 0x22, 0x93, 0xdb, 0xf2, 0x73, 0x0e, 0xe4, 0x6a, 0xd8, 0xfa, 0xe5, 0xc2, 0x83, 0x0e, 0xb5,
+	0xd6, 0xef, 0xbc, 0xb7, 0x7b, 0xf1, 0x1b, 0x96, 0xf9, 0x90, 0x37, 0xac, 0xb2, 0x4e, 0x4c, 0x5c,
+	0x4d, 0x98, 0x08, 0xa9, 0x06, 0x85, 0xad, 0xe4, 0x6d, 0xb0, 0x9c, 0xd0, 0x35, 0xda, 0x37, 0xf9,
+	0x19, 0x07, 0xb2, 0x35, 0x6c, 0xfd, 0x8a, 0x5c, 0x13, 0x32, 0xbf, 0x3f, 0xe5, 0x56, 0x1a, 0x78,
+	0xf5, 0x4e, 0x48, 0xed, 0x89, 0xab, 0x57, 0x06, 0x4b, 0xbd, 0xaa, 0xc6, 0xb0, 0xe2, 0x29, 0x07,
+	0xbe, 0xac, 0x61, 0xeb, 0x77, 0xe8, 0xe9, 0xf0, 0xdc, 0x70, 0x1b, 0x3a, 0x34, 0xa1, 0x7d, 0x06,
+	0xdd, 0x9d, 0x46, 0xc3, 0x25, 0x2d, 0x36, 0xae, 0x2f, 0x4b, 0x60, 0xaa, 0x15, 0xef, 0xc0, 0x60,
+	0xc5, 0xef, 0x82, 0x9c, 0x4b, 0x89, 0x8f, 0xdd, 0x80, 0x99, 0xf6, 0xcc, 0x6c, 0x55, 0xb8, 0xef,
+	0x4a, 0x4b, 0x8c, 0x29, 0x01, 0x90, 0xf5, 0xac, 0xdb, 0x53, 0x4b, 0x45, 0x23, 0x0e, 0x6c, 0x26,
+	0x1c, 0xc0, 0xd0, 0x53, 0x18, 0x4e, 0x09, 0x33, 0x15, 0x83, 0x55, 0x2d, 0xff, 0x0c, 0xbe, 0x1e,
+	0x22, 0x6a, 0xb4, 0x2d, 0xe5, 0x27, 0x13, 0x20, 0x53, 0xc3, 0x16, 0xaf, 0x03, 0x10, 0xfb, 0x0d,
+	0xfa, 0x2a, 0x39, 0xaa, 0x7a, 0x66, 0xaf, 0xf0, 0xed, 0xd0, 0x70, 0x74, 0xaa, 0x05, 0x16, 0xfa,
+	0xe7, 0xf0, 0x37, 0x03, 0x72, 0xfb, 0x50, 0xc2, 0xd6, 0x38, 0xa8, 0xe8, 0xa0, 0xbf, 0x40, 0x36,
+	0x31, 0x30, 0xd7, 0x47, 0xe6, 0x0b, 0xdf, 0x8d, 0x84, 0x44, 0xfc, 0x7f, 0x80, 0xf9, 0x9e, 0x81,
+	0x22, 0x0d, 0x48, 0x8d, 0x03, 0x84, 0xc2, 0x08, 0x40, 0xc4, 0x7c, 0x04, 0xe6, 0xe2, 0x97, 0x53,
+	0x1c, 0x90, 0x17, 0x8b, 0x0b, 0x1b, 0xc3, 0xe3, 0x11, 0xed, 0xdf, 0x20, 0xff, 0x60, 0xa3, 0x7f,
+	0x3f, 0x80, 0xe3, 0x21, 0xb0, 0xb0, 0xfd, 0x0e, 0xe0, 0xf0, 0xf4, 0xea, 0xc1, 0xd5, 0xad, 0xc8,
+	0x5d, 0xdf, 0x8a, 0xdc, 0xab, 0x5b, 0x91, 0xfb, 0xf7, 0x4e, 0x4c, 0x5d, 0xdf, 0x89, 0xa9, 0x17,
+	0x77, 0x62, 0xea, 0xcf, 0x72, 0x6c, 0x24, 0x04, 0xc4, 0x4a, 0xcb, 0xa8, 0xe3, 0x70, 0xa1, 0x9d,
+	0x95, 0x7e, 0xd2, 0x2e, 0xa2, 0x3f, 0x6e, 0x64, 0x44, 0xd4, 0xa7, 0xe8, 0xac, 0xdd, 0x7e, 0x1b,
+	0x00, 0x00, 0xff, 0xff, 0xcb, 0xe5, 0x5b, 0x64, 0xd7, 0x09, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/x/poolmanager/types/tx.pb.go b/x/poolmanager/types/tx.pb.go
index 2b7f074682a..7be2a949c7a 100644
--- a/x/poolmanager/types/tx.pb.go
+++ b/x/poolmanager/types/tx.pb.go
@@ -8,6 +8,7 @@ import (
 	fmt "fmt"
 	github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types"
 	types "github.com/cosmos/cosmos-sdk/types"
+	_ "github.com/cosmos/cosmos-sdk/types/tx/amino"
 	_ "github.com/gogo/protobuf/gogoproto"
 	grpc1 "github.com/gogo/protobuf/grpc"
 	proto "github.com/gogo/protobuf/proto"
@@ -446,55 +447,59 @@ func init() {
 }
 
 var fileDescriptor_acd130b4825d67dc = []byte{
-	// 753 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x56, 0xdf, 0x4e, 0xd3, 0x50,
-	0x1c, 0xde, 0x19, 0x0b, 0xc2, 0x41, 0xfe, 0x55, 0x90, 0x51, 0xb0, 0x25, 0x8d, 0x41, 0x4c, 0xa4,
-	0xcd, 0x86, 0xd1, 0x88, 0x26, 0xc6, 0x81, 0x89, 0x4b, 0x68, 0x26, 0xf5, 0xce, 0x9b, 0xa5, 0x1b,
-	0xcd, 0x6c, 0x58, 0xcf, 0x69, 0x76, 0x4e, 0x61, 0xc4, 0xc4, 0xc4, 0xc4, 0x07, 0xd0, 0x78, 0x69,
-	0x8c, 0x89, 0x4f, 0xc3, 0x25, 0x77, 0x1a, 0x2f, 0x2a, 0xc2, 0x1b, 0xec, 0x09, 0x4c, 0xdb, 0xd3,
-	0xb2, 0x95, 0x51, 0xa8, 0x24, 0x72, 0xd5, 0xf6, 0xf4, 0xf7, 0xe7, 0xfb, 0x7d, 0xdf, 0x77, 0x4e,
-	0x0b, 0x6f, 0x63, 0x62, 0x61, 0x62, 0x12, 0xc5, 0xc6, 0xb8, 0x69, 0xe9, 0x48, 0x6f, 0x18, 0x2d,
-	0x65, 0xa7, 0x50, 0x33, 0xa8, 0x5e, 0x50, 0x68, 0x5b, 0xb6, 0x5b, 0x98, 0x62, 0x6e, 0x8e, 0x45,
-	0xc9, 0x5d, 0x51, 0x32, 0x8b, 0xe2, 0xa7, 0x1a, 0xb8, 0x81, 0xfd, 0x38, 0xc5, 0xbb, 0x0b, 0x52,
-	0x78, 0xa1, 0xee, 0xe7, 0x28, 0x35, 0x9d, 0x18, 0x51, 0xc1, 0x3a, 0x36, 0x11, 0x7b, 0x7f, 0x2f,
-	0xa9, 0x31, 0xd9, 0xd5, 0xed, 0x6a, 0x0b, 0x3b, 0xd4, 0x08, 0xa2, 0x25, 0x37, 0x0b, 0xa7, 0x54,
-	0xd2, 0x78, 0xb5, 0xab, 0xdb, 0xcf, 0xdb, 0x7a, 0x9d, 0x3e, 0xb3, 0xb0, 0x83, 0x68, 0x19, 0x71,
-	0x77, 0xe1, 0x20, 0x31, 0xd0, 0x96, 0xd1, 0xca, 0x83, 0x05, 0xb0, 0x34, 0x5c, 0x9a, 0xec, 0xb8,
-	0xe2, 0xe8, 0x9e, 0x6e, 0x35, 0x57, 0xa5, 0x60, 0x5d, 0xd2, 0x58, 0x00, 0xb7, 0x01, 0x07, 0xfd,
-	0x92, 0x24, 0x9f, 0x5d, 0x18, 0x58, 0x1a, 0x29, 0xca, 0x72, 0xc2, 0x54, 0xb2, 0xd7, 0x2a, 0xec,
-	0xa2, 0x79, 0x69, 0xa5, 0xdc, 0xbe, 0x2b, 0x66, 0x34, 0x56, 0x83, 0x53, 0xe1, 0x10, 0xc5, 0xdb,
-	0x06, 0xaa, 0x9a, 0x28, 0x3f, 0xb0, 0x00, 0x96, 0x46, 0x8a, 0xb3, 0x72, 0x30, 0xb2, 0xec, 0x8d,
-	0x1c, 0xd5, 0x59, 0xc3, 0x26, 0x2a, 0xcd, 0x78, 0xa9, 0x1d, 0x57, 0x1c, 0x0f, 0x90, 0x85, 0x89,
-	0x92, 0x76, 0xcd, 0xbf, 0x2d, 0x23, 0xee, 0x1d, 0x9c, 0x0a, 0x56, 0xb1, 0x43, 0xab, 0x96, 0x89,
-	0xaa, 0xba, 0xdf, 0x3b, 0x9f, 0xf3, 0xa7, 0x52, 0xbd, 0xfc, 0x5f, 0xae, 0xb8, 0xd8, 0x30, 0xe9,
-	0x1b, 0xa7, 0x26, 0xd7, 0xb1, 0xa5, 0x30, 0x7e, 0x83, 0xcb, 0x32, 0xd9, 0xda, 0x56, 0xe8, 0x9e,
-	0x6d, 0x10, 0xb9, 0x8c, 0x68, 0xc7, 0x15, 0xe7, 0xba, 0x3b, 0xf5, 0xd6, 0x94, 0xb4, 0x49, 0x7f,
-	0xb9, 0xe2, 0x50, 0xd5, 0x44, 0xc1, 0x8c, 0xd2, 0x67, 0x00, 0xe7, 0xfb, 0x11, 0xac, 0x19, 0xc4,
-	0xc6, 0x88, 0x18, 0x1c, 0x81, 0x13, 0x27, 0xc5, 0x18, 0xb8, 0x80, 0xf2, 0x72, 0x6a, 0x70, 0x33,
-	0x71, 0x70, 0x21, 0xb0, 0xb1, 0x10, 0x18, 0x43, 0xf5, 0x3b, 0x0b, 0x05, 0x0f, 0x95, 0xdd, 0x34,
-	0xa9, 0x2f, 0xc2, 0xa5, 0x0c, 0xb0, 0x19, 0x33, 0xc0, 0xca, 0x85, 0x0d, 0x70, 0x02, 0x20, 0xe6,
-	0x82, 0xa7, 0x70, 0x2c, 0x14, 0xb3, 0xba, 0x65, 0x20, 0x6c, 0xf9, 0x5e, 0x18, 0x2e, 0xcd, 0x76,
-	0x5c, 0x71, 0xba, 0x57, 0xec, 0xe0, 0xbd, 0xa4, 0x5d, 0x67, 0x92, 0xaf, 0x7b, 0x8f, 0x57, 0xae,
-	0xfb, 0x57, 0x00, 0x17, 0x93, 0x19, 0xbe, 0x5a, 0x07, 0x1c, 0x66, 0xe1, 0xf4, 0x69, 0x5f, 0x56,
-	0x1c, 0x9a, 0x46, 0x78, 0x35, 0x26, 0xbc, 0x72, 0x41, 0xe1, 0x2b, 0x4e, 0x5f, 0xd1, 0xdf, 0xc2,
-	0x1b, 0x91, 0xa8, 0x96, 0xde, 0x0e, 0xb9, 0x08, 0x94, 0xdf, 0x48, 0xcd, 0x05, 0x1f, 0xf3, 0xc9,
-	0x49, 0x49, 0x49, 0x9b, 0x60, 0x66, 0x51, 0xf5, 0x76, 0x00, 0x89, 0x7b, 0x09, 0x87, 0x23, 0xd6,
-	0x7c, 0x97, 0x24, 0x1e, 0x3c, 0x79, 0x76, 0xf0, 0x4c, 0xc4, 0xf8, 0x96, 0xb4, 0xa1, 0x90, 0x68,
-	0xe9, 0x13, 0x80, 0xb7, 0xfa, 0x52, 0x1c, 0x29, 0x6f, 0xc3, 0xf1, 0x08, 0x5d, 0x8f, 0xf0, 0x2f,
-	0x52, 0x0f, 0x7b, 0x33, 0x36, 0x6c, 0x38, 0xe8, 0x28, 0x1b, 0x94, 0xc9, 0xfe, 0x27, 0x0b, 0xc5,
-	0x24, 0x5b, 0xa6, 0x34, 0x80, 0x16, 0x33, 0xc0, 0xfd, 0x8b, 0x1b, 0xe0, 0xcc, 0xad, 0x5f, 0x0a,
-	0x49, 0xf1, 0xec, 0xdb, 0xbd, 0xf7, 0xf9, 0xf8, 0x98, 0x51, 0x40, 0x38, 0x66, 0xc5, 0xa1, 0xc1,
-	0xee, 0x3f, 0xc3, 0x49, 0xb9, 0xff, 0xe1, 0x24, 0xe9, 0x0b, 0x80, 0x77, 0xce, 0xe1, 0xf8, 0xea,
-	0x1c, 0x50, 0xfc, 0x91, 0x83, 0x03, 0x2a, 0x69, 0x70, 0xef, 0x01, 0x9c, 0x3c, 0x7d, 0xea, 0x17,
-	0x12, 0x05, 0xec, 0xf7, 0x21, 0xe3, 0x1f, 0xa5, 0x4e, 0x89, 0xa6, 0xff, 0x00, 0x20, 0xd7, 0xc7,
-	0x80, 0xc5, 0x94, 0x15, 0x2b, 0x0e, 0xe5, 0x57, 0xd3, 0xe7, 0x44, 0x30, 0xbe, 0x01, 0x38, 0x97,
-	0xf4, 0x29, 0x7c, 0x7c, 0x6e, 0xed, 0xb3, 0x93, 0xf9, 0xb5, 0x4b, 0x24, 0x47, 0x08, 0xbf, 0x03,
-	0x38, 0x9f, 0xb8, 0x67, 0x9f, 0xfc, 0x73, 0x17, 0x8f, 0xbc, 0xf5, 0xcb, 0x64, 0x87, 0x20, 0x4b,
-	0x9b, 0xfb, 0x47, 0x02, 0x38, 0x38, 0x12, 0xc0, 0xe1, 0x91, 0x00, 0x3e, 0x1e, 0x0b, 0x99, 0x83,
-	0x63, 0x21, 0xf3, 0xf3, 0x58, 0xc8, 0xbc, 0x7e, 0xd8, 0x65, 0x62, 0xd6, 0x69, 0xb9, 0xa9, 0xd7,
-	0x48, 0xf8, 0xa0, 0xec, 0x14, 0x1e, 0x28, 0xed, 0x9e, 0x3f, 0x56, 0xdf, 0xd9, 0xb5, 0x41, 0xff,
-	0x2f, 0x75, 0xe5, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x61, 0x95, 0x33, 0xba, 0x4e, 0x0b, 0x00,
-	0x00,
+	// 818 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x96, 0x5f, 0x6b, 0xd3, 0x5e,
+	0x18, 0xc7, 0x9b, 0x5f, 0xcb, 0x7e, 0xdb, 0x99, 0xfb, 0xd3, 0xb8, 0xb9, 0xae, 0x9b, 0xe9, 0x88,
+	0x63, 0x76, 0x62, 0x13, 0xda, 0x89, 0x62, 0x15, 0xc4, 0x6e, 0x82, 0x85, 0x95, 0xba, 0x78, 0xe7,
+	0x4d, 0x49, 0xbb, 0x50, 0xc3, 0x9a, 0x73, 0x42, 0xcf, 0xc9, 0xd6, 0x21, 0x08, 0x82, 0x37, 0x8a,
+	0xc2, 0xc4, 0x4b, 0x11, 0xc1, 0x57, 0xe0, 0xcb, 0xd8, 0xe5, 0xee, 0x14, 0x2f, 0x8a, 0x6c, 0x17,
+	0xde, 0xf7, 0x15, 0xc8, 0xc9, 0x49, 0xb2, 0x36, 0xeb, 0xb2, 0xc6, 0x81, 0xbb, 0xd9, 0x92, 0x93,
+	0xe7, 0xdf, 0xf7, 0x79, 0x3e, 0x79, 0x52, 0xb0, 0x88, 0xb0, 0x81, 0xb0, 0x8e, 0x65, 0x13, 0xa1,
+	0x86, 0xa1, 0x42, 0xb5, 0xae, 0x35, 0xe5, 0xed, 0x6c, 0x55, 0x23, 0x6a, 0x56, 0x26, 0x2d, 0xc9,
+	0x6c, 0x22, 0x82, 0xf8, 0x39, 0xc7, 0x4a, 0xea, 0xb2, 0x92, 0x1c, 0xab, 0xe4, 0x54, 0x1d, 0xd5,
+	0x91, 0x6d, 0x27, 0xd3, 0x2b, 0xe6, 0x92, 0x8c, 0xab, 0x86, 0x0e, 0x91, 0x6c, 0xff, 0x75, 0x8e,
+	0x84, 0x9a, 0x1d, 0x46, 0xae, 0xaa, 0x58, 0xf3, 0x72, 0xd4, 0x90, 0x0e, 0x9d, 0xe7, 0x37, 0x83,
+	0x6a, 0xc1, 0x3b, 0xaa, 0x59, 0x69, 0x22, 0x8b, 0x68, 0xcc, 0x5a, 0x7c, 0x1f, 0x05, 0x53, 0x25,
+	0x5c, 0x7f, 0xba, 0xa3, 0x9a, 0x8f, 0x5a, 0x6a, 0x8d, 0x3c, 0x34, 0x90, 0x05, 0x49, 0x11, 0xf2,
+	0xcb, 0x60, 0x08, 0x6b, 0x70, 0x53, 0x6b, 0x26, 0xb8, 0x05, 0x2e, 0x3d, 0x52, 0x88, 0x77, 0xda,
+	0xa9, 0xb1, 0x5d, 0xd5, 0x68, 0xe4, 0x45, 0x76, 0x2e, 0x2a, 0x8e, 0x01, 0xbf, 0x0e, 0x86, 0xec,
+	0x90, 0x38, 0xf1, 0xdf, 0x42, 0x34, 0x3d, 0x9a, 0x93, 0xa4, 0x00, 0xa1, 0x12, 0x4d, 0xe5, 0x66,
+	0x51, 0xa8, 0x5b, 0x21, 0xb6, 0xdf, 0x4e, 0x45, 0x14, 0x27, 0x06, 0x5f, 0x02, 0xc3, 0x04, 0x6d,
+	0x69, 0xb0, 0xa2, 0xc3, 0x44, 0x74, 0x81, 0x4b, 0x8f, 0xe6, 0x66, 0x25, 0x26, 0x59, 0xa2, 0x92,
+	0xbd, 0x38, 0xab, 0x48, 0x87, 0x85, 0x19, 0xea, 0xda, 0x69, 0xa7, 0x26, 0x58, 0x65, 0xae, 0xa3,
+	0xa8, 0xfc, 0x6f, 0x5f, 0x16, 0x21, 0xff, 0x12, 0x4c, 0xb1, 0x53, 0x64, 0x91, 0x8a, 0xa1, 0xc3,
+	0x8a, 0x6a, 0xe7, 0x4e, 0xc4, 0x6c, 0x55, 0x25, 0xea, 0xff, 0xb3, 0x9d, 0x5a, 0xaa, 0xeb, 0xe4,
+	0xb9, 0x55, 0x95, 0x6a, 0xc8, 0x90, 0x9d, 0xfe, 0xb2, 0x7f, 0x19, 0xbc, 0xb9, 0x25, 0x93, 0x5d,
+	0x53, 0xc3, 0x52, 0x11, 0x92, 0x4e, 0x3b, 0x35, 0xd7, 0x9d, 0xa9, 0x37, 0xa6, 0xa8, 0xc4, 0xed,
+	0xe3, 0xb2, 0x45, 0x4a, 0x3a, 0x64, 0x1a, 0xf3, 0x99, 0xb7, 0xbf, 0xbf, 0xdd, 0x48, 0xf7, 0x9b,
+	0x09, 0x9d, 0x45, 0x46, 0xa3, 0x4d, 0xcf, 0x30, 0xff, 0x8c, 0x0e, 0xc5, 0x8f, 0x1c, 0x98, 0xef,
+	0x37, 0x0f, 0x45, 0xc3, 0x26, 0x82, 0x58, 0xe3, 0x31, 0x98, 0x3c, 0xce, 0xed, 0x68, 0x61, 0x13,
+	0x2a, 0x86, 0xd6, 0x32, 0xe3, 0xd7, 0xe2, 0xea, 0x18, 0x77, 0x75, 0xb0, 0xf4, 0xe2, 0x9b, 0x28,
+	0x10, 0x68, 0x55, 0x66, 0x43, 0x27, 0xf6, 0xcc, 0xce, 0xc5, 0xcb, 0x86, 0x8f, 0x97, 0x95, 0x81,
+	0x79, 0x39, 0x2e, 0xc0, 0x07, 0xcd, 0x03, 0x30, 0xee, 0xce, 0xbe, 0xb2, 0xa9, 0x41, 0x64, 0xd8,
+	0xe8, 0x8c, 0x14, 0x66, 0x3b, 0xed, 0xd4, 0x74, 0x2f, 0x1b, 0xec, 0xb9, 0xa8, 0x5c, 0x72, 0x08,
+	0x59, 0xa3, 0xb7, 0x17, 0x8e, 0x49, 0x9a, 0x62, 0x72, 0xad, 0x2f, 0x26, 0x54, 0x73, 0x17, 0x21,
+	0x9f, 0x39, 0xb0, 0x14, 0x3c, 0x8b, 0x8b, 0x65, 0x65, 0x2f, 0x0a, 0xa6, 0x4f, 0x12, 0x5c, 0xb6,
+	0x48, 0x18, 0x44, 0x4a, 0x3e, 0x44, 0xe4, 0x01, 0x11, 0x29, 0x5b, 0x7d, 0xf1, 0x78, 0x01, 0x2e,
+	0x7b, 0xe3, 0x37, 0xd4, 0x96, 0xdb, 0x0b, 0xc6, 0xc8, 0x7a, 0xe8, 0x5e, 0x24, 0x7d, 0x44, 0x1d,
+	0x87, 0x14, 0x95, 0x49, 0x07, 0xab, 0x92, 0xda, 0x62, 0x25, 0xf1, 0x4f, 0xc0, 0x88, 0xd7, 0x35,
+	0x9b, 0xa7, 0xc0, 0x8d, 0x96, 0x70, 0x36, 0xda, 0xa4, 0xaf, 0xdf, 0xa2, 0x32, 0xec, 0x36, 0x3a,
+	0x2f, 0x51, 0x58, 0x96, 0x07, 0xdb, 0x29, 0xd4, 0xf5, 0x03, 0x07, 0xae, 0xf6, 0x1d, 0x89, 0x47,
+	0x8a, 0x09, 0x26, 0x3c, 0x35, 0x3d, 0xa0, 0x3c, 0x0e, 0xdd, 0x9c, 0x2b, 0xbe, 0xe6, 0xb8, 0x8d,
+	0x19, 0x73, 0x1a, 0xe3, 0x60, 0xf2, 0x2e, 0x0a, 0x52, 0x41, 0x18, 0x87, 0x04, 0x46, 0xf1, 0x01,
+	0x73, 0x6b, 0x70, 0x60, 0x4e, 0x5d, 0x2a, 0x05, 0xb7, 0x29, 0x14, 0xf7, 0xee, 0xad, 0x92, 0xf4,
+	0xcb, 0xf4, 0x0c, 0x5c, 0x99, 0x65, 0x8b, 0xb0, 0xbd, 0x72, 0x0a, 0x79, 0xb1, 0x7f, 0x41, 0x5e,
+	0x7e, 0x99, 0x72, 0xb2, 0x78, 0xe6, 0x52, 0xa1, 0x88, 0x7c, 0xe2, 0xc0, 0xf5, 0x33, 0xc6, 0x71,
+	0x71, 0xb0, 0xe4, 0xbe, 0xc7, 0x40, 0xb4, 0x84, 0xeb, 0xfc, 0x2b, 0x0e, 0xc4, 0x4f, 0x7e, 0x7a,
+	0xb2, 0x81, 0xb3, 0xee, 0xf7, 0x35, 0x4d, 0xde, 0x0d, 0xed, 0xe2, 0xa9, 0x7f, 0xcd, 0x01, 0xbe,
+	0x0f, 0xab, 0xb9, 0x90, 0x11, 0xcb, 0x16, 0x49, 0xe6, 0xc3, 0xfb, 0x78, 0x65, 0x7c, 0xe1, 0xc0,
+	0x5c, 0xd0, 0xf7, 0xf8, 0xde, 0x99, 0xb1, 0x4f, 0x77, 0x4e, 0xae, 0x9e, 0xc3, 0xd9, 0xab, 0xf0,
+	0x2b, 0x07, 0xe6, 0x03, 0x5f, 0xef, 0xfb, 0x7f, 0x9d, 0x85, 0x36, 0x6f, 0xed, 0x3c, 0xde, 0x6e,
+	0x91, 0x85, 0x8d, 0xfd, 0x43, 0x81, 0x3b, 0x38, 0x14, 0xb8, 0x5f, 0x87, 0x02, 0xb7, 0x77, 0x24,
+	0x44, 0x0e, 0x8e, 0x84, 0xc8, 0x8f, 0x23, 0x21, 0xf2, 0xec, 0x4e, 0x17, 0xc4, 0x4e, 0xa6, 0x4c,
+	0x43, 0xad, 0x62, 0xf7, 0x46, 0xde, 0xce, 0xde, 0x96, 0x5b, 0x3d, 0x6f, 0x95, 0x4d, 0x76, 0x75,
+	0xc8, 0xfe, 0x65, 0xbd, 0xf2, 0x27, 0x00, 0x00, 0xff, 0xff, 0x67, 0x71, 0x3e, 0x8f, 0x15, 0x0c,
+	0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/x/protorev/keeper/atom b/x/protorev/keeper/atom
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/x/protorev/types/tx.pb.go b/x/protorev/types/tx.pb.go
index b944735e073..4c43599f339 100644
--- a/x/protorev/types/tx.pb.go
+++ b/x/protorev/types/tx.pb.go
@@ -609,61 +609,63 @@ func init() {
 func init() { proto.RegisterFile("osmosis/protorev/v1beta1/tx.proto", fileDescriptor_2783dce032fc6954) }
 
 var fileDescriptor_2783dce032fc6954 = []byte{
-	// 854 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x95, 0x4f, 0x6f, 0xe3, 0x44,
-	0x18, 0xc6, 0x33, 0x5d, 0x40, 0xec, 0xa4, 0xc0, 0xc6, 0xfb, 0x2f, 0x71, 0x8b, 0x93, 0x9d, 0x6e,
-	0x77, 0xc3, 0xee, 0x26, 0xde, 0x24, 0xbb, 0x68, 0x15, 0x04, 0x52, 0xad, 0x3d, 0xc0, 0xa1, 0x28,
-	0x72, 0x8b, 0x90, 0x38, 0x60, 0xec, 0x64, 0x70, 0xac, 0xc6, 0x1e, 0xcb, 0x33, 0x0d, 0xe9, 0x95,
-	0x23, 0x27, 0x24, 0x6e, 0x1c, 0x38, 0xf0, 0x09, 0x40, 0x2a, 0x1c, 0x90, 0x38, 0x70, 0xeb, 0x05,
-	0xa9, 0x82, 0x03, 0x9c, 0x22, 0xd4, 0x22, 0x71, 0xcf, 0x27, 0x40, 0x99, 0xb1, 0x9d, 0x34, 0xb1,
-	0x49, 0x43, 0x2e, 0x55, 0x33, 0xf3, 0xbc, 0xcf, 0xfb, 0x7b, 0x3c, 0xe3, 0xd7, 0xf0, 0x0e, 0xa1,
-	0x2e, 0xa1, 0x0e, 0x55, 0xfd, 0x80, 0x30, 0x12, 0xe0, 0xbe, 0xda, 0xaf, 0x59, 0x98, 0x99, 0x35,
-	0x95, 0x0d, 0xaa, 0x7c, 0x4d, 0xca, 0x87, 0x92, 0x6a, 0x24, 0xa9, 0x86, 0x12, 0xf9, 0x86, 0x4d,
-	0x6c, 0xc2, 0x57, 0xd5, 0xf1, 0x7f, 0x42, 0x20, 0xe7, 0x4c, 0xd7, 0xf1, 0x88, 0xca, 0xff, 0x86,
-	0x4b, 0x9b, 0x36, 0x21, 0x76, 0x0f, 0xab, 0xa6, 0xef, 0xa8, 0xa6, 0xe7, 0x11, 0x66, 0x32, 0x87,
-	0x78, 0xa1, 0xa3, 0x7c, 0x3f, 0x95, 0x21, 0xee, 0x28, 0x84, 0x85, 0x36, 0x57, 0x1a, 0xa2, 0xa5,
-	0xf8, 0x21, 0xb6, 0xd0, 0x1f, 0x00, 0xbe, 0xb6, 0x4b, 0xed, 0x3d, 0xcc, 0xde, 0x25, 0x4c, 0x27,
-	0x87, 0x0c, 0x53, 0xe9, 0x1d, 0xf8, 0xa2, 0xd9, 0x71, 0x1d, 0x2f, 0x0f, 0x4a, 0xa0, 0x7c, 0x55,
-	0x2b, 0x8f, 0x86, 0xc5, 0xf5, 0x23, 0xd3, 0xed, 0x35, 0x11, 0x5f, 0x46, 0xbf, 0x1d, 0x57, 0x6e,
-	0x84, 0x26, 0x3b, 0x9d, 0x4e, 0x80, 0x29, 0xdd, 0x63, 0x81, 0xe3, 0xd9, 0xba, 0x28, 0x93, 0x3e,
-	0x85, 0xb0, 0x4b, 0x98, 0x11, 0x70, 0xb7, 0xfc, 0x5a, 0xe9, 0x4a, 0x39, 0x5b, 0x7f, 0x54, 0x4d,
-	0x7b, 0x1a, 0xd5, 0x7d, 0x72, 0x80, 0xbd, 0x96, 0xe9, 0x04, 0x3b, 0x81, 0x25, 0x08, 0xb4, 0xc2,
-	0xc9, 0xb0, 0x98, 0x19, 0x0d, 0x8b, 0x39, 0xd1, 0x76, 0xe2, 0x86, 0xf4, 0xab, 0xdd, 0x88, 0xb3,
-	0xb9, 0xf9, 0xc5, 0x3f, 0xdf, 0x3d, 0xb8, 0x1d, 0x3d, 0x84, 0x99, 0x14, 0xa8, 0x00, 0x6f, 0xcf,
-	0x2c, 0xe9, 0x98, 0xfa, 0xc4, 0xa3, 0x18, 0x9d, 0x00, 0x78, 0x4b, 0xec, 0x3d, 0xc7, 0x7d, 0xdc,
-	0x23, 0x3e, 0x0e, 0x76, 0xda, 0x6d, 0x72, 0xe8, 0xb1, 0x95, 0xb3, 0xbf, 0x07, 0x73, 0x9d, 0xc8,
-	0xd3, 0x30, 0x85, 0x69, 0x7e, 0x8d, 0x7b, 0x6d, 0x8e, 0x86, 0xc5, 0xbc, 0xf0, 0x9a, 0x93, 0x20,
-	0xfd, 0x5a, 0x67, 0x06, 0xa5, 0xb9, 0x35, 0x8e, 0xa7, 0x5c, 0x8c, 0x37, 0xcb, 0x8b, 0x4a, 0x50,
-	0x49, 0xde, 0x89, 0xc3, 0xfe, 0x04, 0x60, 0x4e, 0x48, 0x5a, 0x84, 0xf4, 0x3e, 0xc4, 0x8e, 0xdd,
-	0x65, 0xab, 0x9f, 0x31, 0x86, 0xeb, 0x3e, 0x21, 0x3d, 0xe3, 0x33, 0xe1, 0xc7, 0x23, 0x66, 0xeb,
-	0xdb, 0xe9, 0xa7, 0x3c, 0xd5, 0x5c, 0xdb, 0x08, 0x8f, 0xf7, 0xba, 0xe8, 0x38, 0x6d, 0x84, 0xf4,
-	0xac, 0x3f, 0x51, 0xa2, 0x0d, 0x58, 0x98, 0x63, 0x8f, 0x93, 0x7d, 0x0f, 0x60, 0x5e, 0xec, 0xee,
-	0x9a, 0x83, 0xb1, 0xa0, 0x45, 0x1c, 0x8f, 0xd1, 0x16, 0x0e, 0xf6, 0x07, 0x2b, 0x07, 0xfc, 0x00,
-	0xde, 0x72, 0xcd, 0x81, 0xc1, 0xd9, 0x7c, 0xee, 0x6b, 0x8c, 0xcf, 0x8b, 0x0d, 0x78, 0xd4, 0x17,
-	0xb4, 0x3b, 0xa3, 0x61, 0xf1, 0x75, 0x61, 0x98, 0xac, 0x43, 0xba, 0xe4, 0xce, 0x61, 0x21, 0x04,
-	0x4b, 0x69, 0xc8, 0x71, 0xae, 0x9f, 0x01, 0xdc, 0x48, 0x16, 0x69, 0x3d, 0xd2, 0x3e, 0x58, 0x39,
-	0xda, 0xc7, 0xb0, 0x90, 0x84, 0x6c, 0x8d, 0xcd, 0xc3, 0x74, 0x77, 0x47, 0xc3, 0x62, 0x29, 0x3d,
-	0x1d, 0x97, 0x22, 0xfd, 0xa6, 0x9b, 0xc4, 0x87, 0xb6, 0xe1, 0xd6, 0x7f, 0xe0, 0xc7, 0x31, 0x8f,
-	0x01, 0xbc, 0x26, 0x74, 0x9a, 0x49, 0xf1, 0x73, 0xec, 0x11, 0x77, 0xf5, 0x7b, 0xf9, 0x09, 0xcc,
-	0x5a, 0x26, 0xc5, 0x46, 0x87, 0xdb, 0x85, 0xc3, 0x67, 0x2b, 0xfd, 0x5a, 0xc6, 0xad, 0x35, 0x39,
-	0xbc, 0x94, 0x92, 0x68, 0x37, 0xe5, 0x82, 0x74, 0x68, 0xc5, 0x84, 0x48, 0x8e, 0x2e, 0xdd, 0x84,
-	0x3a, 0x8a, 0x54, 0xff, 0xe1, 0x65, 0x78, 0x65, 0x97, 0xda, 0xd2, 0xd7, 0x00, 0xae, 0x5f, 0x18,
-	0xa9, 0x6f, 0xa4, 0x13, 0xcc, 0x0c, 0x29, 0xb9, 0x76, 0x69, 0x69, 0xfc, 0x24, 0x1f, 0x7d, 0xfe,
-	0xfb, 0xdf, 0x5f, 0xad, 0xdd, 0x43, 0x77, 0xd5, 0x68, 0x5a, 0xf4, 0x6b, 0x4f, 0x26, 0x5f, 0x05,
-	0x8a, 0x99, 0x31, 0x19, 0xa1, 0xd2, 0x8f, 0x00, 0x5e, 0x4f, 0x1a, 0x7d, 0x8f, 0x17, 0x35, 0x9e,
-	0xad, 0x90, 0x9f, 0x2d, 0x5b, 0x11, 0x13, 0x37, 0x38, 0x71, 0x05, 0x3d, 0x4c, 0x27, 0x9e, 0x9b,
-	0x91, 0xd2, 0x2f, 0x00, 0xde, 0x4c, 0x7e, 0xd9, 0xeb, 0x8b, 0x40, 0xe6, 0x6b, 0xe4, 0xe6, 0xf2,
-	0x35, 0x31, 0xfe, 0x33, 0x8e, 0x5f, 0x47, 0x8f, 0xd3, 0xf1, 0x93, 0x87, 0x82, 0xf4, 0x2b, 0x80,
-	0xf9, 0xd4, 0x17, 0xfb, 0xe9, 0xb2, 0x48, 0xbc, 0x4c, 0x7e, 0xfb, 0x7f, 0x95, 0xc5, 0x61, 0xde,
-	0xe2, 0x61, 0x9e, 0xa2, 0xc6, 0x72, 0x61, 0xf8, 0x0c, 0x90, 0xbe, 0x05, 0xf0, 0xd5, 0x99, 0x4f,
-	0xcb, 0xc3, 0x45, 0x38, 0x53, 0x62, 0xb9, 0xb1, 0x84, 0x38, 0x26, 0xae, 0x72, 0xe2, 0x32, 0xba,
-	0x97, 0x4e, 0x3c, 0xfd, 0x4d, 0x91, 0xbe, 0x01, 0xf0, 0x95, 0x8b, 0x63, 0xe6, 0xc1, 0xa2, 0xb6,
-	0x13, 0xad, 0x5c, 0xbf, 0xbc, 0x36, 0x26, 0xac, 0x70, 0xc2, 0xfb, 0x68, 0x3b, 0x9d, 0x70, 0x6a,
-	0xc0, 0x68, 0xef, 0x9f, 0x9c, 0x29, 0xe0, 0xf4, 0x4c, 0x01, 0x7f, 0x9d, 0x29, 0xe0, 0xcb, 0x73,
-	0x25, 0x73, 0x7a, 0xae, 0x64, 0xfe, 0x3c, 0x57, 0x32, 0x1f, 0x3d, 0xb1, 0x1d, 0xd6, 0x3d, 0xb4,
-	0xaa, 0x6d, 0xe2, 0x46, 0x56, 0x95, 0x9e, 0x69, 0xd1, 0x29, 0xdf, 0x37, 0xd5, 0xc1, 0xc4, 0x99,
-	0x1d, 0xf9, 0x98, 0x5a, 0x2f, 0xf1, 0xdf, 0x8d, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x6d, 0xc7,
-	0x9f, 0x51, 0xa6, 0x0a, 0x00, 0x00,
+	// 883 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x95, 0x4f, 0x8f, 0xdb, 0x44,
+	0x18, 0xc6, 0x77, 0xb6, 0x80, 0xe8, 0xec, 0x02, 0x5d, 0xf7, 0x9f, 0xe3, 0xdd, 0x3a, 0xe9, 0x6c,
+	0xb7, 0x5d, 0xda, 0x6e, 0xdc, 0x4d, 0x5a, 0x54, 0x05, 0x81, 0xb4, 0x56, 0x0f, 0x70, 0x58, 0x14,
+	0xb9, 0x45, 0x48, 0x1c, 0x30, 0x76, 0x32, 0x38, 0x56, 0x63, 0x8f, 0xe5, 0x99, 0x0d, 0xe9, 0x95,
+	0x23, 0x27, 0x24, 0x6e, 0x1c, 0x38, 0xf0, 0x09, 0x38, 0x00, 0x77, 0x6e, 0x7b, 0x41, 0xaa, 0xe8,
+	0x81, 0x0a, 0x89, 0x08, 0xed, 0x22, 0x71, 0xcf, 0x27, 0x40, 0x9e, 0xf1, 0xbf, 0x24, 0x36, 0x69,
+	0x9a, 0xcb, 0x6a, 0x33, 0xf3, 0xcc, 0xf3, 0xfe, 0x9e, 0x77, 0x46, 0xaf, 0xe1, 0x55, 0x42, 0x3d,
+	0x42, 0x5d, 0xaa, 0x05, 0x21, 0x61, 0x24, 0xc4, 0x03, 0x6d, 0xb0, 0x6f, 0x63, 0x66, 0xed, 0x6b,
+	0x6c, 0x58, 0xe7, 0x6b, 0x92, 0x1c, 0x4b, 0xea, 0x89, 0xa4, 0x1e, 0x4b, 0x94, 0x0b, 0x0e, 0x71,
+	0x08, 0x5f, 0xd5, 0xa2, 0xff, 0x84, 0x40, 0xd9, 0xb0, 0x3c, 0xd7, 0x27, 0x1a, 0xff, 0x1b, 0x2f,
+	0x6d, 0x39, 0x84, 0x38, 0x7d, 0xac, 0x59, 0x81, 0xab, 0x59, 0xbe, 0x4f, 0x98, 0xc5, 0x5c, 0xe2,
+	0xc7, 0x8e, 0xca, 0x8d, 0x52, 0x86, 0xb4, 0xa2, 0x10, 0x56, 0x3a, 0x5c, 0x69, 0x8a, 0x92, 0xe2,
+	0x87, 0xd8, 0x42, 0x7f, 0x00, 0xf8, 0xd6, 0x21, 0x75, 0x1e, 0x62, 0xf6, 0x01, 0x61, 0x06, 0x39,
+	0x62, 0x98, 0x4a, 0xef, 0xc3, 0x57, 0xad, 0xae, 0xe7, 0xfa, 0x32, 0xa8, 0x81, 0xdd, 0xb3, 0xfa,
+	0xee, 0x78, 0x54, 0x5d, 0x7f, 0x62, 0x79, 0xfd, 0x16, 0xe2, 0xcb, 0xe8, 0xf7, 0x9f, 0xf6, 0x2e,
+	0xc4, 0x26, 0x07, 0xdd, 0x6e, 0x88, 0x29, 0x7d, 0xc8, 0x42, 0xd7, 0x77, 0x0c, 0x71, 0x4c, 0xfa,
+	0x02, 0xc2, 0x1e, 0x61, 0x66, 0xc8, 0xdd, 0xe4, 0xd5, 0xda, 0x99, 0xdd, 0xb5, 0xc6, 0xed, 0x7a,
+	0x59, 0x37, 0xea, 0x8f, 0xc8, 0x63, 0xec, 0xb7, 0x2d, 0x37, 0x3c, 0x08, 0x6d, 0x41, 0xa0, 0x57,
+	0x8e, 0x47, 0xd5, 0x95, 0xf1, 0xa8, 0xba, 0x21, 0xca, 0x66, 0x6e, 0xc8, 0x38, 0xdb, 0x4b, 0x38,
+	0x5b, 0x5b, 0x5f, 0xff, 0xfb, 0xe3, 0xcd, 0xcb, 0x49, 0x13, 0xa6, 0x52, 0xa0, 0x0a, 0xbc, 0x3c,
+	0xb5, 0x64, 0x60, 0x1a, 0x10, 0x9f, 0x62, 0x74, 0x0c, 0xe0, 0x25, 0xb1, 0xf7, 0x00, 0x0f, 0x70,
+	0x9f, 0x04, 0x38, 0x3c, 0xe8, 0x74, 0xc8, 0x91, 0xcf, 0x96, 0xce, 0xfe, 0x21, 0xdc, 0xe8, 0x26,
+	0x9e, 0xa6, 0x25, 0x4c, 0xe5, 0x55, 0xee, 0xb5, 0x35, 0x1e, 0x55, 0x65, 0xe1, 0x35, 0x23, 0x41,
+	0xc6, 0xb9, 0xee, 0x14, 0x4a, 0x6b, 0x3b, 0x8a, 0xa7, 0x4e, 0xc6, 0x9b, 0xe6, 0x45, 0x35, 0xa8,
+	0x16, 0xef, 0xa4, 0x61, 0xff, 0x04, 0x70, 0x43, 0x48, 0xda, 0x84, 0xf4, 0x3f, 0xc1, 0xae, 0xd3,
+	0x63, 0xcb, 0xdf, 0x31, 0x86, 0xeb, 0x01, 0x21, 0x7d, 0xf3, 0x4b, 0xe1, 0xc7, 0x23, 0xae, 0x35,
+	0x76, 0xca, 0x6f, 0x39, 0x57, 0x5c, 0xdf, 0x8c, 0xaf, 0xf7, 0xbc, 0xa8, 0x98, 0x37, 0x42, 0xc6,
+	0x5a, 0x90, 0x29, 0x5b, 0x6a, 0xd4, 0x83, 0xca, 0x64, 0x0f, 0x72, 0x4e, 0x68, 0x13, 0x56, 0x66,
+	0x16, 0xd3, 0xe4, 0xcf, 0x01, 0x94, 0xc5, 0xee, 0xa1, 0x35, 0x8c, 0x04, 0x6d, 0xe2, 0xfa, 0x8c,
+	0xb6, 0x71, 0xf8, 0x68, 0xb8, 0x74, 0x03, 0x3e, 0x86, 0x97, 0x3c, 0x6b, 0x68, 0x72, 0xf6, 0x80,
+	0xfb, 0x9a, 0xd1, 0x7d, 0xb2, 0x21, 0x6f, 0xc5, 0x2b, 0xfa, 0xd5, 0xf1, 0xa8, 0x7a, 0x45, 0x18,
+	0x16, 0xeb, 0x90, 0x21, 0x79, 0x33, 0x58, 0xad, 0x9d, 0x28, 0x70, 0x6d, 0x32, 0xf0, 0x2c, 0x3d,
+	0x42, 0xb0, 0x56, 0xb6, 0x97, 0xc6, 0xff, 0x0b, 0xc0, 0xcd, 0x62, 0x91, 0xde, 0x27, 0x9d, 0xc7,
+	0x4b, 0x77, 0xe0, 0x33, 0x58, 0x29, 0x4a, 0x66, 0x47, 0xe6, 0x71, 0x13, 0xae, 0x8d, 0x47, 0xd5,
+	0x5a, 0x79, 0x13, 0xb8, 0x14, 0x19, 0x17, 0xbd, 0x22, 0xbe, 0xb9, 0x77, 0xbf, 0x03, 0xb7, 0xff,
+	0x27, 0x5e, 0xda, 0x86, 0x67, 0x00, 0x9e, 0x13, 0x3a, 0xdd, 0xa2, 0xf8, 0x01, 0xf6, 0x89, 0xb7,
+	0xfc, 0xf3, 0xff, 0x1c, 0xae, 0xd9, 0x16, 0xc5, 0x66, 0x97, 0xdb, 0xc5, 0x33, 0x6e, 0xbb, 0xfc,
+	0xf5, 0xa7, 0xa5, 0x75, 0x25, 0x7e, 0xfb, 0x92, 0x28, 0x97, 0x73, 0x41, 0x06, 0xb4, 0x53, 0xc2,
+	0xd6, 0x95, 0x28, 0xbd, 0x3c, 0x99, 0x3e, 0x0b, 0x80, 0x94, 0xe4, 0x69, 0x67, 0x6b, 0x49, 0xe2,
+	0xc6, 0xcf, 0xaf, 0xc3, 0x33, 0x87, 0xd4, 0x91, 0xbe, 0x03, 0x70, 0x7d, 0x62, 0xb0, 0xbf, 0x5d,
+	0x0e, 0x38, 0x35, 0x2a, 0x95, 0xfd, 0x17, 0x96, 0xa6, 0x8d, 0xbe, 0xfd, 0xd5, 0xb3, 0x7f, 0xbe,
+	0x5d, 0xbd, 0x8e, 0xae, 0x69, 0x09, 0xf5, 0x60, 0xff, 0x6e, 0xf6, 0x6d, 0xa2, 0x98, 0x99, 0xd9,
+	0x20, 0x97, 0x7e, 0x01, 0xf0, 0x7c, 0xd1, 0x00, 0xbe, 0x33, 0xaf, 0xf0, 0xf4, 0x09, 0xe5, 0xfe,
+	0xa2, 0x27, 0x52, 0xe2, 0x26, 0x27, 0xde, 0x43, 0xb7, 0xca, 0x89, 0x67, 0x26, 0xb5, 0xf4, 0x2b,
+	0x80, 0x17, 0x8b, 0x47, 0x4a, 0x63, 0x1e, 0xc8, 0xec, 0x19, 0xa5, 0xb5, 0xf8, 0x99, 0x14, 0xff,
+	0x3e, 0xc7, 0x6f, 0xa0, 0x3b, 0xe5, 0xf8, 0xc5, 0xa3, 0x47, 0xfa, 0x0d, 0x40, 0xb9, 0x74, 0x2e,
+	0xdc, 0x5b, 0x14, 0x89, 0x1f, 0x53, 0xde, 0x7b, 0xa9, 0x63, 0x69, 0x98, 0x77, 0x79, 0x98, 0x7b,
+	0xa8, 0xb9, 0x58, 0x18, 0x3e, 0x42, 0xa4, 0x1f, 0x00, 0x7c, 0x73, 0xea, 0x03, 0x77, 0x6b, 0x1e,
+	0x4e, 0x4e, 0xac, 0x34, 0x17, 0x10, 0xa7, 0xc4, 0x75, 0x4e, 0xbc, 0x8b, 0xae, 0x97, 0x13, 0xe7,
+	0xbf, 0x6c, 0xd2, 0xf7, 0x00, 0xbe, 0x31, 0x39, 0x85, 0x6e, 0xce, 0x2b, 0x9b, 0x69, 0x95, 0xc6,
+	0x8b, 0x6b, 0x53, 0xc2, 0x3d, 0x4e, 0x78, 0x03, 0xed, 0x94, 0x13, 0xe6, 0xe6, 0x8f, 0xfe, 0xd1,
+	0xf1, 0x89, 0x0a, 0x9e, 0x9e, 0xa8, 0xe0, 0xef, 0x13, 0x15, 0x7c, 0x73, 0xaa, 0xae, 0x3c, 0x3d,
+	0x55, 0x57, 0x9e, 0x9f, 0xaa, 0x2b, 0x9f, 0xde, 0x75, 0x5c, 0xd6, 0x3b, 0xb2, 0xeb, 0x1d, 0xe2,
+	0x25, 0x56, 0x7b, 0x7d, 0xcb, 0xa6, 0x39, 0xdf, 0x77, 0xb4, 0x61, 0xe6, 0xcc, 0x9e, 0x04, 0x98,
+	0xda, 0xaf, 0xf1, 0xdf, 0xcd, 0xff, 0x02, 0x00, 0x00, 0xff, 0xff, 0x89, 0x8d, 0xc5, 0x97, 0x2c,
+	0x0b, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/x/superfluid/types/tx.pb.go b/x/superfluid/types/tx.pb.go
index 7b030350a26..c2762e500e2 100644
--- a/x/superfluid/types/tx.pb.go
+++ b/x/superfluid/types/tx.pb.go
@@ -1045,6 +1045,7 @@ func init() {
 func init() { proto.RegisterFile("osmosis/superfluid/tx.proto", fileDescriptor_55b645f187d22814) }
 
 var fileDescriptor_55b645f187d22814 = []byte{
+<<<<<<< HEAD
 	// 1290 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x58, 0xcd, 0x73, 0xd3, 0x46,
 	0x14, 0x8f, 0xec, 0x90, 0xc0, 0x86, 0x00, 0x51, 0xf9, 0x30, 0x2e, 0x58, 0x66, 0x61, 0x98, 0x50,
@@ -1127,6 +1128,101 @@ var fileDescriptor_55b645f187d22814 = []byte{
 	0xe4, 0x76, 0xe4, 0x45, 0xe0, 0x80, 0x25, 0xdb, 0x68, 0xd2, 0x70, 0xa1, 0x6d, 0x96, 0x6f, 0x6b,
 	0xdb, 0x03, 0x7f, 0xa3, 0x63, 0xaf, 0x44, 0x73, 0xc6, 0x9f, 0x95, 0x6e, 0xfd, 0x1b, 0x00, 0x00,
 	0xff, 0xff, 0x0e, 0x79, 0xfa, 0xf0, 0xc6, 0x13, 0x00, 0x00,
+=======
+	// 1458 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x58, 0x4f, 0x6f, 0x13, 0x47,
+	0x1b, 0xcf, 0xda, 0x21, 0x81, 0x09, 0x01, 0xb2, 0x04, 0x30, 0x06, 0xbc, 0x66, 0xe0, 0x85, 0xf0,
+	0xc7, 0xde, 0x38, 0xbc, 0x2f, 0xa0, 0x1c, 0x5e, 0x11, 0xc7, 0x6f, 0x5e, 0x99, 0xc6, 0x2a, 0x5d,
+	0x82, 0x2a, 0x71, 0xb1, 0xd6, 0x9e, 0xc9, 0xb2, 0xcd, 0x7a, 0xc7, 0x78, 0xd6, 0x49, 0x50, 0x4f,
+	0x6d, 0x0f, 0x48, 0x9c, 0x38, 0xf6, 0xd6, 0x73, 0x7b, 0x40, 0xf4, 0x1b, 0xf4, 0xd0, 0x03, 0xea,
+	0x89, 0x63, 0xd5, 0x4a, 0xa6, 0x82, 0x43, 0xef, 0x56, 0x3f, 0x40, 0x35, 0xbb, 0xb3, 0xe3, 0x75,
+	0xbc, 0x8b, 0xbd, 0x26, 0xad, 0xd4, 0x0b, 0x78, 0x67, 0x9e, 0x3f, 0xbf, 0xe7, 0x99, 0xe7, 0xf7,
+	0xcc, 0x33, 0x01, 0x67, 0x08, 0x6d, 0x10, 0x6a, 0x52, 0x95, 0xb6, 0x9b, 0xb8, 0xb5, 0x69, 0xb5,
+	0x4d, 0xa4, 0x3a, 0xbb, 0xf9, 0x66, 0x8b, 0x38, 0x44, 0x96, 0xf9, 0x66, 0xbe, 0xb7, 0x99, 0x9e,
+	0x37, 0x88, 0x41, 0xdc, 0x6d, 0x95, 0xfd, 0xf2, 0x24, 0xd3, 0x73, 0x7a, 0xc3, 0xb4, 0x89, 0xea,
+	0xfe, 0xcb, 0x97, 0x32, 0x06, 0x21, 0x86, 0x85, 0x55, 0xf7, 0xab, 0xd6, 0xde, 0x54, 0x51, 0xbb,
+	0xa5, 0x3b, 0x26, 0xb1, 0xfd, 0xfd, 0xba, 0x6b, 0x5d, 0xad, 0xe9, 0x14, 0xab, 0xdb, 0x85, 0x1a,
+	0x76, 0xf4, 0x82, 0x5a, 0x27, 0xa6, 0xbf, 0xaf, 0xec, 0xd5, 0x77, 0xcc, 0x06, 0xa6, 0x8e, 0xde,
+	0x68, 0x72, 0x81, 0x0b, 0x21, 0xd0, 0x7b, 0x3f, 0x3d, 0x21, 0xf8, 0xb5, 0x04, 0x4e, 0x54, 0xa8,
+	0x71, 0x5f, 0xac, 0x97, 0xb0, 0x85, 0x0d, 0xdd, 0xc1, 0xf2, 0x15, 0x30, 0x45, 0xb1, 0x8d, 0x70,
+	0x2b, 0x25, 0x65, 0xa5, 0x85, 0x43, 0xc5, 0xb9, 0x6e, 0x47, 0x99, 0x7d, 0xa2, 0x37, 0xac, 0x65,
+	0xe8, 0xad, 0x43, 0x8d, 0x0b, 0xc8, 0xa7, 0xc0, 0xb4, 0x45, 0xea, 0x5b, 0x55, 0x13, 0xa5, 0x12,
+	0x59, 0x69, 0x61, 0x52, 0x9b, 0x62, 0x9f, 0x65, 0x24, 0x9f, 0x06, 0x07, 0xb7, 0x75, 0xab, 0xaa,
+	0x23, 0xd4, 0x4a, 0x25, 0x99, 0x15, 0x6d, 0x7a, 0x5b, 0xb7, 0x56, 0x10, 0x6a, 0x2d, 0x67, 0x9f,
+	0xfd, 0xfe, 0xf2, 0x6a, 0x48, 0x76, 0x73, 0x88, 0x03, 0x80, 0x0a, 0x38, 0x17, 0x8a, 0x4c, 0xc3,
+	0xb4, 0x49, 0x6c, 0x8a, 0xe1, 0x17, 0x12, 0x38, 0xd5, 0x27, 0xf1, 0xc0, 0x46, 0xfb, 0x88, 0x7e,
+	0x19, 0x32, 0x88, 0xe7, 0x42, 0x20, 0xb6, 0x85, 0x1f, 0x78, 0x1e, 0x28, 0x11, 0x10, 0x04, 0xcc,
+	0x2f, 0x07, 0x61, 0xd6, 0x88, 0x8d, 0xd6, 0x49, 0x7d, 0x6b, 0x5f, 0x60, 0x5e, 0x60, 0x30, 0x33,
+	0xa1, 0x30, 0x99, 0x9f, 0x1c, 0x13, 0x0b, 0xc1, 0xe9, 0x63, 0x10, 0x38, 0x5f, 0x48, 0xe0, 0x62,
+	0x44, 0x2c, 0x2b, 0xf6, 0x3e, 0x83, 0x96, 0x8b, 0x60, 0x92, 0xd5, 0xb2, 0x5b, 0x15, 0x33, 0x4b,
+	0xa7, 0xf3, 0x5e, 0xb1, 0xe7, 0x59, 0xb1, 0xe7, 0x79, 0xb1, 0xe7, 0x57, 0x89, 0x69, 0x17, 0x8f,
+	0xbf, 0xea, 0x28, 0x13, 0xdd, 0x8e, 0x32, 0xe3, 0x39, 0x60, 0x4a, 0x50, 0x73, 0x75, 0xe1, 0xff,
+	0xc1, 0xf5, 0x51, 0xf0, 0xfa, 0x01, 0x06, 0xc1, 0x48, 0x41, 0x30, 0xb0, 0x2b, 0x81, 0xb3, 0x15,
+	0x6a, 0x30, 0xe1, 0x15, 0x1b, 0x7d, 0x18, 0x17, 0x74, 0x70, 0x80, 0x81, 0xa3, 0xa9, 0x44, 0x36,
+	0xf9, 0xfe, 0xc8, 0x16, 0x59, 0x64, 0xdf, 0xbd, 0x51, 0x16, 0x0c, 0xd3, 0x79, 0xd4, 0xae, 0xe5,
+	0xeb, 0xa4, 0xa1, 0x72, 0xce, 0x7b, 0xff, 0xe5, 0x28, 0xda, 0x52, 0x9d, 0x27, 0x4d, 0x4c, 0x5d,
+	0x05, 0xaa, 0x79, 0x96, 0xdf, 0xc7, 0xaa, 0x2b, 0xac, 0x16, 0x2e, 0xfa, 0xb5, 0xc0, 0xc2, 0xcb,
+	0xe9, 0x36, 0xca, 0x85, 0xd1, 0xeb, 0xa6, 0x7b, 0xda, 0x91, 0x31, 0x8b, 0xac, 0x1d, 0x01, 0x89,
+	0x72, 0x89, 0x27, 0x2c, 0x51, 0x2e, 0xc1, 0x97, 0x09, 0xa0, 0x56, 0xa8, 0xb1, 0xda, 0xc2, 0xba,
+	0x83, 0xd7, 0xda, 0x96, 0xa5, 0xe9, 0xb6, 0x81, 0xef, 0x11, 0x6a, 0xb2, 0xe6, 0xf5, 0xcf, 0xce,
+	0x9f, 0x7c, 0x0d, 0x4c, 0x37, 0x09, 0xb1, 0x58, 0x89, 0x4c, 0xb2, 0x88, 0x8b, 0x72, 0xb7, 0xa3,
+	0x1c, 0xf1, 0x90, 0xf2, 0x0d, 0xa8, 0x4d, 0xb1, 0x5f, 0x65, 0xb4, 0x7c, 0x99, 0x25, 0x1b, 0xfa,
+	0xc9, 0xde, 0x6c, 0x5b, 0x56, 0xae, 0xc5, 0x72, 0xe1, 0xa5, 0x7c, 0xb3, 0x97, 0xea, 0xc7, 0xe0,
+	0x56, 0xcc, 0x8c, 0x89, 0xec, 0x9f, 0x04, 0x5e, 0x91, 0x96, 0xfa, 0x4a, 0xb6, 0x24, 0x67, 0x00,
+	0x68, 0x72, 0x03, 0xe5, 0x12, 0xe7, 0x56, 0x60, 0x85, 0xf5, 0xf5, 0x54, 0x85, 0x1a, 0x0f, 0xec,
+	0x7b, 0x84, 0x58, 0x9f, 0x3e, 0x32, 0x1d, 0x6c, 0x99, 0xd4, 0xc1, 0x88, 0x7d, 0xc6, 0x39, 0x8e,
+	0x40, 0x42, 0x12, 0x43, 0x13, 0x72, 0x91, 0x25, 0x44, 0xf1, 0x13, 0xd2, 0xb6, 0xd9, 0x72, 0x6e,
+	0xa7, 0xe7, 0x3c, 0xc7, 0x16, 0xe0, 0x5d, 0x90, 0x8d, 0x42, 0x26, 0xc2, 0xbe, 0x04, 0x8e, 0xe2,
+	0x5d, 0xd3, 0xc1, 0xa8, 0xca, 0x19, 0x4b, 0x53, 0x52, 0x36, 0xb9, 0x30, 0xa9, 0xcd, 0x7a, 0xcb,
+	0xeb, 0x2e, 0x71, 0x29, 0xfc, 0x36, 0x09, 0x6e, 0xbb, 0xc6, 0x2c, 0xaf, 0x8e, 0x2b, 0xa6, 0xd1,
+	0xd2, 0x1d, 0x7c, 0xff, 0x91, 0xde, 0xc2, 0x74, 0x83, 0x88, 0x64, 0xaf, 0x12, 0xbb, 0x8e, 0x6d,
+	0x87, 0xed, 0x21, 0x3f, 0xf1, 0x31, 0xd3, 0x10, 0xec, 0x63, 0xc9, 0x60, 0x1a, 0xf8, 0x06, 0x14,
+	0xbd, 0xcd, 0x00, 0x73, 0xd4, 0x05, 0x50, 0x75, 0x48, 0xb5, 0xe1, 0x21, 0x1a, 0xde, 0xe8, 0xb2,
+	0xbc, 0xd1, 0xa5, 0x38, 0x82, 0xbd, 0x16, 0xa0, 0x76, 0x94, 0xf2, 0xb0, 0x78, 0x94, 0xf2, 0x33,
+	0x09, 0x1c, 0x71, 0xc8, 0x16, 0xb6, 0xab, 0xa4, 0xed, 0x54, 0x1b, 0x8c, 0x35, 0x93, 0xc3, 0x58,
+	0x53, 0xe6, 0x6e, 0x4e, 0x78, 0x6e, 0xfa, 0xd5, 0x61, 0x2c, 0x3a, 0x1d, 0x76, 0x95, 0x3f, 0x6e,
+	0x3b, 0x15, 0xd3, 0xa6, 0xcb, 0x0a, 0x3b, 0xfc, 0x74, 0xef, 0xf0, 0x45, 0xf3, 0xf1, 0xf1, 0xff,
+	0x94, 0x04, 0x77, 0xc6, 0x3d, 0x2b, 0x51, 0x18, 0x0f, 0xc1, 0xb4, 0xde, 0x20, 0x6d, 0xdb, 0x59,
+	0xe4, 0x87, 0x76, 0x87, 0xc5, 0xf3, 0x4b, 0x47, 0xb9, 0x34, 0x02, 0xec, 0xb2, 0xed, 0xf4, 0x8e,
+	0x8d, 0x9b, 0x81, 0x9a, 0x6f, 0xb0, 0x67, 0xbb, 0xe0, 0x1e, 0xf2, 0x07, 0xdb, 0x2e, 0x08, 0xdb,
+	0x05, 0x79, 0x07, 0xcc, 0x59, 0xe6, 0xe3, 0xb6, 0x89, 0x4c, 0xe7, 0x49, 0xb5, 0xee, 0x76, 0x02,
+	0xe4, 0x35, 0x9f, 0xe2, 0xdd, 0x18, 0x5e, 0x4a, 0xb8, 0xde, 0x2b, 0x91, 0x01, 0x83, 0x50, 0x3b,
+	0x26, 0xd6, 0xbc, 0x6e, 0x83, 0xe4, 0x07, 0xe0, 0xd0, 0x67, 0xc4, 0xb4, 0xab, 0x6c, 0x3a, 0x74,
+	0x7b, 0xda, 0xcc, 0x52, 0x3a, 0xef, 0x8d, 0x8e, 0x79, 0x7f, 0x74, 0xcc, 0x6f, 0xf8, 0xa3, 0x63,
+	0xf1, 0x2c, 0x2f, 0x8f, 0x63, 0x9e, 0x0b, 0xa1, 0x0a, 0x9f, 0xbf, 0x51, 0x24, 0xed, 0x20, 0xfb,
+	0x66, 0xc2, 0xf0, 0xab, 0xa4, 0x7b, 0x0b, 0xac, 0x20, 0xb4, 0x41, 0x82, 0x07, 0xb6, 0xee, 0xfb,
+	0xef, 0xf5, 0x34, 0xc1, 0xb7, 0x5b, 0x60, 0xc6, 0xef, 0x50, 0xe2, 0x0e, 0x2e, 0x9e, 0xec, 0x76,
+	0x14, 0xd9, 0xef, 0x27, 0x62, 0x13, 0x06, 0x9a, 0x19, 0x0a, 0x10, 0x35, 0x31, 0x8c, 0xa8, 0x55,
+	0x9f, 0x11, 0x08, 0x53, 0xb3, 0x85, 0xd1, 0xe2, 0x70, 0xe2, 0x9d, 0x0b, 0x63, 0x84, 0xaf, 0x0e,
+	0xb5, 0x59, 0x77, 0xa1, 0xc4, 0xbf, 0x07, 0x1c, 0x14, 0x78, 0x52, 0xc7, 0x74, 0x50, 0xd8, 0xe3,
+	0xa0, 0xb0, 0x7c, 0x95, 0xf1, 0xe8, 0x5f, 0x3e, 0x8f, 0x74, 0x84, 0x72, 0x0e, 0xc9, 0xd5, 0xad,
+	0xe0, 0x1d, 0xee, 0xa7, 0x06, 0xfe, 0x98, 0x74, 0x6f, 0x96, 0x38, 0xa7, 0x20, 0x98, 0x34, 0xf6,
+	0x69, 0x04, 0x28, 0x98, 0xf8, 0x0b, 0x29, 0x98, 0xdc, 0x6f, 0x0a, 0x6e, 0x81, 0x59, 0x1b, 0xef,
+	0x54, 0x05, 0x43, 0x52, 0x07, 0x5c, 0x0f, 0x6b, 0xb1, 0xe9, 0x37, 0xef, 0x79, 0xe8, 0x33, 0x06,
+	0xb5, 0xc3, 0x36, 0xde, 0x11, 0x79, 0x0f, 0x5e, 0x18, 0x03, 0x83, 0xc4, 0xde, 0x0b, 0x03, 0xfe,
+	0x21, 0x81, 0xab, 0x7c, 0x16, 0xfb, 0xdf, 0xae, 0x49, 0x1d, 0xd3, 0x36, 0x42, 0xc7, 0x84, 0xb5,
+	0xfb, 0x8e, 0xbe, 0x85, 0xff, 0x16, 0x1e, 0xe5, 0xf7, 0xce, 0x48, 0xc5, 0xe3, 0xdd, 0x8e, 0x72,
+	0xd4, 0x13, 0xf6, 0x77, 0x60, 0x6f, 0xf0, 0x5c, 0x62, 0x55, 0x9b, 0xeb, 0x1b, 0x3c, 0x31, 0x0f,
+	0x25, 0x37, 0x38, 0x19, 0x51, 0x16, 0x07, 0x7c, 0x2a, 0x81, 0xa5, 0xd1, 0xc3, 0x16, 0x85, 0xfb,
+	0x09, 0x98, 0xaf, 0x07, 0x6a, 0xbd, 0xda, 0x37, 0xd3, 0x17, 0x95, 0x6e, 0x47, 0x39, 0xe3, 0xbf,
+	0x15, 0x06, 0xa5, 0xa0, 0x26, 0x07, 0x97, 0xbd, 0x39, 0x62, 0xe9, 0xc5, 0x61, 0x90, 0xac, 0x50,
+	0x43, 0x6e, 0x01, 0x39, 0x6c, 0x7a, 0xcd, 0x0f, 0xbe, 0xf3, 0xf3, 0xa1, 0x4f, 0xd3, 0x74, 0x61,
+	0x64, 0x51, 0x11, 0xce, 0x2e, 0x98, 0x0f, 0x7d, 0xc1, 0x5e, 0x1b, 0x6a, 0xaa, 0x27, 0x9c, 0xbe,
+	0x11, 0x43, 0x38, 0xca, 0xb3, 0x78, 0xdf, 0x8d, 0xe2, 0xd9, 0x17, 0x1e, 0xc9, 0xf3, 0xc0, 0x4b,
+	0xec, 0x1b, 0x09, 0x9c, 0x1f, 0xfe, 0xce, 0xbc, 0x1d, 0x23, 0xa8, 0x3e, 0xcd, 0xf4, 0x9d, 0x71,
+	0x35, 0x05, 0xc2, 0xa7, 0x12, 0x38, 0x1d, 0xfd, 0x1e, 0x5c, 0x8c, 0xb0, 0x1f, 0xa9, 0x91, 0xbe,
+	0x1d, 0x57, 0x43, 0x20, 0xf9, 0x41, 0x02, 0xd7, 0x63, 0x3d, 0xb6, 0x56, 0x23, 0x5c, 0xc5, 0x31,
+	0x92, 0xfe, 0x68, 0x1f, 0x8c, 0x88, 0x10, 0x3e, 0x07, 0x27, 0xc2, 0x1f, 0x22, 0xd7, 0x23, 0xbc,
+	0x84, 0x4a, 0xa7, 0xff, 0x1d, 0x47, 0x5a, 0x38, 0xff, 0x55, 0x02, 0xff, 0x19, 0xef, 0x7d, 0xb0,
+	0x1e, 0xe9, 0x6f, 0x0c, 0x6b, 0xe9, 0x8d, 0xfd, 0xb4, 0xd6, 0x57, 0x1d, 0xb1, 0x86, 0xb0, 0xa8,
+	0xea, 0x88, 0x63, 0x24, 0xb2, 0x3a, 0xc6, 0x1a, 0x44, 0xbe, 0x97, 0xc0, 0xe5, 0x51, 0xaf, 0xbe,
+	0xff, 0xbe, 0x87, 0x46, 0x23, 0xe8, 0xa7, 0xd7, 0x3e, 0x4c, 0xdf, 0xc7, 0x5c, 0xbc, 0xf7, 0xea,
+	0x6d, 0x46, 0x7a, 0xfd, 0x36, 0x23, 0xfd, 0xf6, 0x36, 0x23, 0x3d, 0x7f, 0x97, 0x99, 0x78, 0xfd,
+	0x2e, 0x33, 0xf1, 0xf3, 0xbb, 0xcc, 0xc4, 0xc3, 0x9b, 0x81, 0x31, 0x82, 0xfb, 0xca, 0x59, 0x7a,
+	0x8d, 0xfa, 0x1f, 0xea, 0x76, 0xe1, 0xa6, 0xba, 0xdb, 0xf7, 0xe7, 0x64, 0x36, 0x5a, 0xd4, 0xa6,
+	0xdc, 0x61, 0xfc, 0xc6, 0x9f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xa8, 0x5a, 0x6f, 0xc5, 0x71, 0x16,
+	0x00, 0x00,
+>>>>>>> 8d7b74400 ([Chore] Add amino name for tx msgs (#5784))
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/x/tokenfactory/types/tx.pb.go b/x/tokenfactory/types/tx.pb.go
index 4eda152540d..a658232ddb3 100644
--- a/x/tokenfactory/types/tx.pb.go
+++ b/x/tokenfactory/types/tx.pb.go
@@ -651,6 +651,7 @@ func init() {
 }
 
 var fileDescriptor_283b6c9a90a846b4 = []byte{
+<<<<<<< HEAD
 	// 790 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x56, 0xcf, 0x4f, 0xdb, 0x48,
 	0x14, 0x8e, 0xf9, 0xb5, 0x30, 0x6c, 0x36, 0x89, 0x61, 0xd9, 0xe0, 0x05, 0x9b, 0xb5, 0x04, 0xda,
@@ -702,6 +703,65 @@ var fileDescriptor_283b6c9a90a846b4 = []byte{
 	0xd2, 0x99, 0x5b, 0x27, 0xc9, 0x87, 0x7d, 0x51, 0xde, 0xb1, 0x2f, 0x7b, 0x17, 0x23, 0xbd, 0x3a,
 	0x87, 0xa4, 0x3e, 0xc7, 0xff, 0x81, 0xf9, 0xf7, 0x47, 0x00, 0x00, 0x00, 0xff, 0xff, 0xb9, 0x3e,
 	0x9e, 0xa1, 0x70, 0x09, 0x00, 0x00,
+=======
+	// 895 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x56, 0xbf, 0x6f, 0xdb, 0x46,
+	0x14, 0x36, 0x93, 0xd4, 0x75, 0x2e, 0x75, 0x25, 0xd1, 0x6e, 0xa2, 0x30, 0x0e, 0x99, 0x5e, 0x91,
+	0xc0, 0x2d, 0x2a, 0x12, 0x72, 0x8b, 0xa0, 0xd5, 0xd4, 0x28, 0x85, 0x91, 0xa1, 0x5a, 0x18, 0x4f,
+	0x45, 0x00, 0xe1, 0x28, 0x9d, 0x68, 0x42, 0xe1, 0x9d, 0xcb, 0x3b, 0x45, 0xf1, 0x56, 0xa0, 0x5b,
+	0xa7, 0x0e, 0xf9, 0x27, 0xba, 0xf5, 0x2f, 0xe8, 0x9c, 0x31, 0x40, 0x97, 0x4e, 0x84, 0x61, 0x03,
+	0xed, 0xce, 0xbf, 0xa0, 0xb8, 0x1f, 0xa4, 0x44, 0x4a, 0xb0, 0xa5, 0xa1, 0xc8, 0x62, 0x98, 0x77,
+	0xdf, 0xf7, 0xee, 0x7d, 0xdf, 0xbd, 0xf7, 0x4e, 0xe0, 0x21, 0x65, 0x31, 0x65, 0x11, 0xf3, 0x38,
+	0x1d, 0x63, 0x32, 0x42, 0x03, 0x4e, 0x93, 0x53, 0xef, 0x55, 0x3b, 0xc0, 0x1c, 0xb5, 0x3d, 0xfe,
+	0xda, 0x3d, 0x49, 0x28, 0xa7, 0xe6, 0x9e, 0x86, 0xb9, 0xf3, 0x30, 0x57, 0xc3, 0xac, 0xdd, 0x90,
+	0x86, 0x54, 0x02, 0x3d, 0xf1, 0x9f, 0xe2, 0x58, 0x0d, 0x14, 0x47, 0x84, 0x7a, 0xf2, 0xaf, 0x5e,
+	0xb2, 0x07, 0x32, 0x8e, 0x17, 0x20, 0x86, 0x8b, 0x43, 0x06, 0x34, 0x22, 0x0b, 0xfb, 0x64, 0x5c,
+	0xec, 0x8b, 0x0f, 0xb5, 0x0f, 0xdf, 0x18, 0xe0, 0xe3, 0x1e, 0x0b, 0x9f, 0x26, 0x18, 0x71, 0xfc,
+	0x3d, 0x26, 0x34, 0x36, 0x3f, 0x07, 0x9b, 0x0c, 0x93, 0x21, 0x4e, 0x9a, 0xc6, 0x03, 0x63, 0xff,
+	0x66, 0xb7, 0x91, 0xa5, 0xce, 0xf6, 0x29, 0x8a, 0x5f, 0x76, 0xa0, 0x5a, 0x87, 0xbe, 0x06, 0x98,
+	0x1e, 0xd8, 0x62, 0x93, 0x60, 0x28, 0x68, 0xcd, 0x6b, 0x12, 0xbc, 0x93, 0xa5, 0x4e, 0x4d, 0x83,
+	0xf5, 0x0e, 0xf4, 0x0b, 0x50, 0xe7, 0xd1, 0xaf, 0xff, 0xfe, 0xf1, 0xc5, 0xa7, 0x4b, 0x1d, 0x1a,
+	0xc8, 0x14, 0x5a, 0x8a, 0xf2, 0x02, 0xdc, 0x2e, 0x67, 0xe5, 0x63, 0x76, 0x42, 0x09, 0xc3, 0x66,
+	0x17, 0xd4, 0x08, 0x9e, 0xf6, 0x25, 0xb5, 0xaf, 0x4e, 0x56, 0x69, 0x5a, 0x59, 0xea, 0xdc, 0x56,
+	0x27, 0x57, 0x00, 0xd0, 0xdf, 0x26, 0x78, 0x7a, 0x24, 0x16, 0x64, 0x2c, 0x78, 0x66, 0x80, 0x0f,
+	0x7b, 0x2c, 0xec, 0x45, 0x84, 0xaf, 0xa3, 0xf6, 0x19, 0xd8, 0x44, 0x31, 0x9d, 0x10, 0x2e, 0xb5,
+	0xde, 0x3a, 0xb8, 0xeb, 0x2a, 0x73, 0x5d, 0x61, 0x7e, 0x7e, 0x75, 0xee, 0x53, 0x1a, 0x91, 0xee,
+	0x27, 0x6f, 0x53, 0x67, 0x63, 0x16, 0x49, 0xd1, 0xa0, 0xaf, 0xf9, 0xe6, 0x77, 0x60, 0x3b, 0x8e,
+	0x08, 0x3f, 0xa2, 0x4f, 0x86, 0xc3, 0x04, 0x33, 0xd6, 0xbc, 0x5e, 0x95, 0x20, 0xb6, 0xfb, 0x9c,
+	0xf6, 0x91, 0x02, 0x40, 0xbf, 0x4c, 0xe8, 0xd8, 0xc2, 0xc8, 0xbb, 0x4b, 0x8d, 0x14, 0x40, 0xd8,
+	0x00, 0x35, 0xad, 0x30, 0x77, 0x0e, 0xfe, 0xa3, 0x54, 0x77, 0x27, 0x09, 0x79, 0x3f, 0xaa, 0x0f,
+	0x41, 0x2d, 0x98, 0x24, 0xe4, 0x30, 0xa1, 0x71, 0x59, 0xf7, 0x5e, 0x96, 0x3a, 0x4d, 0xc5, 0x11,
+	0x80, 0xfe, 0x28, 0xa1, 0xf1, 0x4c, 0x79, 0x95, 0x74, 0x99, 0x76, 0x01, 0xd5, 0xda, 0x85, 0xce,
+	0x42, 0xfb, 0x9f, 0xba, 0xcc, 0x8f, 0x11, 0x09, 0xf1, 0x93, 0x61, 0x1c, 0xad, 0x65, 0xc1, 0x23,
+	0xf0, 0xc1, 0x7c, 0x8d, 0xd7, 0xb3, 0xd4, 0xf9, 0x48, 0x21, 0x75, 0x7d, 0xa9, 0x6d, 0xb3, 0x0d,
+	0x6e, 0x8a, 0xd2, 0x43, 0x22, 0xbe, 0x96, 0xb6, 0x9b, 0xa5, 0x4e, 0x7d, 0x56, 0x95, 0x72, 0x0b,
+	0xfa, 0x5b, 0x04, 0x4f, 0x65, 0x16, 0x97, 0x36, 0x84, 0x4c, 0xb6, 0xa5, 0x28, 0x4d, 0xd5, 0x10,
+	0xb3, 0xfc, 0x0b, 0x69, 0x67, 0x06, 0xd8, 0xed, 0xb1, 0xf0, 0x39, 0xe6, 0x5d, 0x3c, 0xa2, 0x09,
+	0x7e, 0x8e, 0xc9, 0xf0, 0x19, 0xa5, 0xe3, 0xff, 0x43, 0xe0, 0x21, 0xa8, 0x8b, 0xcb, 0x9f, 0x22,
+	0x56, 0xdc, 0x8f, 0xd6, 0x79, 0x2f, 0x4b, 0x9d, 0x3b, 0x8a, 0x52, 0x45, 0x40, 0xbf, 0x96, 0x2f,
+	0xe5, 0x37, 0xd8, 0x12, 0xaa, 0xf7, 0x97, 0xaa, 0x66, 0x98, 0xb7, 0x02, 0x29, 0x44, 0xe4, 0xd6,
+	0x3a, 0xa6, 0x74, 0x0c, 0x6d, 0xb0, 0xb7, 0x4c, 0x61, 0x61, 0xc1, 0x1b, 0x03, 0xec, 0x28, 0x80,
+	0xec, 0xef, 0x1e, 0xe6, 0x68, 0x88, 0x38, 0x5a, 0xc7, 0x01, 0x1f, 0x6c, 0xc5, 0x9a, 0xa6, 0xeb,
+	0xfc, 0xfe, 0xac, 0xce, 0xc9, 0xb8, 0xa8, 0xf3, 0x3c, 0x76, 0xf7, 0x8e, 0xae, 0x75, 0x3d, 0xec,
+	0x72, 0x32, 0xf4, 0x8b, 0x38, 0xf0, 0x3e, 0xb8, 0xb7, 0x24, 0xab, 0x22, 0xeb, 0xbf, 0xae, 0x81,
+	0x7a, 0x8f, 0x85, 0x87, 0x34, 0x19, 0xe0, 0xa3, 0x04, 0x11, 0x36, 0xc2, 0xc9, 0xfb, 0x69, 0x4c,
+	0x1f, 0xec, 0x70, 0x9d, 0xc0, 0x62, 0x73, 0x3e, 0xc8, 0x52, 0x67, 0x4f, 0xf1, 0x72, 0x50, 0xa5,
+	0x41, 0x97, 0x91, 0xcd, 0x1f, 0x40, 0x23, 0x5f, 0x9e, 0x8d, 0xb9, 0x1b, 0x32, 0xa2, 0x9d, 0xa5,
+	0x8e, 0x55, 0x89, 0x38, 0x3f, 0xea, 0x16, 0x89, 0x9d, 0x7d, 0x51, 0x30, 0x9f, 0x2d, 0x2d, 0x98,
+	0x91, 0xf0, 0xaf, 0x95, 0x53, 0xa0, 0x05, 0x9a, 0x55, 0x53, 0x73, 0xc7, 0x0f, 0x7e, 0xdf, 0x04,
+	0xd7, 0x7b, 0x2c, 0x34, 0x7f, 0x02, 0xb7, 0xe6, 0x1f, 0xbc, 0x2f, 0xdd, 0xcb, 0xde, 0x62, 0xb7,
+	0xfc, 0x10, 0x59, 0x5f, 0xaf, 0x83, 0x2e, 0x9e, 0xad, 0x17, 0xe0, 0x86, 0x7c, 0x6e, 0x1e, 0x5e,
+	0xc9, 0x16, 0x30, 0xab, 0xb5, 0x12, 0x6c, 0x3e, 0xba, 0x1c, 0xeb, 0x57, 0x47, 0x17, 0xb0, 0x15,
+	0xa2, 0xcf, 0x0f, 0x4f, 0x69, 0xd7, 0xdc, 0xe0, 0x5c, 0xc1, 0xae, 0x19, 0x7a, 0x15, 0xbb, 0x16,
+	0x87, 0x9a, 0xf9, 0xb3, 0x01, 0xea, 0x0b, 0xed, 0xdc, 0xbe, 0x32, 0x54, 0x95, 0x62, 0x7d, 0xbb,
+	0x36, 0xa5, 0x48, 0xe1, 0x17, 0x03, 0x34, 0x16, 0x87, 0xea, 0xc1, 0x2a, 0x01, 0xcb, 0x1c, 0xab,
+	0xb3, 0x3e, 0xa7, 0xc8, 0x62, 0x0a, 0xb6, 0xcb, 0x03, 0xc2, 0xbd, 0x32, 0x58, 0x09, 0x6f, 0x3d,
+	0x5e, 0x0f, 0x9f, 0x1f, 0xdc, 0xf5, 0xdf, 0x9e, 0xdb, 0xc6, 0xbb, 0x73, 0xdb, 0x38, 0x3b, 0xb7,
+	0x8d, 0xdf, 0x2e, 0xec, 0x8d, 0x77, 0x17, 0xf6, 0xc6, 0xdf, 0x17, 0xf6, 0xc6, 0x8f, 0xdf, 0x84,
+	0x11, 0x3f, 0x9e, 0x04, 0xee, 0x80, 0xc6, 0x9e, 0x8e, 0xdd, 0x7a, 0x89, 0x02, 0x96, 0x7f, 0x78,
+	0xaf, 0xda, 0x8f, 0xbd, 0xd7, 0xe5, 0x26, 0xe5, 0xa7, 0x27, 0x98, 0x05, 0x9b, 0xf2, 0x37, 0xe7,
+	0x57, 0xff, 0x05, 0x00, 0x00, 0xff, 0xff, 0xb2, 0x09, 0x13, 0xf3, 0x23, 0x0b, 0x00, 0x00,
+>>>>>>> 1e3149f0 ([Chore] Add amino name for tx msgs (#5784))
 }
 
 // Reference imports to suppress errors if they are not otherwise used.