diff --git a/go.mod b/go.mod
index 1ac816b0b23..b8aa070c5c2 100644
--- a/go.mod
+++ b/go.mod
@@ -4,6 +4,7 @@ go 1.20
 
 require (
 	cosmossdk.io/errors v1.0.0
+	cosmossdk.io/math v1.1.2
 	github.com/CosmWasm/wasmd v0.31.0
 	github.com/cosmos/cosmos-proto v1.0.0-beta.3
 	github.com/cosmos/cosmos-sdk v0.47.4
@@ -21,10 +22,10 @@ require (
 	github.com/mattn/go-sqlite3 v1.14.17
 	github.com/ory/dockertest/v3 v3.10.0
 	github.com/osmosis-labs/go-mutesting v0.0.0-20221208041716-b43bcd97b3b3
-	github.com/osmosis-labs/osmosis/osmomath v0.0.7-0.20230830181116-75b4d5f6a4c2
-	github.com/osmosis-labs/osmosis/osmoutils v0.0.7-0.20230830181116-75b4d5f6a4c2
-	github.com/osmosis-labs/osmosis/x/epochs v0.0.3-0.20230830181116-75b4d5f6a4c2
-	github.com/osmosis-labs/osmosis/x/ibc-hooks v0.0.9-0.20230830181116-75b4d5f6a4c2
+	github.com/osmosis-labs/osmosis/osmomath v0.0.7-0.20230901175805-bab180bc078b
+	github.com/osmosis-labs/osmosis/osmoutils v0.0.7-0.20230901175805-bab180bc078b
+	github.com/osmosis-labs/osmosis/x/epochs v0.0.3-0.20230901175805-bab180bc078b
+	github.com/osmosis-labs/osmosis/x/ibc-hooks v0.0.9-0.20230901175805-bab180bc078b
 	github.com/pkg/errors v0.9.1
 	github.com/rakyll/statik v0.1.7
 	github.com/spf13/cast v1.5.1
@@ -46,7 +47,6 @@ require (
 
 require (
 	4d63.com/gocheckcompilerdirectives v1.2.1 // indirect
-	cosmossdk.io/math v1.1.2 // indirect
 	github.com/4meepo/tagalign v1.3.2 // indirect
 	github.com/Abirdcfly/dupword v0.0.12 // indirect
 	github.com/Djarvur/go-err113 v0.1.0 // indirect
@@ -56,8 +56,8 @@ require (
 	github.com/alingse/asasalint v0.0.11 // indirect
 	github.com/benbjohnson/clock v1.3.0 // indirect
 	github.com/butuzov/mirror v1.1.0 // indirect
-	github.com/bytedance/sonic v1.10.0 // indirect
 	github.com/ccojocar/zxcvbn-go v1.0.1 // indirect
+	github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect
 	github.com/cosmos/gogoproto v1.4.11 // indirect
 	github.com/cosmos/iavl v0.19.5 // indirect
 	github.com/creachadair/taskgroup v0.3.2 // indirect
diff --git a/go.sum b/go.sum
index e5c1eb0a655..6cc82780993 100644
--- a/go.sum
+++ b/go.sum
@@ -200,7 +200,6 @@ github.com/bwesterb/go-ristretto v1.2.0/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7N
 github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1O2AihPM=
 github.com/bytedance/sonic v1.10.0-rc/go.mod h1:ElCzW+ufi8qKqNW0FY314xriJhyJhuoJ3gFZdAHF7NM=
 github.com/bytedance/sonic v1.10.0 h1:qtNZduETEIWJVIyDl01BeNxur2rW9OwTQ/yBqFRkKEk=
-github.com/bytedance/sonic v1.10.0/go.mod h1:iZcSUejdk5aukTND/Eu/ivjQuEL0Cu9/rf50Hi0u/g4=
 github.com/c-bata/go-prompt v0.2.2/go.mod h1:VzqtzE2ksDBcdln8G7mk2RX9QyGjH+OVqOCSiVIqS34=
 github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ=
 github.com/ccojocar/zxcvbn-go v1.0.1 h1:+sxrANSCj6CdadkcMnvde/GWU1vZiiXRbqYSCalV4/4=
@@ -963,22 +962,14 @@ github.com/osmosis-labs/cosmos-sdk v0.45.0-rc1.0.20230829222007-529c69c19915 h1:
 github.com/osmosis-labs/cosmos-sdk v0.45.0-rc1.0.20230829222007-529c69c19915/go.mod h1:L6USUt+QX9lIqUVCRs8DFEVRZJbCYbemmtcXb7GfHYE=
 github.com/osmosis-labs/go-mutesting v0.0.0-20221208041716-b43bcd97b3b3 h1:YlmchqTmlwdWSmrRmXKR+PcU96ntOd8u10vTaTZdcNY=
 github.com/osmosis-labs/go-mutesting v0.0.0-20221208041716-b43bcd97b3b3/go.mod h1:lV6KnqXYD/ayTe7310MHtM3I2q8Z6bBfMAi+bhwPYtI=
-github.com/osmosis-labs/osmosis/osmomath v0.0.3-dev.0.20230804142026-a81cfe3ddde7 h1:NTR4zfrPMP4pJ5T60zyZumBAnTWmTAQX/JSZLGrM9jI=
-github.com/osmosis-labs/osmosis/osmomath v0.0.3-dev.0.20230804142026-a81cfe3ddde7/go.mod h1:UlftwozB+QObT3o0YfkuuyL9fsVdgoWt0dm6J7MLYnU=
-github.com/osmosis-labs/osmosis/osmomath v0.0.7-0.20230830181116-75b4d5f6a4c2 h1:m3pUdFUUJ97iuKFB8szkuOp5aQdufaS7q0XPC/FfO5E=
-github.com/osmosis-labs/osmosis/osmomath v0.0.7-0.20230830181116-75b4d5f6a4c2/go.mod h1:MakArTjDobfAOPe2myXDSRRTeP8amtcYcSpG80UoOcE=
-github.com/osmosis-labs/osmosis/osmoutils v0.0.0-20230807183608-16c217dedde5 h1:j4ifxomFROGROHalqWwX7VPDgxOPotMB1GiAWdb03i4=
-github.com/osmosis-labs/osmosis/osmoutils v0.0.0-20230807183608-16c217dedde5/go.mod h1:Pl8Nzx6O6ow/+aqfMoMSz4hX+zz6RrnDYsooptECGxM=
-github.com/osmosis-labs/osmosis/osmoutils v0.0.7-0.20230830181116-75b4d5f6a4c2 h1:UU1YGwJieag2oSK4LyMTH9ulCkp5VGKOL57jWAmAx9U=
-github.com/osmosis-labs/osmosis/osmoutils v0.0.7-0.20230830181116-75b4d5f6a4c2/go.mod h1:6ekJSCvnwK3AB7RVJV0Z6xdC+WoMTyAyBjsjuXRU+Zg=
-github.com/osmosis-labs/osmosis/x/epochs v0.0.0-20230328024000-175ec88e4304 h1:RIrWLzIiZN5Xd2JOfSOtGZaf6V3qEQYg6EaDTAkMnCo=
-github.com/osmosis-labs/osmosis/x/epochs v0.0.0-20230328024000-175ec88e4304/go.mod h1:yPWoJTj5RKrXKUChAicp+G/4Ni/uVEpp27mi/FF/L9c=
-github.com/osmosis-labs/osmosis/x/epochs v0.0.3-0.20230830181116-75b4d5f6a4c2 h1:HPiXZ8SyAALdzrlD/vl3lTwYt+6PtcTy3rlQ2xwpL7Y=
-github.com/osmosis-labs/osmosis/x/epochs v0.0.3-0.20230830181116-75b4d5f6a4c2/go.mod h1:dAcK2rT6RDusLHuCWBvE+ciHg2vicoVDwiSpxsL4zvI=
-github.com/osmosis-labs/osmosis/x/ibc-hooks v0.0.0-20230807183608-16c217dedde5 h1:clEegVniz0zTTBXKfg2oymKa63IYUxcrVXM+LtsvCpA=
-github.com/osmosis-labs/osmosis/x/ibc-hooks v0.0.0-20230807183608-16c217dedde5/go.mod h1:sR0lpev9mcm9/9RY50T1og3UC3WpZAsINh/OmgrmFlg=
-github.com/osmosis-labs/osmosis/x/ibc-hooks v0.0.9-0.20230830181116-75b4d5f6a4c2 h1:Jt67EXP/eEXwkBJHaUgE+sqvP+WS4yVTQYDqQKgQWJ4=
-github.com/osmosis-labs/osmosis/x/ibc-hooks v0.0.9-0.20230830181116-75b4d5f6a4c2/go.mod h1:Vww+9pUXpbnemAQBEGimE7RwDQIRvBPySB/F3aPbExU=
+github.com/osmosis-labs/osmosis/osmomath v0.0.7-0.20230901175805-bab180bc078b h1:Sw0WZKfZrUz+ozJhcjZ64TQFOtOHwqSLKrNOLonhXUU=
+github.com/osmosis-labs/osmosis/osmomath v0.0.7-0.20230901175805-bab180bc078b/go.mod h1:MakArTjDobfAOPe2myXDSRRTeP8amtcYcSpG80UoOcE=
+github.com/osmosis-labs/osmosis/osmoutils v0.0.7-0.20230901175805-bab180bc078b h1:UFJcRrnM4q+kgvVvH35+Au5Mzj6Www4SYIF3LG0AvgM=
+github.com/osmosis-labs/osmosis/osmoutils v0.0.7-0.20230901175805-bab180bc078b/go.mod h1:6ekJSCvnwK3AB7RVJV0Z6xdC+WoMTyAyBjsjuXRU+Zg=
+github.com/osmosis-labs/osmosis/x/epochs v0.0.3-0.20230901175805-bab180bc078b h1:6w9/InjrxkQ3Q+3OKdtKQQh4lyUiMb5iknG3NhdtpHc=
+github.com/osmosis-labs/osmosis/x/epochs v0.0.3-0.20230901175805-bab180bc078b/go.mod h1:dAcK2rT6RDusLHuCWBvE+ciHg2vicoVDwiSpxsL4zvI=
+github.com/osmosis-labs/osmosis/x/ibc-hooks v0.0.9-0.20230901175805-bab180bc078b h1:hGUSuffzHPtbu3sjCZi9FK3NkSEkyexg3v2z/H6Bxwg=
+github.com/osmosis-labs/osmosis/x/ibc-hooks v0.0.9-0.20230901175805-bab180bc078b/go.mod h1:Vww+9pUXpbnemAQBEGimE7RwDQIRvBPySB/F3aPbExU=
 github.com/osmosis-labs/wasmd v0.31.0-osmo-v16 h1:X747cZYdnqc/+RV48iPVeGprpVb/fUWSaKGsZUWrdbg=
 github.com/osmosis-labs/wasmd v0.31.0-osmo-v16/go.mod h1:Rf8zW/GgBQyFRRB4s62VQHWA6sTlMFSjoDQQpoq64iI=
 github.com/otiai10/copy v1.2.0/go.mod h1:rrF5dJ5F0t/EWSYODDu4j9/vEeYHMkc8jt0zJChqQWw=
diff --git a/osmoutils/accum/accum.pb.go b/osmoutils/accum/accum.pb.go
index d4174f5fec4..5ab4656af58 100644
--- a/osmoutils/accum/accum.pb.go
+++ b/osmoutils/accum/accum.pb.go
@@ -4,6 +4,7 @@
 package accum
 
 import (
+	cosmossdk_io_math "cosmossdk.io/math"
 	fmt "fmt"
 	github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types"
 	types "github.com/cosmos/cosmos-sdk/types"
@@ -30,7 +31,7 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
 // shares belonging to it from all positions.
 type AccumulatorContent struct {
 	AccumValue  github_com_cosmos_cosmos_sdk_types.DecCoins `protobuf:"bytes,1,rep,name=accum_value,json=accumValue,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.DecCoins" json:"accum_value"`
-	TotalShares github_com_cosmos_cosmos_sdk_types.Dec      `protobuf:"bytes,2,opt,name=total_shares,json=totalShares,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"total_shares"`
+	TotalShares cosmossdk_io_math.LegacyDec                 `protobuf:"bytes,2,opt,name=total_shares,json=totalShares,proto3,customtype=cosmossdk.io/math.LegacyDec" json:"total_shares"`
 }
 
 func (m *AccumulatorContent) Reset()         { *m = AccumulatorContent{} }
@@ -114,7 +115,7 @@ var xxx_messageInfo_Options proto.InternalMessageInfo
 type Record struct {
 	// num_shares is the number of shares belonging to the position associated
 	// with this record.
-	NumShares github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,1,opt,name=num_shares,json=numShares,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"num_shares"`
+	NumShares cosmossdk_io_math.LegacyDec `protobuf:"bytes,1,opt,name=num_shares,json=numShares,proto3,customtype=cosmossdk.io/math.LegacyDec" json:"num_shares"`
 	// accum_value_per_share is the subset of coins per shar of the global
 	// accumulator value that allows to infer how much a position is entitled to
 	// per share that it owns.
@@ -205,33 +206,34 @@ func init() {
 func init() { proto.RegisterFile("osmosis/accum/v1beta1/accum.proto", fileDescriptor_4866f7c74a169dc2) }
 
 var fileDescriptor_4866f7c74a169dc2 = []byte{
-	// 412 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x93, 0x3f, 0x8f, 0xd3, 0x30,
-	0x1c, 0x86, 0xe3, 0x2b, 0xba, 0x53, 0x1d, 0x26, 0x8b, 0x8a, 0xe8, 0x84, 0xdc, 0xd2, 0x01, 0x55,
-	0x42, 0xe7, 0xe8, 0xae, 0x0b, 0x2b, 0x2d, 0x0b, 0x03, 0x02, 0x02, 0x62, 0x60, 0x89, 0x1c, 0xc7,
-	0x6a, 0x23, 0x12, 0x3b, 0xf2, 0x9f, 0x22, 0x76, 0x16, 0x36, 0x3e, 0x04, 0x13, 0x9f, 0xa4, 0x63,
-	0x47, 0x04, 0x52, 0x41, 0xed, 0x17, 0x41, 0xb1, 0x93, 0xd2, 0x81, 0x01, 0x21, 0x75, 0x72, 0x9c,
-	0xbc, 0x79, 0x9e, 0x9f, 0xde, 0x38, 0xf0, 0xbe, 0xd4, 0x95, 0xd4, 0x85, 0x8e, 0x29, 0x63, 0xb6,
-	0x8a, 0x57, 0xd7, 0x19, 0x37, 0xf4, 0xda, 0xef, 0x48, 0xad, 0xa4, 0x91, 0x68, 0xd0, 0x46, 0x88,
-	0xbf, 0xd9, 0x46, 0x2e, 0xef, 0x2c, 0xe4, 0x42, 0xba, 0x44, 0xdc, 0x5c, 0xf9, 0xf0, 0x25, 0x66,
-	0x2e, 0x1d, 0x67, 0x54, 0xf3, 0x03, 0x8d, 0xc9, 0x42, 0xf8, 0xe7, 0xe3, 0x1f, 0x00, 0xa2, 0xc7,
-	0x0d, 0xc7, 0x96, 0xd4, 0x48, 0x35, 0x97, 0xc2, 0x70, 0x61, 0x90, 0x82, 0xa1, 0xa3, 0xa7, 0x2b,
-	0x5a, 0x5a, 0x1e, 0x81, 0x51, 0x6f, 0x12, 0xde, 0xdc, 0x23, 0x1e, 0x46, 0x1a, 0x58, 0xe7, 0x25,
-	0x4f, 0x38, 0x9b, 0xcb, 0x42, 0xcc, 0xa6, 0xeb, 0xed, 0x30, 0xf8, 0xfa, 0x73, 0xf8, 0x70, 0x51,
-	0x98, 0xa5, 0xcd, 0x08, 0x93, 0x55, 0xdc, 0xca, 0xfd, 0x72, 0xa5, 0xf3, 0x77, 0xb1, 0xf9, 0x50,
-	0x73, 0xdd, 0xbd, 0xa3, 0x13, 0xe8, 0x2c, 0x6f, 0x1a, 0x09, 0x7a, 0x09, 0x6f, 0x1b, 0x69, 0x68,
-	0x99, 0xea, 0x25, 0x55, 0x5c, 0x47, 0x67, 0x23, 0x30, 0xe9, 0xcf, 0x48, 0x83, 0xfd, 0xbe, 0x1d,
-	0x3e, 0xf8, 0x37, 0x6c, 0x12, 0x3a, 0xc6, 0x2b, 0x87, 0x18, 0xf7, 0xe1, 0xc5, 0xf3, 0xda, 0x14,
-	0x52, 0xe8, 0xf1, 0x97, 0x1e, 0x3c, 0x4f, 0x38, 0x93, 0x2a, 0x47, 0xcf, 0x20, 0x14, 0xb6, 0xea,
-	0x34, 0xe0, 0xbf, 0x34, 0x7d, 0x61, 0x2b, 0x2f, 0x41, 0x1f, 0x01, 0x1c, 0x1c, 0x95, 0x95, 0xd6,
-	0x5c, 0x79, 0x76, 0x74, 0x76, 0xaa, 0xda, 0xd0, 0x9f, 0xda, 0x5e, 0x70, 0xe5, 0xe6, 0x40, 0x9f,
-	0x00, 0xbc, 0x6b, 0x05, 0x2b, 0x69, 0x51, 0xf1, 0x3c, 0x55, 0xfc, 0x3d, 0x55, 0xb9, 0x4e, 0x5d,
-	0x1b, 0x51, 0xef, 0x54, 0x83, 0x0c, 0x0e, 0xc6, 0xc4, 0x0b, 0x5f, 0x37, 0x3e, 0xf4, 0x08, 0x5e,
-	0x48, 0xdf, 0x7b, 0x74, 0x6b, 0x04, 0x26, 0xe1, 0x0d, 0x26, 0x7f, 0x3d, 0xb4, 0xa4, 0xfd, 0x3a,
-	0x49, 0x17, 0x9f, 0x3d, 0x5d, 0xef, 0x30, 0xd8, 0xec, 0x30, 0xf8, 0xb5, 0xc3, 0xe0, 0xf3, 0x1e,
-	0x07, 0x9b, 0x3d, 0x0e, 0xbe, 0xed, 0x71, 0xf0, 0x36, 0x3e, 0x9a, 0xab, 0x85, 0x5d, 0x95, 0x34,
-	0xd3, 0xdd, 0xc6, 0xad, 0xd6, 0x14, 0x65, 0xfb, 0xef, 0x64, 0xe7, 0xee, 0x84, 0x4f, 0x7f, 0x07,
-	0x00, 0x00, 0xff, 0xff, 0xd7, 0xe4, 0xc9, 0x60, 0x53, 0x03, 0x00, 0x00,
+	// 430 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x93, 0x3f, 0x6f, 0xd3, 0x40,
+	0x18, 0xc6, 0x73, 0x0d, 0x6a, 0x95, 0x0b, 0xd3, 0x89, 0x08, 0xab, 0x20, 0x27, 0x84, 0x25, 0x12,
+	0xea, 0x9d, 0xda, 0x2e, 0xac, 0xa4, 0x15, 0x12, 0x12, 0x12, 0xc8, 0x20, 0x06, 0x16, 0xeb, 0x7c,
+	0x3e, 0x25, 0xa7, 0xda, 0xf7, 0x46, 0xf7, 0xa7, 0xa8, 0x3b, 0x0b, 0x1b, 0x2b, 0x5f, 0x81, 0x4f,
+	0xd2, 0x31, 0x23, 0x62, 0x28, 0x28, 0xf9, 0x22, 0xc8, 0x77, 0x76, 0xe9, 0xc0, 0xc0, 0x92, 0xe9,
+	0xfc, 0xda, 0xcf, 0xfb, 0x7b, 0x5e, 0x3d, 0x7e, 0x0f, 0x3f, 0x01, 0x5b, 0x83, 0x55, 0x96, 0x71,
+	0x21, 0x7c, 0xcd, 0x2e, 0x8f, 0x0b, 0xe9, 0xf8, 0x71, 0xac, 0xe8, 0xca, 0x80, 0x03, 0x32, 0x6a,
+	0x25, 0x34, 0xbe, 0x6c, 0x25, 0x87, 0x0f, 0x16, 0xb0, 0x80, 0xa0, 0x60, 0xcd, 0x53, 0x14, 0x1f,
+	0xa6, 0x22, 0xa8, 0x59, 0xc1, 0xad, 0xbc, 0xa5, 0x09, 0x50, 0x3a, 0x7e, 0x9f, 0xae, 0x11, 0x26,
+	0x2f, 0x1a, 0x8e, 0xaf, 0xb8, 0x03, 0x73, 0x06, 0xda, 0x49, 0xed, 0x88, 0xc1, 0xc3, 0x40, 0xcf,
+	0x2f, 0x79, 0xe5, 0x65, 0x82, 0x26, 0xfd, 0xd9, 0xf0, 0xe4, 0x31, 0x8d, 0x30, 0xda, 0xc0, 0x3a,
+	0x5f, 0x7a, 0x2e, 0xc5, 0x19, 0x28, 0x3d, 0x3f, 0xbd, 0xbe, 0x19, 0xf7, 0xbe, 0xff, 0x1a, 0x3f,
+	0x5b, 0x28, 0xb7, 0xf4, 0x05, 0x15, 0x50, 0xb3, 0xd6, 0x3c, 0x1e, 0x47, 0xb6, 0xbc, 0x60, 0xee,
+	0x6a, 0x25, 0x6d, 0xd7, 0x63, 0x33, 0x1c, 0x5c, 0x3e, 0x34, 0x26, 0xe4, 0x25, 0xbe, 0xef, 0xc0,
+	0xf1, 0x2a, 0xb7, 0x4b, 0x6e, 0xa4, 0x4d, 0xf6, 0x26, 0x68, 0x36, 0x98, 0x3f, 0x6d, 0xb0, 0x3f,
+	0x6f, 0xc6, 0x8f, 0x22, 0xc4, 0x96, 0x17, 0x54, 0x01, 0xab, 0xb9, 0x5b, 0xd2, 0xd7, 0x72, 0xc1,
+	0xc5, 0xd5, 0xb9, 0x14, 0xd9, 0x30, 0x34, 0xbe, 0x0b, 0x7d, 0xd3, 0x01, 0x3e, 0x78, 0xb3, 0x72,
+	0x0a, 0xb4, 0x9d, 0x7e, 0xeb, 0xe3, 0xfd, 0x4c, 0x0a, 0x30, 0x25, 0x99, 0x63, 0xac, 0x7d, 0xdd,
+	0xb1, 0xd1, 0xff, 0xb3, 0x07, 0xda, 0xd7, 0x91, 0x4c, 0x3e, 0x23, 0x3c, 0xba, 0x13, 0x4b, 0xbe,
+	0x92, 0x26, 0x02, 0x93, 0xbd, 0x5d, 0x05, 0x44, 0xfe, 0x06, 0xf4, 0x56, 0x9a, 0x30, 0x07, 0xf9,
+	0x82, 0xf0, 0x43, 0xaf, 0x45, 0xc5, 0x55, 0x2d, 0xcb, 0xdc, 0xc8, 0x4f, 0xdc, 0x94, 0x36, 0x0f,
+	0x11, 0x24, 0xfd, 0x5d, 0x0d, 0x32, 0xba, 0x75, 0xcc, 0xa2, 0xe1, 0xfb, 0xc6, 0x8f, 0x3c, 0xc7,
+	0x07, 0x10, 0xc3, 0x4e, 0xee, 0x4d, 0xd0, 0x6c, 0x78, 0x92, 0xd2, 0x7f, 0xae, 0x27, 0x6d, 0x7f,
+	0x49, 0xd6, 0xc9, 0xe7, 0xaf, 0xae, 0x37, 0x29, 0x5a, 0x6f, 0x52, 0xf4, 0x7b, 0x93, 0xa2, 0xaf,
+	0xdb, 0xb4, 0xb7, 0xde, 0xa6, 0xbd, 0x1f, 0xdb, 0xb4, 0xf7, 0x91, 0xdd, 0x99, 0xab, 0x85, 0x1d,
+	0x55, 0xbc, 0xb0, 0x5d, 0x11, 0x4e, 0xef, 0x54, 0xd5, 0xde, 0x92, 0x62, 0x3f, 0xec, 0xf2, 0xe9,
+	0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x02, 0x19, 0x52, 0x8b, 0x3d, 0x03, 0x00, 0x00,
 }
 
 func (m *AccumulatorContent) Marshal() (dAtA []byte, err error) {
diff --git a/osmoutils/go.mod b/osmoutils/go.mod
index e4d72e16319..14413f3cd02 100644
--- a/osmoutils/go.mod
+++ b/osmoutils/go.mod
@@ -3,6 +3,7 @@ module github.com/osmosis-labs/osmosis/osmoutils
 go 1.20
 
 require (
+	cosmossdk.io/math v1.1.2
 	github.com/cosmos/cosmos-sdk v0.47.4
 	github.com/cosmos/iavl v0.19.5
 	github.com/cosmos/ibc-go/v4 v4.3.1
@@ -16,7 +17,6 @@ require (
 )
 
 require (
-	cosmossdk.io/math v1.1.2 // indirect
 	filippo.io/edwards25519 v1.0.0-rc.1 // indirect
 	github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect
 	github.com/99designs/keyring v1.2.1 // indirect
diff --git a/osmoutils/sumtree/tree.pb.go b/osmoutils/sumtree/tree.pb.go
index 4f007610f28..f5682676f62 100644
--- a/osmoutils/sumtree/tree.pb.go
+++ b/osmoutils/sumtree/tree.pb.go
@@ -4,9 +4,9 @@
 package sumtree
 
 import (
+	cosmossdk_io_math "cosmossdk.io/math"
 	fmt "fmt"
 	_ "github.com/cosmos/cosmos-sdk/types"
-	github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types"
 	_ "github.com/gogo/protobuf/gogoproto"
 	proto "github.com/gogo/protobuf/proto"
 	io "io"
@@ -70,8 +70,8 @@ func (m *Node) GetChildren() []*Child {
 }
 
 type Child struct {
-	Index        []byte                                 `protobuf:"bytes,1,opt,name=index,proto3" json:"index,omitempty"`
-	Accumulation github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,2,opt,name=accumulation,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"accumulation"`
+	Index        []byte                `protobuf:"bytes,1,opt,name=index,proto3" json:"index,omitempty"`
+	Accumulation cosmossdk_io_math.Int `protobuf:"bytes,2,opt,name=accumulation,proto3,customtype=cosmossdk.io/math.Int" json:"accumulation"`
 }
 
 func (m *Child) Reset()         { *m = Child{} }
@@ -169,26 +169,26 @@ func init() {
 }
 
 var fileDescriptor_31a1c5f55b935f78 = []byte{
-	// 302 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x91, 0xb1, 0x4e, 0xeb, 0x30,
-	0x18, 0x85, 0xe3, 0x7b, 0x53, 0x04, 0xa6, 0x53, 0x54, 0xa4, 0xa8, 0x42, 0x6e, 0x94, 0x01, 0x65,
-	0xa9, 0x4d, 0x60, 0xe9, 0x88, 0xca, 0x84, 0x40, 0x0c, 0x19, 0xd9, 0x1c, 0xc7, 0x4d, 0x2d, 0x92,
-	0xb8, 0xc4, 0x0e, 0x82, 0xb7, 0xe0, 0xb1, 0x3a, 0x76, 0x44, 0x0c, 0x15, 0x4a, 0x5e, 0x04, 0xc5,
-	0x09, 0x05, 0x24, 0x24, 0xa6, 0xdf, 0xc7, 0xfe, 0x74, 0xce, 0x91, 0x7f, 0xe8, 0x4b, 0x95, 0x4b,
-	0x25, 0x14, 0x51, 0x55, 0xae, 0x4b, 0xce, 0xc9, 0x63, 0x18, 0x73, 0x4d, 0x43, 0xd2, 0x0a, 0xbc,
-	0x2a, 0xa5, 0x96, 0xce, 0x51, 0xcf, 0x60, 0xa5, 0x65, 0xc9, 0x71, 0x4f, 0x8c, 0x47, 0xa9, 0x4c,
-	0xa5, 0x21, 0x48, 0x7b, 0xea, 0xe0, 0x31, 0x62, 0x86, 0x26, 0x31, 0x55, 0x5f, 0x66, 0x4c, 0x8a,
-	0xa2, 0x7b, 0xf7, 0x2f, 0xa0, 0x7d, 0x2b, 0x13, 0xee, 0xcc, 0xe0, 0x3e, 0x5b, 0x8a, 0x2c, 0x29,
-	0x79, 0xe1, 0x02, 0xef, 0x7f, 0x70, 0x78, 0x76, 0x8c, 0x7f, 0xcd, 0xc1, 0x97, 0x2d, 0x16, 0xed,
-	0x68, 0xff, 0x01, 0x0e, 0xcc, 0x95, 0x33, 0x82, 0x03, 0x51, 0x24, 0xfc, 0xc9, 0x05, 0x1e, 0x08,
-	0x86, 0x51, 0x27, 0x9c, 0x08, 0x0e, 0x29, 0x63, 0x55, 0x5e, 0x65, 0x54, 0x0b, 0x59, 0xb8, 0xff,
-	0x3c, 0x10, 0x1c, 0xcc, 0xf1, 0x7a, 0x3b, 0xb1, 0xde, 0xb6, 0x93, 0x93, 0x54, 0xe8, 0x65, 0x15,
-	0x63, 0x26, 0x73, 0xd2, 0x37, 0xed, 0xc6, 0x54, 0x25, 0xf7, 0x44, 0x3f, 0xaf, 0xb8, 0xc2, 0x57,
-	0x85, 0x8e, 0x7e, 0x78, 0xf8, 0x33, 0x68, 0xdf, 0x70, 0xba, 0x70, 0x4e, 0xa1, 0x9d, 0x71, 0xba,
-	0x30, 0x81, 0x7f, 0x15, 0x36, 0xe4, 0xfc, 0x7a, 0x5d, 0x23, 0xb0, 0xa9, 0x11, 0x78, 0xaf, 0x11,
-	0x78, 0x69, 0x90, 0xb5, 0x69, 0x90, 0xf5, 0xda, 0x20, 0xeb, 0x2e, 0xfc, 0xd6, 0xa4, 0xf7, 0x99,
-	0x66, 0x34, 0x56, 0x9f, 0xc2, 0xcc, 0x4a, 0x8b, 0x6c, 0xb7, 0x9b, 0x78, 0xcf, 0x7c, 0xe1, 0xf9,
-	0x47, 0x00, 0x00, 0x00, 0xff, 0xff, 0x30, 0x34, 0x4b, 0x32, 0xb5, 0x01, 0x00, 0x00,
+	// 298 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x91, 0xb1, 0x4e, 0xf3, 0x30,
+	0x14, 0x85, 0xe3, 0xff, 0x6f, 0x11, 0x98, 0x4e, 0x51, 0x2b, 0x55, 0x15, 0xb8, 0x55, 0xa6, 0x2e,
+	0xd8, 0x04, 0x96, 0x8e, 0x50, 0x26, 0x04, 0x62, 0xc8, 0xc8, 0x84, 0xe3, 0xb8, 0x89, 0x45, 0x92,
+	0x8b, 0x62, 0x07, 0xf1, 0x18, 0x3c, 0x56, 0xc7, 0x8e, 0x88, 0xa1, 0x42, 0xc9, 0x8b, 0xa0, 0x38,
+	0xa1, 0x08, 0x09, 0x89, 0xc9, 0x3e, 0xf6, 0x77, 0xcf, 0x3d, 0xba, 0x17, 0x7b, 0xa0, 0x33, 0xd0,
+	0x4a, 0x33, 0x5d, 0x66, 0xa6, 0x90, 0x92, 0x3d, 0xfb, 0xa1, 0x34, 0xdc, 0x67, 0x8d, 0xa0, 0x4f,
+	0x05, 0x18, 0x70, 0x47, 0x1d, 0x43, 0xb5, 0x81, 0x42, 0xd2, 0x8e, 0x98, 0x0c, 0x63, 0x88, 0xc1,
+	0x12, 0xac, 0xb9, 0xb5, 0xf0, 0x84, 0x08, 0x4b, 0xb3, 0x90, 0xeb, 0x6f, 0x33, 0x01, 0x2a, 0x6f,
+	0xff, 0xbd, 0x0b, 0xdc, 0xbb, 0x83, 0x48, 0xba, 0x0b, 0xbc, 0x2f, 0x12, 0x95, 0x46, 0x85, 0xcc,
+	0xc7, 0x68, 0xf6, 0x7f, 0x7e, 0x78, 0x76, 0x44, 0x7f, 0xed, 0x43, 0xaf, 0x1a, 0x2c, 0xd8, 0xd1,
+	0xde, 0x03, 0xee, 0xdb, 0x27, 0x77, 0x88, 0xfb, 0x2a, 0x8f, 0xe4, 0xcb, 0x18, 0xcd, 0xd0, 0x7c,
+	0x10, 0xb4, 0xc2, 0xbd, 0xc4, 0x03, 0x2e, 0x44, 0x99, 0x95, 0x29, 0x37, 0x0a, 0xf2, 0xf1, 0xbf,
+	0x19, 0x9a, 0x1f, 0x2c, 0x8f, 0xd7, 0xdb, 0xa9, 0xf3, 0xbe, 0x9d, 0x8e, 0xda, 0x78, 0x3a, 0x7a,
+	0xa4, 0x0a, 0x58, 0xc6, 0x4d, 0x42, 0xaf, 0x73, 0x13, 0xfc, 0x28, 0xf1, 0x16, 0xb8, 0x77, 0x2b,
+	0xf9, 0xca, 0x3d, 0xc5, 0xbd, 0x54, 0xf2, 0x95, 0xf5, 0xff, 0x2b, 0x9f, 0x25, 0x97, 0x37, 0xeb,
+	0x8a, 0xa0, 0x4d, 0x45, 0xd0, 0x47, 0x45, 0xd0, 0x6b, 0x4d, 0x9c, 0x4d, 0x4d, 0x9c, 0xb7, 0x9a,
+	0x38, 0xf7, 0x7e, 0xac, 0x4c, 0x52, 0x86, 0x54, 0x40, 0xc6, 0x3a, 0x9f, 0x93, 0x94, 0x87, 0xfa,
+	0x4b, 0xd8, 0xb3, 0x34, 0x2a, 0xdd, 0xad, 0x22, 0xdc, 0xb3, 0x13, 0x3b, 0xff, 0x0c, 0x00, 0x00,
+	0xff, 0xff, 0x17, 0xd5, 0x9c, 0x4b, 0xa4, 0x01, 0x00, 0x00,
 }
 
 func (m *Node) Marshal() (dAtA []byte, err error) {
diff --git a/proto/osmosis/accum/v1beta1/accum.proto b/proto/osmosis/accum/v1beta1/accum.proto
index 9ba71d424e4..ab54ddbb35b 100644
--- a/proto/osmosis/accum/v1beta1/accum.proto
+++ b/proto/osmosis/accum/v1beta1/accum.proto
@@ -15,7 +15,8 @@ message AccumulatorContent {
     (gogoproto.nullable) = false
   ];
   string total_shares = 2 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec",
     (gogoproto.nullable) = false
   ];
 }
@@ -28,7 +29,8 @@ message Record {
   // num_shares is the number of shares belonging to the position associated
   // with this record.
   string num_shares = 1 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec",
     (gogoproto.nullable) = false
   ];
   // accum_value_per_share is the subset of coins per shar of the global
diff --git a/proto/osmosis/concentrated-liquidity/gov.proto b/proto/osmosis/concentrated-liquidity/gov.proto
index c5c51a42bdf..929fe69c162 100644
--- a/proto/osmosis/concentrated-liquidity/gov.proto
+++ b/proto/osmosis/concentrated-liquidity/gov.proto
@@ -53,7 +53,8 @@ message PoolRecord {
   uint64 tick_spacing = 3 [ (gogoproto.moretags) = "yaml:\"tick_spacing\"" ];
   reserved 4;
   string spread_factor = 5 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec",
     (gogoproto.moretags) = "yaml:\"spread_factor\"",
     (gogoproto.nullable) = false
   ];
diff --git a/proto/osmosis/concentrated-liquidity/incentive_record.proto b/proto/osmosis/concentrated-liquidity/incentive_record.proto
index 85c6925a035..90a5c392a5e 100644
--- a/proto/osmosis/concentrated-liquidity/incentive_record.proto
+++ b/proto/osmosis/concentrated-liquidity/incentive_record.proto
@@ -45,7 +45,8 @@ message IncentiveRecordBody {
 
   // emission_rate is the incentive emission rate per second
   string emission_rate = 2 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec",
     (gogoproto.moretags) = "yaml:\"emission_rate\"",
     (gogoproto.nullable) = false
   ];
diff --git a/proto/osmosis/concentrated-liquidity/params.proto b/proto/osmosis/concentrated-liquidity/params.proto
index c9da80ecff0..355b9942825 100644
--- a/proto/osmosis/concentrated-liquidity/params.proto
+++ b/proto/osmosis/concentrated-liquidity/params.proto
@@ -15,7 +15,8 @@ message Params {
   repeated uint64 authorized_tick_spacing = 1
       [ (gogoproto.moretags) = "yaml:\"authorized_tick_spacing\"" ];
   repeated string authorized_spread_factors = 2 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec",
     (gogoproto.moretags) = "yaml:\"authorized_spread_factors\"",
     (gogoproto.nullable) = false
   ];
@@ -26,7 +27,8 @@ message Params {
   // This field can range from (0,1]. If set to 1, it indicates that all
   // incentives stay at cl pool.
   string balancer_shares_reward_discount = 3 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec",
     (gogoproto.moretags) = "yaml:\"balancer_shares_reward_discount\"",
     (gogoproto.nullable) = false
   ];
diff --git a/proto/osmosis/concentrated-liquidity/pool-model/concentrated/tx.proto b/proto/osmosis/concentrated-liquidity/pool-model/concentrated/tx.proto
index e243df39e43..113327ddf89 100644
--- a/proto/osmosis/concentrated-liquidity/pool-model/concentrated/tx.proto
+++ b/proto/osmosis/concentrated-liquidity/pool-model/concentrated/tx.proto
@@ -18,7 +18,8 @@ message MsgCreateConcentratedPool {
   string denom1 = 3 [ (gogoproto.moretags) = "yaml:\"denom1\"" ];
   uint64 tick_spacing = 4 [ (gogoproto.moretags) = "yaml:\"tick_spacing\"" ];
   string spread_factor = 5 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec",
     (gogoproto.moretags) = "yaml:\"spread_factor\"",
     (gogoproto.nullable) = false
   ];
diff --git a/proto/osmosis/concentrated-liquidity/pool.proto b/proto/osmosis/concentrated-liquidity/pool.proto
index c74ec852467..447aa7838d5 100644
--- a/proto/osmosis/concentrated-liquidity/pool.proto
+++ b/proto/osmosis/concentrated-liquidity/pool.proto
@@ -31,7 +31,8 @@ message Pool {
 
   // Amount of total liquidity
   string current_tick_liquidity = 5 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec",
     (gogoproto.moretags) = "yaml:\"current_tick_liquidity\"",
     (gogoproto.nullable) = false
   ];
@@ -53,7 +54,8 @@ message Pool {
 
   // spread_factor is the ratio that is charged on the amount of token in.
   string spread_factor = 12 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec",
     (gogoproto.moretags) = "yaml:\"spread_factor\"",
     (gogoproto.nullable) = false
   ];
diff --git a/proto/osmosis/concentrated-liquidity/position.proto b/proto/osmosis/concentrated-liquidity/position.proto
index 2cd7fd1a004..bcc6ea0a1cb 100644
--- a/proto/osmosis/concentrated-liquidity/position.proto
+++ b/proto/osmosis/concentrated-liquidity/position.proto
@@ -28,7 +28,8 @@ message Position {
     (gogoproto.moretags) = "yaml:\"join_time\""
   ];
   string liquidity = 7 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec",
     (gogoproto.moretags) = "yaml:\"liquidity\"",
     (gogoproto.nullable) = false
   ];
diff --git a/proto/osmosis/concentrated-liquidity/query.proto b/proto/osmosis/concentrated-liquidity/query.proto
index 1ecb3404916..024cfe0cf0d 100644
--- a/proto/osmosis/concentrated-liquidity/query.proto
+++ b/proto/osmosis/concentrated-liquidity/query.proto
@@ -166,7 +166,8 @@ message ParamsResponse { Params params = 1 [ (gogoproto.nullable) = false ]; }
 
 message TickLiquidityNet {
   string liquidity_net = 1 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec",
     (gogoproto.moretags) = "yaml:\"liquidity_net\"",
     (gogoproto.nullable) = false
   ];
@@ -175,7 +176,8 @@ message TickLiquidityNet {
 
 message LiquidityDepthWithRange {
   string liquidity_amount = 1 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec",
     (gogoproto.moretags) = "yaml:\"liquidity_net\"",
     (gogoproto.nullable) = false
   ];
@@ -197,7 +199,8 @@ message LiquidityNetInDirectionResponse {
       [ (gogoproto.nullable) = false ];
   int64 current_tick = 2;
   string current_liquidity = 3 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec",
     (gogoproto.moretags) = "yaml:\"current_liquidity\"",
     (gogoproto.nullable) = false
   ];
diff --git a/proto/osmosis/concentrated-liquidity/tickInfo.proto b/proto/osmosis/concentrated-liquidity/tickInfo.proto
index 04a652c1cb6..0193c9d72dc 100644
--- a/proto/osmosis/concentrated-liquidity/tickInfo.proto
+++ b/proto/osmosis/concentrated-liquidity/tickInfo.proto
@@ -13,12 +13,14 @@ option go_package = "github.com/osmosis-labs/osmosis/v19/x/concentrated-liquidit
 
 message TickInfo {
   string liquidity_gross = 1 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec",
     (gogoproto.moretags) = "yaml:\"liquidity_gross\"",
     (gogoproto.nullable) = false
   ];
   string liquidity_net = 2 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec",
     (gogoproto.moretags) = "yaml:\"liquidity_net\"",
     (gogoproto.nullable) = false
   ];
diff --git a/proto/osmosis/concentrated-liquidity/tx.proto b/proto/osmosis/concentrated-liquidity/tx.proto
index 707bbbfb3eb..4f5f3fe880c 100644
--- a/proto/osmosis/concentrated-liquidity/tx.proto
+++ b/proto/osmosis/concentrated-liquidity/tx.proto
@@ -42,12 +42,14 @@ message MsgCreatePosition {
     (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"
   ];
   string token_min_amount0 = 6 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.Int",
     (gogoproto.moretags) = "yaml:\"token_min_amount0\"",
     (gogoproto.nullable) = false
   ];
   string token_min_amount1 = 7 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.Int",
     (gogoproto.moretags) = "yaml:\"token_min_amount1\"",
     (gogoproto.nullable) = false
   ];
@@ -56,17 +58,20 @@ message MsgCreatePosition {
 message MsgCreatePositionResponse {
   uint64 position_id = 1 [ (gogoproto.moretags) = "yaml:\"position_id\"" ];
   string amount0 = 2 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.Int",
     (gogoproto.moretags) = "yaml:\"amount0\"",
     (gogoproto.nullable) = false
   ];
   string amount1 = 3 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.Int",
     (gogoproto.moretags) = "yaml:\"amount1\"",
     (gogoproto.nullable) = false
   ];
   string liquidity_created = 5 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec",
     (gogoproto.moretags) = "yaml:\"liquidity_created\"",
     (gogoproto.nullable) = false
   ];
@@ -86,13 +91,15 @@ message MsgAddToPosition {
   string sender = 2 [ (gogoproto.moretags) = "yaml:\"sender\"" ];
   // amount0 represents the amount of token0 willing to put in.
   string amount0 = 3 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.Int",
     (gogoproto.moretags) = "yaml:\"amount_0\"",
     (gogoproto.nullable) = false
   ];
   // amount1 represents the amount of token1 willing to put in.
   string amount1 = 4 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.Int",
     (gogoproto.moretags) = "yaml:\"amount_1\"",
     (gogoproto.nullable) = false
   ];
@@ -101,7 +108,8 @@ message MsgAddToPosition {
   // corresponding to the liquidity that is being added, not the total
   // liquidity of the position.
   string token_min_amount0 = 5 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.Int",
     (gogoproto.moretags) = "yaml:\"token_min_amount0\"",
     (gogoproto.nullable) = false
   ];
@@ -110,7 +118,8 @@ message MsgAddToPosition {
   // corresponding to the liquidity that is being added, not the total
   // liquidity of the position.
   string token_min_amount1 = 6 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.Int",
     (gogoproto.moretags) = "yaml:\"token_min_amount1\"",
     (gogoproto.nullable) = false
   ];
@@ -119,12 +128,14 @@ message MsgAddToPosition {
 message MsgAddToPositionResponse {
   uint64 position_id = 1 [ (gogoproto.moretags) = "yaml:\"position_id\"" ];
   string amount0 = 2 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.Int",
     (gogoproto.moretags) = "yaml:\"amount0\"",
     (gogoproto.nullable) = false
   ];
   string amount1 = 3 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.Int",
     (gogoproto.moretags) = "yaml:\"amount1\"",
     (gogoproto.nullable) = false
   ];
@@ -137,7 +148,8 @@ message MsgWithdrawPosition {
   uint64 position_id = 1 [ (gogoproto.moretags) = "yaml:\"position_id\"" ];
   string sender = 2 [ (gogoproto.moretags) = "yaml:\"sender\"" ];
   string liquidity_amount = 3 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec",
     (gogoproto.moretags) = "yaml:\"liquidity_amount\"",
     (gogoproto.nullable) = false
   ];
@@ -145,12 +157,14 @@ message MsgWithdrawPosition {
 
 message MsgWithdrawPositionResponse {
   string amount0 = 1 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.Int",
     (gogoproto.moretags) = "yaml:\"amount0\"",
     (gogoproto.nullable) = false
   ];
   string amount1 = 2 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.Int",
     (gogoproto.moretags) = "yaml:\"amount1\"",
     (gogoproto.nullable) = false
   ];
diff --git a/proto/osmosis/cosmwasmpool/v1beta1/model/module_query_msg.proto b/proto/osmosis/cosmwasmpool/v1beta1/model/module_query_msg.proto
index 503e238487d..7dfc28f79dd 100644
--- a/proto/osmosis/cosmwasmpool/v1beta1/model/module_query_msg.proto
+++ b/proto/osmosis/cosmwasmpool/v1beta1/model/module_query_msg.proto
@@ -16,7 +16,8 @@ message CalcOutAmtGivenIn {
 
   // swap_fee is the swap fee for this swap estimate.
   string swap_fee = 3 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec",
     (gogoproto.nullable) = false
   ];
 }
@@ -42,7 +43,8 @@ message CalcInAmtGivenOut {
 
   // swap_fee is the swap fee for this swap estimate.
   string swap_fee = 3 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec",
     (gogoproto.nullable) = false
   ];
 }
diff --git a/proto/osmosis/cosmwasmpool/v1beta1/model/module_sudo_msg.proto b/proto/osmosis/cosmwasmpool/v1beta1/model/module_sudo_msg.proto
index b22167e5347..4f35a1e1993 100644
--- a/proto/osmosis/cosmwasmpool/v1beta1/model/module_sudo_msg.proto
+++ b/proto/osmosis/cosmwasmpool/v1beta1/model/module_sudo_msg.proto
@@ -18,13 +18,15 @@ message SwapExactAmountIn {
   // token_out_min_amount is the minimum amount of token_out to be received from
   // the pool.
   string token_out_min_amount = 4 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.Int",
     (gogoproto.nullable) = false
   ];
 
   // swap_fee is the swap fee for this swap estimate.
   string swap_fee = 5 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec",
     (gogoproto.nullable) = false
   ];
 }
@@ -38,7 +40,8 @@ message SwapExactAmountInSudoMsg {
 message SwapExactAmountInSudoMsgResponse {
   // token_out_amount is the token out computed from this swap estimate call.
   string token_out_amount = 1 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.Int",
     (gogoproto.nullable) = false
   ];
 }
@@ -55,13 +58,15 @@ message SwapExactAmountOut {
   // token_in_max_amount is the maximum amount of token_in to be sent to the
   // pool.
   string token_in_max_amount = 4 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.Int",
     (gogoproto.nullable) = false
   ];
 
   // swap_fee is the swap fee for this swap estimate.
   string swap_fee = 5 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec",
     (gogoproto.nullable) = false
   ];
 }
@@ -75,7 +80,8 @@ message SwapExactAmountOutSudoMsg {
 message SwapExactAmountOutSudoMsgResponse {
   // token_in_amount is the token in computed from this swap estimate call.
   string token_in_amount = 1 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.Int",
     (gogoproto.nullable) = false
   ];
 }
diff --git a/proto/osmosis/cosmwasmpool/v1beta1/model/pool_query_msg.proto b/proto/osmosis/cosmwasmpool/v1beta1/model/pool_query_msg.proto
index ee6199779fc..2a8097d7987 100644
--- a/proto/osmosis/cosmwasmpool/v1beta1/model/pool_query_msg.proto
+++ b/proto/osmosis/cosmwasmpool/v1beta1/model/pool_query_msg.proto
@@ -15,7 +15,8 @@ message GetSwapFeeQueryMsg {
 message GetSwapFeeQueryMsgResponse {
   // swap_fee is the swap fee for this swap estimate.
   string swap_fee = 3 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec",
     (gogoproto.nullable) = false
   ];
 }
diff --git a/proto/osmosis/gamm/pool-models/balancer/balancerPool.proto b/proto/osmosis/gamm/pool-models/balancer/balancerPool.proto
index 8d5911f3c0d..ae98f457cce 100644
--- a/proto/osmosis/gamm/pool-models/balancer/balancerPool.proto
+++ b/proto/osmosis/gamm/pool-models/balancer/balancerPool.proto
@@ -78,7 +78,8 @@ message PoolParams {
   option (amino.name) = "osmosis/gamm/BalancerPoolParams";
 
   string swap_fee = 1 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec",
     (gogoproto.moretags) = "yaml:\"swap_fee\"",
     (gogoproto.nullable) = false
   ];
@@ -86,7 +87,8 @@ message PoolParams {
   // pools can maintain a non-zero fee. No new pool can be created with non-zero
   // fee anymore
   string exit_fee = 2 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec",
     (gogoproto.moretags) = "yaml:\"exit_fee\"",
     (gogoproto.nullable) = false
   ];
@@ -107,7 +109,8 @@ message PoolAsset {
       [ (gogoproto.moretags) = "yaml:\"token\"", (gogoproto.nullable) = false ];
   // Weight that is not normalized. This weight must be less than 2^50
   string weight = 2 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.Int",
     (gogoproto.moretags) = "yaml:\"weight\"",
     (gogoproto.nullable) = false
   ];
@@ -151,7 +154,8 @@ message Pool {
   ];
   // sum of all non-normalized pool weights
   string total_weight = 7 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.Int",
     (gogoproto.moretags) = "yaml:\"total_weight\"",
     (gogoproto.nullable) = false
   ];
diff --git a/proto/osmosis/gamm/pool-models/stableswap/stableswap_pool.proto b/proto/osmosis/gamm/pool-models/stableswap/stableswap_pool.proto
index 941ff3d06ca..4bb0ad88ee2 100644
--- a/proto/osmosis/gamm/pool-models/stableswap/stableswap_pool.proto
+++ b/proto/osmosis/gamm/pool-models/stableswap/stableswap_pool.proto
@@ -21,7 +21,8 @@ message PoolParams {
   option (amino.name) = "osmosis/gamm/StableswapPoolParams";
 
   string swap_fee = 1 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec",
     (gogoproto.moretags) = "yaml:\"swap_fee\"",
     (gogoproto.nullable) = false
   ];
@@ -29,7 +30,8 @@ message PoolParams {
   // pools can maintain a non-zero fee. No new pool can be created with non-zero
   // fee anymore
   string exit_fee = 2 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec",
     (gogoproto.moretags) = "yaml:\"exit_fee\"",
     (gogoproto.nullable) = false
   ];
diff --git a/proto/osmosis/gamm/v1beta1/gov.proto b/proto/osmosis/gamm/v1beta1/gov.proto
index 9d5b5a2e7e6..cb1f01dc6d3 100644
--- a/proto/osmosis/gamm/v1beta1/gov.proto
+++ b/proto/osmosis/gamm/v1beta1/gov.proto
@@ -65,12 +65,14 @@ message PoolRecordWithCFMMLink {
   string denom1 = 2 [ (gogoproto.moretags) = "yaml:\"denom1\"" ];
   uint64 tick_spacing = 3 [ (gogoproto.moretags) = "yaml:\"tick_spacing\"" ];
   string exponent_at_price_one = 4 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.Int",
     (gogoproto.moretags) = "yaml:\"exponent_at_price_one\"",
     (gogoproto.nullable) = false
   ];
   string spread_factor = 5 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec",
     (gogoproto.moretags) = "yaml:\"spread_factor\"",
     (gogoproto.nullable) = false
   ];
diff --git a/proto/osmosis/gamm/v1beta1/query.proto b/proto/osmosis/gamm/v1beta1/query.proto
index 6b8da036903..a6d2a9880ae 100644
--- a/proto/osmosis/gamm/v1beta1/query.proto
+++ b/proto/osmosis/gamm/v1beta1/query.proto
@@ -176,7 +176,8 @@ message QueryCalcJoinPoolSharesRequest {
 }
 message QueryCalcJoinPoolSharesResponse {
   string share_out_amount = 1 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.Int",
     (gogoproto.moretags) = "yaml:\"share_out_amount\"",
     (gogoproto.nullable) = false
   ];
@@ -190,7 +191,8 @@ message QueryCalcJoinPoolSharesResponse {
 message QueryCalcExitPoolCoinsFromSharesRequest {
   uint64 pool_id = 1;
   string share_in_amount = 2 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.Int",
     (gogoproto.nullable) = false
   ];
 }
@@ -249,7 +251,8 @@ message QueryCalcJoinPoolNoSwapSharesResponse {
     (gogoproto.nullable) = false
   ];
   string shares_out = 2 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.Int",
     (gogoproto.nullable) = false
   ];
 }
@@ -306,7 +309,8 @@ message QuerySwapExactAmountInRequest {
 message QuerySwapExactAmountInResponse {
   option deprecated = true;
   string token_out_amount = 1 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.Int",
     (gogoproto.moretags) = "yaml:\"token_out_amount\"",
     (gogoproto.nullable) = false
   ];
@@ -327,7 +331,8 @@ message QuerySwapExactAmountOutRequest {
 message QuerySwapExactAmountOutResponse {
   option deprecated = true;
   string token_in_amount = 1 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.Int",
     (gogoproto.moretags) = "yaml:\"token_in_amount\"",
     (gogoproto.nullable) = false
   ];
diff --git a/proto/osmosis/gamm/v1beta1/tx.proto b/proto/osmosis/gamm/v1beta1/tx.proto
index edf0070fa28..62719496792 100644
--- a/proto/osmosis/gamm/v1beta1/tx.proto
+++ b/proto/osmosis/gamm/v1beta1/tx.proto
@@ -33,7 +33,8 @@ message MsgJoinPool {
   string sender = 1 [ (gogoproto.moretags) = "yaml:\"sender\"" ];
   uint64 pool_id = 2 [ (gogoproto.moretags) = "yaml:\"pool_id\"" ];
   string share_out_amount = 3 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.Int",
     (gogoproto.moretags) = "yaml:\"pool_amount_out\"",
     (gogoproto.nullable) = false
   ];
@@ -45,7 +46,8 @@ message MsgJoinPool {
 
 message MsgJoinPoolResponse {
   string share_out_amount = 1 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.Int",
     (gogoproto.moretags) = "yaml:\"share_out_amount\"",
     (gogoproto.nullable) = false
   ];
@@ -62,7 +64,8 @@ message MsgExitPool {
   string sender = 1 [ (gogoproto.moretags) = "yaml:\"sender\"" ];
   uint64 pool_id = 2 [ (gogoproto.moretags) = "yaml:\"pool_id\"" ];
   string share_in_amount = 3 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.Int",
     (gogoproto.moretags) = "yaml:\"share_in_amount\"",
     (gogoproto.nullable) = false
   ];
@@ -92,7 +95,8 @@ message MsgSwapExactAmountIn {
     (gogoproto.nullable) = false
   ];
   string token_out_min_amount = 4 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.Int",
     (gogoproto.moretags) = "yaml:\"token_out_min_amount\"",
     (gogoproto.nullable) = false
   ];
@@ -100,7 +104,8 @@ message MsgSwapExactAmountIn {
 
 message MsgSwapExactAmountInResponse {
   string token_out_amount = 1 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.Int",
     (gogoproto.moretags) = "yaml:\"token_out_amount\"",
     (gogoproto.nullable) = false
   ];
@@ -113,7 +118,8 @@ message MsgSwapExactAmountOut {
   repeated osmosis.poolmanager.v1beta1.SwapAmountOutRoute routes = 2
       [ (gogoproto.nullable) = false ];
   string token_in_max_amount = 3 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.Int",
     (gogoproto.moretags) = "yaml:\"token_in_max_amount\"",
     (gogoproto.nullable) = false
   ];
@@ -125,7 +131,8 @@ message MsgSwapExactAmountOut {
 
 message MsgSwapExactAmountOutResponse {
   string token_in_amount = 1 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.Int",
     (gogoproto.moretags) = "yaml:\"token_in_amount\"",
     (gogoproto.nullable) = false
   ];
@@ -143,7 +150,8 @@ message MsgJoinSwapExternAmountIn {
     (gogoproto.nullable) = false
   ];
   string share_out_min_amount = 4 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.Int",
     (gogoproto.moretags) = "yaml:\"share_out_min_amount\"",
     (gogoproto.nullable) = false
   ];
@@ -155,7 +163,8 @@ message MsgJoinSwapExternAmountIn {
 
 message MsgJoinSwapExternAmountInResponse {
   string share_out_amount = 1 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.Int",
     (gogoproto.moretags) = "yaml:\"share_out_amount\"",
     (gogoproto.nullable) = false
   ];
@@ -170,12 +179,14 @@ message MsgJoinSwapShareAmountOut {
   string token_in_denom = 3
       [ (gogoproto.moretags) = "yaml:\"token_in_denom\"" ];
   string share_out_amount = 4 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.Int",
     (gogoproto.moretags) = "yaml:\"share_out_amount\"",
     (gogoproto.nullable) = false
   ];
   string token_in_max_amount = 5 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.Int",
     (gogoproto.moretags) = "yaml:\"token_in_max_amount\"",
     (gogoproto.nullable) = false
   ];
@@ -183,7 +194,8 @@ message MsgJoinSwapShareAmountOut {
 
 message MsgJoinSwapShareAmountOutResponse {
   string token_in_amount = 1 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.Int",
     (gogoproto.moretags) = "yaml:\"token_in_amount\"",
     (gogoproto.nullable) = false
   ];
@@ -198,12 +210,14 @@ message MsgExitSwapShareAmountIn {
   string token_out_denom = 3
       [ (gogoproto.moretags) = "yaml:\"token_out_denom\"" ];
   string share_in_amount = 4 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.Int",
     (gogoproto.moretags) = "yaml:\"share_in_amount\"",
     (gogoproto.nullable) = false
   ];
   string token_out_min_amount = 5 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.Int",
     (gogoproto.moretags) = "yaml:\"token_out_min_amount\"",
     (gogoproto.nullable) = false
   ];
@@ -211,7 +225,8 @@ message MsgExitSwapShareAmountIn {
 
 message MsgExitSwapShareAmountInResponse {
   string token_out_amount = 1 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.Int",
     (gogoproto.moretags) = "yaml:\"token_out_amount\"",
     (gogoproto.nullable) = false
   ];
@@ -228,7 +243,8 @@ message MsgExitSwapExternAmountOut {
     (gogoproto.nullable) = false
   ];
   string share_in_max_amount = 4 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.Int",
     (gogoproto.moretags) = "yaml:\"share_in_max_amount\"",
     (gogoproto.nullable) = false
   ];
@@ -236,7 +252,8 @@ message MsgExitSwapExternAmountOut {
 
 message MsgExitSwapExternAmountOutResponse {
   string share_in_amount = 1 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.Int",
     (gogoproto.moretags) = "yaml:\"share_in_amount\"",
     (gogoproto.nullable) = false
   ];
diff --git a/proto/osmosis/lockup/query.proto b/proto/osmosis/lockup/query.proto
index 047597af46f..8e2a6252b3e 100644
--- a/proto/osmosis/lockup/query.proto
+++ b/proto/osmosis/lockup/query.proto
@@ -251,7 +251,8 @@ message LockedDenomRequest {
 }
 message LockedDenomResponse {
   string amount = 1 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.Int",
     (gogoproto.moretags) = "yaml:\"amount\"",
     (gogoproto.nullable) = false
   ];
diff --git a/proto/osmosis/mint/v1beta1/mint.proto b/proto/osmosis/mint/v1beta1/mint.proto
index f608264ab57..434bfea8683 100644
--- a/proto/osmosis/mint/v1beta1/mint.proto
+++ b/proto/osmosis/mint/v1beta1/mint.proto
@@ -13,7 +13,8 @@ message Minter {
   // epoch_provisions represent rewards for the current epoch.
   string epoch_provisions = 1 [
     (gogoproto.moretags) = "yaml:\"epoch_provisions\"",
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec",
     (gogoproto.nullable) = false
   ];
 }
@@ -25,7 +26,8 @@ message WeightedAddress {
   string address = 1 [ (gogoproto.moretags) = "yaml:\"address\"" ];
   string weight = 2 [
     (gogoproto.moretags) = "yaml:\"weight\"",
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec",
     (gogoproto.nullable) = false
   ];
 }
@@ -37,28 +39,32 @@ message DistributionProportions {
   // staking defines the proportion of the minted mint_denom that is to be
   // allocated as staking rewards.
   string staking = 1 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec",
     (gogoproto.moretags) = "yaml:\"staking\"",
     (gogoproto.nullable) = false
   ];
   // pool_incentives defines the proportion of the minted mint_denom that is
   // to be allocated as pool incentives.
   string pool_incentives = 2 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec",
     (gogoproto.moretags) = "yaml:\"pool_incentives\"",
     (gogoproto.nullable) = false
   ];
   // developer_rewards defines the proportion of the minted mint_denom that is
   // to be allocated to developer rewards address.
   string developer_rewards = 3 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec",
     (gogoproto.moretags) = "yaml:\"developer_rewards\"",
     (gogoproto.nullable) = false
   ];
   // community_pool defines the proportion of the minted mint_denom that is
   // to be allocated to the community pool.
   string community_pool = 4 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec",
     (gogoproto.moretags) = "yaml:\"community_pool\"",
     (gogoproto.nullable) = false
   ];
@@ -73,7 +79,8 @@ message Params {
   // genesis_epoch_provisions epoch provisions from the first epoch.
   string genesis_epoch_provisions = 2 [
     (gogoproto.moretags) = "yaml:\"genesis_epoch_provisions\"",
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec",
     (gogoproto.nullable) = false
   ];
   // epoch_identifier mint epoch identifier e.g. (day, week).
@@ -87,7 +94,8 @@ message Params {
   // at the end of each period set by reduction_period_in_epochs.
   string reduction_factor = 5 [
     (gogoproto.moretags) = "yaml:\"reduction_factor\"",
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec",
     (gogoproto.nullable) = false
   ];
   // distribution_proportions defines the distribution proportions of the minted
diff --git a/proto/osmosis/mint/v1beta1/query.proto b/proto/osmosis/mint/v1beta1/query.proto
index 5fd63e47373..06e65d5250e 100644
--- a/proto/osmosis/mint/v1beta1/query.proto
+++ b/proto/osmosis/mint/v1beta1/query.proto
@@ -39,7 +39,8 @@ message QueryEpochProvisionsRequest {}
 message QueryEpochProvisionsResponse {
   // epoch_provisions is the current minting per epoch provisions value.
   bytes epoch_provisions = 1 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec",
     (gogoproto.nullable) = false
   ];
 }
diff --git a/proto/osmosis/pool-incentives/v1beta1/incentives.proto b/proto/osmosis/pool-incentives/v1beta1/incentives.proto
index c7dec738700..d7064d2261d 100644
--- a/proto/osmosis/pool-incentives/v1beta1/incentives.proto
+++ b/proto/osmosis/pool-incentives/v1beta1/incentives.proto
@@ -26,7 +26,8 @@ message LockableDurationsInfo {
 
 message DistrInfo {
   string total_weight = 1 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.Int",
     (gogoproto.moretags) = "yaml:\"total_weight\"",
     (gogoproto.nullable) = false
   ];
@@ -38,7 +39,8 @@ message DistrRecord {
 
   uint64 gauge_id = 1 [ (gogoproto.moretags) = "yaml:\"gauge_id\"" ];
   string weight = 2 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.Int",
     (gogoproto.nullable) = false
   ];
 }
diff --git a/proto/osmosis/poolmanager/v1beta1/genesis.proto b/proto/osmosis/poolmanager/v1beta1/genesis.proto
index 398d6967cbb..b1cd5b72efa 100644
--- a/proto/osmosis/poolmanager/v1beta1/genesis.proto
+++ b/proto/osmosis/poolmanager/v1beta1/genesis.proto
@@ -49,7 +49,8 @@ message TakerFeeParams {
   // default_taker_fee is the fee used when creating a new pool that doesn't
   // fall under a custom pool taker fee or stableswap taker fee category.
   string default_taker_fee = 1 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec",
     (gogoproto.customname) = "DefaultTakerFee",
     (gogoproto.nullable) = false
   ];
@@ -94,12 +95,14 @@ message TakerFeeParams {
 // gets distributed to the available categories.
 message TakerFeeDistributionPercentage {
   string staking_rewards = 1 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec",
     (gogoproto.moretags) = "yaml:\"staking_rewards\"",
     (gogoproto.nullable) = false
   ];
   string community_pool = 2 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec",
     (gogoproto.moretags) = "yaml:\"community_pool\"",
     (gogoproto.nullable) = false
   ];
diff --git a/proto/osmosis/poolmanager/v1beta1/query.proto b/proto/osmosis/poolmanager/v1beta1/query.proto
index 8ba6ba8ca83..9ac8aec7fc0 100644
--- a/proto/osmosis/poolmanager/v1beta1/query.proto
+++ b/proto/osmosis/poolmanager/v1beta1/query.proto
@@ -146,7 +146,8 @@ message EstimateSinglePoolSwapExactAmountInRequest {
 
 message EstimateSwapExactAmountInResponse {
   string token_out_amount = 1 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.Int",
     (gogoproto.moretags) = "yaml:\"token_out_amount\"",
     (gogoproto.nullable) = false
   ];
@@ -182,7 +183,8 @@ message EstimateSinglePoolSwapExactAmountOutRequest {
 
 message EstimateSwapExactAmountOutResponse {
   string token_in_amount = 1 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.Int",
     (gogoproto.moretags) = "yaml:\"token_in_amount\"",
     (gogoproto.nullable) = false
   ];
diff --git a/proto/osmosis/poolmanager/v1beta1/swap_route.proto b/proto/osmosis/poolmanager/v1beta1/swap_route.proto
index e17aa15b569..efda6e60c05 100644
--- a/proto/osmosis/poolmanager/v1beta1/swap_route.proto
+++ b/proto/osmosis/poolmanager/v1beta1/swap_route.proto
@@ -21,7 +21,8 @@ message SwapAmountInSplitRoute {
   repeated SwapAmountInRoute pools = 1
       [ (gogoproto.moretags) = "yaml:\"pools\"", (gogoproto.nullable) = false ];
   string token_in_amount = 2 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.Int",
     (gogoproto.moretags) = "yaml:\"token_in_amount\"",
     (gogoproto.nullable) = false
   ];
@@ -31,7 +32,8 @@ message SwapAmountOutSplitRoute {
   repeated SwapAmountOutRoute pools = 1
       [ (gogoproto.moretags) = "yaml:\"pools\"", (gogoproto.nullable) = false ];
   string token_out_amount = 2 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.Int",
     (gogoproto.moretags) = "yaml:\"token_out_amount\"",
     (gogoproto.nullable) = false
   ];
diff --git a/proto/osmosis/poolmanager/v1beta1/tx.proto b/proto/osmosis/poolmanager/v1beta1/tx.proto
index 934e2afdbc0..4a157e60f15 100644
--- a/proto/osmosis/poolmanager/v1beta1/tx.proto
+++ b/proto/osmosis/poolmanager/v1beta1/tx.proto
@@ -32,7 +32,8 @@ message MsgSwapExactAmountIn {
     (gogoproto.nullable) = false
   ];
   string token_out_min_amount = 4 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.Int",
     (gogoproto.moretags) = "yaml:\"token_out_min_amount\"",
     (gogoproto.nullable) = false
   ];
@@ -40,7 +41,8 @@ message MsgSwapExactAmountIn {
 
 message MsgSwapExactAmountInResponse {
   string token_out_amount = 1 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.Int",
     (gogoproto.moretags) = "yaml:\"token_out_amount\"",
     (gogoproto.nullable) = false
   ];
@@ -55,7 +57,8 @@ message MsgSplitRouteSwapExactAmountIn {
   string token_in_denom = 3
       [ (gogoproto.moretags) = "yaml:\"token_in_denom\"" ];
   string token_out_min_amount = 4 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.Int",
     (gogoproto.moretags) = "yaml:\"token_out_min_amount\"",
     (gogoproto.nullable) = false
   ];
@@ -63,7 +66,8 @@ message MsgSplitRouteSwapExactAmountIn {
 
 message MsgSplitRouteSwapExactAmountInResponse {
   string token_out_amount = 1 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.Int",
     (gogoproto.moretags) = "yaml:\"token_out_amount\"",
     (gogoproto.nullable) = false
   ];
@@ -76,7 +80,8 @@ message MsgSwapExactAmountOut {
   string sender = 1 [ (gogoproto.moretags) = "yaml:\"sender\"" ];
   repeated SwapAmountOutRoute routes = 2 [ (gogoproto.nullable) = false ];
   string token_in_max_amount = 3 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.Int",
     (gogoproto.moretags) = "yaml:\"token_in_max_amount\"",
     (gogoproto.nullable) = false
   ];
@@ -88,7 +93,8 @@ message MsgSwapExactAmountOut {
 
 message MsgSwapExactAmountOutResponse {
   string token_in_amount = 1 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.Int",
     (gogoproto.moretags) = "yaml:\"token_in_amount\"",
     (gogoproto.nullable) = false
   ];
@@ -103,7 +109,8 @@ message MsgSplitRouteSwapExactAmountOut {
   string token_out_denom = 3
       [ (gogoproto.moretags) = "yaml:\"token_out_denom\"" ];
   string token_in_max_amount = 4 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.Int",
     (gogoproto.moretags) = "yaml:\"token_in_max_amount\"",
     (gogoproto.nullable) = false
   ];
@@ -111,7 +118,8 @@ message MsgSplitRouteSwapExactAmountOut {
 
 message MsgSplitRouteSwapExactAmountOutResponse {
   string token_in_amount = 1 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.Int",
     (gogoproto.moretags) = "yaml:\"token_in_amount\"",
     (gogoproto.nullable) = false
   ];
@@ -136,7 +144,8 @@ message DenomPairTakerFee {
   string denom0 = 1 [ (gogoproto.moretags) = "yaml:\"denom0\"" ];
   string denom1 = 2 [ (gogoproto.moretags) = "yaml:\"denom1\"" ];
   string taker_fee = 3 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec",
     (gogoproto.moretags) = "yaml:\"taker_fee\"",
     (gogoproto.nullable) = false
   ];
diff --git a/proto/osmosis/protorev/v1beta1/protorev.proto b/proto/osmosis/protorev/v1beta1/protorev.proto
index 33030223ad2..7be0ffdadbb 100644
--- a/proto/osmosis/protorev/v1beta1/protorev.proto
+++ b/proto/osmosis/protorev/v1beta1/protorev.proto
@@ -36,7 +36,8 @@ message Route {
   // The step size that will be used to find the optimal swap amount in the
   // binary search
   string step_size = 2 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.Int",
     (gogoproto.nullable) = false,
     (gogoproto.moretags) = "yaml:\"step_size\""
   ];
@@ -65,7 +66,8 @@ message RouteStatistics {
   // number_of_trades is the number of trades the module has executed using this
   // route
   string number_of_trades = 2 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.Int",
     (gogoproto.nullable) = false,
     (gogoproto.moretags) = "yaml:\"number_of_trades\""
   ];
@@ -172,7 +174,8 @@ message BaseDenom {
   // The step size of the binary search that is used to find the optimal swap
   // amount
   string step_size = 2 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.Int",
     (gogoproto.nullable) = false,
     (gogoproto.moretags) = "yaml:\"step_size\""
   ];
diff --git a/proto/osmosis/protorev/v1beta1/query.proto b/proto/osmosis/protorev/v1beta1/query.proto
index fc893a8a44d..4e489182e60 100644
--- a/proto/osmosis/protorev/v1beta1/query.proto
+++ b/proto/osmosis/protorev/v1beta1/query.proto
@@ -136,7 +136,8 @@ message QueryGetProtoRevNumberOfTradesRequest {}
 message QueryGetProtoRevNumberOfTradesResponse {
   // number_of_trades is the number of trades the module has executed
   string number_of_trades = 1 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.Int",
     (gogoproto.nullable) = false,
     (gogoproto.moretags) = "yaml:\"number_of_trades\""
   ];
diff --git a/proto/osmosis/sumtree/v1beta1/tree.proto b/proto/osmosis/sumtree/v1beta1/tree.proto
index 02f54011f10..57a055aa763 100644
--- a/proto/osmosis/sumtree/v1beta1/tree.proto
+++ b/proto/osmosis/sumtree/v1beta1/tree.proto
@@ -11,7 +11,8 @@ message Node { repeated Child children = 1; }
 message Child {
   bytes index = 1;
   string accumulation = 2 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.Int",
     (gogoproto.nullable) = false
   ];
 }
diff --git a/proto/osmosis/superfluid/params.proto b/proto/osmosis/superfluid/params.proto
index 4813e373437..111e67bb9a6 100644
--- a/proto/osmosis/superfluid/params.proto
+++ b/proto/osmosis/superfluid/params.proto
@@ -14,7 +14,8 @@ message Params {
   // volatilities, and have base staking be 'resistant' to volatility.
   string minimum_risk_factor = 1 [
     (gogoproto.moretags) = "yaml:\"minimum_risk_factor\"",
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec",
     (gogoproto.nullable) = false
   ];
 }
diff --git a/proto/osmosis/superfluid/query.proto b/proto/osmosis/superfluid/query.proto
index 1ea41b65b8e..8bda8f1d5dd 100644
--- a/proto/osmosis/superfluid/query.proto
+++ b/proto/osmosis/superfluid/query.proto
@@ -190,12 +190,14 @@ message QueryTotalDelegationByValidatorForDenomResponse {
 message Delegations {
   string val_addr = 1;
   string amount_sfsd = 2 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.Int",
     (gogoproto.moretags) = "yaml:\"amount_sfsd\"",
     (gogoproto.nullable) = false
   ];
   string osmo_equivalent = 3 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.Int",
     (gogoproto.moretags) = "yaml:\"osmo_equivalent\"",
     (gogoproto.nullable) = false
   ];
@@ -204,7 +206,8 @@ message TotalSuperfluidDelegationsRequest {}
 
 message TotalSuperfluidDelegationsResponse {
   string total_delegations = 1 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.Int",
     (gogoproto.moretags) = "yaml:\"total_superfluid_delegations\"",
     (gogoproto.nullable) = false
   ];
diff --git a/proto/osmosis/superfluid/superfluid.proto b/proto/osmosis/superfluid/superfluid.proto
index 8a8ed1f66ac..3f4fe1db55b 100644
--- a/proto/osmosis/superfluid/superfluid.proto
+++ b/proto/osmosis/superfluid/superfluid.proto
@@ -55,7 +55,8 @@ message OsmoEquivalentMultiplierRecord {
   string denom = 2;
   string multiplier = 3 [
     (gogoproto.moretags) = "yaml:\"multiplier\"",
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec",
     (gogoproto.nullable) = false
   ];
 }
diff --git a/proto/osmosis/superfluid/tx.proto b/proto/osmosis/superfluid/tx.proto
index a61b46421a2..593dc293314 100644
--- a/proto/osmosis/superfluid/tx.proto
+++ b/proto/osmosis/superfluid/tx.proto
@@ -178,17 +178,20 @@ message MsgUnlockAndMigrateSharesToFullRangeConcentratedPosition {
 
 message MsgUnlockAndMigrateSharesToFullRangeConcentratedPositionResponse {
   string amount0 = 1 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.Int",
     (gogoproto.moretags) = "yaml:\"amount0\"",
     (gogoproto.nullable) = false
   ];
   string amount1 = 2 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.Int",
     (gogoproto.moretags) = "yaml:\"amount1\"",
     (gogoproto.nullable) = false
   ];
   string liquidity_created = 3 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec",
     (gogoproto.moretags) = "yaml:\"liquidity_created\"",
     (gogoproto.nullable) = false
   ];
@@ -218,12 +221,14 @@ message MsgAddToConcentratedLiquiditySuperfluidPosition {
 message MsgAddToConcentratedLiquiditySuperfluidPositionResponse {
   uint64 position_id = 1 [ (gogoproto.moretags) = "yaml:\"position_id\"" ];
   string amount0 = 2 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.Int",
     (gogoproto.moretags) = "yaml:\"amount0\"",
     (gogoproto.nullable) = false
   ];
   string amount1 = 3 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.Int",
     (gogoproto.moretags) = "yaml:\"amount1\"",
     (gogoproto.nullable) = false
   ];
@@ -231,7 +236,8 @@ message MsgAddToConcentratedLiquiditySuperfluidPositionResponse {
   // It includes the liquidity that existed before in the position
   // and the new liquidity that was added to the position.
   string new_liquidity = 5 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec",
     (gogoproto.moretags) = "yaml:\"new_liquidity\"",
     (gogoproto.nullable) = false
   ];
@@ -252,7 +258,8 @@ message MsgUnbondConvertAndStake {
   string val_addr = 3;
   // min_amt_to_stake indicates the minimum amount to stake after conversion
   string min_amt_to_stake = 4 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.Int",
     (gogoproto.moretags) = "yaml:\"min_amt_to_stake\"",
     (gogoproto.nullable) = false
   ];
@@ -268,7 +275,8 @@ message MsgUnbondConvertAndStake {
 
 message MsgUnbondConvertAndStakeResponse {
   string total_amt_staked = 1 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.Int",
     (gogoproto.moretags) = "yaml:\"total_amt_staked\"",
     (gogoproto.nullable) = false
   ];
diff --git a/proto/osmosis/twap/v1beta1/query.proto b/proto/osmosis/twap/v1beta1/query.proto
index 334cab5f780..6da2388f4a7 100644
--- a/proto/osmosis/twap/v1beta1/query.proto
+++ b/proto/osmosis/twap/v1beta1/query.proto
@@ -51,7 +51,8 @@ message ArithmeticTwapRequest {
 }
 message ArithmeticTwapResponse {
   string arithmetic_twap = 1 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec",
     (gogoproto.moretags) = "yaml:\"arithmetic_twap\"",
     (gogoproto.nullable) = false
   ];
@@ -69,7 +70,8 @@ message ArithmeticTwapToNowRequest {
 }
 message ArithmeticTwapToNowResponse {
   string arithmetic_twap = 1 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec",
     (gogoproto.moretags) = "yaml:\"arithmetic_twap\"",
     (gogoproto.nullable) = false
   ];
@@ -92,7 +94,8 @@ message GeometricTwapRequest {
 }
 message GeometricTwapResponse {
   string geometric_twap = 1 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec",
     (gogoproto.moretags) = "yaml:\"geometric_twap\"",
     (gogoproto.nullable) = false
   ];
@@ -110,7 +113,8 @@ message GeometricTwapToNowRequest {
 }
 message GeometricTwapToNowResponse {
   string geometric_twap = 1 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec",
     (gogoproto.moretags) = "yaml:\"geometric_twap\"",
     (gogoproto.nullable) = false
   ];
diff --git a/proto/osmosis/twap/v1beta1/twap_record.proto b/proto/osmosis/twap/v1beta1/twap_record.proto
index 56025c9e00e..d647af409a9 100644
--- a/proto/osmosis/twap/v1beta1/twap_record.proto
+++ b/proto/osmosis/twap/v1beta1/twap_record.proto
@@ -38,25 +38,30 @@ message TwapRecord {
   // We store the last spot prices in the struct, so that we can interpolate
   // accumulator values for times between when accumulator records are stored.
   string p0_last_spot_price = 6 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec",
     (gogoproto.nullable) = false
   ];
   string p1_last_spot_price = 7 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec",
     (gogoproto.nullable) = false
   ];
 
   string p0_arithmetic_twap_accumulator = 8 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec",
     (gogoproto.nullable) = false
   ];
   string p1_arithmetic_twap_accumulator = 9 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec",
     (gogoproto.nullable) = false
   ];
 
   string geometric_twap_accumulator = 10 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec",
     (gogoproto.nullable) = false
   ];
 
diff --git a/proto/osmosis/txfees/v1beta1/query.proto b/proto/osmosis/txfees/v1beta1/query.proto
index 6c7e9b6aa29..786fd49e95b 100644
--- a/proto/osmosis/txfees/v1beta1/query.proto
+++ b/proto/osmosis/txfees/v1beta1/query.proto
@@ -56,7 +56,8 @@ message QueryDenomSpotPriceResponse {
   uint64 poolID = 1 [ (gogoproto.moretags) = "yaml:\"pool_id\"" ];
   string spot_price = 2 [
     (gogoproto.moretags) = "yaml:\"spot_price\"",
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec",
     (gogoproto.nullable) = false
   ];
 }
diff --git a/proto/osmosis/valset-pref/v1beta1/state.proto b/proto/osmosis/valset-pref/v1beta1/state.proto
index 54e285a460d..f4b0a885524 100644
--- a/proto/osmosis/valset-pref/v1beta1/state.proto
+++ b/proto/osmosis/valset-pref/v1beta1/state.proto
@@ -19,7 +19,8 @@ message ValidatorPreference {
       [ (gogoproto.moretags) = "yaml:\"val_oper_address\"" ];
   // weight is decimal between 0 and 1, and they all sum to 1.
   string weight = 2 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
+
+    (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec",
     (gogoproto.nullable) = false
   ];
 }
diff --git a/tests/cl-genesis-positions/go.mod b/tests/cl-genesis-positions/go.mod
index d174306b79a..8bc6e133dcf 100644
--- a/tests/cl-genesis-positions/go.mod
+++ b/tests/cl-genesis-positions/go.mod
@@ -5,8 +5,8 @@ go 1.20
 require (
 	github.com/cosmos/cosmos-sdk v0.47.4
 	github.com/ignite/cli v0.23.0
-	github.com/osmosis-labs/osmosis/osmomath v0.0.3-dev.0.20230804142026-a81cfe3ddde7
-	github.com/osmosis-labs/osmosis/osmoutils v0.0.0-20230807183608-16c217dedde5
+	github.com/osmosis-labs/osmosis/osmomath v0.0.7-0.20230901175805-bab180bc078b
+	github.com/osmosis-labs/osmosis/osmoutils v0.0.7-0.20230901175805-bab180bc078b
 	github.com/tendermint/tendermint v0.37.0-rc1
 )
 
@@ -22,11 +22,11 @@ require (
 	github.com/bgentry/speakeasy v0.1.1-0.20220910012023-760eaf8b6816 // indirect
 	github.com/blang/semver v3.5.1+incompatible // indirect
 	github.com/btcsuite/btcd v0.22.3 // indirect
-	github.com/bytedance/sonic v1.10.0 // indirect
 	github.com/cenkalti/backoff v2.2.1+incompatible // indirect
 	github.com/cenkalti/backoff/v4 v4.1.3 // indirect
 	github.com/cespare/xxhash v1.1.0 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
+	github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect
 	github.com/coinbase/rosetta-sdk-go v0.7.9 // indirect
 	github.com/confio/ics23/go v0.9.0 // indirect
 	github.com/cosmos/btcutil v1.0.5 // indirect
@@ -88,7 +88,6 @@ require (
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/mtibben/percent v0.2.1 // indirect
 	github.com/nxadm/tail v1.4.8 // indirect
-	github.com/onsi/gomega v1.27.10 // indirect
 	github.com/pelletier/go-toml/v2 v2.0.8 // indirect
 	github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
@@ -103,7 +102,6 @@ require (
 	github.com/rs/cors v1.8.2 // indirect
 	github.com/rs/zerolog v1.27.0 // indirect
 	github.com/sasha-s/go-deadlock v0.3.1 // indirect
-	github.com/sirupsen/logrus v1.9.3 // indirect
 	github.com/spf13/afero v1.9.5 // indirect
 	github.com/spf13/cast v1.5.1 // indirect
 	github.com/spf13/cobra v1.7.0 // indirect
@@ -131,7 +129,6 @@ require (
 	golang.org/x/sys v0.11.0 // indirect
 	golang.org/x/term v0.11.0 // indirect
 	golang.org/x/text v0.12.0 // indirect
-	golang.org/x/tools v0.12.0 // indirect
 	google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5 // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20230726155614-23370e0ffb3e // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20230815205213-6bfd019c3878 // indirect
diff --git a/tests/cl-genesis-positions/go.sum b/tests/cl-genesis-positions/go.sum
index 113bb070a35..f2e38711d69 100644
--- a/tests/cl-genesis-positions/go.sum
+++ b/tests/cl-genesis-positions/go.sum
@@ -686,8 +686,8 @@ github.com/openzipkin/zipkin-go v0.2.1/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnh
 github.com/openzipkin/zipkin-go v0.2.2/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4=
 github.com/ory/dockertest v3.3.5+incompatible h1:iLLK6SQwIhcbrG783Dghaaa3WPzGc+4Emza6EbVUUGA=
 github.com/osmosis-labs/cosmos-sdk v0.45.0-rc1.0.20230829222007-529c69c19915 h1:1VDV+B0rHSrbHjZz7P1tEjZTb2nro/GAhbOT8RAoQcw=
-github.com/osmosis-labs/osmosis/osmomath v0.0.3-dev.0.20230804142026-a81cfe3ddde7 h1:NTR4zfrPMP4pJ5T60zyZumBAnTWmTAQX/JSZLGrM9jI=
-github.com/osmosis-labs/osmosis/osmoutils v0.0.0-20230807183608-16c217dedde5 h1:j4ifxomFROGROHalqWwX7VPDgxOPotMB1GiAWdb03i4=
+github.com/osmosis-labs/osmosis/osmomath v0.0.7-0.20230901175805-bab180bc078b h1:Sw0WZKfZrUz+ozJhcjZ64TQFOtOHwqSLKrNOLonhXUU=
+github.com/osmosis-labs/osmosis/osmoutils v0.0.7-0.20230901175805-bab180bc078b h1:UFJcRrnM4q+kgvVvH35+Au5Mzj6Www4SYIF3LG0AvgM=
 github.com/otiai10/copy v1.7.0 h1:hVoPiN+t+7d2nzzwMiDHPSOogsWAStewq3TwU05+clE=
 github.com/p0mvn/cli v0.23.1 h1:Y4vUUNzTmrhhlaj1FIuLDCX9Go0oTqlf88m2PtaG5Zs=
 github.com/p0mvn/cli v0.23.1/go.mod h1:r92KMcpaLyYii0XnlQz5nfCxAMraLgOvWCHYw4pWZ7w=
diff --git a/tests/cl-go-client/go.mod b/tests/cl-go-client/go.mod
index 2a4b8fcbd27..dbceb0f891f 100644
--- a/tests/cl-go-client/go.mod
+++ b/tests/cl-go-client/go.mod
@@ -5,9 +5,9 @@ go 1.20
 require (
 	github.com/cosmos/cosmos-sdk v0.47.4
 	github.com/ignite/cli v0.23.0
-	github.com/osmosis-labs/osmosis/osmomath v0.0.3-dev.0.20230621002052-afb82fbaa312
-	github.com/osmosis-labs/osmosis/osmoutils v0.0.0-20230623115558-38aaab07d343
-	github.com/osmosis-labs/osmosis/x/epochs v0.0.0-20230328024000-175ec88e4304
+	github.com/osmosis-labs/osmosis/osmomath v0.0.7-0.20230901175805-bab180bc078b
+	github.com/osmosis-labs/osmosis/osmoutils v0.0.7-0.20230901175805-bab180bc078b
+	github.com/osmosis-labs/osmosis/x/epochs v0.0.3-0.20230901175805-bab180bc078b
 
 )
 
@@ -23,11 +23,11 @@ require (
 	github.com/bgentry/speakeasy v0.1.1-0.20220910012023-760eaf8b6816 // indirect
 	github.com/blang/semver v3.5.1+incompatible // indirect
 	github.com/btcsuite/btcd v0.22.3 // indirect
-	github.com/bytedance/sonic v1.10.0 // indirect
 	github.com/cenkalti/backoff v2.2.1+incompatible // indirect
 	github.com/cenkalti/backoff/v4 v4.1.3 // indirect
 	github.com/cespare/xxhash v1.1.0 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
+	github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect
 	github.com/coinbase/rosetta-sdk-go v0.7.9 // indirect
 	github.com/confio/ics23/go v0.9.0 // indirect
 	github.com/cosmos/btcutil v1.0.5 // indirect
@@ -78,7 +78,6 @@ require (
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/jmhodges/levigo v1.0.0 // indirect
 	github.com/klauspost/compress v1.15.11 // indirect
-	github.com/klauspost/cpuid/v2 v2.2.5 // indirect
 	github.com/lib/pq v1.10.9 // indirect
 	github.com/libp2p/go-buffer-pool v0.1.0 // indirect
 	github.com/magiconair/properties v1.8.7 // indirect
@@ -89,8 +88,6 @@ require (
 	github.com/minio/highwayhash v1.0.2 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/mtibben/percent v0.2.1 // indirect
-	github.com/nxadm/tail v1.4.8 // indirect
-	github.com/onsi/gomega v1.27.10 // indirect
 	github.com/pelletier/go-toml/v2 v2.0.8 // indirect
 	github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
@@ -105,7 +102,6 @@ require (
 	github.com/rs/cors v1.8.2 // indirect
 	github.com/rs/zerolog v1.27.0 // indirect
 	github.com/sasha-s/go-deadlock v0.3.1 // indirect
-	github.com/sirupsen/logrus v1.9.3 // indirect
 	github.com/spf13/afero v1.9.5 // indirect
 	github.com/spf13/cast v1.5.1 // indirect
 	github.com/spf13/cobra v1.7.0 // indirect
@@ -134,7 +130,6 @@ require (
 	golang.org/x/sys v0.11.0 // indirect
 	golang.org/x/term v0.11.0 // indirect
 	golang.org/x/text v0.12.0 // indirect
-	golang.org/x/tools v0.12.0 // indirect
 	google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5 // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20230726155614-23370e0ffb3e // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20230815205213-6bfd019c3878 // indirect
diff --git a/tests/cl-go-client/go.sum b/tests/cl-go-client/go.sum
index f81444f17cd..4d5d428eb07 100644
--- a/tests/cl-go-client/go.sum
+++ b/tests/cl-go-client/go.sum
@@ -549,10 +549,10 @@ github.com/klauspost/compress v1.11.7/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYs
 github.com/klauspost/compress v1.12.3/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg=
 github.com/klauspost/compress v1.15.11 h1:Lcadnb3RKGin4FYM/orgq0qde+nc15E5Cbqg4B9Sx9c=
 github.com/klauspost/compress v1.15.11/go.mod h1:QPwzmACJjUTFsnSHH934V6woptycfrDDJnH7hvFVbGM=
+github.com/klauspost/cpuid v0.0.0-20170728055534-ae7887de9fa5 h1:2U0HzY8BJ8hVwDKIzp7y4voR9CX/nvcfymLmg2UiOio=
 github.com/klauspost/cpuid v0.0.0-20170728055534-ae7887de9fa5/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek=
 github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
 github.com/klauspost/cpuid/v2 v2.2.5 h1:0E5MSMDEoAulmXNFquVs//DdoomxaoTY1kUhbc/qbZg=
-github.com/klauspost/cpuid/v2 v2.2.5/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
 github.com/klauspost/crc32 v0.0.0-20161016154125-cb6bfca970f6/go.mod h1:+ZoRqAPRLkC4NPOvfYeR5KNOrY6TD+/sAC3HXPZgDYg=
 github.com/klauspost/pgzip v1.0.2-0.20170402124221-0bf5dcad4ada/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
@@ -656,7 +656,6 @@ github.com/neilotoole/errgroup v0.1.6/go.mod h1:Q2nLGf+594h0CLBs/Mbg6qOr7GtqDK7C
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
 github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
 github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
-github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
 github.com/oklog/oklog v0.3.2/go.mod h1:FCV+B7mhrz4o+ueLpx+KqkyXRGMWOYEvfiXtdGtbWGs=
 github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA=
 github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
@@ -687,12 +686,9 @@ github.com/openzipkin/zipkin-go v0.2.1/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnh
 github.com/openzipkin/zipkin-go v0.2.2/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4=
 github.com/ory/dockertest v3.3.5+incompatible h1:iLLK6SQwIhcbrG783Dghaaa3WPzGc+4Emza6EbVUUGA=
 github.com/osmosis-labs/cosmos-sdk v0.45.0-rc1.0.20230829222007-529c69c19915 h1:1VDV+B0rHSrbHjZz7P1tEjZTb2nro/GAhbOT8RAoQcw=
-github.com/osmosis-labs/osmosis/osmomath v0.0.3-dev.0.20230621002052-afb82fbaa312 h1:7Y/948riUlpIfFSAUIx0rmRy3B+Mdk6alHwOa8lTNXY=
-github.com/osmosis-labs/osmosis/osmomath v0.0.3-dev.0.20230621002052-afb82fbaa312/go.mod h1:JTym95/bqrSnG5MPcXr1YDhv43JdCeo3p+iDbazoX68=
-github.com/osmosis-labs/osmosis/osmoutils v0.0.0-20230623115558-38aaab07d343 h1:7V2b3+mSnLnK0Px+Dl3vnxAQgk4SV8e9ohfJ/tKsq0M=
-github.com/osmosis-labs/osmosis/osmoutils v0.0.0-20230623115558-38aaab07d343/go.mod h1:FqFOfj9+e5S1I7hR3baGUHrqje3g32EOHAXoOf7R00M=
-github.com/osmosis-labs/osmosis/x/epochs v0.0.0-20230328024000-175ec88e4304 h1:RIrWLzIiZN5Xd2JOfSOtGZaf6V3qEQYg6EaDTAkMnCo=
-github.com/osmosis-labs/osmosis/x/epochs v0.0.0-20230328024000-175ec88e4304/go.mod h1:yPWoJTj5RKrXKUChAicp+G/4Ni/uVEpp27mi/FF/L9c=
+github.com/osmosis-labs/osmosis/osmomath v0.0.7-0.20230901175805-bab180bc078b h1:Sw0WZKfZrUz+ozJhcjZ64TQFOtOHwqSLKrNOLonhXUU=
+github.com/osmosis-labs/osmosis/osmoutils v0.0.7-0.20230901175805-bab180bc078b h1:UFJcRrnM4q+kgvVvH35+Au5Mzj6Www4SYIF3LG0AvgM=
+github.com/osmosis-labs/osmosis/x/epochs v0.0.3-0.20230901175805-bab180bc078b h1:6w9/InjrxkQ3Q+3OKdtKQQh4lyUiMb5iknG3NhdtpHc=
 github.com/otiai10/copy v1.7.0 h1:hVoPiN+t+7d2nzzwMiDHPSOogsWAStewq3TwU05+clE=
 github.com/p0mvn/cli v0.23.1 h1:Y4vUUNzTmrhhlaj1FIuLDCX9Go0oTqlf88m2PtaG5Zs=
 github.com/p0mvn/cli v0.23.1/go.mod h1:r92KMcpaLyYii0XnlQz5nfCxAMraLgOvWCHYw4pWZ7w=
@@ -1142,7 +1138,6 @@ golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
diff --git a/x/concentrated-liquidity/client/queryproto/query.pb.go b/x/concentrated-liquidity/client/queryproto/query.pb.go
index 5e72654e457..c742b1acab5 100644
--- a/x/concentrated-liquidity/client/queryproto/query.pb.go
+++ b/x/concentrated-liquidity/client/queryproto/query.pb.go
@@ -5,6 +5,7 @@ package queryproto
 
 import (
 	context "context"
+	cosmossdk_io_math "cosmossdk.io/math"
 	fmt "fmt"
 	_ "github.com/cosmos/cosmos-proto"
 	types "github.com/cosmos/cosmos-sdk/codec/types"
@@ -420,8 +421,8 @@ func (m *ParamsResponse) GetParams() types1.Params {
 }
 
 type TickLiquidityNet struct {
-	LiquidityNet github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,1,opt,name=liquidity_net,json=liquidityNet,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"liquidity_net" yaml:"liquidity_net"`
-	TickIndex    int64                                  `protobuf:"varint,2,opt,name=tick_index,json=tickIndex,proto3" json:"tick_index,omitempty" yaml:"tick_index"`
+	LiquidityNet cosmossdk_io_math.LegacyDec `protobuf:"bytes,1,opt,name=liquidity_net,json=liquidityNet,proto3,customtype=cosmossdk.io/math.LegacyDec" json:"liquidity_net" yaml:"liquidity_net"`
+	TickIndex    int64                       `protobuf:"varint,2,opt,name=tick_index,json=tickIndex,proto3" json:"tick_index,omitempty" yaml:"tick_index"`
 }
 
 func (m *TickLiquidityNet) Reset()         { *m = TickLiquidityNet{} }
@@ -465,9 +466,9 @@ func (m *TickLiquidityNet) GetTickIndex() int64 {
 }
 
 type LiquidityDepthWithRange struct {
-	LiquidityAmount github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,1,opt,name=liquidity_amount,json=liquidityAmount,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"liquidity_amount" yaml:"liquidity_net"`
-	LowerTick       int64                                  `protobuf:"varint,2,opt,name=lower_tick,json=lowerTick,proto3" json:"lower_tick,omitempty" yaml:"lower_tick"`
-	UpperTick       int64                                  `protobuf:"varint,3,opt,name=upper_tick,json=upperTick,proto3" json:"upper_tick,omitempty" yaml:"upper_tick"`
+	LiquidityAmount cosmossdk_io_math.LegacyDec `protobuf:"bytes,1,opt,name=liquidity_amount,json=liquidityAmount,proto3,customtype=cosmossdk.io/math.LegacyDec" json:"liquidity_amount" yaml:"liquidity_net"`
+	LowerTick       int64                       `protobuf:"varint,2,opt,name=lower_tick,json=lowerTick,proto3" json:"lower_tick,omitempty" yaml:"lower_tick"`
+	UpperTick       int64                       `protobuf:"varint,3,opt,name=upper_tick,json=upperTick,proto3" json:"upper_tick,omitempty" yaml:"upper_tick"`
 }
 
 func (m *LiquidityDepthWithRange) Reset()         { *m = LiquidityDepthWithRange{} }
@@ -603,9 +604,9 @@ func (m *LiquidityNetInDirectionRequest) GetUseNoBound() bool {
 }
 
 type LiquidityNetInDirectionResponse struct {
-	LiquidityDepths  []TickLiquidityNet                     `protobuf:"bytes,1,rep,name=liquidity_depths,json=liquidityDepths,proto3" json:"liquidity_depths"`
-	CurrentTick      int64                                  `protobuf:"varint,2,opt,name=current_tick,json=currentTick,proto3" json:"current_tick,omitempty"`
-	CurrentLiquidity github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,3,opt,name=current_liquidity,json=currentLiquidity,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"current_liquidity" yaml:"current_liquidity"`
+	LiquidityDepths  []TickLiquidityNet          `protobuf:"bytes,1,rep,name=liquidity_depths,json=liquidityDepths,proto3" json:"liquidity_depths"`
+	CurrentTick      int64                       `protobuf:"varint,2,opt,name=current_tick,json=currentTick,proto3" json:"current_tick,omitempty"`
+	CurrentLiquidity cosmossdk_io_math.LegacyDec `protobuf:"bytes,3,opt,name=current_liquidity,json=currentLiquidity,proto3,customtype=cosmossdk.io/math.LegacyDec" json:"current_liquidity" yaml:"current_liquidity"`
 }
 
 func (m *LiquidityNetInDirectionResponse) Reset()         { *m = LiquidityNetInDirectionResponse{} }
@@ -1543,141 +1544,142 @@ func init() {
 }
 
 var fileDescriptor_5c83e18b11fd607d = []byte{
-	// 2133 bytes of a gzipped FileDescriptorProto
+	// 2145 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x5a, 0x4d, 0x6c, 0x1c, 0x49,
 	0x15, 0x4e, 0x4d, 0x12, 0x27, 0xf3, 0xe2, 0xc4, 0x4e, 0xd9, 0xb1, 0x27, 0x93, 0x64, 0x26, 0x14,
-	0xec, 0xae, 0xb5, 0x89, 0x67, 0xc8, 0x8f, 0x09, 0xce, 0xcf, 0xee, 0x7a, 0xec, 0xb5, 0x35, 0xac,
-	0x93, 0x75, 0x7a, 0x63, 0x40, 0x1c, 0x68, 0x7a, 0xba, 0xcb, 0xe3, 0xd6, 0xf4, 0x74, 0x8d, 0xbb,
-	0xab, 0xed, 0xb5, 0x96, 0x48, 0x2b, 0xf6, 0x88, 0x04, 0x8b, 0xb8, 0x73, 0xe1, 0x00, 0x42, 0x1c,
-	0xe1, 0x00, 0x37, 0x38, 0xa0, 0x88, 0xc3, 0x6a, 0x25, 0x84, 0x84, 0xf6, 0xe0, 0x85, 0x84, 0x03,
-	0xd2, 0x22, 0x0e, 0xe6, 0xb2, 0x12, 0x17, 0xd4, 0xd5, 0xd5, 0x3d, 0x3d, 0xe3, 0x1e, 0xbb, 0x67,
-	0xec, 0x3d, 0x65, 0xaa, 0xdf, 0xef, 0xf7, 0xde, 0xab, 0x57, 0xf5, 0xca, 0x81, 0x57, 0x99, 0xdb,
-	0x64, 0xae, 0xe9, 0x96, 0x75, 0x66, 0xeb, 0xd4, 0xe6, 0x8e, 0xc6, 0xa9, 0x31, 0x6d, 0x99, 0x1b,
-	0x9e, 0x69, 0x98, 0x7c, 0xbb, 0xbc, 0xe1, 0x51, 0x67, 0xbb, 0xd4, 0x72, 0x18, 0x67, 0xf8, 0x25,
-	0xc9, 0x5b, 0x8a, 0xf3, 0x46, 0xac, 0xa5, 0xcd, 0x1b, 0x35, 0xca, 0xb5, 0x1b, 0xf9, 0xf1, 0x3a,
-	0xab, 0x33, 0x21, 0x51, 0xf6, 0x7f, 0x05, 0xc2, 0xf9, 0x6b, 0x07, 0x18, 0x6a, 0x69, 0x8e, 0xd6,
-	0x74, 0x25, 0xf3, 0xf4, 0x01, 0xcc, 0xdc, 0xd4, 0x1b, 0x55, 0x7b, 0x2d, 0xd4, 0x5d, 0xd0, 0x05,
-	0x7f, 0xb9, 0xa6, 0xb9, 0xb4, 0x2c, 0xdd, 0x28, 0xeb, 0xcc, 0xb4, 0x25, 0xfd, 0xd5, 0x38, 0x5d,
-	0x20, 0x8a, 0xb8, 0x5a, 0x5a, 0xdd, 0xb4, 0x35, 0x6e, 0xb2, 0x90, 0xf7, 0x72, 0x9d, 0xb1, 0xba,
-	0x45, 0xcb, 0x5a, 0xcb, 0x2c, 0x6b, 0xb6, 0xcd, 0xb8, 0x20, 0x86, 0x8e, 0x5d, 0x94, 0x54, 0xb1,
-	0xaa, 0x79, 0x6b, 0x65, 0xcd, 0xde, 0x0e, 0x49, 0x81, 0x11, 0x35, 0x40, 0x1e, 0x2c, 0x24, 0xa9,
-	0xd8, 0x2d, 0xc5, 0xcd, 0x26, 0x75, 0xb9, 0xd6, 0x6c, 0x85, 0x00, 0xba, 0x19, 0x0c, 0xcf, 0x89,
-	0x3b, 0x75, 0x50, 0x3c, 0x5a, 0xcc, 0x35, 0x63, 0xec, 0x33, 0x07, 0xb0, 0x9b, 0xe2, 0xab, 0xb9,
-	0x49, 0x55, 0x87, 0xea, 0xcc, 0x31, 0x02, 0x31, 0xf2, 0x3b, 0x04, 0xe3, 0xab, 0x2e, 0x75, 0x56,
-	0xa4, 0x36, 0x57, 0xa1, 0x1b, 0x1e, 0x75, 0x39, 0xbe, 0x0e, 0xa7, 0x34, 0xc3, 0x70, 0xa8, 0xeb,
-	0xe6, 0xd0, 0x55, 0x34, 0x95, 0xad, 0xe0, 0xdd, 0x9d, 0xe2, 0xb9, 0x6d, 0xad, 0x69, 0xdd, 0x25,
-	0x92, 0x40, 0x94, 0x90, 0x05, 0x5f, 0x83, 0x53, 0x2d, 0xc6, 0x2c, 0xd5, 0x34, 0x72, 0x99, 0xab,
-	0x68, 0xea, 0x44, 0x9c, 0x5b, 0x12, 0x88, 0x32, 0xe4, 0xff, 0xaa, 0x1a, 0x78, 0x11, 0xa0, 0x9d,
-	0x82, 0xdc, 0xf1, 0xab, 0x68, 0xea, 0xcc, 0xcd, 0x97, 0x4b, 0x32, 0x7a, 0x7e, 0xbe, 0x4a, 0x41,
-	0x05, 0xca, 0x7c, 0x95, 0x56, 0xb4, 0x3a, 0x95, 0x6e, 0x29, 0x31, 0x49, 0xf2, 0x47, 0x04, 0x17,
-	0xba, 0x7c, 0x77, 0x5b, 0xcc, 0x76, 0x29, 0xfe, 0x1e, 0x64, 0xc3, 0xf0, 0xf8, 0xee, 0x1f, 0x9f,
-	0x3a, 0x73, 0xf3, 0x7e, 0x29, 0x55, 0x25, 0x97, 0x16, 0x3d, 0xcb, 0x0a, 0x15, 0x56, 0x1c, 0xaa,
-	0x35, 0x0c, 0xb6, 0x65, 0x57, 0x4e, 0x3c, 0xdb, 0x29, 0x1e, 0x53, 0xda, 0x4a, 0xf1, 0x52, 0x07,
-	0x86, 0x8c, 0xc0, 0xf0, 0xca, 0x81, 0x18, 0x02, 0xf7, 0x3a, 0x40, 0x3c, 0x82, 0xb1, 0xc8, 0xdc,
-	0x76, 0xd5, 0x08, 0xc3, 0x7f, 0x07, 0xce, 0x84, 0xc6, 0xfc, 0xa0, 0x22, 0x11, 0xd4, 0x89, 0xdd,
-	0x9d, 0x22, 0x0e, 0x83, 0x1a, 0x11, 0x89, 0x02, 0xe1, 0xaa, 0x6a, 0x90, 0x4d, 0x18, 0xef, 0xd4,
-	0x27, 0x43, 0xf2, 0x5d, 0x38, 0x1d, 0x72, 0x09, 0x6d, 0x47, 0x13, 0x91, 0x48, 0x27, 0xf9, 0x26,
-	0x0c, 0xaf, 0x30, 0x66, 0x45, 0xf5, 0xb3, 0x98, 0x10, 0xa0, 0x41, 0x92, 0xfc, 0x63, 0x04, 0x67,
-	0xa5, 0x62, 0x89, 0x64, 0x06, 0x4e, 0xfa, 0x85, 0x14, 0x26, 0x76, 0xbc, 0x14, 0x6c, 0xa4, 0x52,
-	0xb8, 0x91, 0x4a, 0x73, 0xf6, 0x76, 0x25, 0xfb, 0xe7, 0xdf, 0x4c, 0x9f, 0xf4, 0xe5, 0xaa, 0x4a,
-	0xc0, 0x7d, 0x74, 0x19, 0x1b, 0x81, 0xb3, 0x2b, 0xa2, 0x71, 0x49, 0x77, 0xc9, 0x2a, 0x9c, 0x0b,
-	0x3f, 0x48, 0x17, 0xe7, 0x61, 0x28, 0xe8, 0x6d, 0x32, 0xd4, 0x2f, 0x1d, 0x10, 0xea, 0x40, 0x5c,
-	0xc6, 0x54, 0x8a, 0x92, 0xdf, 0x22, 0x18, 0x7d, 0x62, 0xea, 0x8d, 0xe5, 0x90, 0xed, 0x11, 0xe5,
-	0xb8, 0x01, 0x67, 0x23, 0x31, 0xd5, 0xa6, 0x5c, 0x6e, 0xce, 0x45, 0x5f, 0xf2, 0x93, 0x9d, 0xe2,
-	0xcb, 0x75, 0x93, 0xaf, 0x7b, 0xb5, 0x92, 0xce, 0x9a, 0xb2, 0x1d, 0xc9, 0x7f, 0xa6, 0x5d, 0xa3,
-	0x51, 0xe6, 0xdb, 0x2d, 0xea, 0x96, 0x16, 0xa8, 0xbe, 0xbb, 0x53, 0x1c, 0x0f, 0xea, 0xa8, 0x43,
-	0x19, 0x51, 0x86, 0xad, 0xb8, 0xb1, 0xdb, 0x00, 0x7e, 0xd7, 0x55, 0x4d, 0xdb, 0xa0, 0xef, 0x8a,
-	0x90, 0x1d, 0xaf, 0x5c, 0xd8, 0xdd, 0x29, 0x9e, 0x0f, 0x64, 0xdb, 0x34, 0xa2, 0x64, 0x83, 0xf6,
-	0xec, 0xff, 0xfe, 0x1c, 0xc1, 0x64, 0xe4, 0xf3, 0x02, 0x6d, 0xf1, 0xf5, 0x6f, 0x99, 0x7c, 0x5d,
-	0xd1, 0xec, 0x3a, 0xc5, 0x1b, 0x30, 0xda, 0xb6, 0xa8, 0x35, 0x99, 0x67, 0x1f, 0x35, 0x82, 0x91,
-	0x68, 0x3d, 0x27, 0xd4, 0xfb, 0x20, 0x2c, 0xb6, 0x45, 0x1d, 0xd5, 0xf7, 0x70, 0x2f, 0x88, 0x36,
-	0x8d, 0x28, 0x59, 0xb1, 0xf0, 0x63, 0xee, 0x4b, 0x79, 0xad, 0x56, 0x28, 0x75, 0xbc, 0x5b, 0xaa,
-	0x4d, 0x23, 0x4a, 0x56, 0x2c, 0x7c, 0x29, 0xf2, 0x69, 0x06, 0x0a, 0xf1, 0x74, 0x55, 0xed, 0x05,
-	0xd3, 0xa1, 0xba, 0x5f, 0x36, 0xe1, 0xbe, 0x88, 0x75, 0x4a, 0x74, 0x60, 0xa7, 0x2c, 0xc1, 0x69,
-	0xce, 0x1a, 0xd4, 0x56, 0xcd, 0xa0, 0x62, 0xb3, 0x95, 0xb1, 0xdd, 0x9d, 0xe2, 0x88, 0x0c, 0xbf,
-	0xa4, 0x10, 0xe5, 0x94, 0xf8, 0x59, 0xb5, 0x7d, 0xaf, 0x5d, 0xae, 0x39, 0xbc, 0x87, 0xd7, 0x6d,
-	0x1a, 0x51, 0xb2, 0x62, 0x21, 0xb0, 0xce, 0xc2, 0xb0, 0xe7, 0x52, 0x55, 0xf7, 0x24, 0xda, 0x13,
-	0x57, 0xd1, 0xd4, 0xe9, 0xca, 0xe4, 0xee, 0x4e, 0x71, 0x4c, 0xa2, 0x8d, 0x51, 0x89, 0x02, 0x9e,
-	0x4b, 0xe7, 0xbd, 0x28, 0x4c, 0x35, 0xe6, 0xd9, 0x46, 0x20, 0x78, 0xb2, 0xdb, 0x60, 0x9b, 0x46,
-	0x94, 0xac, 0x58, 0xc4, 0x0d, 0xda, 0x4c, 0x15, 0xdf, 0x72, 0x43, 0x49, 0x06, 0x43, 0x6a, 0x60,
-	0xf0, 0x11, 0xab, 0x88, 0xc5, 0x2f, 0x32, 0x50, 0xec, 0x19, 0x61, 0xb9, 0xfb, 0xd6, 0xe3, 0x45,
-	0x66, 0xf8, 0x05, 0x18, 0xf6, 0x8a, 0x3b, 0x29, 0x5b, 0x5e, 0xf7, 0xb6, 0x93, 0x3b, 0xb3, 0x5d,
-	0x5b, 0xa2, 0xac, 0x5d, 0xfc, 0x25, 0x18, 0xd6, 0x3d, 0xc7, 0xa1, 0x36, 0x8f, 0x55, 0x97, 0x72,
-	0x46, 0x7e, 0x13, 0x58, 0xb7, 0xe0, 0x7c, 0xc8, 0x12, 0x49, 0x8b, 0xcc, 0x64, 0x2b, 0xdf, 0xe8,
-	0xbb, 0xe4, 0x73, 0x41, 0x78, 0xf6, 0x28, 0x24, 0xca, 0xa8, 0xfc, 0x16, 0x79, 0x4d, 0xde, 0x82,
-	0xcb, 0xd1, 0x62, 0x25, 0xa8, 0x4f, 0xb1, 0x07, 0x07, 0x29, 0x44, 0xf2, 0x01, 0x82, 0x2b, 0x3d,
-	0xb4, 0xc9, 0xa0, 0xd7, 0x20, 0xdb, 0xc6, 0x17, 0x44, 0xfb, 0xb5, 0x94, 0xd1, 0xee, 0xd1, 0x2c,
-	0xc2, 0x43, 0xb7, 0x8d, 0xf2, 0xdb, 0x70, 0x65, 0xde, 0xd2, 0xcc, 0xa6, 0x56, 0xb3, 0xe8, 0x3b,
-	0x2d, 0x87, 0x6a, 0x86, 0x42, 0xb7, 0x34, 0xc7, 0x70, 0x0f, 0x7d, 0x6a, 0xfe, 0x0c, 0x41, 0xa1,
-	0x97, 0x6a, 0x09, 0xf0, 0xfb, 0x90, 0xd3, 0x43, 0x0e, 0xd5, 0x15, 0x2c, 0xaa, 0x13, 0xf0, 0x48,
-	0xbc, 0x17, 0x3b, 0x4e, 0x93, 0x10, 0xdd, 0x3c, 0x33, 0xed, 0xca, 0x2b, 0x3e, 0x94, 0xdd, 0x9d,
-	0x62, 0x51, 0x26, 0xb0, 0x87, 0x22, 0xa2, 0x4c, 0xe8, 0x89, 0x5e, 0x90, 0x55, 0xc8, 0x47, 0xfe,
-	0x55, 0xc3, 0xab, 0xdc, 0xe1, 0x71, 0x7f, 0x90, 0x81, 0x4b, 0x89, 0x7a, 0x25, 0xe8, 0x0d, 0x18,
-	0x6f, 0xfb, 0x1a, 0x5d, 0x21, 0x53, 0x00, 0xfe, 0xb2, 0x04, 0x7c, 0xa9, 0x1b, 0x70, 0x5b, 0x09,
-	0x51, 0xc6, 0xf4, 0xbd, 0xa6, 0x7d, 0x93, 0x6b, 0xcc, 0x59, 0xa3, 0x26, 0xa7, 0x46, 0xdc, 0x64,
-	0xa6, 0x4f, 0x93, 0x49, 0x4a, 0x88, 0x32, 0x16, 0x7d, 0x6e, 0x9b, 0x24, 0xcb, 0x70, 0xc5, 0xbf,
-	0x2a, 0xcc, 0xe9, 0xba, 0xd7, 0xf4, 0x2c, 0x8d, 0x33, 0xa7, 0xab, 0xae, 0xfa, 0xda, 0x2b, 0x7f,
-	0xc8, 0x40, 0xa1, 0x97, 0x3a, 0x19, 0xd6, 0x0f, 0x11, 0x5c, 0xea, 0xc8, 0xbc, 0x5a, 0x77, 0xd8,
-	0x16, 0x5f, 0x57, 0xeb, 0x16, 0xab, 0x69, 0x96, 0x0c, 0xef, 0xe5, 0x44, 0xac, 0x0b, 0x54, 0x17,
-	0x70, 0x6f, 0xf9, 0x70, 0x7f, 0xf5, 0x69, 0xf1, 0x5a, 0xba, 0xee, 0xe1, 0xcb, 0xb8, 0x4a, 0xce,
-	0x8d, 0x55, 0xd5, 0x92, 0xb0, 0xb9, 0x24, 0x4c, 0xe2, 0x1f, 0x22, 0x18, 0xf7, 0x5a, 0xfe, 0x90,
-	0xd2, 0xe5, 0x4b, 0x10, 0xf7, 0xdb, 0x29, 0xf7, 0xf2, 0xaa, 0x50, 0xf1, 0xc4, 0xd1, 0xf4, 0x06,
-	0x75, 0xba, 0x53, 0x92, 0xa4, 0x9f, 0x28, 0x38, 0xf8, 0x1c, 0xf7, 0xc6, 0xef, 0x37, 0x05, 0xbf,
-	0xc7, 0xc4, 0x62, 0x28, 0x75, 0x0e, 0x94, 0x93, 0x01, 0x6f, 0x32, 0x9f, 0x65, 0xa0, 0xd8, 0xd3,
-	0x0b, 0x99, 0xca, 0x67, 0x08, 0x66, 0x13, 0x53, 0xc9, 0x5a, 0x62, 0x9f, 0x51, 0xd5, 0x08, 0x0f,
-	0x28, 0x95, 0xad, 0xa9, 0x96, 0xe6, 0x72, 0x95, 0x3b, 0xda, 0x26, 0x75, 0xdc, 0x2f, 0x32, 0xd1,
-	0x37, 0xf7, 0x26, 0xfa, 0x6d, 0xe9, 0x50, 0x74, 0x60, 0xbe, 0xbd, 0xb6, 0xac, 0xb9, 0xfc, 0x49,
-	0xe8, 0x0c, 0x7e, 0x0a, 0x23, 0x32, 0x43, 0x5c, 0xa2, 0x3c, 0x54, 0xf2, 0x0b, 0x32, 0xf9, 0x13,
-	0x1d, 0xc9, 0x0f, 0x55, 0x13, 0xe5, 0x9c, 0x17, 0x67, 0x77, 0xc9, 0x8f, 0x10, 0x4c, 0x46, 0x9b,
-	0x52, 0x11, 0x43, 0xea, 0x60, 0xc9, 0x3e, 0xaa, 0xd1, 0xe3, 0x23, 0x04, 0xb9, 0xbd, 0x0e, 0xc9,
-	0xbc, 0x9b, 0x70, 0xbe, 0x7b, 0xa4, 0x0e, 0xdb, 0xe2, 0xd7, 0x52, 0x86, 0xab, 0x4b, 0xb7, 0x3c,
-	0xef, 0x46, 0xcd, 0x2e, 0x93, 0x47, 0x37, 0xb9, 0xbc, 0x8f, 0xe0, 0xda, 0xfc, 0xe2, 0xc3, 0x87,
-	0x62, 0x2e, 0x32, 0x96, 0x4d, 0xbb, 0xb1, 0xe8, 0xb0, 0xe6, 0x7c, 0xcc, 0xc9, 0x80, 0x12, 0x46,
-	0xfd, 0x31, 0x8c, 0xc7, 0x11, 0xa8, 0x9d, 0x29, 0x28, 0xc6, 0xda, 0x7b, 0x02, 0x17, 0x51, 0xb0,
-	0xbe, 0x47, 0x33, 0x31, 0xe1, 0x7a, 0x3a, 0x0f, 0x64, 0x98, 0x67, 0x61, 0x58, 0x5f, 0x6b, 0x36,
-	0xbb, 0x4c, 0xc7, 0xae, 0x8a, 0x71, 0x2a, 0x51, 0xc0, 0x5f, 0x4a, 0x53, 0x0f, 0xe1, 0xca, 0xaa,
-	0x4b, 0x9d, 0x55, 0xbb, 0xc6, 0x6c, 0xc3, 0xb4, 0xeb, 0x87, 0x7b, 0xe2, 0x20, 0x3f, 0x47, 0x50,
-	0xe8, 0xa5, 0x4f, 0x3a, 0xfb, 0x3e, 0x82, 0x7c, 0xf4, 0x44, 0xa0, 0x6e, 0x99, 0x7c, 0x5d, 0x6d,
-	0x51, 0xc7, 0x64, 0x86, 0x6a, 0x31, 0xbd, 0x21, 0xab, 0xe3, 0x41, 0xca, 0xea, 0x08, 0xd5, 0xfb,
-	0xf7, 0xa1, 0x15, 0xa1, 0x65, 0x99, 0xe9, 0x0d, 0x59, 0x24, 0x93, 0x91, 0x99, 0x4e, 0x32, 0xc9,
-	0x43, 0x6e, 0x89, 0xf2, 0x27, 0x8c, 0x6b, 0x56, 0x74, 0xad, 0x0a, 0xe7, 0xd4, 0x9f, 0x20, 0xb8,
-	0x98, 0x40, 0x94, 0xce, 0x73, 0x18, 0xe1, 0x3e, 0x45, 0xed, 0xbe, 0xc6, 0xed, 0x73, 0xe4, 0x7e,
-	0x55, 0xb6, 0xa6, 0xa9, 0x14, 0xad, 0x29, 0xe8, 0x4b, 0xe7, 0x78, 0x87, 0xf5, 0x9b, 0xff, 0xcb,
-	0xc1, 0xc9, 0xc7, 0x7e, 0xf5, 0xe2, 0x5f, 0x22, 0x10, 0x03, 0xbb, 0x8b, 0x6f, 0xa5, 0x8e, 0x50,
-	0xfb, 0xbd, 0x21, 0x7f, 0xbb, 0x3f, 0xa1, 0x00, 0x34, 0xb9, 0xfd, 0x83, 0xbf, 0xfc, 0xf3, 0xa7,
-	0x99, 0x12, 0xbe, 0x5e, 0x4e, 0x7a, 0x3e, 0x6b, 0xbf, 0x9e, 0x45, 0x4f, 0x87, 0xc2, 0xc1, 0x5f,
-	0x23, 0x18, 0x0a, 0x46, 0x76, 0x9c, 0xda, 0x6c, 0xfc, 0xc5, 0x20, 0x3f, 0xd3, 0xa7, 0x94, 0xf4,
-	0x76, 0x46, 0x78, 0x5b, 0xc6, 0xd3, 0x69, 0xbd, 0x0d, 0x7c, 0xfc, 0x08, 0xc1, 0xd9, 0x8e, 0x77,
-	0x32, 0x7c, 0x2f, 0x6d, 0x43, 0x4f, 0x78, 0x19, 0xcc, 0xdf, 0x1f, 0x4c, 0x58, 0x62, 0xa8, 0x08,
-	0x0c, 0xf7, 0xf1, 0xdd, 0xd4, 0x11, 0x97, 0x1a, 0xca, 0xef, 0xc9, 0x9d, 0xf8, 0x14, 0x7f, 0x86,
-	0xe0, 0x42, 0xe2, 0x34, 0x82, 0xe7, 0xfb, 0x1d, 0x39, 0x12, 0x26, 0xa3, 0xfc, 0xc2, 0xe1, 0x94,
-	0x48, 0xa0, 0x4b, 0x02, 0xe8, 0x1c, 0x7e, 0x3d, 0x25, 0xd0, 0xf6, 0xc8, 0x1a, 0x3e, 0x2d, 0xa8,
-	0x8e, 0xc0, 0xf4, 0xdf, 0xf8, 0x7b, 0x4a, 0xe7, 0xc8, 0x8b, 0xdf, 0xec, 0xd7, 0xd5, 0xc4, 0x47,
-	0x89, 0xfc, 0xe2, 0x61, 0xd5, 0x48, 0xcc, 0x55, 0x81, 0x79, 0x1e, 0xcf, 0xf5, 0x8d, 0xd9, 0xa6,
-	0x5c, 0x35, 0xed, 0xf6, 0x5d, 0x09, 0xff, 0x07, 0xc1, 0x44, 0xf2, 0x44, 0x86, 0xd3, 0xe6, 0x67,
-	0xdf, 0x59, 0x31, 0xff, 0xe6, 0x21, 0xb5, 0x0c, 0x98, 0xe6, 0x5e, 0xa3, 0x1f, 0xfe, 0x07, 0x82,
-	0xb1, 0x84, 0x51, 0x0c, 0xcf, 0xf5, 0xeb, 0xe7, 0x9e, 0xf1, 0x30, 0x5f, 0x39, 0x8c, 0x0a, 0x89,
-	0x73, 0x5e, 0xe0, 0x7c, 0x80, 0xef, 0xf5, 0x8d, 0xb3, 0x3d, 0x7e, 0xe1, 0x3f, 0x21, 0x18, 0x8e,
-	0xbf, 0x4e, 0xe3, 0xbb, 0x7d, 0x1e, 0x86, 0xb1, 0x27, 0xf2, 0xfc, 0xbd, 0x81, 0x64, 0x25, 0x9c,
-	0x07, 0x02, 0xce, 0x1d, 0x3c, 0xd3, 0x67, 0x1b, 0x52, 0x6b, 0xdb, 0xaa, 0x69, 0xe0, 0x7f, 0x21,
-	0x98, 0x48, 0x9e, 0xf1, 0x52, 0x57, 0xe7, 0xbe, 0x13, 0x67, 0xea, 0xea, 0xdc, 0x7f, 0xd0, 0x24,
-	0x73, 0x02, 0xe6, 0x3d, 0x3c, 0xdb, 0xc7, 0xf9, 0xa6, 0x6a, 0xbe, 0xbe, 0xa8, 0x2e, 0xff, 0x8a,
-	0x60, 0xb4, 0xfb, 0x16, 0x8c, 0x5f, 0x1b, 0xec, 0x8a, 0x1b, 0xc1, 0x7b, 0x7d, 0x60, 0x79, 0x09,
-	0xec, 0x0d, 0x01, 0xec, 0x2e, 0xfe, 0x7a, 0x4a, 0x60, 0x7b, 0xee, 0xea, 0xf8, 0xdf, 0x08, 0x26,
-	0x7b, 0x0c, 0x77, 0xa9, 0xdb, 0xea, 0xfe, 0x23, 0x6a, 0xea, 0xb6, 0x7a, 0xc0, 0x8c, 0xd9, 0xf7,
-	0x99, 0x29, 0x0e, 0x8f, 0x20, 0x8b, 0xe1, 0xb8, 0x85, 0x7f, 0x9f, 0x81, 0xaf, 0xa4, 0xb9, 0x79,
-	0x63, 0x25, 0x6d, 0xb3, 0x48, 0x3f, 0x48, 0xe4, 0xdf, 0x39, 0x52, 0x9d, 0x32, 0x2a, 0xa6, 0x88,
-	0x8a, 0x8e, 0xb5, 0xb4, 0x1d, 0x29, 0x36, 0x29, 0xa8, 0x96, 0x69, 0x37, 0xd4, 0x35, 0x87, 0x35,
-	0xd5, 0xb8, 0x50, 0xf9, 0xbd, 0xa4, 0x49, 0xe6, 0x29, 0xfe, 0x1c, 0xc1, 0x44, 0xf2, 0xdd, 0x3f,
-	0xf5, 0x76, 0xdf, 0x77, 0x14, 0x49, 0xbd, 0xdd, 0xf7, 0x1f, 0x40, 0xc8, 0x63, 0x11, 0x92, 0xb7,
-	0x70, 0x35, 0x65, 0x48, 0x3c, 0x97, 0x3a, 0xaa, 0x17, 0xea, 0x53, 0x93, 0xee, 0x5a, 0x9f, 0x20,
-	0x38, 0xbf, 0x67, 0x68, 0xc0, 0x69, 0xf7, 0x6f, 0xaf, 0x59, 0x24, 0xff, 0xc6, 0xe0, 0x0a, 0x06,
-	0xdc, 0x14, 0x75, 0xca, 0xd5, 0xae, 0x01, 0xa7, 0xb2, 0xfe, 0xec, 0x79, 0x01, 0x7d, 0xfc, 0xbc,
-	0x80, 0xfe, 0xfe, 0xbc, 0x80, 0x3e, 0x7c, 0x51, 0x38, 0xf6, 0xf1, 0x8b, 0xc2, 0xb1, 0xbf, 0xbd,
-	0x28, 0x1c, 0xfb, 0xce, 0xa3, 0xd8, 0x44, 0x23, 0xf5, 0x4f, 0x5b, 0x5a, 0xcd, 0x8d, 0x8c, 0x6d,
-	0xde, 0x98, 0x2d, 0xbf, 0xdb, 0xeb, 0x8f, 0xed, 0xba, 0x65, 0x52, 0x9b, 0x07, 0xff, 0xed, 0x20,
-	0xf8, 0xb3, 0xe4, 0x90, 0xf8, 0xe7, 0xd6, 0xff, 0x03, 0x00, 0x00, 0xff, 0xff, 0x29, 0xb3, 0x3e,
-	0x11, 0x7c, 0x21, 0x00, 0x00,
+	0x2c, 0x6b, 0x6d, 0xe2, 0x19, 0xf2, 0x63, 0x82, 0xe3, 0x64, 0xb3, 0x1e, 0x7b, 0x6d, 0x8d, 0xd6,
+	0xc9, 0x3a, 0xbd, 0x31, 0x20, 0x0e, 0xf4, 0xf6, 0x74, 0x97, 0xc7, 0xad, 0xe9, 0xe9, 0x9a, 0x74,
+	0x57, 0xdb, 0x6b, 0x2d, 0x91, 0x56, 0xec, 0x11, 0x09, 0x16, 0x71, 0x45, 0x5c, 0xb8, 0xa0, 0x15,
+	0x47, 0x2e, 0x70, 0x83, 0x03, 0x8a, 0x38, 0xac, 0x56, 0x42, 0x48, 0x68, 0x0f, 0x5e, 0x48, 0x38,
+	0x20, 0x2d, 0x70, 0x30, 0x17, 0x24, 0x2e, 0xa8, 0xab, 0xab, 0x7b, 0x7a, 0xc6, 0x3d, 0x76, 0xcf,
+	0xd8, 0x9c, 0x32, 0xd5, 0xef, 0xf7, 0x7b, 0xef, 0xd5, 0xab, 0x7a, 0xe5, 0xc0, 0x6b, 0xcc, 0x6d,
+	0x32, 0xd7, 0x74, 0xcb, 0x3a, 0xb3, 0x75, 0x6a, 0x73, 0x47, 0xe3, 0xd4, 0x98, 0xb6, 0xcc, 0xa7,
+	0x9e, 0x69, 0x98, 0x7c, 0xbb, 0xfc, 0xd4, 0xa3, 0xce, 0x76, 0xa9, 0xe5, 0x30, 0xce, 0xf0, 0x2b,
+	0x92, 0xb7, 0x14, 0xe7, 0x8d, 0x58, 0x4b, 0x9b, 0x37, 0x6a, 0x94, 0x6b, 0x37, 0xf2, 0xe3, 0x75,
+	0x56, 0x67, 0x42, 0xa2, 0xec, 0xff, 0x0a, 0x84, 0xf3, 0xd7, 0x0e, 0x30, 0xd4, 0xd2, 0x1c, 0xad,
+	0xe9, 0x4a, 0xe6, 0xe9, 0x03, 0x98, 0xb9, 0xa9, 0x37, 0xaa, 0xf6, 0x7a, 0xa8, 0xbb, 0xa0, 0x0b,
+	0xfe, 0x72, 0x4d, 0x73, 0x69, 0x59, 0xba, 0x51, 0xd6, 0x99, 0x69, 0x4b, 0xfa, 0x6b, 0x71, 0xba,
+	0x40, 0x14, 0x71, 0xb5, 0xb4, 0xba, 0x69, 0x6b, 0xdc, 0x64, 0x21, 0xef, 0xe5, 0x3a, 0x63, 0x75,
+	0x8b, 0x96, 0xb5, 0x96, 0x59, 0xd6, 0x6c, 0x9b, 0x71, 0x41, 0x0c, 0x1d, 0xbb, 0x28, 0xa9, 0x62,
+	0x55, 0xf3, 0xd6, 0xcb, 0x9a, 0xbd, 0x1d, 0x92, 0x02, 0x23, 0x6a, 0x80, 0x3c, 0x58, 0x48, 0x52,
+	0xb1, 0x5b, 0x8a, 0x9b, 0x4d, 0xea, 0x72, 0xad, 0xd9, 0x0a, 0x01, 0x74, 0x33, 0x18, 0x9e, 0x13,
+	0x77, 0xea, 0xa0, 0x78, 0xb4, 0x98, 0x6b, 0xc6, 0xd8, 0x67, 0x0e, 0x60, 0x37, 0xc5, 0x57, 0x73,
+	0x93, 0xaa, 0x0e, 0xd5, 0x99, 0x63, 0x04, 0x62, 0xe4, 0xd7, 0x08, 0xc6, 0xd7, 0x5c, 0xea, 0xac,
+	0x4a, 0x6d, 0xae, 0x42, 0x9f, 0x7a, 0xd4, 0xe5, 0xf8, 0x3a, 0x9c, 0xd2, 0x0c, 0xc3, 0xa1, 0xae,
+	0x9b, 0x43, 0x57, 0xd1, 0x54, 0xb6, 0x82, 0x77, 0x77, 0x8a, 0xe7, 0xb6, 0xb5, 0xa6, 0x75, 0x97,
+	0x48, 0x02, 0x51, 0x42, 0x16, 0x7c, 0x0d, 0x4e, 0xb5, 0x18, 0xb3, 0x54, 0xd3, 0xc8, 0x65, 0xae,
+	0xa2, 0xa9, 0x13, 0x71, 0x6e, 0x49, 0x20, 0xca, 0x90, 0xff, 0xab, 0x6a, 0xe0, 0x25, 0x80, 0x76,
+	0x0a, 0x72, 0xc7, 0xaf, 0xa2, 0xa9, 0x33, 0x37, 0xbf, 0x5a, 0x92, 0xd1, 0xf3, 0xf3, 0x55, 0x0a,
+	0x2a, 0x50, 0xe6, 0xab, 0xb4, 0xaa, 0xd5, 0xa9, 0x74, 0x4b, 0x89, 0x49, 0x92, 0xdf, 0x21, 0xb8,
+	0xd0, 0xe5, 0xbb, 0xdb, 0x62, 0xb6, 0x4b, 0xf1, 0xbb, 0x90, 0x0d, 0xc3, 0xe3, 0xbb, 0x7f, 0x7c,
+	0xea, 0xcc, 0xcd, 0x7b, 0xa5, 0x54, 0x95, 0x5c, 0x5a, 0xf2, 0x2c, 0x2b, 0x54, 0x58, 0x71, 0xa8,
+	0xd6, 0x30, 0xd8, 0x96, 0x5d, 0x39, 0xf1, 0x7c, 0xa7, 0x78, 0x4c, 0x69, 0x2b, 0xc5, 0xcb, 0x1d,
+	0x18, 0x32, 0x02, 0xc3, 0xab, 0x07, 0x62, 0x08, 0xdc, 0xeb, 0x00, 0xf1, 0x08, 0xc6, 0x22, 0x73,
+	0xdb, 0x55, 0x23, 0x0c, 0xff, 0x1d, 0x38, 0x13, 0x1a, 0xf3, 0x83, 0x8a, 0x44, 0x50, 0x27, 0x76,
+	0x77, 0x8a, 0x38, 0x0c, 0x6a, 0x44, 0x24, 0x0a, 0x84, 0xab, 0xaa, 0x41, 0x36, 0x61, 0xbc, 0x53,
+	0x9f, 0x0c, 0xc9, 0x77, 0xe1, 0x74, 0xc8, 0x25, 0xb4, 0x1d, 0x4d, 0x44, 0x22, 0x9d, 0xe4, 0x9b,
+	0x30, 0xbc, 0xca, 0x98, 0x15, 0xd5, 0xcf, 0x52, 0x42, 0x80, 0x06, 0x49, 0xf2, 0x8f, 0x10, 0x9c,
+	0x95, 0x8a, 0x25, 0x92, 0x19, 0x38, 0xe9, 0x17, 0x52, 0x98, 0xd8, 0xf1, 0x52, 0xb0, 0x91, 0x4a,
+	0xe1, 0x46, 0x2a, 0xcd, 0xdb, 0xdb, 0x95, 0xec, 0x1f, 0x7e, 0x35, 0x7d, 0xd2, 0x97, 0xab, 0x2a,
+	0x01, 0xf7, 0xd1, 0x65, 0x6c, 0x04, 0xce, 0xae, 0x8a, 0xc6, 0x25, 0xdd, 0x25, 0x6b, 0x70, 0x2e,
+	0xfc, 0x20, 0x5d, 0x5c, 0x80, 0xa1, 0xa0, 0xb7, 0xc9, 0x50, 0xbf, 0x72, 0x40, 0xa8, 0x03, 0x71,
+	0x19, 0x53, 0x29, 0x4a, 0x3e, 0x46, 0x30, 0xfa, 0xc4, 0xd4, 0x1b, 0x2b, 0x21, 0xdb, 0x23, 0xca,
+	0xf1, 0xbb, 0x70, 0x36, 0x12, 0x53, 0x6d, 0xca, 0xe5, 0xe6, 0x9c, 0xf3, 0x25, 0x3f, 0xdb, 0x29,
+	0x5e, 0x0a, 0xf0, 0xb8, 0x46, 0xa3, 0x64, 0xb2, 0x72, 0x53, 0xe3, 0x1b, 0xa5, 0x15, 0x5a, 0xd7,
+	0xf4, 0xed, 0x45, 0xaa, 0xef, 0xee, 0x14, 0xc7, 0x83, 0xe2, 0xe9, 0xd0, 0x40, 0x94, 0x61, 0x2b,
+	0x6e, 0xe1, 0x36, 0x80, 0xdf, 0x6a, 0x55, 0xd3, 0x36, 0xe8, 0x7b, 0x22, 0x4e, 0xc7, 0x2b, 0x17,
+	0x76, 0x77, 0x8a, 0xe7, 0x03, 0xd9, 0x36, 0x8d, 0x28, 0xd9, 0xa0, 0x27, 0xfb, 0xbf, 0xff, 0x89,
+	0x60, 0x32, 0x72, 0x74, 0x91, 0xb6, 0xf8, 0xc6, 0xb7, 0x4c, 0xbe, 0xa1, 0x68, 0x76, 0x9d, 0xe2,
+	0x75, 0x18, 0x6d, 0x5b, 0xd4, 0x9a, 0xcc, 0xb3, 0x8f, 0xc4, 0xed, 0x91, 0x68, 0x3d, 0x2f, 0x74,
+	0xfa, 0x9e, 0x5b, 0x6c, 0x8b, 0x3a, 0xaa, 0xef, 0xd6, 0x5e, 0xcf, 0xdb, 0x34, 0xa2, 0x64, 0xc5,
+	0xc2, 0x8f, 0xae, 0x2f, 0xe5, 0xb5, 0x5a, 0xa1, 0xd4, 0xf1, 0x6e, 0xa9, 0x36, 0x8d, 0x28, 0x59,
+	0xb1, 0xf0, 0xa5, 0xc8, 0xe7, 0x19, 0x28, 0xc4, 0x13, 0x53, 0xb5, 0x17, 0x4d, 0x87, 0xea, 0x7e,
+	0x81, 0x84, 0x3b, 0x20, 0xd6, 0x13, 0xd1, 0x81, 0x3d, 0xb1, 0x04, 0xa7, 0x39, 0x6b, 0x50, 0x5b,
+	0x35, 0x83, 0xda, 0xcc, 0x56, 0xc6, 0x76, 0x77, 0x8a, 0x23, 0x32, 0xe6, 0x92, 0x42, 0x94, 0x53,
+	0xe2, 0x67, 0xd5, 0xf6, 0xbd, 0x76, 0xb9, 0xe6, 0xf0, 0x1e, 0x5e, 0xb7, 0x69, 0x44, 0xc9, 0x8a,
+	0x85, 0xc0, 0x3a, 0x0b, 0xc3, 0x9e, 0x4b, 0x55, 0xdd, 0x93, 0x68, 0x4f, 0x5c, 0x45, 0x53, 0xa7,
+	0x2b, 0x93, 0xbb, 0x3b, 0xc5, 0x31, 0x89, 0x36, 0x46, 0x25, 0x0a, 0x78, 0x2e, 0x5d, 0xf0, 0xa2,
+	0x30, 0xd5, 0x98, 0x67, 0x1b, 0x81, 0xe0, 0xc9, 0x6e, 0x83, 0x6d, 0x1a, 0x51, 0xb2, 0x62, 0x11,
+	0x37, 0x68, 0x33, 0x55, 0x7c, 0xcb, 0x0d, 0x25, 0x19, 0x0c, 0xa9, 0x81, 0xc1, 0x47, 0xac, 0x22,
+	0x16, 0x3f, 0xcd, 0x40, 0xb1, 0x67, 0x84, 0xe5, 0x3e, 0xdb, 0x88, 0x57, 0x96, 0xe1, 0x57, 0x5d,
+	0xd8, 0x15, 0xee, 0xa4, 0x6c, 0x6e, 0xdd, 0x1b, 0x4c, 0xee, 0xc1, 0x76, 0x6d, 0x89, 0x5a, 0x76,
+	0xf1, 0x97, 0x60, 0x58, 0xf7, 0x1c, 0x87, 0xda, 0x3c, 0x56, 0x5d, 0xca, 0x19, 0xf9, 0x4d, 0x60,
+	0xb5, 0xe0, 0x7c, 0xc8, 0x12, 0x49, 0x8b, 0xcc, 0x64, 0x2b, 0x0f, 0xd2, 0xd5, 0x79, 0x2e, 0x88,
+	0xc9, 0x1e, 0x2d, 0x44, 0x19, 0x95, 0xdf, 0x22, 0x57, 0xc9, 0x5b, 0x70, 0x39, 0x5a, 0xac, 0x06,
+	0x45, 0x29, 0x76, 0xdb, 0x20, 0xd5, 0x47, 0x3e, 0x44, 0x70, 0xa5, 0x87, 0x36, 0x19, 0xe9, 0x1a,
+	0x64, 0xdb, 0xa0, 0x82, 0x10, 0xbf, 0x9e, 0x32, 0xc4, 0x3d, 0xda, 0x42, 0x78, 0xa6, 0xb6, 0x51,
+	0x7e, 0x1b, 0xae, 0x2c, 0x58, 0x9a, 0xd9, 0xd4, 0x6a, 0x16, 0x7d, 0xa7, 0xe5, 0x50, 0xcd, 0x50,
+	0xe8, 0x96, 0xe6, 0x18, 0xee, 0xa1, 0x0f, 0xc5, 0x9f, 0x21, 0x28, 0xf4, 0x52, 0x2d, 0x01, 0x7e,
+	0x0f, 0x72, 0x7a, 0xc8, 0xa1, 0xba, 0x82, 0x45, 0x75, 0x02, 0x1e, 0x89, 0xf7, 0x62, 0xc7, 0x61,
+	0x11, 0xa2, 0x5b, 0x60, 0xa6, 0x5d, 0x79, 0xd5, 0x87, 0xb2, 0xbb, 0x53, 0x2c, 0xca, 0x04, 0xf6,
+	0x50, 0x44, 0x94, 0x09, 0x3d, 0xd1, 0x0b, 0xb2, 0x06, 0xf9, 0xc8, 0xbf, 0x6a, 0x78, 0x53, 0x3b,
+	0x3c, 0xee, 0x0f, 0x33, 0x70, 0x29, 0x51, 0xaf, 0x04, 0xfd, 0x14, 0xc6, 0xdb, 0xbe, 0x46, 0x37,
+	0xc4, 0x14, 0x80, 0xbf, 0x2c, 0x01, 0x5f, 0xea, 0x06, 0xdc, 0x56, 0x42, 0x94, 0x31, 0x7d, 0xaf,
+	0x69, 0xdf, 0xe4, 0x3a, 0x73, 0xd6, 0xa9, 0xc9, 0xa9, 0x11, 0x37, 0x99, 0xe9, 0xd3, 0x64, 0x92,
+	0x12, 0xa2, 0x8c, 0x45, 0x9f, 0xdb, 0x26, 0xc9, 0x0a, 0x5c, 0xf1, 0x6f, 0x02, 0xf3, 0xba, 0xee,
+	0x35, 0x3d, 0x4b, 0xe3, 0xcc, 0xe9, 0xaa, 0xab, 0xbe, 0xf6, 0xca, 0x6f, 0x33, 0x50, 0xe8, 0xa5,
+	0x4e, 0x86, 0xf5, 0x23, 0x04, 0x97, 0x3a, 0x32, 0xaf, 0xd6, 0x1d, 0xb6, 0xc5, 0x37, 0xd4, 0xba,
+	0xc5, 0x6a, 0x9a, 0x25, 0xc3, 0x7b, 0x39, 0x11, 0xeb, 0x22, 0xd5, 0x05, 0xdc, 0x5b, 0x3e, 0xdc,
+	0x8f, 0x3f, 0x2f, 0x5e, 0xab, 0x9b, 0x7c, 0xc3, 0xab, 0x95, 0x74, 0xd6, 0x94, 0x03, 0x86, 0xfc,
+	0x67, 0xda, 0x35, 0x1a, 0x65, 0xbe, 0xdd, 0xa2, 0x6e, 0x28, 0xe3, 0x2a, 0x39, 0x37, 0x56, 0x55,
+	0xcb, 0xc2, 0xe6, 0xb2, 0x30, 0x89, 0x7f, 0x80, 0x60, 0xdc, 0x6b, 0xf9, 0x33, 0x48, 0x97, 0x2f,
+	0x41, 0xdc, 0x6f, 0xa7, 0xdc, 0xcb, 0x6b, 0x42, 0xc5, 0x13, 0x47, 0xd3, 0x1b, 0xd4, 0xe9, 0x4e,
+	0x49, 0x92, 0x7e, 0xa2, 0xe0, 0xe0, 0x73, 0xdc, 0x1b, 0xbf, 0xdf, 0x14, 0xfc, 0x1e, 0x13, 0x8b,
+	0xa1, 0xd4, 0x39, 0x50, 0x4e, 0x06, 0xbc, 0xb3, 0x7c, 0x91, 0x81, 0x62, 0x4f, 0x2f, 0x64, 0x2a,
+	0x9f, 0x23, 0x98, 0x4d, 0x4c, 0x25, 0x6b, 0x89, 0x7d, 0x46, 0x55, 0x23, 0x3c, 0x95, 0x54, 0xb6,
+	0xae, 0x5a, 0x9a, 0xcb, 0x55, 0xee, 0x68, 0x9b, 0xd4, 0x71, 0xff, 0x9f, 0x89, 0xbe, 0xb9, 0x37,
+	0xd1, 0x6f, 0x4b, 0x87, 0xa2, 0x53, 0xf2, 0xed, 0xf5, 0x15, 0xcd, 0xe5, 0x4f, 0x42, 0x67, 0xf0,
+	0x33, 0x18, 0x91, 0x19, 0xe2, 0x12, 0xe5, 0xa1, 0x92, 0x5f, 0x90, 0xc9, 0x9f, 0xe8, 0x48, 0x7e,
+	0xa8, 0x9a, 0x28, 0xe7, 0xbc, 0x38, 0xbb, 0x4b, 0x7e, 0x88, 0x60, 0x32, 0xda, 0x94, 0x8a, 0x98,
+	0x41, 0x07, 0x4b, 0xf6, 0x51, 0x4d, 0x16, 0x9f, 0x20, 0xc8, 0xed, 0x75, 0x48, 0xe6, 0xdd, 0x84,
+	0xf3, 0xdd, 0x13, 0x73, 0xd8, 0x16, 0xbf, 0x9e, 0x32, 0x5c, 0x5d, 0xba, 0xe5, 0x79, 0x37, 0x6a,
+	0x76, 0x99, 0x3c, 0xba, 0xc1, 0xe4, 0x03, 0x04, 0xd7, 0x16, 0x96, 0x1e, 0x3e, 0x14, 0x63, 0x8f,
+	0xb1, 0x62, 0xda, 0x8d, 0x25, 0x87, 0x35, 0x17, 0x62, 0x4e, 0x06, 0x94, 0x30, 0xea, 0x8f, 0x61,
+	0x3c, 0x8e, 0x40, 0xed, 0x4c, 0x41, 0x31, 0xd6, 0xde, 0x13, 0xb8, 0x88, 0x82, 0xf5, 0x3d, 0x9a,
+	0x89, 0x09, 0xd7, 0xd3, 0x79, 0x20, 0xc3, 0x3c, 0x0b, 0xc3, 0xfa, 0x7a, 0xb3, 0xd9, 0x65, 0x3a,
+	0x76, 0x3f, 0x8c, 0x53, 0x89, 0x02, 0xfe, 0x52, 0x9a, 0x7a, 0x08, 0x57, 0xfc, 0xe1, 0x7f, 0xcd,
+	0xae, 0x31, 0xdb, 0x30, 0xed, 0xfa, 0xe1, 0x5e, 0x30, 0xc8, 0xcf, 0x11, 0x14, 0x7a, 0xe9, 0x93,
+	0xce, 0x7e, 0x80, 0x20, 0x1f, 0xbd, 0x00, 0xa8, 0x5b, 0x26, 0xdf, 0x50, 0x5b, 0xd4, 0x31, 0x99,
+	0xa1, 0x5a, 0x4c, 0x6f, 0xc8, 0xea, 0xb8, 0x9f, 0xb2, 0x3a, 0x42, 0xf5, 0xfe, 0x7d, 0x68, 0x55,
+	0x68, 0x59, 0x61, 0x7a, 0x43, 0x16, 0xc9, 0x64, 0x64, 0xa6, 0x93, 0x4c, 0xf2, 0x90, 0x5b, 0xa6,
+	0xfc, 0x09, 0xe3, 0x9a, 0x15, 0x5d, 0xab, 0xc2, 0x31, 0xf4, 0xc7, 0x08, 0x2e, 0x26, 0x10, 0xa5,
+	0xf3, 0x1c, 0x46, 0xb8, 0x4f, 0x51, 0xbb, 0xaf, 0x71, 0xfb, 0x1c, 0xb9, 0x5f, 0x93, 0xad, 0x69,
+	0x2a, 0x45, 0x6b, 0x0a, 0xfa, 0xd2, 0x39, 0xde, 0x61, 0xfd, 0xe6, 0x7f, 0x73, 0x70, 0xf2, 0xb1,
+	0x5f, 0xbd, 0xf8, 0x17, 0x08, 0xc4, 0x3c, 0xee, 0xe2, 0x5b, 0xa9, 0x23, 0xd4, 0x7e, 0x4e, 0xc8,
+	0xdf, 0xee, 0x4f, 0x28, 0x00, 0x4d, 0x6e, 0x7f, 0xff, 0x8f, 0x7f, 0xfb, 0x49, 0xa6, 0x84, 0xaf,
+	0x97, 0x93, 0x5e, 0xc7, 0xda, 0x8f, 0x63, 0xd1, 0xcb, 0xa0, 0x70, 0xf0, 0x97, 0x08, 0x86, 0x82,
+	0x89, 0x1c, 0xa7, 0x36, 0x1b, 0x7f, 0x10, 0xc8, 0xcf, 0xf4, 0x29, 0x25, 0xbd, 0x9d, 0x11, 0xde,
+	0x96, 0xf1, 0x74, 0x5a, 0x6f, 0x03, 0x1f, 0x3f, 0x41, 0x70, 0xb6, 0xe3, 0x19, 0x0c, 0xcf, 0xa5,
+	0x6d, 0xe8, 0x09, 0x0f, 0x7f, 0xf9, 0x7b, 0x83, 0x09, 0x4b, 0x0c, 0x15, 0x81, 0xe1, 0x1e, 0xbe,
+	0x9b, 0x3a, 0xe2, 0x52, 0x43, 0xf9, 0x7d, 0xb9, 0x13, 0x9f, 0xe1, 0x2f, 0x10, 0x5c, 0x48, 0x9c,
+	0x46, 0xf0, 0x42, 0xbf, 0x23, 0x47, 0xc2, 0x64, 0x94, 0x5f, 0x3c, 0x9c, 0x12, 0x09, 0x74, 0x59,
+	0x00, 0x9d, 0xc7, 0x0f, 0x52, 0x02, 0x6d, 0xcf, 0xa9, 0xe1, 0x7b, 0x82, 0xea, 0x08, 0x4c, 0xff,
+	0x8e, 0xbf, 0x9c, 0x74, 0xce, 0xb9, 0xf8, 0xcd, 0x7e, 0x5d, 0x4d, 0x7c, 0x89, 0xc8, 0x2f, 0x1d,
+	0x56, 0x8d, 0xc4, 0x5c, 0x15, 0x98, 0x17, 0xf0, 0x7c, 0xdf, 0x98, 0x6d, 0xca, 0x55, 0xd3, 0x6e,
+	0xdf, 0x95, 0xf0, 0xbf, 0x10, 0x4c, 0x24, 0x4f, 0x64, 0x38, 0x6d, 0x7e, 0xf6, 0x9d, 0x15, 0xf3,
+	0x6f, 0x1e, 0x52, 0xcb, 0x80, 0x69, 0xee, 0x35, 0xfa, 0xe1, 0xbf, 0x22, 0x18, 0x4b, 0x18, 0xc5,
+	0xf0, 0x7c, 0xbf, 0x7e, 0xee, 0x19, 0x0f, 0xf3, 0x95, 0xc3, 0xa8, 0x90, 0x38, 0x17, 0x04, 0xce,
+	0xfb, 0x78, 0xae, 0x6f, 0x9c, 0xed, 0xf1, 0x0b, 0xff, 0x1e, 0xc1, 0x70, 0xfc, 0xf1, 0x19, 0xdf,
+	0xed, 0xf3, 0x30, 0x8c, 0xbd, 0x80, 0xe7, 0xe7, 0x06, 0x92, 0x95, 0x70, 0xee, 0x0b, 0x38, 0x77,
+	0xf0, 0x4c, 0x9f, 0x6d, 0x48, 0xad, 0x6d, 0xab, 0xa6, 0x81, 0xff, 0x8e, 0x60, 0x22, 0x79, 0xc6,
+	0x4b, 0x5d, 0x9d, 0xfb, 0x4e, 0x9c, 0xa9, 0xab, 0x73, 0xff, 0x41, 0x93, 0xcc, 0x0b, 0x98, 0x73,
+	0x78, 0xb6, 0x8f, 0xf3, 0x4d, 0xd5, 0x7c, 0x7d, 0x51, 0x5d, 0xfe, 0x09, 0xc1, 0x68, 0xf7, 0x2d,
+	0x18, 0xbf, 0x3e, 0xd8, 0x15, 0x37, 0x82, 0xf7, 0x60, 0x60, 0x79, 0x09, 0xec, 0x0d, 0x01, 0xec,
+	0x2e, 0xfe, 0x46, 0x4a, 0x60, 0x7b, 0xee, 0xea, 0xf8, 0x1f, 0x08, 0x26, 0x7b, 0x0c, 0x77, 0xa9,
+	0xdb, 0xea, 0xfe, 0x23, 0x6a, 0xea, 0xb6, 0x7a, 0xc0, 0x8c, 0xd9, 0xf7, 0x99, 0x29, 0x0e, 0x8f,
+	0x20, 0x8b, 0xe1, 0xb8, 0x85, 0x7f, 0x93, 0x81, 0xaf, 0xa4, 0xb9, 0x79, 0x63, 0x25, 0x6d, 0xb3,
+	0x48, 0x3f, 0x48, 0xe4, 0xdf, 0x39, 0x52, 0x9d, 0x32, 0x2a, 0xa6, 0x88, 0x8a, 0x8e, 0xb5, 0xb4,
+	0x1d, 0x29, 0x36, 0x29, 0xa8, 0x96, 0x69, 0x37, 0xd4, 0x75, 0x87, 0x35, 0xd5, 0xb8, 0x50, 0xf9,
+	0xfd, 0xa4, 0x49, 0xe6, 0x19, 0xfe, 0x0f, 0x82, 0x89, 0xe4, 0xbb, 0x7f, 0xea, 0xed, 0xbe, 0xef,
+	0x28, 0x92, 0x7a, 0xbb, 0xef, 0x3f, 0x80, 0x90, 0xc7, 0x22, 0x24, 0x6f, 0xe1, 0x6a, 0xca, 0x90,
+	0x78, 0x2e, 0x75, 0x54, 0x2f, 0xd4, 0xa7, 0x26, 0xdd, 0xb5, 0x3e, 0x43, 0x70, 0x7e, 0xcf, 0xd0,
+	0x80, 0xd3, 0xee, 0xdf, 0x5e, 0xb3, 0x48, 0xfe, 0x8d, 0xc1, 0x15, 0x0c, 0xb8, 0x29, 0xea, 0x94,
+	0xab, 0x5d, 0x03, 0x4e, 0x65, 0xe3, 0xf9, 0x8b, 0x02, 0xfa, 0xf4, 0x45, 0x01, 0xfd, 0xe5, 0x45,
+	0x01, 0x7d, 0xf4, 0xb2, 0x70, 0xec, 0xd3, 0x97, 0x85, 0x63, 0x7f, 0x7e, 0x59, 0x38, 0xf6, 0x9d,
+	0x47, 0xb1, 0x89, 0x46, 0xea, 0x9f, 0xb6, 0xb4, 0x9a, 0x1b, 0x19, 0xdb, 0xbc, 0x31, 0x5b, 0x7e,
+	0xaf, 0xd7, 0xdf, 0xd2, 0x75, 0xcb, 0xa4, 0x36, 0x0f, 0xfe, 0x57, 0x41, 0xf0, 0x57, 0xc7, 0x21,
+	0xf1, 0xcf, 0xad, 0xff, 0x05, 0x00, 0x00, 0xff, 0xff, 0x7f, 0xaa, 0x47, 0x4c, 0x5b, 0x21, 0x00,
+	0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/x/concentrated-liquidity/model/pool.pb.go b/x/concentrated-liquidity/model/pool.pb.go
index 7d0845f563c..ae8b726dc94 100644
--- a/x/concentrated-liquidity/model/pool.pb.go
+++ b/x/concentrated-liquidity/model/pool.pb.go
@@ -9,9 +9,9 @@
 package model
 
 import (
+	cosmossdk_io_math "cosmossdk.io/math"
 	fmt "fmt"
 	_ "github.com/cosmos/cosmos-proto"
-	github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types"
 	_ "github.com/gogo/protobuf/gogoproto"
 	proto "github.com/gogo/protobuf/proto"
 	_ "github.com/gogo/protobuf/types"
@@ -44,7 +44,7 @@ type Pool struct {
 	SpreadRewardsAddress string `protobuf:"bytes,3,opt,name=spread_rewards_address,json=spreadRewardsAddress,proto3" json:"spread_rewards_address,omitempty" yaml:"spread_rewards_address"`
 	Id                   uint64 `protobuf:"varint,4,opt,name=id,proto3" json:"id,omitempty"`
 	// Amount of total liquidity
-	CurrentTickLiquidity github_com_cosmos_cosmos_sdk_types.Dec          `protobuf:"bytes,5,opt,name=current_tick_liquidity,json=currentTickLiquidity,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"current_tick_liquidity" yaml:"current_tick_liquidity"`
+	CurrentTickLiquidity cosmossdk_io_math.LegacyDec                     `protobuf:"bytes,5,opt,name=current_tick_liquidity,json=currentTickLiquidity,proto3,customtype=cosmossdk.io/math.LegacyDec" json:"current_tick_liquidity" yaml:"current_tick_liquidity"`
 	Token0               string                                          `protobuf:"bytes,6,opt,name=token0,proto3" json:"token0,omitempty"`
 	Token1               string                                          `protobuf:"bytes,7,opt,name=token1,proto3" json:"token1,omitempty"`
 	CurrentSqrtPrice     github_com_osmosis_labs_osmosis_osmomath.BigDec `protobuf:"bytes,8,opt,name=current_sqrt_price,json=currentSqrtPrice,proto3,customtype=github.com/osmosis-labs/osmosis/osmomath.BigDec" json:"current_sqrt_price" yaml:"spot_price"`
@@ -54,7 +54,7 @@ type Pool struct {
 	TickSpacing        uint64 `protobuf:"varint,10,opt,name=tick_spacing,json=tickSpacing,proto3" json:"tick_spacing,omitempty" yaml:"tick_spacing"`
 	ExponentAtPriceOne int64  `protobuf:"varint,11,opt,name=exponent_at_price_one,json=exponentAtPriceOne,proto3" json:"exponent_at_price_one,omitempty" yaml:"exponent_at_price_one"`
 	// spread_factor is the ratio that is charged on the amount of token in.
-	SpreadFactor github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,12,opt,name=spread_factor,json=spreadFactor,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"spread_factor" yaml:"spread_factor"`
+	SpreadFactor cosmossdk_io_math.LegacyDec `protobuf:"bytes,12,opt,name=spread_factor,json=spreadFactor,proto3,customtype=cosmossdk.io/math.LegacyDec" json:"spread_factor" yaml:"spread_factor"`
 	// last_liquidity_update is the last time either the pool liquidity or the
 	// active tick changed
 	LastLiquidityUpdate time.Time `protobuf:"bytes,13,opt,name=last_liquidity_update,json=lastLiquidityUpdate,proto3,stdtime" json:"last_liquidity_update" yaml:"last_liquidity_update"`
@@ -102,47 +102,47 @@ func init() {
 
 var fileDescriptor_3526ea5373d96c9a = []byte{
 	// 659 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0x4f, 0x6b, 0xd4, 0x40,
-	0x14, 0xdf, 0xf4, 0xaf, 0x9d, 0x6d, 0x8b, 0x9d, 0x6e, 0x6b, 0x5a, 0xec, 0x66, 0x0d, 0x28, 0x2b,
-	0xb8, 0x89, 0xab, 0x27, 0x7b, 0xeb, 0x22, 0x05, 0xa1, 0xd0, 0x92, 0x56, 0x04, 0x11, 0xc2, 0x6c,
-	0x32, 0x4d, 0x87, 0x4d, 0x32, 0x69, 0x66, 0xb6, 0xb6, 0xde, 0x05, 0x8f, 0x3d, 0x7a, 0xec, 0x87,
-	0xf0, 0x43, 0x14, 0x4f, 0x3d, 0x8a, 0x87, 0x28, 0x2d, 0xf8, 0x01, 0xf6, 0x13, 0x48, 0x66, 0x26,
-	0xbb, 0x91, 0xae, 0x88, 0xa7, 0xec, 0xfb, 0xbd, 0xdf, 0xfb, 0xcd, 0xef, 0xbd, 0x79, 0xb3, 0xe0,
-	0x31, 0x65, 0x11, 0x65, 0x84, 0xd9, 0x1e, 0x8d, 0x3d, 0x1c, 0xf3, 0x14, 0x71, 0xec, 0xb7, 0x42,
-	0x72, 0xdc, 0x27, 0x3e, 0xe1, 0x67, 0x76, 0x42, 0x69, 0x68, 0x25, 0x29, 0xe5, 0x14, 0x3e, 0x54,
-	0x54, 0xab, 0x4c, 0x1d, 0x32, 0xad, 0x93, 0x76, 0x17, 0x73, 0xd4, 0x5e, 0x5f, 0xf3, 0x04, 0xcf,
-	0x15, 0x45, 0xb6, 0x0c, 0xa4, 0xc2, 0x7a, 0x2d, 0xa0, 0x01, 0x95, 0x78, 0xfe, 0x4b, 0xa1, 0x46,
-	0x40, 0x69, 0x10, 0x62, 0x5b, 0x44, 0xdd, 0xfe, 0xa1, 0xcd, 0x49, 0x84, 0x19, 0x47, 0x51, 0x22,
-	0x09, 0xe6, 0xaf, 0x59, 0x30, 0xb5, 0x47, 0x69, 0x08, 0x9f, 0x80, 0x59, 0xe4, 0xfb, 0x29, 0x66,
-	0x4c, 0xd7, 0x1a, 0x5a, 0x73, 0xae, 0x03, 0x07, 0x99, 0xb1, 0x78, 0x86, 0xa2, 0x70, 0xd3, 0x54,
-	0x09, 0xd3, 0x29, 0x28, 0x70, 0x07, 0x40, 0x22, 0x8c, 0x92, 0x13, 0xcc, 0xdc, 0xa2, 0x70, 0x42,
-	0x14, 0x6e, 0x0c, 0x32, 0x63, 0x4d, 0x16, 0xde, 0xe6, 0x98, 0xce, 0xd2, 0x08, 0xdc, 0x52, 0x6a,
-	0x6f, 0xc0, 0x2a, 0x4b, 0x52, 0x8c, 0x7c, 0x37, 0xc5, 0xef, 0x51, 0xea, 0x8f, 0x14, 0x27, 0x85,
-	0xe2, 0x83, 0x41, 0x66, 0x6c, 0x48, 0xc5, 0xf1, 0x3c, 0xd3, 0xa9, 0xc9, 0x84, 0x23, 0xf1, 0x42,
-	0x78, 0x11, 0x4c, 0x10, 0x5f, 0x9f, 0x6a, 0x68, 0xcd, 0x29, 0x67, 0x82, 0xf8, 0xf0, 0xa3, 0x06,
-	0x56, 0xbd, 0x7e, 0x9a, 0xe2, 0x98, 0xbb, 0x9c, 0x78, 0x3d, 0x77, 0x38, 0x62, 0x7d, 0x5a, 0x9c,
-	0xb4, 0x7b, 0x99, 0x19, 0x95, 0xef, 0x99, 0xf1, 0x28, 0x20, 0xfc, 0xa8, 0xdf, 0xb5, 0x3c, 0x1a,
-	0xa9, 0x31, 0xab, 0x4f, 0x8b, 0xf9, 0x3d, 0x9b, 0x9f, 0x25, 0x98, 0x59, 0x2f, 0xb1, 0x37, 0xf2,
-	0x35, 0x5e, 0xd5, 0x74, 0x6a, 0x2a, 0x71, 0x40, 0xbc, 0xde, 0x4e, 0x01, 0xc3, 0x55, 0x30, 0xc3,
-	0x69, 0x0f, 0xc7, 0x4f, 0xf5, 0x99, 0xfc, 0x58, 0x47, 0x45, 0x43, 0xbc, 0xad, 0xcf, 0x96, 0xf0,
-	0x36, 0xfc, 0x00, 0x60, 0x71, 0x00, 0x3b, 0x4e, 0xb9, 0x9b, 0xa4, 0xc4, 0xc3, 0xfa, 0x1d, 0x61,
-	0x79, 0x47, 0x59, 0xb6, 0x4b, 0x96, 0xd5, 0x36, 0xb5, 0x42, 0xd4, 0x65, 0x45, 0x20, 0xbe, 0x11,
-	0xe2, 0x47, 0x56, 0x87, 0x04, 0xd2, 0xfb, 0x52, 0x31, 0x53, 0xaa, 0x24, 0x4d, 0xe7, 0xae, 0x3a,
-	0x67, 0xff, 0x38, 0xe5, 0x7b, 0x39, 0x04, 0x37, 0xc1, 0x7c, 0xb9, 0x39, 0x7d, 0xae, 0xa1, 0x35,
-	0x27, 0x3b, 0xf7, 0x06, 0x99, 0xb1, 0x7c, 0xbb, 0x75, 0xd3, 0xa9, 0x96, 0x1a, 0xce, 0x6b, 0xc5,
-	0x40, 0x58, 0x82, 0x3c, 0x12, 0x07, 0x3a, 0xc8, 0x6f, 0xa2, 0x5c, 0x5b, 0xce, 0x9a, 0x4e, 0x35,
-	0x0f, 0xf7, 0x65, 0x04, 0xf7, 0xc1, 0x0a, 0x3e, 0x4d, 0x68, 0x9c, 0x4b, 0x23, 0xe5, 0xcf, 0xa5,
-	0x31, 0xd6, 0xab, 0xc2, 0x40, 0x63, 0x90, 0x19, 0xf7, 0xa5, 0xc8, 0x58, 0x9a, 0xe9, 0xc0, 0x02,
-	0xdf, 0x92, 0x9d, 0xec, 0xc6, 0x18, 0xf6, 0xc0, 0x82, 0xda, 0xa0, 0x43, 0xe4, 0x71, 0x9a, 0xea,
-	0xf3, 0x62, 0x86, 0xdb, 0xff, 0x7d, 0xed, 0xb5, 0x3f, 0xd6, 0x51, 0x8a, 0x99, 0xce, 0xbc, 0x8c,
-	0xb7, 0x45, 0x08, 0x4f, 0xc1, 0x4a, 0x88, 0x18, 0x1f, 0xad, 0x83, 0xdb, 0x4f, 0x7c, 0xc4, 0xb1,
-	0xbe, 0xd0, 0xd0, 0x9a, 0xd5, 0x67, 0xeb, 0x96, 0x7c, 0x9c, 0x56, 0xf1, 0x38, 0xad, 0x83, 0xe2,
-	0x71, 0x76, 0x9a, 0xb9, 0xa1, 0x51, 0x87, 0x63, 0x65, 0xcc, 0xf3, 0x1f, 0x86, 0xe6, 0x2c, 0xe7,
-	0xb9, 0xe1, 0x66, 0xbd, 0x16, 0x99, 0xcd, 0xa5, 0x4f, 0x17, 0x46, 0xe5, 0xf3, 0x85, 0x51, 0xf9,
-	0xfa, 0xa5, 0x35, 0x9d, 0x3f, 0xef, 0x57, 0x9d, 0x77, 0x97, 0xd7, 0x75, 0xed, 0xea, 0xba, 0xae,
-	0xfd, 0xbc, 0xae, 0x6b, 0xe7, 0x37, 0xf5, 0xca, 0xd5, 0x4d, 0xbd, 0xf2, 0xed, 0xa6, 0x5e, 0x79,
-	0xdb, 0xf9, 0xd7, 0xe2, 0x9c, 0xb4, 0x5f, 0xd8, 0xa7, 0x7f, 0xfb, 0x13, 0x8b, 0xa8, 0x8f, 0xc3,
-	0xee, 0x8c, 0xe8, 0xe1, 0xf9, 0xef, 0x00, 0x00, 0x00, 0xff, 0xff, 0x17, 0x4c, 0x23, 0x86, 0xf3,
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x54, 0xcf, 0x6e, 0xd3, 0x4e,
+	0x10, 0x8e, 0xfb, 0xf7, 0xd7, 0x4d, 0x5b, 0xfd, 0xba, 0x4d, 0x8b, 0x5b, 0x68, 0x1c, 0x2c, 0x21,
+	0x05, 0x89, 0xda, 0x04, 0x4e, 0x94, 0x53, 0xa3, 0x0a, 0x09, 0x29, 0x12, 0xd5, 0xb6, 0x08, 0x09,
+	0x21, 0x99, 0x8d, 0xbd, 0x75, 0x57, 0xb1, 0xbd, 0xae, 0x77, 0x53, 0xda, 0x3e, 0x01, 0xc7, 0x1e,
+	0x39, 0xf6, 0x21, 0x78, 0x88, 0x8a, 0x0b, 0x3d, 0x22, 0x0e, 0x06, 0xb5, 0x6f, 0x90, 0x27, 0x40,
+	0xde, 0xb5, 0x13, 0xa3, 0x06, 0xc1, 0x29, 0x99, 0x6f, 0xbe, 0xf9, 0xf6, 0x9b, 0xc9, 0x4c, 0xc0,
+	0x43, 0xc6, 0x43, 0xc6, 0x29, 0xb7, 0x5d, 0x16, 0xb9, 0x24, 0x12, 0x09, 0x16, 0xc4, 0xdb, 0x0c,
+	0xe8, 0x51, 0x9f, 0x7a, 0x54, 0x9c, 0xda, 0x31, 0x63, 0x81, 0x15, 0x27, 0x4c, 0x30, 0xf8, 0x20,
+	0xa7, 0x5a, 0x65, 0xea, 0x90, 0x69, 0x1d, 0xb7, 0xba, 0x44, 0xe0, 0xd6, 0xfa, 0x9a, 0x2b, 0x79,
+	0x8e, 0x2c, 0xb2, 0x55, 0xa0, 0x14, 0xd6, 0x6b, 0x3e, 0xf3, 0x99, 0xc2, 0xb3, 0x6f, 0x39, 0x6a,
+	0xf8, 0x8c, 0xf9, 0x01, 0xb1, 0x65, 0xd4, 0xed, 0x1f, 0xd8, 0x82, 0x86, 0x84, 0x0b, 0x1c, 0xc6,
+	0x8a, 0x60, 0x7e, 0x9d, 0x05, 0x53, 0xbb, 0x8c, 0x05, 0xf0, 0x11, 0x98, 0xc5, 0x9e, 0x97, 0x10,
+	0xce, 0x75, 0xad, 0xa1, 0x35, 0xe7, 0xda, 0x70, 0x90, 0x1a, 0x8b, 0xa7, 0x38, 0x0c, 0xb6, 0xcc,
+	0x3c, 0x61, 0xa2, 0x82, 0x02, 0x3b, 0x00, 0x52, 0x69, 0x94, 0x1e, 0x13, 0xee, 0x14, 0x85, 0x13,
+	0xb2, 0x70, 0x63, 0x90, 0x1a, 0x6b, 0xaa, 0xf0, 0x36, 0xc7, 0x44, 0x4b, 0x23, 0x70, 0x3b, 0x57,
+	0x7b, 0x03, 0x56, 0x79, 0x9c, 0x10, 0xec, 0x39, 0x09, 0xf9, 0x80, 0x13, 0x6f, 0xa4, 0x38, 0x29,
+	0x15, 0xef, 0x0f, 0x52, 0x63, 0x43, 0x29, 0x8e, 0xe7, 0x99, 0xa8, 0xa6, 0x12, 0x48, 0xe1, 0x85,
+	0xf0, 0x22, 0x98, 0xa0, 0x9e, 0x3e, 0xd5, 0xd0, 0x9a, 0x53, 0x68, 0x82, 0x7a, 0xf0, 0x0c, 0xac,
+	0xba, 0xfd, 0x24, 0x21, 0x91, 0x70, 0x04, 0x75, 0x7b, 0xce, 0x70, 0xc2, 0xfa, 0xb4, 0x7c, 0x68,
+	0xe7, 0x32, 0x35, 0x2a, 0xdf, 0x53, 0xe3, 0xae, 0x1a, 0x2d, 0xf7, 0x7a, 0x16, 0x65, 0x76, 0x88,
+	0xc5, 0xa1, 0xd5, 0x21, 0x3e, 0x76, 0x4f, 0x77, 0x88, 0x3b, 0xf2, 0x32, 0x5e, 0xca, 0x44, 0xb5,
+	0x3c, 0xb1, 0x4f, 0xdd, 0x5e, 0xa7, 0x80, 0xe1, 0x2a, 0x98, 0x11, 0xac, 0x47, 0xa2, 0xc7, 0xfa,
+	0x4c, 0xf6, 0x16, 0xca, 0xa3, 0x21, 0xde, 0xd2, 0x67, 0x4b, 0x78, 0x0b, 0x9e, 0x01, 0x58, 0x3c,
+	0xc0, 0x8f, 0x12, 0xe1, 0xc4, 0x09, 0x75, 0x89, 0xfe, 0x9f, 0xf4, 0xd9, 0xc9, 0x7d, 0xda, 0x3e,
+	0x15, 0x87, 0xfd, 0xae, 0xe5, 0xb2, 0xd0, 0xce, 0x37, 0x68, 0x33, 0xc0, 0x5d, 0x5e, 0x04, 0xf2,
+	0x53, 0xda, 0x6f, 0x53, 0x5f, 0x79, 0x5f, 0x2a, 0xe6, 0xc8, 0x72, 0x49, 0x13, 0xfd, 0x9f, 0xbf,
+	0xb3, 0x77, 0x94, 0x88, 0xdd, 0x0c, 0x82, 0x5b, 0x60, 0xbe, 0xdc, 0x9c, 0x3e, 0xd7, 0xd0, 0x9a,
+	0x93, 0xed, 0x3b, 0x83, 0xd4, 0x58, 0xbe, 0xdd, 0xba, 0x89, 0xaa, 0xa5, 0x86, 0xb3, 0x5a, 0x39,
+	0x10, 0x1e, 0x63, 0x97, 0x46, 0xbe, 0x0e, 0xb2, 0xe9, 0x97, 0x6b, 0xcb, 0x59, 0x13, 0x55, 0xb3,
+	0x70, 0x4f, 0x45, 0x70, 0x0f, 0xac, 0x90, 0x93, 0x98, 0x45, 0x99, 0x34, 0xce, 0xfd, 0x39, 0x2c,
+	0x22, 0x7a, 0x55, 0x1a, 0x68, 0x0c, 0x52, 0xe3, 0x9e, 0x12, 0x19, 0x4b, 0x33, 0x11, 0x2c, 0xf0,
+	0x6d, 0xd5, 0xc9, 0xab, 0x88, 0xc0, 0xf7, 0x60, 0x21, 0xdf, 0x9a, 0x03, 0xec, 0x0a, 0x96, 0xe8,
+	0xf3, 0x72, 0x86, 0xcf, 0xff, 0xed, 0xb7, 0xae, 0xfd, 0xb6, 0x77, 0x4a, 0xc1, 0x44, 0xf3, 0x2a,
+	0x7e, 0x21, 0x43, 0x78, 0x02, 0x56, 0x02, 0xcc, 0xc5, 0x68, 0x07, 0x9c, 0x7e, 0xec, 0x61, 0x41,
+	0xf4, 0x85, 0x86, 0xd6, 0xac, 0x3e, 0x59, 0xb7, 0xd4, 0x15, 0x5a, 0xc5, 0x15, 0x5a, 0xfb, 0xc5,
+	0x15, 0xb6, 0x9b, 0x99, 0x8b, 0x51, 0x5b, 0x63, 0x65, 0xcc, 0xf3, 0x1f, 0x86, 0x86, 0x96, 0xb3,
+	0xdc, 0x70, 0x9d, 0x5e, 0xcb, 0xcc, 0xd6, 0xd2, 0xc7, 0x0b, 0xa3, 0xf2, 0xe9, 0xc2, 0xa8, 0x7c,
+	0xf9, 0xbc, 0x39, 0x9d, 0xdd, 0xf1, 0xcb, 0xf6, 0xbb, 0xcb, 0xeb, 0xba, 0x76, 0x75, 0x5d, 0xd7,
+	0x7e, 0x5e, 0xd7, 0xb5, 0xf3, 0x9b, 0x7a, 0xe5, 0xea, 0xa6, 0x5e, 0xf9, 0x76, 0x53, 0xaf, 0xbc,
+	0x6d, 0xff, 0x6d, 0x5b, 0x8e, 0x5b, 0xcf, 0xec, 0x93, 0x3f, 0xfd, 0x5b, 0x85, 0xcc, 0x23, 0x41,
+	0x77, 0x46, 0xf6, 0xf0, 0xf4, 0x57, 0x00, 0x00, 0x00, 0xff, 0xff, 0xdb, 0x80, 0x60, 0x95, 0xdc,
 	0x04, 0x00, 0x00,
 }
 
diff --git a/x/concentrated-liquidity/model/position.pb.go b/x/concentrated-liquidity/model/position.pb.go
index 075e8c18b13..6a17a1551a8 100644
--- a/x/concentrated-liquidity/model/position.pb.go
+++ b/x/concentrated-liquidity/model/position.pb.go
@@ -9,9 +9,9 @@
 package model
 
 import (
+	cosmossdk_io_math "cosmossdk.io/math"
 	fmt "fmt"
 	_ "github.com/cosmos/cosmos-proto"
-	github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types"
 	types1 "github.com/cosmos/cosmos-sdk/types"
 	_ "github.com/gogo/protobuf/gogoproto"
 	proto "github.com/gogo/protobuf/proto"
@@ -39,13 +39,13 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
 // Position contains position's id, address, pool id, lower tick, upper tick
 // join time, and liquidity.
 type Position struct {
-	PositionId uint64                                 `protobuf:"varint,1,opt,name=position_id,json=positionId,proto3" json:"position_id,omitempty" yaml:"position_id"`
-	Address    string                                 `protobuf:"bytes,2,opt,name=address,proto3" json:"address,omitempty" yaml:"address"`
-	PoolId     uint64                                 `protobuf:"varint,3,opt,name=pool_id,json=poolId,proto3" json:"pool_id,omitempty" yaml:"pool_id"`
-	LowerTick  int64                                  `protobuf:"varint,4,opt,name=lower_tick,json=lowerTick,proto3" json:"lower_tick,omitempty"`
-	UpperTick  int64                                  `protobuf:"varint,5,opt,name=upper_tick,json=upperTick,proto3" json:"upper_tick,omitempty"`
-	JoinTime   time.Time                              `protobuf:"bytes,6,opt,name=join_time,json=joinTime,proto3,stdtime" json:"join_time" yaml:"join_time"`
-	Liquidity  github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,7,opt,name=liquidity,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"liquidity" yaml:"liquidity"`
+	PositionId uint64                      `protobuf:"varint,1,opt,name=position_id,json=positionId,proto3" json:"position_id,omitempty" yaml:"position_id"`
+	Address    string                      `protobuf:"bytes,2,opt,name=address,proto3" json:"address,omitempty" yaml:"address"`
+	PoolId     uint64                      `protobuf:"varint,3,opt,name=pool_id,json=poolId,proto3" json:"pool_id,omitempty" yaml:"pool_id"`
+	LowerTick  int64                       `protobuf:"varint,4,opt,name=lower_tick,json=lowerTick,proto3" json:"lower_tick,omitempty"`
+	UpperTick  int64                       `protobuf:"varint,5,opt,name=upper_tick,json=upperTick,proto3" json:"upper_tick,omitempty"`
+	JoinTime   time.Time                   `protobuf:"bytes,6,opt,name=join_time,json=joinTime,proto3,stdtime" json:"join_time" yaml:"join_time"`
+	Liquidity  cosmossdk_io_math.LegacyDec `protobuf:"bytes,7,opt,name=liquidity,proto3,customtype=cosmossdk.io/math.LegacyDec" json:"liquidity" yaml:"liquidity"`
 }
 
 func (m *Position) Reset()         { *m = Position{} }
@@ -277,51 +277,52 @@ func init() {
 }
 
 var fileDescriptor_ffdfd7b30d37d326 = []byte{
-	// 697 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x55, 0xcf, 0x6e, 0xd3, 0x30,
-	0x1c, 0x6e, 0xe8, 0x9f, 0xad, 0xae, 0x84, 0x50, 0x36, 0xa6, 0xac, 0x40, 0x53, 0x05, 0xc1, 0x2a,
-	0x41, 0x13, 0x3a, 0x24, 0x10, 0x1c, 0x03, 0x42, 0x9a, 0xc4, 0x61, 0x84, 0x21, 0x24, 0x84, 0x54,
-	0x9c, 0xd8, 0xeb, 0x4c, 0x93, 0x3a, 0x8b, 0x9d, 0x8d, 0x49, 0x3c, 0xc4, 0x2e, 0xf0, 0x02, 0xdc,
-	0x78, 0x92, 0x1d, 0x77, 0x44, 0x1c, 0x3a, 0xb4, 0xbd, 0xc1, 0x9e, 0x00, 0xd9, 0x71, 0x92, 0x6a,
-	0x62, 0x30, 0x0e, 0x3b, 0x35, 0xf6, 0xf7, 0xfb, 0xbe, 0xcf, 0x3f, 0x7f, 0x3f, 0xb9, 0xa0, 0x4f,
-	0x59, 0x44, 0x19, 0x61, 0x4e, 0x40, 0x27, 0x01, 0x9e, 0xf0, 0x04, 0x72, 0x8c, 0xfa, 0x21, 0xd9,
-	0x4e, 0x09, 0x22, 0x7c, 0xcf, 0x89, 0x29, 0x23, 0x9c, 0xd0, 0x89, 0x1d, 0x27, 0x94, 0x53, 0xfd,
-	0x8e, 0x2a, 0xb7, 0x67, 0xcb, 0x8b, 0x6a, 0x7b, 0x67, 0xe0, 0x63, 0x0e, 0x07, 0xed, 0xe5, 0x40,
-	0xd6, 0x0d, 0x25, 0xc9, 0xc9, 0x16, 0x99, 0x42, 0xdb, 0x1c, 0x51, 0x3a, 0x0a, 0xb1, 0x23, 0x57,
-	0x7e, 0xba, 0xe9, 0x70, 0x12, 0x61, 0xc6, 0x61, 0x14, 0xab, 0x82, 0xce, 0xd9, 0x02, 0x94, 0x26,
-	0xb0, 0x3c, 0x42, 0x7b, 0x71, 0x44, 0x47, 0x34, 0x13, 0x16, 0x5f, 0x39, 0x2b, 0x33, 0x71, 0x7c,
-	0xc8, 0xb0, 0xa3, 0x8e, 0xe1, 0x04, 0x94, 0xe4, 0xac, 0xe5, 0xbc, 0xcf, 0x90, 0x06, 0xe3, 0x34,
-	0x96, 0x3f, 0x19, 0x64, 0x7d, 0xa9, 0x82, 0xf9, 0x75, 0xd5, 0xa6, 0xfe, 0x18, 0xb4, 0xf2, 0x96,
-	0x87, 0x04, 0x19, 0x5a, 0x57, 0xeb, 0xd5, 0xdc, 0xa5, 0xd3, 0xa9, 0xa9, 0xef, 0xc1, 0x28, 0x7c,
-	0x6a, 0xcd, 0x80, 0x96, 0x07, 0xf2, 0xd5, 0x1a, 0xd2, 0xef, 0x83, 0x39, 0x88, 0x50, 0x82, 0x19,
-	0x33, 0xae, 0x74, 0xb5, 0x5e, 0xd3, 0xd5, 0x4f, 0xa7, 0xe6, 0xd5, 0x8c, 0xa4, 0x00, 0xcb, 0xcb,
-	0x4b, 0xf4, 0x7b, 0x60, 0x2e, 0xa6, 0x34, 0x14, 0x16, 0x55, 0x69, 0x31, 0x53, 0xad, 0x00, 0xcb,
-	0x6b, 0x88, 0xaf, 0x35, 0xa4, 0xdf, 0x02, 0x20, 0xa4, 0xbb, 0x38, 0x19, 0x72, 0x12, 0x8c, 0x8d,
-	0x5a, 0x57, 0xeb, 0x55, 0xbd, 0xa6, 0xdc, 0xd9, 0x20, 0xc1, 0x58, 0xc0, 0x69, 0x1c, 0xe7, 0x70,
-	0x3d, 0x83, 0xe5, 0x8e, 0x84, 0xdf, 0x80, 0xe6, 0x47, 0x4a, 0x26, 0x43, 0x71, 0xcf, 0x46, 0xa3,
-	0xab, 0xf5, 0x5a, 0xab, 0x6d, 0x3b, 0xbb, 0x63, 0x3b, 0xbf, 0x63, 0x7b, 0x23, 0x0f, 0xc1, 0xbd,
-	0x79, 0x30, 0x35, 0x2b, 0xa7, 0x53, 0xf3, 0x5a, 0x76, 0x98, 0x82, 0x6a, 0xed, 0x1f, 0x99, 0x9a,
-	0x37, 0x2f, 0xd6, 0xa2, 0x58, 0xff, 0x00, 0x9a, 0x45, 0xee, 0xc6, 0x9c, 0xec, 0xd8, 0x15, 0xd4,
-	0x9f, 0x53, 0xf3, 0xee, 0x88, 0xf0, 0xad, 0xd4, 0xb7, 0x03, 0x1a, 0xa9, 0xec, 0xd5, 0x4f, 0x9f,
-	0xa1, 0xb1, 0xc3, 0xf7, 0x62, 0xcc, 0xec, 0xe7, 0x38, 0x28, 0x4d, 0x0a, 0x21, 0xcb, 0x2b, 0x45,
-	0xad, 0xaf, 0x75, 0x70, 0xfd, 0x45, 0x1a, 0x86, 0x79, 0x36, 0x6e, 0x82, 0xe1, 0x18, 0xd1, 0xdd,
-	0x89, 0xfe, 0x0a, 0xcc, 0xe7, 0x37, 0x2f, 0x13, 0x6a, 0xad, 0x3a, 0xf6, 0x85, 0x06, 0xd3, 0x2e,
-	0xb4, 0x6a, 0xe2, 0xac, 0x5e, 0x21, 0xa3, 0xfb, 0xa0, 0x01, 0x19, 0xc3, 0xfc, 0x81, 0x4c, 0xaf,
-	0xb5, 0xba, 0x6c, 0xab, 0xa9, 0x15, 0x03, 0x55, 0xd0, 0x9f, 0x51, 0x32, 0x71, 0x1d, 0x41, 0xfd,
-	0x7e, 0x64, 0xae, 0x5c, 0xa0, 0x4d, 0x41, 0xf0, 0x94, 0x72, 0xe1, 0x31, 0x90, 0x99, 0x5f, 0x86,
-	0xc7, 0x40, 0xff, 0x0c, 0x8c, 0x20, 0x84, 0x24, 0x82, 0x7e, 0x88, 0x87, 0x2c, 0x4e, 0x30, 0x44,
-	0xc3, 0x04, 0xef, 0xc2, 0x04, 0x31, 0xa3, 0xd6, 0xad, 0xfe, 0xdd, 0x75, 0x45, 0x65, 0x6f, 0x66,
-	0xb1, 0x9c, 0x27, 0x64, 0x79, 0x4b, 0x05, 0xf4, 0x5a, 0x22, 0x5e, 0x06, 0xe8, 0xdb, 0x60, 0xb1,
-	0x24, 0x11, 0x19, 0x04, 0xd9, 0xc1, 0xcc, 0xa8, 0xff, 0xcb, 0xf9, 0xb6, 0x72, 0xbe, 0x71, 0xd6,
-	0xb9, 0x14, 0xb1, 0xbc, 0x85, 0x62, 0x7b, 0xad, 0xd8, 0x15, 0x96, 0x9b, 0x34, 0xd9, 0xc4, 0x84,
-	0x63, 0x34, 0x6b, 0xd9, 0xf8, 0x4f, 0xcb, 0x3f, 0x89, 0x58, 0xde, 0x42, 0xb1, 0x5d, 0x5a, 0x5a,
-	0xdf, 0x34, 0xb0, 0x94, 0x0f, 0xd2, 0x5b, 0xc2, 0xb7, 0xd6, 0x71, 0x42, 0x28, 0x7a, 0x49, 0x83,
-	0xf1, 0x65, 0x4c, 0xe6, 0x23, 0x50, 0x17, 0x8f, 0x15, 0x53, 0x83, 0xd9, 0x2e, 0xf4, 0xb2, 0x97,
-	0xcc, 0x2e, 0xdd, 0x15, 0x35, 0x2b, 0x77, 0xdf, 0x1f, 0x1c, 0x77, 0xb4, 0xc3, 0xe3, 0x8e, 0xf6,
-	0xeb, 0xb8, 0xa3, 0xed, 0x9f, 0x74, 0x2a, 0x87, 0x27, 0x9d, 0xca, 0x8f, 0x93, 0x4e, 0xe5, 0x9d,
-	0x3b, 0x33, 0x54, 0x4a, 0xac, 0x1f, 0x42, 0x9f, 0xe5, 0x0b, 0x67, 0x67, 0xf0, 0xc4, 0xf9, 0x74,
-	0xde, 0x3f, 0x42, 0x44, 0x11, 0x0e, 0xfd, 0x86, 0x7c, 0x3a, 0x1e, 0xfe, 0x0e, 0x00, 0x00, 0xff,
-	0xff, 0x6c, 0x6a, 0x9a, 0xed, 0x40, 0x06, 0x00, 0x00,
+	// 709 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x55, 0xcb, 0x6e, 0xd3, 0x40,
+	0x14, 0x8d, 0xc9, 0xa3, 0xed, 0x44, 0x42, 0xc8, 0x2d, 0x95, 0x9b, 0x42, 0x1c, 0x19, 0xa1, 0x46,
+	0x82, 0xd8, 0xa4, 0x48, 0x54, 0xb0, 0x0c, 0x08, 0xa9, 0x52, 0x17, 0xc5, 0x14, 0x21, 0x21, 0xa4,
+	0x68, 0xec, 0x99, 0xa6, 0x43, 0xec, 0x8c, 0xeb, 0x99, 0xb4, 0x44, 0xe2, 0x0b, 0x58, 0x75, 0xc5,
+	0x0f, 0xb0, 0xe3, 0x4b, 0xba, 0xec, 0x12, 0xb1, 0x48, 0x51, 0xfb, 0x07, 0xfd, 0x02, 0x34, 0x0f,
+	0xdb, 0x51, 0x45, 0x79, 0x2c, 0xba, 0x8a, 0xe7, 0x9e, 0x7b, 0xce, 0x99, 0x99, 0x73, 0x35, 0x01,
+	0x1d, 0xca, 0x62, 0xca, 0x08, 0xf3, 0x42, 0x3a, 0x0a, 0xf1, 0x88, 0xa7, 0x90, 0x63, 0xd4, 0x89,
+	0xc8, 0xfe, 0x98, 0x20, 0xc2, 0x27, 0x5e, 0x42, 0x19, 0xe1, 0x84, 0x8e, 0xdc, 0x24, 0xa5, 0x9c,
+	0x9a, 0xf7, 0x75, 0xbb, 0x3b, 0xdb, 0x9e, 0x77, 0xbb, 0x07, 0xdd, 0x00, 0x73, 0xd8, 0x6d, 0xac,
+	0x84, 0xb2, 0xaf, 0x2f, 0x49, 0x9e, 0x5a, 0x28, 0x85, 0x86, 0x3d, 0xa0, 0x74, 0x10, 0x61, 0x4f,
+	0xae, 0x82, 0xf1, 0xae, 0xc7, 0x49, 0x8c, 0x19, 0x87, 0x71, 0xa2, 0x1b, 0x9a, 0x97, 0x1b, 0xd0,
+	0x38, 0x85, 0xc5, 0x16, 0x1a, 0x4b, 0x03, 0x3a, 0xa0, 0x4a, 0x58, 0x7c, 0x65, 0x2c, 0x65, 0xe2,
+	0x05, 0x90, 0x61, 0x4f, 0x6f, 0xc3, 0x0b, 0x29, 0xc9, 0x58, 0x2b, 0xd9, 0x39, 0x23, 0x1a, 0x0e,
+	0xc7, 0x89, 0xfc, 0x51, 0x90, 0xf3, 0xb9, 0x0c, 0xe6, 0xb7, 0xf5, 0x31, 0xcd, 0x0d, 0x50, 0xcf,
+	0x8e, 0xdc, 0x27, 0xc8, 0x32, 0x5a, 0x46, 0xbb, 0xd2, 0x5b, 0xbe, 0x98, 0xda, 0xe6, 0x04, 0xc6,
+	0xd1, 0x33, 0x67, 0x06, 0x74, 0x7c, 0x90, 0xad, 0x36, 0x91, 0xf9, 0x10, 0xcc, 0x41, 0x84, 0x52,
+	0xcc, 0x98, 0x75, 0xa3, 0x65, 0xb4, 0x17, 0x7a, 0xe6, 0xc5, 0xd4, 0xbe, 0xa9, 0x48, 0x1a, 0x70,
+	0xfc, 0xac, 0xc5, 0x7c, 0x00, 0xe6, 0x12, 0x4a, 0x23, 0x61, 0x51, 0x96, 0x16, 0x33, 0xdd, 0x1a,
+	0x70, 0xfc, 0x9a, 0xf8, 0xda, 0x44, 0xe6, 0x5d, 0x00, 0x22, 0x7a, 0x88, 0xd3, 0x3e, 0x27, 0xe1,
+	0xd0, 0xaa, 0xb4, 0x8c, 0x76, 0xd9, 0x5f, 0x90, 0x95, 0x1d, 0x12, 0x0e, 0x05, 0x3c, 0x4e, 0x92,
+	0x0c, 0xae, 0x2a, 0x58, 0x56, 0x24, 0xfc, 0x06, 0x2c, 0x7c, 0xa0, 0x64, 0xd4, 0x17, 0xf7, 0x6c,
+	0xd5, 0x5a, 0x46, 0xbb, 0xbe, 0xde, 0x70, 0xd5, 0x1d, 0xbb, 0xd9, 0x1d, 0xbb, 0x3b, 0x59, 0x08,
+	0xbd, 0x3b, 0xc7, 0x53, 0xbb, 0x74, 0x31, 0xb5, 0x6f, 0xa9, 0xcd, 0xe4, 0x54, 0xe7, 0xe8, 0xd4,
+	0x36, 0xfc, 0x79, 0xb1, 0x16, 0xcd, 0x42, 0x36, 0xcf, 0xdd, 0x9a, 0x93, 0x27, 0xde, 0x10, 0xd4,
+	0x1f, 0x53, 0x7b, 0x55, 0x65, 0xc1, 0xd0, 0xd0, 0x25, 0xd4, 0x8b, 0x21, 0xdf, 0x73, 0xb7, 0xf0,
+	0x00, 0x86, 0x93, 0x17, 0x38, 0x2c, 0x94, 0x73, 0xb6, 0xe3, 0x17, 0x4a, 0xce, 0x97, 0x2a, 0xb8,
+	0xfd, 0x72, 0x1c, 0x45, 0x59, 0x20, 0xbd, 0x14, 0xc3, 0x21, 0xa2, 0x87, 0x23, 0xf3, 0x15, 0x98,
+	0xcf, 0xae, 0x5b, 0xc6, 0x52, 0x5f, 0xf7, 0xdc, 0x7f, 0x9a, 0x46, 0x37, 0xd7, 0xaa, 0x88, 0x0d,
+	0xfa, 0xb9, 0x8c, 0x19, 0x80, 0x1a, 0x64, 0x0c, 0xf3, 0x47, 0x32, 0xb2, 0xfa, 0xfa, 0x8a, 0xab,
+	0x47, 0x55, 0x4c, 0x51, 0x4e, 0x7f, 0x4e, 0xc9, 0xa8, 0xe7, 0x09, 0xea, 0xb7, 0x53, 0x7b, 0x6d,
+	0x40, 0xf8, 0xde, 0x38, 0x70, 0x43, 0x1a, 0xeb, 0xb9, 0xd6, 0x3f, 0x1d, 0x86, 0x86, 0x1e, 0x9f,
+	0x24, 0x98, 0x49, 0x82, 0xaf, 0x95, 0x73, 0x8f, 0xae, 0x0c, 0xfa, 0x3a, 0x3c, 0xba, 0xe6, 0x27,
+	0x60, 0x85, 0x11, 0x24, 0x31, 0x0c, 0x22, 0xdc, 0x67, 0x49, 0x8a, 0x21, 0xea, 0xa7, 0xf8, 0x10,
+	0xa6, 0x88, 0x59, 0x95, 0x56, 0xf9, 0xcf, 0xae, 0x6b, 0x3a, 0x70, 0x5b, 0xc5, 0x72, 0x95, 0x90,
+	0xe3, 0x2f, 0xe7, 0xd0, 0x6b, 0x89, 0xf8, 0x0a, 0x30, 0xf7, 0xc1, 0x52, 0x41, 0x22, 0x32, 0x08,
+	0x72, 0x80, 0x99, 0x55, 0xfd, 0x9b, 0xf3, 0x3d, 0xed, 0xbc, 0x7a, 0xd9, 0xb9, 0x10, 0x71, 0xfc,
+	0xc5, 0xbc, 0xbc, 0x99, 0x57, 0x85, 0xe5, 0x2e, 0x4d, 0x77, 0x31, 0xe1, 0x18, 0xcd, 0x5a, 0xd6,
+	0xfe, 0xd3, 0xf2, 0x77, 0x22, 0x8e, 0xbf, 0x98, 0x97, 0x0b, 0x4b, 0xe7, 0xab, 0x01, 0x96, 0xb3,
+	0x41, 0x7a, 0x4b, 0xf8, 0xde, 0x36, 0x4e, 0x09, 0x45, 0x5b, 0x34, 0x1c, 0x5e, 0xc7, 0x64, 0x3e,
+	0x01, 0x55, 0xf1, 0x42, 0x31, 0x3d, 0x98, 0x8d, 0x5c, 0x4f, 0x3d, 0x5f, 0x6e, 0xe1, 0xae, 0xa9,
+	0xaa, 0xbd, 0xf7, 0xfe, 0xf8, 0xac, 0x69, 0x9c, 0x9c, 0x35, 0x8d, 0x9f, 0x67, 0x4d, 0xe3, 0xe8,
+	0xbc, 0x59, 0x3a, 0x39, 0x6f, 0x96, 0xbe, 0x9f, 0x37, 0x4b, 0xef, 0x7a, 0x33, 0x43, 0xa5, 0xc5,
+	0x3a, 0x11, 0x0c, 0x58, 0xb6, 0xf0, 0x0e, 0xba, 0x4f, 0xbd, 0x8f, 0x57, 0xfd, 0x0d, 0xc4, 0x14,
+	0xe1, 0x28, 0xa8, 0xc9, 0xf7, 0xe2, 0xf1, 0xaf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x87, 0x6c, 0xc9,
+	0x46, 0x35, 0x06, 0x00, 0x00,
 }
 
 func (m *Position) Marshal() (dAtA []byte, err error) {
diff --git a/x/concentrated-liquidity/model/tickInfo.pb.go b/x/concentrated-liquidity/model/tickInfo.pb.go
index f70a90cd93e..f4f8ee2d73a 100644
--- a/x/concentrated-liquidity/model/tickInfo.pb.go
+++ b/x/concentrated-liquidity/model/tickInfo.pb.go
@@ -9,6 +9,7 @@
 package model
 
 import (
+	cosmossdk_io_math "cosmossdk.io/math"
 	fmt "fmt"
 	_ "github.com/cosmos/cosmos-proto"
 	github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types"
@@ -32,8 +33,8 @@ var _ = math.Inf
 const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
 
 type TickInfo struct {
-	LiquidityGross github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,1,opt,name=liquidity_gross,json=liquidityGross,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"liquidity_gross" yaml:"liquidity_gross"`
-	LiquidityNet   github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,2,opt,name=liquidity_net,json=liquidityNet,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"liquidity_net" yaml:"liquidity_net"`
+	LiquidityGross cosmossdk_io_math.LegacyDec `protobuf:"bytes,1,opt,name=liquidity_gross,json=liquidityGross,proto3,customtype=cosmossdk.io/math.LegacyDec" json:"liquidity_gross" yaml:"liquidity_gross"`
+	LiquidityNet   cosmossdk_io_math.LegacyDec `protobuf:"bytes,2,opt,name=liquidity_net,json=liquidityNet,proto3,customtype=cosmossdk.io/math.LegacyDec" json:"liquidity_net" yaml:"liquidity_net"`
 	// Total spread rewards accumulated in the opposite direction that the tick
 	// was last crossed. i.e. if the current tick is to the right of this tick
 	// (meaning its currently a greater price), then this is the total spread
@@ -203,41 +204,41 @@ func init() {
 }
 
 var fileDescriptor_1ccb7e45032b943a = []byte{
-	// 530 bytes of a gzipped FileDescriptorProto
+	// 543 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x94, 0x41, 0x8b, 0xd3, 0x40,
-	0x14, 0xc7, 0x3b, 0xee, 0x22, 0x3a, 0x75, 0xbb, 0x90, 0x5d, 0x25, 0x2e, 0x92, 0x96, 0x80, 0x52,
-	0x90, 0x26, 0xb4, 0xab, 0x87, 0xf5, 0x18, 0x17, 0x57, 0x41, 0x5c, 0x08, 0xf5, 0x22, 0x4a, 0x98,
-	0x24, 0xd3, 0xee, 0xd0, 0x24, 0x93, 0x9d, 0x79, 0xe9, 0xda, 0x8b, 0x37, 0xef, 0xde, 0xfc, 0x0e,
-	0xde, 0xfd, 0x0e, 0x3d, 0xee, 0x51, 0x3c, 0x54, 0x69, 0xbf, 0x81, 0x9f, 0x40, 0x92, 0x4c, 0xba,
-	0xdb, 0x82, 0xb0, 0x0a, 0x9e, 0x92, 0x79, 0xf9, 0xbf, 0xff, 0xff, 0xc7, 0x7b, 0x49, 0x70, 0x87,
-	0xcb, 0x98, 0x4b, 0x26, 0xed, 0x80, 0x27, 0x01, 0x4d, 0x40, 0x10, 0xa0, 0x61, 0x27, 0x62, 0xa7,
-	0x19, 0x0b, 0x19, 0x4c, 0x6c, 0x60, 0xc1, 0xe8, 0x45, 0x32, 0xe0, 0x56, 0x2a, 0x38, 0x70, 0xed,
-	0xbe, 0x92, 0x5b, 0x97, 0xe5, 0x4b, 0xb5, 0x35, 0xee, 0xfa, 0x14, 0x48, 0x77, 0xef, 0x6e, 0x50,
-	0xe8, 0xbc, 0xa2, 0xc9, 0x2e, 0x0f, 0xa5, 0xc3, 0xde, 0xee, 0x90, 0x0f, 0x79, 0x59, 0xcf, 0xef,
-	0x54, 0xd5, 0x28, 0x35, 0xb6, 0x4f, 0x24, 0xb5, 0x95, 0x8b, 0x1d, 0x70, 0x96, 0x94, 0xcf, 0xcd,
-	0xaf, 0x9b, 0xf8, 0x46, 0x5f, 0xa1, 0x68, 0xa7, 0x78, 0x7b, 0x19, 0xe9, 0x0d, 0x05, 0x97, 0x52,
-	0x47, 0x2d, 0xd4, 0xbe, 0xe9, 0x3c, 0x9f, 0xce, 0x9a, 0xb5, 0xef, 0xb3, 0xe6, 0x83, 0x21, 0x83,
-	0x93, 0xcc, 0xb7, 0x02, 0x1e, 0xab, 0x70, 0x75, 0xe9, 0xc8, 0x70, 0x64, 0xc3, 0x24, 0xa5, 0xd2,
-	0x3a, 0xa4, 0xc1, 0xaf, 0x59, 0xf3, 0xce, 0x84, 0xc4, 0xd1, 0x13, 0x73, 0xcd, 0xce, 0x74, 0x1b,
-	0xcb, 0xca, 0x51, 0x5e, 0xd0, 0x46, 0x78, 0xeb, 0x42, 0x93, 0x50, 0xd0, 0xaf, 0x15, 0x81, 0xcf,
-	0xfe, 0x3a, 0x70, 0x77, 0x3d, 0x30, 0xa1, 0x60, 0xba, 0xb7, 0x96, 0xe7, 0x57, 0x14, 0xb4, 0x29,
-	0xc2, 0x07, 0x32, 0x15, 0x94, 0x84, 0x9e, 0xa0, 0x67, 0x44, 0x84, 0x39, 0xd5, 0x19, 0x9c, 0x78,
-	0x3c, 0x4d, 0xb9, 0x64, 0x40, 0xbd, 0x90, 0x09, 0x1a, 0x00, 0xe3, 0x89, 0xc7, 0x07, 0x5e, 0x44,
-	0x24, 0x78, 0x20, 0xc8, 0x98, 0x0a, 0x49, 0x22, 0x7d, 0xa3, 0xb5, 0xd1, 0xae, 0xf7, 0xee, 0x59,
-	0x6a, 0xea, 0xf9, 0x44, 0xab, 0xbd, 0xe4, 0x0c, 0x4f, 0x39, 0x4b, 0x9c, 0xfd, 0x9c, 0xfb, 0xcb,
-	0x8f, 0xe6, 0xc3, 0xab, 0x71, 0xe7, 0x3d, 0xd2, 0xed, 0x95, 0x4c, 0x6e, 0x81, 0x74, 0x54, 0x10,
-	0x1d, 0x2b, 0xa0, 0xc3, 0x8a, 0xe7, 0x78, 0xf0, 0x92, 0x48, 0xe8, 0x57, 0x30, 0xda, 0x07, 0xbc,
-	0x9d, 0xa5, 0xc0, 0x62, 0x9a, 0x03, 0x06, 0x23, 0x2a, 0xa4, 0xbe, 0xd9, 0x42, 0xed, 0x7a, 0xef,
-	0xb1, 0x75, 0xa5, 0x37, 0xc9, 0x7a, 0x5d, 0x74, 0xf7, 0x55, 0xb3, 0x63, 0xe4, 0xe0, 0x17, 0x7b,
-	0x5b, 0xf3, 0x36, 0xdd, 0x46, 0xb6, 0xa2, 0x37, 0x39, 0x6e, 0xac, 0x3a, 0x68, 0xef, 0xf0, 0x66,
-	0xc4, 0x24, 0xe8, 0xa8, 0x18, 0xd3, 0xa3, 0x7f, 0xc1, 0x70, 0x76, 0x14, 0x45, 0xbd, 0x5a, 0xa6,
-	0x04, 0xd3, 0x2d, 0x6c, 0xcd, 0xcf, 0x08, 0x6f, 0xad, 0x88, 0xb5, 0x8f, 0x08, 0xdf, 0x56, 0x9c,
-	0xd5, 0x1a, 0x33, 0x90, 0x2c, 0xa4, 0x0a, 0xe1, 0x3f, 0x6c, 0x6a, 0xa7, 0xcc, 0x53, 0x3b, 0x2a,
-	0xd3, 0x9c, 0xb7, 0xd3, 0xb9, 0x81, 0xce, 0xe7, 0x06, 0xfa, 0x39, 0x37, 0xd0, 0xa7, 0x85, 0x51,
-	0x3b, 0x5f, 0x18, 0xb5, 0x6f, 0x0b, 0xa3, 0xf6, 0xc6, 0xb9, 0xe4, 0xad, 0xc6, 0xd1, 0x89, 0x88,
-	0x2f, 0xab, 0x83, 0x3d, 0xee, 0x1e, 0xd8, 0xef, 0xff, 0xf4, 0x87, 0x88, 0x79, 0x48, 0x23, 0xff,
-	0x7a, 0xf1, 0x9d, 0xee, 0xff, 0x0e, 0x00, 0x00, 0xff, 0xff, 0x13, 0xc7, 0xc2, 0x67, 0x50, 0x04,
-	0x00, 0x00,
+	0x14, 0xc7, 0x1b, 0x77, 0x11, 0x4d, 0xdd, 0x2e, 0x64, 0x57, 0xa9, 0xab, 0xa4, 0x25, 0x20, 0x14,
+	0xa4, 0x09, 0xed, 0xea, 0x61, 0x15, 0x2f, 0xb1, 0xb0, 0x08, 0x8b, 0x0b, 0xa1, 0x5e, 0x44, 0x89,
+	0xd3, 0xc9, 0xb4, 0x1d, 0x9a, 0x64, 0xe2, 0xbc, 0xd7, 0xae, 0xbd, 0x78, 0xf3, 0xee, 0xcd, 0xa3,
+	0x77, 0x3f, 0x49, 0x8f, 0x7b, 0x14, 0x0f, 0x55, 0xda, 0x6f, 0xe0, 0x27, 0x90, 0x24, 0x93, 0xee,
+	0xb6, 0x20, 0x2c, 0x82, 0xa7, 0x64, 0x5e, 0xfe, 0xef, 0xff, 0x7e, 0xbc, 0x7f, 0x12, 0xbd, 0x29,
+	0x20, 0x12, 0xc0, 0xc1, 0xa1, 0x22, 0xa6, 0x2c, 0x46, 0x49, 0x90, 0x05, 0xcd, 0x90, 0xbf, 0x1f,
+	0xf3, 0x80, 0xe3, 0xd4, 0x41, 0x4e, 0x47, 0x2f, 0xe2, 0xbe, 0xb0, 0x13, 0x29, 0x50, 0x18, 0x0f,
+	0x94, 0xdc, 0xbe, 0x2c, 0x5f, 0xa9, 0xed, 0x49, 0xab, 0xc7, 0x90, 0xb4, 0x0e, 0xee, 0xd2, 0x4c,
+	0xe7, 0x67, 0x4d, 0x4e, 0x7e, 0xc8, 0x1d, 0x0e, 0xf6, 0x07, 0x62, 0x20, 0xf2, 0x7a, 0x7a, 0xa7,
+	0xaa, 0x66, 0xae, 0x71, 0x7a, 0x04, 0x98, 0xa3, 0x5c, 0x1c, 0x2a, 0x78, 0x9c, 0x3f, 0xb7, 0xbe,
+	0x6e, 0xeb, 0x37, 0xba, 0x0a, 0xc5, 0xe8, 0xeb, 0xbb, 0xab, 0x91, 0xfe, 0x40, 0x0a, 0x80, 0xaa,
+	0x56, 0xd7, 0x1a, 0x37, 0xdd, 0x67, 0xb3, 0x79, 0xad, 0xf4, 0x63, 0x5e, 0xbb, 0x97, 0xbb, 0x41,
+	0x30, 0xb2, 0xb9, 0x70, 0x22, 0x82, 0x43, 0xfb, 0x84, 0x0d, 0x08, 0x9d, 0x76, 0x18, 0xfd, 0x3d,
+	0xaf, 0xdd, 0x99, 0x92, 0x28, 0x7c, 0x62, 0x6d, 0x78, 0x58, 0x5e, 0x65, 0x55, 0x39, 0x4e, 0x0b,
+	0xc6, 0x3b, 0x7d, 0xe7, 0x42, 0x13, 0x33, 0xac, 0x5e, 0xcb, 0xa6, 0x3c, 0xbd, 0xda, 0x94, 0xfd,
+	0xcd, 0x29, 0x31, 0x43, 0xcb, 0xbb, 0xb5, 0x3a, 0xbf, 0x64, 0x68, 0xcc, 0x34, 0xfd, 0x08, 0x12,
+	0xc9, 0x48, 0xe0, 0x4b, 0x76, 0x46, 0x64, 0x90, 0xa2, 0x9c, 0xe1, 0xd0, 0x17, 0x49, 0x22, 0x80,
+	0x23, 0xf3, 0x03, 0x2e, 0x19, 0x45, 0x2e, 0x62, 0x5f, 0xf4, 0xfd, 0x90, 0x00, 0xfa, 0x28, 0xc9,
+	0x84, 0x49, 0x20, 0x61, 0x75, 0xab, 0xbe, 0xd5, 0x28, 0xb7, 0xef, 0xdb, 0x6a, 0xbf, 0xe9, 0xee,
+	0x8a, 0x04, 0xec, 0x0e, 0xa3, 0xcf, 0x05, 0x8f, 0xdd, 0xc3, 0x14, 0xf6, 0xdb, 0xcf, 0xda, 0xc3,
+	0x01, 0xc7, 0xe1, 0xb8, 0x67, 0x53, 0x11, 0xa9, 0x3c, 0xd4, 0xa5, 0x09, 0xc1, 0xc8, 0xc1, 0x69,
+	0xc2, 0xa0, 0xe8, 0x01, 0xaf, 0x9d, 0x33, 0x79, 0x19, 0xd2, 0x71, 0x46, 0x74, 0xaa, 0x80, 0x3a,
+	0x05, 0xcf, 0x69, 0xff, 0x84, 0x00, 0x76, 0x0b, 0x18, 0xe3, 0xa3, 0xbe, 0x3b, 0x4e, 0x90, 0x47,
+	0x2c, 0x05, 0xa4, 0x23, 0x26, 0xa1, 0xba, 0x5d, 0xd7, 0x1a, 0xe5, 0xf6, 0x63, 0xfb, 0x4a, 0xef,
+	0x8c, 0xfd, 0x2a, 0xeb, 0xee, 0xaa, 0x66, 0xd7, 0x4c, 0xc1, 0x2f, 0xc2, 0xda, 0xf0, 0xb6, 0xbc,
+	0xca, 0x78, 0x4d, 0x6f, 0x09, 0xbd, 0xb2, 0xee, 0x60, 0xbc, 0xd5, 0xb7, 0x43, 0x0e, 0x58, 0xd5,
+	0xb2, 0x35, 0x3d, 0xfa, 0x17, 0x0c, 0x77, 0x4f, 0x51, 0x94, 0x8b, 0x30, 0x01, 0x2d, 0x2f, 0xb3,
+	0xb5, 0xbe, 0x68, 0xfa, 0xce, 0x9a, 0xd8, 0xf8, 0xa4, 0xe9, 0xb7, 0x15, 0x67, 0x11, 0xe3, 0x18,
+	0x81, 0x07, 0x4c, 0x21, 0xfc, 0x87, 0xa4, 0xf6, 0xf2, 0x79, 0x2a, 0xa3, 0x7c, 0x9a, 0xfb, 0x66,
+	0xb6, 0x30, 0xb5, 0xf3, 0x85, 0xa9, 0xfd, 0x5a, 0x98, 0xda, 0xe7, 0xa5, 0x59, 0x3a, 0x5f, 0x9a,
+	0xa5, 0xef, 0x4b, 0xb3, 0xf4, 0xda, 0xbd, 0xe4, 0xad, 0xd6, 0xd1, 0x0c, 0x49, 0x0f, 0x8a, 0x83,
+	0x33, 0x69, 0x1d, 0x39, 0x1f, 0xfe, 0xf6, 0x2f, 0x88, 0x44, 0xc0, 0xc2, 0xde, 0xf5, 0xec, 0x8b,
+	0x3c, 0xfc, 0x13, 0x00, 0x00, 0xff, 0xff, 0xb7, 0xc6, 0x5a, 0x9b, 0x3a, 0x04, 0x00, 0x00,
 }
 
 func (m *TickInfo) Marshal() (dAtA []byte, err error) {
diff --git a/x/concentrated-liquidity/model/tx.pb.go b/x/concentrated-liquidity/model/tx.pb.go
index 0f457c6942d..7ff9e85731c 100644
--- a/x/concentrated-liquidity/model/tx.pb.go
+++ b/x/concentrated-liquidity/model/tx.pb.go
@@ -5,9 +5,9 @@ package model
 
 import (
 	context "context"
+	cosmossdk_io_math "cosmossdk.io/math"
 	fmt "fmt"
 	_ "github.com/cosmos/cosmos-sdk/types"
-	github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types"
 	_ "github.com/gogo/protobuf/gogoproto"
 	grpc1 "github.com/gogo/protobuf/grpc"
 	proto "github.com/gogo/protobuf/proto"
@@ -32,11 +32,11 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
 
 // ===================== MsgCreateConcentratedPool
 type MsgCreateConcentratedPool struct {
-	Sender       string                                 `protobuf:"bytes,1,opt,name=sender,proto3" json:"sender,omitempty" yaml:"sender"`
-	Denom0       string                                 `protobuf:"bytes,2,opt,name=denom0,proto3" json:"denom0,omitempty" yaml:"denom0"`
-	Denom1       string                                 `protobuf:"bytes,3,opt,name=denom1,proto3" json:"denom1,omitempty" yaml:"denom1"`
-	TickSpacing  uint64                                 `protobuf:"varint,4,opt,name=tick_spacing,json=tickSpacing,proto3" json:"tick_spacing,omitempty" yaml:"tick_spacing"`
-	SpreadFactor github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,5,opt,name=spread_factor,json=spreadFactor,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"spread_factor" yaml:"spread_factor"`
+	Sender       string                      `protobuf:"bytes,1,opt,name=sender,proto3" json:"sender,omitempty" yaml:"sender"`
+	Denom0       string                      `protobuf:"bytes,2,opt,name=denom0,proto3" json:"denom0,omitempty" yaml:"denom0"`
+	Denom1       string                      `protobuf:"bytes,3,opt,name=denom1,proto3" json:"denom1,omitempty" yaml:"denom1"`
+	TickSpacing  uint64                      `protobuf:"varint,4,opt,name=tick_spacing,json=tickSpacing,proto3" json:"tick_spacing,omitempty" yaml:"tick_spacing"`
+	SpreadFactor cosmossdk_io_math.LegacyDec `protobuf:"bytes,5,opt,name=spread_factor,json=spreadFactor,proto3,customtype=cosmossdk.io/math.LegacyDec" json:"spread_factor" yaml:"spread_factor"`
 }
 
 func (m *MsgCreateConcentratedPool) Reset()         { *m = MsgCreateConcentratedPool{} }
@@ -155,36 +155,36 @@ func init() {
 }
 
 var fileDescriptor_dde1ce763867060f = []byte{
-	// 455 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x93, 0x41, 0x6b, 0xd4, 0x40,
-	0x14, 0xc7, 0x37, 0xed, 0xba, 0xe2, 0xd8, 0x1e, 0x8c, 0x45, 0xe3, 0x1e, 0x92, 0x1a, 0x41, 0xea,
-	0x61, 0x67, 0x8c, 0x9e, 0x2c, 0x82, 0x90, 0x96, 0x62, 0x0f, 0x05, 0x89, 0x07, 0x41, 0x84, 0x65,
-	0x32, 0x33, 0xc6, 0x61, 0x93, 0xbc, 0x98, 0x99, 0x96, 0xee, 0xb7, 0xf0, 0x4b, 0x09, 0x3d, 0x16,
-	0x4f, 0xd2, 0x43, 0x90, 0xdd, 0x6f, 0xb0, 0x9f, 0x40, 0x92, 0xc9, 0x96, 0x54, 0xcc, 0x49, 0x3c,
-	0xed, 0xfe, 0xe7, 0xff, 0x7b, 0xff, 0xbc, 0xbc, 0x37, 0x41, 0x6f, 0x40, 0x65, 0xa0, 0xa4, 0x22,
-	0x0c, 0x72, 0x26, 0x72, 0x5d, 0x52, 0x2d, 0xf8, 0x24, 0x95, 0x5f, 0x4f, 0x25, 0x97, 0x7a, 0x4e,
-	0x0a, 0x80, 0x74, 0x92, 0x01, 0x17, 0xe9, 0x0d, 0x82, 0xe8, 0x73, 0x5c, 0x94, 0xa0, 0xc1, 0x7e,
-	0xdd, 0x06, 0xe0, 0xae, 0x7d, 0x5d, 0x8f, 0xeb, 0xfa, 0xa6, 0xfc, 0x86, 0x8f, 0xcf, 0x82, 0x58,
-	0x68, 0x1a, 0x8c, 0x77, 0x12, 0x48, 0xa0, 0x09, 0x22, 0xf5, 0x3f, 0x93, 0x39, 0x76, 0x59, 0x13,
-	0x4a, 0x62, 0xaa, 0x04, 0x69, 0x51, 0xc2, 0x40, 0xe6, 0xc6, 0xf7, 0xbf, 0x6f, 0xa0, 0x47, 0x27,
-	0x2a, 0x39, 0x28, 0x05, 0xd5, 0xe2, 0xa0, 0x93, 0xfb, 0x0e, 0x20, 0xb5, 0x9f, 0xa1, 0x91, 0x12,
-	0x39, 0x17, 0xa5, 0x63, 0xed, 0x5a, 0x7b, 0x77, 0xc2, 0x7b, 0xab, 0xca, 0xdb, 0x9e, 0xd3, 0x2c,
-	0xdd, 0xf7, 0xcd, 0xb9, 0x1f, 0xb5, 0x40, 0x8d, 0x72, 0x91, 0x43, 0xf6, 0xdc, 0xd9, 0xf8, 0x13,
-	0x35, 0xe7, 0x7e, 0xd4, 0x02, 0xd7, 0x68, 0xe0, 0x6c, 0xfe, 0x15, 0x0d, 0xd6, 0x68, 0x60, 0xef,
-	0xa3, 0x2d, 0x2d, 0xd9, 0x6c, 0xaa, 0x0a, 0xca, 0x64, 0x9e, 0x38, 0xc3, 0x5d, 0x6b, 0x6f, 0x18,
-	0x3e, 0x5c, 0x55, 0xde, 0x7d, 0x53, 0xd0, 0x75, 0xfd, 0xe8, 0x6e, 0x2d, 0xdf, 0x1b, 0x65, 0xcf,
-	0xd0, 0xb6, 0x2a, 0x4a, 0x41, 0xf9, 0xf4, 0x33, 0x65, 0x1a, 0x4a, 0xe7, 0x56, 0xf3, 0xb4, 0xa3,
-	0x8b, 0xca, 0x1b, 0x5c, 0x55, 0xde, 0xd3, 0x44, 0xea, 0x2f, 0xa7, 0x31, 0x66, 0x90, 0x91, 0x76,
-	0x48, 0xe6, 0x67, 0xa2, 0xf8, 0x8c, 0xe8, 0x79, 0x21, 0x14, 0x3e, 0x14, 0x6c, 0x55, 0x79, 0x3b,
-	0xed, 0x1b, 0x77, 0xc3, 0xfc, 0x68, 0xcb, 0xe8, 0x23, 0x23, 0xdf, 0xa2, 0xc7, 0xbd, 0x63, 0x8c,
-	0x84, 0x2a, 0x20, 0x57, 0xc2, 0x7e, 0x82, 0x6e, 0xd7, 0x4b, 0x9c, 0x4a, 0xde, 0xcc, 0x73, 0x18,
-	0xa2, 0x45, 0xe5, 0x8d, 0x6a, 0xe4, 0xf8, 0x30, 0x1a, 0xd5, 0xd6, 0x31, 0x7f, 0x71, 0x65, 0xa1,
-	0xcd, 0x13, 0x95, 0xd8, 0x3f, 0x2c, 0xf4, 0xa0, 0x67, 0x2d, 0x1f, 0xf0, 0xbf, 0xdc, 0x14, 0xdc,
-	0xdb, 0xe8, 0x78, 0xfa, 0x9f, 0x82, 0xd7, 0x13, 0x08, 0x3f, 0x5d, 0x2c, 0x5c, 0xeb, 0x72, 0xe1,
-	0x5a, 0xbf, 0x16, 0xae, 0xf5, 0x6d, 0xe9, 0x0e, 0x2e, 0x97, 0xee, 0xe0, 0xe7, 0xd2, 0x1d, 0x7c,
-	0x0c, 0x3b, 0xeb, 0x68, 0x9b, 0x98, 0xa4, 0x34, 0x56, 0x6b, 0x41, 0xce, 0x82, 0x57, 0xe4, 0xbc,
-	0xef, 0xdb, 0x6a, 0x9a, 0x8a, 0x47, 0xcd, 0x9d, 0x7e, 0xf9, 0x3b, 0x00, 0x00, 0xff, 0xff, 0x39,
-	0x15, 0x7d, 0x7f, 0x8a, 0x03, 0x00, 0x00,
+	// 457 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x93, 0xc1, 0x6a, 0xd4, 0x40,
+	0x18, 0xc7, 0x37, 0xed, 0xba, 0xe2, 0xd8, 0x1e, 0x8c, 0x45, 0xe3, 0x0a, 0x49, 0x8d, 0x97, 0x7a,
+	0xd8, 0x19, 0xa3, 0x27, 0xab, 0x20, 0xa4, 0x45, 0x2c, 0x58, 0x90, 0x78, 0x10, 0x44, 0x58, 0x27,
+	0x33, 0x63, 0x3a, 0x34, 0xc9, 0x17, 0x33, 0xd3, 0xd2, 0x7d, 0x0b, 0x9f, 0xc7, 0x27, 0xe8, 0xb1,
+	0x78, 0x92, 0x1e, 0x82, 0xec, 0xbe, 0xc1, 0x3e, 0x81, 0x24, 0x93, 0x2d, 0xbb, 0x62, 0x4e, 0xd2,
+	0x5b, 0xfe, 0xf3, 0xff, 0x7d, 0xff, 0x7c, 0xf9, 0xe6, 0x0b, 0x7a, 0x0d, 0x2a, 0x03, 0x25, 0x15,
+	0x61, 0x90, 0x33, 0x91, 0xeb, 0x92, 0x6a, 0xc1, 0x47, 0xa9, 0xfc, 0x76, 0x22, 0xb9, 0xd4, 0x13,
+	0x52, 0x00, 0xa4, 0xa3, 0x0c, 0xb8, 0x48, 0x57, 0x08, 0xa2, 0xcf, 0x70, 0x51, 0x82, 0x06, 0xfb,
+	0x55, 0x1b, 0x80, 0x97, 0xed, 0xab, 0x7a, 0x5c, 0xd7, 0x37, 0xe5, 0x2b, 0x3e, 0x3e, 0x0d, 0x62,
+	0xa1, 0x69, 0x30, 0xdc, 0x4a, 0x20, 0x81, 0x26, 0x88, 0xd4, 0x4f, 0x26, 0x73, 0xe8, 0xb2, 0x26,
+	0x94, 0xc4, 0x54, 0x09, 0xd2, 0xa2, 0x84, 0x81, 0xcc, 0x8d, 0xef, 0xff, 0x58, 0x43, 0x0f, 0x0e,
+	0x55, 0xb2, 0x57, 0x0a, 0xaa, 0xc5, 0xde, 0x52, 0xee, 0x7b, 0x80, 0xd4, 0x7e, 0x82, 0x06, 0x4a,
+	0xe4, 0x5c, 0x94, 0x8e, 0xb5, 0x6d, 0xed, 0xdc, 0x0a, 0xef, 0xcc, 0x2b, 0x6f, 0x73, 0x42, 0xb3,
+	0x74, 0xd7, 0x37, 0xe7, 0x7e, 0xd4, 0x02, 0x35, 0xca, 0x45, 0x0e, 0xd9, 0x53, 0x67, 0xed, 0x6f,
+	0xd4, 0x9c, 0xfb, 0x51, 0x0b, 0x5c, 0xa1, 0x81, 0xb3, 0xfe, 0x4f, 0x34, 0x58, 0xa0, 0x81, 0xbd,
+	0x8b, 0x36, 0xb4, 0x64, 0xc7, 0x63, 0x55, 0x50, 0x26, 0xf3, 0xc4, 0xe9, 0x6f, 0x5b, 0x3b, 0xfd,
+	0xf0, 0xfe, 0xbc, 0xf2, 0xee, 0x9a, 0x82, 0x65, 0xd7, 0x8f, 0x6e, 0xd7, 0xf2, 0x83, 0x51, 0xf6,
+	0x17, 0xb4, 0xa9, 0x8a, 0x52, 0x50, 0x3e, 0xfe, 0x4a, 0x99, 0x86, 0xd2, 0xb9, 0xd1, 0xbc, 0xed,
+	0xe5, 0x79, 0xe5, 0xf5, 0x2e, 0x2b, 0xef, 0xa1, 0x99, 0x8c, 0xe2, 0xc7, 0x58, 0x02, 0xc9, 0xa8,
+	0x3e, 0xc2, 0xef, 0x44, 0x42, 0xd9, 0x64, 0x5f, 0xb0, 0x79, 0xe5, 0x6d, 0xb5, 0x9f, 0xb9, 0x9c,
+	0xe0, 0x47, 0x1b, 0x46, 0xbf, 0x31, 0xf2, 0x2d, 0x7a, 0xd4, 0x39, 0xbb, 0x48, 0xa8, 0x02, 0x72,
+	0x25, 0xec, 0xc7, 0xe8, 0x66, 0x7d, 0x73, 0x63, 0xc9, 0x9b, 0x21, 0xf6, 0x43, 0x34, 0xad, 0xbc,
+	0x41, 0x8d, 0x1c, 0xec, 0x47, 0x83, 0xda, 0x3a, 0xe0, 0xcf, 0x2e, 0x2d, 0xb4, 0x7e, 0xa8, 0x12,
+	0xfb, 0xa7, 0x85, 0xee, 0x75, 0xdc, 0xc5, 0x47, 0xfc, 0x3f, 0xeb, 0x81, 0x3b, 0x1b, 0x1d, 0x8e,
+	0xaf, 0x29, 0x78, 0x31, 0x81, 0xf0, 0xf3, 0xf9, 0xd4, 0xb5, 0x2e, 0xa6, 0xae, 0xf5, 0x7b, 0xea,
+	0x5a, 0xdf, 0x67, 0x6e, 0xef, 0x62, 0xe6, 0xf6, 0x7e, 0xcd, 0xdc, 0xde, 0xa7, 0x30, 0x91, 0xfa,
+	0xe8, 0x24, 0xc6, 0x0c, 0x32, 0xd2, 0x36, 0x31, 0x4a, 0x69, 0xac, 0x16, 0x82, 0x9c, 0x06, 0x2f,
+	0xc8, 0x59, 0xd7, 0x0f, 0xd5, 0x34, 0x15, 0x0f, 0x9a, 0x45, 0x7e, 0xfe, 0x27, 0x00, 0x00, 0xff,
+	0xff, 0x16, 0xd7, 0x80, 0x4d, 0x7f, 0x03, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/x/concentrated-liquidity/types/gov.pb.go b/x/concentrated-liquidity/types/gov.pb.go
index 20577df9042..37411f29193 100644
--- a/x/concentrated-liquidity/types/gov.pb.go
+++ b/x/concentrated-liquidity/types/gov.pb.go
@@ -4,8 +4,8 @@
 package types
 
 import (
+	cosmossdk_io_math "cosmossdk.io/math"
 	fmt "fmt"
-	github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types"
 	_ "github.com/gogo/protobuf/gogoproto"
 	proto "github.com/gogo/protobuf/proto"
 	io "io"
@@ -164,10 +164,10 @@ func (m *PoolIdToTickSpacingRecord) GetNewTickSpacing() uint64 {
 }
 
 type PoolRecord struct {
-	Denom0       string                                 `protobuf:"bytes,1,opt,name=denom0,proto3" json:"denom0,omitempty" yaml:"denom0"`
-	Denom1       string                                 `protobuf:"bytes,2,opt,name=denom1,proto3" json:"denom1,omitempty" yaml:"denom1"`
-	TickSpacing  uint64                                 `protobuf:"varint,3,opt,name=tick_spacing,json=tickSpacing,proto3" json:"tick_spacing,omitempty" yaml:"tick_spacing"`
-	SpreadFactor github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,5,opt,name=spread_factor,json=spreadFactor,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"spread_factor" yaml:"spread_factor"`
+	Denom0       string                      `protobuf:"bytes,1,opt,name=denom0,proto3" json:"denom0,omitempty" yaml:"denom0"`
+	Denom1       string                      `protobuf:"bytes,2,opt,name=denom1,proto3" json:"denom1,omitempty" yaml:"denom1"`
+	TickSpacing  uint64                      `protobuf:"varint,3,opt,name=tick_spacing,json=tickSpacing,proto3" json:"tick_spacing,omitempty" yaml:"tick_spacing"`
+	SpreadFactor cosmossdk_io_math.LegacyDec `protobuf:"bytes,5,opt,name=spread_factor,json=spreadFactor,proto3,customtype=cosmossdk.io/math.LegacyDec" json:"spread_factor" yaml:"spread_factor"`
 }
 
 func (m *PoolRecord) Reset()         { *m = PoolRecord{} }
@@ -236,41 +236,42 @@ func init() {
 }
 
 var fileDescriptor_e6d167276ceeedc2 = []byte{
-	// 541 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x53, 0x3f, 0x6f, 0xd3, 0x4c,
-	0x18, 0xb7, 0x1b, 0x27, 0xef, 0xcb, 0x25, 0x45, 0xc5, 0x44, 0x6a, 0x68, 0x25, 0x3b, 0xb2, 0x04,
-	0x0a, 0x43, 0x6c, 0x0c, 0x13, 0x99, 0x50, 0x5a, 0x55, 0x02, 0x31, 0x54, 0xa6, 0x13, 0x42, 0x8a,
-	0x9c, 0xf3, 0x11, 0x4e, 0x71, 0xfc, 0xb8, 0x77, 0xd7, 0x94, 0x7c, 0x03, 0x24, 0x16, 0x36, 0x18,
-	0xf3, 0x71, 0x3a, 0x76, 0x44, 0x0c, 0x11, 0x4a, 0x16, 0x56, 0xf2, 0x09, 0x50, 0xee, 0x9c, 0xc4,
-	0x29, 0x8a, 0x04, 0x62, 0xb2, 0x9f, 0xbb, 0xdf, 0xf3, 0xfb, 0xf3, 0xdc, 0x1d, 0x6a, 0x00, 0x1f,
-	0x00, 0xa7, 0xdc, 0xc3, 0x90, 0x60, 0x92, 0x08, 0x16, 0x0a, 0x12, 0x35, 0x63, 0x7a, 0x7e, 0x41,
-	0x23, 0x2a, 0x46, 0x5e, 0x0f, 0x86, 0x6e, 0xca, 0x40, 0x80, 0x79, 0x3f, 0x43, 0xba, 0x79, 0xe4,
-	0x0a, 0xe8, 0x0e, 0xfd, 0x2e, 0x11, 0xa1, 0x7f, 0x50, 0xed, 0x41, 0x0f, 0x64, 0x87, 0xb7, 0xf8,
-	0x53, 0xcd, 0xce, 0x4c, 0x47, 0x8d, 0x23, 0x46, 0x42, 0x41, 0x8e, 0x72, 0xdd, 0x2f, 0x97, 0xdd,
-	0xa7, 0x00, 0x31, 0x3f, 0x65, 0x90, 0x02, 0x0f, 0x63, 0xb3, 0x8a, 0x8a, 0x82, 0x8a, 0x98, 0xd4,
-	0xf4, 0xba, 0xde, 0xb8, 0x15, 0xa8, 0xc2, 0xac, 0xa3, 0x72, 0x44, 0x38, 0x66, 0x34, 0x15, 0x14,
-	0x92, 0xda, 0x8e, 0xdc, 0xcb, 0x2f, 0x99, 0xe7, 0xa8, 0x92, 0x02, 0xc4, 0x1d, 0x46, 0x30, 0xb0,
-	0x88, 0xd7, 0x0a, 0xf5, 0x42, 0xa3, 0xfc, 0xd8, 0x77, 0xff, 0xc8, 0xb8, 0xbb, 0xf0, 0x10, 0xc8,
-	0xce, 0xf6, 0xe1, 0xd5, 0xc4, 0xd6, 0xe6, 0x13, 0xfb, 0xee, 0x28, 0x1c, 0xc4, 0x2d, 0x27, 0x4f,
-	0xea, 0x04, 0xe5, 0x74, 0x05, 0xe4, 0xad, 0xca, 0x87, 0xb1, 0xad, 0x7d, 0x19, 0xdb, 0xda, 0x8f,
-	0xb1, 0xad, 0x3b, 0x3f, 0x75, 0x74, 0x78, 0x46, 0x71, 0xff, 0x55, 0x1a, 0x62, 0x9a, 0xf4, 0x8e,
-	0x09, 0x66, 0x24, 0xe4, 0xe4, 0x9f, 0x83, 0x7d, 0xd4, 0x91, 0x2d, 0x4d, 0xd0, 0xa8, 0x23, 0xa0,
-	0x23, 0x28, 0xee, 0x77, 0xb8, 0xd2, 0xb8, 0x11, 0xf6, 0xd9, 0x5f, 0x84, 0x7d, 0x1e, 0x9d, 0x41,
-	0xce, 0x6d, 0x96, 0xdd, 0x58, 0x64, 0x0f, 0x0e, 0xd2, 0x6d, 0x80, 0x9b, 0x99, 0x23, 0x74, 0x6f,
-	0x2b, 0x99, 0xb9, 0x8f, 0xfe, 0xcb, 0x7c, 0xcb, 0xc8, 0x46, 0x50, 0x52, 0xbc, 0x66, 0x03, 0xed,
-	0x25, 0xe4, 0x72, 0x23, 0x89, 0x0c, 0x6e, 0x04, 0xb7, 0x13, 0x72, 0x99, 0x23, 0x6a, 0x19, 0x52,
-	0xe5, 0xf3, 0x0e, 0x42, 0xeb, 0x03, 0x32, 0x1f, 0xa2, 0x52, 0x44, 0x12, 0x18, 0x3c, 0x52, 0x93,
-	0x6c, 0xdf, 0x99, 0x4f, 0xec, 0x5d, 0x75, 0x58, 0x6a, 0xdd, 0x09, 0x32, 0xc0, 0x0a, 0xea, 0xab,
-	0xc1, 0xfe, 0x06, 0xf5, 0x97, 0x50, 0xdf, 0x6c, 0xa1, 0xca, 0x86, 0xa1, 0xc2, 0xc2, 0x50, 0x7b,
-	0x7f, 0x7d, 0x11, 0xf2, 0xbb, 0x4e, 0x50, 0x16, 0x6b, 0x9b, 0x66, 0x1f, 0xed, 0xf2, 0x94, 0x91,
-	0x30, 0xea, 0xbc, 0x0d, 0xb1, 0x00, 0x56, 0x2b, 0x4a, 0xb5, 0x93, 0xc5, 0x34, 0xbf, 0x4d, 0xec,
-	0x07, 0x3d, 0x2a, 0xde, 0x5d, 0x74, 0x5d, 0x0c, 0x03, 0x0f, 0xcb, 0x23, 0xca, 0x3e, 0x4d, 0x1e,
-	0xf5, 0x3d, 0x31, 0x4a, 0x09, 0x77, 0x8f, 0x09, 0x9e, 0x4f, 0xec, 0xaa, 0x92, 0xda, 0x20, 0x73,
-	0x82, 0x8a, 0xaa, 0x4f, 0x64, 0xa9, 0x66, 0xf2, 0xc2, 0xf8, 0xdf, 0xd8, 0x2b, 0xb6, 0xdf, 0x5c,
-	0x4d, 0x2d, 0xfd, 0x7a, 0x6a, 0xe9, 0xdf, 0xa7, 0x96, 0xfe, 0x69, 0x66, 0x69, 0xd7, 0x33, 0x4b,
-	0xfb, 0x3a, 0xb3, 0xb4, 0xd7, 0xed, 0x9c, 0x66, 0x76, 0x2b, 0x9a, 0x71, 0xd8, 0xe5, 0xcb, 0xc2,
-	0x1b, 0xfa, 0x4f, 0xbd, 0xf7, 0xdb, 0x1e, 0xbe, 0xf4, 0xd4, 0x2d, 0xc9, 0xe7, 0xfb, 0xe4, 0x57,
-	0x00, 0x00, 0x00, 0xff, 0xff, 0xf3, 0xd8, 0xa2, 0x9a, 0x27, 0x04, 0x00, 0x00,
+	// 545 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x53, 0xcd, 0x6e, 0xd3, 0x4c,
+	0x14, 0xb5, 0x5b, 0x27, 0xdf, 0xc7, 0x24, 0x45, 0xc5, 0x44, 0x6a, 0x68, 0x24, 0x3b, 0xb2, 0x84,
+	0x14, 0x16, 0xb5, 0x31, 0xac, 0x08, 0x1b, 0x94, 0x56, 0x48, 0xa0, 0x2e, 0x2a, 0xd3, 0x15, 0x42,
+	0x0a, 0x93, 0xf1, 0xe0, 0x8e, 0xe2, 0xf8, 0xba, 0x9e, 0x69, 0x4a, 0xde, 0x00, 0x09, 0x16, 0x2c,
+	0x59, 0xe6, 0x71, 0xba, 0xec, 0x12, 0xb1, 0x88, 0x50, 0xb2, 0x61, 0x4b, 0x9e, 0x00, 0x65, 0x26,
+	0x3f, 0x4e, 0x51, 0x24, 0x10, 0x3b, 0x5f, 0xcf, 0x39, 0xe7, 0x9e, 0x73, 0xef, 0x0c, 0x6a, 0x00,
+	0xef, 0x01, 0x67, 0xdc, 0x23, 0x90, 0x10, 0x9a, 0x88, 0x0c, 0x0b, 0x1a, 0x1e, 0xc4, 0xec, 0xfc,
+	0x82, 0x85, 0x4c, 0x0c, 0xbc, 0x08, 0xfa, 0x6e, 0x9a, 0x81, 0x00, 0xf3, 0xfe, 0x1c, 0xe9, 0xe6,
+	0x91, 0x4b, 0xa0, 0xdb, 0xf7, 0x3b, 0x54, 0x60, 0x7f, 0xbf, 0x12, 0x41, 0x04, 0x92, 0xe1, 0xcd,
+	0xbe, 0x14, 0xd9, 0x99, 0xe8, 0xa8, 0x71, 0x98, 0x51, 0x2c, 0xe8, 0x61, 0x8e, 0x7d, 0xbc, 0x60,
+	0x9f, 0x00, 0xc4, 0xfc, 0x24, 0x83, 0x14, 0x38, 0x8e, 0xcd, 0x0a, 0x2a, 0x08, 0x26, 0x62, 0x5a,
+	0xd5, 0xeb, 0x7a, 0xe3, 0x56, 0xa0, 0x0a, 0xb3, 0x8e, 0x4a, 0x21, 0xe5, 0x24, 0x63, 0xa9, 0x60,
+	0x90, 0x54, 0xb7, 0xe4, 0x59, 0xfe, 0x97, 0x79, 0x8e, 0xca, 0x29, 0x40, 0xdc, 0xce, 0x28, 0x81,
+	0x2c, 0xe4, 0xd5, 0xed, 0xfa, 0x76, 0xa3, 0xf4, 0xc8, 0x77, 0xff, 0xc8, 0xb8, 0x3b, 0xf3, 0x10,
+	0x48, 0x66, 0xab, 0x76, 0x35, 0xb2, 0xb5, 0xe9, 0xc8, 0xbe, 0x3b, 0xc0, 0xbd, 0xb8, 0xe9, 0xe4,
+	0x45, 0x9d, 0xa0, 0x94, 0x2e, 0x81, 0xbc, 0x59, 0xfe, 0x30, 0xb4, 0xb5, 0x2f, 0x43, 0x5b, 0xfb,
+	0x31, 0xb4, 0x75, 0xe7, 0xa7, 0x8e, 0x6a, 0xa7, 0x8c, 0x74, 0x5f, 0xa5, 0x98, 0xb0, 0x24, 0x3a,
+	0xa2, 0x24, 0xa3, 0x98, 0xd3, 0x7f, 0x0e, 0xf6, 0x51, 0x47, 0xb6, 0x34, 0xc1, 0xc2, 0xb6, 0x80,
+	0xb6, 0x60, 0xa4, 0xdb, 0xe6, 0xaa, 0xc7, 0x8d, 0xb0, 0xcf, 0xfe, 0x22, 0xec, 0x8b, 0xf0, 0x14,
+	0x72, 0x6e, 0xe7, 0xd9, 0x8d, 0x59, 0xf6, 0x60, 0x3f, 0xdd, 0x04, 0xb8, 0x99, 0x39, 0x44, 0xf7,
+	0x36, 0x8a, 0x99, 0x7b, 0xe8, 0xbf, 0xb9, 0x6f, 0x19, 0xd9, 0x08, 0x8a, 0x4a, 0xd7, 0x6c, 0xa0,
+	0xdd, 0x84, 0x5e, 0xae, 0x25, 0x91, 0xc1, 0x8d, 0xe0, 0x76, 0x42, 0x2f, 0x73, 0x42, 0x4d, 0x43,
+	0x76, 0xf9, 0xb4, 0x85, 0xd0, 0x6a, 0x41, 0xe6, 0x03, 0x54, 0x0c, 0x69, 0x02, 0xbd, 0x87, 0x6a,
+	0x92, 0xad, 0x3b, 0xd3, 0x91, 0xbd, 0xa3, 0x96, 0xa5, 0xfe, 0x3b, 0xc1, 0x1c, 0xb0, 0x84, 0xfa,
+	0x6a, 0xb0, 0xbf, 0x41, 0xfd, 0x05, 0xd4, 0x37, 0x9b, 0xa8, 0xbc, 0x66, 0x68, 0x7b, 0x66, 0xa8,
+	0xb5, 0xb7, 0xba, 0x08, 0xf9, 0x53, 0x27, 0x28, 0x89, 0x95, 0x4d, 0xf3, 0x2d, 0xda, 0xe1, 0x69,
+	0x46, 0x71, 0xd8, 0x7e, 0x87, 0x89, 0x80, 0xac, 0x5a, 0x90, 0xdd, 0x9e, 0xce, 0xa6, 0xf9, 0x6d,
+	0x64, 0xd7, 0x88, 0xdc, 0x0b, 0x0f, 0xbb, 0x2e, 0x03, 0xaf, 0x87, 0xc5, 0x99, 0x7b, 0x4c, 0x23,
+	0x4c, 0x06, 0x47, 0x94, 0x4c, 0x47, 0x76, 0x45, 0xe9, 0xaf, 0x29, 0x38, 0x41, 0x59, 0xd5, 0xcf,
+	0x65, 0xa9, 0x06, 0xf1, 0xd2, 0xf8, 0xdf, 0xd8, 0x2d, 0xb4, 0xde, 0x5c, 0x8d, 0x2d, 0xfd, 0x7a,
+	0x6c, 0xe9, 0xdf, 0xc7, 0x96, 0xfe, 0x79, 0x62, 0x69, 0xd7, 0x13, 0x4b, 0xfb, 0x3a, 0xb1, 0xb4,
+	0xd7, 0xad, 0x88, 0x89, 0xb3, 0x8b, 0x8e, 0x4b, 0xa0, 0xe7, 0xcd, 0xaf, 0xc2, 0x41, 0x8c, 0x3b,
+	0x7c, 0x51, 0x78, 0x7d, 0xff, 0x89, 0xf7, 0x7e, 0xd3, 0x6b, 0x17, 0x83, 0x94, 0xf2, 0x4e, 0x51,
+	0xbe, 0xd9, 0xc7, 0xbf, 0x02, 0x00, 0x00, 0xff, 0xff, 0x93, 0xc7, 0xda, 0x05, 0x1c, 0x04, 0x00,
+	0x00,
 }
 
 func (this *CreateConcentratedLiquidityPoolsProposal) Equal(that interface{}) bool {
diff --git a/x/concentrated-liquidity/types/incentive_record.pb.go b/x/concentrated-liquidity/types/incentive_record.pb.go
index 9d86d044ca5..39e477c177f 100644
--- a/x/concentrated-liquidity/types/incentive_record.pb.go
+++ b/x/concentrated-liquidity/types/incentive_record.pb.go
@@ -4,9 +4,9 @@
 package types
 
 import (
+	cosmossdk_io_math "cosmossdk.io/math"
 	fmt "fmt"
 	_ "github.com/cosmos/cosmos-proto"
-	github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types"
 	types1 "github.com/cosmos/cosmos-sdk/types"
 	_ "github.com/gogo/protobuf/gogoproto"
 	proto "github.com/gogo/protobuf/proto"
@@ -113,7 +113,7 @@ type IncentiveRecordBody struct {
 	// remaining_coin is the total amount of incentives to be distributed
 	RemainingCoin types1.DecCoin `protobuf:"bytes,1,opt,name=remaining_coin,json=remainingCoin,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.DecCoin" json:"remaining_coin" yaml:"remaining_coins"`
 	// emission_rate is the incentive emission rate per second
-	EmissionRate github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,2,opt,name=emission_rate,json=emissionRate,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"emission_rate" yaml:"emission_rate"`
+	EmissionRate cosmossdk_io_math.LegacyDec `protobuf:"bytes,2,opt,name=emission_rate,json=emissionRate,proto3,customtype=cosmossdk.io/math.LegacyDec" json:"emission_rate" yaml:"emission_rate"`
 	// start_time is the time when the incentive starts distributing
 	StartTime time.Time `protobuf:"bytes,3,opt,name=start_time,json=startTime,proto3,stdtime" json:"start_time" yaml:"start_time"`
 }
@@ -175,42 +175,43 @@ func init() {
 }
 
 var fileDescriptor_9d38bf94e42ee434 = []byte{
-	// 548 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x53, 0xd1, 0x6a, 0x13, 0x41,
-	0x14, 0xcd, 0xc6, 0x5a, 0xe9, 0xa4, 0x55, 0xdc, 0x54, 0x9b, 0x86, 0xba, 0x5b, 0x16, 0x95, 0x22,
-	0x64, 0x86, 0x54, 0x7c, 0x30, 0x8f, 0x6b, 0x11, 0x02, 0x3e, 0x2d, 0x8a, 0x22, 0xc2, 0x32, 0xbb,
-	0x33, 0xae, 0x43, 0xb3, 0x3b, 0x71, 0x67, 0x12, 0xcc, 0x5f, 0x54, 0xf0, 0xc1, 0x6f, 0xf0, 0x4b,
-	0xfa, 0xd8, 0x27, 0x11, 0x1f, 0x52, 0x49, 0x7e, 0x40, 0xf2, 0x05, 0x32, 0xb3, 0xb3, 0x49, 0x9a,
-	0x5a, 0xe8, 0x53, 0x72, 0x66, 0xee, 0xb9, 0xf7, 0x9c, 0x33, 0x77, 0xc1, 0x33, 0x2e, 0x52, 0x2e,
-	0x98, 0x40, 0x31, 0xcf, 0x62, 0x9a, 0xc9, 0x1c, 0x4b, 0x4a, 0x5a, 0x3d, 0xf6, 0x79, 0xc0, 0x08,
-	0x93, 0x23, 0xc4, 0xf4, 0x29, 0x1b, 0xd2, 0x30, 0xa7, 0x31, 0xcf, 0x09, 0xec, 0xe7, 0x5c, 0x72,
-	0xfb, 0x91, 0xa1, 0xc1, 0x65, 0xda, 0x9c, 0x05, 0x87, 0xed, 0x88, 0x4a, 0xdc, 0x6e, 0xee, 0xc6,
-	0xba, 0x2e, 0xd4, 0x24, 0x54, 0x80, 0xa2, 0x43, 0x73, 0x3b, 0xe1, 0x09, 0x2f, 0xce, 0xd5, 0x3f,
-	0x73, 0xea, 0x26, 0x9c, 0x27, 0x3d, 0x8a, 0x34, 0x8a, 0x06, 0x1f, 0x91, 0x64, 0x29, 0x15, 0x12,
-	0xa7, 0x7d, 0x53, 0xe0, 0xac, 0x16, 0x90, 0x41, 0x8e, 0x25, 0xe3, 0x59, 0x79, 0x5f, 0x0c, 0x41,
-	0x11, 0x16, 0x14, 0x19, 0x19, 0x28, 0xe6, 0xcc, 0xdc, 0x7b, 0x3f, 0xab, 0xe0, 0x4e, 0xb7, 0xf4,
-	0x14, 0x68, 0x4b, 0x76, 0x07, 0x6c, 0x2e, 0x6c, 0x32, 0xd2, 0xb0, 0xf6, 0xad, 0x83, 0x35, 0x7f,
-	0x67, 0x36, 0x76, 0xeb, 0x23, 0x9c, 0xf6, 0x3a, 0xde, 0xf2, 0xad, 0x17, 0xd4, 0xe6, 0xb0, 0x4b,
-	0xec, 0x1d, 0x70, 0xab, 0xcf, 0x79, 0x4f, 0xd1, 0xaa, 0x8a, 0x16, 0xac, 0x2b, 0xd8, 0x25, 0xf6,
-	0x37, 0x0b, 0xdc, 0x5b, 0x0d, 0x2f, 0x8c, 0x38, 0x19, 0x35, 0xd6, 0xf6, 0xad, 0x83, 0xda, 0x61,
-	0x07, 0x5e, 0x2b, 0x42, 0xb8, 0x22, 0xd6, 0xe7, 0x64, 0xe4, 0x3f, 0x3c, 0x1d, 0xbb, 0x95, 0xd9,
-	0xd8, 0xdd, 0x5b, 0x95, 0xb7, 0x34, 0xc6, 0x0b, 0xea, 0xec, 0x32, 0xd5, 0x7e, 0x0b, 0x40, 0xca,
-	0xb2, 0x70, 0xd0, 0x57, 0xc1, 0x36, 0x6e, 0x6a, 0x29, 0xbb, 0xb0, 0x08, 0x15, 0x96, 0xa1, 0xc2,
-	0x23, 0x13, 0xaa, 0xff, 0xc0, 0x4c, 0xba, 0x5b, 0x4c, 0x5a, 0x50, 0xbd, 0xef, 0xe7, 0xae, 0x15,
-	0x6c, 0xa4, 0x2c, 0x7b, 0x53, 0xe0, 0xbf, 0x55, 0x50, 0xff, 0x8f, 0x56, 0xfb, 0xab, 0x05, 0x6e,
-	0xe7, 0x34, 0xc5, 0x2c, 0x63, 0x59, 0x12, 0xaa, 0x97, 0xd0, 0xf9, 0xd6, 0x0e, 0xf7, 0xa0, 0xd9,
-	0x07, 0xf5, 0x54, 0x73, 0xbb, 0x47, 0x34, 0x7e, 0xc1, 0x59, 0xe6, 0xbf, 0x32, 0x83, 0xef, 0x17,
-	0x83, 0x2f, 0x76, 0x10, 0xde, 0x8f, 0x73, 0xf7, 0x49, 0xc2, 0xe4, 0xa7, 0x41, 0x04, 0x63, 0x9e,
-	0x9a, 0xcd, 0x32, 0x3f, 0x2d, 0x41, 0x8e, 0x91, 0x1c, 0xf5, 0xa9, 0x28, 0xbb, 0x05, 0x5b, 0x73,
-	0xbe, 0x82, 0xf6, 0x31, 0xd8, 0xa2, 0x29, 0x13, 0x82, 0xf1, 0x2c, 0x54, 0xb1, 0xeb, 0xa7, 0xdb,
-	0xf0, 0x5f, 0xaa, 0x99, 0xbf, 0xc7, 0xee, 0xe3, 0xeb, 0x75, 0x9e, 0x8d, 0xdd, 0xed, 0x42, 0xdd,
-	0x85, 0x66, 0x5e, 0xb0, 0x59, 0xe2, 0x00, 0x4b, 0x6a, 0xbf, 0x03, 0x40, 0x48, 0x9c, 0xcb, 0x50,
-	0x27, 0x7e, 0x43, 0x7b, 0x6f, 0x5e, 0x4a, 0xfc, 0x75, 0xb9, 0xe7, 0xab, 0x91, 0x2f, 0xb8, 0xde,
-	0x89, 0x8e, 0x5c, 0x1f, 0xa8, 0x72, 0xff, 0xc3, 0xe9, 0xc4, 0xb1, 0xce, 0x26, 0x8e, 0xf5, 0x67,
-	0xe2, 0x58, 0x27, 0x53, 0xa7, 0x72, 0x36, 0x75, 0x2a, 0xbf, 0xa6, 0x4e, 0xe5, 0xbd, 0xbf, 0xe4,
-	0xc0, 0xac, 0x59, 0xab, 0x87, 0x23, 0x51, 0x02, 0x34, 0x6c, 0x3f, 0x47, 0x5f, 0xae, 0xfa, 0xe6,
-	0xb5, 0xc3, 0x68, 0x5d, 0x6b, 0x7b, 0xfa, 0x2f, 0x00, 0x00, 0xff, 0xff, 0x23, 0xd3, 0x25, 0x13,
-	0x22, 0x04, 0x00, 0x00,
+	// 564 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x93, 0xcf, 0x6e, 0xd3, 0x30,
+	0x1c, 0xc7, 0x9b, 0x32, 0x86, 0xe6, 0x6e, 0x20, 0xd2, 0xc1, 0xba, 0x32, 0x92, 0x29, 0x02, 0x69,
+	0x42, 0xaa, 0xad, 0x0e, 0x71, 0xa0, 0xdc, 0x42, 0x2f, 0x95, 0x76, 0x8a, 0x40, 0x20, 0x84, 0x14,
+	0x9c, 0xc4, 0x64, 0xd6, 0x9a, 0xb8, 0xc4, 0x6e, 0x45, 0xde, 0x62, 0x48, 0x1c, 0x78, 0x06, 0x9e,
+	0x64, 0xc7, 0x9d, 0x10, 0xe2, 0xd0, 0xa1, 0x56, 0xbc, 0x40, 0x9f, 0x00, 0xd9, 0x71, 0xda, 0xae,
+	0x03, 0x69, 0xa7, 0xf6, 0x6b, 0xff, 0xbe, 0xbf, 0x3f, 0x1f, 0xff, 0x02, 0x9e, 0x31, 0x9e, 0x30,
+	0x4e, 0x39, 0x0a, 0x59, 0x1a, 0x92, 0x54, 0x64, 0x58, 0x90, 0xa8, 0xd5, 0xa7, 0x9f, 0x86, 0x34,
+	0xa2, 0x22, 0x47, 0x54, 0x9d, 0xd2, 0x11, 0xf1, 0x33, 0x12, 0xb2, 0x2c, 0x82, 0x83, 0x8c, 0x09,
+	0x66, 0x3e, 0xd6, 0x36, 0xb8, 0x6c, 0x9b, 0xbb, 0xe0, 0xa8, 0x1d, 0x10, 0x81, 0xdb, 0xcd, 0xdd,
+	0x50, 0xc5, 0xf9, 0xca, 0x84, 0x0a, 0x51, 0x64, 0x68, 0x6e, 0xc7, 0x2c, 0x66, 0xc5, 0xb9, 0xfc,
+	0xa7, 0x4f, 0xed, 0x98, 0xb1, 0xb8, 0x4f, 0x90, 0x52, 0xc1, 0xf0, 0x23, 0x12, 0x34, 0x21, 0x5c,
+	0xe0, 0x64, 0xa0, 0x03, 0xac, 0xd5, 0x80, 0x68, 0x98, 0x61, 0x41, 0x59, 0x5a, 0xde, 0x17, 0x45,
+	0x50, 0x80, 0x39, 0x41, 0xba, 0x0d, 0x14, 0x32, 0xaa, 0xef, 0x9d, 0x1f, 0x55, 0x70, 0xa7, 0x57,
+	0xce, 0xe4, 0xa9, 0x91, 0xcc, 0x0e, 0xd8, 0x5c, 0x8c, 0x49, 0xa3, 0x86, 0xb1, 0x6f, 0x1c, 0xac,
+	0xb9, 0x3b, 0xb3, 0xb1, 0x5d, 0xcf, 0x71, 0xd2, 0xef, 0x38, 0xcb, 0xb7, 0x8e, 0x57, 0x9b, 0xcb,
+	0x5e, 0x64, 0xee, 0x80, 0x5b, 0x03, 0xc6, 0xfa, 0xd2, 0x56, 0x95, 0x36, 0x6f, 0x5d, 0xca, 0x5e,
+	0x64, 0x7e, 0x35, 0xc0, 0xbd, 0x55, 0x78, 0x7e, 0xc0, 0xa2, 0xbc, 0xb1, 0xb6, 0x6f, 0x1c, 0xd4,
+	0x0e, 0x3b, 0xf0, 0x5a, 0x08, 0xe1, 0x4a, 0xb3, 0x2e, 0x8b, 0x72, 0xf7, 0xd1, 0xd9, 0xd8, 0xae,
+	0xcc, 0xc6, 0xf6, 0xde, 0x6a, 0x7b, 0x4b, 0x65, 0x1c, 0xaf, 0x4e, 0xaf, 0x5a, 0xcd, 0x37, 0x00,
+	0x24, 0x34, 0xf5, 0x87, 0x03, 0x09, 0xb6, 0x71, 0x53, 0xb5, 0xb2, 0x0b, 0x0b, 0xa8, 0xb0, 0x84,
+	0x0a, 0xbb, 0x1a, 0xaa, 0xfb, 0x50, 0x57, 0xba, 0x5b, 0x54, 0x5a, 0x58, 0x9d, 0x6f, 0x17, 0xb6,
+	0xe1, 0x6d, 0x24, 0x34, 0x7d, 0x5d, 0xe8, 0x3f, 0x55, 0x50, 0xff, 0x47, 0xaf, 0xe6, 0x17, 0x03,
+	0xdc, 0xce, 0x48, 0x82, 0x69, 0x4a, 0xd3, 0xd8, 0x97, 0x2f, 0xa1, 0xf8, 0xd6, 0x0e, 0xf7, 0xa0,
+	0xde, 0x07, 0xf9, 0x54, 0xf3, 0x71, 0xbb, 0x24, 0x7c, 0xc9, 0x68, 0xea, 0x1e, 0xe9, 0xc2, 0xf7,
+	0x8b, 0xc2, 0x97, 0x33, 0x70, 0xe7, 0xfb, 0x85, 0xfd, 0x24, 0xa6, 0xe2, 0x78, 0x18, 0xc0, 0x90,
+	0x25, 0x7a, 0xb3, 0xf4, 0x4f, 0x8b, 0x47, 0x27, 0x48, 0xe4, 0x03, 0xc2, 0xcb, 0x6c, 0xde, 0xd6,
+	0xdc, 0x2f, 0xa5, 0xf9, 0x01, 0x6c, 0x91, 0x84, 0x72, 0x4e, 0x59, 0xea, 0x4b, 0xec, 0xea, 0xe9,
+	0x36, 0xdc, 0x17, 0xb2, 0xe6, 0xaf, 0xb1, 0xfd, 0xa0, 0xc8, 0xc3, 0xa3, 0x13, 0x48, 0x19, 0x4a,
+	0xb0, 0x38, 0x86, 0x47, 0x24, 0xc6, 0x61, 0xde, 0x25, 0xe1, 0x6c, 0x6c, 0x6f, 0x17, 0x2d, 0x5d,
+	0xca, 0xe0, 0x78, 0x9b, 0xa5, 0xf6, 0xb0, 0x20, 0xe6, 0x5b, 0x00, 0xb8, 0xc0, 0x99, 0xf0, 0x15,
+	0xe6, 0x1b, 0x6a, 0xe0, 0xe6, 0x15, 0xcc, 0xaf, 0xca, 0xe5, 0x5e, 0xe5, 0xbc, 0xf0, 0x3a, 0xa7,
+	0x8a, 0xb3, 0x3a, 0x90, 0xe1, 0xee, 0xfb, 0xb3, 0x89, 0x65, 0x9c, 0x4f, 0x2c, 0xe3, 0xf7, 0xc4,
+	0x32, 0x4e, 0xa7, 0x56, 0xe5, 0x7c, 0x6a, 0x55, 0x7e, 0x4e, 0xad, 0xca, 0x3b, 0x77, 0x09, 0x88,
+	0xde, 0xad, 0x56, 0x1f, 0x07, 0xbc, 0x14, 0x68, 0xd4, 0x7e, 0x8e, 0x3e, 0xff, 0xef, 0x43, 0x57,
+	0xc0, 0x82, 0x75, 0xd5, 0xdb, 0xd3, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x98, 0x15, 0x4d, 0x6c,
+	0x17, 0x04, 0x00, 0x00,
 }
 
 func (m *IncentiveRecord) Marshal() (dAtA []byte, err error) {
diff --git a/x/concentrated-liquidity/types/params.pb.go b/x/concentrated-liquidity/types/params.pb.go
index 787d26e99bf..a69d99a2303 100644
--- a/x/concentrated-liquidity/types/params.pb.go
+++ b/x/concentrated-liquidity/types/params.pb.go
@@ -4,9 +4,9 @@
 package types
 
 import (
+	cosmossdk_io_math "cosmossdk.io/math"
 	fmt "fmt"
 	_ "github.com/cosmos/cosmos-proto"
-	github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types"
 	_ "github.com/gogo/protobuf/gogoproto"
 	proto "github.com/gogo/protobuf/proto"
 	_ "github.com/gogo/protobuf/types"
@@ -34,15 +34,15 @@ type Params struct {
 	// spacing values concentrated-liquidity pools can be created with. For
 	// example, an authorized_tick_spacing of [1, 10, 30] allows for pools
 	// to be created with tick spacing of 1, 10, or 30.
-	AuthorizedTickSpacing   []uint64                                 `protobuf:"varint,1,rep,packed,name=authorized_tick_spacing,json=authorizedTickSpacing,proto3" json:"authorized_tick_spacing,omitempty" yaml:"authorized_tick_spacing"`
-	AuthorizedSpreadFactors []github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,2,rep,name=authorized_spread_factors,json=authorizedSpreadFactors,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"authorized_spread_factors" yaml:"authorized_spread_factors"`
+	AuthorizedTickSpacing   []uint64                      `protobuf:"varint,1,rep,packed,name=authorized_tick_spacing,json=authorizedTickSpacing,proto3" json:"authorized_tick_spacing,omitempty" yaml:"authorized_tick_spacing"`
+	AuthorizedSpreadFactors []cosmossdk_io_math.LegacyDec `protobuf:"bytes,2,rep,name=authorized_spread_factors,json=authorizedSpreadFactors,proto3,customtype=cosmossdk.io/math.LegacyDec" json:"authorized_spread_factors" yaml:"authorized_spread_factors"`
 	// balancer_shares_reward_discount is the rate by which incentives flowing
 	// from CL to Balancer pools will be discounted to encourage LPs to migrate.
 	// e.g. a rate of 0.05 means Balancer LPs get 5% less incentives than full
 	// range CL LPs.
 	// This field can range from (0,1]. If set to 1, it indicates that all
 	// incentives stay at cl pool.
-	BalancerSharesRewardDiscount github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,3,opt,name=balancer_shares_reward_discount,json=balancerSharesRewardDiscount,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"balancer_shares_reward_discount" yaml:"balancer_shares_reward_discount"`
+	BalancerSharesRewardDiscount cosmossdk_io_math.LegacyDec `protobuf:"bytes,3,opt,name=balancer_shares_reward_discount,json=balancerSharesRewardDiscount,proto3,customtype=cosmossdk.io/math.LegacyDec" json:"balancer_shares_reward_discount" yaml:"balancer_shares_reward_discount"`
 	// authorized_quote_denoms is a list of quote denoms that can be used as
 	// token1 when creating a pool. We limit the quote assets to a small set for
 	// the purposes of having convinient price increments stemming from tick to
@@ -130,42 +130,42 @@ func init() {
 }
 
 var fileDescriptor_cd3784445b6f6ba7 = []byte{
-	// 546 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x93, 0x31, 0x6f, 0xd3, 0x40,
-	0x14, 0xc7, 0x63, 0x52, 0x22, 0x6a, 0x26, 0x2c, 0x10, 0x4e, 0x05, 0xb6, 0x65, 0xa4, 0x12, 0x09,
-	0x6a, 0x8b, 0x32, 0x01, 0x9b, 0x09, 0xcc, 0xc5, 0x01, 0x09, 0x55, 0x48, 0xa7, 0xf3, 0xf9, 0xea,
-	0x9c, 0x62, 0xfb, 0xb9, 0x77, 0x67, 0x20, 0xec, 0x20, 0x26, 0xc4, 0xc8, 0xc6, 0xd7, 0xe9, 0xd8,
-	0x11, 0x31, 0x18, 0x94, 0x6c, 0x8c, 0xf9, 0x04, 0x28, 0x67, 0x87, 0x3a, 0x94, 0x0a, 0x98, 0xec,
-	0xf7, 0xfe, 0xbf, 0xf7, 0xee, 0xdd, 0x7b, 0xef, 0xf4, 0x5b, 0x20, 0x32, 0x10, 0x4c, 0xf8, 0x04,
-	0x72, 0x42, 0x73, 0xc9, 0xb1, 0xa4, 0xf1, 0x4e, 0xca, 0x0e, 0x4b, 0x16, 0x33, 0x39, 0xf5, 0x0b,
-	0xcc, 0x71, 0x26, 0xbc, 0x82, 0x83, 0x04, 0xe3, 0x7a, 0x03, 0x7b, 0x6d, 0xf8, 0x17, 0xbb, 0x75,
-	0x39, 0x81, 0x04, 0x14, 0xe9, 0x2f, 0xff, 0xea, 0xa0, 0xad, 0x3e, 0x51, 0x51, 0xa8, 0x16, 0x6a,
-	0xa3, 0x91, 0xac, 0x04, 0x20, 0x49, 0xa9, 0xaf, 0xac, 0xa8, 0x3c, 0xf0, 0xe3, 0x92, 0x63, 0xc9,
-	0x20, 0xaf, 0x75, 0xf7, 0x5d, 0x4f, 0xef, 0xed, 0xa9, 0x02, 0x8c, 0x7d, 0xfd, 0x2a, 0x2e, 0xe5,
-	0x18, 0x38, 0x7b, 0x43, 0x63, 0x24, 0x19, 0x99, 0x20, 0x51, 0x60, 0xc2, 0xf2, 0xc4, 0xd4, 0x9c,
-	0xee, 0x60, 0x23, 0x70, 0x17, 0x95, 0x6d, 0x4d, 0x71, 0x96, 0xde, 0x77, 0xcf, 0x00, 0xdd, 0xf0,
-	0xca, 0x89, 0xf2, 0x94, 0x91, 0xc9, 0xa8, 0xf6, 0x1b, 0x1f, 0x34, 0xbd, 0xdf, 0x8a, 0x11, 0x05,
-	0xa7, 0x38, 0x46, 0x07, 0x98, 0x48, 0xe0, 0xc2, 0x3c, 0xe7, 0x74, 0x07, 0x9b, 0x41, 0x78, 0x54,
-	0xd9, 0x9d, 0xaf, 0x95, 0xbd, 0x9d, 0x30, 0x39, 0x2e, 0x23, 0x8f, 0x40, 0xd6, 0xdc, 0xa5, 0xf9,
-	0xec, 0x88, 0x78, 0xe2, 0xcb, 0x69, 0x41, 0x85, 0x37, 0xa4, 0x64, 0x51, 0xd9, 0xce, 0xa9, 0x62,
-	0xd6, 0x13, 0xbb, 0x61, 0xeb, 0x46, 0x23, 0x25, 0x3d, 0xae, 0x15, 0xe3, 0xb3, 0xa6, 0xdb, 0x11,
-	0x4e, 0x71, 0x4e, 0x28, 0x47, 0x62, 0x8c, 0x39, 0x15, 0x88, 0xd3, 0x57, 0x98, 0xc7, 0x28, 0x66,
-	0x82, 0x40, 0x99, 0x4b, 0xb3, 0xeb, 0x68, 0x83, 0xcd, 0xe0, 0xf9, 0x7f, 0x97, 0xb5, 0x5d, 0x97,
-	0xf5, 0x97, 0xf4, 0x6e, 0x78, 0x6d, 0x45, 0x8c, 0x14, 0x10, 0x2a, 0x7d, 0xd8, 0xc8, 0xbf, 0x8d,
-	0xe3, 0xb0, 0x04, 0x49, 0x51, 0x4c, 0x73, 0xc8, 0x84, 0xb9, 0xa1, 0xfa, 0xf5, 0xe7, 0x71, 0xb4,
-	0xc1, 0xb5, 0x71, 0x3c, 0x59, 0x0a, 0x43, 0xe5, 0x37, 0xde, 0x6a, 0xba, 0xd1, 0x8a, 0x29, 0x0b,
-	0xc9, 0x32, 0x2a, 0xcc, 0xf3, 0x4e, 0x77, 0x70, 0x71, 0xb7, 0xef, 0xd5, 0x3b, 0xe3, 0xad, 0x76,
-	0xc6, 0x1b, 0x36, 0x3b, 0x13, 0x3c, 0x58, 0xf6, 0xe2, 0x47, 0x65, 0x1b, 0xab, 0x2d, 0xba, 0x0d,
-	0x19, 0x93, 0x34, 0x2b, 0xe4, 0x74, 0x51, 0xd9, 0xfd, 0x53, 0xc5, 0x34, 0x89, 0xdd, 0x4f, 0xdf,
-	0x6c, 0x2d, 0xbc, 0x74, 0x22, 0x3c, 0xab, 0xfd, 0xc6, 0x7b, 0x4d, 0xbf, 0xc9, 0x04, 0x2a, 0x28,
-	0xcf, 0x98, 0x10, 0x0c, 0xf2, 0x94, 0x0a, 0x81, 0x0a, 0x80, 0x14, 0x11, 0x4e, 0xd5, 0x09, 0x88,
-	0xe6, 0x38, 0x4a, 0x69, 0x6c, 0xf6, 0x1c, 0x6d, 0x70, 0x21, 0xd8, 0x5d, 0x54, 0xb6, 0x57, 0x9f,
-	0xf3, 0x8f, 0x81, 0x6e, 0x78, 0x83, 0x89, 0xbd, 0x35, 0x70, 0x0f, 0x20, 0x7d, 0xd8, 0x60, 0x8f,
-	0x6a, 0x2a, 0x78, 0x71, 0x34, 0xb3, 0xb4, 0xe3, 0x99, 0xa5, 0x7d, 0x9f, 0x59, 0xda, 0xc7, 0xb9,
-	0xd5, 0x39, 0x9e, 0x5b, 0x9d, 0x2f, 0x73, 0xab, 0xb3, 0x1f, 0xb4, 0x06, 0xdf, 0xbc, 0xce, 0x9d,
-	0x14, 0x47, 0x62, 0x65, 0xf8, 0x2f, 0xef, 0xdc, 0xf3, 0x5f, 0x9f, 0xf5, 0xba, 0xd5, 0x62, 0x44,
-	0x3d, 0xd5, 0xcb, 0xbb, 0x3f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x0a, 0xfa, 0x5f, 0x9a, 0x0c, 0x04,
-	0x00, 0x00,
+	// 552 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x93, 0xb1, 0x6f, 0xd3, 0x4e,
+	0x14, 0xc7, 0xe3, 0x5f, 0xda, 0xe8, 0x57, 0x33, 0x61, 0x81, 0x70, 0x0a, 0xd8, 0x96, 0x91, 0x20,
+	0x12, 0xd4, 0x16, 0x65, 0x02, 0x36, 0x13, 0x60, 0x01, 0x29, 0x38, 0xb0, 0x54, 0x48, 0xa7, 0xf3,
+	0xf9, 0xea, 0x9c, 0x62, 0xfb, 0xb9, 0x77, 0x67, 0x20, 0xac, 0x08, 0x89, 0x91, 0x81, 0x81, 0x3f,
+	0xa9, 0x63, 0x47, 0xc4, 0x60, 0x50, 0xb2, 0x31, 0xa1, 0xfc, 0x05, 0x28, 0x3e, 0x87, 0x26, 0x94,
+	0x8a, 0x6e, 0xf7, 0xde, 0xf7, 0xf3, 0xde, 0xbd, 0xfb, 0xea, 0x9d, 0x7e, 0x13, 0x44, 0x06, 0x82,
+	0x09, 0x9f, 0x40, 0x4e, 0x68, 0x2e, 0x39, 0x96, 0x34, 0xde, 0x49, 0xd9, 0x41, 0xc9, 0x62, 0x26,
+	0x27, 0x7e, 0x81, 0x39, 0xce, 0x84, 0x57, 0x70, 0x90, 0x60, 0x5c, 0x6d, 0x60, 0x6f, 0x15, 0xfe,
+	0xcd, 0x6e, 0x5f, 0x48, 0x20, 0x81, 0x9a, 0xf4, 0x17, 0x27, 0x55, 0xb4, 0xdd, 0x25, 0x75, 0x15,
+	0x52, 0x82, 0x0a, 0x1a, 0xc9, 0x4a, 0x00, 0x92, 0x94, 0xfa, 0x75, 0x14, 0x95, 0xfb, 0x7e, 0x5c,
+	0x72, 0x2c, 0x19, 0xe4, 0x4a, 0x77, 0x7f, 0x6e, 0xea, 0x9d, 0x41, 0x3d, 0x80, 0xb1, 0xa7, 0x5f,
+	0xc2, 0xa5, 0x1c, 0x01, 0x67, 0x6f, 0x69, 0x8c, 0x24, 0x23, 0x63, 0x24, 0x0a, 0x4c, 0x58, 0x9e,
+	0x98, 0x9a, 0xd3, 0xee, 0x6d, 0x04, 0xee, 0xbc, 0xb2, 0xad, 0x09, 0xce, 0xd2, 0x7b, 0xee, 0x29,
+	0xa0, 0x1b, 0x5e, 0x3c, 0x56, 0x9e, 0x33, 0x32, 0x1e, 0xaa, 0xbc, 0xf1, 0x4e, 0xd3, 0xbb, 0x2b,
+	0x35, 0xa2, 0xe0, 0x14, 0xc7, 0x68, 0x1f, 0x13, 0x09, 0x5c, 0x98, 0xff, 0x39, 0xed, 0xde, 0x56,
+	0xf0, 0xf8, 0xb0, 0xb2, 0x5b, 0x5f, 0x2b, 0xfb, 0xb2, 0x7a, 0x80, 0x88, 0xc7, 0x1e, 0x03, 0x3f,
+	0xc3, 0x72, 0xe4, 0x3d, 0xa1, 0x09, 0x26, 0x93, 0x3e, 0x25, 0xf3, 0xca, 0x76, 0x4e, 0x4c, 0xb0,
+	0xde, 0xcd, 0x0d, 0x57, 0x9e, 0x31, 0xac, 0xa5, 0x47, 0x4a, 0x31, 0x3e, 0x69, 0xba, 0x1d, 0xe1,
+	0x14, 0xe7, 0x84, 0x72, 0x24, 0x46, 0x98, 0x53, 0x81, 0x38, 0x7d, 0x8d, 0x79, 0x8c, 0x62, 0x26,
+	0x08, 0x94, 0xb9, 0x34, 0xdb, 0x8e, 0xd6, 0xdb, 0x0a, 0x9e, 0x9e, 0x6d, 0x96, 0xeb, 0x6a, 0x96,
+	0x7f, 0xf4, 0x74, 0xc3, 0x2b, 0x4b, 0x62, 0x58, 0x03, 0x61, 0xad, 0xf7, 0x1b, 0xf9, 0x0f, 0xe3,
+	0x0f, 0x4a, 0x90, 0x14, 0xc5, 0x34, 0x87, 0x4c, 0x98, 0x1b, 0xb5, 0x33, 0x7f, 0x37, 0x7e, 0x15,
+	0x5c, 0x33, 0xfe, 0xd9, 0x42, 0xe8, 0xd7, 0x79, 0xe3, 0xbd, 0xa6, 0x1b, 0x2b, 0x35, 0x65, 0x21,
+	0x59, 0x46, 0x85, 0xb9, 0xe9, 0xb4, 0x7b, 0xe7, 0x76, 0xbb, 0x9e, 0xda, 0x0e, 0x6f, 0xb9, 0x1d,
+	0x5e, 0xbf, 0xd9, 0x8e, 0xe0, 0xfe, 0xc2, 0x80, 0x1f, 0x95, 0x6d, 0x2c, 0xf7, 0xe5, 0x16, 0x64,
+	0x4c, 0xd2, 0xac, 0x90, 0x93, 0x79, 0x65, 0x77, 0x4f, 0x0c, 0xd3, 0x34, 0x76, 0x3f, 0x7f, 0xb3,
+	0xb5, 0xf0, 0xfc, 0xb1, 0xf0, 0x42, 0xe5, 0x8d, 0x0f, 0x9a, 0x7e, 0x83, 0x09, 0x54, 0x50, 0x9e,
+	0x31, 0x21, 0x18, 0xe4, 0x29, 0x15, 0x02, 0x15, 0x00, 0x29, 0x22, 0x9c, 0xd6, 0x37, 0x20, 0x9a,
+	0xe3, 0x28, 0xa5, 0xb1, 0xd9, 0x71, 0xb4, 0xde, 0xff, 0xc1, 0xee, 0xbc, 0xb2, 0x3d, 0x75, 0xcf,
+	0x19, 0x0b, 0xdd, 0xf0, 0x1a, 0x13, 0x83, 0x35, 0x70, 0x00, 0x90, 0x3e, 0x68, 0xb0, 0x87, 0x8a,
+	0x0a, 0x5e, 0x1e, 0x4e, 0x2d, 0xed, 0x68, 0x6a, 0x69, 0xdf, 0xa7, 0x96, 0xf6, 0x71, 0x66, 0xb5,
+	0x8e, 0x66, 0x56, 0xeb, 0xcb, 0xcc, 0x6a, 0xed, 0x05, 0x09, 0x93, 0xa3, 0x32, 0xf2, 0x08, 0x64,
+	0x7e, 0xf3, 0x0f, 0x77, 0x52, 0x1c, 0x89, 0x65, 0xe0, 0xbf, 0xba, 0x7d, 0xd7, 0x7f, 0x73, 0xda,
+	0x3f, 0x96, 0x93, 0x82, 0x8a, 0xa8, 0x53, 0x7b, 0x79, 0xe7, 0x57, 0x00, 0x00, 0x00, 0xff, 0xff,
+	0x2d, 0x6c, 0x62, 0xc6, 0xf6, 0x03, 0x00, 0x00,
 }
 
 func (m *Params) Marshal() (dAtA []byte, err error) {
@@ -455,7 +455,7 @@ func (m *Params) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			var v github_com_cosmos_cosmos_sdk_types.Dec
+			var v cosmossdk_io_math.LegacyDec
 			m.AuthorizedSpreadFactors = append(m.AuthorizedSpreadFactors, v)
 			if err := m.AuthorizedSpreadFactors[len(m.AuthorizedSpreadFactors)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 				return err
diff --git a/x/concentrated-liquidity/types/tx.pb.go b/x/concentrated-liquidity/types/tx.pb.go
index 545051ce379..e15a0cef088 100644
--- a/x/concentrated-liquidity/types/tx.pb.go
+++ b/x/concentrated-liquidity/types/tx.pb.go
@@ -5,6 +5,7 @@ package types
 
 import (
 	context "context"
+	cosmossdk_io_math "cosmossdk.io/math"
 	fmt "fmt"
 	github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types"
 	types "github.com/cosmos/cosmos-sdk/types"
@@ -43,8 +44,8 @@ type MsgCreatePosition struct {
 	// and at a maximum be of length 2 (for a position that straddles the current
 	// tick).
 	TokensProvided  github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,5,rep,name=tokens_provided,json=tokensProvided,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"tokens_provided"`
-	TokenMinAmount0 github_com_cosmos_cosmos_sdk_types.Int   `protobuf:"bytes,6,opt,name=token_min_amount0,json=tokenMinAmount0,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"token_min_amount0" yaml:"token_min_amount0"`
-	TokenMinAmount1 github_com_cosmos_cosmos_sdk_types.Int   `protobuf:"bytes,7,opt,name=token_min_amount1,json=tokenMinAmount1,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"token_min_amount1" yaml:"token_min_amount1"`
+	TokenMinAmount0 cosmossdk_io_math.Int                    `protobuf:"bytes,6,opt,name=token_min_amount0,json=tokenMinAmount0,proto3,customtype=cosmossdk.io/math.Int" json:"token_min_amount0" yaml:"token_min_amount0"`
+	TokenMinAmount1 cosmossdk_io_math.Int                    `protobuf:"bytes,7,opt,name=token_min_amount1,json=tokenMinAmount1,proto3,customtype=cosmossdk.io/math.Int" json:"token_min_amount1" yaml:"token_min_amount1"`
 }
 
 func (m *MsgCreatePosition) Reset()         { *m = MsgCreatePosition{} }
@@ -116,10 +117,10 @@ func (m *MsgCreatePosition) GetTokensProvided() github_com_cosmos_cosmos_sdk_typ
 }
 
 type MsgCreatePositionResponse struct {
-	PositionId       uint64                                 `protobuf:"varint,1,opt,name=position_id,json=positionId,proto3" json:"position_id,omitempty" yaml:"position_id"`
-	Amount0          github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,2,opt,name=amount0,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"amount0" yaml:"amount0"`
-	Amount1          github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,3,opt,name=amount1,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"amount1" yaml:"amount1"`
-	LiquidityCreated github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,5,opt,name=liquidity_created,json=liquidityCreated,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"liquidity_created" yaml:"liquidity_created"`
+	PositionId       uint64                      `protobuf:"varint,1,opt,name=position_id,json=positionId,proto3" json:"position_id,omitempty" yaml:"position_id"`
+	Amount0          cosmossdk_io_math.Int       `protobuf:"bytes,2,opt,name=amount0,proto3,customtype=cosmossdk.io/math.Int" json:"amount0" yaml:"amount0"`
+	Amount1          cosmossdk_io_math.Int       `protobuf:"bytes,3,opt,name=amount1,proto3,customtype=cosmossdk.io/math.Int" json:"amount1" yaml:"amount1"`
+	LiquidityCreated cosmossdk_io_math.LegacyDec `protobuf:"bytes,5,opt,name=liquidity_created,json=liquidityCreated,proto3,customtype=cosmossdk.io/math.LegacyDec" json:"liquidity_created" yaml:"liquidity_created"`
 	// the lower and upper tick are in the response because there are
 	// instances in which multiple ticks represent the same price, so
 	// we may move their provided tick to the canonical tick that represents
@@ -187,19 +188,19 @@ type MsgAddToPosition struct {
 	PositionId uint64 `protobuf:"varint,1,opt,name=position_id,json=positionId,proto3" json:"position_id,omitempty" yaml:"position_id"`
 	Sender     string `protobuf:"bytes,2,opt,name=sender,proto3" json:"sender,omitempty" yaml:"sender"`
 	// amount0 represents the amount of token0 willing to put in.
-	Amount0 github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,3,opt,name=amount0,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"amount0" yaml:"amount_0"`
+	Amount0 cosmossdk_io_math.Int `protobuf:"bytes,3,opt,name=amount0,proto3,customtype=cosmossdk.io/math.Int" json:"amount0" yaml:"amount_0"`
 	// amount1 represents the amount of token1 willing to put in.
-	Amount1 github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,4,opt,name=amount1,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"amount1" yaml:"amount_1"`
+	Amount1 cosmossdk_io_math.Int `protobuf:"bytes,4,opt,name=amount1,proto3,customtype=cosmossdk.io/math.Int" json:"amount1" yaml:"amount_1"`
 	// token_min_amount0 represents the minimum amount of token0 desired from the
 	// new position being created. Note that this field indicates the min amount0
 	// corresponding to the liquidity that is being added, not the total
 	// liquidity of the position.
-	TokenMinAmount0 github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,5,opt,name=token_min_amount0,json=tokenMinAmount0,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"token_min_amount0" yaml:"token_min_amount0"`
+	TokenMinAmount0 cosmossdk_io_math.Int `protobuf:"bytes,5,opt,name=token_min_amount0,json=tokenMinAmount0,proto3,customtype=cosmossdk.io/math.Int" json:"token_min_amount0" yaml:"token_min_amount0"`
 	// token_min_amount1 represents the minimum amount of token1 desired from the
 	// new position being created. Note that this field indicates the min amount1
 	// corresponding to the liquidity that is being added, not the total
 	// liquidity of the position.
-	TokenMinAmount1 github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,6,opt,name=token_min_amount1,json=tokenMinAmount1,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"token_min_amount1" yaml:"token_min_amount1"`
+	TokenMinAmount1 cosmossdk_io_math.Int `protobuf:"bytes,6,opt,name=token_min_amount1,json=tokenMinAmount1,proto3,customtype=cosmossdk.io/math.Int" json:"token_min_amount1" yaml:"token_min_amount1"`
 }
 
 func (m *MsgAddToPosition) Reset()         { *m = MsgAddToPosition{} }
@@ -250,9 +251,9 @@ func (m *MsgAddToPosition) GetSender() string {
 }
 
 type MsgAddToPositionResponse struct {
-	PositionId uint64                                 `protobuf:"varint,1,opt,name=position_id,json=positionId,proto3" json:"position_id,omitempty" yaml:"position_id"`
-	Amount0    github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,2,opt,name=amount0,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"amount0" yaml:"amount0"`
-	Amount1    github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,3,opt,name=amount1,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"amount1" yaml:"amount1"`
+	PositionId uint64                `protobuf:"varint,1,opt,name=position_id,json=positionId,proto3" json:"position_id,omitempty" yaml:"position_id"`
+	Amount0    cosmossdk_io_math.Int `protobuf:"bytes,2,opt,name=amount0,proto3,customtype=cosmossdk.io/math.Int" json:"amount0" yaml:"amount0"`
+	Amount1    cosmossdk_io_math.Int `protobuf:"bytes,3,opt,name=amount1,proto3,customtype=cosmossdk.io/math.Int" json:"amount1" yaml:"amount1"`
 }
 
 func (m *MsgAddToPositionResponse) Reset()         { *m = MsgAddToPositionResponse{} }
@@ -297,9 +298,9 @@ func (m *MsgAddToPositionResponse) GetPositionId() uint64 {
 
 // ===================== MsgWithdrawPosition
 type MsgWithdrawPosition struct {
-	PositionId      uint64                                 `protobuf:"varint,1,opt,name=position_id,json=positionId,proto3" json:"position_id,omitempty" yaml:"position_id"`
-	Sender          string                                 `protobuf:"bytes,2,opt,name=sender,proto3" json:"sender,omitempty" yaml:"sender"`
-	LiquidityAmount github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,3,opt,name=liquidity_amount,json=liquidityAmount,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"liquidity_amount" yaml:"liquidity_amount"`
+	PositionId      uint64                      `protobuf:"varint,1,opt,name=position_id,json=positionId,proto3" json:"position_id,omitempty" yaml:"position_id"`
+	Sender          string                      `protobuf:"bytes,2,opt,name=sender,proto3" json:"sender,omitempty" yaml:"sender"`
+	LiquidityAmount cosmossdk_io_math.LegacyDec `protobuf:"bytes,3,opt,name=liquidity_amount,json=liquidityAmount,proto3,customtype=cosmossdk.io/math.LegacyDec" json:"liquidity_amount" yaml:"liquidity_amount"`
 }
 
 func (m *MsgWithdrawPosition) Reset()         { *m = MsgWithdrawPosition{} }
@@ -350,8 +351,8 @@ func (m *MsgWithdrawPosition) GetSender() string {
 }
 
 type MsgWithdrawPositionResponse struct {
-	Amount0 github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,1,opt,name=amount0,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"amount0" yaml:"amount0"`
-	Amount1 github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,2,opt,name=amount1,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"amount1" yaml:"amount1"`
+	Amount0 cosmossdk_io_math.Int `protobuf:"bytes,1,opt,name=amount0,proto3,customtype=cosmossdk.io/math.Int" json:"amount0" yaml:"amount0"`
+	Amount1 cosmossdk_io_math.Int `protobuf:"bytes,2,opt,name=amount1,proto3,customtype=cosmossdk.io/math.Int" json:"amount1" yaml:"amount1"`
 }
 
 func (m *MsgWithdrawPositionResponse) Reset()         { *m = MsgWithdrawPositionResponse{} }
@@ -706,80 +707,81 @@ func init() {
 }
 
 var fileDescriptor_1f1fff802923d7db = []byte{
-	// 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, 0x04, 0x04, 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, 0x80, 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, 0xac, 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, 0x2d, 0xf9, 0xc1, 0xa9, 0x3f, 0x14, 0x79, 0x4d, 0xa8,
-	0x9b, 0xf7, 0x7f, 0x7b, 0x79, 0xed, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xa6, 0x4e, 0x2a, 0x3e,
-	0x57, 0x12, 0x00, 0x00,
+	// 1174 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x58, 0xcf, 0x6f, 0xe3, 0x44,
+	0x1b, 0xee, 0x34, 0xdd, 0x54, 0x3b, 0xfd, 0xfa, 0x23, 0x6e, 0xb7, 0x4d, 0xd3, 0xfd, 0xe2, 0x32,
+	0x02, 0x91, 0x05, 0x25, 0x6e, 0x16, 0x24, 0xd8, 0x20, 0xed, 0xb2, 0x29, 0x5a, 0x29, 0x2b, 0x22,
+	0x56, 0xde, 0x95, 0x90, 0x10, 0x52, 0xe4, 0x78, 0xa6, 0xee, 0xa8, 0x89, 0x27, 0x78, 0x9c, 0x76,
+	0xfb, 0x17, 0x20, 0x10, 0x07, 0x84, 0xc4, 0x11, 0x04, 0x37, 0xc4, 0x01, 0x21, 0x71, 0xe5, 0xc8,
+	0x61, 0x0f, 0x1c, 0xf6, 0x88, 0x38, 0x18, 0xd4, 0x1e, 0x10, 0x17, 0x0e, 0xb9, 0x23, 0x21, 0x7b,
+	0xec, 0xb1, 0xeb, 0xa4, 0xb4, 0x49, 0xa1, 0x07, 0x2e, 0x6d, 0x3c, 0xf3, 0xbe, 0xcf, 0x3c, 0xf3,
+	0x3c, 0xef, 0xbc, 0x9e, 0x04, 0x3e, 0xcf, 0x78, 0x97, 0x71, 0xca, 0x35, 0x93, 0xd9, 0x26, 0xb1,
+	0x5d, 0xc7, 0x70, 0x09, 0x2e, 0x77, 0xe8, 0x7b, 0x7d, 0x8a, 0xa9, 0x7b, 0xa8, 0xb9, 0x8f, 0x2b,
+	0x3d, 0x87, 0xb9, 0x4c, 0x79, 0x2e, 0x0c, 0xac, 0x24, 0x03, 0x65, 0x5c, 0x65, 0xbf, 0xda, 0x26,
+	0xae, 0x51, 0x2d, 0xac, 0x58, 0xcc, 0x62, 0x41, 0x86, 0xe6, 0x7f, 0x12, 0xc9, 0x85, 0x9c, 0xd1,
+	0xa5, 0x36, 0xd3, 0x82, 0xbf, 0xe1, 0x90, 0x6a, 0x31, 0x66, 0x75, 0x88, 0x16, 0x3c, 0xb5, 0xfb,
+	0x3b, 0x9a, 0x4b, 0xbb, 0x84, 0xbb, 0x46, 0xb7, 0x17, 0x06, 0x14, 0xd3, 0x01, 0xb8, 0xef, 0x18,
+	0x2e, 0x65, 0x76, 0x34, 0x6f, 0x06, 0x8c, 0xb4, 0xb6, 0xc1, 0x89, 0x16, 0x2e, 0xaf, 0x99, 0x8c,
+	0x86, 0xf3, 0xe8, 0xfb, 0x19, 0x98, 0x6b, 0x72, 0x6b, 0xdb, 0x21, 0x86, 0x4b, 0x1e, 0x30, 0x4e,
+	0xfd, 0x5c, 0xe5, 0x45, 0x38, 0xdb, 0x63, 0xac, 0xd3, 0xa2, 0x38, 0x0f, 0x36, 0x41, 0x69, 0xa6,
+	0xae, 0x0c, 0x3c, 0x75, 0xe1, 0xd0, 0xe8, 0x76, 0x6a, 0x28, 0x9c, 0x40, 0x7a, 0xd6, 0xff, 0xd4,
+	0xc0, 0xca, 0x0d, 0x98, 0xe5, 0xc4, 0xc6, 0xc4, 0xc9, 0x4f, 0x6f, 0x82, 0xd2, 0xd5, 0x7a, 0x6e,
+	0xe0, 0xa9, 0xf3, 0x22, 0x56, 0x8c, 0x23, 0x3d, 0x0c, 0x50, 0x5e, 0x86, 0xb0, 0xc3, 0x0e, 0x88,
+	0xd3, 0x72, 0xa9, 0xb9, 0x97, 0xcf, 0x6c, 0x82, 0x52, 0xa6, 0x7e, 0x6d, 0xe0, 0xa9, 0x39, 0x11,
+	0x1e, 0xcf, 0x21, 0xfd, 0x6a, 0xf0, 0xf0, 0x88, 0x9a, 0x7b, 0x7e, 0x56, 0xbf, 0xd7, 0x8b, 0xb2,
+	0x66, 0xd2, 0x59, 0xf1, 0x1c, 0xd2, 0xaf, 0x06, 0x0f, 0x41, 0x96, 0x0b, 0x17, 0x5d, 0xb6, 0x47,
+	0x6c, 0xde, 0xea, 0x39, 0x6c, 0x9f, 0x62, 0x82, 0xf3, 0x57, 0x36, 0x33, 0xa5, 0xb9, 0x9b, 0xeb,
+	0x15, 0xa1, 0x49, 0xc5, 0xd7, 0x24, 0xb2, 0xa4, 0xb2, 0xcd, 0xa8, 0x5d, 0xdf, 0x7a, 0xe2, 0xa9,
+	0x53, 0x5f, 0xff, 0xa2, 0x96, 0x2c, 0xea, 0xee, 0xf6, 0xdb, 0x15, 0x93, 0x75, 0xb5, 0x50, 0x40,
+	0xf1, 0xaf, 0xcc, 0xf1, 0x9e, 0xe6, 0x1e, 0xf6, 0x08, 0x0f, 0x12, 0xb8, 0xbe, 0x20, 0xd6, 0x78,
+	0x10, 0x2e, 0xa1, 0x10, 0x98, 0x0b, 0x46, 0x5a, 0x5d, 0x6a, 0xb7, 0x8c, 0x2e, 0xeb, 0xdb, 0xee,
+	0x56, 0x3e, 0x1b, 0xe8, 0x72, 0xcb, 0x07, 0xff, 0xd9, 0x53, 0xaf, 0x09, 0x28, 0x8e, 0xf7, 0x2a,
+	0x94, 0x69, 0x5d, 0xc3, 0xdd, 0xad, 0x34, 0x6c, 0x77, 0xe0, 0xa9, 0x79, 0xb1, 0x9f, 0xa1, 0x7c,
+	0xa4, 0x8b, 0x9d, 0x34, 0xa9, 0x7d, 0x57, 0x8c, 0x8c, 0x5a, 0xa6, 0x9a, 0x9f, 0xbd, 0xd0, 0x32,
+	0xd5, 0xa1, 0x65, 0xaa, 0x35, 0xf5, 0xc3, 0xdf, 0xbe, 0x7d, 0xa1, 0x20, 0x8b, 0xbf, 0x53, 0x36,
+	0x83, 0x3a, 0x29, 0xf7, 0xc2, 0x42, 0x41, 0x3f, 0x64, 0xe0, 0xfa, 0x50, 0xf9, 0xe8, 0x84, 0xf7,
+	0x98, 0xcd, 0x89, 0xf2, 0x0a, 0x9c, 0x8b, 0x22, 0xe3, 0x52, 0x5a, 0x1d, 0x78, 0xaa, 0x12, 0x95,
+	0x92, 0x9c, 0x44, 0x3a, 0x8c, 0x9e, 0x1a, 0x58, 0x69, 0xc0, 0xd9, 0x48, 0x3b, 0x51, 0x53, 0xda,
+	0x59, 0x9b, 0x0a, 0x8b, 0x53, 0x2a, 0x16, 0xe5, 0xc7, 0x50, 0xd5, 0xa0, 0xde, 0xc6, 0x85, 0xaa,
+	0x4a, 0xa8, 0xaa, 0xd2, 0x81, 0x39, 0x79, 0x94, 0x5b, 0x42, 0x09, 0xbf, 0xa6, 0x7c, 0xd0, 0x3b,
+	0x21, 0xe8, 0xc6, 0x30, 0xe8, 0x9b, 0xc4, 0x32, 0xcc, 0xc3, 0x37, 0x88, 0x19, 0x4b, 0x3f, 0x84,
+	0x82, 0xf4, 0x25, 0x39, 0x26, 0xb4, 0xc4, 0xa9, 0xb3, 0x92, 0x9d, 0xe8, 0xac, 0xcc, 0x9e, 0xef,
+	0xac, 0xa0, 0x3f, 0x33, 0x70, 0xa9, 0xc9, 0xad, 0xbb, 0x18, 0x3f, 0x62, 0xb2, 0x09, 0x4c, 0xec,
+	0xde, 0x18, 0x0d, 0xe1, 0x7e, 0x6c, 0xb4, 0x70, 0x67, 0xeb, 0x2c, 0x77, 0x16, 0x93, 0xee, 0xb4,
+	0x92, 0x4e, 0xdf, 0x8f, 0x9d, 0x9e, 0x99, 0x04, 0x2b, 0x69, 0xf5, 0xc8, 0x63, 0x7c, 0xe5, 0x72,
+	0x8e, 0x71, 0xf6, 0xdf, 0x3f, 0xc6, 0x06, 0xc6, 0x65, 0x97, 0xc5, 0xc7, 0xf8, 0x77, 0x00, 0xf3,
+	0x69, 0xff, 0xff, 0xa3, 0xa7, 0x18, 0xbd, 0x3f, 0x0d, 0x97, 0x9b, 0xdc, 0x7a, 0x9b, 0xba, 0xbb,
+	0xd8, 0x31, 0x0e, 0x2e, 0xb5, 0xdc, 0x29, 0x8c, 0xcf, 0x79, 0xe8, 0x57, 0xb8, 0x9f, 0xdb, 0xe7,
+	0x6b, 0x20, 0x6b, 0xe9, 0x06, 0x22, 0x40, 0x90, 0xbe, 0x28, 0x87, 0x84, 0xe9, 0xb5, 0x67, 0x7c,
+	0xcf, 0xaf, 0x27, 0x3c, 0x3f, 0x08, 0x37, 0x1c, 0xbb, 0xfe, 0x1d, 0x80, 0x1b, 0x23, 0x94, 0x90,
+	0xc6, 0x27, 0xfc, 0x03, 0xff, 0x9c, 0x7f, 0xd3, 0x17, 0xf4, 0xef, 0x0b, 0x00, 0xd7, 0xfc, 0x57,
+	0x0e, 0xeb, 0x74, 0x88, 0xe9, 0x3e, 0xec, 0x39, 0xc4, 0xc0, 0x3a, 0x39, 0x30, 0x1c, 0xcc, 0x95,
+	0x1a, 0xfc, 0x5f, 0xc2, 0x26, 0x9e, 0x07, 0x9b, 0x99, 0xd2, 0x4c, 0x7d, 0x6d, 0xe0, 0xa9, 0xcb,
+	0x43, 0x26, 0x72, 0xa4, 0xcf, 0xc5, 0x2e, 0xf2, 0x31, 0x6c, 0xac, 0x15, 0x7d, 0x6d, 0xd7, 0x93,
+	0xaf, 0x45, 0xd6, 0x29, 0xf3, 0x5e, 0xd9, 0x11, 0x34, 0xd0, 0x8f, 0x00, 0xaa, 0xa7, 0x50, 0x94,
+	0xe2, 0x7e, 0x05, 0x60, 0xde, 0x14, 0x01, 0x04, 0xb7, 0x78, 0x10, 0xd3, 0x0a, 0x01, 0x02, 0xde,
+	0x7f, 0x7b, 0x51, 0x79, 0xe8, 0xcb, 0x37, 0xf0, 0x54, 0x55, 0x10, 0x3c, 0x0d, 0x08, 0x8d, 0x75,
+	0x97, 0x59, 0x95, 0x30, 0x27, 0x28, 0xa3, 0x2f, 0x01, 0x5c, 0x89, 0xb7, 0xd3, 0x08, 0x2e, 0xb6,
+	0x74, 0x9f, 0x5c, 0x9a, 0xdc, 0xc8, 0x97, 0xfb, 0xff, 0x27, 0xe5, 0xf6, 0x99, 0x94, 0xa9, 0xa4,
+	0x82, 0xbc, 0x69, 0x78, 0x7d, 0x14, 0x47, 0xa9, 0xf7, 0x67, 0x00, 0xae, 0xc4, 0x32, 0xc5, 0x99,
+	0x67, 0x6b, 0xfd, 0x56, 0xa8, 0xf5, 0x46, 0x5a, 0xeb, 0xc4, 0xf2, 0x63, 0xe9, 0xbc, 0x2c, 0x21,
+	0x12, 0x5a, 0xfa, 0xfc, 0x76, 0x98, 0xb3, 0x43, 0x68, 0x8a, 0xdf, 0xf4, 0x98, 0xfc, 0x46, 0x81,
+	0x8c, 0xc9, 0x4f, 0x42, 0xc4, 0xfc, 0xd0, 0x37, 0x00, 0x16, 0x9a, 0xdc, 0xba, 0xd7, 0xb7, 0x2d,
+	0xba, 0x73, 0xb8, 0xbd, 0x6b, 0x38, 0x16, 0xc1, 0x51, 0xcb, 0xb8, 0xb4, 0x52, 0xb8, 0xe1, 0x97,
+	0xc2, 0xb3, 0x89, 0x52, 0xd8, 0x11, 0x7c, 0xca, 0xa6, 0x20, 0x24, 0x9b, 0x1b, 0x47, 0xbb, 0x10,
+	0x9d, 0xce, 0x57, 0x96, 0x45, 0x1d, 0x2e, 0xda, 0xe4, 0xa0, 0x35, 0xdc, 0xf9, 0x0b, 0x03, 0x4f,
+	0x5d, 0x15, 0x24, 0x52, 0x01, 0x48, 0x9f, 0xb7, 0x89, 0xec, 0x96, 0x0d, 0x7c, 0xf3, 0x8f, 0x2b,
+	0x30, 0xd3, 0xe4, 0x96, 0xf2, 0x11, 0x80, 0x0b, 0xa9, 0x2f, 0x52, 0xaf, 0x56, 0xce, 0xf5, 0x85,
+	0xb0, 0x32, 0x74, 0x87, 0x2e, 0xbc, 0x3e, 0x69, 0xa6, 0xdc, 0xda, 0x27, 0x00, 0x2e, 0x0d, 0xbd,
+	0xe5, 0x6a, 0xe7, 0x87, 0x4d, 0xe7, 0x16, 0xea, 0x93, 0xe7, 0x4a, 0x52, 0x1f, 0x00, 0x38, 0x9f,
+	0xba, 0x66, 0x9e, 0x1f, 0xf5, 0x44, 0x62, 0xe1, 0xce, 0x84, 0x89, 0x92, 0xcb, 0xe7, 0x00, 0xae,
+	0x8c, 0x7c, 0x8d, 0xdc, 0x1e, 0x43, 0xfb, 0x11, 0xf9, 0x85, 0x7b, 0x17, 0xcb, 0x97, 0x04, 0x3f,
+	0x05, 0x30, 0x37, 0xdc, 0x75, 0x5f, 0x1b, 0x1b, 0x3d, 0x4e, 0x2e, 0x6c, 0x5f, 0x20, 0x39, 0xe2,
+	0x55, 0x7f, 0xf7, 0xc9, 0x51, 0x11, 0x3c, 0x3d, 0x2a, 0x82, 0x5f, 0x8f, 0x8a, 0xe0, 0xe3, 0xe3,
+	0xe2, 0xd4, 0xd3, 0xe3, 0xe2, 0xd4, 0x4f, 0xc7, 0xc5, 0xa9, 0x77, 0xea, 0x89, 0x26, 0x13, 0x2e,
+	0x54, 0xee, 0x18, 0x6d, 0x1e, 0x3d, 0x68, 0xfb, 0xd5, 0x5b, 0xda, 0xe3, 0x53, 0x7f, 0x46, 0xf1,
+	0x9b, 0x50, 0x3b, 0x1b, 0xfc, 0x32, 0xf1, 0xd2, 0x5f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x28, 0x46,
+	0xa1, 0x3c, 0x75, 0x11, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/x/cosmwasmpool/cosmwasm/msg/module_query_msg.pb.go b/x/cosmwasmpool/cosmwasm/msg/module_query_msg.pb.go
index 8dfe7665132..480e28cb1dc 100644
--- a/x/cosmwasmpool/cosmwasm/msg/module_query_msg.pb.go
+++ b/x/cosmwasmpool/cosmwasm/msg/module_query_msg.pb.go
@@ -4,8 +4,8 @@
 package msg
 
 import (
+	cosmossdk_io_math "cosmossdk.io/math"
 	fmt "fmt"
-	github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types"
 	types "github.com/cosmos/cosmos-sdk/types"
 	_ "github.com/gogo/protobuf/gogoproto"
 	proto "github.com/gogo/protobuf/proto"
@@ -32,7 +32,7 @@ type CalcOutAmtGivenIn struct {
 	// token_out_denom is the token denom to be received from the pool.
 	TokenOutDenom string `protobuf:"bytes,2,opt,name=token_out_denom,json=tokenOutDenom,proto3" json:"token_out_denom,omitempty"`
 	// swap_fee is the swap fee for this swap estimate.
-	SwapFee github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,3,opt,name=swap_fee,json=swapFee,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"swap_fee"`
+	SwapFee cosmossdk_io_math.LegacyDec `protobuf:"bytes,3,opt,name=swap_fee,json=swapFee,proto3,customtype=cosmossdk.io/math.LegacyDec" json:"swap_fee"`
 }
 
 func (m *CalcOutAmtGivenIn) Reset()         { *m = CalcOutAmtGivenIn{} }
@@ -180,7 +180,7 @@ type CalcInAmtGivenOut struct {
 	// token_in_denom is the token denom to be sentt to the pool.
 	TokenInDenom string `protobuf:"bytes,2,opt,name=token_in_denom,json=tokenInDenom,proto3" json:"token_in_denom,omitempty"`
 	// swap_fee is the swap fee for this swap estimate.
-	SwapFee github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,3,opt,name=swap_fee,json=swapFee,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"swap_fee"`
+	SwapFee cosmossdk_io_math.LegacyDec `protobuf:"bytes,3,opt,name=swap_fee,json=swapFee,proto3,customtype=cosmossdk.io/math.LegacyDec" json:"swap_fee"`
 }
 
 func (m *CalcInAmtGivenOut) Reset()         { *m = CalcInAmtGivenOut{} }
@@ -335,36 +335,37 @@ func init() {
 }
 
 var fileDescriptor_4e43e2b40a371ec3 = []byte{
-	// 464 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x94, 0x4f, 0x6b, 0x13, 0x41,
-	0x18, 0xc6, 0x33, 0x2a, 0x36, 0x1d, 0xff, 0xd1, 0x45, 0x21, 0x2d, 0xb2, 0x2d, 0x41, 0x4a, 0x2f,
-	0x9d, 0x21, 0x7a, 0xaa, 0x08, 0x62, 0x5a, 0x94, 0x9c, 0x02, 0xb9, 0x48, 0xbd, 0x2c, 0xb3, 0x93,
-	0xd7, 0x75, 0xe9, 0xce, 0xbc, 0xdb, 0xce, 0x4c, 0x6a, 0xcf, 0x7e, 0x01, 0x3f, 0x93, 0xa7, 0x1e,
-	0x7b, 0x14, 0x0f, 0x45, 0x92, 0x2f, 0x22, 0xb3, 0x7f, 0xd2, 0x6c, 0x2a, 0x52, 0x28, 0x5e, 0x92,
-	0xcc, 0xbc, 0xf3, 0x3c, 0xf3, 0x3e, 0xef, 0x2f, 0xbb, 0x74, 0x0f, 0x8d, 0x42, 0x93, 0x1a, 0x2e,
-	0xd1, 0xa8, 0x53, 0x61, 0x54, 0x8e, 0x98, 0xf1, 0x49, 0x2f, 0x06, 0x2b, 0x7a, 0x5c, 0xe1, 0x18,
-	0x32, 0xff, 0xe9, 0x32, 0x88, 0x8e, 0x1d, 0x9c, 0x9c, 0x45, 0xca, 0x24, 0x2c, 0x3f, 0x41, 0x8b,
-	0xc1, 0xf3, 0x4a, 0xca, 0x16, 0xa5, 0xac, 0x92, 0x6e, 0x3c, 0x4d, 0x30, 0xc1, 0xe2, 0x20, 0xf7,
-	0xbf, 0x4a, 0xcd, 0x46, 0x28, 0x0b, 0x11, 0x8f, 0x85, 0x81, 0xf9, 0x2d, 0x12, 0x53, 0x5d, 0xd6,
-	0xbb, 0x3f, 0x08, 0x5d, 0xdb, 0x17, 0x99, 0x1c, 0x3a, 0xfb, 0x4e, 0xd9, 0x0f, 0xe9, 0x04, 0xf4,
-	0x40, 0x07, 0xaf, 0x69, 0xdb, 0xe2, 0x11, 0xe8, 0x28, 0xd5, 0x1d, 0xb2, 0x45, 0x76, 0x1e, 0xbc,
-	0x5c, 0x67, 0xa5, 0x11, 0xf3, 0x46, 0xf5, 0x9d, 0x6c, 0x1f, 0x53, 0xdd, 0xbf, 0x77, 0x7e, 0xb9,
-	0xd9, 0x1a, 0xad, 0x14, 0x82, 0x81, 0x0e, 0xb6, 0xe9, 0x93, 0x52, 0x8b, 0xce, 0x46, 0x63, 0xd0,
-	0xa8, 0x3a, 0x77, 0xb6, 0xc8, 0xce, 0xea, 0xe8, 0x51, 0xb1, 0x3d, 0x74, 0xf6, 0xc0, 0x6f, 0x06,
-	0x03, 0xda, 0x36, 0xa7, 0x22, 0x8f, 0x3e, 0x03, 0x74, 0xee, 0xfa, 0x03, 0x7d, 0xe6, 0x8d, 0x7e,
-	0x5d, 0x6e, 0x6e, 0x27, 0xa9, 0xfd, 0xe2, 0x62, 0x26, 0x51, 0xf1, 0xaa, 0xfd, 0xf2, 0x6b, 0xd7,
-	0x8c, 0x8f, 0xb8, 0x3d, 0xcb, 0xc1, 0xb0, 0x03, 0x90, 0xa3, 0x15, 0xaf, 0x7f, 0x0f, 0xd0, 0xfd,
-	0x46, 0x68, 0xe7, 0x5a, 0x88, 0x11, 0x1c, 0x3b, 0x30, 0x36, 0x48, 0xe8, 0x33, 0x29, 0x32, 0x59,
-	0xb4, 0x23, 0x94, 0x8d, 0x12, 0x5f, 0xbe, 0x0a, 0xc6, 0xd9, 0xbf, 0xa6, 0xca, 0xae, 0xd9, 0x56,
-	0x71, 0xd7, 0xe4, 0x72, 0xa1, 0x7b, 0x48, 0xd7, 0xff, 0xd2, 0x84, 0xc9, 0x51, 0x1b, 0x08, 0xde,
-	0xd0, 0xd5, 0xf9, 0x54, 0x6e, 0x3a, 0xd2, 0x76, 0x3d, 0xb0, 0x39, 0xa5, 0x81, 0xae, 0xad, 0x87,
-	0xce, 0xde, 0xce, 0x33, 0x78, 0x41, 0x1f, 0xd7, 0x8c, 0x1b, 0x98, 0x1e, 0x56, 0x20, 0xff, 0x1b,
-	0xa5, 0x46, 0x88, 0x65, 0x4a, 0xa9, 0x5e, 0x80, 0x74, 0x95, 0xeb, 0x06, 0x94, 0x1a, 0xb6, 0x8b,
-	0x94, 0x1a, 0x85, 0xee, 0xc7, 0x92, 0xd2, 0x52, 0x13, 0x15, 0xa5, 0x5b, 0xfc, 0xef, 0xfb, 0x87,
-	0xe7, 0xd3, 0x90, 0x5c, 0x4c, 0x43, 0xf2, 0x7b, 0x1a, 0x92, 0xef, 0xb3, 0xb0, 0x75, 0x31, 0x0b,
-	0x5b, 0x3f, 0x67, 0x61, 0xeb, 0xd3, 0xdb, 0x85, 0x49, 0x55, 0x31, 0x76, 0x33, 0x11, 0x9b, 0x7a,
-	0xc1, 0x27, 0xbd, 0x3d, 0xfe, 0xb5, 0xf9, 0x42, 0xa8, 0x17, 0x5c, 0x99, 0x24, 0xbe, 0x5f, 0x3c,
-	0xab, 0xaf, 0xfe, 0x04, 0x00, 0x00, 0xff, 0xff, 0xce, 0x9c, 0xb1, 0x03, 0x3c, 0x04, 0x00, 0x00,
+	// 465 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x93, 0x4d, 0x6b, 0x13, 0x41,
+	0x18, 0xc7, 0xb3, 0x2a, 0x36, 0x1d, 0xdf, 0xe8, 0xa2, 0x90, 0x56, 0xd9, 0x96, 0x28, 0xd2, 0x8b,
+	0x33, 0x44, 0x4f, 0x15, 0x51, 0x4c, 0x8b, 0x12, 0x10, 0x02, 0xb9, 0x48, 0xbd, 0x2c, 0xb3, 0x93,
+	0xc7, 0xed, 0xd0, 0x9d, 0x79, 0xd2, 0xce, 0x4c, 0x6a, 0xcf, 0x7e, 0x01, 0xbf, 0x8d, 0x5f, 0xa1,
+	0xc7, 0x1e, 0xc5, 0x43, 0x91, 0xe4, 0x8b, 0xc8, 0xec, 0x4b, 0x9a, 0x4d, 0x45, 0x0a, 0xed, 0x65,
+	0xd9, 0x99, 0x67, 0xfe, 0xff, 0xe7, 0xe5, 0x37, 0x43, 0xb6, 0xd0, 0x28, 0x34, 0xd2, 0x30, 0x81,
+	0x46, 0x1d, 0x71, 0xa3, 0x46, 0x88, 0x19, 0x1b, 0x77, 0x12, 0xb0, 0xbc, 0xc3, 0x14, 0x0e, 0x21,
+	0xf3, 0x5f, 0x97, 0x41, 0x7c, 0xe0, 0xe0, 0xf0, 0x38, 0x56, 0x26, 0xa5, 0xa3, 0x43, 0xb4, 0x18,
+	0x3e, 0x29, 0xa5, 0x74, 0x5e, 0x4a, 0x4b, 0xe9, 0xda, 0xc3, 0x14, 0x53, 0xcc, 0x0f, 0x32, 0xff,
+	0x57, 0x68, 0xd6, 0x22, 0x91, 0x8b, 0x58, 0xc2, 0x0d, 0xcc, 0xb2, 0x08, 0x94, 0xba, 0x88, 0xb7,
+	0x7f, 0x06, 0x64, 0x65, 0x9b, 0x67, 0xa2, 0xef, 0xec, 0x7b, 0x65, 0x3f, 0xca, 0x31, 0xe8, 0x9e,
+	0x0e, 0x5f, 0x93, 0xa6, 0xc5, 0x7d, 0xd0, 0xb1, 0xd4, 0xad, 0x60, 0x23, 0xd8, 0xbc, 0xf3, 0x72,
+	0x95, 0x16, 0x46, 0xd4, 0x1b, 0x55, 0x39, 0xe9, 0x36, 0x4a, 0xdd, 0xbd, 0x75, 0x72, 0xb6, 0xde,
+	0x18, 0x2c, 0xe5, 0x82, 0x9e, 0x0e, 0x9f, 0x93, 0x07, 0x85, 0x16, 0x9d, 0x8d, 0x87, 0xa0, 0x51,
+	0xb5, 0x6e, 0x6c, 0x04, 0x9b, 0xcb, 0x83, 0x7b, 0xf9, 0x76, 0xdf, 0xd9, 0x1d, 0xbf, 0x19, 0xbe,
+	0x25, 0x4d, 0x73, 0xc4, 0x47, 0xf1, 0x57, 0x80, 0xd6, 0x4d, 0x7f, 0xa0, 0xfb, 0xd4, 0x1b, 0xfd,
+	0x3e, 0x5b, 0x7f, 0x5c, 0xa4, 0x32, 0xc3, 0x7d, 0x2a, 0x91, 0x29, 0x6e, 0xf7, 0xe8, 0x27, 0x48,
+	0xb9, 0x38, 0xde, 0x01, 0x31, 0x58, 0xf2, 0xa2, 0x0f, 0x00, 0xed, 0xef, 0x01, 0x69, 0x5d, 0xa8,
+	0x7c, 0x00, 0x07, 0x0e, 0x8c, 0x0d, 0x53, 0xf2, 0x48, 0xf0, 0x4c, 0xe4, 0x35, 0x70, 0x65, 0xe3,
+	0xd4, 0x87, 0xcf, 0xbb, 0x61, 0xf4, 0x7f, 0xa3, 0xa4, 0x17, 0x6c, 0xcb, 0x1e, 0x57, 0xc4, 0x62,
+	0xa0, 0xbd, 0x4b, 0x56, 0xff, 0x51, 0x84, 0x19, 0xa1, 0x36, 0x10, 0xbe, 0x21, 0xcb, 0xb3, 0x51,
+	0x5c, 0x76, 0x8e, 0xcd, 0x6a, 0x4a, 0x33, 0x34, 0x3d, 0x5d, 0x59, 0xf7, 0x9d, 0xbd, 0x9a, 0x67,
+	0xf8, 0x8c, 0xdc, 0xaf, 0xc0, 0xd6, 0xd8, 0xdc, 0x2d, 0xe9, 0x5d, 0x2f, 0x9a, 0x5a, 0xe5, 0x8b,
+	0x68, 0xa4, 0x9e, 0x23, 0x73, 0xde, 0xcc, 0x25, 0xd0, 0xd4, 0x6c, 0xe7, 0xd1, 0xd4, 0x02, 0xed,
+	0xcf, 0x05, 0x9a, 0x85, 0x22, 0x4a, 0x34, 0x57, 0xb8, 0xe1, 0xdd, 0xdd, 0x93, 0x49, 0x14, 0x9c,
+	0x4e, 0xa2, 0xe0, 0xcf, 0x24, 0x0a, 0x7e, 0x4c, 0xa3, 0xc6, 0xe9, 0x34, 0x6a, 0xfc, 0x9a, 0x46,
+	0x8d, 0x2f, 0xef, 0x52, 0x69, 0xf7, 0x5c, 0x42, 0x05, 0x2a, 0x56, 0xb6, 0xf1, 0x22, 0xe3, 0x89,
+	0xa9, 0x16, 0x6c, 0xdc, 0xd9, 0x62, 0xdf, 0xea, 0x4f, 0xbf, 0x5a, 0x30, 0x65, 0xd2, 0xe4, 0x76,
+	0xfe, 0x2a, 0x5f, 0xfd, 0x0d, 0x00, 0x00, 0xff, 0xff, 0xc0, 0x45, 0xe7, 0x44, 0x26, 0x04, 0x00,
+	0x00,
 }
 
 func (m *CalcOutAmtGivenIn) Marshal() (dAtA []byte, err error) {
diff --git a/x/cosmwasmpool/cosmwasm/msg/module_sudo_msg.pb.go b/x/cosmwasmpool/cosmwasm/msg/module_sudo_msg.pb.go
index 2bd3095ed42..cfdd333b857 100644
--- a/x/cosmwasmpool/cosmwasm/msg/module_sudo_msg.pb.go
+++ b/x/cosmwasmpool/cosmwasm/msg/module_sudo_msg.pb.go
@@ -4,8 +4,8 @@
 package msg
 
 import (
+	cosmossdk_io_math "cosmossdk.io/math"
 	fmt "fmt"
-	github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types"
 	types "github.com/cosmos/cosmos-sdk/types"
 	_ "github.com/gogo/protobuf/gogoproto"
 	proto "github.com/gogo/protobuf/proto"
@@ -34,9 +34,9 @@ type SwapExactAmountIn struct {
 	TokenOutDenom string `protobuf:"bytes,3,opt,name=token_out_denom,json=tokenOutDenom,proto3" json:"token_out_denom,omitempty"`
 	// token_out_min_amount is the minimum amount of token_out to be received from
 	// the pool.
-	TokenOutMinAmount github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,4,opt,name=token_out_min_amount,json=tokenOutMinAmount,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"token_out_min_amount"`
+	TokenOutMinAmount cosmossdk_io_math.Int `protobuf:"bytes,4,opt,name=token_out_min_amount,json=tokenOutMinAmount,proto3,customtype=cosmossdk.io/math.Int" json:"token_out_min_amount"`
 	// swap_fee is the swap fee for this swap estimate.
-	SwapFee github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,5,opt,name=swap_fee,json=swapFee,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"swap_fee"`
+	SwapFee cosmossdk_io_math.LegacyDec `protobuf:"bytes,5,opt,name=swap_fee,json=swapFee,proto3,customtype=cosmossdk.io/math.LegacyDec" json:"swap_fee"`
 }
 
 func (m *SwapExactAmountIn) Reset()         { *m = SwapExactAmountIn{} }
@@ -141,7 +141,7 @@ func (m *SwapExactAmountInSudoMsg) GetSwapExactAmountIn() SwapExactAmountIn {
 
 type SwapExactAmountInSudoMsgResponse struct {
 	// token_out_amount is the token out computed from this swap estimate call.
-	TokenOutAmount github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,1,opt,name=token_out_amount,json=tokenOutAmount,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"token_out_amount"`
+	TokenOutAmount cosmossdk_io_math.Int `protobuf:"bytes,1,opt,name=token_out_amount,json=tokenOutAmount,proto3,customtype=cosmossdk.io/math.Int" json:"token_out_amount"`
 }
 
 func (m *SwapExactAmountInSudoMsgResponse) Reset()         { *m = SwapExactAmountInSudoMsgResponse{} }
@@ -186,9 +186,9 @@ type SwapExactAmountOut struct {
 	TokenInDenom string `protobuf:"bytes,3,opt,name=token_in_denom,json=tokenInDenom,proto3" json:"token_in_denom,omitempty"`
 	// token_in_max_amount is the maximum amount of token_in to be sent to the
 	// pool.
-	TokenInMaxAmount github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,4,opt,name=token_in_max_amount,json=tokenInMaxAmount,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"token_in_max_amount"`
+	TokenInMaxAmount cosmossdk_io_math.Int `protobuf:"bytes,4,opt,name=token_in_max_amount,json=tokenInMaxAmount,proto3,customtype=cosmossdk.io/math.Int" json:"token_in_max_amount"`
 	// swap_fee is the swap fee for this swap estimate.
-	SwapFee github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,5,opt,name=swap_fee,json=swapFee,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"swap_fee"`
+	SwapFee cosmossdk_io_math.LegacyDec `protobuf:"bytes,5,opt,name=swap_fee,json=swapFee,proto3,customtype=cosmossdk.io/math.LegacyDec" json:"swap_fee"`
 }
 
 func (m *SwapExactAmountOut) Reset()         { *m = SwapExactAmountOut{} }
@@ -293,7 +293,7 @@ func (m *SwapExactAmountOutSudoMsg) GetSwapExactAmountOut() SwapExactAmountOut {
 
 type SwapExactAmountOutSudoMsgResponse struct {
 	// token_in_amount is the token in computed from this swap estimate call.
-	TokenInAmount github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,1,opt,name=token_in_amount,json=tokenInAmount,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"token_in_amount"`
+	TokenInAmount cosmossdk_io_math.Int `protobuf:"bytes,1,opt,name=token_in_amount,json=tokenInAmount,proto3,customtype=cosmossdk.io/math.Int" json:"token_in_amount"`
 }
 
 func (m *SwapExactAmountOutSudoMsgResponse) Reset()         { *m = SwapExactAmountOutSudoMsgResponse{} }
@@ -343,42 +343,43 @@ func init() {
 }
 
 var fileDescriptor_e3b9879c5388a3a5 = []byte{
-	// 560 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x54, 0x41, 0x6f, 0xd3, 0x30,
-	0x14, 0x6e, 0xca, 0xd8, 0x3a, 0xc3, 0xc6, 0x6a, 0x0a, 0xca, 0x26, 0x94, 0x95, 0x0a, 0x4d, 0xbb,
-	0xcc, 0xa6, 0x70, 0x01, 0x84, 0x84, 0x28, 0x03, 0xa9, 0x87, 0xaa, 0x52, 0x27, 0x21, 0x40, 0x42,
-	0x51, 0x9a, 0x78, 0x21, 0x5a, 0xed, 0x17, 0xcd, 0xce, 0x5a, 0x04, 0x27, 0x0e, 0x9c, 0xf9, 0x3d,
-	0xf0, 0x07, 0x76, 0xdc, 0x11, 0x71, 0x98, 0x50, 0xfb, 0x47, 0x50, 0x62, 0xa7, 0xdd, 0x56, 0x15,
-	0xb1, 0xb1, 0x4b, 0x12, 0xfb, 0xbd, 0xef, 0x7d, 0xef, 0x7d, 0xf9, 0x6c, 0xf4, 0x08, 0x24, 0x07,
-	0x19, 0x49, 0xea, 0x83, 0xe4, 0x7d, 0x4f, 0xf2, 0x18, 0xa0, 0x47, 0x0f, 0xea, 0x5d, 0xa6, 0xbc,
-	0x3a, 0xe5, 0x10, 0xb0, 0x5e, 0xfa, 0x4c, 0x7a, 0xcc, 0x95, 0x49, 0x00, 0x2e, 0x97, 0x21, 0x89,
-	0xf7, 0x41, 0x01, 0xbe, 0x63, 0x90, 0xe4, 0x24, 0x92, 0x18, 0xe4, 0x5a, 0x25, 0x84, 0x10, 0xb2,
-	0x44, 0x9a, 0x7e, 0x69, 0xcc, 0x9a, 0xe3, 0x67, 0x20, 0xda, 0xf5, 0x24, 0x1b, 0x93, 0xf8, 0x10,
-	0x09, 0x1d, 0xaf, 0xfd, 0x28, 0xa2, 0xf2, 0x4e, 0xdf, 0x8b, 0x5f, 0x0e, 0x3c, 0x5f, 0x3d, 0xe7,
-	0x90, 0x08, 0xd5, 0x14, 0xf8, 0x36, 0x9a, 0x97, 0x4c, 0x04, 0x6c, 0xdf, 0xb6, 0xaa, 0xd6, 0xe6,
-	0x62, 0xc7, 0xac, 0xf0, 0x13, 0x54, 0x52, 0xb0, 0xc7, 0x84, 0x1b, 0x09, 0xbb, 0x58, 0xb5, 0x36,
-	0xaf, 0x3d, 0x58, 0x25, 0x9a, 0x80, 0xa4, 0x04, 0x79, 0x2f, 0xe4, 0x05, 0x44, 0xa2, 0x31, 0x77,
-	0x78, 0xbc, 0x5e, 0xe8, 0x2c, 0x64, 0x80, 0xa6, 0xc0, 0x1b, 0xe8, 0x86, 0xc6, 0x42, 0xa2, 0xdc,
-	0x80, 0x09, 0xe0, 0xf6, 0x95, 0xac, 0xf8, 0x52, 0xb6, 0xdd, 0x4e, 0xd4, 0x76, 0xba, 0x89, 0x5d,
-	0x54, 0x99, 0xe4, 0xf1, 0x48, 0xb8, 0x5e, 0xd6, 0x95, 0x3d, 0x97, 0x26, 0x37, 0x48, 0x5a, 0xf4,
-	0xd7, 0xf1, 0xfa, 0x46, 0x18, 0xa9, 0x0f, 0x49, 0x97, 0xf8, 0xc0, 0xa9, 0x19, 0x51, 0xbf, 0xb6,
-	0x64, 0xb0, 0x47, 0xd5, 0xc7, 0x98, 0x49, 0xd2, 0x14, 0xaa, 0x53, 0xce, 0x8b, 0xb7, 0x22, 0xa1,
-	0xc7, 0xc3, 0x4d, 0x54, 0x92, 0x7d, 0x2f, 0x76, 0x77, 0x19, 0xb3, 0xaf, 0x9e, 0xbb, 0xe8, 0x36,
-	0xf3, 0x3b, 0x0b, 0x29, 0xfe, 0x15, 0x63, 0xb5, 0x2f, 0x16, 0xb2, 0xa7, 0xd4, 0xdb, 0x49, 0x02,
-	0x68, 0xc9, 0x10, 0xef, 0xa2, 0x4a, 0xc6, 0xc3, 0xd2, 0xa0, 0x99, 0x22, 0x15, 0xce, 0xca, 0x84,
-	0xa3, 0xe4, 0x6f, 0x7f, 0x93, 0x4c, 0x55, 0x35, 0x72, 0x96, 0xe5, 0xd9, 0x40, 0xed, 0x33, 0xaa,
-	0xce, 0xea, 0xa1, 0xc3, 0x64, 0x0c, 0x42, 0x32, 0xfc, 0x06, 0xad, 0x4c, 0x44, 0x35, 0x82, 0x5a,
-	0x17, 0x12, 0x74, 0x39, 0x17, 0x54, 0x53, 0xd5, 0xbe, 0x17, 0x11, 0x3e, 0x43, 0xdf, 0x4e, 0xd4,
-	0x4c, 0x07, 0x3d, 0x45, 0x8b, 0xe3, 0x46, 0xfe, 0xd5, 0x42, 0xa5, 0x9c, 0x12, 0xdf, 0x43, 0xcb,
-	0xb9, 0xff, 0x4e, 0x59, 0xe8, 0xba, 0x31, 0x99, 0x76, 0xd0, 0x7b, 0x74, 0x73, 0x9c, 0xc5, 0xbd,
-	0xc1, 0xff, 0x19, 0x68, 0xc5, 0x94, 0x6e, 0x79, 0x83, 0xcb, 0xf7, 0xcf, 0x57, 0x0b, 0xad, 0x4e,
-	0x8b, 0x97, 0x1b, 0x28, 0x42, 0xb7, 0xa6, 0x0d, 0x94, 0xea, 0xa6, 0x1d, 0x74, 0xff, 0x5c, 0x0e,
-	0x6a, 0x27, 0xca, 0xc8, 0x89, 0xe5, 0x54, 0xa4, 0xf6, 0x09, 0xdd, 0x9d, 0xd9, 0xc7, 0xd8, 0x44,
-	0xaf, 0xf3, 0x13, 0x3c, 0x39, 0x94, 0x17, 0xf3, 0xd0, 0x92, 0xd1, 0x54, 0x33, 0x35, 0xde, 0x1e,
-	0x0e, 0x1d, 0xeb, 0x68, 0xe8, 0x58, 0xbf, 0x87, 0x8e, 0xf5, 0x6d, 0xe4, 0x14, 0x8e, 0x46, 0x4e,
-	0xe1, 0xe7, 0xc8, 0x29, 0xbc, 0x7b, 0x76, 0xa2, 0xa0, 0x19, 0x76, 0xab, 0xe7, 0x75, 0x65, 0xbe,
-	0xa0, 0x07, 0xf5, 0xc7, 0x74, 0x70, 0xfa, 0x26, 0xcd, 0x17, 0x94, 0xcb, 0xb0, 0x3b, 0x9f, 0xdd,
-	0x72, 0x0f, 0xff, 0x04, 0x00, 0x00, 0xff, 0xff, 0x1b, 0x13, 0xbc, 0xfa, 0x75, 0x05, 0x00, 0x00,
+	// 565 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x54, 0x4f, 0x6f, 0xd3, 0x3e,
+	0x18, 0x6e, 0xf6, 0xdb, 0x6f, 0x7f, 0x0c, 0x1b, 0xab, 0xe9, 0x50, 0x36, 0x20, 0x2b, 0x05, 0xa1,
+	0x5d, 0xb0, 0x29, 0x5c, 0x00, 0x21, 0x10, 0x65, 0x03, 0x55, 0x5a, 0xa9, 0xd4, 0x9d, 0xe0, 0x12,
+	0xb9, 0x89, 0x97, 0x85, 0xd6, 0x7e, 0xab, 0xd9, 0x59, 0xcb, 0x95, 0x03, 0x67, 0x3e, 0x01, 0x7c,
+	0x9d, 0x1d, 0x77, 0x44, 0x1c, 0x26, 0xd4, 0x7e, 0x11, 0x94, 0xc4, 0x69, 0xd9, 0xa2, 0xa2, 0x4e,
+	0xe2, 0x52, 0xd5, 0x7e, 0xdf, 0xe7, 0x79, 0x5e, 0x3f, 0x79, 0x6c, 0xf4, 0x04, 0x94, 0x00, 0x15,
+	0x2a, 0xea, 0x81, 0x12, 0x7d, 0xa6, 0x44, 0x0f, 0xa0, 0x4b, 0x8f, 0xab, 0x6d, 0xae, 0x59, 0x95,
+	0x0a, 0xf0, 0x79, 0x37, 0xfe, 0x8d, 0xba, 0xdc, 0x55, 0x91, 0x0f, 0xae, 0x50, 0x01, 0xe9, 0x1d,
+	0x81, 0x06, 0x7c, 0xcb, 0x20, 0xc9, 0x9f, 0x48, 0x62, 0x90, 0x9b, 0xa5, 0x00, 0x02, 0x48, 0x1a,
+	0x69, 0xfc, 0x2f, 0xc5, 0x6c, 0x3a, 0x5e, 0x02, 0xa2, 0x6d, 0xa6, 0xf8, 0x58, 0xc4, 0x83, 0x50,
+	0xa6, 0xf5, 0xca, 0xf7, 0x39, 0x54, 0xdc, 0xef, 0xb3, 0xde, 0xee, 0x80, 0x79, 0xfa, 0x95, 0x80,
+	0x48, 0xea, 0xba, 0xc4, 0x37, 0xd0, 0x82, 0xe2, 0xd2, 0xe7, 0x47, 0xb6, 0x55, 0xb6, 0xb6, 0x97,
+	0x5b, 0x66, 0x85, 0x9f, 0xa1, 0x25, 0x0d, 0x1d, 0x2e, 0xdd, 0x50, 0xda, 0x73, 0x65, 0x6b, 0xfb,
+	0xca, 0xa3, 0x0d, 0x92, 0x0a, 0x90, 0x58, 0x20, 0x9b, 0x85, 0xbc, 0x86, 0x50, 0xd6, 0xe6, 0x4f,
+	0xce, 0xb6, 0x0a, 0xad, 0xc5, 0x04, 0x50, 0x97, 0xf8, 0x3e, 0xba, 0x96, 0x62, 0x21, 0xd2, 0xae,
+	0xcf, 0x25, 0x08, 0xfb, 0xbf, 0x84, 0x7c, 0x25, 0xd9, 0x6e, 0x46, 0x7a, 0x27, 0xde, 0xc4, 0xef,
+	0x50, 0x69, 0xd2, 0x27, 0x42, 0xe9, 0xb2, 0x64, 0x2a, 0x7b, 0x3e, 0x6e, 0xae, 0xdd, 0x8e, 0x49,
+	0x7f, 0x9e, 0x6d, 0xad, 0xa7, 0xb2, 0xca, 0xef, 0x90, 0x10, 0xa8, 0x60, 0xfa, 0x90, 0xd4, 0xa5,
+	0x6e, 0x15, 0x33, 0xae, 0x46, 0x28, 0xd3, 0xd3, 0xe0, 0x17, 0x68, 0x49, 0xf5, 0x59, 0xcf, 0x3d,
+	0xe0, 0xdc, 0xfe, 0x3f, 0xe1, 0xb8, 0x6b, 0x38, 0x6e, 0xe6, 0x39, 0xf6, 0x78, 0xc0, 0xbc, 0x4f,
+	0x3b, 0xdc, 0x6b, 0x2d, 0xc6, 0xa0, 0x37, 0x9c, 0x57, 0x3e, 0x5b, 0xc8, 0xce, 0x39, 0xb4, 0x1f,
+	0xf9, 0xd0, 0x50, 0x01, 0x3e, 0x40, 0xa5, 0x84, 0x9c, 0xc7, 0x45, 0x33, 0x69, 0x6c, 0x8e, 0x95,
+	0x98, 0x43, 0xc9, 0xdf, 0xbe, 0x18, 0xc9, 0xb1, 0x1a, 0xcb, 0x8a, 0xea, 0x62, 0xa1, 0xd2, 0x41,
+	0xe5, 0x69, 0x33, 0xb4, 0xb8, 0xea, 0x81, 0x54, 0x1c, 0xbf, 0x45, 0x6b, 0x13, 0xe3, 0x8c, 0x69,
+	0xd6, 0x2c, 0xa6, 0xad, 0x66, 0xa6, 0xa5, 0xcc, 0x95, 0x6f, 0x73, 0x08, 0x5f, 0x50, 0x6b, 0x46,
+	0x7a, 0x6a, 0x28, 0x9e, 0xa3, 0xe5, 0xb1, 0xee, 0xac, 0xa9, 0x58, 0xca, 0x24, 0xf1, 0x3d, 0xb4,
+	0x9a, 0x45, 0xea, 0x5c, 0x2a, 0xae, 0x9a, 0xdc, 0xa4, 0xa1, 0xd8, 0x43, 0xd7, 0xc7, 0x5d, 0x82,
+	0x0d, 0x2e, 0x95, 0x89, 0x35, 0xc3, 0xd4, 0x60, 0x83, 0x7f, 0x14, 0x89, 0x2f, 0x16, 0xda, 0xc8,
+	0x1b, 0x94, 0x65, 0x22, 0x44, 0xeb, 0xf9, 0x4c, 0xc4, 0xde, 0xa4, 0xa1, 0x78, 0x78, 0xa9, 0x50,
+	0x34, 0x23, 0x6d, 0x2c, 0xc3, 0x2a, 0x57, 0xa9, 0x7c, 0x44, 0x77, 0xa6, 0xce, 0x31, 0xce, 0xc5,
+	0x6e, 0x76, 0xf1, 0x26, 0x77, 0x69, 0xa6, 0x58, 0xac, 0x18, 0xdf, 0x52, 0xe2, 0xda, 0xfb, 0x93,
+	0xa1, 0x63, 0x9d, 0x0e, 0x1d, 0xeb, 0xd7, 0xd0, 0xb1, 0xbe, 0x8e, 0x9c, 0xc2, 0xe9, 0xc8, 0x29,
+	0xfc, 0x18, 0x39, 0x85, 0x0f, 0x2f, 0x83, 0x50, 0x1f, 0x46, 0x6d, 0xe2, 0x81, 0xa0, 0xe6, 0x6c,
+	0x0f, 0xba, 0xac, 0xad, 0xb2, 0x05, 0x3d, 0xae, 0x3e, 0xa5, 0x83, 0xf3, 0xef, 0x5d, 0xb6, 0xa0,
+	0x42, 0x05, 0xed, 0x85, 0xe4, 0x2d, 0x7a, 0xfc, 0x3b, 0x00, 0x00, 0xff, 0xff, 0x13, 0x86, 0x28,
+	0x1a, 0x1b, 0x05, 0x00, 0x00,
 }
 
 func (m *SwapExactAmountIn) Marshal() (dAtA []byte, err error) {
diff --git a/x/cosmwasmpool/cosmwasm/msg/pool_query_msg.pb.go b/x/cosmwasmpool/cosmwasm/msg/pool_query_msg.pb.go
index 096553a4684..c0961145a7c 100644
--- a/x/cosmwasmpool/cosmwasm/msg/pool_query_msg.pb.go
+++ b/x/cosmwasmpool/cosmwasm/msg/pool_query_msg.pb.go
@@ -4,8 +4,8 @@
 package msg
 
 import (
+	cosmossdk_io_math "cosmossdk.io/math"
 	fmt "fmt"
-	github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types"
 	types "github.com/cosmos/cosmos-sdk/types"
 	_ "github.com/gogo/protobuf/gogoproto"
 	proto "github.com/gogo/protobuf/proto"
@@ -73,7 +73,7 @@ func (m *GetSwapFeeQueryMsg) GetGetSwapFee() EmptyStruct {
 
 type GetSwapFeeQueryMsgResponse struct {
 	// swap_fee is the swap fee for this swap estimate.
-	SwapFee github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,3,opt,name=swap_fee,json=swapFee,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"swap_fee"`
+	SwapFee cosmossdk_io_math.LegacyDec `protobuf:"bytes,3,opt,name=swap_fee,json=swapFee,proto3,customtype=cosmossdk.io/math.LegacyDec" json:"swap_fee"`
 }
 
 func (m *GetSwapFeeQueryMsgResponse) Reset()         { *m = GetSwapFeeQueryMsgResponse{} }
@@ -495,40 +495,40 @@ func init() {
 
 var fileDescriptor_3251d17e76ef0dc1 = []byte{
 	// 544 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x94, 0xc1, 0x6e, 0xd3, 0x4c,
-	0x10, 0xc7, 0xe3, 0xaf, 0x9f, 0x00, 0x4f, 0x4a, 0x69, 0xad, 0x82, 0xda, 0x8a, 0xba, 0xc5, 0x12,
-	0x10, 0x90, 0xea, 0x55, 0xcb, 0x01, 0xc1, 0x05, 0x91, 0x16, 0x2a, 0xa4, 0x22, 0x35, 0x09, 0x97,
-	0x72, 0xb1, 0x36, 0xce, 0xb2, 0xb1, 0xb0, 0x33, 0x4e, 0x66, 0xd3, 0x10, 0xde, 0x80, 0x1b, 0x8f,
-	0xd5, 0x63, 0x8f, 0x88, 0x43, 0x85, 0x92, 0x17, 0x41, 0xeb, 0x38, 0x9b, 0x44, 0x29, 0x39, 0xf4,
-	0x94, 0xec, 0xec, 0xfc, 0xf7, 0x37, 0xff, 0x99, 0xf5, 0xc2, 0x4b, 0xa4, 0x04, 0x29, 0x22, 0x16,
-	0x22, 0x25, 0x3d, 0x4e, 0x49, 0x8a, 0x18, 0xb3, 0xf3, 0xfd, 0xba, 0x50, 0x7c, 0x9f, 0x25, 0xd8,
-	0x10, 0x31, 0xd3, 0xa1, 0xa0, 0xdd, 0x15, 0x9d, 0x7e, 0x90, 0x90, 0xf4, 0xd3, 0x0e, 0x2a, 0x74,
-	0x1e, 0xe6, 0x42, 0x7f, 0x5a, 0xe8, 0xe7, 0xc2, 0xad, 0x75, 0x89, 0x12, 0xb3, 0x44, 0xa6, 0xff,
-	0x8d, 0x34, 0x5b, 0x6e, 0x98, 0x89, 0x58, 0x9d, 0x93, 0x30, 0x8c, 0x10, 0xa3, 0xd6, 0x68, 0xdf,
-	0x93, 0xe0, 0x1c, 0x0b, 0x55, 0xeb, 0xf1, 0xf4, 0xbd, 0x10, 0x15, 0x0d, 0xfc, 0x48, 0xd2, 0xa9,
-	0xc0, 0xb2, 0x14, 0x2a, 0xa0, 0x1e, 0x4f, 0x83, 0x2f, 0x42, 0x6c, 0x58, 0xbb, 0x56, 0xa9, 0x78,
-	0xf0, 0xcc, 0x5f, 0x54, 0x80, 0xff, 0x2e, 0x49, 0x55, 0xbf, 0xa6, 0x3a, 0xdd, 0x50, 0x95, 0xff,
-	0xbf, 0xb8, 0xda, 0x29, 0x54, 0x41, 0x9a, 0xa3, 0x3d, 0x09, 0x5b, 0xf3, 0xa0, 0xaa, 0xa0, 0x14,
-	0x5b, 0x24, 0x9c, 0x0f, 0x70, 0xc7, 0xc0, 0x96, 0x76, 0xad, 0x92, 0x5d, 0xf6, 0xf5, 0x09, 0xbf,
-	0xaf, 0x76, 0x9e, 0xc8, 0x48, 0x35, 0xbb, 0x75, 0x3f, 0xc4, 0x84, 0xe5, 0x5e, 0x46, 0x3f, 0x7b,
-	0xd4, 0xf8, 0xca, 0x54, 0x3f, 0x15, 0xe4, 0x1f, 0x89, 0xb0, 0x7a, 0x9b, 0x72, 0x10, 0x07, 0xbb,
-	0x96, 0xa2, 0x3a, 0xed, 0x44, 0xa1, 0x70, 0x9e, 0xc3, 0x5a, 0xbb, 0x8b, 0x4a, 0x04, 0x9c, 0x48,
-	0xa8, 0xa0, 0x21, 0x5a, 0x98, 0x64, 0x6e, 0xec, 0xea, 0xbd, 0x6c, 0xe3, 0xad, 0x8e, 0x1f, 0xe9,
-	0xb0, 0x53, 0x82, 0x55, 0xdd, 0xa5, 0x99, 0xd4, 0xff, 0xb2, 0xd4, 0x15, 0x1d, 0x9f, 0x64, 0x7a,
-	0x1c, 0xd6, 0x0c, 0xc2, 0xf4, 0xec, 0x04, 0x80, 0x52, 0x54, 0x41, 0xaa, 0xa3, 0x79, 0xc7, 0x9e,
-	0x2e, 0xee, 0x98, 0x39, 0x24, 0xef, 0x97, 0x4d, 0xe3, 0x80, 0xf7, 0x1a, 0x36, 0xe7, 0x10, 0xa6,
-	0x5b, 0xdb, 0x73, 0x28, 0x7b, 0x5a, 0x7b, 0x17, 0x8a, 0x53, 0xb3, 0xf0, 0x7e, 0x58, 0xb0, 0x7d,
-	0x2c, 0xd4, 0x27, 0x54, 0x3c, 0x3e, 0x45, 0x8c, 0x4f, 0xa2, 0x76, 0x37, 0x6a, 0x44, 0xaa, 0x6f,
-	0x4a, 0x6f, 0xc2, 0x86, 0x1e, 0xb7, 0xd2, 0x19, 0x41, 0x76, 0xf5, 0xe2, 0x71, 0xce, 0x4d, 0x47,
-	0x7f, 0x5f, 0x5e, 0x47, 0xf4, 0xbe, 0xc3, 0xe3, 0x85, 0xa5, 0x18, 0x8b, 0x15, 0x58, 0xff, 0x47,
-	0x39, 0x4b, 0xa5, 0xe2, 0xc1, 0xa6, 0x3f, 0xba, 0x03, 0xbe, 0x1e, 0x8c, 0xa9, 0xe2, 0x10, 0xa3,
-	0x56, 0x8e, 0x77, 0xd4, 0x3c, 0x9b, 0xe0, 0xc1, 0x98, 0x5d, 0x6b, 0xf2, 0x8e, 0x20, 0xe3, 0xff,
-	0x0c, 0x56, 0x27, 0xfe, 0x29, 0xdb, 0xbb, 0xa9, 0xef, 0x15, 0x39, 0x83, 0xf0, 0x0e, 0xc1, 0xbd,
-	0x1e, 0x6a, 0x9c, 0x3e, 0x82, 0xe5, 0x39, 0xb0, 0x5d, 0x2d, 0xaa, 0x89, 0xa4, 0x7c, 0x76, 0x31,
-	0x70, 0xad, 0xcb, 0x81, 0x6b, 0xfd, 0x19, 0xb8, 0xd6, 0xcf, 0xa1, 0x5b, 0xb8, 0x1c, 0xba, 0x85,
-	0x5f, 0x43, 0xb7, 0xf0, 0xf9, 0xcd, 0xd4, 0xd7, 0x91, 0x57, 0xba, 0x17, 0xf3, 0x3a, 0x8d, 0x17,
-	0xec, 0x7c, 0xff, 0x15, 0xfb, 0x36, 0xfb, 0xd2, 0x8c, 0x17, 0x2c, 0x21, 0x59, 0xbf, 0x95, 0x3d,
-	0x03, 0x2f, 0xfe, 0x06, 0x00, 0x00, 0xff, 0xff, 0x5f, 0xed, 0x81, 0xec, 0x95, 0x04, 0x00, 0x00,
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x94, 0xc1, 0x6e, 0xd3, 0x40,
+	0x10, 0x86, 0x63, 0x8a, 0x00, 0x4f, 0x4a, 0x69, 0xad, 0x82, 0xda, 0x40, 0xdd, 0x62, 0x84, 0x08,
+	0x48, 0xd8, 0x4a, 0x39, 0x20, 0x38, 0x80, 0x48, 0x0b, 0xbd, 0x04, 0xa9, 0x49, 0xb8, 0x14, 0x21,
+	0x59, 0x1b, 0x67, 0xd9, 0x58, 0xd8, 0x19, 0x27, 0xb3, 0x69, 0x08, 0x6f, 0xc0, 0x8d, 0xc7, 0xea,
+	0xb1, 0x47, 0xc4, 0xa1, 0x42, 0xc9, 0x8b, 0xa0, 0x75, 0x9c, 0x4d, 0xa2, 0x94, 0x1c, 0x7a, 0xcb,
+	0xce, 0xce, 0x3f, 0xdf, 0xfc, 0x33, 0x1b, 0xc3, 0x4b, 0xa4, 0x18, 0x29, 0x24, 0x2f, 0x40, 0x8a,
+	0xfb, 0x8c, 0xe2, 0x04, 0x31, 0xf2, 0x4e, 0x4b, 0x0d, 0x2e, 0x59, 0xc9, 0x8b, 0xb1, 0xc9, 0x23,
+	0x4f, 0x85, 0xfc, 0x4e, 0x8f, 0x77, 0x07, 0x7e, 0x4c, 0xc2, 0x4d, 0xba, 0x28, 0xd1, 0x7a, 0x90,
+	0x09, 0xdd, 0x59, 0xa1, 0x9b, 0x09, 0x0b, 0x9b, 0x02, 0x05, 0xa6, 0x89, 0x9e, 0xfa, 0x35, 0xd6,
+	0x14, 0xec, 0x20, 0x15, 0x79, 0x0d, 0x46, 0x5c, 0x33, 0x02, 0x0c, 0xdb, 0xe3, 0x7b, 0x47, 0x80,
+	0x75, 0xc4, 0x65, 0xbd, 0xcf, 0x92, 0x0f, 0x9c, 0x57, 0x15, 0xf0, 0x23, 0x09, 0xab, 0x0a, 0xab,
+	0x82, 0x4b, 0x9f, 0xfa, 0x2c, 0xf1, 0xbf, 0x72, 0xbe, 0x65, 0xec, 0x19, 0xc5, 0xfc, 0xfe, 0x53,
+	0x77, 0x59, 0x03, 0xee, 0xfb, 0x38, 0x91, 0x83, 0xba, 0xec, 0xf6, 0x02, 0x59, 0xbe, 0x7e, 0x76,
+	0xb1, 0x9b, 0xab, 0x81, 0xd0, 0xa5, 0x9d, 0x2f, 0x50, 0x58, 0x04, 0xd5, 0x38, 0x25, 0xd8, 0x26,
+	0x6e, 0xbd, 0x81, 0x5b, 0x1a, 0xb6, 0xb2, 0x67, 0x14, 0xcd, 0xf2, 0x23, 0x55, 0xe1, 0xcf, 0xc5,
+	0xee, 0xfd, 0xb1, 0x01, 0x6a, 0x7e, 0x73, 0x43, 0xf4, 0x62, 0x26, 0x5b, 0x6e, 0x85, 0x0b, 0x16,
+	0x0c, 0x0e, 0x79, 0x50, 0xbb, 0x49, 0x59, 0x75, 0x06, 0x66, 0x3d, 0x41, 0x79, 0xdc, 0x0d, 0x03,
+	0x6e, 0x3d, 0x83, 0x8d, 0x4e, 0x0f, 0x25, 0xf7, 0x19, 0x11, 0x97, 0x7e, 0x93, 0xb7, 0x31, 0x4e,
+	0x2d, 0x98, 0xb5, 0x3b, 0xe9, 0xc5, 0x3b, 0x15, 0x3f, 0x54, 0x61, 0xab, 0x08, 0xeb, 0x6a, 0x34,
+	0x73, 0xa9, 0xd7, 0xd2, 0xd4, 0x35, 0x15, 0x9f, 0x66, 0x3a, 0x0c, 0x36, 0x34, 0x42, 0x0f, 0xaa,
+	0x02, 0x40, 0x09, 0x4a, 0x3f, 0x51, 0xd1, 0x6c, 0x4c, 0x4f, 0x96, 0x8f, 0x49, 0x17, 0xc9, 0x86,
+	0x64, 0xd2, 0x24, 0xe0, 0xbc, 0x86, 0xed, 0x05, 0x84, 0x1e, 0xd1, 0xce, 0x02, 0xca, 0x9c, 0xd5,
+	0xde, 0x86, 0xfc, 0xcc, 0x02, 0x9c, 0x9f, 0x06, 0xec, 0x1c, 0x71, 0xf9, 0x09, 0x25, 0x8b, 0x8e,
+	0x11, 0xa3, 0x4a, 0xd8, 0xe9, 0x85, 0xcd, 0x50, 0x0e, 0x74, 0xeb, 0x2d, 0xd8, 0x52, 0x3b, 0x96,
+	0x2a, 0xc3, 0x4f, 0xdf, 0x5b, 0x34, 0xc9, 0xb9, 0xea, 0xbe, 0xef, 0x8a, 0xcb, 0x88, 0xce, 0x0f,
+	0x78, 0xbc, 0xb4, 0x15, 0x6d, 0xb1, 0x0a, 0x9b, 0xff, 0x69, 0x67, 0xa5, 0x98, 0xdf, 0xdf, 0x76,
+	0xc7, 0x4f, 0xc1, 0x55, 0x8b, 0xd1, 0x5d, 0x1c, 0x60, 0xd8, 0xce, 0xf0, 0x96, 0x5c, 0x64, 0x13,
+	0xdc, 0x9b, 0xb0, 0xeb, 0x2d, 0xd6, 0xe5, 0xa4, 0xfd, 0x9f, 0xc0, 0xfa, 0xd4, 0x3f, 0xa5, 0x77,
+	0x57, 0xf5, 0xbd, 0x26, 0xe6, 0x10, 0xce, 0x01, 0xd8, 0x97, 0x43, 0xb5, 0xd3, 0x87, 0xb0, 0xba,
+	0x00, 0x36, 0x6b, 0x79, 0x39, 0x95, 0x94, 0x4f, 0xce, 0x86, 0xb6, 0x71, 0x3e, 0xb4, 0x8d, 0xbf,
+	0x43, 0xdb, 0xf8, 0x35, 0xb2, 0x73, 0xe7, 0x23, 0x3b, 0xf7, 0x7b, 0x64, 0xe7, 0x3e, 0xbf, 0x15,
+	0xa1, 0x6c, 0xf5, 0x1a, 0x6e, 0x80, 0xb1, 0x97, 0x75, 0xfa, 0x3c, 0x62, 0x0d, 0x9a, 0x1c, 0xbc,
+	0xd3, 0xd2, 0x2b, 0xef, 0xfb, 0xfc, 0xe7, 0x65, 0x72, 0xf0, 0x62, 0x12, 0x8d, 0x1b, 0xe9, 0x7f,
+	0xff, 0xc5, 0xbf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x24, 0x73, 0x88, 0x87, 0x8a, 0x04, 0x00, 0x00,
 }
 
 func (m *GetSwapFeeQueryMsg) Marshal() (dAtA []byte, err error) {
diff --git a/x/epochs/go.mod b/x/epochs/go.mod
index de4bd290b70..ad810b4098a 100644
--- a/x/epochs/go.mod
+++ b/x/epochs/go.mod
@@ -8,7 +8,7 @@ require (
 	github.com/golang/protobuf v1.5.3
 	github.com/gorilla/mux v1.8.0
 	github.com/grpc-ecosystem/grpc-gateway v1.16.0
-	github.com/osmosis-labs/osmosis/osmoutils v0.0.0-20230510161551-8bf252f26bae
+	github.com/osmosis-labs/osmosis/osmoutils v0.0.7-0.20230901175805-bab180bc078b
 	github.com/spf13/cobra v1.7.0
 	github.com/stretchr/testify v1.8.4
 	github.com/tendermint/tendermint v0.37.0-rc1
diff --git a/x/gamm/pool-models/balancer/balancerPool.pb.go b/x/gamm/pool-models/balancer/balancerPool.pb.go
index cde215b1858..b703a5c5d6a 100644
--- a/x/gamm/pool-models/balancer/balancerPool.pb.go
+++ b/x/gamm/pool-models/balancer/balancerPool.pb.go
@@ -9,9 +9,9 @@
 package balancer
 
 import (
+	cosmossdk_io_math "cosmossdk.io/math"
 	fmt "fmt"
 	_ "github.com/cosmos/cosmos-proto"
-	github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types"
 	types1 "github.com/cosmos/cosmos-sdk/types"
 	_ "github.com/cosmos/cosmos-sdk/types/tx/amino"
 	_ "github.com/cosmos/cosmos-sdk/x/auth/types"
@@ -135,12 +135,12 @@ func (m *SmoothWeightChangeParams) GetTargetPoolWeights() []PoolAsset {
 // governance. Instead they will be managed by the token holders of the pool.
 // The pool's token holders are specified in future_pool_governor.
 type PoolParams struct {
-	SwapFee github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,1,opt,name=swap_fee,json=swapFee,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"swap_fee" yaml:"swap_fee"`
+	SwapFee cosmossdk_io_math.LegacyDec `protobuf:"bytes,1,opt,name=swap_fee,json=swapFee,proto3,customtype=cosmossdk.io/math.LegacyDec" json:"swap_fee" yaml:"swap_fee"`
 	// N.B.: exit fee is disabled during pool creation in x/poolmanager. While old
 	// pools can maintain a non-zero fee. No new pool can be created with non-zero
 	// fee anymore
-	ExitFee                  github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,2,opt,name=exit_fee,json=exitFee,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"exit_fee" yaml:"exit_fee"`
-	SmoothWeightChangeParams *SmoothWeightChangeParams              `protobuf:"bytes,3,opt,name=smooth_weight_change_params,json=smoothWeightChangeParams,proto3" json:"smooth_weight_change_params,omitempty" yaml:"smooth_weight_change_params"`
+	ExitFee                  cosmossdk_io_math.LegacyDec `protobuf:"bytes,2,opt,name=exit_fee,json=exitFee,proto3,customtype=cosmossdk.io/math.LegacyDec" json:"exit_fee" yaml:"exit_fee"`
+	SmoothWeightChangeParams *SmoothWeightChangeParams   `protobuf:"bytes,3,opt,name=smooth_weight_change_params,json=smoothWeightChangeParams,proto3" json:"smooth_weight_change_params,omitempty" yaml:"smooth_weight_change_params"`
 }
 
 func (m *PoolParams) Reset()         { *m = PoolParams{} }
@@ -192,7 +192,7 @@ type PoolAsset struct {
 	// the denomination must be unique amongst all PoolAssets for this pool.
 	Token types1.Coin `protobuf:"bytes,1,opt,name=token,proto3" json:"token" yaml:"token"`
 	// Weight that is not normalized. This weight must be less than 2^50
-	Weight github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,2,opt,name=weight,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"weight" yaml:"weight"`
+	Weight cosmossdk_io_math.Int `protobuf:"bytes,2,opt,name=weight,proto3,customtype=cosmossdk.io/math.Int" json:"weight" yaml:"weight"`
 }
 
 func (m *PoolAsset) Reset()         { *m = PoolAsset{} }
@@ -255,7 +255,7 @@ type Pool struct {
 	// They contain the pool asset and the information about the weight
 	PoolAssets []PoolAsset `protobuf:"bytes,6,rep,name=pool_assets,json=poolAssets,proto3" json:"pool_assets" yaml:"pool_assets"`
 	// sum of all non-normalized pool weights
-	TotalWeight github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,7,opt,name=total_weight,json=totalWeight,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"total_weight" yaml:"total_weight"`
+	TotalWeight cosmossdk_io_math.Int `protobuf:"bytes,7,opt,name=total_weight,json=totalWeight,proto3,customtype=cosmossdk.io/math.Int" json:"total_weight" yaml:"total_weight"`
 }
 
 func (m *Pool) Reset()      { *m = Pool{} }
@@ -302,62 +302,62 @@ func init() {
 }
 
 var fileDescriptor_7e991f749f68c2a4 = []byte{
-	// 867 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0x4f, 0x8f, 0xdb, 0x44,
-	0x14, 0x8f, 0x37, 0xd9, 0x4d, 0x77, 0x52, 0x8a, 0x76, 0x9a, 0x83, 0x93, 0x15, 0x99, 0xd5, 0x80,
-	0x50, 0x55, 0x35, 0xb6, 0x52, 0xb8, 0xb0, 0x97, 0xaa, 0x6e, 0x0b, 0xea, 0xad, 0xb8, 0x48, 0xa5,
-	0xa8, 0x92, 0x35, 0x49, 0x26, 0xb6, 0x55, 0xdb, 0x63, 0x79, 0x26, 0x69, 0xf7, 0x1b, 0xa0, 0x9e,
-	0x7a, 0x2c, 0xb7, 0xde, 0xb9, 0x70, 0xe0, 0x43, 0xac, 0xe0, 0x52, 0x89, 0x0b, 0xe2, 0x60, 0xd0,
-	0xee, 0x01, 0x89, 0x63, 0x3e, 0x01, 0x9a, 0x3f, 0xce, 0x9f, 0x25, 0x11, 0xad, 0x7a, 0x49, 0x66,
-	0xde, 0xbc, 0xf7, 0x7b, 0xbf, 0xf7, 0xde, 0x6f, 0xc6, 0xe0, 0x73, 0xc6, 0x53, 0xc6, 0x63, 0xee,
-	0x86, 0x24, 0x4d, 0xdd, 0x9c, 0xb1, 0xa4, 0x9f, 0xb2, 0x31, 0x4d, 0xb8, 0x3b, 0x24, 0x09, 0xc9,
-	0x46, 0xb4, 0x58, 0x2c, 0x1e, 0x30, 0x96, 0x38, 0x79, 0xc1, 0x04, 0x83, 0x6d, 0x13, 0xe5, 0xc8,
-	0x28, 0x67, 0x36, 0x18, 0x52, 0x41, 0x06, 0xdd, 0xce, 0x48, 0x99, 0x03, 0xe5, 0xe3, 0xea, 0x8d,
-	0x0e, 0xe8, 0xb6, 0x43, 0x16, 0x32, 0x6d, 0x97, 0x2b, 0x63, 0x3d, 0x20, 0x69, 0x9c, 0x31, 0x57,
-	0xfd, 0x1a, 0x53, 0x2f, 0x64, 0x2c, 0x4c, 0xa8, 0xab, 0x76, 0xc3, 0xe9, 0xc4, 0x1d, 0x4f, 0x0b,
-	0x22, 0x62, 0x96, 0x99, 0x73, 0x74, 0xf1, 0x5c, 0xc4, 0x29, 0xe5, 0x82, 0xa4, 0x79, 0x05, 0xa0,
-	0xf3, 0xba, 0x64, 0x2a, 0x22, 0xd7, 0x30, 0x53, 0x9b, 0x0b, 0xe7, 0x43, 0xc2, 0xe9, 0xe2, 0x7c,
-	0xc4, 0x62, 0x93, 0x00, 0xff, 0x5a, 0x07, 0xf6, 0xc3, 0x94, 0x31, 0x11, 0x3d, 0xa2, 0x71, 0x18,
-	0x89, 0x3b, 0x11, 0xc9, 0x42, 0xfa, 0x80, 0x14, 0x24, 0xe5, 0xf0, 0x5b, 0x00, 0xb8, 0x20, 0x85,
-	0x08, 0x64, 0x56, 0xdb, 0x3a, 0xb2, 0xae, 0xb5, 0x6e, 0x76, 0x1d, 0x4d, 0xc9, 0xa9, 0x28, 0x39,
-	0xdf, 0x54, 0x94, 0xbc, 0x8f, 0x4e, 0x4b, 0x54, 0x9b, 0x97, 0xe8, 0xe0, 0x84, 0xa4, 0xc9, 0x31,
-	0x5e, 0xc6, 0xe2, 0x97, 0x7f, 0x22, 0xcb, 0xdf, 0x57, 0x06, 0xe9, 0x0e, 0x23, 0x70, 0xa9, 0xaa,
-	0xd4, 0xde, 0x51, 0xb8, 0x9d, 0xff, 0xe0, 0xde, 0x35, 0x0e, 0xde, 0x40, 0xc2, 0xfe, 0x53, 0x22,
-	0x58, 0x85, 0xdc, 0x60, 0x69, 0x2c, 0x68, 0x9a, 0x8b, 0x93, 0x79, 0x89, 0x3e, 0xd4, 0xc9, 0xaa,
-	0x33, 0xfc, 0x4a, 0xa6, 0x5a, 0xa0, 0xc3, 0x19, 0x68, 0xc7, 0x59, 0x2c, 0x62, 0x92, 0x04, 0x72,
-	0xdc, 0xc1, 0x33, 0x55, 0x26, 0xb7, 0xeb, 0x47, 0xf5, 0x6b, 0xad, 0x9b, 0xc8, 0xd9, 0x34, 0x5a,
-	0x47, 0xce, 0xfe, 0x36, 0xe7, 0x54, 0x78, 0x1f, 0x9b, 0x92, 0x0e, 0x75, 0x96, 0x4d, 0x50, 0xd8,
-	0x87, 0xc6, 0x2c, 0xc3, 0x74, 0x1b, 0x39, 0xe4, 0xe0, 0xaa, 0x20, 0x45, 0x48, 0xc5, 0x7a, 0xda,
-	0xc6, 0xdb, 0xa5, 0xc5, 0x26, 0x6d, 0x57, 0xa7, 0xdd, 0x80, 0x84, 0xfd, 0x03, 0x6d, 0x5d, 0x49,
-	0x8a, 0x5f, 0xd4, 0x01, 0x90, 0x7b, 0x33, 0xbf, 0x27, 0xe0, 0x12, 0x7f, 0x46, 0xf2, 0x60, 0x42,
-	0xf5, 0xf4, 0xf6, 0xbd, 0xdb, 0x12, 0xf7, 0x8f, 0x12, 0x7d, 0x1a, 0xc6, 0x22, 0x9a, 0x0e, 0x9d,
-	0x11, 0x4b, 0x8d, 0x72, 0xcd, 0x5f, 0x9f, 0x8f, 0x9f, 0xba, 0xe2, 0x24, 0xa7, 0xdc, 0xb9, 0x4b,
-	0x47, 0xcb, 0xf6, 0x56, 0x38, 0xd8, 0x6f, 0xca, 0xe5, 0x97, 0x94, 0x4a, 0x74, 0xfa, 0x3c, 0x16,
-	0x0a, 0x7d, 0xe7, 0xfd, 0xd0, 0x2b, 0x1c, 0xec, 0x37, 0xe5, 0x52, 0xa2, 0xff, 0x60, 0x81, 0x43,
-	0xae, 0x84, 0x69, 0x2a, 0x0e, 0x46, 0x4a, 0x9a, 0x41, 0xae, 0x6a, 0xb3, 0xeb, 0x4a, 0x35, 0xce,
-	0xe6, 0x46, 0x6e, 0x53, 0xb4, 0x77, 0xfd, 0xb4, 0x44, 0xd6, 0xbc, 0x44, 0xd8, 0x54, 0xb5, 0x3d,
-	0x01, 0xf6, 0x6d, 0xbe, 0x05, 0xe5, 0xf8, 0x93, 0x17, 0x7f, 0xff, 0x74, 0x1d, 0xad, 0x3d, 0x25,
-	0xde, 0xca, 0xab, 0xa1, 0xbd, 0xf0, 0x8f, 0x16, 0xd8, 0x5f, 0x4c, 0x14, 0xde, 0x03, 0xbb, 0x82,
-	0x3d, 0xa5, 0x99, 0xb9, 0x46, 0x1d, 0xc7, 0x3c, 0x18, 0xf2, 0x62, 0x2e, 0x78, 0xdf, 0x61, 0x71,
-	0xe6, 0xb5, 0xcd, 0xec, 0x2f, 0x9b, 0xd9, 0xcb, 0x28, 0xec, 0xeb, 0x68, 0xf8, 0x08, 0xec, 0x69,
-	0xb6, 0xa6, 0xe5, 0xb7, 0xde, 0xa1, 0xe5, 0xf7, 0x33, 0x31, 0x2f, 0xd1, 0x07, 0x1a, 0x56, 0xa3,
-	0x60, 0xdf, 0xc0, 0xe1, 0xdf, 0x1a, 0xa0, 0x21, 0xd9, 0xc2, 0x1b, 0xa0, 0x49, 0xc6, 0xe3, 0x82,
-	0x72, 0x6e, 0x34, 0x03, 0xe7, 0x25, 0xba, 0xa2, 0x83, 0xcc, 0x01, 0xf6, 0x2b, 0x17, 0x78, 0x05,
-	0xec, 0xc4, 0x63, 0xc5, 0xa5, 0xe1, 0xef, 0xc4, 0x63, 0x38, 0x01, 0x2d, 0xa5, 0xd2, 0xb5, 0x29,
-	0x1d, 0x6d, 0x97, 0xbb, 0x99, 0xcb, 0x85, 0x6b, 0x56, 0xbd, 0xc1, 0xc1, 0x0a, 0x16, 0xf6, 0x41,
-	0xbe, 0x94, 0xf6, 0xd7, 0xa0, 0x3d, 0x99, 0x8a, 0x69, 0x41, 0xb5, 0x4b, 0xc8, 0x66, 0xb4, 0xc8,
-	0x58, 0x61, 0x37, 0x14, 0x65, 0xb4, 0x84, 0xda, 0xe4, 0x85, 0x7d, 0xa8, 0xcd, 0x92, 0xc1, 0x57,
-	0xc6, 0x08, 0x1f, 0x83, 0xcb, 0x82, 0x09, 0x92, 0x04, 0x3c, 0x22, 0x05, 0xe5, 0xf6, 0xee, 0xff,
-	0x0d, 0xea, 0xd0, 0x90, 0xbe, 0x5a, 0x0d, 0x6a, 0x19, 0x8c, 0xfd, 0x96, 0xda, 0x3e, 0x54, 0x3b,
-	0xf8, 0xc4, 0x74, 0x85, 0x48, 0x29, 0x70, 0x7b, 0xef, 0xed, 0x1e, 0x81, 0xae, 0xc1, 0x87, 0x1a,
-	0x7f, 0x05, 0xc1, 0xf4, 0x42, 0xb9, 0x71, 0x18, 0x55, 0xc4, 0x8d, 0x32, 0x9a, 0xaa, 0x07, 0xf7,
-	0xde, 0x59, 0x19, 0x6b, 0x75, 0x54, 0xfa, 0xd0, 0x75, 0xe8, 0x4b, 0x70, 0xec, 0x7e, 0xff, 0x1a,
-	0xd5, 0x5e, 0xbd, 0x46, 0xb5, 0x5f, 0x7e, 0xee, 0xef, 0x4a, 0xa2, 0xf7, 0xe5, 0x4d, 0xe8, 0x6c,
-	0xbd, 0x09, 0xde, 0xe3, 0xd3, 0xb3, 0x9e, 0xf5, 0xe6, 0xac, 0x67, 0xfd, 0x75, 0xd6, 0xb3, 0x5e,
-	0x9e, 0xf7, 0x6a, 0x6f, 0xce, 0x7b, 0xb5, 0xdf, 0xcf, 0x7b, 0xb5, 0xef, 0x6e, 0xad, 0xd0, 0x32,
-	0xf1, 0xfd, 0x84, 0x0c, 0x79, 0xb5, 0x71, 0x67, 0x83, 0x2f, 0xdc, 0xe7, 0xdb, 0xbf, 0xd3, 0xc3,
-	0x3d, 0xf5, 0xa1, 0xf8, 0xec, 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x9d, 0x13, 0x7c, 0x51, 0xd3,
-	0x07, 0x00, 0x00,
+	// 870 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x55, 0x4d, 0x8f, 0xdb, 0x44,
+	0x18, 0x8e, 0xb3, 0xd9, 0xdd, 0xee, 0x6c, 0x29, 0xda, 0x69, 0x90, 0x9c, 0x44, 0x64, 0x56, 0x03,
+	0x87, 0xaa, 0xea, 0xda, 0x4a, 0xa9, 0x90, 0xd8, 0x0b, 0xc2, 0x2d, 0x45, 0x95, 0x38, 0x14, 0x17,
+	0xa9, 0x14, 0x21, 0x59, 0x93, 0x64, 0x62, 0x8f, 0x6a, 0x7b, 0x22, 0xcf, 0x24, 0xed, 0xfe, 0x03,
+	0xc4, 0xa9, 0xc7, 0xc2, 0xa9, 0x3f, 0x81, 0x03, 0xbf, 0x80, 0xd3, 0x0a, 0x2e, 0x3d, 0x22, 0x0e,
+	0x06, 0xed, 0x1e, 0x90, 0x38, 0x46, 0xfc, 0x00, 0x34, 0x1f, 0xce, 0xc7, 0x36, 0x51, 0xab, 0x5e,
+	0x22, 0xcf, 0x3b, 0xef, 0xf3, 0xbc, 0xcf, 0xbc, 0xef, 0x33, 0x13, 0x70, 0x8b, 0x8b, 0x8c, 0x0b,
+	0x26, 0xfc, 0x98, 0x64, 0x99, 0x3f, 0xe6, 0x3c, 0x3d, 0xca, 0xf8, 0x90, 0xa6, 0xc2, 0xef, 0x93,
+	0x94, 0xe4, 0x03, 0x5a, 0xcc, 0x3f, 0xee, 0x73, 0x9e, 0x7a, 0xe3, 0x82, 0x4b, 0x0e, 0x9b, 0x16,
+	0xe5, 0x29, 0x94, 0x37, 0xed, 0xf5, 0xa9, 0x24, 0xbd, 0x76, 0x6b, 0xa0, 0xc3, 0x91, 0xce, 0xf1,
+	0xcd, 0xc2, 0x00, 0xda, 0xcd, 0x98, 0xc7, 0xdc, 0xc4, 0xd5, 0x97, 0x8d, 0x1e, 0x90, 0x8c, 0xe5,
+	0xdc, 0xd7, 0xbf, 0x36, 0xd4, 0x8d, 0x39, 0x8f, 0x53, 0xea, 0xeb, 0x55, 0x7f, 0x32, 0xf2, 0x87,
+	0x93, 0x82, 0x48, 0xc6, 0x73, 0xbb, 0x8f, 0x2e, 0xee, 0x4b, 0x96, 0x51, 0x21, 0x49, 0x36, 0xae,
+	0x08, 0x4c, 0x5d, 0x9f, 0x4c, 0x64, 0xe2, 0x5b, 0x65, 0x7a, 0x71, 0x61, 0xbf, 0x4f, 0x04, 0x9d,
+	0xef, 0x0f, 0x38, 0xb3, 0x05, 0xf0, 0xef, 0x5b, 0xc0, 0x7d, 0x90, 0x71, 0x2e, 0x93, 0x87, 0x94,
+	0xc5, 0x89, 0xbc, 0x9d, 0x90, 0x3c, 0xa6, 0xf7, 0x49, 0x41, 0x32, 0x01, 0xbf, 0x01, 0x40, 0x48,
+	0x52, 0xc8, 0x48, 0x55, 0x75, 0x9d, 0x43, 0xe7, 0xda, 0xfe, 0xcd, 0xb6, 0x67, 0x24, 0x79, 0x95,
+	0x24, 0xef, 0xeb, 0x4a, 0x52, 0xf0, 0xfe, 0x69, 0x89, 0x6a, 0xb3, 0x12, 0x1d, 0x9c, 0x90, 0x2c,
+	0x3d, 0xc6, 0x0b, 0x2c, 0x7e, 0xf6, 0x17, 0x72, 0xc2, 0x3d, 0x1d, 0x50, 0xe9, 0x30, 0x01, 0x97,
+	0xaa, 0x93, 0xba, 0x75, 0xcd, 0xdb, 0x7a, 0x85, 0xf7, 0x8e, 0x4d, 0x08, 0x7a, 0x8a, 0xf6, 0xdf,
+	0x12, 0xc1, 0x0a, 0x72, 0x83, 0x67, 0x4c, 0xd2, 0x6c, 0x2c, 0x4f, 0x66, 0x25, 0x7a, 0xd7, 0x14,
+	0xab, 0xf6, 0xf0, 0x73, 0x55, 0x6a, 0xce, 0x0e, 0xa7, 0xa0, 0xc9, 0x72, 0x26, 0x19, 0x49, 0x23,
+	0x35, 0xee, 0xe8, 0x89, 0x3e, 0xa6, 0x70, 0xb7, 0x0e, 0xb7, 0xae, 0xed, 0xdf, 0x44, 0xde, 0xba,
+	0xd1, 0x7a, 0x6a, 0xf6, 0x9f, 0x09, 0x41, 0x65, 0xf0, 0x81, 0x3d, 0x52, 0xc7, 0x54, 0x59, 0x47,
+	0x85, 0x43, 0x68, 0xc3, 0x0a, 0x66, 0xda, 0x28, 0xa0, 0x00, 0x57, 0x25, 0x29, 0x62, 0x2a, 0x57,
+	0xcb, 0x36, 0xde, 0xac, 0x2c, 0xb6, 0x65, 0xdb, 0xa6, 0xec, 0x1a, 0x26, 0x1c, 0x1e, 0x98, 0xe8,
+	0x52, 0x51, 0xfc, 0x5f, 0x1d, 0x00, 0xb5, 0xb6, 0xf3, 0xfb, 0x0a, 0x5c, 0x12, 0x4f, 0xc8, 0x38,
+	0x1a, 0x51, 0x33, 0xbd, 0xbd, 0xe0, 0x63, 0xc5, 0xfb, 0x67, 0x89, 0x3a, 0xc6, 0x16, 0x62, 0xf8,
+	0xd8, 0x63, 0xdc, 0xcf, 0x88, 0x4c, 0xbc, 0x2f, 0x69, 0x4c, 0x06, 0x27, 0x77, 0xe8, 0x60, 0xd1,
+	0xd3, 0x0a, 0x8c, 0xc3, 0x5d, 0xf5, 0x79, 0x97, 0x52, 0x45, 0x49, 0x9f, 0x32, 0xa9, 0x29, 0xeb,
+	0x6f, 0x41, 0x59, 0x81, 0x71, 0xb8, 0xab, 0x3e, 0x15, 0xe5, 0x8f, 0x0e, 0xe8, 0x08, 0x6d, 0x41,
+	0x7b, 0xb6, 0x68, 0xa0, 0x4d, 0x18, 0x8d, 0xf5, 0x29, 0xdc, 0x2d, 0xed, 0x0f, 0x6f, 0x7d, 0xcb,
+	0x36, 0x79, 0x37, 0xb8, 0x7e, 0x5a, 0x22, 0x67, 0x56, 0x22, 0x6c, 0x8f, 0xb2, 0xb9, 0x00, 0x0e,
+	0x5d, 0xb1, 0x81, 0xe5, 0xf8, 0xc3, 0x1f, 0xfe, 0xf9, 0xf9, 0x3a, 0x5a, 0x79, 0x34, 0x82, 0xa5,
+	0xf7, 0xc1, 0x64, 0xe1, 0x9f, 0x1c, 0xb0, 0x37, 0x9f, 0x1d, 0xfc, 0x1c, 0x6c, 0x4b, 0xfe, 0x98,
+	0xe6, 0xf6, 0xc2, 0xb4, 0x3c, 0xfb, 0x34, 0xa8, 0x2b, 0x38, 0xd7, 0x7d, 0x9b, 0xb3, 0x3c, 0x68,
+	0xda, 0x29, 0x5f, 0xb6, 0x53, 0x56, 0x28, 0x1c, 0x1a, 0x34, 0xbc, 0x0b, 0x76, 0x8c, 0x5a, 0xdb,
+	0x67, 0xcf, 0xf6, 0xf9, 0xbd, 0x57, 0xfb, 0x7c, 0x2f, 0x97, 0xb3, 0x12, 0xbd, 0x63, 0x58, 0x0c,
+	0x08, 0x87, 0x16, 0x8d, 0x7f, 0x6d, 0x80, 0x86, 0x12, 0x07, 0x6f, 0x80, 0x5d, 0x32, 0x1c, 0x16,
+	0x54, 0x08, 0x6b, 0x06, 0x38, 0x2b, 0xd1, 0x15, 0x03, 0xb2, 0x1b, 0x38, 0xac, 0x52, 0xe0, 0x15,
+	0x50, 0x67, 0x43, 0x5d, 0xba, 0x11, 0xd6, 0xd9, 0x10, 0x8e, 0xc0, 0xbe, 0xb6, 0xdf, 0xca, 0x50,
+	0x0e, 0x37, 0xfb, 0xd8, 0x8e, 0xe1, 0xc2, 0xfd, 0xa9, 0x1e, 0xd7, 0x68, 0x89, 0x0b, 0x87, 0x60,
+	0xbc, 0xec, 0xd9, 0xe6, 0x68, 0x22, 0x27, 0x05, 0x35, 0x29, 0x31, 0x9f, 0xd2, 0x22, 0xe7, 0x85,
+	0xdb, 0xd0, 0x92, 0xd1, 0x82, 0x6a, 0x5d, 0x16, 0x0e, 0xa1, 0x09, 0x2b, 0x05, 0x5f, 0xd8, 0x20,
+	0x7c, 0x04, 0x2e, 0x4b, 0x2e, 0x49, 0x1a, 0x89, 0x84, 0x14, 0x54, 0xb8, 0xdb, 0xaf, 0x9b, 0x4b,
+	0xc7, 0x8a, 0xbe, 0x5a, 0xcd, 0x65, 0x01, 0xc6, 0xe1, 0xbe, 0x5e, 0x3e, 0xd0, 0x2b, 0xf8, 0x9d,
+	0xed, 0x0a, 0x51, 0x93, 0x17, 0xee, 0xce, 0x9b, 0xdd, 0xee, 0xb6, 0xe5, 0x87, 0x86, 0x7f, 0x89,
+	0xc1, 0xf6, 0x42, 0xa7, 0x09, 0xf8, 0xb0, 0x12, 0x6e, 0x8d, 0xb0, 0xab, 0x7b, 0x70, 0xeb, 0x75,
+	0x46, 0x58, 0x91, 0x5d, 0xd9, 0xc1, 0xc8, 0x36, 0x16, 0x3f, 0xf6, 0xbf, 0x7f, 0x81, 0x6a, 0xcf,
+	0x5f, 0xa0, 0xda, 0x6f, 0xbf, 0x1c, 0x6d, 0x2b, 0x5d, 0xf7, 0x94, 0xcf, 0x5b, 0x1b, 0x7d, 0x1e,
+	0x3c, 0x3a, 0x3d, 0xeb, 0x3a, 0x2f, 0xcf, 0xba, 0xce, 0xdf, 0x67, 0x5d, 0xe7, 0xd9, 0x79, 0xb7,
+	0xf6, 0xf2, 0xbc, 0x5b, 0xfb, 0xe3, 0xbc, 0x5b, 0xfb, 0xf6, 0xd3, 0x98, 0xc9, 0x64, 0xd2, 0xf7,
+	0x06, 0x3c, 0xf3, 0x2d, 0xfe, 0x28, 0x25, 0x7d, 0x51, 0x2d, 0xfc, 0x69, 0xef, 0x13, 0xff, 0xe9,
+	0xe6, 0xff, 0xdb, 0xfe, 0x8e, 0x7e, 0xf0, 0x3f, 0xfa, 0x3f, 0x00, 0x00, 0xff, 0xff, 0x7c, 0xcf,
+	0x58, 0x0b, 0x9b, 0x07, 0x00, 0x00,
 }
 
 func (m *SmoothWeightChangeParams) Marshal() (dAtA []byte, err error) {
diff --git a/x/gamm/pool-models/stableswap/stableswap_pool.pb.go b/x/gamm/pool-models/stableswap/stableswap_pool.pb.go
index 7303599c3f7..f236a5adc7b 100644
--- a/x/gamm/pool-models/stableswap/stableswap_pool.pb.go
+++ b/x/gamm/pool-models/stableswap/stableswap_pool.pb.go
@@ -4,6 +4,7 @@
 package stableswap
 
 import (
+	cosmossdk_io_math "cosmossdk.io/math"
 	fmt "fmt"
 	_ "github.com/cosmos/cosmos-proto"
 	github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types"
@@ -34,11 +35,11 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
 // governance. Instead they will be managed by the token holders of the pool.
 // The pool's token holders are specified in future_pool_governor.
 type PoolParams struct {
-	SwapFee github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,1,opt,name=swap_fee,json=swapFee,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"swap_fee" yaml:"swap_fee"`
+	SwapFee cosmossdk_io_math.LegacyDec `protobuf:"bytes,1,opt,name=swap_fee,json=swapFee,proto3,customtype=cosmossdk.io/math.LegacyDec" json:"swap_fee" yaml:"swap_fee"`
 	// N.B.: exit fee is disabled during pool creation in x/poolmanager. While old
 	// pools can maintain a non-zero fee. No new pool can be created with non-zero
 	// fee anymore
-	ExitFee github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,2,opt,name=exit_fee,json=exitFee,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"exit_fee" yaml:"exit_fee"`
+	ExitFee cosmossdk_io_math.LegacyDec `protobuf:"bytes,2,opt,name=exit_fee,json=exitFee,proto3,customtype=cosmossdk.io/math.LegacyDec" json:"exit_fee" yaml:"exit_fee"`
 }
 
 func (m *PoolParams) Reset()         { *m = PoolParams{} }
@@ -140,50 +141,50 @@ func init() {
 }
 
 var fileDescriptor_ae0f054436f9999a = []byte{
-	// 676 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x54, 0xcf, 0x4f, 0xd4, 0x4c,
-	0x18, 0xde, 0xc2, 0xc2, 0xf2, 0x0d, 0xdf, 0xb7, 0xe4, 0xab, 0x24, 0x16, 0x88, 0x9d, 0xa5, 0x11,
-	0xb2, 0x21, 0x6e, 0xeb, 0x6a, 0x62, 0x02, 0x37, 0x16, 0x83, 0x31, 0x31, 0x06, 0xcb, 0xc9, 0x1f,
-	0xc9, 0x3a, 0x6d, 0x67, 0xcb, 0xc4, 0x76, 0xa7, 0x76, 0xa6, 0x08, 0x17, 0xcf, 0xc6, 0x93, 0x47,
-	0x8f, 0x9c, 0x3d, 0x79, 0xf0, 0x8f, 0x20, 0x7a, 0xe1, 0x68, 0x3c, 0x54, 0x03, 0x07, 0xaf, 0x66,
-	0xff, 0x02, 0x33, 0xd3, 0xd9, 0x5d, 0x16, 0x95, 0x90, 0x78, 0xd9, 0x9d, 0xf7, 0x7d, 0x9f, 0xf7,
-	0x79, 0x7f, 0x3d, 0x29, 0x58, 0xa5, 0x2c, 0xa6, 0x8c, 0x30, 0x27, 0x44, 0x71, 0xec, 0x24, 0x94,
-	0x46, 0x8d, 0x98, 0x06, 0x38, 0x62, 0x0e, 0xe3, 0xc8, 0x8b, 0x30, 0x7b, 0x81, 0x92, 0x53, 0xcf,
-	0xb6, 0x40, 0xd8, 0x49, 0x4a, 0x39, 0xd5, 0x57, 0x54, 0xaa, 0x2d, 0x52, 0x6d, 0x11, 0x28, 0x32,
-	0xed, 0x21, 0xdc, 0xde, 0x6d, 0x7a, 0x98, 0xa3, 0xe6, 0xfc, 0x9c, 0x2f, 0xc1, 0x6d, 0x99, 0xe9,
-	0x14, 0x46, 0x41, 0x33, 0x3f, 0x1b, 0xd2, 0x90, 0x16, 0x7e, 0xf1, 0x52, 0xde, 0xff, 0x51, 0x4c,
-	0xba, 0xd4, 0x91, 0xbf, 0xca, 0x65, 0x86, 0x94, 0x86, 0x11, 0x76, 0xa4, 0xe5, 0x65, 0x1d, 0x27,
-	0xc8, 0x52, 0xc4, 0x09, 0xed, 0xaa, 0x38, 0x3c, 0x1b, 0xe7, 0x24, 0xc6, 0x8c, 0xa3, 0x38, 0xe9,
-	0x13, 0x14, 0x75, 0x1d, 0x94, 0xf1, 0x1d, 0x47, 0x75, 0x26, 0x8d, 0x33, 0x71, 0x0f, 0x31, 0x3c,
-	0x88, 0xfb, 0x94, 0xa8, 0x02, 0xd6, 0x0f, 0x0d, 0x80, 0x2d, 0x4a, 0xa3, 0x2d, 0x94, 0xa2, 0x98,
-	0xe9, 0x4f, 0xc0, 0x94, 0x5c, 0x49, 0x07, 0x63, 0x43, 0xab, 0x69, 0xf5, 0x7f, 0x5a, 0xeb, 0x87,
-	0x39, 0x2c, 0x7d, 0xc9, 0xe1, 0x72, 0x48, 0xf8, 0x4e, 0xe6, 0xd9, 0x3e, 0x8d, 0xd5, 0xac, 0xea,
-	0xaf, 0xc1, 0x82, 0x67, 0x0e, 0xdf, 0x4f, 0x30, 0xb3, 0x6f, 0x63, 0xbf, 0x97, 0xc3, 0x99, 0x7d,
-	0x14, 0x47, 0x6b, 0x56, 0x9f, 0xc7, 0x72, 0x2b, 0xe2, 0xb9, 0x89, 0xb1, 0x60, 0xc7, 0x7b, 0x84,
-	0x4b, 0xf6, 0xb1, 0xbf, 0x63, 0xef, 0xf3, 0x58, 0x6e, 0x45, 0x3c, 0x37, 0x31, 0x5e, 0x5b, 0x7e,
-	0xfd, 0xfd, 0xfd, 0xca, 0xe2, 0xc8, 0xed, 0xb7, 0x07, 0x57, 0x1b, 0xce, 0x68, 0x7d, 0x9a, 0x00,
-	0x65, 0x61, 0xea, 0xd7, 0x40, 0x05, 0x05, 0x41, 0x8a, 0x19, 0x53, 0xb3, 0xea, 0xbd, 0x1c, 0x56,
-	0x0b, 0x7e, 0x15, 0xb0, 0xdc, 0x3e, 0x44, 0xaf, 0x82, 0x31, 0x12, 0xc8, 0xb6, 0xcb, 0xee, 0x18,
-	0x09, 0xf4, 0x97, 0x60, 0x5a, 0xe8, 0xa3, 0x9d, 0x48, 0x56, 0x63, 0xbc, 0xa6, 0xd5, 0xa7, 0x6f,
-	0xdc, 0xb2, 0x2f, 0x2e, 0x20, 0x7b, 0xd8, 0x53, 0x6b, 0x49, 0xec, 0xa1, 0x97, 0xc3, 0x2b, 0x6a,
-	0x77, 0xa3, 0xe2, 0x54, 0x35, 0x2c, 0x17, 0x24, 0xc3, 0x53, 0x3d, 0x00, 0xb3, 0x9d, 0x8c, 0x67,
-	0x29, 0x2e, 0x20, 0x21, 0xdd, 0xc5, 0x69, 0x97, 0xa6, 0x46, 0x59, 0x8e, 0x02, 0x7b, 0x39, 0x5c,
-	0x28, 0xc8, 0x7e, 0x87, 0xb2, 0x5c, 0xbd, 0x70, 0x8b, 0x1e, 0xee, 0x28, 0xa7, 0xfe, 0x10, 0xfc,
-	0xcb, 0x29, 0x47, 0x51, 0x9b, 0xed, 0xa0, 0x14, 0x33, 0x63, 0x42, 0xce, 0x34, 0x67, 0x2b, 0x6d,
-	0x0b, 0x0d, 0x0d, 0x9a, 0xdf, 0xa0, 0xa4, 0xdb, 0x5a, 0x50, 0x6d, 0x5f, 0x2a, 0x2a, 0x9d, 0x4e,
-	0xb6, 0xdc, 0x69, 0x69, 0x6e, 0x4b, 0x4b, 0x4f, 0x41, 0x55, 0x36, 0x10, 0x91, 0xe7, 0x19, 0x09,
-	0x08, 0xdf, 0x37, 0x26, 0x6b, 0xe3, 0xe7, 0x93, 0x5f, 0x17, 0xe4, 0xef, 0xbe, 0xc2, 0xfa, 0x05,
-	0xb4, 0x21, 0x12, 0x98, 0xfb, 0x9f, 0x28, 0x71, 0xaf, 0x5f, 0x41, 0xbf, 0x0f, 0x66, 0x98, 0x8f,
-	0x22, 0xd2, 0x0d, 0xdb, 0x1d, 0xe4, 0x73, 0x9a, 0x32, 0xa3, 0x52, 0x1b, 0xaf, 0x97, 0x5b, 0x4b,
-	0xbd, 0x1c, 0x2e, 0xfe, 0xb2, 0xe9, 0x33, 0x58, 0xcb, 0xad, 0x2a, 0xcf, 0x66, 0xe1, 0xd0, 0x9f,
-	0x82, 0xb9, 0x51, 0x4c, 0xdb, 0xa7, 0x5d, 0x9e, 0xd2, 0x28, 0xc2, 0xa9, 0x31, 0x25, 0xd7, 0x7e,
-	0xb5, 0x97, 0xc3, 0x9a, 0x62, 0xfe, 0x13, 0xd4, 0x72, 0x2f, 0x8f, 0x10, 0x6f, 0x0c, 0x22, 0x6b,
-	0xcd, 0x57, 0x07, 0xb0, 0xf4, 0xf6, 0x00, 0x96, 0x3e, 0x7e, 0x68, 0x4c, 0x88, 0xd3, 0xdc, 0x15,
-	0x9a, 0x5e, 0x38, 0x47, 0xd3, 0xad, 0xc7, 0x87, 0xc7, 0xa6, 0x76, 0x74, 0x6c, 0x6a, 0xdf, 0x8e,
-	0x4d, 0xed, 0xcd, 0x89, 0x59, 0x3a, 0x3a, 0x31, 0x4b, 0x9f, 0x4f, 0xcc, 0xd2, 0xa3, 0xf5, 0x53,
-	0x7b, 0x53, 0x0c, 0x8d, 0x08, 0x79, 0xac, 0x6f, 0x38, 0xbb, 0xcd, 0x55, 0x67, 0xef, 0xbc, 0x8f,
-	0xa4, 0x37, 0x29, 0x3f, 0x12, 0x37, 0x7f, 0x06, 0x00, 0x00, 0xff, 0xff, 0x5b, 0xe4, 0x2c, 0xc5,
-	0x52, 0x05, 0x00, 0x00,
+	// 684 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x54, 0xbf, 0x6f, 0xd3, 0x4e,
+	0x14, 0x8f, 0xdb, 0xb4, 0xe9, 0xd7, 0xfd, 0x92, 0x0a, 0x53, 0x09, 0xb7, 0x11, 0x76, 0x6a, 0x51,
+	0x14, 0x55, 0xc4, 0x47, 0x40, 0xaa, 0xd4, 0x6e, 0xa4, 0xa8, 0x08, 0xa9, 0x42, 0xc5, 0x9d, 0x80,
+	0x21, 0x9c, 0xed, 0x8b, 0x73, 0xaa, 0x9d, 0x33, 0xbe, 0x73, 0x69, 0x16, 0x66, 0xc4, 0xc4, 0xc8,
+	0xd8, 0x99, 0x89, 0x81, 0x3f, 0xa2, 0x82, 0xa5, 0x23, 0xea, 0x60, 0x50, 0x3b, 0xb0, 0xe7, 0x2f,
+	0x40, 0x77, 0xbe, 0xa4, 0x49, 0x81, 0x08, 0xb1, 0x24, 0xf7, 0xde, 0xfb, 0x7c, 0x3e, 0xef, 0xc7,
+	0x3d, 0x9f, 0xba, 0x41, 0x68, 0x44, 0x28, 0xa6, 0x20, 0x80, 0x51, 0x04, 0x62, 0x42, 0xc2, 0x7a,
+	0x44, 0x7c, 0x14, 0x52, 0x40, 0x19, 0x74, 0x43, 0x44, 0x5f, 0xc1, 0x78, 0xe4, 0xd8, 0xe2, 0x08,
+	0x3b, 0x4e, 0x08, 0x23, 0xda, 0x9a, 0xa4, 0xda, 0x9c, 0x6a, 0xf3, 0x40, 0xce, 0xb4, 0x2f, 0xe0,
+	0xf6, 0x41, 0xc3, 0x45, 0x0c, 0x36, 0x96, 0x97, 0x3c, 0x01, 0x6e, 0x09, 0x26, 0xc8, 0x8d, 0x5c,
+	0x66, 0x79, 0x31, 0x20, 0x01, 0xc9, 0xfd, 0xfc, 0x24, 0xbd, 0x57, 0x61, 0x84, 0xbb, 0x04, 0x88,
+	0x5f, 0xe9, 0x32, 0x02, 0x42, 0x82, 0x10, 0x01, 0x61, 0xb9, 0x69, 0x1b, 0xf8, 0x69, 0x02, 0x19,
+	0x26, 0x5d, 0x19, 0x37, 0x2f, 0xc7, 0x19, 0x8e, 0x10, 0x65, 0x30, 0x8a, 0x07, 0x02, 0x79, 0x5e,
+	0x00, 0x53, 0xd6, 0x01, 0xb2, 0x32, 0x61, 0x5c, 0x8a, 0xbb, 0x90, 0xa2, 0x61, 0xdc, 0x23, 0x58,
+	0x26, 0xb0, 0x4e, 0x15, 0x55, 0xdd, 0x25, 0x24, 0xdc, 0x85, 0x09, 0x8c, 0xa8, 0xf6, 0x44, 0x9d,
+	0x13, 0x23, 0x69, 0x23, 0xa4, 0x2b, 0x55, 0xa5, 0xf6, 0x5f, 0x73, 0xfd, 0x38, 0x33, 0x0b, 0xa7,
+	0x99, 0x59, 0xc9, 0x85, 0xa8, 0xbf, 0x6f, 0x63, 0x02, 0x22, 0xc8, 0x3a, 0xf6, 0x0e, 0x0a, 0xa0,
+	0xd7, 0x7b, 0x80, 0xbc, 0x7e, 0x66, 0x2e, 0xf4, 0x60, 0x14, 0x6e, 0x5a, 0x03, 0xb2, 0xe5, 0x94,
+	0xf8, 0x71, 0x1b, 0x21, 0x2e, 0x89, 0x0e, 0x31, 0x13, 0x92, 0x53, 0xff, 0x20, 0x39, 0x20, 0x5b,
+	0x4e, 0x89, 0x1f, 0xb7, 0x11, 0xda, 0xbc, 0xf5, 0xf6, 0xc7, 0xc7, 0xb5, 0x95, 0xb1, 0x5b, 0xde,
+	0x1b, 0xde, 0xcf, 0x45, 0x37, 0xd6, 0x97, 0x19, 0xb5, 0xc8, 0x4d, 0xed, 0xb6, 0x5a, 0x82, 0xbe,
+	0x9f, 0x20, 0x4a, 0x65, 0x57, 0x5a, 0x3f, 0x33, 0xcb, 0xb9, 0xbe, 0x0c, 0x58, 0xce, 0x00, 0xa2,
+	0x95, 0xd5, 0x29, 0xec, 0x8b, 0x5a, 0x8b, 0xce, 0x14, 0xf6, 0xb5, 0xd7, 0xea, 0x3c, 0xdf, 0x84,
+	0x56, 0x2c, 0x54, 0xf5, 0xe9, 0xaa, 0x52, 0x9b, 0xbf, 0xbb, 0x6e, 0xff, 0xfd, 0xaa, 0xd8, 0x17,
+	0x35, 0x35, 0x57, 0x79, 0xf3, 0xfd, 0xcc, 0xbc, 0x21, 0x07, 0x36, 0xbe, 0x86, 0x32, 0x87, 0xe5,
+	0xa8, 0xf1, 0xe8, 0xa5, 0x2c, 0xb6, 0x53, 0x96, 0x26, 0x28, 0x87, 0x04, 0xe4, 0x00, 0x25, 0x5d,
+	0x92, 0xe8, 0x45, 0xd1, 0x8a, 0xd9, 0xcf, 0xcc, 0x4a, 0x2e, 0xf6, 0x3b, 0x94, 0xe5, 0x68, 0xb9,
+	0x9b, 0xd7, 0xf0, 0x50, 0x3a, 0xb5, 0xa7, 0xea, 0xff, 0x8c, 0x30, 0x18, 0xb6, 0x68, 0x07, 0x26,
+	0x88, 0xea, 0x33, 0xa2, 0xa7, 0x25, 0x5b, 0x6e, 0x31, 0xdf, 0x96, 0x61, 0xf1, 0x5b, 0x04, 0x77,
+	0x9b, 0x15, 0x59, 0xf6, 0xb5, 0x3c, 0xd3, 0x28, 0xd9, 0x72, 0xe6, 0x85, 0xb9, 0x27, 0x2c, 0x2d,
+	0x51, 0xcb, 0xa2, 0x80, 0x10, 0xbf, 0x4c, 0xb1, 0x8f, 0x59, 0x4f, 0x9f, 0xad, 0x4e, 0x4f, 0x16,
+	0xbf, 0xc3, 0xc5, 0x3f, 0x7c, 0x33, 0x6b, 0x01, 0x66, 0x9d, 0xd4, 0xb5, 0x3d, 0x12, 0xc9, 0xef,
+	0x49, 0xfe, 0xd5, 0xa9, 0xbf, 0x0f, 0x58, 0x2f, 0x46, 0x54, 0x10, 0xa8, 0x73, 0x85, 0xa7, 0xd8,
+	0x19, 0x64, 0xd0, 0x1e, 0xab, 0x0b, 0xd4, 0x83, 0x21, 0xee, 0x06, 0xad, 0x36, 0xf4, 0x18, 0x49,
+	0xa8, 0x5e, 0xaa, 0x4e, 0xd7, 0x8a, 0xcd, 0xd5, 0x7e, 0x66, 0xae, 0xfc, 0x32, 0xe9, 0x4b, 0x58,
+	0xcb, 0x29, 0x4b, 0xcf, 0x76, 0xee, 0xd0, 0x5e, 0xa8, 0x4b, 0xe3, 0x98, 0x96, 0x47, 0xba, 0x2c,
+	0x21, 0x61, 0x88, 0x12, 0x7d, 0x4e, 0x8c, 0xfd, 0x66, 0x3f, 0x33, 0xab, 0x52, 0xf9, 0x4f, 0x50,
+	0xcb, 0xb9, 0x3e, 0x26, 0xbc, 0x35, 0x8c, 0x6c, 0x36, 0xde, 0x1c, 0x99, 0x85, 0xf7, 0x47, 0x66,
+	0xe1, 0xf3, 0xa7, 0xfa, 0x0c, 0xbf, 0x9a, 0x47, 0x7c, 0xa7, 0x2b, 0x13, 0x76, 0xba, 0xf9, 0xfc,
+	0xf8, 0xcc, 0x50, 0x4e, 0xce, 0x0c, 0xe5, 0xfb, 0x99, 0xa1, 0xbc, 0x3b, 0x37, 0x0a, 0x27, 0xe7,
+	0x46, 0xe1, 0xeb, 0xb9, 0x51, 0x78, 0x76, 0x7f, 0x64, 0x6e, 0x52, 0xa1, 0x1e, 0x42, 0x97, 0x0e,
+	0x0c, 0x70, 0xd0, 0xd8, 0x00, 0x87, 0x93, 0x9e, 0x43, 0x77, 0x56, 0x3c, 0x07, 0xf7, 0x7e, 0x06,
+	0x00, 0x00, 0xff, 0xff, 0xdc, 0x02, 0xde, 0xf4, 0x3c, 0x05, 0x00, 0x00,
 }
 
 func (m *PoolParams) Marshal() (dAtA []byte, err error) {
diff --git a/x/gamm/types/gov.pb.go b/x/gamm/types/gov.pb.go
index 37359ed00f4..b2167f33427 100644
--- a/x/gamm/types/gov.pb.go
+++ b/x/gamm/types/gov.pb.go
@@ -4,9 +4,9 @@
 package types
 
 import (
+	cosmossdk_io_math "cosmossdk.io/math"
 	fmt "fmt"
 	_ "github.com/cosmos/cosmos-proto"
-	github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types"
 	_ "github.com/cosmos/cosmos-sdk/types/tx/amino"
 	_ "github.com/gogo/protobuf/gogoproto"
 	proto "github.com/gogo/protobuf/proto"
@@ -117,12 +117,12 @@ func (m *UpdateMigrationRecordsProposal) XXX_DiscardUnknown() {
 var xxx_messageInfo_UpdateMigrationRecordsProposal proto.InternalMessageInfo
 
 type PoolRecordWithCFMMLink struct {
-	Denom0             string                                 `protobuf:"bytes,1,opt,name=denom0,proto3" json:"denom0,omitempty" yaml:"denom0"`
-	Denom1             string                                 `protobuf:"bytes,2,opt,name=denom1,proto3" json:"denom1,omitempty" yaml:"denom1"`
-	TickSpacing        uint64                                 `protobuf:"varint,3,opt,name=tick_spacing,json=tickSpacing,proto3" json:"tick_spacing,omitempty" yaml:"tick_spacing"`
-	ExponentAtPriceOne github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,4,opt,name=exponent_at_price_one,json=exponentAtPriceOne,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"exponent_at_price_one" yaml:"exponent_at_price_one"`
-	SpreadFactor       github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,5,opt,name=spread_factor,json=spreadFactor,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"spread_factor" yaml:"spread_factor"`
-	BalancerPoolId     uint64                                 `protobuf:"varint,6,opt,name=balancer_pool_id,json=balancerPoolId,proto3" json:"balancer_pool_id,omitempty" yaml:"balancer_pool_id"`
+	Denom0             string                      `protobuf:"bytes,1,opt,name=denom0,proto3" json:"denom0,omitempty" yaml:"denom0"`
+	Denom1             string                      `protobuf:"bytes,2,opt,name=denom1,proto3" json:"denom1,omitempty" yaml:"denom1"`
+	TickSpacing        uint64                      `protobuf:"varint,3,opt,name=tick_spacing,json=tickSpacing,proto3" json:"tick_spacing,omitempty" yaml:"tick_spacing"`
+	ExponentAtPriceOne cosmossdk_io_math.Int       `protobuf:"bytes,4,opt,name=exponent_at_price_one,json=exponentAtPriceOne,proto3,customtype=cosmossdk.io/math.Int" json:"exponent_at_price_one" yaml:"exponent_at_price_one"`
+	SpreadFactor       cosmossdk_io_math.LegacyDec `protobuf:"bytes,5,opt,name=spread_factor,json=spreadFactor,proto3,customtype=cosmossdk.io/math.LegacyDec" json:"spread_factor" yaml:"spread_factor"`
+	BalancerPoolId     uint64                      `protobuf:"varint,6,opt,name=balancer_pool_id,json=balancerPoolId,proto3" json:"balancer_pool_id,omitempty" yaml:"balancer_pool_id"`
 }
 
 func (m *PoolRecordWithCFMMLink) Reset()         { *m = PoolRecordWithCFMMLink{} }
@@ -280,57 +280,58 @@ func init() {
 func init() { proto.RegisterFile("osmosis/gamm/v1beta1/gov.proto", fileDescriptor_f31b9a6c0dbbdfa3) }
 
 var fileDescriptor_f31b9a6c0dbbdfa3 = []byte{
-	// 800 bytes of a gzipped FileDescriptorProto
+	// 805 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x55, 0xcf, 0x6f, 0xe3, 0x44,
-	0x14, 0x8e, 0x93, 0x6c, 0x56, 0x4c, 0x77, 0x11, 0x35, 0x81, 0x84, 0x2e, 0xb2, 0x83, 0x0f, 0xa5,
-	0xac, 0x88, 0xbd, 0xe1, 0xc7, 0x81, 0x48, 0x1c, 0x9a, 0x40, 0xa5, 0x45, 0x5b, 0xa8, 0xdc, 0x5d,
-	0x10, 0x5c, 0xac, 0xc9, 0x78, 0xea, 0x8c, 0x62, 0xcf, 0x98, 0x99, 0xd9, 0xb2, 0x3d, 0x72, 0x40,
-	0x20, 0x4e, 0x1c, 0x11, 0xa7, 0xfe, 0x09, 0x1c, 0xf8, 0x23, 0x2a, 0x4e, 0x3d, 0x22, 0x0e, 0x16,
-	0x6a, 0x0f, 0xf4, 0x9c, 0x23, 0x17, 0xd0, 0xcc, 0xd8, 0x25, 0x40, 0x44, 0x15, 0x7a, 0xe2, 0x92,
-	0xf8, 0xbd, 0xf7, 0xf9, 0x7b, 0x7e, 0xdf, 0xbc, 0x4f, 0x03, 0x1c, 0x26, 0x32, 0x26, 0x88, 0x08,
-	0x12, 0x98, 0x65, 0xc1, 0xe1, 0x60, 0x82, 0x25, 0x1c, 0x04, 0x09, 0x3b, 0xf4, 0x73, 0xce, 0x24,
-	0xb3, 0xdb, 0x65, 0xdd, 0x57, 0x75, 0xbf, 0xac, 0x6f, 0xb4, 0x13, 0x96, 0x30, 0x0d, 0x08, 0xd4,
-	0x93, 0xc1, 0x6e, 0x78, 0xcb, 0xb9, 0x30, 0xc5, 0x8a, 0xc0, 0x60, 0x5e, 0x5a, 0x8a, 0x11, 0x53,
-	0xc8, 0x71, 0x5c, 0x42, 0x5e, 0x40, 0x1a, 0x13, 0x19, 0x7e, 0x13, 0x94, 0xa5, 0x75, 0x98, 0x11,
-	0xca, 0x02, 0xfd, 0x6b, 0x52, 0xde, 0x97, 0x75, 0xe0, 0x86, 0x38, 0x4f, 0x21, 0xc2, 0xbb, 0x24,
-	0xe1, 0x50, 0x12, 0x46, 0x43, 0x8c, 0x18, 0x8f, 0xc5, 0x1e, 0x67, 0x39, 0x13, 0x30, 0xb5, 0xdb,
-	0xe0, 0x86, 0x24, 0x32, 0xc5, 0x5d, 0xab, 0x67, 0x6d, 0x3d, 0x15, 0x9a, 0xc0, 0xee, 0x81, 0xb5,
-	0x18, 0x0b, 0xc4, 0x49, 0xae, 0xde, 0xe9, 0xd6, 0x75, 0x6d, 0x31, 0x65, 0x3f, 0x04, 0x37, 0xb9,
-	0xa1, 0xea, 0x36, 0x7a, 0x8d, 0xad, 0xb5, 0xd7, 0xde, 0xf0, 0x97, 0xc9, 0xe1, 0x8f, 0x60, 0x0a,
-	0x29, 0xc2, 0xfc, 0x21, 0x1b, 0x33, 0x8a, 0x30, 0x95, 0x1c, 0x4a, 0x1c, 0xef, 0x31, 0x96, 0x3e,
-	0x20, 0x74, 0x36, 0x6a, 0x9e, 0x14, 0x6e, 0x2d, 0xac, 0xa8, 0x86, 0x1f, 0x7e, 0x75, 0xec, 0xd6,
-	0xbe, 0x3d, 0x76, 0x6b, 0x17, 0xc7, 0xae, 0xf5, 0xe3, 0x0f, 0xfd, 0x8d, 0x72, 0x44, 0x25, 0x7a,
-	0xc5, 0x38, 0x66, 0x54, 0x62, 0x2a, 0xbf, 0xfe, 0xf5, 0xfb, 0xbb, 0x2f, 0x57, 0x8a, 0x5d, 0x31,
-	0xa5, 0xf7, 0x45, 0x1d, 0x38, 0x8f, 0xf2, 0x18, 0xca, 0xff, 0x8b, 0x10, 0x8f, 0x56, 0x13, 0x62,
-	0xb3, 0x12, 0xe2, 0xdf, 0x87, 0xf4, 0x2e, 0x1a, 0xe0, 0x79, 0xd5, 0xd2, 0xe4, 0x3f, 0x22, 0x72,
-	0x3a, 0xde, 0xd9, 0xdd, 0x55, 0x1f, 0x60, 0xbf, 0x02, 0x5a, 0x31, 0xa6, 0x2c, 0xbb, 0x67, 0x04,
-	0x18, 0xad, 0xcf, 0x0b, 0xf7, 0xf6, 0x11, 0xcc, 0xd2, 0xa1, 0x67, 0xf2, 0x5e, 0x58, 0x02, 0x2e,
-	0xa1, 0x03, 0xa3, 0xc7, 0x3f, 0xa0, 0x83, 0x0a, 0x3a, 0xb0, 0x87, 0xe0, 0x96, 0x24, 0x68, 0x16,
-	0x89, 0x1c, 0x22, 0x42, 0x93, 0x6e, 0xa3, 0x67, 0x6d, 0x35, 0x47, 0x9d, 0x79, 0xe1, 0x3e, 0x6b,
-	0x5e, 0x58, 0xac, 0x7a, 0xe1, 0x9a, 0x0a, 0xf7, 0x4d, 0x64, 0x7f, 0x6e, 0x81, 0xe7, 0xf0, 0x93,
-	0x9c, 0x51, 0x4c, 0x65, 0x04, 0x65, 0x94, 0x73, 0x82, 0x70, 0xc4, 0x28, 0xee, 0x36, 0x75, 0xdb,
-	0xf7, 0x95, 0x64, 0x3f, 0x17, 0xee, 0x66, 0x42, 0xe4, 0xf4, 0xf1, 0xc4, 0x47, 0x2c, 0x2b, 0x2d,
-	0x51, 0xfe, 0xf5, 0x45, 0x3c, 0x0b, 0xe4, 0x51, 0x8e, 0x85, 0x7f, 0x9f, 0xca, 0x79, 0xe1, 0xbe,
-	0x68, 0x7a, 0x2e, 0x25, 0xf5, 0x42, 0xbb, 0xca, 0x6f, 0xcb, 0x3d, 0x95, 0xfd, 0x80, 0x62, 0x7b,
-	0x06, 0x6e, 0x8b, 0x9c, 0x63, 0x18, 0x47, 0x07, 0x10, 0x49, 0xc6, 0xbb, 0x37, 0x74, 0xeb, 0x9d,
-	0x15, 0x5a, 0xbf, 0x83, 0xd1, 0xbc, 0x70, 0xdb, 0xa6, 0xf5, 0x5f, 0xc8, 0xbc, 0xf0, 0x96, 0x89,
-	0x77, 0x74, 0x68, 0xbf, 0x0b, 0x9e, 0x99, 0x94, 0x5b, 0x12, 0xe5, 0x8c, 0xa5, 0x11, 0x89, 0xbb,
-	0x2d, 0x2d, 0xd8, 0x9d, 0x79, 0xe1, 0x76, 0x0c, 0xc3, 0xdf, 0x11, 0x5e, 0xf8, 0x74, 0x95, 0x52,
-	0x27, 0x7b, 0x3f, 0x1e, 0x36, 0xd5, 0xce, 0x78, 0xbf, 0xd5, 0xc1, 0x9b, 0x63, 0x8e, 0xa1, 0xc4,
-	0x8b, 0xfb, 0xf6, 0x80, 0x7c, 0xfa, 0x98, 0xc4, 0x44, 0x1e, 0x29, 0xac, 0xd8, 0xa6, 0xb1, 0x3a,
-	0x7b, 0xc9, 0xd4, 0x16, 0x5c, 0xdb, 0x09, 0xdf, 0x59, 0xe0, 0x8e, 0xfe, 0xa8, 0x72, 0x89, 0xa3,
-	0xcf, 0x88, 0x9c, 0x46, 0xe8, 0x20, 0xcb, 0xa2, 0x94, 0xd0, 0x59, 0x69, 0x8f, 0x57, 0x97, 0xdb,
-	0x63, 0xf9, 0x56, 0x8e, 0x7c, 0x25, 0xf4, 0xbc, 0x70, 0x37, 0xcd, 0xf0, 0x48, 0x0f, 0x14, 0xa1,
-	0xd4, 0x4c, 0x0f, 0x69, 0xac, 0xa9, 0x23, 0xc9, 0x74, 0x1f, 0x2f, 0xec, 0xe4, 0x97, 0x3c, 0x42,
-	0x13, 0x1d, 0x64, 0x99, 0x22, 0x1a, 0xa6, 0xab, 0x19, 0xea, 0xed, 0xca, 0x50, 0xff, 0x49, 0x42,
-	0xef, 0x77, 0x0b, 0x78, 0xfb, 0x58, 0xee, 0x23, 0x98, 0x12, 0x9a, 0x98, 0xe3, 0x55, 0xec, 0x9c,
-	0xa5, 0x29, 0xe6, 0xd7, 0x56, 0xba, 0x03, 0x6e, 0x56, 0xfb, 0xa1, 0x0d, 0x15, 0xb6, 0x72, 0x7d,
-	0xf4, 0x76, 0x1f, 0xd8, 0xe8, 0xb2, 0x4d, 0x04, 0xe3, 0x98, 0x63, 0x21, 0x8c, 0x5d, 0xc2, 0xf5,
-	0x3f, 0x2b, 0xdb, 0xa6, 0x30, 0xfc, 0x78, 0x35, 0x51, 0xee, 0x56, 0xa2, 0x5c, 0x3d, 0xda, 0xe8,
-	0xbd, 0x93, 0x33, 0xc7, 0x3a, 0x3d, 0x73, 0xac, 0x5f, 0xce, 0x1c, 0xeb, 0x9b, 0x73, 0xa7, 0x76,
-	0x7a, 0xee, 0xd4, 0x7e, 0x3a, 0x77, 0x6a, 0x9f, 0xdc, 0x5b, 0xf0, 0x4c, 0x49, 0xd8, 0x4f, 0xe1,
-	0x44, 0x54, 0x41, 0x70, 0x38, 0x78, 0x2b, 0x78, 0x62, 0x2e, 0x41, 0xed, 0xa0, 0x49, 0x4b, 0x5f,
-	0x67, 0xaf, 0xff, 0x11, 0x00, 0x00, 0xff, 0xff, 0xe8, 0x00, 0x37, 0xed, 0x91, 0x07, 0x00, 0x00,
+	0x14, 0x8e, 0x93, 0x6c, 0x56, 0x4c, 0x77, 0x11, 0x35, 0x59, 0x12, 0x5a, 0x64, 0x07, 0x1f, 0x96,
+	0xb2, 0xa2, 0xf6, 0x86, 0x1f, 0x07, 0x82, 0xf6, 0xd0, 0x04, 0x56, 0x5a, 0xd4, 0x8a, 0xca, 0xdd,
+	0x05, 0xc1, 0xc5, 0x4c, 0xc6, 0x53, 0x67, 0x14, 0x7b, 0xc6, 0xcc, 0x4c, 0x4b, 0xf3, 0x07, 0x20,
+	0x10, 0x27, 0x8e, 0x88, 0x53, 0xff, 0x04, 0x0e, 0xfc, 0x11, 0x15, 0x5c, 0x7a, 0x44, 0x1c, 0x2c,
+	0xd4, 0x1e, 0xe0, 0x9c, 0x23, 0x17, 0xd0, 0xcc, 0xd8, 0xa5, 0xd0, 0x88, 0xaa, 0xf4, 0xb4, 0x97,
+	0x28, 0xef, 0xbd, 0xcf, 0xdf, 0xe7, 0xf7, 0xbd, 0xf7, 0x64, 0xe0, 0x30, 0x91, 0x31, 0x41, 0x44,
+	0x90, 0xc0, 0x2c, 0x0b, 0xf6, 0xfb, 0x63, 0x2c, 0x61, 0x3f, 0x48, 0xd8, 0xbe, 0x9f, 0x73, 0x26,
+	0x99, 0xdd, 0x2e, 0xeb, 0xbe, 0xaa, 0xfb, 0x65, 0x7d, 0xa5, 0x9d, 0xb0, 0x84, 0x69, 0x40, 0xa0,
+	0xfe, 0x19, 0xec, 0x8a, 0xb7, 0x98, 0x0b, 0x53, 0xac, 0x08, 0x0c, 0xe6, 0xe5, 0x85, 0x18, 0x31,
+	0x81, 0x1c, 0xc7, 0x25, 0xe4, 0x45, 0xa4, 0x31, 0x91, 0xe1, 0x37, 0x41, 0x59, 0x5a, 0x86, 0x19,
+	0xa1, 0x2c, 0xd0, 0xbf, 0x26, 0xe5, 0x7d, 0x59, 0x07, 0x6e, 0x88, 0xf3, 0x14, 0x22, 0xbc, 0x45,
+	0x12, 0x0e, 0x25, 0x61, 0x34, 0xc4, 0x88, 0xf1, 0x58, 0x6c, 0x73, 0x96, 0x33, 0x01, 0x53, 0xbb,
+	0x0d, 0x6e, 0x48, 0x22, 0x53, 0xdc, 0xb5, 0x7a, 0xd6, 0xda, 0x33, 0xa1, 0x09, 0xec, 0x1e, 0x58,
+	0x8a, 0xb1, 0x40, 0x9c, 0xe4, 0xea, 0x99, 0x6e, 0x5d, 0xd7, 0xce, 0xa7, 0xec, 0xc7, 0xe0, 0x26,
+	0x37, 0x54, 0xdd, 0x46, 0xaf, 0xb1, 0xb6, 0xf4, 0xfa, 0x9b, 0xfe, 0x22, 0x3b, 0xfc, 0x21, 0x4c,
+	0x21, 0x45, 0x98, 0x3f, 0x66, 0x23, 0x46, 0x11, 0xa6, 0x92, 0x43, 0x89, 0xe3, 0x6d, 0xc6, 0xd2,
+	0x4d, 0x42, 0xa7, 0xc3, 0xe6, 0x51, 0xe1, 0xd6, 0xc2, 0x8a, 0x6a, 0xf0, 0xe1, 0x57, 0x87, 0x6e,
+	0xed, 0xdb, 0x43, 0xb7, 0xf6, 0xfb, 0xa1, 0x6b, 0xfd, 0xf8, 0xc3, 0xfa, 0x4a, 0xd9, 0xa2, 0x32,
+	0xbd, 0x62, 0x1c, 0x31, 0x2a, 0x31, 0x95, 0x5f, 0xff, 0xf6, 0xfd, 0xbd, 0x57, 0x2a, 0xc7, 0x2e,
+	0xe9, 0xd2, 0xfb, 0xa2, 0x0e, 0x9c, 0x27, 0x79, 0x0c, 0xe5, 0xd3, 0x62, 0xc4, 0x93, 0xab, 0x19,
+	0x71, 0xb7, 0x32, 0xe2, 0xbf, 0x9b, 0xf4, 0x7e, 0x6a, 0x80, 0x17, 0x94, 0xa4, 0xc9, 0x7f, 0x44,
+	0xe4, 0x64, 0xf4, 0x70, 0x6b, 0x4b, 0xbd, 0x80, 0xfd, 0x2a, 0x68, 0xc5, 0x98, 0xb2, 0xec, 0xbe,
+	0x31, 0x60, 0xb8, 0x3c, 0x2f, 0xdc, 0xdb, 0x33, 0x98, 0xa5, 0x03, 0xcf, 0xe4, 0xbd, 0xb0, 0x04,
+	0x9c, 0x41, 0xfb, 0xc6, 0x8f, 0x0b, 0xd0, 0x7e, 0x05, 0xed, 0xdb, 0x03, 0x70, 0x4b, 0x12, 0x34,
+	0x8d, 0x44, 0x0e, 0x11, 0xa1, 0x49, 0xb7, 0xd1, 0xb3, 0xd6, 0x9a, 0xc3, 0xce, 0xbc, 0x70, 0x9f,
+	0x37, 0x0f, 0x9c, 0xaf, 0x7a, 0xe1, 0x92, 0x0a, 0x77, 0x4c, 0x64, 0xe7, 0xe0, 0x0e, 0x3e, 0xc8,
+	0x19, 0xc5, 0x54, 0x46, 0x50, 0x46, 0x39, 0x27, 0x08, 0x47, 0x8c, 0xe2, 0x6e, 0x53, 0xab, 0x3e,
+	0x50, 0x8e, 0xfd, 0x52, 0xb8, 0x77, 0x8c, 0x35, 0x22, 0x9e, 0xfa, 0x84, 0x05, 0x19, 0x94, 0x13,
+	0xff, 0x11, 0x95, 0xf3, 0xc2, 0x7d, 0xc9, 0x28, 0x2c, 0xe4, 0xf0, 0x42, 0xbb, 0xca, 0x6f, 0xc8,
+	0x6d, 0x95, 0xfd, 0x80, 0x62, 0xfb, 0x53, 0x70, 0x5b, 0xe4, 0x1c, 0xc3, 0x38, 0xda, 0x85, 0x48,
+	0x32, 0xde, 0xbd, 0xa1, 0x95, 0xde, 0x29, 0x95, 0x56, 0x2f, 0x2a, 0x6d, 0xe2, 0x04, 0xa2, 0xd9,
+	0xbb, 0x18, 0xcd, 0x0b, 0xb7, 0x6d, 0xf4, 0xfe, 0xc1, 0xe0, 0x85, 0xb7, 0x4c, 0xfc, 0x50, 0x87,
+	0xf6, 0x7b, 0xe0, 0xb9, 0x71, 0xb9, 0x08, 0x51, 0xce, 0x58, 0x1a, 0x91, 0xb8, 0xdb, 0xd2, 0x9e,
+	0xac, 0xce, 0x0b, 0xb7, 0x63, 0x18, 0xfe, 0x8d, 0xf0, 0xc2, 0x67, 0xab, 0x94, 0x1a, 0xde, 0xa3,
+	0x78, 0xd0, 0x54, 0x6b, 0xe1, 0xfd, 0x51, 0x07, 0x6f, 0x8d, 0x38, 0x86, 0x12, 0x9f, 0x5f, 0xa9,
+	0x4d, 0xf2, 0xd9, 0x1e, 0x89, 0x89, 0x9c, 0x29, 0xac, 0xd8, 0xa0, 0xb1, 0x1a, 0xaf, 0x64, 0x6a,
+	0xd0, 0xd7, 0x5e, 0xf6, 0xef, 0x2c, 0xb0, 0xaa, 0x5f, 0xaa, 0xdc, 0xd3, 0xe8, 0x73, 0x22, 0x27,
+	0x11, 0xda, 0xcd, 0xb2, 0x28, 0x25, 0x74, 0x5a, 0x5e, 0xc0, 0x6b, 0x8b, 0x2f, 0x60, 0xf1, 0xe2,
+	0x0d, 0x7d, 0xe5, 0xee, 0xbc, 0x70, 0xef, 0x9a, 0xe6, 0x91, 0x6e, 0x28, 0x42, 0xa9, 0xe9, 0x1e,
+	0xd2, 0x58, 0x53, 0x47, 0x92, 0x69, 0x1d, 0x2f, 0xec, 0xe4, 0x67, 0x3c, 0x42, 0x13, 0xed, 0x66,
+	0x99, 0x22, 0x1a, 0xa4, 0x57, 0xbb, 0x99, 0x07, 0xd5, 0xcd, 0xfc, 0x2f, 0x0b, 0xbd, 0x3f, 0x2d,
+	0xe0, 0xed, 0x60, 0xb9, 0x83, 0x60, 0x4a, 0x68, 0x62, 0xc6, 0xab, 0xd8, 0x39, 0x4b, 0x53, 0xcc,
+	0xaf, 0xed, 0x74, 0x07, 0xdc, 0xac, 0xf6, 0x43, 0xdf, 0x4c, 0xd8, 0xca, 0xf5, 0xe8, 0xed, 0x75,
+	0x60, 0xa3, 0x33, 0x99, 0x08, 0xc6, 0x31, 0xc7, 0x42, 0x98, 0x93, 0x08, 0x97, 0xff, 0xae, 0x6c,
+	0x98, 0xc2, 0xe0, 0xe3, 0xab, 0x99, 0x72, 0xaf, 0x32, 0xe5, 0xf2, 0xd6, 0x86, 0xef, 0x1f, 0x9d,
+	0x38, 0xd6, 0xf1, 0x89, 0x63, 0xfd, 0x7a, 0xe2, 0x58, 0xdf, 0x9c, 0x3a, 0xb5, 0xe3, 0x53, 0xa7,
+	0xf6, 0xf3, 0xa9, 0x53, 0xfb, 0xe4, 0x7e, 0x42, 0xe4, 0x64, 0x6f, 0xec, 0x23, 0x96, 0x05, 0x25,
+	0xe1, 0x7a, 0x0a, 0xc7, 0xa2, 0x0a, 0x82, 0xfd, 0xfe, 0xdb, 0xc1, 0x81, 0xf9, 0xce, 0xc9, 0x59,
+	0x8e, 0xc5, 0xb8, 0xa5, 0xbf, 0x58, 0x6f, 0xfc, 0x15, 0x00, 0x00, 0xff, 0xff, 0x8b, 0x0e, 0x7d,
+	0xe5, 0x74, 0x07, 0x00, 0x00,
 }
 
 func (this *ReplaceMigrationRecordsProposal) Equal(that interface{}) bool {
diff --git a/x/gamm/types/query.pb.go b/x/gamm/types/query.pb.go
index 70985c9f930..bcd3f590a2a 100644
--- a/x/gamm/types/query.pb.go
+++ b/x/gamm/types/query.pb.go
@@ -5,6 +5,7 @@ package types
 
 import (
 	context "context"
+	cosmossdk_io_math "cosmossdk.io/math"
 	fmt "fmt"
 	_ "github.com/cosmos/cosmos-proto"
 	types "github.com/cosmos/cosmos-sdk/codec/types"
@@ -457,7 +458,7 @@ func (m *QueryCalcJoinPoolSharesRequest) GetTokensIn() github_com_cosmos_cosmos_
 }
 
 type QueryCalcJoinPoolSharesResponse struct {
-	ShareOutAmount github_com_cosmos_cosmos_sdk_types.Int   `protobuf:"bytes,1,opt,name=share_out_amount,json=shareOutAmount,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"share_out_amount" yaml:"share_out_amount"`
+	ShareOutAmount cosmossdk_io_math.Int                    `protobuf:"bytes,1,opt,name=share_out_amount,json=shareOutAmount,proto3,customtype=cosmossdk.io/math.Int" json:"share_out_amount" yaml:"share_out_amount"`
 	TokensOut      github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,2,rep,name=tokens_out,json=tokensOut,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"tokens_out"`
 }
 
@@ -503,8 +504,8 @@ func (m *QueryCalcJoinPoolSharesResponse) GetTokensOut() github_com_cosmos_cosmo
 
 // =============================== CalcExitPoolCoinsFromShares
 type QueryCalcExitPoolCoinsFromSharesRequest struct {
-	PoolId        uint64                                 `protobuf:"varint,1,opt,name=pool_id,json=poolId,proto3" json:"pool_id,omitempty"`
-	ShareInAmount github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,2,opt,name=share_in_amount,json=shareInAmount,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"share_in_amount"`
+	PoolId        uint64                `protobuf:"varint,1,opt,name=pool_id,json=poolId,proto3" json:"pool_id,omitempty"`
+	ShareInAmount cosmossdk_io_math.Int `protobuf:"bytes,2,opt,name=share_in_amount,json=shareInAmount,proto3,customtype=cosmossdk.io/math.Int" json:"share_in_amount"`
 }
 
 func (m *QueryCalcExitPoolCoinsFromSharesRequest) Reset() {
@@ -923,7 +924,7 @@ func (m *QueryCalcJoinPoolNoSwapSharesRequest) GetTokensIn() github_com_cosmos_c
 
 type QueryCalcJoinPoolNoSwapSharesResponse struct {
 	TokensOut github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,1,rep,name=tokens_out,json=tokensOut,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"tokens_out" yaml:"tokens_out"`
-	SharesOut github_com_cosmos_cosmos_sdk_types.Int   `protobuf:"bytes,2,opt,name=shares_out,json=sharesOut,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"shares_out"`
+	SharesOut cosmossdk_io_math.Int                    `protobuf:"bytes,2,opt,name=shares_out,json=sharesOut,proto3,customtype=cosmossdk.io/math.Int" json:"shares_out"`
 }
 
 func (m *QueryCalcJoinPoolNoSwapSharesResponse) Reset()         { *m = QueryCalcJoinPoolNoSwapSharesResponse{} }
@@ -1267,7 +1268,7 @@ func (m *QuerySwapExactAmountInRequest) GetRoutes() []types2.SwapAmountInRoute {
 
 // Deprecated: Do not use.
 type QuerySwapExactAmountInResponse struct {
-	TokenOutAmount github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,1,opt,name=token_out_amount,json=tokenOutAmount,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"token_out_amount" yaml:"token_out_amount"`
+	TokenOutAmount cosmossdk_io_math.Int `protobuf:"bytes,1,opt,name=token_out_amount,json=tokenOutAmount,proto3,customtype=cosmossdk.io/math.Int" json:"token_out_amount" yaml:"token_out_amount"`
 }
 
 func (m *QuerySwapExactAmountInResponse) Reset()         { *m = QuerySwapExactAmountInResponse{} }
@@ -1376,7 +1377,7 @@ func (m *QuerySwapExactAmountOutRequest) GetTokenOut() string {
 
 // Deprecated: Do not use.
 type QuerySwapExactAmountOutResponse struct {
-	TokenInAmount github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,1,opt,name=token_in_amount,json=tokenInAmount,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"token_in_amount" yaml:"token_in_amount"`
+	TokenInAmount cosmossdk_io_math.Int `protobuf:"bytes,1,opt,name=token_in_amount,json=tokenInAmount,proto3,customtype=cosmossdk.io/math.Int" json:"token_in_amount" yaml:"token_in_amount"`
 }
 
 func (m *QuerySwapExactAmountOutResponse) Reset()         { *m = QuerySwapExactAmountOutResponse{} }
@@ -1712,136 +1713,136 @@ func init() {
 func init() { proto.RegisterFile("osmosis/gamm/v1beta1/query.proto", fileDescriptor_d9a717df9ca609ef) }
 
 var fileDescriptor_d9a717df9ca609ef = []byte{
-	// 2055 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x58, 0x4d, 0x6c, 0x1b, 0xc7,
-	0x15, 0xd6, 0xc8, 0xb2, 0x22, 0x8d, 0x6d, 0xfd, 0x4c, 0xe4, 0x98, 0xa6, 0x6c, 0xd1, 0x99, 0x26,
-	0x92, 0x63, 0x4b, 0x4b, 0xc9, 0x56, 0xd0, 0x46, 0x8d, 0x13, 0x4b, 0x8a, 0x64, 0x53, 0xb0, 0x2c,
-	0x65, 0x1d, 0xb4, 0x68, 0x8b, 0x76, 0xb1, 0x22, 0xd7, 0xd4, 0xc6, 0xdc, 0x1d, 0x9a, 0x3b, 0x1b,
-	0x4b, 0x08, 0x8c, 0x00, 0x39, 0xa5, 0xbd, 0xa4, 0x40, 0xdb, 0x14, 0x2d, 0x8a, 0xf6, 0x12, 0x14,
-	0x45, 0xcf, 0x05, 0x7a, 0xea, 0xa1, 0xe8, 0xc5, 0xe8, 0xc9, 0x68, 0x7b, 0x28, 0x7a, 0x60, 0x0b,
-	0xbb, 0xbd, 0xf5, 0xa4, 0x4b, 0xae, 0xc5, 0xcc, 0xbc, 0xfd, 0x21, 0xb9, 0x5c, 0xfe, 0xa4, 0x06,
-	0x92, 0x13, 0xb9, 0x33, 0xef, 0xe7, 0x7b, 0x3f, 0xf3, 0xe6, 0xcd, 0xc3, 0x17, 0x98, 0xe7, 0x30,
-	0xcf, 0xf6, 0xf2, 0x65, 0xd3, 0x71, 0xf2, 0xef, 0x2d, 0xed, 0x59, 0xdc, 0x5c, 0xca, 0xdf, 0xf7,
-	0xad, 0xda, 0xa1, 0x56, 0xad, 0x31, 0xce, 0xc8, 0x14, 0x50, 0x68, 0x82, 0x42, 0x03, 0x8a, 0xec,
-	0x54, 0x99, 0x95, 0x99, 0x24, 0xc8, 0x8b, 0x7f, 0x8a, 0x36, 0x7b, 0x3e, 0x51, 0x1a, 0x3f, 0x80,
-	0xed, 0xf9, 0x60, 0xbb, 0xca, 0x58, 0xc5, 0x31, 0x5d, 0xb3, 0x6c, 0xd5, 0x42, 0x2a, 0xef, 0x81,
-	0x59, 0x35, 0x6a, 0xcc, 0xe7, 0x16, 0x50, 0xcf, 0x14, 0x25, 0x79, 0x7e, 0xcf, 0xf4, 0xac, 0x90,
-	0xaa, 0xc8, 0x6c, 0x17, 0xf6, 0x2f, 0xc5, 0xf7, 0x25, 0xe2, 0x90, 0xaa, 0x6a, 0x96, 0x6d, 0xd7,
-	0xe4, 0x36, 0x0b, 0x68, 0xcf, 0x95, 0x19, 0x2b, 0x57, 0xac, 0xbc, 0x59, 0xb5, 0xf3, 0xa6, 0xeb,
-	0x32, 0x2e, 0x37, 0x3d, 0xd8, 0x3d, 0x0b, 0xbb, 0xf2, 0x6b, 0xcf, 0xbf, 0x9b, 0x37, 0xdd, 0xc3,
-	0x60, 0x4b, 0x29, 0x31, 0x94, 0xa9, 0xea, 0x03, 0xb6, 0x5e, 0x4c, 0x34, 0xd6, 0xdb, 0x37, 0x6b,
-	0x56, 0x49, 0x91, 0xd0, 0x75, 0x3c, 0xf1, 0xb6, 0x00, 0xb6, 0xcb, 0x58, 0x45, 0xb7, 0xee, 0xfb,
-	0x96, 0xc7, 0xc9, 0x65, 0xfc, 0x9c, 0x30, 0xdf, 0xb0, 0x4b, 0x19, 0x74, 0x01, 0x5d, 0x1c, 0x5a,
-	0x23, 0x47, 0xf5, 0xdc, 0xd8, 0xa1, 0xe9, 0x54, 0x56, 0x28, 0x6c, 0x50, 0x7d, 0x58, 0xfc, 0x2b,
-	0x94, 0x56, 0x06, 0x33, 0x88, 0xde, 0xc2, 0x93, 0x31, 0x21, 0x5e, 0x95, 0xb9, 0x9e, 0x45, 0xae,
-	0xe2, 0x21, 0x41, 0x22, 0x45, 0x9c, 0xb8, 0x32, 0xa5, 0x29, 0x0b, 0xb4, 0xc0, 0x02, 0x6d, 0xd5,
-	0x3d, 0x5c, 0x1b, 0xfd, 0xf3, 0xef, 0x16, 0x8e, 0x0b, 0xae, 0x82, 0x2e, 0x89, 0xa5, 0xb4, 0xef,
-	0xc4, 0xa4, 0x79, 0x01, 0xa6, 0x4d, 0x8c, 0x23, 0x97, 0x65, 0x06, 0xa5, 0xcc, 0x59, 0x0d, 0xac,
-	0x15, 0xfe, 0xd5, 0x54, 0x46, 0x80, 0x91, 0xda, 0xae, 0x59, 0xb6, 0x80, 0x57, 0x8f, 0x71, 0xd2,
-	0x1f, 0x23, 0x4c, 0xe2, 0xd2, 0x01, 0xec, 0xab, 0xf8, 0xb8, 0xd0, 0xef, 0x65, 0xd0, 0x85, 0x63,
-	0xdd, 0xa0, 0x55, 0xd4, 0xe4, 0x46, 0x02, 0xaa, 0xb9, 0x8e, 0xa8, 0x94, 0xce, 0x06, 0x58, 0x59,
-	0x3c, 0x25, 0x51, 0xdd, 0xf6, 0x9d, 0xb8, 0xd9, 0xd2, 0x1f, 0xb7, 0xf1, 0xe9, 0xa6, 0x3d, 0x00,
-	0xbd, 0x84, 0x47, 0x5d, 0xdf, 0x31, 0x02, 0xe0, 0x22, 0x52, 0x53, 0x47, 0xf5, 0xdc, 0x84, 0x8a,
-	0x54, 0xb8, 0x45, 0xf5, 0x11, 0x17, 0x58, 0xa5, 0xbc, 0x75, 0xd0, 0x25, 0x56, 0xde, 0x39, 0xac,
-	0x5a, 0xfd, 0x84, 0x9d, 0x6e, 0x01, 0xa8, 0x48, 0x48, 0x04, 0x4a, 0x12, 0xf3, 0xc3, 0xaa, 0x25,
-	0xe5, 0x8c, 0xc6, 0x41, 0x85, 0x5b, 0x54, 0x1f, 0xa9, 0x02, 0x2b, 0xfd, 0x3d, 0xc2, 0x33, 0x52,
-	0xd8, 0xba, 0x59, 0x29, 0x6e, 0x31, 0xdb, 0x15, 0x42, 0xef, 0x88, 0x2c, 0xf5, 0xfa, 0xc1, 0x46,
-	0xf6, 0xf1, 0x28, 0x67, 0xf7, 0x2c, 0xd7, 0x33, 0x6c, 0x11, 0x14, 0x11, 0xd0, 0xb3, 0x0d, 0x41,
-	0x09, 0xc2, 0xb1, 0xce, 0x6c, 0x77, 0x6d, 0xf1, 0x51, 0x3d, 0x37, 0xf0, 0xdb, 0x7f, 0xe6, 0x2e,
-	0x96, 0x6d, 0xbe, 0xef, 0xef, 0x69, 0x45, 0xe6, 0xc0, 0x29, 0x82, 0x9f, 0x05, 0xaf, 0x74, 0x2f,
-	0x2f, 0x30, 0x7b, 0x92, 0xc1, 0xd3, 0x47, 0x94, 0xf4, 0x82, 0x4b, 0x3f, 0x1c, 0xc4, 0xb9, 0xb6,
-	0xc8, 0xc1, 0x21, 0x1e, 0x9e, 0x90, 0x27, 0xce, 0x60, 0x3e, 0x37, 0x4c, 0x87, 0xf9, 0x2e, 0x07,
-	0xbf, 0x14, 0x84, 0xe6, 0x7f, 0xd4, 0x73, 0xb3, 0x5d, 0x68, 0x2e, 0xb8, 0xfc, 0xa8, 0x9e, 0x3b,
-	0xa3, 0x2c, 0x6e, 0x96, 0x47, 0xf5, 0x31, 0xb9, 0xb4, 0xe3, 0xf3, 0x55, 0xb9, 0x40, 0xde, 0xc5,
-	0x18, 0x5c, 0xc0, 0x7c, 0xfe, 0x2c, 0x7c, 0x00, 0x1e, 0xde, 0xf1, 0x39, 0xfd, 0x39, 0xc2, 0x73,
-	0xa1, 0x13, 0x36, 0x0e, 0x6c, 0x2e, 0x9c, 0x20, 0xa9, 0x36, 0x6b, 0xcc, 0x69, 0x8c, 0xe3, 0x99,
-	0xa6, 0x38, 0x86, 0x31, 0xfb, 0x06, 0x1e, 0x57, 0x56, 0xd9, 0x6e, 0xe0, 0xa4, 0x41, 0xe9, 0x24,
-	0xad, 0x37, 0x27, 0xe9, 0xa7, 0xa4, 0x98, 0x82, 0xab, 0x1c, 0x41, 0x3f, 0x41, 0xf8, 0x62, 0x67,
-	0x70, 0x10, 0xaa, 0x46, 0xaf, 0xa1, 0x67, 0xea, 0xb5, 0x0d, 0xfc, 0x42, 0x78, 0x80, 0x76, 0xcd,
-	0x9a, 0xe9, 0xf4, 0x95, 0xeb, 0xf4, 0x06, 0x3e, 0xd3, 0x22, 0x06, 0xac, 0x99, 0xc7, 0xc3, 0x55,
-	0xb9, 0x92, 0x56, 0x82, 0x75, 0xa0, 0xa1, 0x6f, 0xc3, 0x19, 0x7c, 0x87, 0x71, 0xb3, 0x22, 0xa4,
-	0xdd, 0xb2, 0xef, 0xfb, 0x76, 0xc9, 0xe6, 0x87, 0x7d, 0x5f, 0x0b, 0x9f, 0x22, 0x38, 0x1d, 0x49,
-	0x32, 0x01, 0xe4, 0x43, 0x3c, 0x5a, 0x09, 0x16, 0x3b, 0x7b, 0xfc, 0x2d, 0xe1, 0xf1, 0xa8, 0x9a,
-	0x84, 0x9c, 0xb4, 0xb7, 0x28, 0x84, 0x7c, 0x12, 0xe6, 0x26, 0xb8, 0x50, 0xa2, 0xec, 0xbf, 0xec,
-	0x50, 0x1f, 0x67, 0x5a, 0xe5, 0x80, 0x99, 0xdf, 0xc2, 0x27, 0xb9, 0x58, 0x36, 0x64, 0x76, 0x06,
-	0x11, 0x49, 0xb1, 0x74, 0x1a, 0x2c, 0x7d, 0x5e, 0x29, 0x8b, 0x33, 0x53, 0xfd, 0x04, 0x8f, 0x54,
-	0xd0, 0x3f, 0x20, 0xfc, 0x52, 0x4b, 0x0d, 0xba, 0xcd, 0xee, 0x3c, 0x30, 0xab, 0x5f, 0x8a, 0x1a,
-	0xfa, 0x19, 0xc2, 0x2f, 0x77, 0xc0, 0x0f, 0x4e, 0xfc, 0xa0, 0xb7, 0xe3, 0xb9, 0x01, 0x2e, 0x9c,
-	0x0c, 0x5c, 0x18, 0xb0, 0xd2, 0x3e, 0xcf, 0x2c, 0xd9, 0xc6, 0x58, 0x85, 0x00, 0xaa, 0x6a, 0x3f,
-	0xf5, 0x69, 0x54, 0x49, 0x10, 0x25, 0xe0, 0xbf, 0x08, 0x2e, 0xd1, 0x3b, 0x55, 0xc6, 0x77, 0x6b,
-	0x76, 0xb1, 0xaf, 0xab, 0x98, 0x6c, 0xe0, 0x09, 0x61, 0xbc, 0x61, 0x7a, 0x9e, 0xc5, 0x8d, 0x92,
-	0xe5, 0x32, 0x07, 0xb0, 0x4d, 0x47, 0x57, 0x46, 0x33, 0x05, 0xd5, 0xc7, 0xc4, 0xd2, 0xaa, 0x58,
-	0x79, 0x4b, 0x2c, 0x90, 0x9b, 0x78, 0xf2, 0xbe, 0xcf, 0x78, 0xa3, 0x9c, 0x63, 0x52, 0xce, 0xb9,
-	0xa3, 0x7a, 0x2e, 0xa3, 0xe4, 0xb4, 0x90, 0x50, 0x7d, 0x5c, 0xae, 0x45, 0x92, 0xc4, 0xa1, 0xda,
-	0x1a, 0x1a, 0x19, 0x9a, 0x38, 0xae, 0x9f, 0x78, 0x60, 0xf3, 0x7d, 0x11, 0xc9, 0x4d, 0xcb, 0xa2,
-	0x7f, 0x44, 0x78, 0x3a, 0x6a, 0xbd, 0xbe, 0x69, 0xf3, 0xfd, 0x4d, 0xbb, 0xc2, 0xad, 0x5a, 0x60,
-	0xf4, 0x35, 0x7c, 0xca, 0xb1, 0x5d, 0x23, 0x5e, 0x0e, 0x84, 0xf2, 0xcc, 0x51, 0x3d, 0x37, 0xa5,
-	0x94, 0x37, 0x6c, 0x53, 0xfd, 0xa4, 0x63, 0xbb, 0x61, 0x45, 0x21, 0xd3, 0xf1, 0xc6, 0x43, 0xda,
-	0x1f, 0xb5, 0x18, 0x4d, 0xed, 0xe3, 0xb1, 0xbe, 0xdb, 0xc7, 0x5f, 0x22, 0x7c, 0x2e, 0xd9, 0x86,
-	0x2f, 0x48, 0x23, 0xa9, 0xc3, 0xb5, 0x12, 0x4b, 0x29, 0x40, 0xb6, 0x8c, 0xb1, 0x57, 0x65, 0xdc,
-	0xa8, 0x8a, 0x55, 0xf0, 0xed, 0xe9, 0xe8, 0x78, 0x44, 0x7b, 0x54, 0x1f, 0xf5, 0x02, 0x6e, 0x59,
-	0x20, 0x7f, 0x30, 0x88, 0xcf, 0x2b, 0xa1, 0x0f, 0xcc, 0xea, 0xc6, 0x81, 0x59, 0x84, 0x2e, 0xa3,
-	0xe0, 0x06, 0xa1, 0x7b, 0x05, 0x0f, 0x7b, 0x96, 0x5b, 0xb2, 0x6a, 0x20, 0x77, 0xf2, 0xa8, 0x9e,
-	0x3b, 0x05, 0x72, 0xe5, 0x3a, 0xd5, 0x81, 0x20, 0x9e, 0xda, 0x83, 0x1d, 0x53, 0x5b, 0xc3, 0xaa,
-	0x4e, 0x88, 0x22, 0xa4, 0x52, 0xf1, 0xf9, 0xa3, 0x7a, 0x6e, 0x3c, 0x76, 0xa0, 0x0d, 0xdb, 0xa5,
-	0xfa, 0x73, 0xf2, 0x6f, 0xc1, 0x25, 0xdf, 0xc5, 0xc3, 0xf2, 0x7d, 0xe6, 0x65, 0x86, 0xa4, 0xfb,
-	0x35, 0x2d, 0x78, 0x1a, 0xc6, 0xde, 0x73, 0xa1, 0x13, 0x85, 0x39, 0xa1, 0x25, 0x82, 0x6d, 0xed,
-	0x34, 0x94, 0x0c, 0xc0, 0xae, 0x64, 0x51, 0x1d, 0x84, 0x4a, 0x67, 0xfc, 0x2c, 0x68, 0x56, 0x13,
-	0x9c, 0x11, 0x75, 0x7c, 0x0a, 0xdb, 0xff, 0xaf, 0xe3, 0x6b, 0x96, 0x47, 0xf5, 0x31, 0xb9, 0x14,
-	0x76, 0x7c, 0x12, 0xdb, 0xc7, 0x83, 0xc9, 0xd8, 0x76, 0x7c, 0xfe, 0xac, 0x23, 0xf5, 0xbd, 0xd0,
-	0xf3, 0xc7, 0xa4, 0xe7, 0xf3, 0x5d, 0x7a, 0x5e, 0x40, 0xeb, 0xc2, 0xf5, 0xe2, 0x59, 0x11, 0xfa,
-	0x20, 0x33, 0xd4, 0xfc, 0xac, 0x08, 0xb7, 0x28, 0x5c, 0x2c, 0x3b, 0xbe, 0xf2, 0xc8, 0x4f, 0x83,
-	0x16, 0x24, 0xc9, 0x23, 0x10, 0xae, 0x2a, 0x1e, 0x0f, 0x52, 0xa9, 0x31, 0x5a, 0x37, 0x7b, 0x8e,
-	0xd6, 0x0b, 0x8d, 0x99, 0x19, 0x06, 0xeb, 0x14, 0x24, 0x68, 0x2c, 0x56, 0xe7, 0x70, 0x36, 0xea,
-	0x16, 0x9a, 0x7b, 0x2d, 0xfa, 0x8b, 0xa0, 0x56, 0x36, 0x6f, 0x7f, 0x21, 0xda, 0x26, 0x5a, 0xc6,
-	0x97, 0xd4, 0x95, 0xcd, 0xdc, 0xa2, 0xe5, 0xf2, 0x9a, 0xc9, 0xad, 0x92, 0xac, 0x67, 0xa5, 0x5b,
-	0xb6, 0x7b, 0x4f, 0x74, 0xd6, 0xeb, 0x9b, 0xdb, 0xdb, 0x41, 0xce, 0xbd, 0x86, 0x4f, 0x16, 0xef,
-	0x3a, 0xea, 0x35, 0x1a, 0x5d, 0x69, 0x67, 0xa2, 0xee, 0x26, 0xbe, 0x4b, 0x75, 0x2c, 0x3e, 0x95,
-	0x34, 0x6a, 0xe0, 0xcb, 0x5d, 0x29, 0x02, 0xb7, 0x2c, 0xe2, 0xa9, 0x62, 0x8c, 0xb2, 0x51, 0xa3,
-	0x4e, 0x8a, 0x2d, 0x52, 0xe8, 0x5c, 0xd0, 0x7c, 0x6c, 0x6e, 0x6f, 0x37, 0x2b, 0x11, 0x2a, 0x82,
-	0xee, 0x89, 0x3e, 0xc4, 0xb3, 0x9d, 0x08, 0x01, 0xc4, 0x1d, 0x3c, 0xe9, 0xd8, 0xe5, 0x9a, 0xac,
-	0xc7, 0x46, 0xcd, 0x2a, 0xb2, 0x5a, 0x29, 0x68, 0xf8, 0x66, 0xb5, 0xa4, 0x51, 0x95, 0xb6, 0x1d,
-	0x90, 0xeb, 0x8a, 0x5a, 0x9f, 0x70, 0x9a, 0x56, 0xae, 0x7c, 0x94, 0xc1, 0xc7, 0xa5, 0x7e, 0xf2,
-	0x01, 0x96, 0x57, 0x87, 0x47, 0xe6, 0x92, 0x85, 0xb5, 0xcc, 0x4e, 0xb2, 0x17, 0x3b, 0x13, 0x2a,
-	0xe8, 0xf4, 0x2b, 0x1f, 0xfe, 0xf5, 0xdf, 0x3f, 0x1a, 0x3c, 0x4f, 0xa6, 0xf3, 0x89, 0x93, 0x23,
-	0x75, 0x57, 0x7d, 0x8c, 0xf0, 0x48, 0x30, 0x8b, 0x20, 0x97, 0x52, 0x64, 0x37, 0x0d, 0x33, 0xb2,
-	0x97, 0xbb, 0xa2, 0x05, 0x28, 0x97, 0x24, 0x94, 0x17, 0x49, 0x2e, 0x19, 0x4a, 0x38, 0xdd, 0xf8,
-	0x68, 0x10, 0x91, 0x4f, 0x11, 0x1e, 0x6b, 0x3c, 0x28, 0x64, 0x31, 0x45, 0x57, 0xe2, 0x91, 0xcb,
-	0x2e, 0xf5, 0xc0, 0x01, 0x18, 0x17, 0x24, 0xc6, 0x39, 0xf2, 0x72, 0x32, 0x46, 0xd5, 0xb4, 0x87,
-	0xa7, 0x86, 0xfc, 0x1a, 0xe1, 0xf1, 0xa6, 0xbe, 0x81, 0x2c, 0x75, 0x8a, 0x4d, 0x4b, 0x9f, 0x94,
-	0xbd, 0xd2, 0x0b, 0x0b, 0x20, 0x9d, 0x97, 0x48, 0x67, 0xc9, 0x4b, 0xc9, 0x48, 0xef, 0x4a, 0x6a,
-	0x38, 0x30, 0x1e, 0xf9, 0x3e, 0xc2, 0x43, 0x42, 0x12, 0x99, 0xed, 0xa0, 0x2a, 0x80, 0x34, 0xd7,
-	0x91, 0x0e, 0x70, 0x2c, 0xa6, 0x7b, 0x4c, 0xaa, 0xcf, 0xbf, 0x0f, 0xc7, 0xf6, 0xa1, 0x88, 0xed,
-	0x27, 0x08, 0x8f, 0x04, 0x43, 0xa6, 0xd4, 0x6c, 0x6b, 0x1a, 0x67, 0xa5, 0x66, 0x5b, 0xf3, 0xd4,
-	0x8a, 0x2e, 0x49, 0x5c, 0x97, 0xc9, 0x2b, 0xed, 0x71, 0xc9, 0xc6, 0x32, 0xc2, 0x46, 0x7e, 0x82,
-	0x70, 0xa6, 0xdd, 0x93, 0x85, 0xac, 0xa4, 0x28, 0xef, 0xf0, 0x4e, 0xcb, 0x7e, 0xbd, 0x2f, 0x5e,
-	0x30, 0x64, 0x80, 0xfc, 0x09, 0x61, 0xd2, 0x3a, 0x8e, 0x22, 0xcb, 0x5d, 0x4a, 0x6d, 0xc4, 0xf2,
-	0x6a, 0x8f, 0x5c, 0x80, 0xe2, 0xba, 0x74, 0xe7, 0x0a, 0xf9, 0x5a, 0x57, 0x61, 0xce, 0xbf, 0xcb,
-	0x6c, 0xd7, 0x90, 0xd3, 0x75, 0x4b, 0x5c, 0xd1, 0x86, 0xed, 0x92, 0xff, 0x20, 0x3c, 0x9d, 0x32,
-	0xb2, 0x21, 0xd7, 0x3a, 0x00, 0x4b, 0x9f, 0x43, 0x65, 0xdf, 0xe8, 0x97, 0x1d, 0x0c, 0xbc, 0x21,
-	0x0d, 0x5c, 0x25, 0x6f, 0x76, 0x67, 0xa0, 0x75, 0x60, 0x73, 0x65, 0xa0, 0x1a, 0x72, 0xa9, 0xbe,
-	0x40, 0xd8, 0xf9, 0x2b, 0x84, 0x71, 0x34, 0xbb, 0x21, 0xf3, 0x1d, 0x92, 0xb6, 0x61, 0x52, 0x94,
-	0x5d, 0xe8, 0x92, 0x1a, 0x40, 0x2f, 0x4b, 0xd0, 0x1a, 0x99, 0xef, 0x0e, 0xb4, 0x1a, 0x0c, 0x91,
-	0x47, 0x08, 0x93, 0xd6, 0x01, 0x4e, 0x6a, 0x3e, 0xb5, 0x9d, 0x21, 0xa5, 0xe6, 0x53, 0xfb, 0x29,
-	0x11, 0xdd, 0x90, 0xc8, 0x5f, 0x27, 0x2b, 0xdd, 0x21, 0x57, 0x85, 0x57, 0x7e, 0x86, 0xd5, 0x57,
-	0xd4, 0x92, 0xdf, 0x20, 0x7c, 0x22, 0x36, 0x9d, 0x21, 0x0b, 0x9d, 0xd0, 0x34, 0x26, 0x8d, 0xd6,
-	0x2d, 0x39, 0xa0, 0x5e, 0x91, 0xa8, 0x97, 0xc9, 0x95, 0x5e, 0x50, 0xab, 0xf1, 0x80, 0xc8, 0x8b,
-	0xd1, 0xf0, 0x0d, 0x47, 0xd2, 0x6a, 0x59, 0xf3, 0xf0, 0x20, 0x3b, 0xdf, 0x1d, 0x31, 0x80, 0xfc,
-	0x6a, 0x8f, 0x49, 0x21, 0x98, 0xe5, 0xa5, 0xfb, 0x18, 0xe1, 0xb3, 0x1b, 0x1e, 0xb7, 0x1d, 0x93,
-	0x5b, 0x2d, 0x6f, 0x21, 0x72, 0x35, 0x0d, 0x44, 0x9b, 0x67, 0x64, 0x76, 0xb9, 0x37, 0x26, 0xb0,
-	0xe0, 0xa6, 0xb4, 0xe0, 0x4d, 0x72, 0x2d, 0xd9, 0x82, 0xd8, 0x29, 0x04, 0xb4, 0xf9, 0x58, 0xa9,
-	0x09, 0x4f, 0xa2, 0x30, 0xe9, 0x6f, 0x08, 0x67, 0xdb, 0x98, 0xb4, 0xe3, 0x73, 0xd2, 0x03, 0xbc,
-	0xe8, 0xc5, 0x95, 0x9a, 0xf2, 0xed, 0x5f, 0x25, 0xb4, 0x20, 0xad, 0xba, 0x4e, 0xde, 0xf8, 0x1c,
-	0x56, 0x31, 0x9f, 0x0b, 0xb3, 0x3e, 0x43, 0x78, 0x26, 0xbd, 0x81, 0x26, 0xd7, 0xd3, 0xea, 0x61,
-	0x37, 0x4d, 0x7e, 0x76, 0xf5, 0x73, 0x48, 0x00, 0x93, 0x77, 0xa5, 0xc9, 0x5b, 0xe4, 0x66, 0xb2,
-	0xc9, 0x49, 0x9d, 0xbd, 0x51, 0xb1, 0xdd, 0x7b, 0xc6, 0xdd, 0x1a, 0x73, 0x0c, 0xf1, 0x6a, 0xc8,
-	0xbf, 0x1f, 0x7f, 0x4a, 0x3c, 0x24, 0x7f, 0x41, 0xf8, 0x6c, 0xdb, 0x86, 0x9d, 0xa4, 0x5e, 0xb4,
-	0x1d, 0xde, 0x03, 0xd9, 0xd7, 0xfb, 0x63, 0xee, 0xae, 0x34, 0x48, 0x2b, 0x5a, 0xed, 0x15, 0xc6,
-	0x7a, 0x6b, 0x5b, 0x8f, 0x9e, 0xcc, 0xa0, 0xc7, 0x4f, 0x66, 0xd0, 0xbf, 0x9e, 0xcc, 0xa0, 0x1f,
-	0x3e, 0x9d, 0x19, 0x78, 0xfc, 0x74, 0x66, 0xe0, 0xef, 0x4f, 0x67, 0x06, 0xbe, 0xbd, 0x18, 0x7b,
-	0xcb, 0x81, 0xdc, 0x85, 0x8a, 0xb9, 0xe7, 0x85, 0x4a, 0xde, 0x5b, 0x7a, 0x2d, 0x7f, 0xa0, 0x54,
-	0xc9, 0x97, 0xdd, 0xde, 0xb0, 0x9c, 0x4b, 0x5d, 0xfd, 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x7c,
-	0xda, 0xc3, 0x57, 0x65, 0x1f, 0x00, 0x00,
+	// 2062 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x58, 0x4d, 0x6c, 0x5c, 0x57,
+	0x15, 0xf6, 0x75, 0x1c, 0xd7, 0x3e, 0x49, 0xfc, 0x73, 0xeb, 0x34, 0x93, 0x71, 0xe2, 0x49, 0x2f,
+	0xad, 0x9d, 0x26, 0xf6, 0x1b, 0x3b, 0x71, 0xd5, 0xd6, 0x24, 0x6d, 0x6c, 0xd7, 0x4e, 0x6c, 0xc5,
+	0xb1, 0xfb, 0x52, 0x09, 0x01, 0x82, 0xa7, 0xe7, 0x99, 0x97, 0xf1, 0xab, 0xe7, 0xbd, 0x3b, 0x99,
+	0x77, 0x5f, 0x63, 0xab, 0x8a, 0x2a, 0xb1, 0x40, 0x29, 0x9b, 0x22, 0x01, 0x5d, 0x21, 0xd8, 0x54,
+	0x08, 0xb1, 0x46, 0x62, 0xc5, 0x02, 0xb1, 0x89, 0x58, 0x45, 0xc0, 0x02, 0xb1, 0x18, 0x50, 0x02,
+	0xac, 0xd8, 0xe0, 0x0d, 0x5b, 0x74, 0x7f, 0xde, 0xcf, 0xcc, 0xbc, 0x79, 0xf3, 0x53, 0x45, 0x0a,
+	0x2b, 0x7b, 0xee, 0x3d, 0xe7, 0xdc, 0xef, 0x3b, 0xe7, 0xdc, 0xf3, 0xce, 0x3d, 0x70, 0x81, 0x7a,
+	0x0e, 0xf5, 0x6c, 0x2f, 0x5f, 0x32, 0x1d, 0x27, 0xff, 0xf1, 0xc2, 0xae, 0xc5, 0xcc, 0x85, 0xfc,
+	0x7d, 0xdf, 0xaa, 0x1e, 0x6a, 0x95, 0x2a, 0x65, 0x14, 0x4f, 0x28, 0x09, 0x8d, 0x4b, 0x68, 0x4a,
+	0x22, 0x3b, 0x51, 0xa2, 0x25, 0x2a, 0x04, 0xf2, 0xfc, 0x3f, 0x29, 0x9b, 0x3d, 0x9f, 0x68, 0x8d,
+	0x1d, 0xa8, 0xed, 0xd9, 0x60, 0xbb, 0x42, 0x69, 0xd9, 0x31, 0x5d, 0xb3, 0x64, 0x55, 0x43, 0x29,
+	0xef, 0x81, 0x59, 0x31, 0xaa, 0xd4, 0x67, 0x96, 0x92, 0x9e, 0x2a, 0x08, 0xf1, 0xfc, 0xae, 0xe9,
+	0x59, 0xa1, 0x54, 0x81, 0xda, 0xae, 0xda, 0xbf, 0x14, 0xdf, 0x17, 0x88, 0x43, 0xa9, 0x8a, 0x59,
+	0xb2, 0x5d, 0x93, 0xd9, 0x34, 0x90, 0x3d, 0x57, 0xa2, 0xb4, 0x54, 0xb6, 0xf2, 0x66, 0xc5, 0xce,
+	0x9b, 0xae, 0x4b, 0x99, 0xd8, 0xf4, 0xd4, 0xee, 0x59, 0xb5, 0x2b, 0x7e, 0xed, 0xfa, 0xf7, 0xf2,
+	0xa6, 0x7b, 0x18, 0x6c, 0xc9, 0x43, 0x0c, 0x49, 0x55, 0xfe, 0x50, 0x5b, 0xaf, 0x26, 0x92, 0xf5,
+	0xf6, 0xcc, 0xaa, 0x55, 0x94, 0x22, 0x64, 0x15, 0xc6, 0x3e, 0xe0, 0xc0, 0x76, 0x28, 0x2d, 0xeb,
+	0xd6, 0x7d, 0xdf, 0xf2, 0x18, 0xbe, 0x0c, 0x2f, 0x71, 0xfa, 0x86, 0x5d, 0xcc, 0xa0, 0x0b, 0xe8,
+	0xe2, 0xc0, 0x0a, 0x3e, 0xaa, 0xe5, 0x46, 0x0e, 0x4d, 0xa7, 0xbc, 0x44, 0xd4, 0x06, 0xd1, 0x07,
+	0xf9, 0x7f, 0x1b, 0xc5, 0xa5, 0xfe, 0x0c, 0x22, 0xb7, 0x61, 0x3c, 0x66, 0xc4, 0xab, 0x50, 0xd7,
+	0xb3, 0xf0, 0x55, 0x18, 0xe0, 0x22, 0xc2, 0xc4, 0x89, 0x2b, 0x13, 0x9a, 0x64, 0xa0, 0x05, 0x0c,
+	0xb4, 0x65, 0xf7, 0x70, 0x65, 0xf8, 0x0f, 0xbf, 0x9e, 0x3b, 0xce, 0xb5, 0x36, 0x74, 0x21, 0x2c,
+	0xac, 0x7d, 0x3b, 0x66, 0xcd, 0x0b, 0x30, 0xad, 0x03, 0x44, 0x2e, 0xcb, 0xf4, 0x0b, 0x9b, 0xd3,
+	0x9a, 0x62, 0xcb, 0xfd, 0xab, 0xc9, 0x8c, 0x50, 0x24, 0xb5, 0x1d, 0xb3, 0x64, 0x29, 0x5d, 0x3d,
+	0xa6, 0x49, 0x7e, 0x8c, 0x00, 0xc7, 0xad, 0x2b, 0xb0, 0x6f, 0xc2, 0x71, 0x7e, 0xbe, 0x97, 0x41,
+	0x17, 0x8e, 0x75, 0x82, 0x56, 0x4a, 0xe3, 0x9b, 0x09, 0xa8, 0x66, 0xda, 0xa2, 0x92, 0x67, 0xd6,
+	0xc1, 0xca, 0xc2, 0x84, 0x40, 0x75, 0xc7, 0x77, 0xe2, 0xb4, 0x85, 0x3f, 0xee, 0xc0, 0xe9, 0x86,
+	0x3d, 0x05, 0x7a, 0x01, 0x86, 0x5d, 0xdf, 0x31, 0x02, 0xe0, 0x3c, 0x52, 0x13, 0x47, 0xb5, 0xdc,
+	0x98, 0x8c, 0x54, 0xb8, 0x45, 0xf4, 0x21, 0x57, 0xa9, 0x0a, 0x7b, 0xab, 0xea, 0x2c, 0xbe, 0xf2,
+	0xe1, 0x61, 0xc5, 0xea, 0x25, 0xec, 0x64, 0x53, 0x81, 0x8a, 0x8c, 0x44, 0xa0, 0x84, 0x30, 0x3b,
+	0xac, 0x58, 0xc2, 0xce, 0x70, 0x1c, 0x54, 0xb8, 0x45, 0xf4, 0xa1, 0x8a, 0x52, 0x25, 0xbf, 0x41,
+	0x30, 0x25, 0x8c, 0xad, 0x9a, 0xe5, 0xc2, 0x26, 0xb5, 0x5d, 0x6e, 0xf4, 0x2e, 0xcf, 0x52, 0xaf,
+	0x17, 0x6c, 0x78, 0x0f, 0x86, 0x19, 0xdd, 0xb7, 0x5c, 0xcf, 0xb0, 0x79, 0x50, 0x78, 0x40, 0xcf,
+	0xd6, 0x05, 0x25, 0x08, 0xc7, 0x2a, 0xb5, 0xdd, 0x95, 0xf9, 0xc7, 0xb5, 0x5c, 0xdf, 0xaf, 0xfe,
+	0x96, 0xbb, 0x58, 0xb2, 0xd9, 0x9e, 0xbf, 0xab, 0x15, 0xa8, 0xa3, 0x6e, 0x91, 0xfa, 0x33, 0xe7,
+	0x15, 0xf7, 0xf3, 0x1c, 0xb3, 0x27, 0x14, 0x3c, 0x7d, 0x48, 0x5a, 0xdf, 0x70, 0xc9, 0x7f, 0x10,
+	0xe4, 0x5a, 0x22, 0x57, 0x0e, 0xd9, 0x85, 0x31, 0x71, 0xe3, 0x0c, 0xea, 0x33, 0xc3, 0x74, 0xa8,
+	0xef, 0x32, 0xe5, 0x97, 0xb7, 0xf9, 0xc9, 0x7f, 0xad, 0xe5, 0x4e, 0xcb, 0x73, 0xbc, 0xe2, 0xbe,
+	0x66, 0xd3, 0xbc, 0x63, 0xb2, 0x3d, 0x6d, 0xc3, 0x65, 0x47, 0xb5, 0xdc, 0x19, 0x49, 0xb0, 0x51,
+	0x9d, 0xe8, 0x23, 0x62, 0x69, 0xdb, 0x67, 0xcb, 0x62, 0x01, 0x7f, 0x04, 0xa0, 0x18, 0x53, 0x9f,
+	0x3d, 0x0f, 0xca, 0xca, 0xa1, 0xdb, 0x3e, 0x23, 0x9f, 0x21, 0x98, 0x09, 0x39, 0xaf, 0x1d, 0xd8,
+	0x8c, 0x73, 0x16, 0x52, 0xeb, 0x55, 0xea, 0xd4, 0x87, 0xed, 0x4c, 0x43, 0xd8, 0xc2, 0x10, 0xad,
+	0xc1, 0xa8, 0x64, 0x65, 0xbb, 0x81, 0x4f, 0xfa, 0x85, 0x4f, 0xce, 0xa7, 0xfa, 0x44, 0x3f, 0x25,
+	0xb4, 0x36, 0x5c, 0xc9, 0x9b, 0x7c, 0x81, 0xe0, 0x62, 0x7b, 0x2c, 0x2a, 0x10, 0xf5, 0x4e, 0x42,
+	0xcf, 0xd5, 0x49, 0x6b, 0xf0, 0x4a, 0x78, 0x3d, 0x76, 0xcc, 0xaa, 0xe9, 0xf4, 0x94, 0xc9, 0xe4,
+	0x26, 0x9c, 0x69, 0x32, 0xa3, 0xd8, 0xcc, 0xc2, 0x60, 0x45, 0xac, 0xa4, 0x15, 0x58, 0x5d, 0xc9,
+	0x90, 0x0f, 0xd4, 0x0d, 0xfb, 0x90, 0x32, 0xb3, 0xcc, 0xad, 0xdd, 0xb6, 0xef, 0xfb, 0x76, 0xd1,
+	0x66, 0x87, 0x3d, 0x17, 0xfd, 0x2f, 0x83, 0xdc, 0x4f, 0xb2, 0xa9, 0x40, 0x3e, 0x84, 0xe1, 0x72,
+	0xb0, 0xd8, 0xde, 0xe3, 0xef, 0x73, 0x8f, 0x47, 0xb5, 0x22, 0xd4, 0x24, 0xdd, 0x45, 0x21, 0xd4,
+	0x13, 0x30, 0xd7, 0x95, 0x0b, 0x05, 0xca, 0xde, 0x8b, 0x0a, 0xf1, 0x21, 0xd3, 0x6c, 0x47, 0xd1,
+	0xfc, 0x26, 0x9c, 0x64, 0x7c, 0xd9, 0x10, 0xd9, 0x19, 0x44, 0x24, 0x85, 0xe9, 0xa4, 0x62, 0xfa,
+	0xb2, 0x3c, 0x2c, 0xae, 0x4c, 0xf4, 0x13, 0x2c, 0x3a, 0x82, 0xfc, 0x16, 0xc1, 0x6b, 0x4d, 0x15,
+	0xe6, 0x0e, 0xbd, 0xfb, 0xc0, 0xac, 0xfc, 0x5f, 0x54, 0xc8, 0x7f, 0x21, 0x78, 0xbd, 0x0d, 0x7e,
+	0xe5, 0xc4, 0x4f, 0xbb, 0xbb, 0x9e, 0x6b, 0xca, 0x85, 0xe3, 0x81, 0x0b, 0x03, 0x55, 0xd2, 0xe3,
+	0x9d, 0xc5, 0xd7, 0x00, 0x64, 0x08, 0x54, 0x11, 0xed, 0xa0, 0x1c, 0x0d, 0x4b, 0x05, 0x7e, 0xe3,
+	0xff, 0x8d, 0xd4, 0x17, 0xf1, 0x6e, 0x85, 0xb2, 0x9d, 0xaa, 0x5d, 0xe8, 0xe9, 0xbb, 0x8a, 0xd7,
+	0x60, 0x8c, 0x73, 0x35, 0x4c, 0xcf, 0xb3, 0x98, 0x51, 0xb4, 0x5c, 0xea, 0x28, 0x28, 0x93, 0xd1,
+	0x07, 0xa1, 0x51, 0x82, 0xe8, 0x23, 0x7c, 0x69, 0x99, 0xaf, 0xbc, 0xcf, 0x17, 0xf0, 0x2d, 0x18,
+	0xbf, 0xef, 0x53, 0x56, 0x6f, 0xe7, 0x98, 0xb0, 0x73, 0xee, 0xa8, 0x96, 0xcb, 0x48, 0x3b, 0x4d,
+	0x22, 0x44, 0x1f, 0x15, 0x6b, 0x91, 0x25, 0x7e, 0x87, 0x36, 0x07, 0x86, 0x06, 0xc6, 0x8e, 0xeb,
+	0x27, 0x1e, 0xd8, 0x6c, 0x8f, 0x07, 0x6e, 0xdd, 0xb2, 0xc8, 0xef, 0x10, 0x4c, 0x46, 0x7d, 0xd4,
+	0x37, 0x6c, 0xb6, 0xb7, 0x6e, 0x97, 0x99, 0x55, 0x0d, 0x48, 0x5f, 0x87, 0x53, 0x8e, 0xed, 0x1a,
+	0xf1, 0xdb, 0xcf, 0x0f, 0xcf, 0x1c, 0xd5, 0x72, 0x13, 0xf2, 0xf0, 0xba, 0x6d, 0xa2, 0x9f, 0x74,
+	0x6c, 0x37, 0x2c, 0x20, 0x78, 0x32, 0xde, 0x45, 0x08, 0xfe, 0x51, 0xbf, 0xd0, 0xd0, 0x0b, 0x1e,
+	0xeb, 0xb9, 0x17, 0xfc, 0x19, 0x82, 0x73, 0xc9, 0x1c, 0x5e, 0x90, 0xae, 0x50, 0x57, 0x5f, 0x91,
+	0x58, 0x4a, 0x29, 0x64, 0x8b, 0x00, 0x5e, 0x85, 0x32, 0xa3, 0xc2, 0x57, 0x95, 0x6f, 0x4f, 0x47,
+	0xb7, 0x21, 0xda, 0x23, 0xfa, 0xb0, 0x17, 0x68, 0x8b, 0x7a, 0xf8, 0x83, 0x7e, 0x38, 0x2f, 0x8d,
+	0x3e, 0x30, 0x2b, 0x6b, 0x07, 0x66, 0x41, 0xf5, 0x10, 0x1b, 0x6e, 0x10, 0xba, 0x37, 0x60, 0xd0,
+	0xb3, 0xdc, 0xa2, 0x55, 0x55, 0x76, 0xc7, 0x8f, 0x6a, 0xb9, 0x53, 0xca, 0xae, 0x58, 0x27, 0xba,
+	0x12, 0x88, 0xa7, 0x76, 0x7f, 0xdb, 0xd4, 0xd6, 0x40, 0x96, 0x05, 0x5e, 0x73, 0x64, 0x2a, 0xbe,
+	0x7c, 0x54, 0xcb, 0x8d, 0xc6, 0xee, 0xaf, 0x61, 0xbb, 0x44, 0x7f, 0x49, 0xfc, 0xbb, 0xe1, 0xe2,
+	0xef, 0xc0, 0xa0, 0x78, 0x6c, 0x79, 0x99, 0x01, 0xe1, 0x7e, 0x4d, 0x0b, 0xde, 0x79, 0xb1, 0xc7,
+	0x59, 0xe8, 0x44, 0x4e, 0x27, 0x64, 0xc2, 0xd5, 0x56, 0x4e, 0xab, 0x0a, 0xa1, 0xb0, 0x4b, 0x5b,
+	0x44, 0x57, 0x46, 0x85, 0x33, 0x1e, 0x05, 0x9d, 0x67, 0x82, 0x33, 0xa2, 0xf6, 0x4d, 0x62, 0xeb,
+	0xb9, 0x7d, 0x6b, 0x54, 0x27, 0xfa, 0x88, 0x58, 0x0a, 0xdb, 0x37, 0x01, 0xe5, 0xf3, 0xfe, 0x64,
+	0x28, 0xdb, 0x3e, 0x7b, 0xde, 0x81, 0xf9, 0x6e, 0xe8, 0xe8, 0x63, 0xc2, 0xd1, 0xf9, 0x0e, 0x1d,
+	0xcd, 0xa1, 0x75, 0xe0, 0x69, 0xfe, 0x24, 0x08, 0x7d, 0x90, 0x19, 0x68, 0x7c, 0x12, 0x84, 0x5b,
+	0x44, 0x7d, 0x36, 0xb6, 0x7d, 0xe9, 0x91, 0xef, 0x07, 0x0d, 0x46, 0x92, 0x47, 0x54, 0x74, 0x0c,
+	0x18, 0x0d, 0x32, 0xa7, 0x3e, 0x38, 0x6f, 0xb5, 0x0b, 0xce, 0x2b, 0xf5, 0x79, 0x17, 0xc6, 0xe6,
+	0x94, 0x4a, 0xbf, 0x58, 0x68, 0xce, 0x41, 0x36, 0xfa, 0xf4, 0x37, 0x36, 0x4e, 0xe4, 0xa7, 0x41,
+	0x25, 0x6c, 0xdc, 0x7e, 0x21, 0x7a, 0x20, 0x52, 0x82, 0x4b, 0xf2, 0xfb, 0x4b, 0xdd, 0x82, 0xe5,
+	0xb2, 0xaa, 0xc9, 0xac, 0xa2, 0xa8, 0x56, 0xc5, 0xdb, 0xb6, 0xbb, 0xcf, 0xdb, 0xe4, 0xd5, 0xf5,
+	0xad, 0xad, 0x20, 0xc5, 0xde, 0x81, 0x93, 0x85, 0x7b, 0x8e, 0x7c, 0x38, 0x46, 0x1f, 0xac, 0x33,
+	0x51, 0xab, 0x12, 0xdf, 0x25, 0x3a, 0xf0, 0x9f, 0xd2, 0x1a, 0x31, 0xe0, 0x72, 0x47, 0x07, 0x29,
+	0xb7, 0xcc, 0xc3, 0x44, 0x21, 0x26, 0x59, 0x7f, 0xa2, 0x8e, 0x0b, 0x4d, 0x56, 0xc8, 0x4c, 0xd0,
+	0x49, 0xac, 0x6f, 0x6d, 0x35, 0x1e, 0xc2, 0x8f, 0x08, 0x5a, 0x21, 0xf2, 0x10, 0xa6, 0xdb, 0x09,
+	0x2a, 0x10, 0x77, 0x61, 0xdc, 0xb1, 0x4b, 0x55, 0x51, 0x6d, 0x8d, 0xaa, 0x55, 0xa0, 0xd5, 0x62,
+	0xd0, 0xbd, 0x4d, 0x6b, 0x49, 0x53, 0x25, 0x6d, 0x2b, 0x10, 0xd7, 0xa5, 0xb4, 0x3e, 0xe6, 0x34,
+	0xac, 0x5c, 0x79, 0x94, 0x81, 0xe3, 0xe2, 0x7c, 0xfc, 0x29, 0x88, 0x0f, 0x83, 0x87, 0x67, 0x92,
+	0x8d, 0x35, 0x8d, 0x39, 0xb2, 0x17, 0xdb, 0x0b, 0x4a, 0xe8, 0xe4, 0x6b, 0xdf, 0xfb, 0xd3, 0x3f,
+	0x7e, 0xd4, 0x7f, 0x1e, 0x4f, 0xe6, 0x13, 0x87, 0x3c, 0xf2, 0x4b, 0xf4, 0x39, 0x82, 0xa1, 0x60,
+	0x6c, 0x80, 0x2f, 0xa5, 0xd8, 0x6e, 0x98, 0x3b, 0x64, 0x2f, 0x77, 0x24, 0xab, 0xa0, 0x5c, 0x12,
+	0x50, 0x5e, 0xc5, 0xb9, 0x64, 0x28, 0xe1, 0x20, 0xe2, 0x51, 0x3f, 0xc2, 0x5f, 0x22, 0x18, 0xa9,
+	0xbf, 0x28, 0x78, 0x3e, 0xe5, 0xac, 0xc4, 0x2b, 0x97, 0x5d, 0xe8, 0x42, 0x43, 0x61, 0x9c, 0x13,
+	0x18, 0x67, 0xf0, 0xeb, 0xc9, 0x18, 0x65, 0x07, 0x1e, 0xde, 0x1a, 0xfc, 0x0b, 0x04, 0xa3, 0x0d,
+	0x5d, 0x01, 0x5e, 0x68, 0x17, 0x9b, 0xa6, 0x2e, 0x28, 0x7b, 0xa5, 0x1b, 0x15, 0x85, 0x74, 0x56,
+	0x20, 0x9d, 0xc6, 0xaf, 0x25, 0x23, 0xbd, 0x27, 0xa4, 0xd5, 0x85, 0xf1, 0xf0, 0x67, 0x08, 0x06,
+	0xb8, 0x25, 0x3c, 0xdd, 0xe6, 0xa8, 0x00, 0xd2, 0x4c, 0x5b, 0x39, 0x85, 0x63, 0x3e, 0xdd, 0x63,
+	0xe2, 0xf8, 0xfc, 0x27, 0xea, 0xda, 0x3e, 0xe4, 0xb1, 0xfd, 0x02, 0xc1, 0x50, 0x30, 0x0f, 0x4a,
+	0xcd, 0xb6, 0x86, 0xc9, 0x53, 0x6a, 0xb6, 0x35, 0x0e, 0x98, 0xc8, 0x82, 0xc0, 0x75, 0x19, 0xbf,
+	0xd1, 0x1a, 0x97, 0x68, 0x1b, 0x23, 0x6c, 0xf8, 0x27, 0x08, 0x32, 0xad, 0xde, 0x1f, 0x78, 0x29,
+	0xe5, 0xf0, 0x36, 0x8f, 0xae, 0xec, 0xd7, 0x7b, 0xd2, 0x55, 0x44, 0xfa, 0xf0, 0xef, 0x11, 0xe0,
+	0xe6, 0xc9, 0x11, 0x5e, 0xec, 0xd0, 0x6a, 0x3d, 0x96, 0x37, 0xbb, 0xd4, 0x52, 0x28, 0x6e, 0x08,
+	0x77, 0x2e, 0xe1, 0xb7, 0x3b, 0x0a, 0x73, 0xfe, 0x23, 0x6a, 0xbb, 0x86, 0x18, 0x84, 0x5b, 0xfc,
+	0x8b, 0x6c, 0xd8, 0x2e, 0xfe, 0x27, 0x82, 0xc9, 0x94, 0xf9, 0x0b, 0xbe, 0xde, 0x06, 0x58, 0xfa,
+	0x0c, 0x29, 0xfb, 0x6e, 0xaf, 0xea, 0x8a, 0xe0, 0x4d, 0x41, 0x70, 0x19, 0xbf, 0xd7, 0x19, 0x41,
+	0xeb, 0xc0, 0x66, 0x92, 0xa0, 0x1c, 0x50, 0xc9, 0xbe, 0x80, 0xf3, 0xfc, 0x39, 0x02, 0x88, 0x06,
+	0x31, 0x78, 0xb6, 0x4d, 0xd2, 0xd6, 0x8d, 0x7d, 0xb2, 0x73, 0x1d, 0x4a, 0x2b, 0xd0, 0x8b, 0x02,
+	0xb4, 0x86, 0x67, 0x3b, 0x03, 0x2d, 0xa7, 0x3c, 0xf8, 0x31, 0x02, 0xdc, 0x3c, 0x8d, 0x49, 0xcd,
+	0xa7, 0x96, 0x03, 0xa1, 0xd4, 0x7c, 0x6a, 0x3d, 0xf2, 0x21, 0x6b, 0x02, 0xf9, 0x35, 0xbc, 0xd4,
+	0x19, 0x72, 0x59, 0x78, 0xc5, 0xcf, 0xb0, 0xfa, 0xf2, 0x5a, 0xf2, 0x4b, 0x04, 0x27, 0x62, 0xa3,
+	0x16, 0x3c, 0xd7, 0x0e, 0x4d, 0x7d, 0xd2, 0x68, 0x9d, 0x8a, 0x2b, 0xd4, 0x4b, 0x02, 0xf5, 0x22,
+	0xbe, 0xd2, 0x0d, 0x6a, 0xf9, 0xf8, 0xe7, 0x79, 0x31, 0x1c, 0xbe, 0xd0, 0x70, 0x5a, 0x2d, 0x6b,
+	0x1c, 0x0d, 0x64, 0x67, 0x3b, 0x13, 0x56, 0x20, 0xdf, 0xea, 0x32, 0x29, 0xb8, 0xb2, 0xf8, 0xe8,
+	0x3e, 0x41, 0x70, 0x76, 0xcd, 0x63, 0xb6, 0x63, 0x32, 0xab, 0xe9, 0xa5, 0x83, 0xaf, 0xa6, 0x81,
+	0x68, 0xf1, 0x48, 0xcc, 0x2e, 0x76, 0xa7, 0xa4, 0x18, 0xdc, 0x12, 0x0c, 0xde, 0xc3, 0xd7, 0x93,
+	0x19, 0xc4, 0x6e, 0xa1, 0x42, 0x9b, 0x8f, 0x95, 0x9a, 0xf0, 0x26, 0x72, 0x4a, 0x7f, 0x46, 0x90,
+	0x6d, 0x41, 0x69, 0xdb, 0x67, 0xb8, 0x0b, 0x78, 0xd1, 0x03, 0x2b, 0x35, 0xe5, 0x5b, 0x3f, 0x42,
+	0xc8, 0x86, 0x60, 0x75, 0x03, 0xbf, 0xfb, 0x15, 0x58, 0x51, 0x9f, 0x71, 0x5a, 0xff, 0x45, 0x30,
+	0x95, 0xde, 0x40, 0xe3, 0x1b, 0x69, 0xf5, 0xb0, 0x93, 0x26, 0x3f, 0xbb, 0xfc, 0x15, 0x2c, 0x28,
+	0xca, 0x3b, 0x82, 0xf2, 0x26, 0xbe, 0x95, 0x4c, 0x39, 0xa9, 0xb3, 0x37, 0xca, 0xb6, 0xbb, 0x6f,
+	0xdc, 0xab, 0x52, 0xc7, 0xe0, 0xaf, 0x86, 0xfc, 0x27, 0xf1, 0xa7, 0xc4, 0x43, 0xfc, 0x47, 0x04,
+	0x67, 0x5b, 0x36, 0xec, 0x38, 0xf5, 0x43, 0xdb, 0xe6, 0x3d, 0x90, 0xbd, 0xd6, 0x9b, 0x72, 0x67,
+	0xa5, 0x41, 0xb0, 0x68, 0xe6, 0xcb, 0xc9, 0x7a, 0x2b, 0x9b, 0x8f, 0x9f, 0x4e, 0xa1, 0x27, 0x4f,
+	0xa7, 0xd0, 0xdf, 0x9f, 0x4e, 0xa1, 0x1f, 0x3e, 0x9b, 0xea, 0x7b, 0xf2, 0x6c, 0xaa, 0xef, 0x2f,
+	0xcf, 0xa6, 0xfa, 0xbe, 0x35, 0x1f, 0x7b, 0xcb, 0x29, 0xbb, 0x73, 0x65, 0x73, 0xd7, 0x0b, 0x0f,
+	0xf9, 0x78, 0xe1, 0x9d, 0xfc, 0x81, 0x3c, 0x4a, 0xbc, 0xec, 0x76, 0x07, 0xc5, 0xd4, 0xe9, 0xea,
+	0xff, 0x02, 0x00, 0x00, 0xff, 0xff, 0x55, 0xee, 0xd8, 0xe5, 0x10, 0x1f, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/x/gamm/types/tx.pb.go b/x/gamm/types/tx.pb.go
index 651289866f7..b88ffe87ca3 100644
--- a/x/gamm/types/tx.pb.go
+++ b/x/gamm/types/tx.pb.go
@@ -5,8 +5,8 @@ package types
 
 import (
 	context "context"
+	cosmossdk_io_math "cosmossdk.io/math"
 	fmt "fmt"
-	github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types"
 	types "github.com/cosmos/cosmos-sdk/types"
 	_ "github.com/cosmos/cosmos-sdk/types/tx/amino"
 	_ "github.com/gogo/protobuf/gogoproto"
@@ -35,10 +35,10 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
 // ===================== MsgJoinPool
 // This is really MsgJoinPoolNoSwap
 type MsgJoinPool struct {
-	Sender         string                                 `protobuf:"bytes,1,opt,name=sender,proto3" json:"sender,omitempty" yaml:"sender"`
-	PoolId         uint64                                 `protobuf:"varint,2,opt,name=pool_id,json=poolId,proto3" json:"pool_id,omitempty" yaml:"pool_id"`
-	ShareOutAmount github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,3,opt,name=share_out_amount,json=shareOutAmount,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"share_out_amount" yaml:"pool_amount_out"`
-	TokenInMaxs    []types.Coin                           `protobuf:"bytes,4,rep,name=token_in_maxs,json=tokenInMaxs,proto3" json:"token_in_maxs" yaml:"token_in_max_amounts"`
+	Sender         string                `protobuf:"bytes,1,opt,name=sender,proto3" json:"sender,omitempty" yaml:"sender"`
+	PoolId         uint64                `protobuf:"varint,2,opt,name=pool_id,json=poolId,proto3" json:"pool_id,omitempty" yaml:"pool_id"`
+	ShareOutAmount cosmossdk_io_math.Int `protobuf:"bytes,3,opt,name=share_out_amount,json=shareOutAmount,proto3,customtype=cosmossdk.io/math.Int" json:"share_out_amount" yaml:"pool_amount_out"`
+	TokenInMaxs    []types.Coin          `protobuf:"bytes,4,rep,name=token_in_maxs,json=tokenInMaxs,proto3" json:"token_in_maxs" yaml:"token_in_max_amounts"`
 }
 
 func (m *MsgJoinPool) Reset()         { *m = MsgJoinPool{} }
@@ -96,8 +96,8 @@ func (m *MsgJoinPool) GetTokenInMaxs() []types.Coin {
 }
 
 type MsgJoinPoolResponse struct {
-	ShareOutAmount github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,1,opt,name=share_out_amount,json=shareOutAmount,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"share_out_amount" yaml:"share_out_amount"`
-	TokenIn        []types.Coin                           `protobuf:"bytes,2,rep,name=token_in,json=tokenIn,proto3" json:"token_in" yaml:"token_in"`
+	ShareOutAmount cosmossdk_io_math.Int `protobuf:"bytes,1,opt,name=share_out_amount,json=shareOutAmount,proto3,customtype=cosmossdk.io/math.Int" json:"share_out_amount" yaml:"share_out_amount"`
+	TokenIn        []types.Coin          `protobuf:"bytes,2,rep,name=token_in,json=tokenIn,proto3" json:"token_in" yaml:"token_in"`
 }
 
 func (m *MsgJoinPoolResponse) Reset()         { *m = MsgJoinPoolResponse{} }
@@ -142,10 +142,10 @@ func (m *MsgJoinPoolResponse) GetTokenIn() []types.Coin {
 
 // ===================== MsgExitPool
 type MsgExitPool struct {
-	Sender        string                                 `protobuf:"bytes,1,opt,name=sender,proto3" json:"sender,omitempty" yaml:"sender"`
-	PoolId        uint64                                 `protobuf:"varint,2,opt,name=pool_id,json=poolId,proto3" json:"pool_id,omitempty" yaml:"pool_id"`
-	ShareInAmount github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,3,opt,name=share_in_amount,json=shareInAmount,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"share_in_amount" yaml:"share_in_amount"`
-	TokenOutMins  []types.Coin                           `protobuf:"bytes,4,rep,name=token_out_mins,json=tokenOutMins,proto3" json:"token_out_mins" yaml:"token_out_min_amounts"`
+	Sender        string                `protobuf:"bytes,1,opt,name=sender,proto3" json:"sender,omitempty" yaml:"sender"`
+	PoolId        uint64                `protobuf:"varint,2,opt,name=pool_id,json=poolId,proto3" json:"pool_id,omitempty" yaml:"pool_id"`
+	ShareInAmount cosmossdk_io_math.Int `protobuf:"bytes,3,opt,name=share_in_amount,json=shareInAmount,proto3,customtype=cosmossdk.io/math.Int" json:"share_in_amount" yaml:"share_in_amount"`
+	TokenOutMins  []types.Coin          `protobuf:"bytes,4,rep,name=token_out_mins,json=tokenOutMins,proto3" json:"token_out_mins" yaml:"token_out_min_amounts"`
 }
 
 func (m *MsgExitPool) Reset()         { *m = MsgExitPool{} }
@@ -248,10 +248,10 @@ func (m *MsgExitPoolResponse) GetTokenOut() []types.Coin {
 
 // ===================== MsgSwapExactAmountIn
 type MsgSwapExactAmountIn struct {
-	Sender            string                                 `protobuf:"bytes,1,opt,name=sender,proto3" json:"sender,omitempty" yaml:"sender"`
-	Routes            []types1.SwapAmountInRoute             `protobuf:"bytes,2,rep,name=routes,proto3" json:"routes"`
-	TokenIn           types.Coin                             `protobuf:"bytes,3,opt,name=token_in,json=tokenIn,proto3" json:"token_in" yaml:"token_in"`
-	TokenOutMinAmount github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,4,opt,name=token_out_min_amount,json=tokenOutMinAmount,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"token_out_min_amount" yaml:"token_out_min_amount"`
+	Sender            string                     `protobuf:"bytes,1,opt,name=sender,proto3" json:"sender,omitempty" yaml:"sender"`
+	Routes            []types1.SwapAmountInRoute `protobuf:"bytes,2,rep,name=routes,proto3" json:"routes"`
+	TokenIn           types.Coin                 `protobuf:"bytes,3,opt,name=token_in,json=tokenIn,proto3" json:"token_in" yaml:"token_in"`
+	TokenOutMinAmount cosmossdk_io_math.Int      `protobuf:"bytes,4,opt,name=token_out_min_amount,json=tokenOutMinAmount,proto3,customtype=cosmossdk.io/math.Int" json:"token_out_min_amount" yaml:"token_out_min_amount"`
 }
 
 func (m *MsgSwapExactAmountIn) Reset()         { *m = MsgSwapExactAmountIn{} }
@@ -309,7 +309,7 @@ func (m *MsgSwapExactAmountIn) GetTokenIn() types.Coin {
 }
 
 type MsgSwapExactAmountInResponse struct {
-	TokenOutAmount github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,1,opt,name=token_out_amount,json=tokenOutAmount,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"token_out_amount" yaml:"token_out_amount"`
+	TokenOutAmount cosmossdk_io_math.Int `protobuf:"bytes,1,opt,name=token_out_amount,json=tokenOutAmount,proto3,customtype=cosmossdk.io/math.Int" json:"token_out_amount" yaml:"token_out_amount"`
 }
 
 func (m *MsgSwapExactAmountInResponse) Reset()         { *m = MsgSwapExactAmountInResponse{} }
@@ -346,10 +346,10 @@ func (m *MsgSwapExactAmountInResponse) XXX_DiscardUnknown() {
 var xxx_messageInfo_MsgSwapExactAmountInResponse proto.InternalMessageInfo
 
 type MsgSwapExactAmountOut struct {
-	Sender           string                                 `protobuf:"bytes,1,opt,name=sender,proto3" json:"sender,omitempty" yaml:"sender"`
-	Routes           []types1.SwapAmountOutRoute            `protobuf:"bytes,2,rep,name=routes,proto3" json:"routes"`
-	TokenInMaxAmount github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,3,opt,name=token_in_max_amount,json=tokenInMaxAmount,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"token_in_max_amount" yaml:"token_in_max_amount"`
-	TokenOut         types.Coin                             `protobuf:"bytes,4,opt,name=token_out,json=tokenOut,proto3" json:"token_out" yaml:"token_out"`
+	Sender           string                      `protobuf:"bytes,1,opt,name=sender,proto3" json:"sender,omitempty" yaml:"sender"`
+	Routes           []types1.SwapAmountOutRoute `protobuf:"bytes,2,rep,name=routes,proto3" json:"routes"`
+	TokenInMaxAmount cosmossdk_io_math.Int       `protobuf:"bytes,3,opt,name=token_in_max_amount,json=tokenInMaxAmount,proto3,customtype=cosmossdk.io/math.Int" json:"token_in_max_amount" yaml:"token_in_max_amount"`
+	TokenOut         types.Coin                  `protobuf:"bytes,4,opt,name=token_out,json=tokenOut,proto3" json:"token_out" yaml:"token_out"`
 }
 
 func (m *MsgSwapExactAmountOut) Reset()         { *m = MsgSwapExactAmountOut{} }
@@ -407,7 +407,7 @@ func (m *MsgSwapExactAmountOut) GetTokenOut() types.Coin {
 }
 
 type MsgSwapExactAmountOutResponse struct {
-	TokenInAmount github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,1,opt,name=token_in_amount,json=tokenInAmount,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"token_in_amount" yaml:"token_in_amount"`
+	TokenInAmount cosmossdk_io_math.Int `protobuf:"bytes,1,opt,name=token_in_amount,json=tokenInAmount,proto3,customtype=cosmossdk.io/math.Int" json:"token_in_amount" yaml:"token_in_amount"`
 }
 
 func (m *MsgSwapExactAmountOutResponse) Reset()         { *m = MsgSwapExactAmountOutResponse{} }
@@ -446,10 +446,10 @@ var xxx_messageInfo_MsgSwapExactAmountOutResponse proto.InternalMessageInfo
 // ===================== MsgJoinSwapExternAmountIn
 // TODO: Rename to MsgJoinSwapExactAmountIn
 type MsgJoinSwapExternAmountIn struct {
-	Sender            string                                 `protobuf:"bytes,1,opt,name=sender,proto3" json:"sender,omitempty" yaml:"sender"`
-	PoolId            uint64                                 `protobuf:"varint,2,opt,name=pool_id,json=poolId,proto3" json:"pool_id,omitempty" yaml:"pool_id"`
-	TokenIn           types.Coin                             `protobuf:"bytes,3,opt,name=token_in,json=tokenIn,proto3" json:"token_in" yaml:"token_in"`
-	ShareOutMinAmount github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,4,opt,name=share_out_min_amount,json=shareOutMinAmount,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"share_out_min_amount" yaml:"share_out_min_amount"`
+	Sender            string                `protobuf:"bytes,1,opt,name=sender,proto3" json:"sender,omitempty" yaml:"sender"`
+	PoolId            uint64                `protobuf:"varint,2,opt,name=pool_id,json=poolId,proto3" json:"pool_id,omitempty" yaml:"pool_id"`
+	TokenIn           types.Coin            `protobuf:"bytes,3,opt,name=token_in,json=tokenIn,proto3" json:"token_in" yaml:"token_in"`
+	ShareOutMinAmount cosmossdk_io_math.Int `protobuf:"bytes,4,opt,name=share_out_min_amount,json=shareOutMinAmount,proto3,customtype=cosmossdk.io/math.Int" json:"share_out_min_amount" yaml:"share_out_min_amount"`
 }
 
 func (m *MsgJoinSwapExternAmountIn) Reset()         { *m = MsgJoinSwapExternAmountIn{} }
@@ -507,7 +507,7 @@ func (m *MsgJoinSwapExternAmountIn) GetTokenIn() types.Coin {
 }
 
 type MsgJoinSwapExternAmountInResponse struct {
-	ShareOutAmount github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,1,opt,name=share_out_amount,json=shareOutAmount,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"share_out_amount" yaml:"share_out_amount"`
+	ShareOutAmount cosmossdk_io_math.Int `protobuf:"bytes,1,opt,name=share_out_amount,json=shareOutAmount,proto3,customtype=cosmossdk.io/math.Int" json:"share_out_amount" yaml:"share_out_amount"`
 }
 
 func (m *MsgJoinSwapExternAmountInResponse) Reset()         { *m = MsgJoinSwapExternAmountInResponse{} }
@@ -545,11 +545,11 @@ var xxx_messageInfo_MsgJoinSwapExternAmountInResponse proto.InternalMessageInfo
 
 // ===================== MsgJoinSwapShareAmountOut
 type MsgJoinSwapShareAmountOut struct {
-	Sender           string                                 `protobuf:"bytes,1,opt,name=sender,proto3" json:"sender,omitempty" yaml:"sender"`
-	PoolId           uint64                                 `protobuf:"varint,2,opt,name=pool_id,json=poolId,proto3" json:"pool_id,omitempty" yaml:"pool_id"`
-	TokenInDenom     string                                 `protobuf:"bytes,3,opt,name=token_in_denom,json=tokenInDenom,proto3" json:"token_in_denom,omitempty" yaml:"token_in_denom"`
-	ShareOutAmount   github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,4,opt,name=share_out_amount,json=shareOutAmount,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"share_out_amount" yaml:"share_out_amount"`
-	TokenInMaxAmount github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,5,opt,name=token_in_max_amount,json=tokenInMaxAmount,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"token_in_max_amount" yaml:"token_in_max_amount"`
+	Sender           string                `protobuf:"bytes,1,opt,name=sender,proto3" json:"sender,omitempty" yaml:"sender"`
+	PoolId           uint64                `protobuf:"varint,2,opt,name=pool_id,json=poolId,proto3" json:"pool_id,omitempty" yaml:"pool_id"`
+	TokenInDenom     string                `protobuf:"bytes,3,opt,name=token_in_denom,json=tokenInDenom,proto3" json:"token_in_denom,omitempty" yaml:"token_in_denom"`
+	ShareOutAmount   cosmossdk_io_math.Int `protobuf:"bytes,4,opt,name=share_out_amount,json=shareOutAmount,proto3,customtype=cosmossdk.io/math.Int" json:"share_out_amount" yaml:"share_out_amount"`
+	TokenInMaxAmount cosmossdk_io_math.Int `protobuf:"bytes,5,opt,name=token_in_max_amount,json=tokenInMaxAmount,proto3,customtype=cosmossdk.io/math.Int" json:"token_in_max_amount" yaml:"token_in_max_amount"`
 }
 
 func (m *MsgJoinSwapShareAmountOut) Reset()         { *m = MsgJoinSwapShareAmountOut{} }
@@ -607,7 +607,7 @@ func (m *MsgJoinSwapShareAmountOut) GetTokenInDenom() string {
 }
 
 type MsgJoinSwapShareAmountOutResponse struct {
-	TokenInAmount github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,1,opt,name=token_in_amount,json=tokenInAmount,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"token_in_amount" yaml:"token_in_amount"`
+	TokenInAmount cosmossdk_io_math.Int `protobuf:"bytes,1,opt,name=token_in_amount,json=tokenInAmount,proto3,customtype=cosmossdk.io/math.Int" json:"token_in_amount" yaml:"token_in_amount"`
 }
 
 func (m *MsgJoinSwapShareAmountOutResponse) Reset()         { *m = MsgJoinSwapShareAmountOutResponse{} }
@@ -645,11 +645,11 @@ var xxx_messageInfo_MsgJoinSwapShareAmountOutResponse proto.InternalMessageInfo
 
 // ===================== MsgExitSwapShareAmountIn
 type MsgExitSwapShareAmountIn struct {
-	Sender            string                                 `protobuf:"bytes,1,opt,name=sender,proto3" json:"sender,omitempty" yaml:"sender"`
-	PoolId            uint64                                 `protobuf:"varint,2,opt,name=pool_id,json=poolId,proto3" json:"pool_id,omitempty" yaml:"pool_id"`
-	TokenOutDenom     string                                 `protobuf:"bytes,3,opt,name=token_out_denom,json=tokenOutDenom,proto3" json:"token_out_denom,omitempty" yaml:"token_out_denom"`
-	ShareInAmount     github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,4,opt,name=share_in_amount,json=shareInAmount,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"share_in_amount" yaml:"share_in_amount"`
-	TokenOutMinAmount github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,5,opt,name=token_out_min_amount,json=tokenOutMinAmount,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"token_out_min_amount" yaml:"token_out_min_amount"`
+	Sender            string                `protobuf:"bytes,1,opt,name=sender,proto3" json:"sender,omitempty" yaml:"sender"`
+	PoolId            uint64                `protobuf:"varint,2,opt,name=pool_id,json=poolId,proto3" json:"pool_id,omitempty" yaml:"pool_id"`
+	TokenOutDenom     string                `protobuf:"bytes,3,opt,name=token_out_denom,json=tokenOutDenom,proto3" json:"token_out_denom,omitempty" yaml:"token_out_denom"`
+	ShareInAmount     cosmossdk_io_math.Int `protobuf:"bytes,4,opt,name=share_in_amount,json=shareInAmount,proto3,customtype=cosmossdk.io/math.Int" json:"share_in_amount" yaml:"share_in_amount"`
+	TokenOutMinAmount cosmossdk_io_math.Int `protobuf:"bytes,5,opt,name=token_out_min_amount,json=tokenOutMinAmount,proto3,customtype=cosmossdk.io/math.Int" json:"token_out_min_amount" yaml:"token_out_min_amount"`
 }
 
 func (m *MsgExitSwapShareAmountIn) Reset()         { *m = MsgExitSwapShareAmountIn{} }
@@ -707,7 +707,7 @@ func (m *MsgExitSwapShareAmountIn) GetTokenOutDenom() string {
 }
 
 type MsgExitSwapShareAmountInResponse struct {
-	TokenOutAmount github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,1,opt,name=token_out_amount,json=tokenOutAmount,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"token_out_amount" yaml:"token_out_amount"`
+	TokenOutAmount cosmossdk_io_math.Int `protobuf:"bytes,1,opt,name=token_out_amount,json=tokenOutAmount,proto3,customtype=cosmossdk.io/math.Int" json:"token_out_amount" yaml:"token_out_amount"`
 }
 
 func (m *MsgExitSwapShareAmountInResponse) Reset()         { *m = MsgExitSwapShareAmountInResponse{} }
@@ -745,10 +745,10 @@ var xxx_messageInfo_MsgExitSwapShareAmountInResponse proto.InternalMessageInfo
 
 // ===================== MsgExitSwapExternAmountOut
 type MsgExitSwapExternAmountOut struct {
-	Sender           string                                 `protobuf:"bytes,1,opt,name=sender,proto3" json:"sender,omitempty" yaml:"sender"`
-	PoolId           uint64                                 `protobuf:"varint,2,opt,name=pool_id,json=poolId,proto3" json:"pool_id,omitempty" yaml:"pool_id"`
-	TokenOut         types.Coin                             `protobuf:"bytes,3,opt,name=token_out,json=tokenOut,proto3" json:"token_out" yaml:"token_out"`
-	ShareInMaxAmount github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,4,opt,name=share_in_max_amount,json=shareInMaxAmount,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"share_in_max_amount" yaml:"share_in_max_amount"`
+	Sender           string                `protobuf:"bytes,1,opt,name=sender,proto3" json:"sender,omitempty" yaml:"sender"`
+	PoolId           uint64                `protobuf:"varint,2,opt,name=pool_id,json=poolId,proto3" json:"pool_id,omitempty" yaml:"pool_id"`
+	TokenOut         types.Coin            `protobuf:"bytes,3,opt,name=token_out,json=tokenOut,proto3" json:"token_out" yaml:"token_out"`
+	ShareInMaxAmount cosmossdk_io_math.Int `protobuf:"bytes,4,opt,name=share_in_max_amount,json=shareInMaxAmount,proto3,customtype=cosmossdk.io/math.Int" json:"share_in_max_amount" yaml:"share_in_max_amount"`
 }
 
 func (m *MsgExitSwapExternAmountOut) Reset()         { *m = MsgExitSwapExternAmountOut{} }
@@ -806,7 +806,7 @@ func (m *MsgExitSwapExternAmountOut) GetTokenOut() types.Coin {
 }
 
 type MsgExitSwapExternAmountOutResponse struct {
-	ShareInAmount github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,1,opt,name=share_in_amount,json=shareInAmount,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"share_in_amount" yaml:"share_in_amount"`
+	ShareInAmount cosmossdk_io_math.Int `protobuf:"bytes,1,opt,name=share_in_amount,json=shareInAmount,proto3,customtype=cosmossdk.io/math.Int" json:"share_in_amount" yaml:"share_in_amount"`
 }
 
 func (m *MsgExitSwapExternAmountOutResponse) Reset()         { *m = MsgExitSwapExternAmountOutResponse{} }
@@ -864,83 +864,83 @@ func init() {
 func init() { proto.RegisterFile("osmosis/gamm/v1beta1/tx.proto", fileDescriptor_cfc8fd3ac7df3247) }
 
 var fileDescriptor_cfc8fd3ac7df3247 = []byte{
-	// 1214 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x58, 0xcb, 0x6e, 0xdb, 0x46,
-	0x14, 0x35, 0x25, 0xc5, 0x76, 0xc6, 0xf5, 0x43, 0x8c, 0x1f, 0x32, 0x9d, 0x48, 0xf6, 0xb4, 0x70,
-	0x9c, 0x38, 0x22, 0x63, 0x07, 0xe8, 0xc3, 0x9b, 0xa2, 0x6a, 0x03, 0x54, 0x41, 0x04, 0x05, 0xcc,
-	0x26, 0xe8, 0x46, 0xa0, 0x2c, 0x42, 0x61, 0x63, 0xce, 0x08, 0x1a, 0xd2, 0x51, 0x50, 0xa0, 0x05,
-	0x0a, 0xb4, 0x40, 0xbb, 0x6a, 0x51, 0xf4, 0xf1, 0x19, 0xdd, 0xf6, 0x0f, 0xb2, 0xcc, 0xa2, 0x05,
-	0xda, 0x14, 0x10, 0x0a, 0x7b, 0xd1, 0x6d, 0xa1, 0x2f, 0x28, 0x86, 0x33, 0xa4, 0x48, 0x8a, 0xb4,
-	0x44, 0x47, 0x8a, 0x37, 0x89, 0x35, 0x73, 0x5f, 0x73, 0xee, 0xe1, 0x99, 0x4b, 0x82, 0x6b, 0x98,
-	0x98, 0x98, 0x18, 0x44, 0x69, 0x6a, 0xa6, 0xa9, 0x1c, 0xef, 0xd5, 0x75, 0x4b, 0xdb, 0x53, 0xac,
-	0x8e, 0xdc, 0x6a, 0x63, 0x0b, 0x8b, 0xcb, 0x7c, 0x5b, 0xa6, 0xdb, 0x32, 0xdf, 0x96, 0x96, 0x9b,
-	0xb8, 0x89, 0x1d, 0x03, 0x85, 0xfe, 0xc5, 0x6c, 0xa5, 0xac, 0x66, 0x1a, 0x08, 0x2b, 0xce, 0xbf,
-	0x7c, 0x29, 0x7f, 0xe8, 0xf8, 0x2b, 0x75, 0x8d, 0xe8, 0x5e, 0xf0, 0x43, 0x6c, 0x20, 0xbe, 0x7f,
-	0xcb, 0xcd, 0xde, 0xc2, 0xf8, 0xc8, 0xd4, 0x90, 0xd6, 0xd4, 0xdb, 0x9e, 0x1d, 0x79, 0xaa, 0xb5,
-	0x6a, 0x6d, 0x6c, 0x5b, 0x3a, 0xb3, 0x86, 0x2f, 0x53, 0x60, 0xae, 0x42, 0x9a, 0xf7, 0xb0, 0x81,
-	0x1e, 0x60, 0x7c, 0x24, 0xde, 0x00, 0xd3, 0x44, 0x47, 0x0d, 0xbd, 0x9d, 0x13, 0x36, 0x85, 0x9d,
-	0xcb, 0xa5, 0x6c, 0xaf, 0x5b, 0x98, 0x7f, 0xa6, 0x99, 0x47, 0x07, 0x90, 0xad, 0x43, 0x95, 0x1b,
-	0x88, 0xbb, 0x60, 0x86, 0xa6, 0xa8, 0x19, 0x8d, 0x5c, 0x6a, 0x53, 0xd8, 0xc9, 0x94, 0xc4, 0x5e,
-	0xb7, 0xb0, 0xc0, 0x6c, 0xf9, 0x06, 0x54, 0xa7, 0xe9, 0x5f, 0xe5, 0x86, 0xd8, 0x06, 0x4b, 0xe4,
-	0xb1, 0xd6, 0xd6, 0x6b, 0xd8, 0xb6, 0x6a, 0x9a, 0x89, 0x6d, 0x64, 0xe5, 0xd2, 0x4e, 0x86, 0x8f,
-	0x9f, 0x77, 0x0b, 0x53, 0x2f, 0xbb, 0x85, 0xed, 0xa6, 0x61, 0x3d, 0xb6, 0xeb, 0xf2, 0x21, 0x36,
-	0x15, 0x7e, 0x44, 0xf6, 0x5f, 0x91, 0x34, 0x9e, 0x28, 0xd6, 0xb3, 0x96, 0x4e, 0xe4, 0x32, 0xb2,
-	0x7a, 0xdd, 0xc2, 0xaa, 0x2f, 0x07, 0x0b, 0x45, 0xa3, 0x42, 0x75, 0xc1, 0xc9, 0x50, 0xb5, 0xad,
-	0x0f, 0x9c, 0x45, 0xb1, 0x0e, 0xe6, 0x2d, 0xfc, 0x44, 0x47, 0x35, 0x03, 0xd5, 0x4c, 0xad, 0x43,
-	0x72, 0x99, 0xcd, 0xf4, 0xce, 0xdc, 0xfe, 0xba, 0xcc, 0xe2, 0xca, 0x14, 0x41, 0x17, 0x7f, 0xf9,
-	0x43, 0x6c, 0xa0, 0xd2, 0x9b, 0xb4, 0x96, 0x5e, 0xb7, 0xb0, 0xc1, 0x32, 0xf8, 0xbd, 0x79, 0x26,
-	0x02, 0xd5, 0x39, 0x67, 0xb9, 0x8c, 0x2a, 0x5a, 0x87, 0x1c, 0x6c, 0x7c, 0xfb, 0xef, 0xaf, 0x37,
-	0x57, 0x03, 0x0d, 0xff, 0x14, 0x1b, 0xa8, 0x48, 0x8b, 0x83, 0x7f, 0x09, 0xe0, 0x8a, 0x0f, 0x5c,
-	0x55, 0x27, 0x2d, 0x8c, 0x88, 0x2e, 0x92, 0x08, 0x30, 0x18, 0xdc, 0xe5, 0xc4, 0x60, 0xac, 0xf1,
-	0xe6, 0x84, 0xe2, 0x0d, 0xa2, 0x51, 0x01, 0xb3, 0xee, 0x79, 0x72, 0xa9, 0x61, 0x40, 0xac, 0x71,
-	0x20, 0x16, 0x83, 0x40, 0x40, 0x75, 0x86, 0x1f, 0x1e, 0xfe, 0xcd, 0x88, 0x73, 0xb7, 0x63, 0x58,
-	0x13, 0x25, 0x4e, 0x0b, 0x2c, 0xb2, 0xb3, 0x19, 0x68, 0x4c, 0xbc, 0x09, 0x85, 0x83, 0xea, 0xbc,
-	0xb3, 0x52, 0x46, 0x1c, 0x28, 0x1d, 0x2c, 0xb0, 0xf3, 0x52, 0x34, 0x4d, 0x03, 0x8d, 0xc0, 0x9b,
-	0xb7, 0x38, 0x5c, 0x57, 0xfd, 0x70, 0x71, 0xf7, 0x3e, 0x71, 0xde, 0x70, 0xd6, 0xab, 0xb6, 0x55,
-	0x31, 0x50, 0x24, 0x73, 0xf4, 0x8e, 0x61, 0x31, 0xe6, 0x34, 0x1d, 0xe2, 0xb8, 0xe0, 0x7a, 0xc4,
-	0x79, 0x00, 0x2e, 0x7b, 0xb1, 0x73, 0xc2, 0xb0, 0xaa, 0x72, 0xbc, 0xaa, 0xa5, 0x50, 0x55, 0x50,
-	0x9d, 0x75, 0x2b, 0x81, 0x5f, 0xa7, 0xc1, 0x72, 0x85, 0x34, 0x1f, 0x3e, 0xd5, 0x5a, 0x77, 0x3b,
-	0xda, 0x21, 0x27, 0x4b, 0x19, 0x25, 0xe9, 0xe7, 0x7d, 0x30, 0xed, 0x48, 0x0a, 0xe1, 0xbc, 0x92,
-	0x65, 0x57, 0xe1, 0x7c, 0x12, 0xe4, 0x95, 0x46, 0x53, 0xb9, 0x59, 0x54, 0xea, 0x56, 0xca, 0xd0,
-	0x3a, 0x55, 0x1e, 0x23, 0xc0, 0x53, 0xda, 0xe9, 0x57, 0xe3, 0xa9, 0xf8, 0x39, 0x58, 0x8e, 0x6a,
-	0x47, 0x2e, 0xe3, 0x9c, 0xaa, 0x92, 0x98, 0x44, 0x1b, 0xf1, 0x2d, 0x86, 0x6a, 0xd6, 0xd7, 0x61,
-	0x76, 0xc6, 0x83, 0x6d, 0xda, 0xe6, 0xad, 0x40, 0x9b, 0xa9, 0x08, 0x17, 0x75, 0x8a, 0x76, 0x91,
-	0x39, 0x16, 0x0d, 0x04, 0x7f, 0x10, 0xc0, 0xd5, 0xa8, 0x46, 0xf8, 0x45, 0xa3, 0x9f, 0x74, 0x3c,
-	0xa2, 0x11, 0x8e, 0x07, 0xd5, 0x05, 0xf7, 0x00, 0x2c, 0x3d, 0xfc, 0x26, 0x0d, 0x56, 0x06, 0xab,
-	0xaa, 0xda, 0x56, 0x12, 0x7e, 0x54, 0x42, 0xfc, 0x50, 0x46, 0xe4, 0x47, 0xd5, 0xb6, 0xa2, 0x08,
-	0xf2, 0x19, 0xb8, 0x12, 0x21, 0xcc, 0x5c, 0x15, 0xee, 0x27, 0xc6, 0x42, 0x8a, 0xd5, 0x7a, 0xa8,
-	0x2e, 0xf5, 0xa5, 0x9e, 0x8b, 0x43, 0xe0, 0x09, 0xcc, 0x0c, 0xa3, 0xe7, 0x08, 0x4f, 0xe0, 0xc1,
-	0x75, 0x4a, 0x10, 0x38, 0x84, 0x20, 0xd4, 0xe7, 0x7b, 0x01, 0x5c, 0x8b, 0xec, 0x85, 0x47, 0x91,
-	0x16, 0x58, 0xf4, 0x8e, 0x11, 0x60, 0xc8, 0xb9, 0xb5, 0x32, 0x14, 0x0e, 0xaa, 0xf3, 0x1c, 0x11,
-	0xce, 0x8f, 0xff, 0x52, 0x60, 0x9d, 0xdf, 0x70, 0xac, 0x2e, 0x4b, 0x6f, 0xa3, 0xf3, 0x68, 0x48,
-	0xa2, 0x3b, 0x61, 0xfc, 0x12, 0xd1, 0xbf, 0x3e, 0xc7, 0x27, 0x11, 0x51, 0x31, 0xa1, 0x9a, 0x75,
-	0xaf, 0xe5, 0xbe, 0x44, 0xdc, 0xa2, 0x0c, 0xb8, 0x3e, 0x38, 0x43, 0x70, 0x1a, 0x50, 0x48, 0x7d,
-	0x42, 0xf1, 0x8b, 0x00, 0xb6, 0x62, 0x21, 0xbf, 0xd0, 0x11, 0x03, 0xfe, 0x9e, 0x0e, 0xb0, 0xe1,
-	0x21, 0xdd, 0x3d, 0x97, 0x62, 0x24, 0x62, 0xc3, 0xfb, 0xee, 0x7d, 0x6d, 0xa0, 0x5a, 0x43, 0x47,
-	0xd8, 0xe4, 0x52, 0xb0, 0xde, 0xeb, 0x16, 0x56, 0x42, 0x34, 0x76, 0xf6, 0xdd, 0x9b, 0xb8, 0x8c,
-	0x3e, 0xa2, 0x3f, 0x23, 0xb1, 0xca, 0x4c, 0x7a, 0x1c, 0x8b, 0x51, 0xb1, 0x4b, 0xaf, 0x43, 0xc5,
-	0xce, 0x66, 0x9c, 0x53, 0xa8, 0x5f, 0x78, 0x7e, 0x0c, 0x32, 0x2e, 0xd8, 0xd6, 0x0b, 0x14, 0x9f,
-	0x3f, 0xd2, 0x20, 0xc7, 0xa7, 0xa4, 0x50, 0x5d, 0x13, 0xd4, 0x9e, 0x92, 0x7b, 0x4c, 0xda, 0x5c,
-	0x3f, 0xdd, 0xa4, 0x70, 0xe1, 0x9e, 0x81, 0x5b, 0x78, 0xd5, 0xb6, 0x18, 0xe1, 0x22, 0x66, 0xda,
-	0xcc, 0x64, 0x67, 0xda, 0xb8, 0x29, 0xe8, 0xd2, 0x6b, 0x9a, 0x82, 0x76, 0x29, 0xe1, 0xb6, 0x07,
-	0x87, 0xdd, 0x41, 0xc2, 0x19, 0x08, 0xfe, 0x2c, 0x80, 0xcd, 0xb8, 0xbe, 0x5e, 0xec, 0x38, 0xd4,
-	0x4b, 0x01, 0xc9, 0x57, 0x99, 0x5f, 0x7b, 0x27, 0xa9, 0x70, 0x81, 0xa1, 0x23, 0x3d, 0x86, 0xa1,
-	0x83, 0xaa, 0x8f, 0x47, 0x19, 0x9f, 0xfa, 0x64, 0x5e, 0x4d, 0x7d, 0x22, 0x42, 0x42, 0x75, 0x89,
-	0x33, 0xb1, 0xaf, 0x3e, 0x45, 0x4a, 0x86, 0x9d, 0x18, 0x32, 0x04, 0xef, 0x3b, 0x5a, 0xf6, 0x4f,
-	0x02, 0x80, 0xf1, 0xa0, 0xfb, 0xf5, 0x27, 0xfc, 0x50, 0x09, 0x13, 0x7d, 0xa8, 0xf6, 0x7f, 0x9b,
-	0x01, 0xe9, 0x0a, 0x69, 0x8a, 0x8f, 0xc0, 0xac, 0xf7, 0xfd, 0x64, 0x4b, 0x8e, 0xfa, 0xba, 0x23,
-	0xfb, 0xbe, 0x02, 0x48, 0x37, 0x86, 0x9a, 0x78, 0x67, 0x7a, 0x04, 0x66, 0xbd, 0x17, 0xec, 0xf8,
-	0xc8, 0xae, 0xc9, 0x19, 0x91, 0x07, 0xde, 0x24, 0x09, 0xc8, 0x0e, 0xbe, 0xf3, 0xdd, 0x8c, 0xf5,
-	0x1f, 0xb0, 0x95, 0xf6, 0x47, 0xb7, 0xf5, 0x92, 0x1e, 0x03, 0x31, 0xe2, 0x4d, 0x62, 0x77, 0xd4,
-	0x48, 0x55, 0xdb, 0x92, 0xee, 0x24, 0x30, 0xf6, 0xf2, 0x7e, 0x29, 0x80, 0xd5, 0x98, 0x11, 0x55,
-	0x39, 0xb3, 0x19, 0x83, 0x0e, 0xd2, 0x3b, 0x09, 0x1d, 0x22, 0x8b, 0x08, 0x4d, 0x46, 0xc3, 0x8b,
-	0x08, 0x3a, 0x8c, 0x50, 0x44, 0xcc, 0x25, 0xfd, 0x95, 0x00, 0xd6, 0xe2, 0xd4, 0xeb, 0xf6, 0x99,
-	0xec, 0x89, 0xf0, 0x90, 0xde, 0x4d, 0xea, 0xe1, 0xd5, 0xf1, 0x05, 0x58, 0x89, 0xbe, 0xb6, 0xe5,
-	0xa1, 0x21, 0x03, 0xf6, 0xd2, 0xdb, 0xc9, 0xec, 0xdd, 0x02, 0x4a, 0xf7, 0x9e, 0x9f, 0xe4, 0x85,
-	0x17, 0x27, 0x79, 0xe1, 0x9f, 0x93, 0xbc, 0xf0, 0xdd, 0x69, 0x7e, 0xea, 0xc5, 0x69, 0x7e, 0xea,
-	0xcf, 0xd3, 0xfc, 0xd4, 0x27, 0xb7, 0x7d, 0x32, 0xc1, 0x63, 0x17, 0x8f, 0xb4, 0x3a, 0x71, 0x7f,
-	0x28, 0xc7, 0x7b, 0xef, 0x29, 0x1d, 0x26, 0x5b, 0x8e, 0x68, 0xd4, 0xa7, 0x9d, 0x4f, 0xa9, 0x77,
-	0xfe, 0x0f, 0x00, 0x00, 0xff, 0xff, 0x78, 0x71, 0x07, 0x17, 0xf8, 0x15, 0x00, 0x00,
+	// 1207 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0x4d, 0x6f, 0xdb, 0x46,
+	0x10, 0x35, 0x25, 0xc5, 0x76, 0xd6, 0xf5, 0x17, 0xe3, 0x0f, 0x99, 0x4e, 0x24, 0x7b, 0x5b, 0x24,
+	0x4e, 0x1c, 0x91, 0xb1, 0x03, 0x34, 0xa9, 0x5b, 0xa0, 0xa8, 0xda, 0x1c, 0x14, 0x54, 0x50, 0xc0,
+	0x5c, 0x82, 0x5e, 0x04, 0xca, 0x22, 0x64, 0x26, 0xe6, 0xae, 0xa0, 0x5d, 0x3a, 0xca, 0xa9, 0x45,
+	0xd0, 0xb4, 0x40, 0x4f, 0xfd, 0x29, 0x45, 0x7b, 0xea, 0x3f, 0x70, 0x7b, 0xca, 0xb1, 0xe8, 0x41,
+	0x6d, 0xed, 0x43, 0xef, 0x02, 0x0a, 0xf4, 0x58, 0x2c, 0xb9, 0xa4, 0x48, 0x8a, 0x34, 0x25, 0x55,
+	0xf2, 0xc5, 0xb0, 0xb8, 0x33, 0xb3, 0x33, 0xf3, 0xde, 0xbc, 0x5d, 0x12, 0xdc, 0xc0, 0xc4, 0xc4,
+	0xc4, 0x20, 0x4a, 0x43, 0x33, 0x4d, 0xe5, 0x64, 0xaf, 0xa6, 0x53, 0x6d, 0x4f, 0xa1, 0x6d, 0xb9,
+	0xd9, 0xc2, 0x14, 0x8b, 0x2b, 0x7c, 0x59, 0x66, 0xcb, 0x32, 0x5f, 0x96, 0x56, 0x1a, 0xb8, 0x81,
+	0x6d, 0x03, 0x85, 0xfd, 0xe7, 0xd8, 0x4a, 0xcb, 0x9a, 0x69, 0x20, 0xac, 0xd8, 0x7f, 0xf9, 0xa3,
+	0xdc, 0xa1, 0xed, 0xaf, 0xd4, 0x34, 0xa2, 0x7b, 0xc1, 0x0f, 0xb1, 0x81, 0xf8, 0xfa, 0x5d, 0x77,
+	0xf7, 0x26, 0xc6, 0xc7, 0xa6, 0x86, 0xb4, 0x86, 0xde, 0xf2, 0xec, 0xc8, 0x4b, 0xad, 0x59, 0x6d,
+	0x61, 0x8b, 0xea, 0x8e, 0x35, 0xfc, 0x25, 0x05, 0xe6, 0xca, 0xa4, 0xf1, 0x18, 0x1b, 0xe8, 0x09,
+	0xc6, 0xc7, 0xe2, 0x6d, 0x30, 0x4d, 0x74, 0x54, 0xd7, 0x5b, 0x59, 0x61, 0x4b, 0xd8, 0xb9, 0x5a,
+	0x5c, 0xee, 0x76, 0xf2, 0xf3, 0xaf, 0x34, 0xf3, 0xf8, 0x00, 0x3a, 0xcf, 0xa1, 0xca, 0x0d, 0xc4,
+	0x5d, 0x30, 0xc3, 0xb6, 0xa8, 0x1a, 0xf5, 0x6c, 0x6a, 0x4b, 0xd8, 0xc9, 0x14, 0xc5, 0x6e, 0x27,
+	0xbf, 0xe0, 0xd8, 0xf2, 0x05, 0xa8, 0x4e, 0xb3, 0xff, 0x4a, 0x75, 0x51, 0x03, 0x4b, 0xe4, 0x48,
+	0x6b, 0xe9, 0x55, 0x6c, 0xd1, 0xaa, 0x66, 0x62, 0x0b, 0xd1, 0x6c, 0xda, 0xde, 0xe1, 0xc1, 0x69,
+	0x27, 0x3f, 0xf5, 0x7b, 0x27, 0xbf, 0xea, 0xd4, 0x45, 0xea, 0x2f, 0x64, 0x03, 0x2b, 0xa6, 0x46,
+	0x8f, 0xe4, 0x12, 0xa2, 0xdd, 0x4e, 0x7e, 0xcd, 0x17, 0xd2, 0xf1, 0x64, 0x41, 0xa0, 0xba, 0x60,
+	0x07, 0xac, 0x58, 0xf4, 0x13, 0xfb, 0xa1, 0x58, 0x03, 0xf3, 0x14, 0xbf, 0xd0, 0x51, 0xd5, 0x40,
+	0x55, 0x53, 0x6b, 0x93, 0x6c, 0x66, 0x2b, 0xbd, 0x33, 0xb7, 0xbf, 0x21, 0x3b, 0x81, 0x65, 0xd6,
+	0x30, 0xb7, 0xdd, 0xf2, 0xa7, 0xd8, 0x40, 0xc5, 0x77, 0xd9, 0xd6, 0xdd, 0x4e, 0x7e, 0xd3, 0xd9,
+	0xc1, 0xef, 0xcd, 0x77, 0x22, 0x50, 0x9d, 0xb3, 0x1f, 0x97, 0x50, 0x59, 0x6b, 0x93, 0x83, 0xcd,
+	0xef, 0xfe, 0xfe, 0xe1, 0xce, 0x5a, 0x00, 0xdf, 0xe7, 0xd8, 0x40, 0x05, 0x96, 0x1c, 0x3c, 0x15,
+	0xc0, 0x35, 0x5f, 0x2f, 0x55, 0x9d, 0x34, 0x31, 0x22, 0xba, 0x58, 0x8b, 0xa8, 0xdd, 0xe9, 0xee,
+	0xc3, 0xa4, 0xda, 0xd7, 0x79, 0xeb, 0x43, 0xee, 0xfd, 0xc5, 0x97, 0xc1, 0xac, 0x9b, 0x7e, 0x36,
+	0x95, 0x54, 0xf7, 0x3a, 0xaf, 0x7b, 0x31, 0x58, 0x37, 0x54, 0x67, 0x78, 0xad, 0xf0, 0x57, 0x87,
+	0x16, 0x8f, 0xda, 0x06, 0x9d, 0x28, 0x2d, 0xaa, 0x60, 0xd1, 0xa9, 0xcd, 0x40, 0xa3, 0xb1, 0x22,
+	0xe4, 0x0d, 0xd5, 0x79, 0xfb, 0x49, 0x09, 0xf1, 0xbe, 0xe8, 0x60, 0xc1, 0x29, 0x8f, 0x35, 0xcf,
+	0x34, 0xd0, 0x00, 0xac, 0x78, 0x8f, 0x77, 0xe7, 0xba, 0xbf, 0x3b, 0xdc, 0xbd, 0x47, 0x8b, 0x77,
+	0xec, 0xe7, 0x15, 0x8b, 0x96, 0x0d, 0x14, 0xc9, 0x0b, 0xbd, 0x6d, 0x50, 0x87, 0x17, 0x0d, 0x9b,
+	0x16, 0x6e, 0x2f, 0x3d, 0x5a, 0x3c, 0x01, 0x57, 0xbd, 0xd8, 0x59, 0x21, 0x29, 0xab, 0x2c, 0xcf,
+	0x6a, 0x29, 0x94, 0x15, 0x54, 0x67, 0xdd, 0x4c, 0xe0, 0x3f, 0x29, 0xb0, 0x52, 0x26, 0x8d, 0xa7,
+	0x2f, 0xb5, 0xe6, 0xa3, 0xb6, 0x76, 0xc8, 0xb9, 0x51, 0x42, 0xc3, 0xc0, 0xf7, 0x39, 0x98, 0xb6,
+	0xf5, 0x81, 0x70, 0x1a, 0xc9, 0xb2, 0x2b, 0x57, 0x3e, 0x3d, 0xf1, 0x52, 0x63, 0x5b, 0xb9, 0xbb,
+	0xa8, 0xcc, 0xad, 0x98, 0x61, 0x79, 0xaa, 0x3c, 0x46, 0x80, 0x96, 0x0c, 0xd8, 0xff, 0x47, 0x4b,
+	0xd1, 0x04, 0x2b, 0x51, 0x70, 0x64, 0x33, 0x76, 0x55, 0x1f, 0x25, 0x71, 0x66, 0x33, 0x1e, 0x51,
+	0xa8, 0x2e, 0xfb, 0x00, 0x75, 0x4a, 0x3a, 0xb8, 0xc9, 0x50, 0xdd, 0x0e, 0xa0, 0xca, 0x04, 0xb4,
+	0xa0, 0xb3, 0xe6, 0x16, 0x1c, 0xc7, 0x82, 0x81, 0xe0, 0x6b, 0x01, 0x5c, 0x8f, 0xea, 0xbb, 0x5f,
+	0x01, 0x7a, 0x9b, 0x8e, 0xa4, 0x00, 0x61, 0x77, 0xa8, 0x2e, 0xb8, 0xf9, 0x3a, 0xbb, 0xc1, 0x7f,
+	0x53, 0x60, 0xb5, 0x3f, 0x89, 0x8a, 0x45, 0x87, 0x41, 0xbf, 0x1c, 0x42, 0x5f, 0x19, 0x10, 0xfd,
+	0x8a, 0x45, 0xa3, 0xe0, 0x7f, 0x0e, 0xae, 0x45, 0x88, 0x2a, 0x1f, 0xf1, 0x0f, 0x93, 0x4a, 0x97,
+	0x62, 0x65, 0x19, 0xaa, 0x4b, 0x3d, 0x55, 0xe6, 0x93, 0x1e, 0x18, 0xa7, 0x4c, 0x12, 0xd7, 0x06,
+	0x18, 0xa7, 0x83, 0x5b, 0x0c, 0x7e, 0x98, 0x00, 0x3f, 0xf3, 0xf9, 0x4a, 0x00, 0x37, 0x22, 0x5b,
+	0xef, 0x11, 0xa0, 0x0a, 0x16, 0xbd, 0x32, 0x02, 0xf8, 0x0f, 0xaa, 0x73, 0x21, 0x6f, 0xa8, 0xce,
+	0xf3, 0x06, 0x70, 0xf4, 0xff, 0x48, 0x81, 0x0d, 0x7e, 0xf6, 0x38, 0x69, 0x50, 0xbd, 0x85, 0x46,
+	0x99, 0xff, 0xa1, 0xe4, 0x7b, 0xfc, 0xe3, 0xdd, 0x3b, 0xe9, 0x46, 0x1e, 0xef, 0xa8, 0x10, 0x50,
+	0x5d, 0x76, 0x0f, 0xcc, 0xde, 0x78, 0xdf, 0x65, 0xf8, 0xde, 0xea, 0x3f, 0xcc, 0x39, 0xc8, 0xac,
+	0x83, 0xbe, 0x21, 0xff, 0x56, 0x00, 0xdb, 0xb1, 0x1d, 0xbe, 0xcc, 0xb3, 0x1e, 0xfe, 0x98, 0x0e,
+	0x60, 0xfd, 0x94, 0xad, 0x8e, 0x34, 0xed, 0x43, 0x61, 0xfd, 0xb1, 0x7b, 0x92, 0x1a, 0xa8, 0x5a,
+	0xd7, 0x11, 0x36, 0xf9, 0x18, 0x6f, 0x74, 0x3b, 0xf9, 0xd5, 0x10, 0x49, 0xed, 0x75, 0xf7, 0x8c,
+	0x2c, 0xa1, 0xcf, 0xd8, 0xcf, 0xc8, 0xd6, 0x64, 0xc6, 0x7c, 0x0d, 0x8a, 0x11, 0x9c, 0x2b, 0x13,
+	0x10, 0x9c, 0x8b, 0xe9, 0x63, 0xe7, 0xe5, 0xd7, 0x88, 0xaf, 0x83, 0xf4, 0x09, 0x82, 0x76, 0x79,
+	0x3a, 0xf1, 0x53, 0x1a, 0x64, 0xf9, 0x65, 0x24, 0x94, 0xc6, 0x04, 0x65, 0xa2, 0xe8, 0x56, 0xc5,
+	0xa0, 0xf3, 0x73, 0x47, 0x0a, 0x27, 0xee, 0x19, 0xb8, 0x89, 0x57, 0x2c, 0xea, 0xb0, 0x27, 0xe2,
+	0xa6, 0x98, 0x19, 0xeb, 0x4d, 0x31, 0xee, 0x6e, 0x71, 0x65, 0x32, 0x77, 0x8b, 0x5d, 0xc6, 0x9e,
+	0x9b, 0xfd, 0x37, 0xc6, 0x7e, 0xf6, 0x18, 0x08, 0x7e, 0x23, 0x80, 0xad, 0x38, 0xd4, 0x2e, 0xf5,
+	0x92, 0xf1, 0x57, 0x0a, 0x48, 0xbe, 0x44, 0xfc, 0x22, 0x38, 0x49, 0xed, 0x09, 0x9c, 0xed, 0xe9,
+	0x31, 0x9c, 0xed, 0x4c, 0x28, 0x3c, 0x42, 0xf8, 0x84, 0x22, 0x33, 0x94, 0x50, 0x44, 0x44, 0x80,
+	0xea, 0x12, 0xa7, 0x55, 0x4f, 0x28, 0x0a, 0x0c, 0xea, 0x9d, 0x18, 0xa8, 0x83, 0xe7, 0x0c, 0xcb,
+	0xf2, 0x8d, 0x00, 0x60, 0x7c, 0x8f, 0xfd, 0x52, 0x11, 0x1e, 0x08, 0x61, 0x9c, 0x03, 0xb1, 0xff,
+	0xf3, 0x0c, 0x48, 0x97, 0x49, 0x43, 0x7c, 0x06, 0x66, 0xbd, 0xcf, 0x03, 0xdb, 0x72, 0xd4, 0xc7,
+	0x0b, 0xd9, 0xf7, 0xd6, 0x2b, 0xdd, 0x4e, 0x34, 0xf1, 0x4a, 0x78, 0x06, 0x66, 0xbd, 0x37, 0xcc,
+	0xf8, 0xc8, 0xae, 0xc9, 0x05, 0x91, 0xfb, 0xde, 0xad, 0x08, 0x58, 0xee, 0x7f, 0x0b, 0xba, 0x13,
+	0xeb, 0xdf, 0x67, 0x2b, 0xed, 0x0f, 0x6e, 0xeb, 0x6d, 0x7a, 0x02, 0xc4, 0x88, 0xdb, 0xf7, 0xee,
+	0xa0, 0x91, 0x2a, 0x16, 0x95, 0xee, 0x0f, 0x61, 0xec, 0xed, 0xfb, 0x5a, 0x00, 0x6b, 0x31, 0x17,
+	0x3f, 0xe5, 0x42, 0x30, 0xfa, 0x1d, 0xa4, 0x07, 0x43, 0x3a, 0x44, 0x26, 0x11, 0xba, 0x91, 0x24,
+	0x27, 0x11, 0x74, 0x18, 0x20, 0x89, 0x98, 0xe3, 0xf3, 0x8d, 0x00, 0xd6, 0xe3, 0xb4, 0xe9, 0xde,
+	0x85, 0xec, 0x89, 0xf0, 0x90, 0x1e, 0x0e, 0xeb, 0xe1, 0xe5, 0xf1, 0x25, 0x58, 0x8d, 0x3e, 0x61,
+	0xe5, 0xc4, 0x90, 0x01, 0x7b, 0xe9, 0xfd, 0xe1, 0xec, 0xdd, 0x04, 0x8a, 0x8f, 0x4f, 0xcf, 0x72,
+	0xc2, 0xdb, 0xb3, 0x9c, 0xf0, 0xe7, 0x59, 0x4e, 0xf8, 0xfe, 0x3c, 0x37, 0xf5, 0xf6, 0x3c, 0x37,
+	0xf5, 0xdb, 0x79, 0x6e, 0xea, 0x8b, 0x7b, 0x0d, 0x83, 0x1e, 0x59, 0x35, 0xf9, 0x10, 0x9b, 0x0a,
+	0x8f, 0x5d, 0x38, 0xd6, 0x6a, 0xc4, 0xfd, 0xa1, 0x9c, 0xec, 0x7d, 0xa0, 0xb4, 0x1d, 0x95, 0xa2,
+	0xaf, 0x9a, 0x3a, 0xa9, 0x4d, 0xdb, 0x5f, 0x0a, 0xef, 0xff, 0x17, 0x00, 0x00, 0xff, 0xff, 0xdd,
+	0xe7, 0xf0, 0x9f, 0xd7, 0x14, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/x/ibc-hooks/go.mod b/x/ibc-hooks/go.mod
index 4b2bd0a1da5..5d2dc1e9220 100644
--- a/x/ibc-hooks/go.mod
+++ b/x/ibc-hooks/go.mod
@@ -11,7 +11,7 @@ require (
 	github.com/gogo/protobuf v1.3.3
 	github.com/gorilla/mux v1.8.0
 	github.com/grpc-ecosystem/grpc-gateway v1.16.0
-	github.com/osmosis-labs/osmosis/osmoutils v0.0.0-20230510161551-8bf252f26bae
+	github.com/osmosis-labs/osmosis/osmoutils v0.0.7-0.20230901175805-bab180bc078b
 	github.com/spf13/cobra v1.7.0
 	github.com/tendermint/tendermint v0.37.0-rc1
 	google.golang.org/grpc v1.57.0
@@ -29,10 +29,10 @@ require (
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/bgentry/speakeasy v0.1.1-0.20220910012023-760eaf8b6816 // indirect
 	github.com/btcsuite/btcd v0.22.3 // indirect
-	github.com/bytedance/sonic v1.10.0 // indirect
 	github.com/cenkalti/backoff/v4 v4.1.3 // indirect
 	github.com/cespare/xxhash v1.1.0 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
+	github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect
 	github.com/coinbase/rosetta-sdk-go v0.7.9 // indirect
 	github.com/confio/ics23/go v0.9.0 // indirect
 	github.com/cosmos/btcutil v1.0.5 // indirect
@@ -52,10 +52,11 @@ require (
 	github.com/dvsekhvalnov/jose2go v1.5.0 // indirect
 	github.com/felixge/httpsnoop v1.0.2 // indirect
 	github.com/fsnotify/fsnotify v1.6.0 // indirect
-	github.com/gin-gonic/gin v1.9.1 // indirect
 	github.com/go-kit/kit v0.12.0 // indirect
 	github.com/go-kit/log v0.2.1 // indirect
 	github.com/go-logfmt/logfmt v0.5.1 // indirect
+	github.com/go-playground/validator/v10 v10.14.0 // indirect
+	github.com/goccy/go-json v0.10.2 // indirect
 	github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect
 	github.com/gogo/gateway v1.1.0 // indirect
 	github.com/golang/glog v1.1.1 // indirect
@@ -81,7 +82,6 @@ require (
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/jmhodges/levigo v1.0.0 // indirect
 	github.com/klauspost/compress v1.15.11 // indirect
-	github.com/klauspost/cpuid/v2 v2.2.5 // indirect
 	github.com/lib/pq v1.10.9 // indirect
 	github.com/libp2p/go-buffer-pool v0.1.0 // indirect
 	github.com/magiconair/properties v1.8.7 // indirect
@@ -93,7 +93,6 @@ require (
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/mtibben/percent v0.2.1 // indirect
 	github.com/nxadm/tail v1.4.8 // indirect
-	github.com/onsi/gomega v1.27.10 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
 	github.com/pelletier/go-toml/v2 v2.0.8 // indirect
 	github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 // indirect
@@ -109,7 +108,6 @@ require (
 	github.com/rs/cors v1.8.2 // indirect
 	github.com/rs/zerolog v1.27.0 // indirect
 	github.com/sasha-s/go-deadlock v0.3.1 // indirect
-	github.com/sirupsen/logrus v1.9.3 // indirect
 	github.com/spf13/afero v1.9.5 // indirect
 	github.com/spf13/cast v1.5.1 // indirect
 	github.com/spf13/jwalterweatherman v1.1.0 // indirect
@@ -122,17 +120,19 @@ require (
 	github.com/tendermint/crypto v0.0.0-20191022145703-50d29ede1e15 // indirect
 	github.com/tendermint/go-amino v0.16.0 // indirect
 	github.com/tendermint/tm-db v0.6.8-0.20220506192307-f628bb5dc95b // indirect
+	github.com/ugorji/go/codec v1.2.11 // indirect
 	github.com/zondax/hid v0.9.1 // indirect
 	github.com/zondax/ledger-go v0.14.1 // indirect
 	go.etcd.io/bbolt v1.3.6 // indirect
 	go.opencensus.io v0.24.0 // indirect
+	golang.org/x/arch v0.3.0 // indirect
 	golang.org/x/crypto v0.12.0 // indirect
 	golang.org/x/exp v0.0.0-20230811145659-89c5cff77bcb // indirect
+	golang.org/x/mod v0.12.0 // indirect
 	golang.org/x/net v0.14.0 // indirect
 	golang.org/x/sys v0.11.0 // indirect
 	golang.org/x/term v0.11.0 // indirect
 	golang.org/x/text v0.12.0 // indirect
-	golang.org/x/tools v0.12.0 // indirect
 	google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5 // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20230726155614-23370e0ffb3e // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20230815205213-6bfd019c3878 // indirect
diff --git a/x/ibc-hooks/go.sum b/x/ibc-hooks/go.sum
index 452d17daeb4..1840835ff34 100644
--- a/x/ibc-hooks/go.sum
+++ b/x/ibc-hooks/go.sum
@@ -150,7 +150,6 @@ github.com/bwesterb/go-ristretto v1.2.0/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7N
 github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1O2AihPM=
 github.com/bytedance/sonic v1.10.0-rc/go.mod h1:ElCzW+ufi8qKqNW0FY314xriJhyJhuoJ3gFZdAHF7NM=
 github.com/bytedance/sonic v1.10.0 h1:qtNZduETEIWJVIyDl01BeNxur2rW9OwTQ/yBqFRkKEk=
-github.com/bytedance/sonic v1.10.0/go.mod h1:iZcSUejdk5aukTND/Eu/ivjQuEL0Cu9/rf50Hi0u/g4=
 github.com/c-bata/go-prompt v0.2.2/go.mod h1:VzqtzE2ksDBcdln8G7mk2RX9QyGjH+OVqOCSiVIqS34=
 github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ=
 github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4=
@@ -311,7 +310,6 @@ github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE
 github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
 github.com/gin-gonic/gin v1.6.3/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M=
 github.com/gin-gonic/gin v1.9.1 h1:4idEAncQnU5cB7BeOkPtxjfCSye0AAm1R0RVIqJ+Jmg=
-github.com/gin-gonic/gin v1.9.1/go.mod h1:hPrL7YrpYKXt5YId3A/Tnip5kqbEAP+KLuI3SUcPTeU=
 github.com/glycerine/go-unsnap-stream v0.0.0-20180323001048-9f0cb55181dd/go.mod h1:/20jfyN9Y5QPEAprSgKAUr+glWDY39ZiUEAYOEv5dsE=
 github.com/glycerine/goconvey v0.0.0-20190410193231-58a59202ab31/go.mod h1:Ogl1Tioa0aV7gstGFO7KhffUsb9M4ydbEbbxpcEDc24=
 github.com/go-chi/chi/v5 v5.0.0/go.mod h1:BBug9lr0cqtdAhsu6R4AAdvufI0/XBzAQSsUqJpoZOs=
@@ -576,10 +574,10 @@ github.com/klauspost/compress v1.11.7/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYs
 github.com/klauspost/compress v1.12.3/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg=
 github.com/klauspost/compress v1.15.11 h1:Lcadnb3RKGin4FYM/orgq0qde+nc15E5Cbqg4B9Sx9c=
 github.com/klauspost/compress v1.15.11/go.mod h1:QPwzmACJjUTFsnSHH934V6woptycfrDDJnH7hvFVbGM=
+github.com/klauspost/cpuid v0.0.0-20170728055534-ae7887de9fa5 h1:2U0HzY8BJ8hVwDKIzp7y4voR9CX/nvcfymLmg2UiOio=
 github.com/klauspost/cpuid v0.0.0-20170728055534-ae7887de9fa5/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek=
 github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
 github.com/klauspost/cpuid/v2 v2.2.5 h1:0E5MSMDEoAulmXNFquVs//DdoomxaoTY1kUhbc/qbZg=
-github.com/klauspost/cpuid/v2 v2.2.5/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
 github.com/klauspost/crc32 v0.0.0-20161016154125-cb6bfca970f6/go.mod h1:+ZoRqAPRLkC4NPOvfYeR5KNOrY6TD+/sAC3HXPZgDYg=
 github.com/klauspost/pgzip v1.0.2-0.20170402124221-0bf5dcad4ada/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs=
 github.com/knz/go-libedit v1.10.1/go.mod h1:MZTVkCWyz0oBc7JOWP3wNAzd002ZbM/5hgShxwh4x8M=
@@ -702,7 +700,6 @@ github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1Cpa
 github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
 github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
 github.com/onsi/gomega v1.27.10 h1:naR28SdDFlqrG6kScpT8VWpu1xWY5nJRCF3XaYyBjhI=
-github.com/onsi/gomega v1.27.10/go.mod h1:RsS8tutOdbdgzbPtzzATp12yT7kM5I5aElG3evPbQ0M=
 github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk=
 github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
 github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
@@ -720,8 +717,7 @@ github.com/openzipkin/zipkin-go v0.2.2/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnh
 github.com/ory/dockertest v3.3.5+incompatible h1:iLLK6SQwIhcbrG783Dghaaa3WPzGc+4Emza6EbVUUGA=
 github.com/osmosis-labs/cosmos-sdk v0.45.0-rc1.0.20230829222007-529c69c19915 h1:1VDV+B0rHSrbHjZz7P1tEjZTb2nro/GAhbOT8RAoQcw=
 github.com/osmosis-labs/cosmos-sdk v0.45.0-rc1.0.20230829222007-529c69c19915/go.mod h1:L6USUt+QX9lIqUVCRs8DFEVRZJbCYbemmtcXb7GfHYE=
-github.com/osmosis-labs/osmosis/osmoutils v0.0.0-20230510161551-8bf252f26bae h1:I1Cy+GpTPWbVi0lBw9+bS1w42YfQjvXNK9bW4YbHhcs=
-github.com/osmosis-labs/osmosis/osmoutils v0.0.0-20230510161551-8bf252f26bae/go.mod h1:hk/o9/kmTSZmZqwXcSrPuwj/gpRMCqbE/d3vj6teL2A=
+github.com/osmosis-labs/osmosis/osmoutils v0.0.7-0.20230901175805-bab180bc078b h1:UFJcRrnM4q+kgvVvH35+Au5Mzj6Www4SYIF3LG0AvgM=
 github.com/osmosis-labs/wasmd v0.31.0-osmo-v16 h1:X747cZYdnqc/+RV48iPVeGprpVb/fUWSaKGsZUWrdbg=
 github.com/osmosis-labs/wasmd v0.31.0-osmo-v16/go.mod h1:Rf8zW/GgBQyFRRB4s62VQHWA6sTlMFSjoDQQpoq64iI=
 github.com/otiai10/copy v1.7.0 h1:hVoPiN+t+7d2nzzwMiDHPSOogsWAStewq3TwU05+clE=
@@ -828,7 +824,6 @@ github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6Mwd
 github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
 github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
 github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
-github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
 github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
 github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=
@@ -906,7 +901,6 @@ github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS
 github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08=
 github.com/tyler-smith/go-bip39 v1.0.1-0.20181017060643-dbb3b84ba2ef/go.mod h1:sJ5fKU0s6JVwZjjcUEX2zFOnvq0ASQ2K9Zr6cf67kNs=
 github.com/tyler-smith/go-bip39 v1.0.2/go.mod h1:sJ5fKU0s6JVwZjjcUEX2zFOnvq0ASQ2K9Zr6cf67kNs=
-github.com/ugorji/go v1.1.7 h1:/68gy2h+1mWMrwZFeD1kQialdSzAb432dtpeJ42ovdo=
 github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw=
 github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
 github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
@@ -1174,10 +1168,8 @@ golang.org/x/sys v0.0.0-20210816183151-1e6c022a8912/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20210819135213-f52c844e1c1c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM=
 golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -1262,7 +1254,6 @@ golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4f
 golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
 golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.12.0 h1:YW6HUoUmYBpwSgyaGaZq1fHjrBjX1rlpZ54T6mu2kss=
-golang.org/x/tools v0.12.0/go.mod h1:Sc0INKfu04TlqNoRA1hgpFZbhYXHPr4V5DzpSBTPqQM=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
diff --git a/x/lockup/types/query.pb.go b/x/lockup/types/query.pb.go
index 7566bd41ffc..8aa78c3edcb 100644
--- a/x/lockup/types/query.pb.go
+++ b/x/lockup/types/query.pb.go
@@ -5,6 +5,7 @@ package types
 
 import (
 	context "context"
+	cosmossdk_io_math "cosmossdk.io/math"
 	fmt "fmt"
 	github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types"
 	types "github.com/cosmos/cosmos-sdk/types"
@@ -912,7 +913,7 @@ func (m *LockedDenomRequest) GetDuration() time.Duration {
 }
 
 type LockedDenomResponse struct {
-	Amount github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,1,opt,name=amount,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"amount" yaml:"amount"`
+	Amount cosmossdk_io_math.Int `protobuf:"bytes,1,opt,name=amount,proto3,customtype=cosmossdk.io/math.Int" json:"amount" yaml:"amount"`
 }
 
 func (m *LockedDenomResponse) Reset()         { *m = LockedDenomResponse{} }
@@ -1912,112 +1913,113 @@ func init() {
 func init() { proto.RegisterFile("osmosis/lockup/query.proto", fileDescriptor_e906fda01cffd91a) }
 
 var fileDescriptor_e906fda01cffd91a = []byte{
-	// 1675 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x58, 0xcb, 0x6f, 0x14, 0x47,
-	0x1a, 0x77, 0x19, 0xec, 0x5d, 0x3e, 0xd6, 0x86, 0x2d, 0x0c, 0x6b, 0xb7, 0xcd, 0x8c, 0x29, 0xc0,
-	0x78, 0x77, 0xed, 0x6e, 0x6c, 0x2c, 0xf3, 0x58, 0x9e, 0x83, 0x61, 0x65, 0xd6, 0x4b, 0x60, 0x20,
-	0x41, 0x79, 0x69, 0xd4, 0x33, 0x53, 0x0c, 0x2d, 0x66, 0xba, 0x87, 0xe9, 0x1e, 0xc3, 0x04, 0x11,
-	0x14, 0xc8, 0x21, 0x87, 0x1c, 0x88, 0x72, 0x89, 0x72, 0x88, 0x92, 0xdc, 0x92, 0x48, 0x51, 0x2e,
-	0x39, 0xa0, 0xdc, 0x13, 0x94, 0x43, 0x84, 0x94, 0x4b, 0x94, 0x83, 0x89, 0x70, 0xfe, 0x02, 0x4e,
-	0x91, 0x72, 0x89, 0xba, 0xaa, 0xba, 0x3d, 0xfd, 0x9c, 0x1e, 0x4f, 0xb0, 0x7c, 0xb2, 0xa7, 0xbf,
-	0xd7, 0xef, 0xf7, 0xd5, 0xf3, 0x57, 0x20, 0x19, 0x66, 0xc5, 0x30, 0x35, 0x53, 0x29, 0x1b, 0x85,
-	0xeb, 0xf5, 0xaa, 0x72, 0xa3, 0x4e, 0x6b, 0x0d, 0xb9, 0x5a, 0x33, 0x2c, 0x03, 0xf7, 0x0b, 0x9b,
-	0xcc, 0x6d, 0xd2, 0x40, 0xc9, 0x28, 0x19, 0xcc, 0xa4, 0xd8, 0xff, 0x71, 0x2f, 0x29, 0x55, 0x60,
-	0x6e, 0x4a, 0x5e, 0x35, 0xa9, 0xb2, 0x38, 0x95, 0xa7, 0x96, 0x3a, 0xa5, 0x14, 0x0c, 0x4d, 0x17,
-	0xf6, 0x91, 0x92, 0x61, 0x94, 0xca, 0x54, 0x51, 0xab, 0x9a, 0xa2, 0xea, 0xba, 0x61, 0xa9, 0x96,
-	0x66, 0xe8, 0xa6, 0xb0, 0xa6, 0x85, 0x95, 0xfd, 0xca, 0xd7, 0xaf, 0x2a, 0x96, 0x56, 0xa1, 0xa6,
-	0xa5, 0x56, 0xaa, 0x4e, 0x7a, 0xbf, 0x43, 0xb1, 0x5e, 0x63, 0x19, 0x84, 0x7d, 0xc8, 0x47, 0xc0,
-	0xfe, 0x23, 0x4c, 0xc3, 0x3e, 0x53, 0x55, 0xad, 0xa9, 0x15, 0x51, 0x98, 0xec, 0x80, 0x81, 0xff,
-	0x1b, 0xc5, 0x7a, 0x99, 0x66, 0xd4, 0xb2, 0xaa, 0x17, 0x68, 0x96, 0xde, 0xa8, 0x53, 0xd3, 0x22,
-	0x6f, 0xc0, 0x76, 0xdf, 0x77, 0xb3, 0x6a, 0xe8, 0x26, 0xc5, 0x2a, 0xf4, 0xd8, 0xac, 0xcc, 0x41,
-	0x34, 0xba, 0x61, 0x7c, 0xf3, 0xf4, 0x90, 0xcc, 0x79, 0xcb, 0x36, 0x6f, 0x59, 0xf0, 0x96, 0x4f,
-	0x1b, 0x9a, 0x9e, 0xd9, 0xff, 0x68, 0x29, 0xdd, 0xf5, 0xf9, 0x93, 0xf4, 0x78, 0x49, 0xb3, 0xae,
-	0xd5, 0xf3, 0x72, 0xc1, 0xa8, 0x28, 0xa2, 0x49, 0xfc, 0xcf, 0xa4, 0x59, 0xbc, 0xae, 0x58, 0x8d,
-	0x2a, 0x35, 0x59, 0x80, 0x99, 0xe5, 0x99, 0xc9, 0x30, 0x0c, 0xf1, 0xda, 0x0b, 0x46, 0xe1, 0x3a,
-	0x2d, 0x9e, 0xaa, 0x18, 0x75, 0xdd, 0x72, 0x80, 0xdd, 0x05, 0x29, 0xcc, 0xb8, 0x76, 0xe8, 0xfe,
-	0x0b, 0x3b, 0x4f, 0x15, 0x0a, 0x76, 0xd5, 0x17, 0x75, 0xbb, 0xa3, 0x6a, 0xbe, 0x4c, 0xb9, 0x03,
-	0x47, 0x88, 0xc7, 0xa0, 0xc7, 0xb8, 0xa9, 0xd3, 0xda, 0x20, 0x1a, 0x45, 0xe3, 0x9b, 0x32, 0x5b,
-	0x9f, 0x2d, 0xa5, 0xff, 0xd6, 0x50, 0x2b, 0xe5, 0x23, 0x84, 0x7d, 0x26, 0x59, 0x6e, 0x26, 0xf7,
-	0x11, 0xa4, 0xa2, 0x32, 0xad, 0x1d, 0x9d, 0xb3, 0x30, 0xe2, 0x01, 0xa1, 0xe9, 0xa5, 0x55, 0xb1,
-	0xb9, 0x87, 0x7c, 0x7d, 0x59, 0x49, 0xb4, 0x76, 0x64, 0x4e, 0xc3, 0x90, 0xc0, 0xc0, 0x67, 0xc7,
-	0xaa, 0x98, 0xdc, 0x05, 0x29, 0x2c, 0xc9, 0xda, 0xb1, 0xf8, 0x08, 0xb9, 0x63, 0xc2, 0x11, 0x5c,
-	0x50, 0x4d, 0xeb, 0xb2, 0x56, 0xa1, 0x6d, 0x32, 0xc1, 0x2f, 0xc1, 0x26, 0x77, 0x1f, 0x19, 0xec,
-	0x1e, 0x45, 0xe3, 0x9b, 0xa7, 0x25, 0x99, 0x6f, 0x24, 0xb2, 0xb3, 0x91, 0xc8, 0x97, 0x1d, 0x8f,
-	0xcc, 0x88, 0x0d, 0xf8, 0xd9, 0x52, 0x7a, 0x2b, 0xcf, 0xe5, 0x86, 0x92, 0x07, 0x4f, 0xd2, 0x28,
-	0xbb, 0x92, 0x8a, 0x5c, 0x71, 0x87, 0xda, 0x8f, 0x4f, 0x34, 0x69, 0x16, 0x7a, 0xec, 0x29, 0xe0,
-	0x34, 0x49, 0x92, 0xbd, 0x5b, 0xa8, 0x7c, 0x81, 0xd6, 0x34, 0xa3, 0x68, 0x07, 0x67, 0x36, 0xda,
-	0x45, 0xb3, 0xdc, 0x9d, 0x7c, 0x89, 0x60, 0x22, 0x34, 0xf3, 0x79, 0x63, 0x65, 0x56, 0xbd, 0xa0,
-	0x97, 0x1b, 0xeb, 0xa5, 0x13, 0x25, 0x98, 0x4c, 0x88, 0xb7, 0xc3, 0xce, 0x7c, 0x8a, 0x60, 0xd4,
-	0xb3, 0xbc, 0x68, 0x31, 0x43, 0xaf, 0x1a, 0x35, 0xba, 0x9e, 0xe6, 0xc5, 0xab, 0xb0, 0x2b, 0x06,
-	0x63, 0x87, 0x1d, 0x78, 0x88, 0xdc, 0xec, 0xde, 0x5e, 0xcf, 0x51, 0xdd, 0xa8, 0xac, 0x93, 0x16,
-	0xe0, 0x01, 0xe8, 0x29, 0xda, 0x78, 0x06, 0x37, 0xd8, 0xf5, 0xb3, 0xfc, 0x07, 0x79, 0x0d, 0x48,
-	0x1c, 0xf4, 0x0e, 0x3b, 0xf3, 0x26, 0x60, 0x9e, 0xd6, 0xd3, 0x09, 0x17, 0x09, 0x6a, 0x42, 0x82,
-	0xb3, 0xf0, 0x57, 0xe7, 0xe6, 0x20, 0x68, 0x0f, 0x05, 0x68, 0xcf, 0x09, 0x87, 0xcc, 0xb0, 0x60,
-	0xbd, 0x85, 0xb3, 0x76, 0x02, 0xc9, 0x07, 0x36, 0x69, 0x37, 0x0f, 0xd1, 0x61, 0x9b, 0xa7, 0xbe,
-	0xa0, 0x73, 0x05, 0x7a, 0x55, 0x76, 0x3a, 0x8b, 0xb1, 0x38, 0x61, 0x67, 0xfb, 0x79, 0x29, 0x3d,
-	0x96, 0x60, 0x3f, 0x9c, 0xd7, 0xad, 0x67, 0x4b, 0xe9, 0x3e, 0x5e, 0x97, 0x67, 0x21, 0x59, 0x91,
-	0x8e, 0x8c, 0x43, 0x1f, 0xaf, 0xe7, 0x50, 0xfd, 0x07, 0xfc, 0xc5, 0xee, 0x44, 0x4e, 0x2b, 0xb2,
-	0x52, 0x1b, 0xb3, 0xbd, 0xf6, 0xcf, 0xf9, 0x22, 0x39, 0x09, 0xfd, 0x8e, 0xa7, 0x00, 0x25, 0xc3,
-	0x46, 0xdb, 0xc6, 0xfc, 0x62, 0x5b, 0x9c, 0x65, 0x7e, 0x64, 0x06, 0x86, 0xd8, 0x2f, 0x7a, 0x53,
-	0xad, 0x15, 0xb3, 0xb4, 0x40, 0xb5, 0x45, 0x5a, 0x6b, 0x59, 0xf7, 0x0c, 0x48, 0x61, 0x51, 0x02,
-	0xc3, 0x3e, 0xd8, 0x52, 0x63, 0x96, 0x5c, 0x4d, 0x98, 0xc4, 0x18, 0xf5, 0xd7, 0x3c, 0x01, 0x64,
-	0x1b, 0xfc, 0xfd, 0x3c, 0xbd, 0xc5, 0xe6, 0xcc, 0xfc, 0x9c, 0x73, 0x01, 0x9a, 0x04, 0xdc, 0xfc,
-	0x51, 0xe4, 0x8c, 0x69, 0xc1, 0xae, 0x4b, 0x0d, 0xdd, 0xba, 0x46, 0x2d, 0xad, 0xb0, 0xc0, 0x48,
-	0x9a, 0x99, 0x06, 0xff, 0xc7, 0xcd, 0x19, 0x19, 0x7d, 0xa4, 0x7b, 0x10, 0x91, 0x45, 0x20, 0x71,
-	0x19, 0x04, 0x80, 0x05, 0xd8, 0x62, 0x3a, 0x5e, 0xb9, 0xe6, 0x69, 0xbc, 0xd3, 0xdf, 0x63, 0x4f,
-	0x32, 0x31, 0x93, 0xfb, 0xcd, 0xe6, 0x8f, 0x26, 0xab, 0xfb, 0x1f, 0x18, 0xf5, 0xd5, 0x4d, 0x0e,
-	0x9c, 0x18, 0x01, 0xda, 0x21, 0x98, 0xcf, 0x41, 0xbf, 0x17, 0xb3, 0x98, 0x16, 0x89, 0x20, 0xf7,
-	0x79, 0x20, 0x93, 0x8f, 0x91, 0x6f, 0x8d, 0x2f, 0x18, 0x7a, 0x89, 0xd6, 0x9c, 0xb5, 0xd4, 0xee,
-	0xfe, 0xf4, 0x3c, 0xd6, 0xe9, 0xeb, 0xb0, 0x3b, 0x16, 0x61, 0x87, 0xdb, 0xd0, 0x87, 0xfe, 0x6b,
-	0xcb, 0x7a, 0xe2, 0xee, 0xbf, 0xb2, 0xfc, 0x69, 0xac, 0xbf, 0x42, 0x30, 0x1d, 0xd3, 0xd5, 0x4e,
-	0x2f, 0x2e, 0xcf, 0xa3, 0x17, 0x15, 0x38, 0xd0, 0x16, 0xe2, 0x0e, 0x3b, 0xf4, 0x0d, 0x82, 0x7d,
-	0x31, 0xf5, 0x56, 0x75, 0x7c, 0x3f, 0x87, 0xb6, 0x44, 0x1c, 0xdd, 0x79, 0x18, 0x6f, 0x0d, 0xbe,
-	0xc3, 0x0e, 0x0d, 0x00, 0xbe, 0x58, 0xa7, 0xb5, 0xc6, 0x05, 0xa6, 0xcc, 0x9d, 0x8d, 0xfe, 0x7f,
-	0xb0, 0xcd, 0xf3, 0x55, 0x14, 0x99, 0x81, 0x5e, 0xae, 0xe0, 0xc5, 0x66, 0xb5, 0x23, 0x50, 0x85,
-	0x59, 0x45, 0x05, 0xe1, 0x3b, 0xfd, 0xfb, 0x08, 0xf4, 0xb0, 0x6c, 0xf8, 0x5d, 0x04, 0x7d, 0x1e,
-	0x69, 0x8f, 0xf7, 0xf8, 0x33, 0x84, 0xbd, 0x08, 0x48, 0x7b, 0x5b, 0x78, 0x71, 0x78, 0x44, 0xbe,
-	0xf7, 0xe3, 0xaf, 0xef, 0x77, 0x8f, 0xe3, 0x31, 0xc5, 0xf7, 0xec, 0xe0, 0xbc, 0x89, 0x54, 0x58,
-	0x58, 0x2e, 0x2f, 0x8a, 0x7f, 0x82, 0x00, 0x07, 0x05, 0x3d, 0xfe, 0x67, 0x78, 0xb5, 0x90, 0x17,
-	0x01, 0xe9, 0x5f, 0x49, 0x5c, 0x05, 0xba, 0x19, 0x86, 0x4e, 0xc6, 0x13, 0x2d, 0xd0, 0xf1, 0xdb,
-	0x6b, 0x8e, 0x5f, 0x38, 0xf0, 0x43, 0x04, 0x3b, 0xc2, 0x95, 0x3a, 0x9e, 0xf4, 0x17, 0x8f, 0x7d,
-	0x1b, 0x90, 0xe4, 0xa4, 0xee, 0x02, 0xef, 0x49, 0x86, 0xf7, 0x08, 0x3e, 0x14, 0x85, 0x57, 0xe5,
-	0xf1, 0xb9, 0xba, 0x9b, 0x20, 0xc7, 0x44, 0xa4, 0x72, 0x9b, 0x2d, 0x94, 0x3b, 0xf8, 0x6b, 0x04,
-	0xdb, 0x43, 0x75, 0x39, 0x9e, 0x88, 0xc5, 0xe2, 0x7b, 0x07, 0x90, 0x26, 0x13, 0x7a, 0x0b, 0xe0,
-	0x27, 0x18, 0xf0, 0xc3, 0xf8, 0x60, 0x32, 0xe0, 0x9a, 0x5e, 0xf2, 0xe1, 0xfe, 0x0c, 0x01, 0x0e,
-	0xca, 0xf0, 0xe0, 0xbc, 0x88, 0xd4, 0xfb, 0xc1, 0x79, 0x11, 0xad, 0xea, 0xc9, 0x51, 0x06, 0x77,
-	0x16, 0xcf, 0xb4, 0x82, 0x2b, 0x26, 0x46, 0x64, 0x8f, 0xbd, 0xf7, 0xfb, 0xc8, 0x1e, 0x87, 0xea,
-	0xfa, 0xc8, 0x1e, 0x87, 0xab, 0xec, 0xe4, 0x3d, 0x16, 0xa0, 0xab, 0xaa, 0x69, 0xd9, 0x4a, 0xc5,
-	0xc5, 0xfd, 0x1b, 0x82, 0xbd, 0x89, 0xe4, 0x2b, 0x3e, 0x9a, 0x08, 0x59, 0xc4, 0x61, 0x27, 0x1d,
-	0x5b, 0x65, 0xb4, 0xe0, 0x99, 0x65, 0x3c, 0x17, 0xf0, 0xb9, 0x36, 0x79, 0xe6, 0x74, 0xa3, 0x79,
-	0x7e, 0x19, 0x7a, 0xb9, 0xe1, 0x52, 0xff, 0x16, 0xb9, 0x4f, 0x45, 0x41, 0xad, 0x8a, 0xf7, 0xc7,
-	0x4e, 0xf6, 0x10, 0xe9, 0x2d, 0x4d, 0xb5, 0x11, 0x21, 0x68, 0xcd, 0x31, 0x5a, 0xc7, 0xf1, 0xd1,
-	0x64, 0x4b, 0x84, 0x16, 0x73, 0x79, 0x96, 0x24, 0xe7, 0x19, 0xc3, 0xef, 0x91, 0xef, 0xb9, 0xca,
-	0xa3, 0x2d, 0xf1, 0x54, 0xa2, 0xd6, 0x37, 0x9f, 0xc1, 0xd2, 0x74, 0x3b, 0x21, 0x82, 0xcb, 0x19,
-	0xc6, 0xe5, 0x04, 0x3e, 0xd6, 0xee, 0x10, 0xb1, 0x43, 0xd6, 0x25, 0xf3, 0x36, 0x82, 0xcd, 0x4d,
-	0x52, 0x12, 0x13, 0x3f, 0x94, 0xa0, 0xce, 0x95, 0x76, 0xc7, 0xfa, 0x08, 0x7c, 0x13, 0x0c, 0xdf,
-	0x18, 0xde, 0x13, 0x85, 0x4f, 0xe0, 0xe2, 0x22, 0xf9, 0x3e, 0x02, 0xe0, 0x59, 0x32, 0x8d, 0xf9,
-	0x39, 0xbc, 0x33, 0xbc, 0x82, 0x03, 0x20, 0x15, 0x65, 0x16, 0xb5, 0x67, 0x59, 0xed, 0xfd, 0x58,
-	0x6e, 0x51, 0x3b, 0xdf, 0xc8, 0x69, 0x45, 0xe5, 0xb6, 0xd0, 0x33, 0x77, 0xf0, 0x17, 0x88, 0xeb,
-	0x7a, 0xaf, 0x8a, 0x0c, 0xee, 0x80, 0x91, 0xfa, 0x34, 0xb8, 0x03, 0x46, 0x8b, 0x52, 0x72, 0x9c,
-	0xa1, 0x3c, 0x84, 0x67, 0xe3, 0x50, 0xe6, 0x7c, 0xba, 0xb5, 0x09, 0xed, 0x5b, 0x08, 0x60, 0x45,
-	0x97, 0xe2, 0x5d, 0xfe, 0xd2, 0x01, 0x21, 0x2b, 0x91, 0x38, 0x97, 0xa4, 0xe3, 0xa6, 0xd3, 0x5b,
-	0x7c, 0x52, 0xe5, 0xb4, 0x22, 0xfe, 0x01, 0x81, 0x14, 0x2d, 0x55, 0x83, 0x6b, 0xa1, 0xa5, 0x30,
-	0x0e, 0xae, 0x85, 0xd6, 0x4a, 0x98, 0xcc, 0x33, 0xcc, 0x27, 0xf1, 0xf1, 0x28, 0xcc, 0x5e, 0xcd,
-	0x59, 0xaf, 0x9a, 0xf6, 0xd0, 0x0b, 0x0e, 0x2b, 0x1d, 0x7d, 0xa7, 0x1b, 0xe1, 0xef, 0x10, 0x0c,
-	0x45, 0xca, 0xd8, 0xe0, 0x2e, 0xd5, 0x4a, 0x2e, 0x4b, 0x53, 0x6d, 0x44, 0x24, 0x5d, 0xd9, 0x7e,
-	0x36, 0xa1, 0x64, 0xec, 0xa1, 0x19, 0x8e, 0xb9, 0x47, 0xe3, 0xf8, 0x4d, 0x27, 0x54, 0x4b, 0x4b,
-	0x07, 0xda, 0x8a, 0x11, 0x7c, 0xce, 0xb6, 0x1a, 0x1d, 0xdf, 0x4e, 0x55, 0x66, 0x69, 0x72, 0x8e,
-	0x4a, 0x88, 0x3e, 0xf3, 0x5d, 0x2a, 0xf1, 0x67, 0xbe, 0x9f, 0xc4, 0x64, 0x42, 0xef, 0x55, 0x9e,
-	0xf9, 0x01, 0xdc, 0xef, 0x75, 0xc3, 0xbf, 0xdb, 0x50, 0x7f, 0x38, 0xd3, 0x46, 0x93, 0xa3, 0xce,
-	0xff, 0xd3, 0x1d, 0xe5, 0x10, 0xcc, 0x5f, 0x66, 0xcc, 0x2f, 0xe1, 0x8b, 0xab, 0x1b, 0xb8, 0xb8,
-	0xcb, 0xc0, 0xf2, 0xca, 0xe3, 0x7a, 0xa4, 0xc8, 0xc3, 0x07, 0xdb, 0x20, 0xe1, 0x39, 0xa0, 0x0e,
-	0xb5, 0x1f, 0x28, 0x28, 0x2f, 0x30, 0xca, 0x67, 0xf1, 0xdc, 0x2a, 0x29, 0x7b, 0x0f, 0xd7, 0x06,
-	0xf4, 0x72, 0x69, 0x18, 0x3c, 0x56, 0x83, 0xea, 0x33, 0x78, 0xac, 0x86, 0x68, 0x51, 0x32, 0xc6,
-	0x00, 0x8e, 0xe2, 0x54, 0x14, 0x40, 0xae, 0x3e, 0x33, 0x0b, 0x8f, 0x9e, 0xa6, 0xd0, 0xe3, 0xa7,
-	0x29, 0xf4, 0xcb, 0xd3, 0x14, 0x7a, 0xb0, 0x9c, 0xea, 0x7a, 0xbc, 0x9c, 0xea, 0xfa, 0x69, 0x39,
-	0xd5, 0xf5, 0xca, 0x74, 0xd3, 0x63, 0xb0, 0xc8, 0x31, 0x59, 0x56, 0xf3, 0xa6, 0x9b, 0x70, 0x71,
-	0xea, 0xb0, 0x72, 0xcb, 0x49, 0xcb, 0x1e, 0x87, 0xf3, 0xbd, 0x4c, 0xe2, 0x1f, 0xf8, 0x23, 0x00,
-	0x00, 0xff, 0xff, 0x43, 0x55, 0x33, 0x80, 0xb5, 0x1f, 0x00, 0x00,
+	// 1681 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x59, 0xcd, 0x6f, 0x14, 0xe5,
+	0x1f, 0xef, 0x53, 0x68, 0x7f, 0x3f, 0xbe, 0xd8, 0x82, 0x0f, 0x05, 0xdb, 0x69, 0xd9, 0x2d, 0x0f,
+	0x50, 0xaa, 0xb6, 0x33, 0xb4, 0x34, 0xe5, 0x45, 0x5e, 0x97, 0x52, 0x53, 0xac, 0x08, 0x0b, 0x6a,
+	0x7c, 0xcb, 0x66, 0x76, 0xf7, 0x61, 0x99, 0x74, 0x77, 0x66, 0xd9, 0x99, 0x2d, 0xac, 0x04, 0x89,
+	0xe0, 0xc1, 0x83, 0x07, 0x8c, 0x17, 0xe3, 0xc1, 0xa8, 0x37, 0x35, 0x31, 0x5e, 0x3c, 0x10, 0xef,
+	0x4a, 0x3c, 0x18, 0x12, 0x2f, 0xc6, 0x43, 0x31, 0xd4, 0xbf, 0x80, 0x93, 0x89, 0x17, 0x33, 0xcf,
+	0xf3, 0xcc, 0x76, 0xe7, 0x75, 0x67, 0xbb, 0xd2, 0xf4, 0xd4, 0xce, 0x7c, 0xdf, 0x3e, 0x9f, 0xef,
+	0xf3, 0xfa, 0x99, 0x05, 0xc9, 0x30, 0x4b, 0x86, 0xa9, 0x99, 0x4a, 0xd1, 0xc8, 0x2d, 0x54, 0xcb,
+	0xca, 0xd5, 0x2a, 0xad, 0xd4, 0xe4, 0x72, 0xc5, 0xb0, 0x0c, 0xdc, 0x2b, 0x6c, 0x32, 0xb7, 0x49,
+	0x7d, 0x05, 0xa3, 0x60, 0x30, 0x93, 0x62, 0xff, 0xc7, 0xbd, 0xa4, 0x44, 0x8e, 0xb9, 0x29, 0x59,
+	0xd5, 0xa4, 0xca, 0xe2, 0x44, 0x96, 0x5a, 0xea, 0x84, 0x92, 0x33, 0x34, 0x5d, 0xd8, 0x87, 0x0a,
+	0x86, 0x51, 0x28, 0x52, 0x45, 0x2d, 0x6b, 0x8a, 0xaa, 0xeb, 0x86, 0xa5, 0x5a, 0x9a, 0xa1, 0x9b,
+	0xc2, 0x9a, 0x14, 0x56, 0xf6, 0x94, 0xad, 0x5e, 0x56, 0x2c, 0xad, 0x44, 0x4d, 0x4b, 0x2d, 0x95,
+	0x9d, 0xf4, 0x5e, 0x87, 0x7c, 0xb5, 0xc2, 0x32, 0x08, 0xfb, 0x80, 0x87, 0x80, 0xfd, 0x47, 0x98,
+	0x06, 0x3d, 0xa6, 0xb2, 0x5a, 0x51, 0x4b, 0xa2, 0x30, 0xd9, 0x01, 0x7d, 0x2f, 0x1b, 0xf9, 0x6a,
+	0x91, 0xa6, 0xd4, 0xa2, 0xaa, 0xe7, 0x68, 0x9a, 0x5e, 0xad, 0x52, 0xd3, 0x22, 0xef, 0xc2, 0x76,
+	0xcf, 0x7b, 0xb3, 0x6c, 0xe8, 0x26, 0xc5, 0x2a, 0x74, 0xd9, 0xac, 0xcc, 0x7e, 0x34, 0xbc, 0x61,
+	0x74, 0xf3, 0xe4, 0x80, 0xcc, 0x79, 0xcb, 0x36, 0x6f, 0x59, 0xf0, 0x96, 0x4f, 0x1b, 0x9a, 0x9e,
+	0xda, 0x7f, 0x7f, 0x29, 0xd9, 0xf1, 0xcd, 0xc3, 0xe4, 0x68, 0x41, 0xb3, 0xae, 0x54, 0xb3, 0x72,
+	0xce, 0x28, 0x29, 0xa2, 0x49, 0xfc, 0xcf, 0xb8, 0x99, 0x5f, 0x50, 0xac, 0x5a, 0x99, 0x9a, 0x2c,
+	0xc0, 0x4c, 0xf3, 0xcc, 0x64, 0x10, 0x06, 0x78, 0xed, 0x79, 0x23, 0xb7, 0x40, 0xf3, 0xa7, 0x4a,
+	0x46, 0x55, 0xb7, 0x1c, 0x60, 0xb7, 0x40, 0x0a, 0x32, 0xae, 0x1d, 0xba, 0x17, 0x61, 0xe7, 0xa9,
+	0x5c, 0xce, 0xae, 0xfa, 0xaa, 0x6e, 0x77, 0x54, 0xcd, 0x16, 0x29, 0x77, 0xe0, 0x08, 0xf1, 0x08,
+	0x74, 0x19, 0xd7, 0x74, 0x5a, 0xe9, 0x47, 0xc3, 0x68, 0x74, 0x53, 0x6a, 0xeb, 0xe3, 0xa5, 0xe4,
+	0x53, 0x35, 0xb5, 0x54, 0x3c, 0x42, 0xd8, 0x6b, 0x92, 0xe6, 0x66, 0x72, 0x07, 0x41, 0x22, 0x2c,
+	0xd3, 0xda, 0xd1, 0x99, 0x85, 0x21, 0x17, 0x08, 0x4d, 0x2f, 0xac, 0x8a, 0xcd, 0x6d, 0xe4, 0xe9,
+	0xcb, 0x4a, 0xa2, 0xb5, 0x23, 0x73, 0x1a, 0x06, 0x04, 0x06, 0x3e, 0x3b, 0x56, 0xc5, 0xe4, 0x16,
+	0x48, 0x41, 0x49, 0xd6, 0x8e, 0xc5, 0xe7, 0xa8, 0x3e, 0x26, 0x1c, 0xc1, 0x79, 0xd5, 0xb4, 0x2e,
+	0x69, 0x25, 0xda, 0x22, 0x13, 0xfc, 0x1a, 0x6c, 0xaa, 0xef, 0x23, 0xfd, 0x9d, 0xc3, 0x68, 0x74,
+	0xf3, 0xa4, 0x24, 0xf3, 0x8d, 0x44, 0x76, 0x36, 0x12, 0xf9, 0x92, 0xe3, 0x91, 0x1a, 0xb2, 0x01,
+	0x3f, 0x5e, 0x4a, 0x6e, 0xe5, 0xb9, 0xea, 0xa1, 0xe4, 0xee, 0xc3, 0x24, 0x4a, 0xaf, 0xa4, 0x22,
+	0xaf, 0xd7, 0x87, 0xda, 0x8b, 0x4f, 0x34, 0x69, 0x1a, 0xba, 0xec, 0x29, 0xe0, 0x34, 0x49, 0x92,
+	0xdd, 0x5b, 0xa8, 0x7c, 0x9e, 0x56, 0x34, 0x23, 0x6f, 0x07, 0xa7, 0x36, 0xda, 0x45, 0xd3, 0xdc,
+	0x9d, 0x7c, 0x87, 0x60, 0x2c, 0x30, 0xf3, 0x39, 0x63, 0x65, 0x56, 0xbd, 0xa2, 0x17, 0x6b, 0xeb,
+	0xa5, 0x13, 0x05, 0x18, 0x8f, 0x89, 0xb7, 0xcd, 0xce, 0x7c, 0x85, 0x60, 0xd8, 0xb5, 0xbc, 0x68,
+	0x3e, 0x45, 0x2f, 0x1b, 0x15, 0xba, 0x9e, 0xe6, 0xc5, 0x5b, 0xb0, 0x2b, 0x02, 0x63, 0x9b, 0x1d,
+	0xb8, 0x87, 0xea, 0xd9, 0xdd, 0xbd, 0x9e, 0xa1, 0xba, 0x51, 0x5a, 0x27, 0x2d, 0xc0, 0x7d, 0xd0,
+	0x95, 0xb7, 0xf1, 0xf4, 0x6f, 0xb0, 0xeb, 0xa7, 0xf9, 0x03, 0x79, 0x1b, 0x48, 0x14, 0xf4, 0x36,
+	0x3b, 0xf3, 0x1e, 0x60, 0x9e, 0xd6, 0xd5, 0x89, 0x3a, 0x12, 0xd4, 0x80, 0x04, 0xa7, 0xe1, 0xff,
+	0xce, 0xcd, 0x41, 0xd0, 0x1e, 0xf0, 0xd1, 0x9e, 0x11, 0x0e, 0xa9, 0x41, 0xc1, 0x7a, 0x0b, 0x67,
+	0xed, 0x04, 0x92, 0x4f, 0x6d, 0xd2, 0xf5, 0x3c, 0xe4, 0x1d, 0xd8, 0xe6, 0xaa, 0x2f, 0xe8, 0xcc,
+	0x42, 0xb7, 0xca, 0x4e, 0x67, 0x31, 0x16, 0xb2, 0x9d, 0xed, 0x8f, 0xa5, 0xe4, 0x76, 0xbe, 0xfb,
+	0x99, 0xf9, 0x05, 0x59, 0x33, 0x94, 0x92, 0x6a, 0x5d, 0x91, 0xe7, 0x74, 0xeb, 0xf1, 0x52, 0xb2,
+	0x87, 0x97, 0xe1, 0x41, 0x24, 0x2d, 0xa2, 0xc9, 0x28, 0xf4, 0xf0, 0xf4, 0x0e, 0xb3, 0x67, 0xe0,
+	0x7f, 0x36, 0xf1, 0x8c, 0x96, 0x67, 0x99, 0x37, 0xa6, 0xbb, 0xed, 0xc7, 0xb9, 0x3c, 0x39, 0x09,
+	0xbd, 0x8e, 0xa7, 0xc0, 0x20, 0xc3, 0x46, 0xdb, 0xc6, 0xfc, 0x22, 0x3b, 0x9a, 0x66, 0x7e, 0x64,
+	0x0a, 0x06, 0xd8, 0x13, 0xbd, 0xa6, 0x56, 0xf2, 0x69, 0x9a, 0xa3, 0xda, 0x22, 0xad, 0x34, 0xad,
+	0x7b, 0x06, 0xa4, 0xa0, 0x28, 0x81, 0x61, 0x1f, 0x6c, 0xa9, 0x30, 0x4b, 0xa6, 0x22, 0x4c, 0x62,
+	0x48, 0x7a, 0x2b, 0xae, 0x00, 0xb2, 0x0d, 0x9e, 0x3e, 0x47, 0xaf, 0xb3, 0x29, 0x32, 0x37, 0xe3,
+	0xdc, 0x77, 0xc6, 0x01, 0x37, 0xbe, 0x14, 0x39, 0x23, 0x5a, 0xb0, 0xeb, 0x62, 0x4d, 0xb7, 0xae,
+	0x50, 0x4b, 0xcb, 0xcd, 0x33, 0x92, 0x66, 0xaa, 0xc6, 0xff, 0xa9, 0xe7, 0x0c, 0x8d, 0x3e, 0xd2,
+	0xd9, 0x8f, 0xc8, 0x22, 0x90, 0xa8, 0x0c, 0x02, 0xc0, 0x3c, 0x6c, 0x31, 0x1d, 0xaf, 0x4c, 0xe3,
+	0xac, 0xdd, 0xe9, 0xed, 0xb1, 0x2b, 0x99, 0x98, 0xb8, 0xbd, 0x66, 0xe3, 0x4b, 0x93, 0xd5, 0x7d,
+	0x01, 0x86, 0x3d, 0x75, 0xe3, 0x03, 0x27, 0x86, 0x8f, 0x76, 0x00, 0xe6, 0xb3, 0xd0, 0xeb, 0xc6,
+	0x2c, 0xa6, 0x45, 0x2c, 0xc8, 0x3d, 0x2e, 0xc8, 0xe4, 0x0b, 0xe4, 0x59, 0xd2, 0xf3, 0x86, 0x5e,
+	0xa0, 0x15, 0x67, 0xe9, 0xb4, 0xba, 0x1d, 0x3d, 0x99, 0x65, 0xb9, 0x3b, 0x12, 0x61, 0x9b, 0xbb,
+	0xce, 0x67, 0xde, 0x5b, 0xca, 0x7a, 0xe2, 0xee, 0xbd, 0xa1, 0xfc, 0x67, 0xac, 0xbf, 0x47, 0x30,
+	0x19, 0xd1, 0xd5, 0x76, 0xef, 0x29, 0x4f, 0xa2, 0x17, 0x25, 0x38, 0xd0, 0x12, 0xe2, 0x36, 0x3b,
+	0xf4, 0x23, 0x82, 0x7d, 0x11, 0xf5, 0x56, 0x75, 0x5a, 0x3f, 0x81, 0xb6, 0x84, 0x9c, 0xd4, 0x59,
+	0x18, 0x6d, 0x0e, 0xbe, 0xcd, 0x0e, 0xf5, 0x01, 0xbe, 0x50, 0xa5, 0x95, 0xda, 0x79, 0x26, 0xc4,
+	0x9d, 0x8d, 0xfe, 0x25, 0xd8, 0xe6, 0x7a, 0x2b, 0x8a, 0x4c, 0x41, 0x37, 0x17, 0xec, 0x62, 0xb3,
+	0xda, 0xe1, 0xab, 0xc2, 0xac, 0xa2, 0x82, 0xf0, 0x9d, 0xfc, 0x67, 0x08, 0xba, 0x58, 0x36, 0xfc,
+	0x11, 0x82, 0x1e, 0x97, 0x92, 0xc7, 0x7b, 0xbc, 0x19, 0x82, 0x3e, 0x00, 0x48, 0x7b, 0x9b, 0x78,
+	0x71, 0x78, 0x44, 0xbe, 0xfd, 0xdb, 0x5f, 0x9f, 0x74, 0x8e, 0xe2, 0x11, 0xc5, 0xf3, 0x95, 0xc1,
+	0xf9, 0x04, 0x52, 0x62, 0x61, 0x99, 0xac, 0x28, 0xfe, 0x25, 0x02, 0xec, 0xd7, 0xef, 0xf8, 0xd9,
+	0xe0, 0x6a, 0x01, 0x1f, 0x00, 0xa4, 0xe7, 0xe2, 0xb8, 0x0a, 0x74, 0x53, 0x0c, 0x9d, 0x8c, 0xc7,
+	0x9a, 0xa0, 0xe3, 0x97, 0xd5, 0x0c, 0xbf, 0x70, 0xe0, 0x7b, 0x08, 0x76, 0x04, 0x0b, 0x73, 0x3c,
+	0xee, 0x2d, 0x1e, 0xf9, 0x29, 0x40, 0x92, 0xe3, 0xba, 0x0b, 0xbc, 0x27, 0x19, 0xde, 0x23, 0xf8,
+	0x50, 0x18, 0x5e, 0x95, 0xc7, 0x67, 0xaa, 0xf5, 0x04, 0x19, 0xa6, 0x19, 0x95, 0x1b, 0x6c, 0xa1,
+	0xdc, 0xc4, 0x3f, 0x20, 0xd8, 0x1e, 0x28, 0xc3, 0xf1, 0x58, 0x24, 0x16, 0x8f, 0xec, 0x97, 0xc6,
+	0x63, 0x7a, 0x0b, 0xe0, 0x27, 0x18, 0xf0, 0xc3, 0xf8, 0x60, 0x3c, 0xe0, 0x9a, 0x5e, 0xf0, 0xe0,
+	0xfe, 0x1a, 0x01, 0xf6, 0xab, 0x6e, 0xff, 0xbc, 0x08, 0x95, 0xf7, 0xfe, 0x79, 0x11, 0x2e, 0xe2,
+	0xc9, 0x51, 0x06, 0x77, 0x1a, 0x4f, 0x35, 0x83, 0x2b, 0x26, 0x46, 0x68, 0x8f, 0xdd, 0xd7, 0xf9,
+	0xd0, 0x1e, 0x07, 0xca, 0xf8, 0xd0, 0x1e, 0x07, 0x8b, 0xea, 0xf8, 0x3d, 0x16, 0xa0, 0xcb, 0xaa,
+	0x69, 0xd9, 0xc2, 0xa4, 0x8e, 0xfb, 0x6f, 0x04, 0x7b, 0x63, 0xa9, 0x55, 0x7c, 0x34, 0x16, 0xb2,
+	0x90, 0xc3, 0x4e, 0x3a, 0xb6, 0xca, 0x68, 0xc1, 0x33, 0xcd, 0x78, 0xce, 0xe3, 0xb3, 0x2d, 0xf2,
+	0xcc, 0xe8, 0x46, 0xe3, 0xfc, 0x32, 0xf4, 0x62, 0xad, 0x4e, 0xfd, 0x27, 0x54, 0xff, 0x32, 0xe4,
+	0x97, 0xa6, 0x78, 0x7f, 0xe4, 0x64, 0x0f, 0x50, 0xda, 0xd2, 0x44, 0x0b, 0x11, 0x82, 0xd6, 0x0c,
+	0xa3, 0x75, 0x1c, 0x1f, 0x8d, 0xb7, 0x44, 0x68, 0x3e, 0x93, 0x65, 0x49, 0x32, 0xae, 0x31, 0xfc,
+	0x05, 0x79, 0xbe, 0x4e, 0xb9, 0xa4, 0x24, 0x9e, 0x88, 0xd5, 0xfa, 0xc6, 0x33, 0x58, 0x9a, 0x6c,
+	0x25, 0x44, 0x70, 0x39, 0xc3, 0xb8, 0x9c, 0xc0, 0xc7, 0x5a, 0x1d, 0x22, 0x76, 0xc8, 0xd6, 0xc9,
+	0x7c, 0x80, 0x60, 0x73, 0x83, 0x72, 0xc4, 0xc4, 0x0b, 0xc5, 0x2f, 0x6b, 0xa5, 0xdd, 0x91, 0x3e,
+	0x02, 0xdf, 0x18, 0xc3, 0x37, 0x82, 0xf7, 0x84, 0xe1, 0x13, 0xb8, 0xb8, 0x26, 0xbe, 0x83, 0x00,
+	0x78, 0x96, 0x54, 0x6d, 0x6e, 0x06, 0xef, 0x0c, 0xae, 0xe0, 0x00, 0x48, 0x84, 0x99, 0x45, 0xed,
+	0x69, 0x56, 0x7b, 0x3f, 0x96, 0x9b, 0xd4, 0xce, 0xd6, 0x32, 0x5a, 0x5e, 0xb9, 0x21, 0xf4, 0xcc,
+	0x4d, 0xfc, 0x2d, 0xe2, 0x32, 0xde, 0xad, 0x22, 0xfd, 0x3b, 0x60, 0xa8, 0x3e, 0xf5, 0xef, 0x80,
+	0xe1, 0xa2, 0x94, 0x1c, 0x67, 0x28, 0x0f, 0xe1, 0xe9, 0x28, 0x94, 0x19, 0x8f, 0x6e, 0x6d, 0x40,
+	0xfb, 0x3e, 0x02, 0x58, 0xd1, 0xa5, 0x78, 0x97, 0xb7, 0xb4, 0x4f, 0xc8, 0x4a, 0x24, 0xca, 0x25,
+	0xee, 0xb8, 0xe9, 0xf4, 0x3a, 0x9f, 0x54, 0x19, 0x2d, 0x8f, 0x7f, 0x45, 0x20, 0x85, 0x4b, 0x55,
+	0xff, 0x5a, 0x68, 0x2a, 0x8c, 0xfd, 0x6b, 0xa1, 0xb9, 0x12, 0x26, 0x73, 0x0c, 0xf3, 0x49, 0x7c,
+	0x3c, 0x0c, 0xb3, 0x5b, 0x73, 0x56, 0xcb, 0xa6, 0x3d, 0xf4, 0x82, 0xc3, 0x4a, 0x47, 0x3f, 0xec,
+	0x44, 0xf8, 0x67, 0x04, 0x03, 0xa1, 0x32, 0xd6, 0xbf, 0x4b, 0x35, 0x93, 0xcb, 0xd2, 0x44, 0x0b,
+	0x11, 0x71, 0x57, 0xb6, 0x97, 0x4d, 0x20, 0x19, 0x7b, 0x68, 0x06, 0x23, 0xee, 0xd1, 0x38, 0x7a,
+	0xd3, 0x09, 0xd4, 0xd2, 0xd2, 0x81, 0x96, 0x62, 0x04, 0x9f, 0xd9, 0x66, 0xa3, 0xe3, 0xd9, 0xa9,
+	0x8a, 0x2c, 0x4d, 0xc6, 0x51, 0x09, 0xe1, 0x67, 0x7e, 0x9d, 0x4a, 0xf4, 0x99, 0xef, 0x25, 0x31,
+	0x1e, 0xd3, 0x7b, 0x95, 0x67, 0xbe, 0x0f, 0xf7, 0xc7, 0x9d, 0xf0, 0x7c, 0x0b, 0xea, 0x0f, 0xa7,
+	0x5a, 0x68, 0x72, 0xd8, 0xf9, 0x7f, 0xba, 0xad, 0x1c, 0x82, 0xf9, 0x1b, 0x8c, 0xf9, 0x45, 0x7c,
+	0x61, 0x75, 0x03, 0x17, 0x75, 0x19, 0x58, 0x5e, 0xf9, 0x96, 0x1e, 0x2a, 0xf2, 0xf0, 0xc1, 0x16,
+	0x48, 0xb8, 0x0e, 0xa8, 0x43, 0xad, 0x07, 0x0a, 0xca, 0xf3, 0x8c, 0xf2, 0x2c, 0x9e, 0x59, 0x25,
+	0x65, 0xf7, 0xe1, 0x5a, 0x83, 0x6e, 0x2e, 0x0d, 0xfd, 0xc7, 0xaa, 0x5f, 0x7d, 0xfa, 0x8f, 0xd5,
+	0x00, 0x2d, 0x4a, 0x46, 0x18, 0xc0, 0x61, 0x9c, 0x08, 0x03, 0xc8, 0xd5, 0x67, 0x6a, 0xfe, 0xfe,
+	0xa3, 0x04, 0x7a, 0xf0, 0x28, 0x81, 0xfe, 0x7c, 0x94, 0x40, 0x77, 0x97, 0x13, 0x1d, 0x0f, 0x96,
+	0x13, 0x1d, 0xbf, 0x2f, 0x27, 0x3a, 0xde, 0x9c, 0x6c, 0xf8, 0x2d, 0x4c, 0xe4, 0x18, 0x2f, 0xaa,
+	0x59, 0xb3, 0x9e, 0x70, 0x71, 0xe2, 0xb0, 0x72, 0xdd, 0x49, 0xcb, 0x7e, 0x1b, 0xcb, 0x76, 0x33,
+	0x89, 0x7f, 0xe0, 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x48, 0x2e, 0xfa, 0x9c, 0xa4, 0x1f, 0x00,
+	0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/x/mint/types/mint.pb.go b/x/mint/types/mint.pb.go
index 0c7997a137e..c12cdb50923 100644
--- a/x/mint/types/mint.pb.go
+++ b/x/mint/types/mint.pb.go
@@ -4,9 +4,9 @@
 package types
 
 import (
+	cosmossdk_io_math "cosmossdk.io/math"
 	fmt "fmt"
 	_ "github.com/cosmos/cosmos-sdk/codec/types"
-	github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types"
 	_ "github.com/gogo/protobuf/gogoproto"
 	proto "github.com/gogo/protobuf/proto"
 	_ "github.com/gogo/protobuf/types"
@@ -29,7 +29,7 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
 // Minter represents the minting state.
 type Minter struct {
 	// epoch_provisions represent rewards for the current epoch.
-	EpochProvisions github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,1,opt,name=epoch_provisions,json=epochProvisions,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"epoch_provisions" yaml:"epoch_provisions"`
+	EpochProvisions cosmossdk_io_math.LegacyDec `protobuf:"bytes,1,opt,name=epoch_provisions,json=epochProvisions,proto3,customtype=cosmossdk.io/math.LegacyDec" json:"epoch_provisions" yaml:"epoch_provisions"`
 }
 
 func (m *Minter) Reset()         { *m = Minter{} }
@@ -69,8 +69,8 @@ var xxx_messageInfo_Minter proto.InternalMessageInfo
 // The weight is used to determine the proportion of the total minted
 // tokens to be minted to the address.
 type WeightedAddress struct {
-	Address string                                 `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty" yaml:"address"`
-	Weight  github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,2,opt,name=weight,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"weight" yaml:"weight"`
+	Address string                      `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty" yaml:"address"`
+	Weight  cosmossdk_io_math.LegacyDec `protobuf:"bytes,2,opt,name=weight,proto3,customtype=cosmossdk.io/math.LegacyDec" json:"weight" yaml:"weight"`
 }
 
 func (m *WeightedAddress) Reset()         { *m = WeightedAddress{} }
@@ -119,16 +119,16 @@ func (m *WeightedAddress) GetAddress() string {
 type DistributionProportions struct {
 	// staking defines the proportion of the minted mint_denom that is to be
 	// allocated as staking rewards.
-	Staking github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,1,opt,name=staking,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"staking" yaml:"staking"`
+	Staking cosmossdk_io_math.LegacyDec `protobuf:"bytes,1,opt,name=staking,proto3,customtype=cosmossdk.io/math.LegacyDec" json:"staking" yaml:"staking"`
 	// pool_incentives defines the proportion of the minted mint_denom that is
 	// to be allocated as pool incentives.
-	PoolIncentives github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,2,opt,name=pool_incentives,json=poolIncentives,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"pool_incentives" yaml:"pool_incentives"`
+	PoolIncentives cosmossdk_io_math.LegacyDec `protobuf:"bytes,2,opt,name=pool_incentives,json=poolIncentives,proto3,customtype=cosmossdk.io/math.LegacyDec" json:"pool_incentives" yaml:"pool_incentives"`
 	// developer_rewards defines the proportion of the minted mint_denom that is
 	// to be allocated to developer rewards address.
-	DeveloperRewards github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,3,opt,name=developer_rewards,json=developerRewards,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"developer_rewards" yaml:"developer_rewards"`
+	DeveloperRewards cosmossdk_io_math.LegacyDec `protobuf:"bytes,3,opt,name=developer_rewards,json=developerRewards,proto3,customtype=cosmossdk.io/math.LegacyDec" json:"developer_rewards" yaml:"developer_rewards"`
 	// community_pool defines the proportion of the minted mint_denom that is
 	// to be allocated to the community pool.
-	CommunityPool github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,4,opt,name=community_pool,json=communityPool,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"community_pool" yaml:"community_pool"`
+	CommunityPool cosmossdk_io_math.LegacyDec `protobuf:"bytes,4,opt,name=community_pool,json=communityPool,proto3,customtype=cosmossdk.io/math.LegacyDec" json:"community_pool" yaml:"community_pool"`
 }
 
 func (m *DistributionProportions) Reset()         { *m = DistributionProportions{} }
@@ -169,7 +169,7 @@ type Params struct {
 	// mint_denom is the denom of the coin to mint.
 	MintDenom string `protobuf:"bytes,1,opt,name=mint_denom,json=mintDenom,proto3" json:"mint_denom,omitempty"`
 	// genesis_epoch_provisions epoch provisions from the first epoch.
-	GenesisEpochProvisions github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,2,opt,name=genesis_epoch_provisions,json=genesisEpochProvisions,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"genesis_epoch_provisions" yaml:"genesis_epoch_provisions"`
+	GenesisEpochProvisions cosmossdk_io_math.LegacyDec `protobuf:"bytes,2,opt,name=genesis_epoch_provisions,json=genesisEpochProvisions,proto3,customtype=cosmossdk.io/math.LegacyDec" json:"genesis_epoch_provisions" yaml:"genesis_epoch_provisions"`
 	// epoch_identifier mint epoch identifier e.g. (day, week).
 	EpochIdentifier string `protobuf:"bytes,3,opt,name=epoch_identifier,json=epochIdentifier,proto3" json:"epoch_identifier,omitempty" yaml:"epoch_identifier"`
 	// reduction_period_in_epochs the number of epochs it takes
@@ -177,7 +177,7 @@ type Params struct {
 	ReductionPeriodInEpochs int64 `protobuf:"varint,4,opt,name=reduction_period_in_epochs,json=reductionPeriodInEpochs,proto3" json:"reduction_period_in_epochs,omitempty" yaml:"reduction_period_in_epochs"`
 	// reduction_factor is the reduction multiplier to execute
 	// at the end of each period set by reduction_period_in_epochs.
-	ReductionFactor github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,5,opt,name=reduction_factor,json=reductionFactor,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"reduction_factor" yaml:"reduction_factor"`
+	ReductionFactor cosmossdk_io_math.LegacyDec `protobuf:"bytes,5,opt,name=reduction_factor,json=reductionFactor,proto3,customtype=cosmossdk.io/math.LegacyDec" json:"reduction_factor" yaml:"reduction_factor"`
 	// distribution_proportions defines the distribution proportions of the minted
 	// denom. In other words, defines which stakeholders will receive the minted
 	// denoms and how much.
@@ -276,55 +276,56 @@ func init() {
 func init() { proto.RegisterFile("osmosis/mint/v1beta1/mint.proto", fileDescriptor_ccb38f8335e0f45b) }
 
 var fileDescriptor_ccb38f8335e0f45b = []byte{
-	// 768 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0xcd, 0x6e, 0xf3, 0x44,
-	0x14, 0x8d, 0x49, 0x49, 0xf9, 0xa6, 0x6a, 0x53, 0xac, 0xd2, 0x98, 0x22, 0xe2, 0xd6, 0x6a, 0x51,
-	0x90, 0x68, 0x4c, 0xdb, 0x15, 0xdd, 0x00, 0x51, 0x28, 0xa4, 0x12, 0x52, 0x18, 0x16, 0x95, 0xba,
-	0xb1, 0x1c, 0x7b, 0xea, 0x8e, 0x1a, 0xcf, 0x98, 0x99, 0x49, 0x42, 0x36, 0xbc, 0x00, 0x1b, 0x96,
-	0x5d, 0xc2, 0xdb, 0x74, 0x59, 0x76, 0x88, 0x45, 0x84, 0xda, 0x37, 0xc8, 0x0b, 0x80, 0xe6, 0xc7,
-	0x49, 0xeb, 0x36, 0x12, 0xd1, 0xb7, 0x8a, 0xe7, 0xdc, 0x93, 0x73, 0xae, 0xef, 0xdc, 0x7b, 0x0d,
-	0x5c, 0xca, 0x53, 0xca, 0x31, 0xf7, 0x53, 0x4c, 0x84, 0x3f, 0x3c, 0xea, 0x21, 0x11, 0x1e, 0xa9,
-	0x43, 0x33, 0x63, 0x54, 0x50, 0x7b, 0xcb, 0x10, 0x9a, 0x0a, 0x33, 0x84, 0x9d, 0xad, 0x84, 0x26,
-	0x54, 0x11, 0x7c, 0xf9, 0xa4, 0xb9, 0x3b, 0x6e, 0x42, 0x69, 0xd2, 0x47, 0xbe, 0x3a, 0xf5, 0x06,
-	0x57, 0xbe, 0xc0, 0x29, 0xe2, 0x22, 0x4c, 0x33, 0x43, 0xf8, 0xb0, 0x48, 0x08, 0xc9, 0xd8, 0x84,
-	0xea, 0xc5, 0x50, 0x3c, 0x60, 0xa1, 0xc0, 0x94, 0xe8, 0xb8, 0xf7, 0x0b, 0xa8, 0x7c, 0x8f, 0x89,
-	0x40, 0xcc, 0x16, 0x60, 0x13, 0x65, 0x34, 0xba, 0x0e, 0x32, 0x46, 0x87, 0x98, 0x63, 0x4a, 0xb8,
-	0x63, 0xed, 0x5a, 0x8d, 0x37, 0xad, 0xce, 0xdd, 0xc4, 0x2d, 0xfd, 0x3d, 0x71, 0x3f, 0x49, 0xb0,
-	0xb8, 0x1e, 0xf4, 0x9a, 0x11, 0x4d, 0xfd, 0x48, 0xe5, 0x6f, 0x7e, 0x0e, 0x79, 0x7c, 0xe3, 0x8b,
-	0x71, 0x86, 0x78, 0xb3, 0x8d, 0xa2, 0xe9, 0xc4, 0xad, 0x8d, 0xc3, 0xb4, 0x7f, 0xea, 0x15, 0xf5,
-	0x3c, 0x58, 0x55, 0x50, 0x77, 0x8e, 0xdc, 0x5a, 0xa0, 0x7a, 0x81, 0x70, 0x72, 0x2d, 0x50, 0xfc,
-	0x75, 0x1c, 0x33, 0xc4, 0xb9, 0xfd, 0x19, 0x58, 0x0d, 0xf5, 0xa3, 0x49, 0xc0, 0x9e, 0x4e, 0xdc,
-	0x0d, 0x2d, 0x69, 0x02, 0x1e, 0xcc, 0x29, 0xf6, 0x05, 0xa8, 0x8c, 0x94, 0x80, 0xf3, 0x8e, 0x22,
-	0x7f, 0xb9, 0x74, 0xb6, 0xeb, 0x5a, 0x5a, 0xab, 0x78, 0xd0, 0xc8, 0x79, 0x7f, 0x96, 0x41, 0xad,
-	0x8d, 0xb9, 0x60, 0xb8, 0x37, 0x90, 0x15, 0xeb, 0x32, 0x9a, 0x51, 0x26, 0x9f, 0xb8, 0x7d, 0x09,
-	0x56, 0xb9, 0x08, 0x6f, 0x30, 0x49, 0x4c, 0x8a, 0x5f, 0x2d, 0xed, 0x6a, 0x5e, 0xc8, 0xc8, 0x78,
-	0x30, 0x17, 0xb4, 0x7f, 0x02, 0xd5, 0x8c, 0xd2, 0x7e, 0x80, 0x49, 0x84, 0x88, 0xc0, 0x43, 0xc4,
-	0xcd, 0x9b, 0x7d, 0xb7, 0xb4, 0xc7, 0xb6, 0xf6, 0x28, 0xc8, 0x79, 0x70, 0x43, 0x22, 0x9d, 0x19,
-	0x60, 0x8f, 0xc0, 0xfb, 0x31, 0x1a, 0xa2, 0x3e, 0xcd, 0x10, 0x0b, 0x18, 0x1a, 0x85, 0x2c, 0xe6,
-	0x4e, 0x59, 0x99, 0x9e, 0x2f, 0x6d, 0xea, 0x68, 0xd3, 0x17, 0x82, 0x1e, 0xdc, 0x9c, 0x61, 0x50,
-	0x43, 0x36, 0x01, 0x1b, 0x11, 0x4d, 0xd3, 0x01, 0xc1, 0x62, 0x1c, 0xc8, 0xa4, 0x9c, 0x15, 0xe5,
-	0xfa, 0xed, 0xd2, 0xae, 0x1f, 0x68, 0xd7, 0xe7, 0x6a, 0x1e, 0x5c, 0x9f, 0x01, 0x5d, 0x79, 0xfe,
-	0xb7, 0x02, 0x2a, 0xdd, 0x90, 0x85, 0x29, 0xb7, 0x3f, 0x06, 0x40, 0xce, 0x5e, 0x10, 0x23, 0x42,
-	0x53, 0x7d, 0x8b, 0xf0, 0x8d, 0x44, 0xda, 0x12, 0xb0, 0x7f, 0xb5, 0x80, 0x93, 0x20, 0x82, 0x38,
-	0xe6, 0xc1, 0x8b, 0xb9, 0xd0, 0xf7, 0xf1, 0xc3, 0xd2, 0x49, 0xba, 0x3a, 0xc9, 0x45, 0xba, 0x1e,
-	0xdc, 0x36, 0xa1, 0x6f, 0x9e, 0x8f, 0x89, 0x7d, 0x96, 0x0f, 0x27, 0x8e, 0xe5, 0x9d, 0x5d, 0x61,
-	0xc4, 0xcc, 0xfd, 0x7c, 0x54, 0x1c, 0xb7, 0x39, 0x23, 0x1f, 0xb7, 0xce, 0x0c, 0xb1, 0x7b, 0x60,
-	0x87, 0xa1, 0x78, 0x10, 0xc9, 0x2e, 0x0e, 0x32, 0xc4, 0x30, 0x8d, 0x03, 0x4c, 0x74, 0x22, 0x5c,
-	0xd5, 0xbe, 0xdc, 0x3a, 0x98, 0x4e, 0xdc, 0x3d, 0xad, 0xb8, 0x98, 0xeb, 0xc1, 0xda, 0x2c, 0xd8,
-	0x55, 0xb1, 0x0e, 0x51, 0x49, 0x73, 0xb9, 0x48, 0xe6, 0xff, 0xbb, 0x0a, 0x23, 0x41, 0x99, 0xf3,
-	0xee, 0xdb, 0x2d, 0x92, 0xa2, 0x9e, 0x07, 0xab, 0x33, 0xe8, 0x4c, 0x21, 0x36, 0x01, 0x4e, 0xfc,
-	0x64, 0x58, 0x65, 0x55, 0xf3, 0x69, 0x75, 0x2a, 0xbb, 0x56, 0x63, 0xed, 0xf8, 0xb0, 0xf9, 0xda,
-	0xce, 0x6d, 0x2e, 0x18, 0xf1, 0xd6, 0x8a, 0x4c, 0x16, 0xd6, 0xe2, 0x05, 0x1b, 0xe0, 0x0f, 0x0b,
-	0xec, 0x8f, 0xcc, 0xe2, 0x0a, 0x5e, 0xf4, 0x7a, 0xc0, 0x50, 0x84, 0xf0, 0x10, 0x31, 0xee, 0xac,
-	0xee, 0x96, 0x1b, 0x6b, 0xc7, 0x07, 0xaf, 0x9b, 0x17, 0x56, 0x5f, 0xeb, 0x53, 0x69, 0x3a, 0xaf,
-	0xff, 0x62, 0x5d, 0x0f, 0xee, 0xe5, 0xee, 0xed, 0xc2, 0x50, 0xc1, 0xdc, 0x5a, 0xf6, 0x70, 0x43,
-	0xda, 0x61, 0x92, 0xcc, 0x04, 0x9e, 0x15, 0x89, 0x8b, 0x90, 0x09, 0x7d, 0xa3, 0xce, 0x7b, 0xea,
-	0xf2, 0x4f, 0xa6, 0x13, 0xd7, 0xd7, 0xe6, 0xff, 0xf7, 0x9f, 0x1e, 0xdc, 0x37, 0x54, 0x93, 0xc0,
-	0xd3, 0x8a, 0xfe, 0x28, 0x79, 0xaa, 0x31, 0x4e, 0x57, 0x6e, 0x7f, 0x77, 0x4b, 0xad, 0xf3, 0xbb,
-	0x87, 0xba, 0x75, 0xff, 0x50, 0xb7, 0xfe, 0x79, 0xa8, 0x5b, 0xbf, 0x3d, 0xd6, 0x4b, 0xf7, 0x8f,
-	0xf5, 0xd2, 0x5f, 0x8f, 0xf5, 0xd2, 0xe5, 0xe7, 0x4f, 0xba, 0xc2, 0x14, 0xeb, 0xb0, 0x1f, 0xf6,
-	0x78, 0x7e, 0xf0, 0x87, 0x47, 0x5f, 0xf8, 0x3f, 0xeb, 0x2f, 0xaa, 0xea, 0x91, 0x5e, 0x45, 0x7d,
-	0xc3, 0x4e, 0xfe, 0x0b, 0x00, 0x00, 0xff, 0xff, 0x6e, 0xde, 0x68, 0x0c, 0x6e, 0x07, 0x00, 0x00,
+	// 774 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x55, 0xcf, 0x4f, 0x1b, 0x47,
+	0x18, 0xf5, 0xd6, 0xd4, 0x94, 0x41, 0x60, 0xba, 0xa2, 0x78, 0x0b, 0xaa, 0x17, 0x56, 0x20, 0xb9,
+	0x52, 0xf1, 0x16, 0x68, 0x0f, 0x45, 0xfd, 0xa1, 0x5a, 0x2e, 0x12, 0x15, 0x51, 0xac, 0xc9, 0x21,
+	0x52, 0x2e, 0xab, 0xf5, 0xee, 0x78, 0x3d, 0xc2, 0xbb, 0xb3, 0x9a, 0x19, 0x9b, 0xf8, 0x96, 0x7b,
+	0x14, 0x29, 0xc7, 0x1c, 0x93, 0x43, 0xfe, 0x17, 0x8e, 0x1c, 0xa3, 0x1c, 0xac, 0x08, 0x4e, 0xb9,
+	0xfa, 0x2f, 0x88, 0xe6, 0xc7, 0xda, 0xb0, 0x60, 0xc9, 0xca, 0x6d, 0xe7, 0x7d, 0x6f, 0xde, 0xfb,
+	0xfc, 0xcd, 0xbc, 0x31, 0xb0, 0x09, 0x8b, 0x09, 0xc3, 0xcc, 0x8d, 0x71, 0xc2, 0xdd, 0xc1, 0x41,
+	0x1b, 0x71, 0xff, 0x40, 0x2e, 0xea, 0x29, 0x25, 0x9c, 0x98, 0xeb, 0x9a, 0x50, 0x97, 0x98, 0x26,
+	0x6c, 0xae, 0x47, 0x24, 0x22, 0x92, 0xe0, 0x8a, 0x2f, 0xc5, 0xdd, 0xb4, 0x23, 0x42, 0xa2, 0x1e,
+	0x72, 0xe5, 0xaa, 0xdd, 0xef, 0xb8, 0x1c, 0xc7, 0x88, 0x71, 0x3f, 0x4e, 0x35, 0xe1, 0xc7, 0x3c,
+	0xc1, 0x4f, 0x86, 0xba, 0x54, 0xcd, 0x97, 0xc2, 0x3e, 0xf5, 0x39, 0x26, 0x89, 0xaa, 0x3b, 0x0c,
+	0x94, 0x1e, 0xe1, 0x84, 0x23, 0x6a, 0x62, 0xb0, 0x86, 0x52, 0x12, 0x74, 0xbd, 0x94, 0x92, 0x01,
+	0x66, 0x98, 0x24, 0xcc, 0x32, 0xb6, 0x8d, 0xda, 0x52, 0xe3, 0xef, 0xcb, 0x91, 0x5d, 0xf8, 0x38,
+	0xb2, 0xb7, 0x02, 0xd9, 0x34, 0x0b, 0xcf, 0xeb, 0x98, 0xb8, 0xb1, 0xcf, 0xbb, 0xf5, 0x33, 0x14,
+	0xf9, 0xc1, 0xb0, 0x89, 0x82, 0xf1, 0xc8, 0xae, 0x0c, 0xfd, 0xb8, 0x77, 0xec, 0xe4, 0x45, 0x1c,
+	0x58, 0x96, 0x50, 0x6b, 0x8a, 0xbc, 0x32, 0x40, 0xf9, 0x29, 0xc2, 0x51, 0x97, 0xa3, 0xf0, 0xdf,
+	0x30, 0xa4, 0x88, 0x31, 0xf3, 0x17, 0xb0, 0xe8, 0xab, 0x4f, 0xed, 0x6a, 0x8e, 0x47, 0xf6, 0xaa,
+	0x92, 0xd4, 0x05, 0x07, 0x66, 0x14, 0xf3, 0x0c, 0x94, 0x2e, 0xa4, 0x80, 0xf5, 0x8d, 0x24, 0xff,
+	0x36, 0x5f, 0x8b, 0x2b, 0x4a, 0x4f, 0x6d, 0x75, 0xa0, 0xd6, 0x70, 0xde, 0x17, 0x41, 0xa5, 0x89,
+	0x19, 0xa7, 0xb8, 0xdd, 0x17, 0xb3, 0x69, 0x51, 0x92, 0x12, 0x2a, 0xbe, 0x98, 0xf9, 0x18, 0x2c,
+	0x32, 0xee, 0x9f, 0xe3, 0x24, 0xd2, 0x7d, 0xfd, 0x3e, 0x9f, 0x95, 0x6e, 0x5d, 0xef, 0x75, 0x60,
+	0xa6, 0x62, 0x76, 0x40, 0x39, 0x25, 0xa4, 0xe7, 0xe1, 0x24, 0x40, 0x09, 0xc7, 0x03, 0xc4, 0xf4,
+	0x6f, 0xf8, 0x6b, 0x3e, 0xe1, 0x0d, 0x25, 0x9c, 0xd3, 0x70, 0xe0, 0xaa, 0x40, 0x4e, 0x27, 0x80,
+	0xd9, 0x03, 0xdf, 0x87, 0x68, 0x80, 0x7a, 0x24, 0x45, 0xd4, 0xa3, 0xe8, 0xc2, 0xa7, 0x21, 0xb3,
+	0x8a, 0xd2, 0xe9, 0x9f, 0xf9, 0x9c, 0x2c, 0xe5, 0x74, 0x4f, 0xc5, 0x81, 0x6b, 0x13, 0x0c, 0x2a,
+	0xc8, 0x0c, 0xc0, 0x6a, 0x40, 0xe2, 0xb8, 0x9f, 0x60, 0x3e, 0xf4, 0x44, 0x27, 0xd6, 0x82, 0xb4,
+	0xfa, 0x73, 0x3e, 0xab, 0x1f, 0x94, 0xd5, 0x5d, 0x09, 0x07, 0xae, 0x4c, 0x80, 0x96, 0x58, 0x7f,
+	0x2e, 0x81, 0x52, 0xcb, 0xa7, 0x7e, 0xcc, 0xcc, 0x9f, 0x00, 0x10, 0xc9, 0xf1, 0x42, 0x94, 0x90,
+	0x58, 0x9d, 0x0c, 0x5c, 0x12, 0x48, 0x53, 0x00, 0xe6, 0x0b, 0x03, 0x58, 0x11, 0x4a, 0x10, 0xc3,
+	0xcc, 0xbb, 0x77, 0xab, 0xd5, 0xb8, 0x4f, 0xe6, 0xeb, 0xcc, 0x56, 0x9d, 0xcd, 0x12, 0x73, 0xe0,
+	0x86, 0x2e, 0xfd, 0x77, 0xf7, 0x92, 0x9b, 0x27, 0x59, 0x9e, 0x70, 0x28, 0x8e, 0xa4, 0x83, 0x11,
+	0xd5, 0xe3, 0xdf, 0xca, 0x87, 0x65, 0xca, 0xc8, 0xc2, 0x72, 0x3a, 0x41, 0xcc, 0x36, 0xd8, 0xa4,
+	0x28, 0xec, 0x07, 0xe2, 0x3a, 0x7a, 0x29, 0xa2, 0x98, 0x84, 0x1e, 0x4e, 0x54, 0x23, 0x4c, 0x4e,
+	0xb9, 0xd8, 0xd8, 0x1b, 0x8f, 0xec, 0x1d, 0xa5, 0x38, 0x9b, 0xeb, 0xc0, 0xca, 0xa4, 0xd8, 0x92,
+	0xb5, 0xd3, 0x44, 0x36, 0xcd, 0x44, 0xf6, 0xa7, 0xfb, 0x3a, 0x7e, 0xc0, 0x09, 0xb5, 0xbe, 0xfd,
+	0x8a, 0xec, 0xe7, 0x45, 0x1c, 0x58, 0x9e, 0x40, 0x27, 0x12, 0x31, 0x13, 0x60, 0x85, 0xb7, 0xa2,
+	0x26, 0x46, 0x99, 0x65, 0xcd, 0x2a, 0x6d, 0x1b, 0xb5, 0xe5, 0xc3, 0xfd, 0xfa, 0x43, 0x6f, 0x63,
+	0x7d, 0x46, 0x40, 0x1b, 0x0b, 0xa2, 0x43, 0x58, 0x09, 0x67, 0xe4, 0xf7, 0x9d, 0x01, 0x76, 0x2f,
+	0xf4, 0x5b, 0xe3, 0xdd, 0xbb, 0xca, 0x1e, 0x45, 0x01, 0xc2, 0x03, 0x44, 0x99, 0xb5, 0xb8, 0x5d,
+	0xac, 0x2d, 0x1f, 0xee, 0x3d, 0x6c, 0x9e, 0x7b, 0xad, 0x1a, 0x3f, 0x0b, 0xd3, 0xe9, 0xd0, 0x67,
+	0xeb, 0x3a, 0x70, 0x27, 0x73, 0x6f, 0xe6, 0x32, 0x03, 0x33, 0x6b, 0xf3, 0xa5, 0x01, 0x6a, 0xc2,
+	0x0e, 0x27, 0xd1, 0x44, 0xe0, 0xce, 0x90, 0x18, 0xf7, 0x29, 0x57, 0xc7, 0x68, 0x7d, 0x27, 0x4f,
+	0xfc, 0x68, 0x3c, 0xb2, 0x5d, 0x65, 0x3e, 0xef, 0x4e, 0x07, 0xee, 0x6a, 0xaa, 0x6e, 0xe0, 0xf6,
+	0x44, 0x9f, 0x08, 0x9e, 0xbc, 0x0d, 0xc7, 0x0b, 0x6f, 0xde, 0xda, 0x85, 0xc6, 0xff, 0x97, 0xd7,
+	0x55, 0xe3, 0xea, 0xba, 0x6a, 0x7c, 0xba, 0xae, 0x1a, 0xaf, 0x6f, 0xaa, 0x85, 0xab, 0x9b, 0x6a,
+	0xe1, 0xc3, 0x4d, 0xb5, 0xf0, 0xec, 0xd7, 0x08, 0xf3, 0x6e, 0xbf, 0x5d, 0x0f, 0x48, 0xec, 0xea,
+	0x61, 0xed, 0xf7, 0xfc, 0x36, 0xcb, 0x16, 0xee, 0xe0, 0xe0, 0x0f, 0xf7, 0xb9, 0xfa, 0xe7, 0xe3,
+	0xc3, 0x14, 0xb1, 0x76, 0x49, 0xfe, 0xd7, 0x1c, 0x7d, 0x09, 0x00, 0x00, 0xff, 0xff, 0x2c, 0x9a,
+	0xec, 0x92, 0x16, 0x07, 0x00, 0x00,
 }
 
 func (m *Minter) Marshal() (dAtA []byte, err error) {
diff --git a/x/mint/types/query.pb.go b/x/mint/types/query.pb.go
index 6ce0dbb6624..75f59f9567a 100644
--- a/x/mint/types/query.pb.go
+++ b/x/mint/types/query.pb.go
@@ -5,8 +5,8 @@ package types
 
 import (
 	context "context"
+	cosmossdk_io_math "cosmossdk.io/math"
 	fmt "fmt"
-	github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types"
 	_ "github.com/gogo/protobuf/gogoproto"
 	grpc1 "github.com/gogo/protobuf/grpc"
 	proto "github.com/gogo/protobuf/proto"
@@ -155,7 +155,7 @@ var xxx_messageInfo_QueryEpochProvisionsRequest proto.InternalMessageInfo
 // Query/EpochProvisions RPC method.
 type QueryEpochProvisionsResponse struct {
 	// epoch_provisions is the current minting per epoch provisions value.
-	EpochProvisions github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,1,opt,name=epoch_provisions,json=epochProvisions,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"epoch_provisions"`
+	EpochProvisions cosmossdk_io_math.LegacyDec `protobuf:"bytes,1,opt,name=epoch_provisions,json=epochProvisions,proto3,customtype=cosmossdk.io/math.LegacyDec" json:"epoch_provisions"`
 }
 
 func (m *QueryEpochProvisionsResponse) Reset()         { *m = QueryEpochProvisionsResponse{} }
@@ -201,32 +201,32 @@ func init() {
 func init() { proto.RegisterFile("osmosis/mint/v1beta1/query.proto", fileDescriptor_cd2f42111e753fbb) }
 
 var fileDescriptor_cd2f42111e753fbb = []byte{
-	// 394 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x92, 0xc1, 0x4e, 0xea, 0x40,
-	0x14, 0x86, 0x5b, 0x72, 0x2f, 0x8b, 0xb9, 0x37, 0xc1, 0x8c, 0x2c, 0x4c, 0xad, 0x85, 0x34, 0x86,
-	0xe0, 0x82, 0x19, 0x8b, 0x2b, 0x5d, 0x12, 0xdd, 0xb8, 0x02, 0x76, 0xba, 0x31, 0x6d, 0x9d, 0x94,
-	0x46, 0xda, 0x29, 0x9d, 0x81, 0xc8, 0x56, 0x5f, 0xc0, 0xc4, 0x97, 0xf0, 0x11, 0x7c, 0x04, 0x96,
-	0x24, 0x6e, 0x8c, 0x0b, 0x62, 0xc0, 0x07, 0x31, 0x9d, 0x8e, 0x44, 0x70, 0x62, 0x74, 0xd5, 0x66,
-	0xce, 0x7f, 0xfe, 0xff, 0x9b, 0x73, 0x06, 0x54, 0x29, 0x8b, 0x28, 0x0b, 0x19, 0x8e, 0xc2, 0x98,
-	0xe3, 0x91, 0xe3, 0x11, 0xee, 0x3a, 0x78, 0x30, 0x24, 0xe9, 0x18, 0x25, 0x29, 0xe5, 0x14, 0x96,
-	0xa5, 0x02, 0x65, 0x0a, 0x24, 0x15, 0x46, 0x39, 0xa0, 0x01, 0x15, 0x02, 0x9c, 0xfd, 0xe5, 0x5a,
-	0xc3, 0x0c, 0x28, 0x0d, 0xfa, 0x04, 0xbb, 0x49, 0x88, 0xdd, 0x38, 0xa6, 0xdc, 0xe5, 0x21, 0x8d,
-	0x99, 0xac, 0x56, 0x94, 0x59, 0xc2, 0x56, 0x08, 0xec, 0x32, 0x80, 0x9d, 0x2c, 0xb9, 0xed, 0xa6,
-	0x6e, 0xc4, 0xba, 0x64, 0x30, 0x24, 0x8c, 0xdb, 0x1d, 0xb0, 0xb9, 0x72, 0xca, 0x12, 0x1a, 0x33,
-	0x02, 0x8f, 0x40, 0x31, 0x11, 0x27, 0x5b, 0x7a, 0x55, 0xaf, 0xff, 0x6b, 0x9a, 0x48, 0x05, 0x8a,
-	0xf2, 0xae, 0xd6, 0x9f, 0xc9, 0xac, 0xa2, 0x75, 0x65, 0x87, 0xbd, 0x03, 0xb6, 0x85, 0xe5, 0x49,
-	0x42, 0xfd, 0x5e, 0x3b, 0xa5, 0xa3, 0x90, 0x65, 0x9c, 0x1f, 0x89, 0x63, 0x60, 0xaa, 0xcb, 0x32,
-	0xfa, 0x0c, 0x6c, 0x90, 0xac, 0x74, 0x91, 0x2c, 0x6b, 0x02, 0xe2, 0x7f, 0x0b, 0x65, 0x31, 0x2f,
-	0xb3, 0x4a, 0x2d, 0x08, 0x79, 0x6f, 0xe8, 0x21, 0x9f, 0x46, 0xd8, 0x17, 0x5c, 0xf2, 0xd3, 0x60,
-	0x97, 0x57, 0x98, 0x8f, 0x13, 0xc2, 0xd0, 0x31, 0xf1, 0xbb, 0x25, 0xb2, 0x1a, 0xd1, 0x7c, 0x2c,
-	0x80, 0xbf, 0x22, 0x1b, 0xde, 0xea, 0xa0, 0x98, 0xc3, 0xc3, 0xba, 0xfa, 0x6a, 0x5f, 0x67, 0x65,
-	0xec, 0xfd, 0x40, 0x99, 0x5f, 0xc2, 0xde, 0xbd, 0x79, 0x7a, 0xbb, 0x2f, 0x58, 0xd0, 0xc4, 0xca,
-	0xb5, 0xe4, 0x93, 0x82, 0x0f, 0x3a, 0x28, 0xad, 0x8d, 0x01, 0x3a, 0xdf, 0x84, 0xa8, 0x27, 0x6a,
-	0x34, 0x7f, 0xd3, 0x22, 0x01, 0x91, 0x00, 0xac, 0xc3, 0x9a, 0x1a, 0x70, 0x7d, 0x03, 0xad, 0xd3,
-	0xc9, 0xdc, 0xd2, 0xa7, 0x73, 0x4b, 0x7f, 0x9d, 0x5b, 0xfa, 0xdd, 0xc2, 0xd2, 0xa6, 0x0b, 0x4b,
-	0x7b, 0x5e, 0x58, 0xda, 0xf9, 0xfe, 0xa7, 0x6d, 0x48, 0xaf, 0x46, 0xdf, 0xf5, 0xd8, 0xd2, 0x78,
-	0xe4, 0x1c, 0xe2, 0xeb, 0xdc, 0x5e, 0xec, 0xc6, 0x2b, 0x8a, 0x07, 0x79, 0xf0, 0x1e, 0x00, 0x00,
-	0xff, 0xff, 0x40, 0xb6, 0x14, 0x7c, 0x1f, 0x03, 0x00, 0x00,
+	// 399 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x92, 0xc1, 0x4a, 0xe3, 0x40,
+	0x1c, 0xc6, 0x93, 0xb2, 0xdb, 0xc3, 0xec, 0x42, 0x97, 0xd9, 0x1e, 0x96, 0x34, 0x9b, 0x96, 0xec,
+	0xb2, 0x74, 0x0f, 0x3b, 0xb3, 0xa9, 0x27, 0x3d, 0x16, 0xbd, 0x88, 0x48, 0xdb, 0xa3, 0x17, 0x99,
+	0xc4, 0x21, 0x0d, 0x36, 0xf9, 0xa7, 0x99, 0x69, 0xb1, 0x57, 0x7d, 0x01, 0xc1, 0x97, 0xf0, 0x11,
+	0x7c, 0x84, 0x1e, 0x0b, 0x5e, 0xc4, 0x43, 0x91, 0xd6, 0x07, 0x91, 0x4c, 0xd2, 0x42, 0x6b, 0x10,
+	0xbd, 0x85, 0xf9, 0x7f, 0xff, 0xef, 0xfb, 0xcd, 0x97, 0x41, 0x0d, 0x10, 0x21, 0x88, 0x40, 0xd0,
+	0x30, 0x88, 0x24, 0x1d, 0x3b, 0x2e, 0x97, 0xcc, 0xa1, 0xc3, 0x11, 0x4f, 0x26, 0x24, 0x4e, 0x40,
+	0x02, 0xae, 0xe6, 0x0a, 0x92, 0x2a, 0x48, 0xae, 0x30, 0xaa, 0x3e, 0xf8, 0xa0, 0x04, 0x34, 0xfd,
+	0xca, 0xb4, 0x86, 0xe9, 0x03, 0xf8, 0x03, 0x4e, 0x59, 0x1c, 0x50, 0x16, 0x45, 0x20, 0x99, 0x0c,
+	0x20, 0x12, 0xf9, 0xb4, 0x5e, 0x98, 0xa5, 0x6c, 0x95, 0xc0, 0xae, 0x22, 0xdc, 0x4d, 0x93, 0x3b,
+	0x2c, 0x61, 0xa1, 0xe8, 0xf1, 0xe1, 0x88, 0x0b, 0x69, 0x77, 0xd1, 0xf7, 0x8d, 0x53, 0x11, 0x43,
+	0x24, 0x38, 0xde, 0x43, 0xe5, 0x58, 0x9d, 0xfc, 0xd0, 0x1b, 0x7a, 0xf3, 0x4b, 0xcb, 0x24, 0x45,
+	0xa0, 0x24, 0xdb, 0x6a, 0x7f, 0x9a, 0xce, 0xeb, 0x5a, 0x2f, 0xdf, 0xb0, 0x7f, 0xa2, 0x9a, 0xb2,
+	0x3c, 0x88, 0xc1, 0xeb, 0x77, 0x12, 0x18, 0x07, 0x22, 0xe5, 0x5c, 0x25, 0x46, 0xc8, 0x2c, 0x1e,
+	0xe7, 0xd1, 0xc7, 0xe8, 0x1b, 0x4f, 0x47, 0xa7, 0xf1, 0x7a, 0xa6, 0x20, 0xbe, 0xb6, 0x7f, 0xa5,
+	0x31, 0x8f, 0xf3, 0x7a, 0xcd, 0x53, 0x30, 0xe2, 0xec, 0x9c, 0x04, 0x40, 0x43, 0x26, 0xfb, 0xe4,
+	0x88, 0xfb, 0xcc, 0x9b, 0xec, 0x73, 0xaf, 0x57, 0xe1, 0x9b, 0xbe, 0xad, 0xbb, 0x12, 0xfa, 0xac,
+	0x02, 0xf1, 0x95, 0x8e, 0xca, 0x19, 0x31, 0x6e, 0x16, 0xdf, 0xe7, 0x75, 0x41, 0xc6, 0xdf, 0x77,
+	0x28, 0x33, 0x72, 0xfb, 0xf7, 0xe5, 0xfd, 0xf3, 0x4d, 0xc9, 0xc2, 0x26, 0x2d, 0xfc, 0x17, 0x59,
+	0x3d, 0xf8, 0x56, 0x47, 0x95, 0xad, 0xbb, 0x63, 0xe7, 0x8d, 0x90, 0xe2, 0x1a, 0x8d, 0xd6, 0x47,
+	0x56, 0x72, 0x40, 0xa2, 0x00, 0x9b, 0xf8, 0x4f, 0x31, 0xe0, 0x76, 0xed, 0xed, 0xc3, 0xe9, 0xc2,
+	0xd2, 0x67, 0x0b, 0x4b, 0x7f, 0x5a, 0x58, 0xfa, 0xf5, 0xd2, 0xd2, 0x66, 0x4b, 0x4b, 0x7b, 0x58,
+	0x5a, 0xda, 0xc9, 0x7f, 0x3f, 0x90, 0xfd, 0x91, 0x4b, 0x3c, 0x08, 0x57, 0x5e, 0xff, 0x06, 0xcc,
+	0x15, 0x6b, 0xe3, 0xb1, 0xb3, 0x4b, 0x2f, 0x32, 0x7b, 0x39, 0x89, 0xb9, 0x70, 0xcb, 0xea, 0x15,
+	0xee, 0xbc, 0x04, 0x00, 0x00, 0xff, 0xff, 0x37, 0x2f, 0x70, 0xd5, 0x14, 0x03, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/x/pool-incentives/types/incentives.pb.go b/x/pool-incentives/types/incentives.pb.go
index 53774f211e4..0d63eff3de2 100644
--- a/x/pool-incentives/types/incentives.pb.go
+++ b/x/pool-incentives/types/incentives.pb.go
@@ -4,8 +4,8 @@
 package types
 
 import (
+	cosmossdk_io_math "cosmossdk.io/math"
 	fmt "fmt"
-	github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types"
 	_ "github.com/gogo/protobuf/gogoproto"
 	proto "github.com/gogo/protobuf/proto"
 	_ "github.com/gogo/protobuf/types"
@@ -120,8 +120,8 @@ func (m *LockableDurationsInfo) GetLockableDurations() []time.Duration {
 }
 
 type DistrInfo struct {
-	TotalWeight github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,1,opt,name=total_weight,json=totalWeight,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"total_weight" yaml:"total_weight"`
-	Records     []DistrRecord                          `protobuf:"bytes,2,rep,name=records,proto3" json:"records"`
+	TotalWeight cosmossdk_io_math.Int `protobuf:"bytes,1,opt,name=total_weight,json=totalWeight,proto3,customtype=cosmossdk.io/math.Int" json:"total_weight" yaml:"total_weight"`
+	Records     []DistrRecord         `protobuf:"bytes,2,rep,name=records,proto3" json:"records"`
 }
 
 func (m *DistrInfo) Reset()         { *m = DistrInfo{} }
@@ -165,8 +165,8 @@ func (m *DistrInfo) GetRecords() []DistrRecord {
 }
 
 type DistrRecord struct {
-	GaugeId uint64                                 `protobuf:"varint,1,opt,name=gauge_id,json=gaugeId,proto3" json:"gauge_id,omitempty" yaml:"gauge_id"`
-	Weight  github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,2,opt,name=weight,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"weight"`
+	GaugeId uint64                `protobuf:"varint,1,opt,name=gauge_id,json=gaugeId,proto3" json:"gauge_id,omitempty" yaml:"gauge_id"`
+	Weight  cosmossdk_io_math.Int `protobuf:"bytes,2,opt,name=weight,proto3,customtype=cosmossdk.io/math.Int" json:"weight"`
 }
 
 func (m *DistrRecord) Reset()         { *m = DistrRecord{} }
@@ -327,43 +327,43 @@ func init() {
 }
 
 var fileDescriptor_a8153bad03e553d1 = []byte{
-	// 565 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x94, 0xbf, 0x6f, 0xd3, 0x40,
-	0x14, 0xc7, 0x73, 0x6d, 0x94, 0xb4, 0xe7, 0xf0, 0xcb, 0x05, 0x91, 0x16, 0xc9, 0x8e, 0x4e, 0x02,
-	0x55, 0x8a, 0x62, 0x13, 0x98, 0x08, 0x5b, 0x14, 0x40, 0x01, 0x86, 0xca, 0xa2, 0x42, 0x62, 0x89,
-	0xec, 0xf8, 0xea, 0x58, 0xb5, 0xfd, 0x22, 0xdf, 0x25, 0xd0, 0xff, 0x00, 0x89, 0x85, 0xb1, 0x63,
-	0xff, 0x0f, 0x36, 0xa6, 0x8e, 0x1d, 0x11, 0x83, 0x41, 0xc9, 0xc2, 0x9c, 0xbf, 0x00, 0xf9, 0x7c,
-	0x26, 0x27, 0x2a, 0x55, 0x30, 0xe5, 0x9e, 0xdf, 0x7d, 0xdf, 0xfb, 0x7c, 0xdf, 0x3b, 0x05, 0x3f,
-	0x04, 0x16, 0x03, 0x0b, 0x99, 0x3d, 0x05, 0x88, 0x3a, 0x61, 0x32, 0xa6, 0x09, 0x0f, 0xe7, 0x94,
-	0xd9, 0xf3, 0xae, 0x47, 0xb9, 0xdb, 0xb5, 0xd7, 0x9f, 0xac, 0x69, 0x0a, 0x1c, 0x74, 0x43, 0x2a,
-	0xac, 0x5c, 0xa1, 0x64, 0xa5, 0x60, 0xef, 0x76, 0x00, 0x01, 0x88, 0xab, 0x76, 0x7e, 0x2a, 0x54,
-	0x7b, 0x46, 0x00, 0x10, 0x44, 0xd4, 0x16, 0x91, 0x37, 0x3b, 0xb2, 0xfd, 0x59, 0xea, 0xf2, 0x10,
-	0x92, 0x22, 0x4f, 0x5e, 0xe2, 0xda, 0x81, 0x9b, 0xba, 0x31, 0xd3, 0x7b, 0xb8, 0x11, 0x87, 0x09,
-	0xa7, 0xfe, 0xc8, 0xa7, 0x09, 0xc4, 0x4d, 0xd4, 0x42, 0xfb, 0xdb, 0xfd, 0xbb, 0xab, 0xcc, 0xdc,
-	0x39, 0x71, 0xe3, 0xa8, 0x47, 0xd4, 0x2c, 0x71, 0xb4, 0x22, 0x1c, 0xe4, 0x51, 0xaf, 0x7a, 0x7a,
-	0x66, 0x56, 0xc8, 0x47, 0x84, 0xef, 0xbc, 0x86, 0xf1, 0xb1, 0xeb, 0x45, 0x74, 0x20, 0xdb, 0xb0,
-	0x61, 0x72, 0x04, 0x3a, 0x60, 0x3d, 0x92, 0x89, 0x51, 0x09, 0xc0, 0x9a, 0xa8, 0xb5, 0xb9, 0xaf,
-	0x3d, 0xda, 0xb5, 0x0a, 0x44, 0xab, 0x44, 0xb4, 0x4a, 0x6d, 0xff, 0xfe, 0x79, 0x66, 0x56, 0x56,
-	0x99, 0xb9, 0x5b, 0x00, 0x5c, 0x2e, 0x41, 0x4e, 0x7f, 0x98, 0xc8, 0xb9, 0x15, 0xfd, 0xdd, 0x94,
-	0x7c, 0x45, 0x78, 0x7b, 0x10, 0x32, 0x9e, 0x8a, 0xf6, 0x13, 0xdc, 0xe0, 0xc0, 0xdd, 0x68, 0xf4,
-	0x9e, 0x86, 0xc1, 0x84, 0x4b, 0x6b, 0xcf, 0xf2, 0xea, 0xdf, 0x33, 0xf3, 0x41, 0x10, 0xf2, 0xc9,
-	0xcc, 0xb3, 0xc6, 0x10, 0xdb, 0x63, 0x31, 0x64, 0xf9, 0xd3, 0x61, 0xfe, 0xb1, 0xcd, 0x4f, 0xa6,
-	0x94, 0x59, 0xc3, 0x84, 0xaf, 0x07, 0xa1, 0xd6, 0x22, 0x8e, 0x26, 0xc2, 0xb7, 0x22, 0xd2, 0x5f,
-	0xe1, 0x7a, 0x4a, 0xc7, 0x90, 0xfa, 0xac, 0xb9, 0x21, 0xdc, 0xb5, 0xad, 0xab, 0xd7, 0x66, 0x09,
-	0x4a, 0x47, 0x68, 0xfa, 0xd5, 0x9c, 0xc8, 0x29, 0x2b, 0x90, 0x4f, 0x08, 0x6b, 0x4a, 0x5a, 0xb7,
-	0xf0, 0x56, 0xe0, 0xce, 0x02, 0x3a, 0x0a, 0x7d, 0x61, 0xa1, 0xda, 0xdf, 0x59, 0x65, 0xe6, 0x8d,
-	0x02, 0xaa, 0xcc, 0x10, 0xa7, 0x2e, 0x8e, 0x43, 0x5f, 0x7f, 0x8e, 0x6b, 0xd2, 0xf0, 0x86, 0x30,
-	0x6c, 0xfd, 0x9f, 0x61, 0x47, 0xaa, 0x7b, 0xd5, 0x5f, 0x67, 0x26, 0x22, 0x5f, 0x10, 0xd6, 0x0e,
-	0x00, 0xa2, 0x37, 0xf0, 0x22, 0xaf, 0xaf, 0xb7, 0x71, 0x3d, 0xb7, 0xb4, 0x86, 0xd1, 0x57, 0x99,
-	0x79, 0xbd, 0x80, 0x91, 0x09, 0xe2, 0xd4, 0xf2, 0xd3, 0xd0, 0xd7, 0xdb, 0x0a, 0xfa, 0x86, 0xb8,
-	0x7d, 0x73, 0x95, 0x99, 0x0d, 0x05, 0x5d, 0xe1, 0x76, 0xf0, 0x56, 0xb9, 0xe1, 0xe6, 0x66, 0x0b,
-	0x5d, 0xfd, 0x46, 0xee, 0xc9, 0x37, 0x22, 0xc7, 0x50, 0x0a, 0x8b, 0x97, 0xf1, 0xa7, 0x0e, 0xa1,
-	0xb8, 0xa1, 0xc0, 0x33, 0xfd, 0x10, 0x5f, 0x13, 0x90, 0x1c, 0x46, 0xa2, 0xed, 0xbf, 0xae, 0x4b,
-	0x29, 0x22, 0xd7, 0xa5, 0x4d, 0x95, 0x4f, 0x87, 0xe7, 0x0b, 0x03, 0x5d, 0x2c, 0x0c, 0xf4, 0x73,
-	0x61, 0xa0, 0xcf, 0x4b, 0xa3, 0x72, 0xb1, 0x34, 0x2a, 0xdf, 0x96, 0x46, 0xe5, 0xdd, 0x53, 0x65,
-	0xe8, 0xb2, 0x47, 0x27, 0x72, 0x3d, 0x56, 0x06, 0xf6, 0xbc, 0xfb, 0xc4, 0xfe, 0x70, 0xe9, 0xef,
-	0x40, 0x6c, 0xc3, 0xab, 0x09, 0xdf, 0x8f, 0x7f, 0x07, 0x00, 0x00, 0xff, 0xff, 0xef, 0x98, 0xb1,
-	0x8c, 0x36, 0x04, 0x00, 0x00,
+	// 562 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x53, 0xcd, 0x6e, 0xd3, 0x4c,
+	0x14, 0xcd, 0xb4, 0x51, 0xd2, 0x8e, 0xf3, 0x7d, 0x80, 0x4b, 0x45, 0x5a, 0x84, 0x1d, 0x8d, 0x84,
+	0x54, 0x29, 0xea, 0x98, 0xf0, 0xb3, 0x20, 0xec, 0xa2, 0x48, 0x28, 0xc0, 0xa2, 0xb2, 0xa8, 0x2a,
+	0xb1, 0x89, 0xec, 0x78, 0xea, 0x58, 0xb5, 0x7d, 0x23, 0xcf, 0x24, 0x50, 0x9e, 0x80, 0x25, 0xcb,
+	0x2e, 0xfb, 0x0a, 0xac, 0x79, 0x81, 0x2e, 0xbb, 0x44, 0x2c, 0x0c, 0x4a, 0x36, 0xac, 0xf3, 0x04,
+	0xc8, 0xe3, 0x31, 0xb1, 0xa8, 0x14, 0xb1, 0x9b, 0x3b, 0xe7, 0x9e, 0x7b, 0xce, 0xf1, 0x1d, 0xe3,
+	0x47, 0xc0, 0x23, 0xe0, 0x01, 0xb7, 0x26, 0x00, 0xe1, 0x61, 0x10, 0x8f, 0x58, 0x2c, 0x82, 0x19,
+	0xe3, 0xd6, 0xac, 0xe3, 0x32, 0xe1, 0x74, 0xac, 0xd5, 0x15, 0x9d, 0x24, 0x20, 0x40, 0x37, 0x14,
+	0x83, 0x66, 0x8c, 0x12, 0xaa, 0x08, 0xfb, 0x77, 0x7d, 0xf0, 0x41, 0xb6, 0x5a, 0xd9, 0x29, 0x67,
+	0xed, 0x1b, 0x3e, 0x80, 0x1f, 0x32, 0x4b, 0x56, 0xee, 0xf4, 0xd4, 0xf2, 0xa6, 0x89, 0x23, 0x02,
+	0x88, 0x73, 0x9c, 0xbc, 0xc2, 0xb5, 0x23, 0x27, 0x71, 0x22, 0xae, 0x77, 0x71, 0x23, 0x0a, 0x62,
+	0xc1, 0xbc, 0xa1, 0xc7, 0x62, 0x88, 0x9a, 0xa8, 0x85, 0x0e, 0xb6, 0x7b, 0xf7, 0x96, 0xa9, 0xb9,
+	0x73, 0xee, 0x44, 0x61, 0x97, 0x94, 0x51, 0x62, 0x6b, 0x79, 0xd9, 0xcf, 0xaa, 0x6e, 0xf5, 0xe2,
+	0xd2, 0xac, 0x90, 0x4f, 0x08, 0xef, 0xbe, 0x81, 0xd1, 0x99, 0xe3, 0x86, 0xac, 0xaf, 0x64, 0xf8,
+	0x20, 0x3e, 0x05, 0x1d, 0xb0, 0x1e, 0x2a, 0x60, 0x58, 0x18, 0xe0, 0x4d, 0xd4, 0xda, 0x3c, 0xd0,
+	0x1e, 0xef, 0xd1, 0xdc, 0x22, 0x2d, 0x2c, 0xd2, 0x82, 0xdb, 0x7b, 0x78, 0x95, 0x9a, 0x95, 0x65,
+	0x6a, 0xee, 0xe5, 0x06, 0x6e, 0x8e, 0x20, 0x17, 0x3f, 0x4c, 0x64, 0xdf, 0x09, 0xff, 0x16, 0x25,
+	0x5f, 0x10, 0xde, 0xee, 0x07, 0x5c, 0x24, 0x52, 0xfe, 0x04, 0x37, 0x04, 0x08, 0x27, 0x1c, 0xbe,
+	0x67, 0x81, 0x3f, 0x16, 0x2a, 0xda, 0xd3, 0x6c, 0xfa, 0xf7, 0xd4, 0xdc, 0x1d, 0xc9, 0x2f, 0xcb,
+	0xbd, 0x33, 0x1a, 0x80, 0x15, 0x39, 0x62, 0x4c, 0x07, 0xb1, 0x58, 0xe5, 0x2e, 0x53, 0x89, 0xad,
+	0xc9, 0xf2, 0x44, 0x56, 0xfa, 0x6b, 0x5c, 0x4f, 0xd8, 0x08, 0x12, 0x8f, 0x37, 0x37, 0x64, 0x98,
+	0x36, 0x5d, 0xbf, 0x25, 0x2a, 0x4d, 0xd9, 0x92, 0xd3, 0xab, 0x66, 0x06, 0xec, 0x62, 0x02, 0xf9,
+	0x88, 0xb5, 0x12, 0xaa, 0x53, 0xbc, 0xe5, 0x3b, 0x53, 0x9f, 0x0d, 0x03, 0x4f, 0x1a, 0xae, 0xf6,
+	0x76, 0x96, 0xa9, 0x79, 0x2b, 0xf7, 0x54, 0x20, 0xc4, 0xae, 0xcb, 0xe3, 0xc0, 0xd3, 0x9f, 0xe1,
+	0x9a, 0x8a, 0xb7, 0x21, 0xe3, 0x3d, 0x58, 0x1b, 0xcf, 0x56, 0xcd, 0xdd, 0xea, 0xaf, 0x4b, 0x13,
+	0x91, 0xaf, 0x08, 0x6b, 0x47, 0x00, 0xe1, 0x5b, 0x78, 0x99, 0x8d, 0xd3, 0xdb, 0xb8, 0x9e, 0x05,
+	0x58, 0x69, 0xeb, 0xcb, 0xd4, 0xfc, 0x3f, 0xd7, 0x56, 0x00, 0xb1, 0x6b, 0xd9, 0x69, 0xe0, 0xe9,
+	0xed, 0x92, 0xd3, 0x0d, 0xd9, 0x7d, 0x7b, 0x99, 0x9a, 0x8d, 0x92, 0xd3, 0x92, 0x4d, 0x1b, 0x6f,
+	0x15, 0xeb, 0x6b, 0x6e, 0xb6, 0xd0, 0xfa, 0x07, 0x70, 0x5f, 0x3d, 0x00, 0x95, 0xba, 0x20, 0xe6,
+	0x6b, 0xff, 0x33, 0x87, 0x30, 0xdc, 0x28, 0x99, 0xe7, 0xfa, 0x31, 0xfe, 0x4f, 0x9a, 0x14, 0x30,
+	0x94, 0xb2, 0xff, 0xba, 0x9c, 0xd2, 0x10, 0xb5, 0x1c, 0x6d, 0x52, 0xba, 0x3a, 0xbe, 0x9a, 0x1b,
+	0xe8, 0x7a, 0x6e, 0xa0, 0x9f, 0x73, 0x03, 0x7d, 0x5e, 0x18, 0x95, 0xeb, 0x85, 0x51, 0xf9, 0xb6,
+	0x30, 0x2a, 0xef, 0x5e, 0xf8, 0x81, 0x18, 0x4f, 0x5d, 0x3a, 0x82, 0xc8, 0x52, 0x1a, 0x87, 0xa1,
+	0xe3, 0xf2, 0xa2, 0xb0, 0x66, 0x9d, 0xe7, 0xd6, 0x87, 0x1b, 0xff, 0xba, 0x38, 0x9f, 0x30, 0xee,
+	0xd6, 0x64, 0xee, 0x27, 0xbf, 0x03, 0x00, 0x00, 0xff, 0xff, 0x3d, 0xc7, 0x20, 0x7a, 0x13, 0x04,
+	0x00, 0x00,
 }
 
 func (this *DistrRecord) Equal(that interface{}) bool {
diff --git a/x/poolmanager/client/queryproto/query.pb.go b/x/poolmanager/client/queryproto/query.pb.go
index b887e949959..4d1b7a0b78c 100644
--- a/x/poolmanager/client/queryproto/query.pb.go
+++ b/x/poolmanager/client/queryproto/query.pb.go
@@ -5,6 +5,7 @@ package queryproto
 
 import (
 	context "context"
+	cosmossdk_io_math "cosmossdk.io/math"
 	fmt "fmt"
 	_ "github.com/cosmos/cosmos-proto"
 	types1 "github.com/cosmos/cosmos-sdk/codec/types"
@@ -315,7 +316,7 @@ func (m *EstimateSinglePoolSwapExactAmountInRequest) GetTokenOutDenom() string {
 }
 
 type EstimateSwapExactAmountInResponse struct {
-	TokenOutAmount github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,1,opt,name=token_out_amount,json=tokenOutAmount,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"token_out_amount" yaml:"token_out_amount"`
+	TokenOutAmount cosmossdk_io_math.Int `protobuf:"bytes,1,opt,name=token_out_amount,json=tokenOutAmount,proto3,customtype=cosmossdk.io/math.Int" json:"token_out_amount" yaml:"token_out_amount"`
 }
 
 func (m *EstimateSwapExactAmountInResponse) Reset()         { *m = EstimateSwapExactAmountInResponse{} }
@@ -549,7 +550,7 @@ func (m *EstimateSinglePoolSwapExactAmountOutRequest) GetTokenOut() string {
 }
 
 type EstimateSwapExactAmountOutResponse struct {
-	TokenInAmount github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,1,opt,name=token_in_amount,json=tokenInAmount,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"token_in_amount" yaml:"token_in_amount"`
+	TokenInAmount cosmossdk_io_math.Int `protobuf:"bytes,1,opt,name=token_in_amount,json=tokenInAmount,proto3,customtype=cosmossdk.io/math.Int" json:"token_in_amount" yaml:"token_in_amount"`
 }
 
 func (m *EstimateSwapExactAmountOutResponse) Reset()         { *m = EstimateSwapExactAmountOutResponse{} }
@@ -1145,106 +1146,106 @@ func init() {
 }
 
 var fileDescriptor_6256a4106f701b7d = []byte{
-	// 1569 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x58, 0x4f, 0x6f, 0x1b, 0xc5,
-	0x1b, 0xce, 0xda, 0x6e, 0x1a, 0x4f, 0x9b, 0xc4, 0x99, 0x36, 0x69, 0xe2, 0xf6, 0xe7, 0x75, 0xa7,
-	0xfd, 0x15, 0xb7, 0x49, 0x76, 0x95, 0xa4, 0x80, 0xa8, 0x04, 0x55, 0x9c, 0x86, 0xc6, 0xa8, 0xd0,
-	0xb0, 0x29, 0x14, 0x0a, 0xc5, 0xda, 0x24, 0x8b, 0xbb, 0xaa, 0xbd, 0xb3, 0xf1, 0xce, 0xb6, 0x8d,
-	0x50, 0x2f, 0x9c, 0x38, 0xa1, 0x22, 0x24, 0x8a, 0xc4, 0x01, 0x71, 0xe0, 0x52, 0xae, 0xf0, 0x1d,
-	0x2a, 0x24, 0x50, 0x10, 0x17, 0xc4, 0xc1, 0xa0, 0x96, 0x03, 0x87, 0x5e, 0xf0, 0x27, 0x40, 0xf3,
-	0x67, 0xd7, 0xf6, 0xc6, 0x5e, 0xaf, 0x9d, 0x1c, 0x38, 0x65, 0x3d, 0xf3, 0xce, 0xfb, 0xbe, 0xcf,
-	0xb3, 0xef, 0xb3, 0xfb, 0x6c, 0xc0, 0x73, 0xd8, 0xa9, 0x60, 0xc7, 0x74, 0x54, 0x1b, 0xe3, 0x72,
-	0x45, 0xb7, 0xf4, 0x92, 0x51, 0x55, 0xef, 0xcc, 0xad, 0x1b, 0x44, 0x9f, 0x53, 0xb7, 0x5c, 0xa3,
-	0xba, 0xad, 0xd8, 0x55, 0x4c, 0x30, 0x3c, 0x2e, 0x02, 0x95, 0xa6, 0x40, 0x45, 0x04, 0xa6, 0x8f,
-	0x96, 0x70, 0x09, 0xb3, 0x38, 0x95, 0x5e, 0xf1, 0x23, 0xe9, 0xb3, 0x61, 0xb9, 0x4b, 0x86, 0x65,
-	0xb0, 0x74, 0x2c, 0xf4, 0x74, 0x58, 0x28, 0xb9, 0x27, 0xa2, 0x66, 0xc2, 0xa2, 0x9c, 0xbb, 0xba,
-	0x5d, 0xac, 0x62, 0x97, 0x18, 0x22, 0x3a, 0xb3, 0xc1, 0xc2, 0xd5, 0x75, 0xdd, 0x31, 0xfc, 0xa8,
-	0x0d, 0x6c, 0x5a, 0x62, 0xff, 0x5c, 0xf3, 0x3e, 0x83, 0xea, 0x47, 0xd9, 0x7a, 0xc9, 0xb4, 0x74,
-	0x62, 0x62, 0x2f, 0xf6, 0x44, 0x09, 0xe3, 0x52, 0xd9, 0x50, 0x75, 0xdb, 0x54, 0x75, 0xcb, 0xc2,
-	0x84, 0x6d, 0x7a, 0xdd, 0x4f, 0x89, 0x5d, 0xf6, 0x6b, 0xdd, 0xfd, 0x50, 0xd5, 0xad, 0x6d, 0x6f,
-	0x8b, 0x17, 0x29, 0x72, 0x72, 0xf8, 0x0f, 0xb1, 0x25, 0x07, 0x4f, 0x11, 0xb3, 0x62, 0x38, 0x44,
-	0xaf, 0xd8, 0x3c, 0x00, 0x8d, 0x82, 0xe1, 0x55, 0xbd, 0xaa, 0x57, 0x1c, 0xcd, 0xd8, 0x72, 0x0d,
-	0x87, 0xa0, 0x35, 0x30, 0xe2, 0x2d, 0x38, 0x36, 0xb6, 0x1c, 0x03, 0x2e, 0x82, 0x41, 0x9b, 0xad,
-	0x4c, 0x4a, 0x59, 0x29, 0x77, 0x68, 0xfe, 0x94, 0x12, 0x72, 0x9b, 0x14, 0x7e, 0x38, 0x9f, 0x78,
-	0x5c, 0x93, 0x07, 0x34, 0x71, 0x10, 0x3d, 0x93, 0x40, 0x76, 0xd9, 0x21, 0x66, 0x45, 0x27, 0xc6,
-	0xda, 0x5d, 0xdd, 0x5e, 0xbe, 0xa7, 0x6f, 0x90, 0xc5, 0x0a, 0x76, 0x2d, 0x52, 0xb0, 0x44, 0x65,
-	0x38, 0x0d, 0x0e, 0xd2, 0x84, 0x45, 0x73, 0x73, 0x32, 0x96, 0x95, 0x72, 0x89, 0x3c, 0xac, 0xd7,
-	0xe4, 0x91, 0x6d, 0xbd, 0x52, 0xbe, 0x80, 0xc4, 0x06, 0xd2, 0x06, 0xe9, 0x55, 0x61, 0x13, 0x2a,
-	0x60, 0x88, 0xe0, 0xdb, 0x86, 0x55, 0x34, 0xad, 0xc9, 0x78, 0x56, 0xca, 0x25, 0xf3, 0x47, 0xea,
-	0x35, 0x79, 0x94, 0x47, 0x7b, 0x3b, 0x48, 0x3b, 0xc8, 0x2e, 0x0b, 0x16, 0xbc, 0x09, 0x06, 0xd9,
-	0x7d, 0x73, 0x26, 0x13, 0xd9, 0x78, 0xee, 0xd0, 0xbc, 0x12, 0x0a, 0x82, 0xf6, 0xe8, 0xb7, 0x47,
-	0x8f, 0xe5, 0xc7, 0x29, 0x9e, 0x7a, 0x4d, 0x1e, 0xe6, 0x15, 0x78, 0x2e, 0xa4, 0x89, 0xa4, 0xaf,
-	0x25, 0x86, 0xa4, 0x54, 0x4c, 0x1b, 0x74, 0x0c, 0x6b, 0xd3, 0xa8, 0xa2, 0x47, 0x31, 0x30, 0xdf,
-	0x11, 0xee, 0x75, 0x93, 0xdc, 0x5a, 0xad, 0x9a, 0x15, 0x93, 0x98, 0x77, 0x8c, 0x6b, 0xdb, 0xb6,
-	0xe1, 0xb4, 0x21, 0x40, 0xea, 0x89, 0x80, 0x58, 0x04, 0x02, 0x2e, 0x82, 0x11, 0xde, 0x6b, 0xd1,
-	0xab, 0x11, 0xcf, 0xc6, 0x73, 0x89, 0xfc, 0x54, 0xbd, 0x26, 0x8f, 0x37, 0x83, 0x2a, 0xfa, 0xa5,
-	0x0e, 0xf3, 0x85, 0x55, 0x5e, 0xf0, 0x6d, 0x30, 0x21, 0x02, 0x78, 0x76, 0xec, 0x92, 0xe2, 0xa6,
-	0x61, 0xe1, 0x0a, 0x63, 0x34, 0x99, 0x3f, 0x59, 0xaf, 0xc9, 0xff, 0x6b, 0x49, 0x14, 0x88, 0x43,
-	0xda, 0x11, 0xbe, 0x71, 0x8d, 0xae, 0x5f, 0x75, 0xc9, 0x25, 0xb6, 0xfa, 0x93, 0x04, 0xce, 0xf9,
-	0x64, 0x99, 0x56, 0xa9, 0x6c, 0xd0, 0x82, 0x51, 0xa6, 0x64, 0xff, 0x49, 0xca, 0x83, 0xd1, 0x20,
-	0x38, 0x3e, 0x5c, 0xe9, 0x7a, 0x4d, 0x9e, 0x68, 0x3e, 0xd6, 0x84, 0x6a, 0x98, 0xb4, 0xe0, 0xf9,
-	0x52, 0x02, 0x27, 0x43, 0x66, 0x5d, 0x88, 0xca, 0x01, 0xa9, 0x46, 0x22, 0x9d, 0xed, 0x32, 0x3c,
-	0xc9, 0x7c, 0x81, 0x4e, 0xda, 0xef, 0x35, 0xf9, 0x4c, 0xc9, 0x24, 0xb7, 0xdc, 0x75, 0x65, 0x03,
-	0x57, 0x84, 0xa6, 0xc5, 0x9f, 0x59, 0x67, 0xf3, 0xb6, 0x4a, 0xe8, 0xe0, 0x28, 0x05, 0x8b, 0xd4,
-	0x6b, 0xf2, 0xb1, 0x60, 0x63, 0x3c, 0x1f, 0xd2, 0x46, 0xbc, 0xce, 0x78, 0x79, 0xf4, 0x4f, 0xe7,
-	0xd6, 0xae, 0xba, 0xa4, 0x2f, 0x1d, 0x7e, 0xe0, 0xeb, 0x2a, 0xce, 0x74, 0xa5, 0x46, 0xd4, 0x15,
-	0xad, 0x17, 0x41, 0x58, 0x70, 0x0e, 0x24, 0x7d, 0x5c, 0x93, 0x09, 0x46, 0xd0, 0xd1, 0x7a, 0x4d,
-	0x4e, 0x05, 0x20, 0x23, 0x6d, 0xc8, 0xc3, 0x1a, 0xd0, 0xe2, 0x77, 0x31, 0xb0, 0xd0, 0x19, 0xf3,
-	0x3e, 0x89, 0x71, 0xb7, 0xb8, 0x62, 0xbd, 0x89, 0x6b, 0x0d, 0x8c, 0xb7, 0x88, 0xc6, 0xb4, 0xfc,
-	0xf1, 0xa3, 0xda, 0xca, 0xd6, 0x6b, 0xf2, 0x89, 0x36, 0xda, 0xf2, 0xc2, 0x90, 0x06, 0x9b, 0xa4,
-	0x55, 0xb0, 0xd8, 0x24, 0xf6, 0xc1, 0x1d, 0xfa, 0x59, 0x02, 0xd3, 0x5d, 0xc5, 0xd8, 0x7e, 0x56,
-	0x22, 0xb1, 0x14, 0x40, 0xc7, 0x35, 0xd9, 0xc4, 0x52, 0x10, 0xd6, 0x61, 0xd2, 0x11, 0x50, 0x3c,
-	0x12, 0xa0, 0x2f, 0x24, 0x80, 0xc2, 0x46, 0x5e, 0xc8, 0xd1, 0xf6, 0x84, 0x6f, 0x5a, 0xad, 0x6a,
-	0x5c, 0xe9, 0x59, 0x8d, 0x13, 0x01, 0x24, 0x9e, 0x18, 0x87, 0x05, 0x14, 0xa1, 0xc5, 0x31, 0x30,
-	0xfa, 0x86, 0x5b, 0xa1, 0xec, 0xfa, 0xaf, 0xde, 0x65, 0x90, 0x6a, 0x2c, 0x89, 0xc6, 0xe6, 0x40,
-	0xd2, 0x72, 0x2b, 0x6c, 0x6c, 0x1c, 0x41, 0x71, 0x13, 0x64, 0x7f, 0x0b, 0x69, 0x43, 0x96, 0x38,
-	0x8a, 0x2e, 0x80, 0x43, 0xf4, 0xa2, 0x9f, 0x5b, 0x84, 0x96, 0xc0, 0x61, 0x7e, 0x56, 0x94, 0x5f,
-	0x00, 0x09, 0xba, 0x23, 0xde, 0xfc, 0x47, 0x15, 0x6e, 0x27, 0x14, 0xcf, 0x4e, 0x28, 0x8b, 0xd6,
-	0x76, 0x3e, 0xf9, 0xe3, 0xf7, 0xb3, 0x07, 0xd8, 0x1c, 0x6b, 0x2c, 0x98, 0x42, 0x5b, 0x2c, 0x97,
-	0x5b, 0xa0, 0x15, 0x40, 0xaa, 0xb1, 0x24, 0x72, 0x3f, 0x0f, 0x0e, 0x78, 0xb0, 0xe2, 0x51, 0x92,
-	0xf3, 0x68, 0xb4, 0x23, 0x81, 0xd4, 0x9a, 0x8d, 0xc9, 0x6a, 0xd5, 0xdc, 0x30, 0xfa, 0x9a, 0xc3,
-	0x65, 0x90, 0xa2, 0x7e, 0xac, 0xa8, 0x3b, 0x8e, 0x41, 0x5a, 0x26, 0xf1, 0x78, 0xe3, 0x69, 0x1a,
-	0x8c, 0x40, 0xda, 0x08, 0x5d, 0x5a, 0xa4, 0x2b, 0x7c, 0x1a, 0x57, 0xc0, 0xd8, 0x96, 0x8b, 0x49,
-	0x6b, 0x1e, 0x3e, 0x95, 0x27, 0xea, 0x35, 0x79, 0x92, 0xe7, 0xd9, 0x15, 0x82, 0xb4, 0x51, 0xb6,
-	0xd6, 0xc8, 0x84, 0x0a, 0x60, 0xac, 0x09, 0x91, 0xa0, 0xe7, 0x3c, 0x00, 0x8e, 0x8d, 0x49, 0xd1,
-	0xa6, 0xab, 0x62, 0x1a, 0xc7, 0xeb, 0x35, 0x79, 0x8c, 0xe7, 0x6d, 0xec, 0x21, 0x2d, 0xe9, 0x78,
-	0xa7, 0xd1, 0x0a, 0x98, 0xba, 0x86, 0x89, 0xce, 0xa8, 0xbe, 0x62, 0x6e, 0xb9, 0xe6, 0xa6, 0x49,
-	0xb6, 0xfb, 0x1a, 0x85, 0xaf, 0x24, 0x90, 0x6e, 0x97, 0x4a, 0xb4, 0x77, 0x1f, 0x24, 0xcb, 0xde,
-	0xa2, 0xb8, 0x83, 0x53, 0x8a, 0xf0, 0x9e, 0x94, 0x28, 0xff, 0x99, 0xbf, 0x84, 0x4d, 0x2b, 0x7f,
-	0x49, 0x3c, 0xe5, 0xc5, 0xdc, 0xfa, 0x27, 0xd1, 0xa3, 0x3f, 0xe4, 0x5c, 0x04, 0x69, 0xd1, 0x24,
-	0x8e, 0xd6, 0xa8, 0x88, 0x8e, 0x81, 0x71, 0xd6, 0x5c, 0x10, 0x23, 0x7a, 0x28, 0x81, 0x89, 0xe0,
-	0xce, 0x7f, 0xa2, 0xe5, 0xf9, 0x5f, 0xc6, 0xc1, 0x81, 0x37, 0xe9, 0x27, 0x00, 0xfc, 0x54, 0x02,
-	0x83, 0xdc, 0x27, 0xc3, 0x73, 0x11, 0xcc, 0xb4, 0x80, 0x96, 0x9e, 0x8e, 0x14, 0xcb, 0xc1, 0xa2,
-	0xe9, 0x8f, 0x7f, 0xfd, 0xeb, 0xf3, 0xd8, 0xff, 0xe1, 0x29, 0x35, 0xec, 0x83, 0x46, 0x74, 0xf1,
-	0xb7, 0x04, 0xa6, 0x3a, 0x7a, 0x16, 0xf8, 0x72, 0x68, 0xdd, 0x6e, 0xbe, 0x3e, 0xfd, 0x4a, 0xbf,
-	0xc7, 0x05, 0x92, 0x2b, 0x0c, 0xc9, 0xab, 0xf0, 0x52, 0x28, 0x92, 0x8f, 0xc4, 0x00, 0xdf, 0x57,
-	0x0d, 0x91, 0x91, 0x7f, 0xad, 0x19, 0x34, 0xa7, 0x78, 0x08, 0x17, 0x4d, 0x0b, 0x7e, 0x13, 0x6b,
-	0x7a, 0xc3, 0x75, 0xf7, 0xe6, 0xf0, 0x6a, 0x7f, 0xdd, 0x77, 0x34, 0x16, 0x7b, 0xa6, 0x43, 0x67,
-	0x74, 0xbc, 0x07, 0xdf, 0xdd, 0x0f, 0x3a, 0x8a, 0x77, 0x4d, 0x72, 0x8b, 0x3e, 0x46, 0x78, 0xa3,
-	0x45, 0x36, 0xba, 0xf0, 0x93, 0x18, 0x38, 0x15, 0xc1, 0x92, 0xc3, 0xcb, 0xd1, 0xa0, 0x74, 0x35,
-	0xf5, 0x7b, 0xe6, 0xe4, 0x1d, 0xc6, 0x89, 0x06, 0x57, 0x7b, 0xe6, 0x84, 0xf5, 0xc6, 0x5d, 0x59,
-	0xdb, 0x71, 0x79, 0x26, 0x81, 0x74, 0x67, 0xff, 0x00, 0xfb, 0x6a, 0xbc, 0xe1, 0x9f, 0xd2, 0x17,
-	0xfb, 0x3e, 0x2f, 0x90, 0xbf, 0xce, 0x90, 0x5f, 0x86, 0xcb, 0x7b, 0x9f, 0x06, 0xec, 0x12, 0xf8,
-	0x6d, 0x0c, 0xcc, 0xf4, 0xe2, 0x96, 0xe1, 0x6a, 0x9f, 0x00, 0x3a, 0xeb, 0x63, 0xcf, 0x94, 0xac,
-	0x33, 0x4a, 0xde, 0x87, 0x37, 0xf6, 0x85, 0x92, 0xf6, 0x0a, 0x79, 0x10, 0x03, 0xa7, 0xa3, 0xf8,
-	0x64, 0xb8, 0xb2, 0x37, 0x89, 0xec, 0xe7, 0xa8, 0xdc, 0x64, 0xbc, 0x5c, 0x87, 0x6f, 0xf5, 0xc8,
-	0x0b, 0x65, 0xa1, 0x8b, 0x50, 0xe8, 0xe8, 0x3c, 0x94, 0xc0, 0x90, 0x67, 0x5f, 0xe1, 0x4c, 0x68,
-	0xb3, 0x01, 0xe3, 0x9b, 0x9e, 0x8d, 0x18, 0x2d, 0x80, 0x28, 0x0c, 0x48, 0x0e, 0x9e, 0x09, 0x05,
-	0xe2, 0x7b, 0x63, 0xf8, 0x99, 0x04, 0x12, 0x34, 0x03, 0xcc, 0x85, 0xbf, 0x40, 0x1b, 0xa6, 0x39,
-	0x7d, 0x36, 0x42, 0xa4, 0xe8, 0xe6, 0x3c, 0xeb, 0x46, 0x81, 0x33, 0xa1, 0xdd, 0xb0, 0x4e, 0x1a,
-	0xe4, 0x32, 0xb6, 0x3c, 0x47, 0xdc, 0x85, 0xad, 0x80, 0x97, 0xee, 0xc2, 0x56, 0xd0, 0x66, 0x47,
-	0x64, 0x4b, 0x2f, 0x97, 0x67, 0x39, 0x5b, 0x5f, 0x4b, 0x20, 0xe9, 0xbb, 0x51, 0x18, 0x5e, 0x2c,
-	0xe8, 0xc3, 0xd3, 0x4a, 0xd4, 0x70, 0xd1, 0xdc, 0x02, 0x6b, 0x6e, 0x16, 0x4e, 0xb7, 0x6d, 0x2e,
-	0x40, 0x9a, 0xca, 0xec, 0xae, 0x03, 0x77, 0x24, 0x00, 0x77, 0x3b, 0x53, 0xf8, 0x42, 0x68, 0xed,
-	0x8e, 0xae, 0x38, 0xfd, 0x62, 0xcf, 0xe7, 0x44, 0xf3, 0x05, 0xd6, 0xfc, 0x12, 0x5c, 0xec, 0xe5,
-	0xce, 0xab, 0x84, 0x26, 0xe4, 0x42, 0xf2, 0xbd, 0x21, 0xfc, 0x41, 0x02, 0x23, 0xad, 0xae, 0x15,
-	0xce, 0x77, 0x6f, 0x6b, 0x17, 0x94, 0x85, 0x9e, 0xce, 0x08, 0x18, 0x17, 0x18, 0x8c, 0xf3, 0x70,
-	0x3e, 0x02, 0x0c, 0xde, 0xbc, 0xdf, 0x77, 0xfe, 0xe6, 0xe3, 0x27, 0x19, 0x69, 0xe7, 0x49, 0x46,
-	0xfa, 0xf3, 0x49, 0x46, 0x7a, 0xf0, 0x34, 0x33, 0xb0, 0xf3, 0x34, 0x33, 0xf0, 0xdb, 0xd3, 0xcc,
-	0xc0, 0x8d, 0xa5, 0x26, 0x8b, 0x2c, 0xf2, 0xce, 0x96, 0xf5, 0x75, 0xc7, 0x2f, 0x72, 0x67, 0xee,
-	0x25, 0xf5, 0x5e, 0x4b, 0xa9, 0x8d, 0xb2, 0x69, 0x58, 0x84, 0xff, 0x9b, 0x9c, 0x7f, 0x04, 0x0e,
-	0xb2, 0x3f, 0x0b, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0xe0, 0x6d, 0x19, 0xe3, 0x42, 0x18, 0x00,
-	0x00,
+	// 1577 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x58, 0xcf, 0x6f, 0xdb, 0x64,
+	0x18, 0xae, 0x93, 0xac, 0x6b, 0xbe, 0xad, 0x6d, 0xfa, 0x6d, 0xe9, 0xda, 0x6c, 0xc4, 0xd9, 0xb7,
+	0x01, 0xd9, 0xda, 0xda, 0x6a, 0x3b, 0x18, 0x4c, 0x82, 0xa9, 0xe9, 0xca, 0x16, 0x34, 0x58, 0x71,
+	0x07, 0x83, 0xc1, 0x88, 0x9c, 0xc6, 0xa4, 0xd6, 0x62, 0x3b, 0x8d, 0x3f, 0x6f, 0xab, 0xd0, 0x2e,
+	0x48, 0x08, 0x4e, 0x68, 0x88, 0xc3, 0x0e, 0x1c, 0x10, 0x07, 0x2e, 0xe3, 0x0a, 0xff, 0xc3, 0x84,
+	0x04, 0x2a, 0xe2, 0x82, 0x38, 0x04, 0xb4, 0x72, 0xe0, 0xb0, 0x0b, 0xf9, 0x0b, 0xd0, 0xf7, 0xc3,
+	0x4e, 0xe2, 0x26, 0x8e, 0x93, 0xf6, 0xc0, 0xa9, 0xce, 0xf7, 0xbd, 0xdf, 0xfb, 0x3e, 0xcf, 0xe3,
+	0xf7, 0xb5, 0x1f, 0x17, 0x3c, 0x6f, 0xd9, 0x86, 0x65, 0xeb, 0xb6, 0x5c, 0xb5, 0xac, 0x8a, 0xa1,
+	0x9a, 0x6a, 0x59, 0xab, 0xc9, 0x77, 0xe6, 0x8b, 0x1a, 0x56, 0xe7, 0xe5, 0x4d, 0x47, 0xab, 0x6d,
+	0x49, 0xd5, 0x9a, 0x85, 0x2d, 0x78, 0x9c, 0x07, 0x4a, 0x2d, 0x81, 0x12, 0x0f, 0x4c, 0x1d, 0x2d,
+	0x5b, 0x65, 0x8b, 0xc6, 0xc9, 0xe4, 0x8a, 0x1d, 0x49, 0x9d, 0x09, 0xca, 0x5d, 0xd6, 0x4c, 0x8d,
+	0xa6, 0xa3, 0xa1, 0xa7, 0x83, 0x42, 0xf1, 0x3d, 0x1e, 0x35, 0x1b, 0x14, 0x65, 0xdf, 0x55, 0xab,
+	0x85, 0x9a, 0xe5, 0x60, 0x8d, 0x47, 0xa7, 0xd7, 0x69, 0xb8, 0x5c, 0x54, 0x6d, 0xcd, 0x8b, 0x5a,
+	0xb7, 0x74, 0x93, 0xef, 0x9f, 0x6d, 0xdd, 0xa7, 0x54, 0xbd, 0xa8, 0xaa, 0x5a, 0xd6, 0x4d, 0x15,
+	0xeb, 0x96, 0x1b, 0x7b, 0xa2, 0x6c, 0x59, 0xe5, 0x8a, 0x26, 0xab, 0x55, 0x5d, 0x56, 0x4d, 0xd3,
+	0xc2, 0x74, 0xd3, 0x45, 0x3f, 0xcd, 0x77, 0xe9, 0xaf, 0xa2, 0xf3, 0x91, 0xac, 0x9a, 0x5b, 0xee,
+	0x16, 0x2b, 0x52, 0x60, 0xe2, 0xb0, 0x1f, 0x7c, 0x4b, 0xf4, 0x9f, 0xc2, 0xba, 0xa1, 0xd9, 0x58,
+	0x35, 0xaa, 0x2c, 0x00, 0x8d, 0x83, 0xd1, 0x55, 0xb5, 0xa6, 0x1a, 0xb6, 0xa2, 0x6d, 0x3a, 0x9a,
+	0x8d, 0xd1, 0x1a, 0x18, 0x73, 0x17, 0xec, 0xaa, 0x65, 0xda, 0x1a, 0x5c, 0x02, 0xc3, 0x55, 0xba,
+	0x32, 0x25, 0x64, 0x84, 0xec, 0xa1, 0x85, 0x53, 0x52, 0xc0, 0x6d, 0x92, 0xd8, 0xe1, 0x5c, 0xec,
+	0x71, 0x5d, 0x1c, 0x52, 0xf8, 0x41, 0xf4, 0x54, 0x00, 0x99, 0x15, 0x1b, 0xeb, 0x86, 0x8a, 0xb5,
+	0xb5, 0xbb, 0x6a, 0x75, 0xe5, 0x9e, 0xba, 0x8e, 0x97, 0x0c, 0xcb, 0x31, 0x71, 0xde, 0xe4, 0x95,
+	0xe1, 0x0c, 0x38, 0x48, 0x12, 0x16, 0xf4, 0xd2, 0x54, 0x24, 0x23, 0x64, 0x63, 0x39, 0xd8, 0xa8,
+	0x8b, 0x63, 0x5b, 0xaa, 0x51, 0xb9, 0x80, 0xf8, 0x06, 0x52, 0x86, 0xc9, 0x55, 0xbe, 0x04, 0x25,
+	0x30, 0x82, 0xad, 0xdb, 0x9a, 0x59, 0xd0, 0xcd, 0xa9, 0x68, 0x46, 0xc8, 0xc6, 0x73, 0x47, 0x1a,
+	0x75, 0x71, 0x9c, 0x45, 0xbb, 0x3b, 0x48, 0x39, 0x48, 0x2f, 0xf3, 0x26, 0xbc, 0x05, 0x86, 0xe9,
+	0x7d, 0xb3, 0xa7, 0x62, 0x99, 0x68, 0xf6, 0xd0, 0x82, 0x14, 0x48, 0x82, 0x60, 0xf4, 0xe0, 0x91,
+	0x63, 0xb9, 0x24, 0xe1, 0xd3, 0xa8, 0x8b, 0xa3, 0xac, 0x02, 0xcb, 0x85, 0x14, 0x9e, 0xf4, 0xf5,
+	0xd8, 0x88, 0x90, 0x88, 0x28, 0xc3, 0xb6, 0x66, 0x96, 0xb4, 0x1a, 0x7a, 0x14, 0x01, 0x0b, 0x5d,
+	0xe9, 0xde, 0xd0, 0xf1, 0xc6, 0x6a, 0x4d, 0x37, 0x74, 0xac, 0xdf, 0xd1, 0xae, 0x6f, 0x55, 0x35,
+	0xbb, 0x83, 0x00, 0x42, 0x5f, 0x02, 0x44, 0x42, 0x08, 0x70, 0x11, 0x8c, 0x31, 0xac, 0x05, 0xb7,
+	0x46, 0x34, 0x13, 0xcd, 0xc6, 0x72, 0xd3, 0x8d, 0xba, 0x98, 0x6c, 0x25, 0x55, 0xf0, 0x4a, 0x1d,
+	0x66, 0x0b, 0xab, 0xac, 0xe0, 0x3b, 0x60, 0x92, 0x07, 0xb0, 0xec, 0x96, 0x83, 0x0b, 0x25, 0xcd,
+	0xb4, 0x0c, 0xaa, 0x68, 0x3c, 0x77, 0xb2, 0x51, 0x17, 0x9f, 0x69, 0x4b, 0xe4, 0x8b, 0x43, 0xca,
+	0x11, 0xb6, 0x71, 0x9d, 0xac, 0x5f, 0x73, 0xf0, 0x25, 0xba, 0xfa, 0xb3, 0x00, 0xce, 0x7a, 0x62,
+	0xe9, 0x66, 0xb9, 0xa2, 0x91, 0x82, 0x61, 0xba, 0x64, 0xff, 0x45, 0xca, 0x81, 0x71, 0x3f, 0x39,
+	0xd6, 0x5c, 0xa9, 0x46, 0x5d, 0x9c, 0x6c, 0x3d, 0xd6, 0xc2, 0x6a, 0x14, 0xb7, 0xf1, 0xf9, 0x4c,
+	0x00, 0x27, 0x03, 0x7a, 0x9d, 0x0f, 0x55, 0x11, 0x24, 0x9a, 0x89, 0x54, 0xba, 0x4b, 0xf9, 0xc4,
+	0x73, 0x2f, 0x91, 0x4e, 0xfb, 0xa3, 0x2e, 0x26, 0xd9, 0x20, 0xdb, 0xa5, 0xdb, 0x92, 0x6e, 0xc9,
+	0x86, 0x8a, 0x37, 0xa4, 0xbc, 0x89, 0x1b, 0x75, 0xf1, 0x98, 0x1f, 0x07, 0x3b, 0x8e, 0x94, 0x31,
+	0x17, 0x08, 0xab, 0x86, 0xfe, 0xed, 0x8e, 0xe4, 0x9a, 0x83, 0x07, 0x1a, 0xbb, 0x0f, 0xbd, 0x31,
+	0x8a, 0xd2, 0x31, 0x92, 0x43, 0x8e, 0x11, 0xa9, 0x17, 0x62, 0x8e, 0xe0, 0x3c, 0x88, 0x7b, 0xbc,
+	0xa6, 0x62, 0x54, 0x8f, 0xa3, 0x8d, 0xba, 0x98, 0xf0, 0x51, 0x46, 0xca, 0x88, 0xcb, 0xd5, 0x37,
+	0x7a, 0xdf, 0x47, 0xc0, 0x62, 0x77, 0xce, 0xfb, 0x34, 0x7b, 0xbb, 0x67, 0x29, 0xd2, 0xdf, 0x2c,
+	0xad, 0x81, 0x64, 0xdb, 0x8c, 0xe8, 0xa6, 0xd7, 0x6d, 0x64, 0x94, 0x32, 0x8d, 0xba, 0x78, 0xa2,
+	0xc3, 0x28, 0xb9, 0x61, 0x48, 0x81, 0x2d, 0x93, 0x94, 0x37, 0x69, 0xe3, 0x0d, 0xa0, 0x1d, 0xfa,
+	0x45, 0x00, 0x33, 0x3d, 0x67, 0xaf, 0x73, 0xaf, 0x84, 0x52, 0xc9, 0xc7, 0x8e, 0x8d, 0x60, 0x8b,
+	0x4a, 0x7e, 0x5a, 0x87, 0x71, 0x57, 0x42, 0xd1, 0x50, 0x84, 0x3e, 0x15, 0x00, 0x0a, 0x6a, 0x79,
+	0x3e, 0x7d, 0x05, 0x77, 0xce, 0x75, 0xb3, 0x7d, 0xf8, 0xce, 0xf7, 0x1a, 0xbe, 0x49, 0x1f, 0x70,
+	0x77, 0xf6, 0x46, 0x39, 0x72, 0x3e, 0x7a, 0x13, 0x60, 0xfc, 0x4d, 0xc7, 0x20, 0x62, 0x7a, 0x2f,
+	0xd6, 0x15, 0x90, 0x68, 0x2e, 0x71, 0x1c, 0xf3, 0x20, 0x6e, 0x3a, 0x06, 0xed, 0x12, 0x9b, 0x2b,
+	0xda, 0xc2, 0xd0, 0xdb, 0x42, 0xca, 0x88, 0xc9, 0x8f, 0xa2, 0x0b, 0xe0, 0x10, 0xb9, 0x18, 0xe4,
+	0x8e, 0xa0, 0x65, 0x70, 0x98, 0x9d, 0xe5, 0xe5, 0x17, 0x41, 0x8c, 0xec, 0xf0, 0xf7, 0xfa, 0x51,
+	0x89, 0x99, 0x05, 0xc9, 0x35, 0x0b, 0xd2, 0x92, 0xb9, 0x95, 0x8b, 0xff, 0xf4, 0xc3, 0xdc, 0x01,
+	0xda, 0xb6, 0x0a, 0x0d, 0x26, 0xd4, 0x96, 0x2a, 0x95, 0x36, 0x6a, 0x79, 0x90, 0x68, 0x2e, 0xf1,
+	0xdc, 0x2f, 0x80, 0x03, 0x2e, 0xad, 0x68, 0x98, 0xe4, 0x2c, 0x1a, 0x6d, 0x0b, 0x20, 0xb1, 0x56,
+	0xb5, 0xf0, 0x6a, 0x4d, 0x5f, 0xd7, 0x06, 0x6a, 0xbb, 0x15, 0x90, 0x20, 0x6e, 0xab, 0xa0, 0xda,
+	0xb6, 0x86, 0xdb, 0x1a, 0xef, 0x78, 0xf3, 0xe1, 0xe9, 0x8f, 0x40, 0xca, 0x18, 0x59, 0x5a, 0x22,
+	0x2b, 0xac, 0xf9, 0xae, 0x80, 0x89, 0x4d, 0xc7, 0xc2, 0xed, 0x79, 0x58, 0x13, 0x9e, 0x68, 0xd4,
+	0xc5, 0x29, 0x96, 0x67, 0x57, 0x08, 0x52, 0xc6, 0xe9, 0x5a, 0x33, 0x13, 0xca, 0x83, 0x89, 0x16,
+	0x46, 0x5c, 0x9e, 0x73, 0x00, 0xd8, 0x55, 0x0b, 0x17, 0xaa, 0x64, 0x95, 0x37, 0x5f, 0xb2, 0x51,
+	0x17, 0x27, 0x58, 0xde, 0xe6, 0x1e, 0x52, 0xe2, 0xb6, 0x7b, 0x1a, 0x5d, 0x01, 0xd3, 0xd7, 0x2d,
+	0xac, 0x52, 0xa9, 0xaf, 0xea, 0x9b, 0x8e, 0x5e, 0xd2, 0xf1, 0xd6, 0x40, 0xad, 0xf0, 0xb5, 0x00,
+	0x52, 0x9d, 0x52, 0x71, 0x78, 0xf7, 0x41, 0xbc, 0xe2, 0x2e, 0xf2, 0x3b, 0x38, 0x2d, 0x71, 0x67,
+	0x49, 0x84, 0xf2, 0x1e, 0xf1, 0xcb, 0x96, 0x6e, 0xe6, 0x2e, 0xf1, 0x87, 0x3a, 0xef, 0x5b, 0xef,
+	0x24, 0x7a, 0xf4, 0xa7, 0x98, 0x2d, 0xeb, 0x78, 0xc3, 0x29, 0x4a, 0xeb, 0x96, 0xc1, 0xad, 0x29,
+	0xff, 0x33, 0x67, 0x97, 0x6e, 0xcb, 0x98, 0x3c, 0x83, 0x69, 0x12, 0x5b, 0x69, 0x56, 0x44, 0xc7,
+	0x40, 0x92, 0x82, 0xf3, 0x73, 0x44, 0x0f, 0x05, 0x30, 0xe9, 0xdf, 0xf9, 0x5f, 0x40, 0x5e, 0xf8,
+	0x35, 0x09, 0x0e, 0xbc, 0x45, 0x0c, 0x3e, 0xfc, 0x42, 0x00, 0xc3, 0xcc, 0x05, 0xc3, 0xb3, 0x21,
+	0xac, 0x32, 0xa7, 0x96, 0x9a, 0x09, 0x15, 0xcb, 0xc8, 0xa2, 0x99, 0x4f, 0x7e, 0xfb, 0xfb, 0xab,
+	0xc8, 0xb3, 0xf0, 0x94, 0x1c, 0xf4, 0xb9, 0xc2, 0x51, 0xfc, 0x23, 0x80, 0xe9, 0xae, 0x8e, 0x04,
+	0xbe, 0x12, 0x58, 0xb7, 0x97, 0x6b, 0x4f, 0xbd, 0x3a, 0xe8, 0x71, 0xce, 0xe4, 0x2a, 0x65, 0xf2,
+	0x1a, 0xbc, 0x14, 0xc8, 0xe4, 0x63, 0xde, 0xc0, 0xf7, 0x65, 0x8d, 0x67, 0x64, 0xdf, 0x62, 0x1a,
+	0xc9, 0xc9, 0x1f, 0xc2, 0x05, 0xdd, 0x84, 0xdf, 0x46, 0x5a, 0x5e, 0x68, 0xbd, 0x9d, 0x37, 0xbc,
+	0x36, 0x18, 0xfa, 0xae, 0x3e, 0x62, 0xcf, 0x72, 0xa8, 0x54, 0x8e, 0xf7, 0xe1, 0x7b, 0xfb, 0x21,
+	0x47, 0xe1, 0xae, 0x8e, 0x37, 0xc8, 0x63, 0x84, 0x01, 0x2d, 0xd0, 0xd6, 0x85, 0x9f, 0x47, 0xc0,
+	0xa9, 0x10, 0x86, 0x1b, 0x5e, 0x0e, 0x47, 0xa5, 0xa7, 0x65, 0xdf, 0xb3, 0x26, 0xef, 0x52, 0x4d,
+	0x14, 0xb8, 0xda, 0xb7, 0x26, 0x14, 0x1b, 0x33, 0x61, 0x1d, 0xdb, 0xe5, 0xa9, 0x00, 0x52, 0xdd,
+	0xed, 0x02, 0x1c, 0x08, 0x78, 0xd3, 0x2e, 0xa5, 0x2e, 0x0e, 0x7c, 0x9e, 0x33, 0x7f, 0x83, 0x32,
+	0xbf, 0x0c, 0x57, 0xf6, 0xde, 0x0d, 0x96, 0x83, 0xe1, 0x77, 0x11, 0x30, 0xdb, 0x8f, 0x39, 0x86,
+	0xab, 0x03, 0x12, 0xe8, 0x3e, 0x1f, 0x7b, 0x96, 0xa4, 0x48, 0x25, 0xf9, 0x00, 0xde, 0xdc, 0x17,
+	0x49, 0x3a, 0x4f, 0xc8, 0x83, 0x08, 0x38, 0x1d, 0xc6, 0x16, 0xc3, 0x2b, 0x7b, 0x1b, 0x91, 0xfd,
+	0x6c, 0x95, 0x5b, 0x54, 0x97, 0x1b, 0xf0, 0xed, 0x3e, 0x75, 0x21, 0x2a, 0xf4, 0x18, 0x14, 0xd2,
+	0x3a, 0x0f, 0x05, 0x30, 0xe2, 0xda, 0x57, 0x38, 0x1b, 0x08, 0xd6, 0x67, 0x7c, 0x53, 0x73, 0x21,
+	0xa3, 0x39, 0x11, 0x89, 0x12, 0xc9, 0xc2, 0xe7, 0x02, 0x89, 0x78, 0xde, 0x18, 0x7e, 0x29, 0x80,
+	0x18, 0xc9, 0x00, 0xb3, 0xc1, 0x2f, 0xd0, 0xa6, 0x69, 0x4e, 0x9d, 0x09, 0x11, 0xc9, 0xd1, 0x9c,
+	0xa3, 0x68, 0x24, 0x38, 0x1b, 0x88, 0x86, 0x22, 0x69, 0x8a, 0x4b, 0xd5, 0x72, 0x1d, 0x71, 0x0f,
+	0xb5, 0x7c, 0x5e, 0xba, 0x87, 0x5a, 0x7e, 0x9b, 0x1d, 0x52, 0x2d, 0xb5, 0x52, 0x99, 0x63, 0x6a,
+	0x7d, 0x23, 0x80, 0xb8, 0xe7, 0x46, 0x61, 0x70, 0x31, 0xbf, 0x0f, 0x4f, 0x49, 0x61, 0xc3, 0x39,
+	0xb8, 0x45, 0x0a, 0x6e, 0x0e, 0xce, 0x74, 0x04, 0xe7, 0x13, 0x4d, 0xa6, 0x76, 0xd7, 0x86, 0xdb,
+	0x02, 0x80, 0xbb, 0x9d, 0x29, 0x7c, 0x31, 0xb0, 0x76, 0x57, 0x57, 0x9c, 0x3a, 0xdf, 0xf7, 0x39,
+	0x0e, 0x3e, 0x4f, 0xc1, 0x2f, 0xc3, 0xa5, 0x7e, 0xee, 0xbc, 0x8c, 0x49, 0x42, 0x36, 0x48, 0x9e,
+	0x37, 0x84, 0x3f, 0x0a, 0x60, 0xac, 0xdd, 0xb5, 0xc2, 0x85, 0xde, 0xb0, 0x76, 0x51, 0x59, 0xec,
+	0xeb, 0x0c, 0xa7, 0x71, 0x81, 0xd2, 0x38, 0x07, 0x17, 0x42, 0xd0, 0x60, 0xe0, 0x3d, 0xdc, 0xb9,
+	0x5b, 0x8f, 0x9f, 0xa4, 0x85, 0xed, 0x27, 0x69, 0xe1, 0xaf, 0x27, 0x69, 0xe1, 0xc1, 0x4e, 0x7a,
+	0x68, 0x7b, 0x27, 0x3d, 0xf4, 0xfb, 0x4e, 0x7a, 0xe8, 0xe6, 0x72, 0x8b, 0x45, 0xe6, 0x79, 0xe7,
+	0x2a, 0x6a, 0xd1, 0xf6, 0x8a, 0xdc, 0x99, 0x7f, 0x59, 0xbe, 0xd7, 0x56, 0x6a, 0xbd, 0xa2, 0x6b,
+	0x26, 0x66, 0xff, 0x04, 0x67, 0x1f, 0x81, 0xc3, 0xf4, 0xcf, 0xe2, 0x7f, 0x01, 0x00, 0x00, 0xff,
+	0xff, 0x99, 0xd0, 0xeb, 0xa1, 0x20, 0x18, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/x/poolmanager/types/genesis.pb.go b/x/poolmanager/types/genesis.pb.go
index 5e80d223dbf..ee7f9a88117 100644
--- a/x/poolmanager/types/genesis.pb.go
+++ b/x/poolmanager/types/genesis.pb.go
@@ -4,6 +4,7 @@
 package types
 
 import (
+	cosmossdk_io_math "cosmossdk.io/math"
 	fmt "fmt"
 	_ "github.com/cosmos/cosmos-proto"
 	_ "github.com/cosmos/cosmos-sdk/codec/types"
@@ -166,7 +167,7 @@ func (m *GenesisState) GetPoolRoutes() []ModuleRoute {
 type TakerFeeParams struct {
 	// default_taker_fee is the fee used when creating a new pool that doesn't
 	// fall under a custom pool taker fee or stableswap taker fee category.
-	DefaultTakerFee github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,1,opt,name=default_taker_fee,json=defaultTakerFee,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"default_taker_fee"`
+	DefaultTakerFee cosmossdk_io_math.LegacyDec `protobuf:"bytes,1,opt,name=default_taker_fee,json=defaultTakerFee,proto3,customtype=cosmossdk.io/math.LegacyDec" json:"default_taker_fee"`
 	// osmo_taker_fee_distribution defines the distribution of taker fees
 	// generated in OSMO. As of this writing, it has two catagories:
 	//   - staking_rewards: the percent of the taker fee that gets distributed to
@@ -259,8 +260,8 @@ func (m *TakerFeeParams) GetCommunityPoolDenomToSwapNonWhitelistedAssetsTo() str
 // TakerFeeDistributionPercentage defines what percent of the taker fee category
 // gets distributed to the available categories.
 type TakerFeeDistributionPercentage struct {
-	StakingRewards github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,1,opt,name=staking_rewards,json=stakingRewards,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"staking_rewards" yaml:"staking_rewards"`
-	CommunityPool  github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,2,opt,name=community_pool,json=communityPool,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"community_pool" yaml:"community_pool"`
+	StakingRewards cosmossdk_io_math.LegacyDec `protobuf:"bytes,1,opt,name=staking_rewards,json=stakingRewards,proto3,customtype=cosmossdk.io/math.LegacyDec" json:"staking_rewards" yaml:"staking_rewards"`
+	CommunityPool  cosmossdk_io_math.LegacyDec `protobuf:"bytes,2,opt,name=community_pool,json=communityPool,proto3,customtype=cosmossdk.io/math.LegacyDec" json:"community_pool" yaml:"community_pool"`
 }
 
 func (m *TakerFeeDistributionPercentage) Reset()         { *m = TakerFeeDistributionPercentage{} }
@@ -308,58 +309,59 @@ func init() {
 }
 
 var fileDescriptor_aa099d9fbdf68b35 = []byte{
-	// 810 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0x4f, 0x6f, 0x1b, 0x45,
-	0x14, 0xcf, 0x26, 0x69, 0xa4, 0x8c, 0x8b, 0x4d, 0x57, 0x94, 0x6e, 0x13, 0x69, 0xd7, 0xda, 0x4a,
-	0xc8, 0x08, 0x75, 0x57, 0x09, 0x12, 0x08, 0x10, 0x07, 0x3b, 0x56, 0x0b, 0x12, 0xb4, 0xe9, 0x36,
-	0x12, 0x52, 0x2f, 0xa3, 0xb1, 0xf7, 0x65, 0xb3, 0xca, 0xee, 0x8c, 0xbb, 0x33, 0x1b, 0xd7, 0x5c,
-	0xf9, 0x02, 0x48, 0x5c, 0x39, 0x73, 0xe0, 0xc6, 0x37, 0xe0, 0xc0, 0xa1, 0xc7, 0x1e, 0x11, 0x87,
-	0x05, 0x39, 0xdf, 0xc0, 0x9f, 0x00, 0xcd, 0x1f, 0xc7, 0xd9, 0x50, 0x5b, 0x0d, 0x3d, 0xd9, 0xf3,
-	0xde, 0xfb, 0xfd, 0xde, 0x7b, 0xbf, 0xfd, 0x8d, 0x06, 0x7d, 0xc8, 0x78, 0xce, 0x78, 0xca, 0xc3,
-	0x11, 0x63, 0x59, 0x4e, 0x28, 0x49, 0xa0, 0x08, 0xcf, 0xf6, 0x06, 0x20, 0xc8, 0x5e, 0x98, 0x00,
-	0x05, 0x9e, 0xf2, 0x60, 0x54, 0x30, 0xc1, 0xec, 0x5d, 0x53, 0x1a, 0x5c, 0x2a, 0x0d, 0x4c, 0xe9,
-	0xce, 0x7b, 0x09, 0x4b, 0x98, 0xaa, 0x0b, 0xe5, 0x3f, 0x0d, 0xd9, 0xb9, 0x9b, 0x30, 0x96, 0x64,
-	0x10, 0xaa, 0xd3, 0xa0, 0x3c, 0x0e, 0x09, 0x9d, 0xcc, 0x53, 0x43, 0x45, 0x87, 0x35, 0x46, 0x1f,
-	0x4c, 0xca, 0xbd, 0x8a, 0x8a, 0xcb, 0x82, 0x88, 0x94, 0xd1, 0x79, 0x5e, 0x57, 0x87, 0x03, 0xc2,
-	0xe1, 0x62, 0xd6, 0x21, 0x4b, 0xe7, 0xf9, 0x60, 0xd5, 0x4e, 0x39, 0x8b, 0xcb, 0x0c, 0x70, 0xc1,
-	0x4a, 0x01, 0xba, 0xde, 0x9f, 0xad, 0xa3, 0xad, 0x43, 0x52, 0x90, 0x9c, 0xdb, 0x3f, 0x59, 0xe8,
-	0x96, 0x44, 0xe1, 0x61, 0x01, 0xaa, 0x25, 0x3e, 0x06, 0x70, 0xac, 0xf6, 0x46, 0xa7, 0xb1, 0x7f,
-	0x37, 0x30, 0x53, 0xca, 0xbe, 0xf3, 0xc5, 0x83, 0x03, 0x96, 0xd2, 0xde, 0x37, 0x2f, 0x2b, 0x6f,
-	0x6d, 0x56, 0x79, 0xce, 0x84, 0xe4, 0xd9, 0xe7, 0xfe, 0x7f, 0x18, 0xfc, 0x5f, 0xff, 0xf6, 0x3a,
-	0x49, 0x2a, 0x4e, 0xca, 0x41, 0x30, 0x64, 0xb9, 0x59, 0xd7, 0xfc, 0xdc, 0xe7, 0xf1, 0x69, 0x28,
-	0x26, 0x23, 0xe0, 0x8a, 0x8c, 0x47, 0x2d, 0x89, 0x3f, 0x30, 0xf0, 0x07, 0x00, 0xf6, 0x19, 0x7a,
-	0x57, 0x90, 0x53, 0x28, 0x24, 0x15, 0x1e, 0xa9, 0x49, 0x9d, 0xf5, 0xb6, 0xd5, 0x69, 0xec, 0x7f,
-	0x14, 0xac, 0xf8, 0x28, 0xc1, 0x91, 0x04, 0x3d, 0x00, 0xd0, 0xcb, 0xf5, 0x3c, 0x33, 0xe5, 0x1d,
-	0x3d, 0xe5, 0x55, 0x4a, 0x3f, 0x6a, 0x8a, 0x1a, 0xc0, 0x7e, 0x86, 0xee, 0x90, 0x52, 0x9c, 0xb0,
-	0x22, 0xfd, 0x1e, 0x62, 0xfc, 0xbc, 0x64, 0x02, 0x70, 0x0c, 0x94, 0xe5, 0xdc, 0xd9, 0x68, 0x6f,
-	0x74, 0xb6, 0x7b, 0xfe, 0xac, 0xf2, 0x5c, 0xcd, 0xb6, 0xa4, 0xd0, 0x8f, 0x6e, 0x2f, 0x32, 0x4f,
-	0x64, 0xa2, 0xaf, 0xe3, 0x7f, 0x58, 0xe8, 0xe6, 0x43, 0xed, 0xaf, 0xa7, 0x82, 0x08, 0xb0, 0xdb,
-	0xe8, 0x26, 0x85, 0x17, 0x02, 0x2b, 0xf1, 0xd2, 0xd8, 0xb1, 0xda, 0x56, 0x67, 0x33, 0x42, 0x32,
-	0x76, 0xc8, 0x58, 0xf6, 0x75, 0x6c, 0x77, 0xd1, 0x56, 0x6d, 0xf9, 0x7b, 0x2b, 0x97, 0x37, 0x4b,
-	0x6f, 0xca, 0xa5, 0x23, 0x03, 0xb4, 0x1f, 0xa3, 0x86, 0xe2, 0x57, 0x9f, 0x5f, 0x6f, 0xd1, 0xd8,
-	0xef, 0xac, 0xe4, 0xf9, 0x56, 0x19, 0x26, 0x92, 0x00, 0x43, 0x86, 0x64, 0x99, 0x0a, 0x70, 0xff,
-	0xf7, 0x1b, 0xa8, 0x59, 0x97, 0xd9, 0xce, 0xd1, 0xad, 0x18, 0x8e, 0x49, 0x99, 0x09, 0x7c, 0x21,
-	0xb1, 0xda, 0x66, 0xbb, 0xd7, 0x95, 0xf8, 0xbf, 0x2a, 0xef, 0x83, 0x37, 0xf0, 0x42, 0x1f, 0x86,
-	0xd3, 0xca, 0x6b, 0xf5, 0x35, 0xd5, 0xbc, 0x47, 0xd4, 0x8a, 0xeb, 0x01, 0xfb, 0x67, 0x0b, 0xa9,
-	0x9b, 0xb9, 0x68, 0x86, 0xe3, 0x94, 0x8b, 0x22, 0x1d, 0x94, 0xd2, 0x3f, 0x46, 0xab, 0x2f, 0xde,
-	0xc8, 0x28, 0xfd, 0x4b, 0xc0, 0x43, 0x28, 0x86, 0x40, 0x05, 0x49, 0xa0, 0xd7, 0x96, 0x63, 0x4f,
-	0x2b, 0xcf, 0x79, 0xcc, 0x73, 0xf6, 0xba, 0xda, 0xc8, 0x61, 0x4b, 0x32, 0xf6, 0x2f, 0x16, 0xf2,
-	0x28, 0xa3, 0x78, 0xd5, 0x88, 0x1b, 0x6f, 0x3f, 0xe2, 0x3d, 0x33, 0xe2, 0xee, 0x23, 0x46, 0x97,
-	0x4e, 0xb9, 0x4b, 0x97, 0x27, 0xed, 0x03, 0xd4, 0x22, 0x71, 0x9e, 0x52, 0x4c, 0xe2, 0xb8, 0x00,
-	0xce, 0x81, 0x3b, 0x9b, 0xca, 0xe4, 0x3b, 0xb3, 0xca, 0x7b, 0xdf, 0x98, 0xbc, 0x5e, 0xe0, 0x47,
-	0x4d, 0x15, 0xe9, 0xce, 0x03, 0xf6, 0x6f, 0x16, 0xfa, 0x64, 0xc8, 0xf2, 0xbc, 0xa4, 0xa9, 0x98,
-	0x68, 0x2b, 0xab, 0x7b, 0x80, 0x05, 0xc3, 0x7c, 0x4c, 0x46, 0x58, 0x4a, 0x31, 0x3e, 0x49, 0x05,
-	0x64, 0x29, 0x17, 0x10, 0x63, 0xc2, 0x39, 0x08, 0x8e, 0x05, 0x73, 0x6e, 0x68, 0x87, 0xcc, 0x2a,
-	0xef, 0x4b, 0xdd, 0xec, 0xff, 0xf1, 0xf8, 0x51, 0x70, 0x01, 0x94, 0xf7, 0x46, 0x5d, 0xb7, 0x23,
-	0xf6, 0x74, 0x4c, 0x46, 0x8f, 0x18, 0xfd, 0x6e, 0x01, 0xe9, 0x2a, 0xc4, 0x11, 0xf3, 0x7f, 0x58,
-	0x47, 0xee, 0x6a, 0x75, 0xed, 0xe7, 0xa8, 0xc5, 0x05, 0x39, 0x4d, 0x69, 0x82, 0x0b, 0x18, 0x93,
-	0x22, 0xe6, 0xc6, 0xd0, 0x5f, 0x5d, 0xcf, 0xd0, 0x0b, 0x25, 0xaf, 0xd0, 0xf9, 0x51, 0xd3, 0x44,
-	0x22, 0x1d, 0xb0, 0x29, 0x6a, 0xd6, 0x05, 0x50, 0x46, 0xde, 0xee, 0x3d, 0xbc, 0x76, 0xc7, 0xdb,
-	0xaf, 0x93, 0xd3, 0x8f, 0xde, 0xa9, 0xc9, 0xd4, 0x7b, 0xf2, 0x72, 0xea, 0x5a, 0xaf, 0xa6, 0xae,
-	0xf5, 0xcf, 0xd4, 0xb5, 0x7e, 0x3c, 0x77, 0xd7, 0x5e, 0x9d, 0xbb, 0x6b, 0x7f, 0x9e, 0xbb, 0x6b,
-	0xcf, 0x3e, 0xbd, 0xd4, 0xc9, 0x38, 0xf4, 0x7e, 0x46, 0x06, 0x7c, 0x7e, 0x08, 0xcf, 0xf6, 0x3e,
-	0x0b, 0x5f, 0xd4, 0x1e, 0x1b, 0xd5, 0x7e, 0xb0, 0xa5, 0x9e, 0x97, 0x8f, 0xff, 0x0d, 0x00, 0x00,
-	0xff, 0xff, 0xb2, 0xd3, 0xe1, 0xd1, 0x64, 0x07, 0x00, 0x00,
+	// 823 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0x4d, 0x6f, 0xdb, 0x46,
+	0x10, 0x35, 0x63, 0xc7, 0x80, 0xd7, 0xa9, 0xd4, 0x10, 0x4d, 0xc3, 0xd8, 0x00, 0x29, 0x30, 0x17,
+	0x15, 0x45, 0x48, 0xd8, 0x05, 0x52, 0xf4, 0x23, 0x07, 0xcb, 0x46, 0x8a, 0x02, 0x69, 0xe2, 0x30,
+	0x06, 0x0a, 0xe4, 0xb2, 0x58, 0x91, 0x63, 0x9a, 0xb0, 0xb8, 0xa3, 0x72, 0x97, 0x76, 0xd4, 0x5f,
+	0x51, 0xa0, 0xd7, 0x9e, 0x7b, 0xe8, 0xad, 0x87, 0xfe, 0x83, 0x1e, 0x72, 0xcc, 0xb1, 0xe8, 0x41,
+	0x2d, 0xe4, 0x73, 0x2f, 0xfa, 0x05, 0xc5, 0x7e, 0xc8, 0x36, 0xdd, 0x48, 0x30, 0x9a, 0x93, 0xc4,
+	0x99, 0x79, 0x6f, 0xe6, 0xcd, 0xbe, 0x25, 0xc9, 0x47, 0x28, 0x4a, 0x14, 0x85, 0x88, 0x87, 0x88,
+	0x83, 0x92, 0x71, 0x96, 0x43, 0x15, 0x9f, 0x6c, 0xf5, 0x41, 0xb2, 0xad, 0x38, 0x07, 0x0e, 0xa2,
+	0x10, 0xd1, 0xb0, 0x42, 0x89, 0xee, 0xa6, 0x2d, 0x8d, 0x2e, 0x95, 0x46, 0xb6, 0x74, 0xe3, 0x83,
+	0x1c, 0x73, 0xd4, 0x75, 0xb1, 0xfa, 0x67, 0x20, 0x1b, 0xf7, 0x72, 0xc4, 0x7c, 0x00, 0xb1, 0x7e,
+	0xea, 0xd7, 0x87, 0x31, 0xe3, 0xa3, 0x59, 0x2a, 0xd5, 0x74, 0xd4, 0x60, 0xcc, 0x83, 0x4d, 0xf9,
+	0x57, 0x51, 0x59, 0x5d, 0x31, 0x59, 0x20, 0x9f, 0xe5, 0x4d, 0x75, 0xdc, 0x67, 0x02, 0xce, 0x67,
+	0x4d, 0xb1, 0x98, 0xe5, 0xa3, 0x45, 0x9a, 0x4a, 0xcc, 0xea, 0x01, 0xd0, 0x0a, 0x6b, 0x09, 0xa6,
+	0x3e, 0x9c, 0xde, 0x20, 0xab, 0xfb, 0xac, 0x62, 0xa5, 0x70, 0x7f, 0x74, 0xc8, 0x6d, 0x85, 0xa2,
+	0x69, 0x05, 0xba, 0x25, 0x3d, 0x04, 0xf0, 0x9c, 0xce, 0x72, 0x77, 0x7d, 0xfb, 0x5e, 0x64, 0xa7,
+	0x54, 0x7d, 0x67, 0xc2, 0xa3, 0x5d, 0x2c, 0x78, 0xef, 0xc9, 0xeb, 0x71, 0xb0, 0x34, 0x1d, 0x07,
+	0xde, 0x88, 0x95, 0x83, 0xcf, 0xc3, 0xff, 0x30, 0x84, 0xbf, 0xfc, 0x15, 0x74, 0xf3, 0x42, 0x1e,
+	0xd5, 0xfd, 0x28, 0xc5, 0xd2, 0xca, 0xb5, 0x3f, 0x0f, 0x44, 0x76, 0x1c, 0xcb, 0xd1, 0x10, 0x84,
+	0x26, 0x13, 0x49, 0x5b, 0xe1, 0x77, 0x2d, 0xfc, 0x31, 0x80, 0x7b, 0x42, 0xde, 0x97, 0xec, 0x18,
+	0x2a, 0x45, 0x45, 0x87, 0x7a, 0x52, 0xef, 0x46, 0xc7, 0xe9, 0xae, 0x6f, 0x7f, 0x1c, 0x2d, 0x38,
+	0x94, 0xe8, 0x40, 0x81, 0x1e, 0x03, 0x18, 0x71, 0xbd, 0xc0, 0x4e, 0x79, 0xd7, 0x4c, 0x79, 0x95,
+	0x32, 0x4c, 0x5a, 0xb2, 0x01, 0x70, 0x5f, 0x92, 0xbb, 0xac, 0x96, 0x47, 0x58, 0x15, 0xdf, 0x43,
+	0x46, 0xbf, 0xab, 0x51, 0x02, 0xcd, 0x80, 0x63, 0x29, 0xbc, 0xe5, 0xce, 0x72, 0x77, 0xad, 0x17,
+	0x4e, 0xc7, 0x81, 0x6f, 0xd8, 0xe6, 0x14, 0x86, 0xc9, 0x9d, 0x8b, 0xcc, 0x73, 0x95, 0xd8, 0x33,
+	0xf1, 0xdf, 0x1d, 0x72, 0xeb, 0x2b, 0xe3, 0xaf, 0x17, 0x92, 0x49, 0x70, 0x3b, 0xe4, 0x16, 0x87,
+	0x57, 0x92, 0xea, 0xe5, 0x15, 0x99, 0xe7, 0x74, 0x9c, 0xee, 0x4a, 0x42, 0x54, 0x6c, 0x1f, 0x71,
+	0xf0, 0x75, 0xe6, 0xee, 0x90, 0xd5, 0x86, 0xf8, 0xfb, 0x0b, 0xc5, 0x5b, 0xd1, 0x2b, 0x4a, 0x74,
+	0x62, 0x81, 0xee, 0x33, 0xb2, 0xae, 0xf9, 0xf5, 0xf1, 0x1b, 0x15, 0xeb, 0xdb, 0xdd, 0x85, 0x3c,
+	0xdf, 0x68, 0xc3, 0x24, 0x0a, 0x60, 0xc9, 0x88, 0x2a, 0xd3, 0x01, 0x11, 0xfe, 0x76, 0x93, 0xb4,
+	0x9a, 0x6b, 0x76, 0xfb, 0xe4, 0x76, 0x06, 0x87, 0xac, 0x1e, 0x48, 0x7a, 0xbe, 0x62, 0xad, 0x66,
+	0xad, 0xf7, 0x50, 0xe1, 0xff, 0x1c, 0x07, 0x9b, 0xe6, 0xe4, 0x45, 0x76, 0x1c, 0x15, 0x18, 0x97,
+	0x4c, 0x1e, 0x45, 0x4f, 0x20, 0x67, 0xe9, 0x68, 0x0f, 0xd2, 0xc9, 0x38, 0x68, 0xef, 0x19, 0xfc,
+	0x8c, 0x38, 0x69, 0x67, 0xcd, 0x80, 0xfb, 0x93, 0x43, 0xf4, 0x75, 0xbc, 0xe8, 0x40, 0xb3, 0x42,
+	0xc8, 0xaa, 0xe8, 0xd7, 0xca, 0x34, 0x76, 0x41, 0x5f, 0x5c, 0xcb, 0x1d, 0x7b, 0x97, 0x80, 0xfb,
+	0x50, 0xa5, 0xc0, 0x25, 0xcb, 0xa1, 0xd7, 0x51, 0xb3, 0x4e, 0xc6, 0x81, 0xf7, 0x4c, 0x94, 0xf8,
+	0xb6, 0xda, 0xc4, 0xc3, 0x39, 0x19, 0xf7, 0x67, 0x87, 0x04, 0x1c, 0x39, 0x5d, 0x34, 0xe2, 0xf2,
+	0xbb, 0x8f, 0x78, 0xdf, 0x8e, 0xb8, 0xf9, 0x14, 0xf9, 0xdc, 0x29, 0x37, 0xf9, 0xfc, 0xa4, 0xbb,
+	0x4b, 0xda, 0x2c, 0x2b, 0x0b, 0x4e, 0x59, 0x96, 0x55, 0x20, 0x04, 0x08, 0x6f, 0x45, 0x3b, 0x7b,
+	0x63, 0x3a, 0x0e, 0x3e, 0xb4, 0xce, 0x6e, 0x16, 0x84, 0x49, 0x4b, 0x47, 0x76, 0x66, 0x01, 0xf7,
+	0x57, 0x87, 0x3c, 0x4c, 0xb1, 0x2c, 0x6b, 0x5e, 0xc8, 0x91, 0xf1, 0xaf, 0x36, 0x3f, 0x95, 0x48,
+	0xc5, 0x29, 0x1b, 0x52, 0xb5, 0x8a, 0xd3, 0xa3, 0x42, 0xc2, 0xa0, 0x10, 0x12, 0x32, 0xca, 0x84,
+	0x00, 0x29, 0xa8, 0x44, 0xef, 0xa6, 0xb6, 0xc5, 0xce, 0x74, 0x1c, 0x3c, 0x32, 0xcd, 0xfe, 0x1f,
+	0x4f, 0x98, 0x44, 0xe7, 0x40, 0x75, 0x59, 0xf4, 0x1d, 0x3b, 0xc0, 0x17, 0xa7, 0x6c, 0xf8, 0x14,
+	0xf9, 0xb7, 0x17, 0x90, 0x1d, 0x8d, 0x38, 0xc0, 0xf0, 0x1f, 0x87, 0xf8, 0x8b, 0xb7, 0xeb, 0x1e,
+	0x92, 0xb6, 0x90, 0xec, 0xb8, 0xe0, 0x39, 0xad, 0xe0, 0x94, 0x55, 0x99, 0xb0, 0x2e, 0x7e, 0x74,
+	0x0d, 0x17, 0x5f, 0xac, 0xef, 0x0a, 0x47, 0x98, 0xb4, 0x6c, 0x24, 0x31, 0x01, 0x37, 0x25, 0xad,
+	0xa6, 0x6a, 0xed, 0xde, 0xb5, 0xde, 0x97, 0xd7, 0x6b, 0x73, 0xe7, 0x6d, 0x8b, 0x0b, 0x93, 0xf7,
+	0x1a, 0x0b, 0xe9, 0x3d, 0x7f, 0x3d, 0xf1, 0x9d, 0x37, 0x13, 0xdf, 0xf9, 0x7b, 0xe2, 0x3b, 0x3f,
+	0x9c, 0xf9, 0x4b, 0x6f, 0xce, 0xfc, 0xa5, 0x3f, 0xce, 0xfc, 0xa5, 0x97, 0x9f, 0x5e, 0x7a, 0x2f,
+	0x5b, 0x2f, 0x3e, 0x18, 0xb0, 0xbe, 0x98, 0x3d, 0xc4, 0x27, 0x5b, 0x9f, 0xc5, 0xaf, 0x1a, 0xdf,
+	0x12, 0xfd, 0xb2, 0xee, 0xaf, 0xea, 0xaf, 0xc7, 0x27, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0xa7,
+	0x24, 0x16, 0xe1, 0x43, 0x07, 0x00, 0x00,
 }
 
 func (m *Params) Marshal() (dAtA []byte, err error) {
diff --git a/x/poolmanager/types/swap_route.pb.go b/x/poolmanager/types/swap_route.pb.go
index dc56c732ada..06934a402b7 100644
--- a/x/poolmanager/types/swap_route.pb.go
+++ b/x/poolmanager/types/swap_route.pb.go
@@ -4,8 +4,8 @@
 package types
 
 import (
+	cosmossdk_io_math "cosmossdk.io/math"
 	fmt "fmt"
-	github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types"
 	_ "github.com/gogo/protobuf/gogoproto"
 	proto "github.com/gogo/protobuf/proto"
 	io "io"
@@ -129,8 +129,8 @@ func (m *SwapAmountOutRoute) GetTokenInDenom() string {
 }
 
 type SwapAmountInSplitRoute struct {
-	Pools         []SwapAmountInRoute                    `protobuf:"bytes,1,rep,name=pools,proto3" json:"pools" yaml:"pools"`
-	TokenInAmount github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,2,opt,name=token_in_amount,json=tokenInAmount,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"token_in_amount" yaml:"token_in_amount"`
+	Pools         []SwapAmountInRoute   `protobuf:"bytes,1,rep,name=pools,proto3" json:"pools" yaml:"pools"`
+	TokenInAmount cosmossdk_io_math.Int `protobuf:"bytes,2,opt,name=token_in_amount,json=tokenInAmount,proto3,customtype=cosmossdk.io/math.Int" json:"token_in_amount" yaml:"token_in_amount"`
 }
 
 func (m *SwapAmountInSplitRoute) Reset()         { *m = SwapAmountInSplitRoute{} }
@@ -174,8 +174,8 @@ func (m *SwapAmountInSplitRoute) GetPools() []SwapAmountInRoute {
 }
 
 type SwapAmountOutSplitRoute struct {
-	Pools          []SwapAmountOutRoute                   `protobuf:"bytes,1,rep,name=pools,proto3" json:"pools" yaml:"pools"`
-	TokenOutAmount github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,2,opt,name=token_out_amount,json=tokenOutAmount,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"token_out_amount" yaml:"token_out_amount"`
+	Pools          []SwapAmountOutRoute  `protobuf:"bytes,1,rep,name=pools,proto3" json:"pools" yaml:"pools"`
+	TokenOutAmount cosmossdk_io_math.Int `protobuf:"bytes,2,opt,name=token_out_amount,json=tokenOutAmount,proto3,customtype=cosmossdk.io/math.Int" json:"token_out_amount" yaml:"token_out_amount"`
 }
 
 func (m *SwapAmountOutSplitRoute) Reset()         { *m = SwapAmountOutSplitRoute{} }
@@ -230,35 +230,35 @@ func init() {
 }
 
 var fileDescriptor_cddd97a9a05492a8 = []byte{
-	// 446 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x93, 0x4d, 0x8f, 0x93, 0x40,
-	0x18, 0xc7, 0x19, 0x5f, 0xd6, 0x38, 0xae, 0x55, 0xc9, 0xba, 0x5b, 0xd7, 0x04, 0x1a, 0x0e, 0xa6,
-	0x89, 0x76, 0x26, 0xd5, 0x83, 0xd1, 0x8b, 0x91, 0x78, 0x90, 0x53, 0x23, 0xbd, 0xd5, 0x03, 0x19,
-	0x0a, 0x41, 0x52, 0x98, 0x21, 0x9d, 0xa1, 0xb5, 0x57, 0xe3, 0x07, 0xf0, 0x63, 0xf5, 0xd8, 0xa3,
-	0xf1, 0x40, 0x4c, 0x9b, 0x78, 0xf1, 0xc6, 0x27, 0x30, 0x0c, 0x60, 0xa1, 0x26, 0x8d, 0x7a, 0x62,
-	0x5e, 0x9e, 0x97, 0xdf, 0xff, 0xcf, 0x33, 0xf0, 0x09, 0xe3, 0x31, 0xe3, 0x21, 0xc7, 0x09, 0x63,
-	0x51, 0x4c, 0x28, 0x09, 0xfc, 0x39, 0x5e, 0x0c, 0x5d, 0x5f, 0x90, 0x21, 0xe6, 0x4b, 0x92, 0x38,
-	0x73, 0x96, 0x0a, 0x1f, 0x25, 0x73, 0x26, 0x98, 0xfa, 0xb0, 0x8a, 0x46, 0x8d, 0x68, 0x54, 0x45,
-	0x5f, 0x9e, 0x05, 0x2c, 0x60, 0x32, 0x0e, 0x17, 0xab, 0x32, 0xc5, 0xf8, 0x0c, 0xe0, 0xbd, 0xf1,
-	0x92, 0x24, 0xaf, 0x63, 0x96, 0x52, 0x61, 0x51, 0xbb, 0x28, 0xa7, 0x3e, 0x86, 0x37, 0x8a, 0x12,
-	0x4e, 0xe8, 0x75, 0x41, 0x0f, 0xf4, 0xaf, 0x99, 0x6a, 0x9e, 0xe9, 0x9d, 0x15, 0x89, 0xa3, 0x97,
-	0x46, 0x75, 0x61, 0xd8, 0x27, 0xc5, 0xca, 0xf2, 0x54, 0x13, 0xde, 0x11, 0x6c, 0xe6, 0x53, 0x87,
-	0xa5, 0xc2, 0xf1, 0x7c, 0xca, 0xe2, 0xee, 0x95, 0x1e, 0xe8, 0xdf, 0x34, 0x2f, 0xf3, 0x4c, 0x3f,
-	0x2f, 0x93, 0x0e, 0x02, 0x0c, 0xfb, 0xb6, 0x3c, 0x19, 0xa5, 0xe2, 0x8d, 0xdc, 0x7f, 0x02, 0x50,
-	0xdd, 0x63, 0x8c, 0x52, 0xf1, 0x1f, 0x1c, 0xaf, 0x60, 0xa7, 0x6c, 0x13, 0xd2, 0x16, 0xc6, 0x83,
-	0x3c, 0xd3, 0xef, 0x37, 0x31, 0xea, 0x7b, 0xc3, 0x3e, 0x95, 0x07, 0x16, 0x2d, 0x21, 0x7e, 0x00,
-	0x78, 0xde, 0xf4, 0x62, 0x9c, 0x44, 0x61, 0x05, 0x32, 0x81, 0xd7, 0x8b, 0x2e, 0xbc, 0x0b, 0x7a,
-	0x57, 0xfb, 0xb7, 0x9e, 0x22, 0x74, 0xc4, 0x69, 0xf4, 0x87, 0x9f, 0xe6, 0xd9, 0x3a, 0xd3, 0x95,
-	0x3c, 0xd3, 0x4f, 0xf7, 0xe8, 0xdc, 0xb0, 0xcb, 0x92, 0x6a, 0x52, 0xfb, 0x17, 0x52, 0x87, 0xc8,
-	0xb4, 0x0a, 0xfc, 0x6d, 0x91, 0xf5, 0x2d, 0xd3, 0x1f, 0x05, 0xa1, 0xf8, 0x90, 0xba, 0x68, 0xca,
-	0x62, 0x3c, 0x95, 0x8d, 0xab, 0xcf, 0x80, 0x7b, 0x33, 0x2c, 0x56, 0x89, 0xcf, 0x91, 0x45, 0xc5,
-	0xa1, 0xdb, 0xbf, 0xcb, 0xd5, 0x6e, 0x5b, 0xb4, 0xa4, 0x32, 0x7e, 0x02, 0x78, 0xd1, 0x72, 0xbb,
-	0xa1, 0xf4, 0x7d, 0x5b, 0x29, 0xfe, 0x4b, 0xa5, 0xf5, 0x2f, 0x3b, 0x2e, 0x95, 0xc3, 0xbb, 0xfb,
-	0x49, 0x68, 0x69, 0xb5, 0xfe, 0x59, 0xeb, 0xc5, 0xe1, 0x64, 0xd5, 0x62, 0x3b, 0xf5, 0x68, 0x95,
-	0x64, 0xe6, 0xbb, 0xf5, 0x56, 0x03, 0x9b, 0xad, 0x06, 0xbe, 0x6f, 0x35, 0xf0, 0x65, 0xa7, 0x29,
-	0x9b, 0x9d, 0xa6, 0x7c, 0xdd, 0x69, 0xca, 0xe4, 0x79, 0xa3, 0x59, 0x25, 0x73, 0x10, 0x11, 0x97,
-	0xd7, 0x1b, 0xbc, 0x18, 0xbe, 0xc0, 0x1f, 0x5b, 0x6f, 0x4f, 0x12, 0xb8, 0x27, 0xf2, 0xf1, 0x3c,
-	0xfb, 0x15, 0x00, 0x00, 0xff, 0xff, 0x76, 0x59, 0xb3, 0xd3, 0x9f, 0x03, 0x00, 0x00,
+	// 443 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x93, 0xbb, 0xae, 0xd3, 0x30,
+	0x1c, 0xc6, 0x63, 0x2e, 0x07, 0x61, 0x0e, 0x05, 0xa2, 0x73, 0x29, 0x45, 0x4a, 0xaa, 0x4c, 0x95,
+	0x00, 0x5b, 0x85, 0xa1, 0xc0, 0x82, 0x88, 0x58, 0x32, 0x55, 0xa4, 0x5b, 0x19, 0x22, 0xa7, 0x89,
+	0xd2, 0xa8, 0x89, 0x1d, 0xd5, 0x4e, 0x4b, 0x57, 0xc4, 0x03, 0xf0, 0x58, 0x1d, 0xbb, 0x20, 0xa1,
+	0x0e, 0x11, 0x6a, 0xdf, 0x20, 0x4f, 0x80, 0x72, 0xa3, 0x49, 0x91, 0x0a, 0x3a, 0x9b, 0x2f, 0xff,
+	0xcf, 0xff, 0xdf, 0xf7, 0xd9, 0x86, 0x2f, 0x18, 0x0f, 0x19, 0xf7, 0x39, 0x8e, 0x18, 0x0b, 0x42,
+	0x42, 0x89, 0xe7, 0xce, 0xf1, 0xa2, 0x6f, 0xbb, 0x82, 0xf4, 0x31, 0x5f, 0x92, 0xc8, 0x9a, 0xb3,
+	0x58, 0xb8, 0x28, 0x9a, 0x33, 0xc1, 0xe4, 0x67, 0x65, 0x35, 0xaa, 0x55, 0xa3, 0xb2, 0xba, 0x73,
+	0xe1, 0x31, 0x8f, 0xe5, 0x75, 0x38, 0x1b, 0x15, 0x12, 0xed, 0x1b, 0x80, 0x4f, 0x46, 0x4b, 0x12,
+	0x7d, 0x08, 0x59, 0x4c, 0x85, 0x41, 0xcd, 0xec, 0x38, 0xf9, 0x39, 0xbc, 0x97, 0x1d, 0x61, 0xf9,
+	0x4e, 0x1b, 0x74, 0x41, 0xef, 0x8e, 0x2e, 0xa7, 0x89, 0xda, 0x5a, 0x91, 0x30, 0x78, 0xa7, 0x95,
+	0x1b, 0x9a, 0x79, 0x96, 0x8d, 0x0c, 0x47, 0xd6, 0xe1, 0x23, 0xc1, 0x66, 0x2e, 0xb5, 0x58, 0x2c,
+	0x2c, 0xc7, 0xa5, 0x2c, 0x6c, 0xdf, 0xea, 0x82, 0xde, 0x7d, 0xbd, 0x93, 0x26, 0xea, 0x55, 0x21,
+	0x3a, 0x2a, 0xd0, 0xcc, 0x87, 0xf9, 0xca, 0x30, 0x16, 0x1f, 0xf3, 0xf9, 0x57, 0x00, 0xe5, 0x03,
+	0xc6, 0x30, 0x16, 0x37, 0xe0, 0x78, 0x0f, 0x5b, 0x45, 0x1b, 0x9f, 0x36, 0x30, 0x9e, 0xa6, 0x89,
+	0x7a, 0x59, 0xc7, 0xa8, 0xf6, 0x35, 0xf3, 0x3c, 0x5f, 0x30, 0x68, 0x01, 0xf1, 0x03, 0xc0, 0xab,
+	0x7a, 0x16, 0xa3, 0x28, 0xf0, 0x4b, 0x90, 0x31, 0xbc, 0x9b, 0x75, 0xe1, 0x6d, 0xd0, 0xbd, 0xdd,
+	0x7b, 0xf0, 0x0a, 0xa1, 0x13, 0x49, 0xa3, 0xbf, 0xf2, 0xd4, 0x2f, 0xd6, 0x89, 0x2a, 0xa5, 0x89,
+	0x7a, 0x7e, 0x40, 0xe7, 0x9a, 0x59, 0x1c, 0x29, 0x5b, 0x55, 0x7e, 0x3e, 0xb5, 0x48, 0x2e, 0x2b,
+	0xc1, 0x07, 0x99, 0x6a, 0x9b, 0xa8, 0x97, 0x93, 0xbc, 0x1b, 0x77, 0x66, 0xc8, 0x67, 0x38, 0x24,
+	0x62, 0x8a, 0x0c, 0x2a, 0x8e, 0xc3, 0xfd, 0xa3, 0xae, 0xc2, 0x35, 0x68, 0x01, 0xa1, 0x6d, 0x01,
+	0xbc, 0x6e, 0x84, 0x5b, 0x33, 0xf6, 0xb9, 0x69, 0x0c, 0xff, 0xa7, 0xb1, 0xea, 0x86, 0x4e, 0x3b,
+	0xb3, 0xe1, 0xe3, 0xc3, 0xc5, 0x37, 0xac, 0xbd, 0xf9, 0x97, 0xb5, 0xeb, 0xe3, 0x77, 0x53, 0x79,
+	0x6b, 0x55, 0x0f, 0xa7, 0x00, 0xd1, 0x3f, 0xad, 0x77, 0x0a, 0xd8, 0xec, 0x14, 0xf0, 0x6b, 0xa7,
+	0x80, 0xef, 0x7b, 0x45, 0xda, 0xec, 0x15, 0xe9, 0xe7, 0x5e, 0x91, 0xc6, 0x03, 0xcf, 0x17, 0xd3,
+	0xd8, 0x46, 0x13, 0x16, 0xe2, 0xd2, 0xd5, 0xcb, 0x80, 0xd8, 0xbc, 0x9a, 0xe0, 0x45, 0xff, 0x2d,
+	0xfe, 0xd2, 0xf8, 0x59, 0x62, 0x15, 0xb9, 0xdc, 0x3e, 0xcb, 0xbf, 0xc6, 0xeb, 0xdf, 0x01, 0x00,
+	0x00, 0xff, 0xff, 0x84, 0x58, 0x0e, 0xcc, 0x7d, 0x03, 0x00, 0x00,
 }
 
 func (m *SwapAmountInRoute) Marshal() (dAtA []byte, err error) {
diff --git a/x/poolmanager/types/tx.pb.go b/x/poolmanager/types/tx.pb.go
index 1d9e03c3197..00d7324f5fc 100644
--- a/x/poolmanager/types/tx.pb.go
+++ b/x/poolmanager/types/tx.pb.go
@@ -5,8 +5,8 @@ package types
 
 import (
 	context "context"
+	cosmossdk_io_math "cosmossdk.io/math"
 	fmt "fmt"
-	github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types"
 	types "github.com/cosmos/cosmos-sdk/types"
 	_ "github.com/cosmos/cosmos-sdk/types/tx/amino"
 	_ "github.com/gogo/protobuf/gogoproto"
@@ -33,10 +33,10 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
 
 // ===================== MsgSwapExactAmountIn
 type MsgSwapExactAmountIn struct {
-	Sender            string                                 `protobuf:"bytes,1,opt,name=sender,proto3" json:"sender,omitempty" yaml:"sender"`
-	Routes            []SwapAmountInRoute                    `protobuf:"bytes,2,rep,name=routes,proto3" json:"routes"`
-	TokenIn           types.Coin                             `protobuf:"bytes,3,opt,name=token_in,json=tokenIn,proto3" json:"token_in" yaml:"token_in"`
-	TokenOutMinAmount github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,4,opt,name=token_out_min_amount,json=tokenOutMinAmount,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"token_out_min_amount" yaml:"token_out_min_amount"`
+	Sender            string                `protobuf:"bytes,1,opt,name=sender,proto3" json:"sender,omitempty" yaml:"sender"`
+	Routes            []SwapAmountInRoute   `protobuf:"bytes,2,rep,name=routes,proto3" json:"routes"`
+	TokenIn           types.Coin            `protobuf:"bytes,3,opt,name=token_in,json=tokenIn,proto3" json:"token_in" yaml:"token_in"`
+	TokenOutMinAmount cosmossdk_io_math.Int `protobuf:"bytes,4,opt,name=token_out_min_amount,json=tokenOutMinAmount,proto3,customtype=cosmossdk.io/math.Int" json:"token_out_min_amount" yaml:"token_out_min_amount"`
 }
 
 func (m *MsgSwapExactAmountIn) Reset()         { *m = MsgSwapExactAmountIn{} }
@@ -94,7 +94,7 @@ func (m *MsgSwapExactAmountIn) GetTokenIn() types.Coin {
 }
 
 type MsgSwapExactAmountInResponse struct {
-	TokenOutAmount github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,1,opt,name=token_out_amount,json=tokenOutAmount,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"token_out_amount" yaml:"token_out_amount"`
+	TokenOutAmount cosmossdk_io_math.Int `protobuf:"bytes,1,opt,name=token_out_amount,json=tokenOutAmount,proto3,customtype=cosmossdk.io/math.Int" json:"token_out_amount" yaml:"token_out_amount"`
 }
 
 func (m *MsgSwapExactAmountInResponse) Reset()         { *m = MsgSwapExactAmountInResponse{} }
@@ -132,10 +132,10 @@ var xxx_messageInfo_MsgSwapExactAmountInResponse proto.InternalMessageInfo
 
 // ===================== MsgSplitRouteSwapExactAmountIn
 type MsgSplitRouteSwapExactAmountIn struct {
-	Sender            string                                 `protobuf:"bytes,1,opt,name=sender,proto3" json:"sender,omitempty" yaml:"sender"`
-	Routes            []SwapAmountInSplitRoute               `protobuf:"bytes,2,rep,name=routes,proto3" json:"routes"`
-	TokenInDenom      string                                 `protobuf:"bytes,3,opt,name=token_in_denom,json=tokenInDenom,proto3" json:"token_in_denom,omitempty" yaml:"token_in_denom"`
-	TokenOutMinAmount github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,4,opt,name=token_out_min_amount,json=tokenOutMinAmount,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"token_out_min_amount" yaml:"token_out_min_amount"`
+	Sender            string                   `protobuf:"bytes,1,opt,name=sender,proto3" json:"sender,omitempty" yaml:"sender"`
+	Routes            []SwapAmountInSplitRoute `protobuf:"bytes,2,rep,name=routes,proto3" json:"routes"`
+	TokenInDenom      string                   `protobuf:"bytes,3,opt,name=token_in_denom,json=tokenInDenom,proto3" json:"token_in_denom,omitempty" yaml:"token_in_denom"`
+	TokenOutMinAmount cosmossdk_io_math.Int    `protobuf:"bytes,4,opt,name=token_out_min_amount,json=tokenOutMinAmount,proto3,customtype=cosmossdk.io/math.Int" json:"token_out_min_amount" yaml:"token_out_min_amount"`
 }
 
 func (m *MsgSplitRouteSwapExactAmountIn) Reset()         { *m = MsgSplitRouteSwapExactAmountIn{} }
@@ -193,7 +193,7 @@ func (m *MsgSplitRouteSwapExactAmountIn) GetTokenInDenom() string {
 }
 
 type MsgSplitRouteSwapExactAmountInResponse struct {
-	TokenOutAmount github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,1,opt,name=token_out_amount,json=tokenOutAmount,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"token_out_amount" yaml:"token_out_amount"`
+	TokenOutAmount cosmossdk_io_math.Int `protobuf:"bytes,1,opt,name=token_out_amount,json=tokenOutAmount,proto3,customtype=cosmossdk.io/math.Int" json:"token_out_amount" yaml:"token_out_amount"`
 }
 
 func (m *MsgSplitRouteSwapExactAmountInResponse) Reset() {
@@ -233,10 +233,10 @@ var xxx_messageInfo_MsgSplitRouteSwapExactAmountInResponse proto.InternalMessage
 
 // ===================== MsgSwapExactAmountOut
 type MsgSwapExactAmountOut struct {
-	Sender           string                                 `protobuf:"bytes,1,opt,name=sender,proto3" json:"sender,omitempty" yaml:"sender"`
-	Routes           []SwapAmountOutRoute                   `protobuf:"bytes,2,rep,name=routes,proto3" json:"routes"`
-	TokenInMaxAmount github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,3,opt,name=token_in_max_amount,json=tokenInMaxAmount,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"token_in_max_amount" yaml:"token_in_max_amount"`
-	TokenOut         types.Coin                             `protobuf:"bytes,4,opt,name=token_out,json=tokenOut,proto3" json:"token_out" yaml:"token_out"`
+	Sender           string                `protobuf:"bytes,1,opt,name=sender,proto3" json:"sender,omitempty" yaml:"sender"`
+	Routes           []SwapAmountOutRoute  `protobuf:"bytes,2,rep,name=routes,proto3" json:"routes"`
+	TokenInMaxAmount cosmossdk_io_math.Int `protobuf:"bytes,3,opt,name=token_in_max_amount,json=tokenInMaxAmount,proto3,customtype=cosmossdk.io/math.Int" json:"token_in_max_amount" yaml:"token_in_max_amount"`
+	TokenOut         types.Coin            `protobuf:"bytes,4,opt,name=token_out,json=tokenOut,proto3" json:"token_out" yaml:"token_out"`
 }
 
 func (m *MsgSwapExactAmountOut) Reset()         { *m = MsgSwapExactAmountOut{} }
@@ -294,7 +294,7 @@ func (m *MsgSwapExactAmountOut) GetTokenOut() types.Coin {
 }
 
 type MsgSwapExactAmountOutResponse struct {
-	TokenInAmount github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,1,opt,name=token_in_amount,json=tokenInAmount,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"token_in_amount" yaml:"token_in_amount"`
+	TokenInAmount cosmossdk_io_math.Int `protobuf:"bytes,1,opt,name=token_in_amount,json=tokenInAmount,proto3,customtype=cosmossdk.io/math.Int" json:"token_in_amount" yaml:"token_in_amount"`
 }
 
 func (m *MsgSwapExactAmountOutResponse) Reset()         { *m = MsgSwapExactAmountOutResponse{} }
@@ -332,10 +332,10 @@ var xxx_messageInfo_MsgSwapExactAmountOutResponse proto.InternalMessageInfo
 
 // ===================== MsgSplitRouteSwapExactAmountOut
 type MsgSplitRouteSwapExactAmountOut struct {
-	Sender           string                                 `protobuf:"bytes,1,opt,name=sender,proto3" json:"sender,omitempty" yaml:"sender"`
-	Routes           []SwapAmountOutSplitRoute              `protobuf:"bytes,2,rep,name=routes,proto3" json:"routes"`
-	TokenOutDenom    string                                 `protobuf:"bytes,3,opt,name=token_out_denom,json=tokenOutDenom,proto3" json:"token_out_denom,omitempty" yaml:"token_out_denom"`
-	TokenInMaxAmount github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,4,opt,name=token_in_max_amount,json=tokenInMaxAmount,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"token_in_max_amount" yaml:"token_in_max_amount"`
+	Sender           string                    `protobuf:"bytes,1,opt,name=sender,proto3" json:"sender,omitempty" yaml:"sender"`
+	Routes           []SwapAmountOutSplitRoute `protobuf:"bytes,2,rep,name=routes,proto3" json:"routes"`
+	TokenOutDenom    string                    `protobuf:"bytes,3,opt,name=token_out_denom,json=tokenOutDenom,proto3" json:"token_out_denom,omitempty" yaml:"token_out_denom"`
+	TokenInMaxAmount cosmossdk_io_math.Int     `protobuf:"bytes,4,opt,name=token_in_max_amount,json=tokenInMaxAmount,proto3,customtype=cosmossdk.io/math.Int" json:"token_in_max_amount" yaml:"token_in_max_amount"`
 }
 
 func (m *MsgSplitRouteSwapExactAmountOut) Reset()         { *m = MsgSplitRouteSwapExactAmountOut{} }
@@ -393,7 +393,7 @@ func (m *MsgSplitRouteSwapExactAmountOut) GetTokenOutDenom() string {
 }
 
 type MsgSplitRouteSwapExactAmountOutResponse struct {
-	TokenInAmount github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,1,opt,name=token_in_amount,json=tokenInAmount,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"token_in_amount" yaml:"token_in_amount"`
+	TokenInAmount cosmossdk_io_math.Int `protobuf:"bytes,1,opt,name=token_in_amount,json=tokenInAmount,proto3,customtype=cosmossdk.io/math.Int" json:"token_in_amount" yaml:"token_in_amount"`
 }
 
 func (m *MsgSplitRouteSwapExactAmountOutResponse) Reset() {
@@ -531,9 +531,9 @@ func (m *MsgSetDenomPairTakerFeeResponse) GetSuccess() bool {
 type DenomPairTakerFee struct {
 	// denom0 and denom1 get automatically lexigographically sorted
 	// when being stored, so the order of input here does not matter.
-	Denom0   string                                 `protobuf:"bytes,1,opt,name=denom0,proto3" json:"denom0,omitempty" yaml:"denom0"`
-	Denom1   string                                 `protobuf:"bytes,2,opt,name=denom1,proto3" json:"denom1,omitempty" yaml:"denom1"`
-	TakerFee github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,3,opt,name=taker_fee,json=takerFee,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"taker_fee" yaml:"taker_fee"`
+	Denom0   string                      `protobuf:"bytes,1,opt,name=denom0,proto3" json:"denom0,omitempty" yaml:"denom0"`
+	Denom1   string                      `protobuf:"bytes,2,opt,name=denom1,proto3" json:"denom1,omitempty" yaml:"denom1"`
+	TakerFee cosmossdk_io_math.LegacyDec `protobuf:"bytes,3,opt,name=taker_fee,json=takerFee,proto3,customtype=cosmossdk.io/math.LegacyDec" json:"taker_fee" yaml:"taker_fee"`
 }
 
 func (m *DenomPairTakerFee) Reset()         { *m = DenomPairTakerFee{} }
@@ -602,69 +602,69 @@ func init() {
 }
 
 var fileDescriptor_acd130b4825d67dc = []byte{
-	// 990 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x97, 0x5d, 0x6f, 0xdb, 0x54,
-	0x18, 0xc7, 0x7b, 0x96, 0xd2, 0xb5, 0x67, 0x6c, 0x6b, 0x4c, 0x46, 0xb3, 0x74, 0x24, 0x95, 0x37,
-	0x8d, 0x14, 0x61, 0x9b, 0x74, 0x93, 0xd0, 0xb2, 0x49, 0x88, 0xac, 0x20, 0x2a, 0x2d, 0xca, 0x66,
-	0xb8, 0xe2, 0xc6, 0x72, 0xd2, 0x43, 0xb0, 0x5a, 0x9f, 0x63, 0xe5, 0x1c, 0x6f, 0x99, 0x90, 0x90,
-	0x90, 0x76, 0xc3, 0x04, 0xd2, 0x10, 0x97, 0x08, 0x21, 0xf1, 0x09, 0xf8, 0x18, 0x13, 0x57, 0xbb,
-	0x44, 0x5c, 0x44, 0xa8, 0x45, 0xe2, 0xbe, 0x1f, 0x00, 0xa1, 0xf3, 0x62, 0x27, 0x75, 0x5d, 0x27,
-	0x6e, 0x25, 0x7a, 0xd3, 0xc6, 0xce, 0xf3, 0xfa, 0x7f, 0x7e, 0xe7, 0xd1, 0x09, 0xbc, 0x41, 0xa8,
-	0x4f, 0xa8, 0x47, 0xad, 0x80, 0x90, 0x5d, 0xdf, 0xc5, 0x6e, 0x1f, 0x0d, 0xac, 0xc7, 0x8d, 0x2e,
-	0x62, 0x6e, 0xc3, 0x62, 0x43, 0x33, 0x18, 0x10, 0x46, 0xb4, 0x55, 0x65, 0x65, 0x4e, 0x58, 0x99,
-	0xca, 0xaa, 0x52, 0xea, 0x93, 0x3e, 0x11, 0x76, 0x16, 0xff, 0x24, 0x5d, 0x2a, 0x45, 0xd7, 0xf7,
-	0x30, 0xb1, 0xc4, 0x5f, 0xf5, 0xaa, 0xda, 0x13, 0x61, 0xac, 0xae, 0x4b, 0x51, 0x9c, 0xa3, 0x47,
-	0x3c, 0xac, 0xbe, 0x7f, 0x37, 0xab, 0x16, 0xfa, 0xc4, 0x0d, 0x9c, 0x01, 0x09, 0x19, 0x92, 0xd6,
-	0xfa, 0xf7, 0x05, 0x58, 0x6a, 0xd3, 0xfe, 0xa7, 0x4f, 0xdc, 0xe0, 0xa3, 0xa1, 0xdb, 0x63, 0x1f,
-	0xfa, 0x24, 0xc4, 0x6c, 0x0b, 0x6b, 0xeb, 0x70, 0x81, 0x22, 0xbc, 0x8d, 0x06, 0x65, 0xb0, 0x06,
-	0xea, 0x4b, 0xad, 0xe2, 0xc1, 0xa8, 0x76, 0xf1, 0xa9, 0xeb, 0xef, 0x36, 0x75, 0xf9, 0x5e, 0xb7,
-	0x95, 0x81, 0xf6, 0x00, 0x2e, 0x88, 0x90, 0xb4, 0x7c, 0x6e, 0xad, 0x50, 0xbf, 0xb0, 0x61, 0x9a,
-	0x19, 0x8d, 0x9a, 0x3c, 0x55, 0x94, 0xc5, 0xe6, 0x6e, 0xad, 0xf9, 0x97, 0xa3, 0xda, 0x9c, 0xad,
-	0x62, 0x68, 0x6d, 0xb8, 0xc8, 0xc8, 0x0e, 0xc2, 0x8e, 0x87, 0xcb, 0x85, 0x35, 0x50, 0xbf, 0xb0,
-	0x71, 0xd5, 0x94, 0x2d, 0x9b, 0xbc, 0xe5, 0x38, 0xce, 0x7d, 0xe2, 0xe1, 0xd6, 0x0a, 0x77, 0x3d,
-	0x18, 0xd5, 0x2e, 0xcb, 0xca, 0x22, 0x47, 0xdd, 0x3e, 0x2f, 0x3e, 0x6e, 0x61, 0xed, 0x6b, 0x58,
-	0x92, 0x6f, 0x49, 0xc8, 0x1c, 0xdf, 0xc3, 0x8e, 0x2b, 0x72, 0x97, 0xe7, 0x45, 0x57, 0x6d, 0xee,
-	0xff, 0xe7, 0xa8, 0x76, 0xb3, 0xef, 0xb1, 0x2f, 0xc3, 0xae, 0xd9, 0x23, 0xbe, 0xa5, 0xf4, 0x95,
-	0xff, 0x0c, 0xba, 0xbd, 0x63, 0xb1, 0xa7, 0x01, 0xa2, 0xe6, 0x16, 0x66, 0x07, 0xa3, 0xda, 0xea,
-	0x64, 0xa6, 0xc3, 0x31, 0x75, 0xbb, 0x28, 0x5e, 0x77, 0x42, 0xd6, 0xf6, 0xb0, 0xec, 0xb1, 0x69,
-	0x3c, 0xff, 0xe7, 0xb7, 0x77, 0xea, 0x69, 0x33, 0xe1, 0xb3, 0x30, 0x10, 0x17, 0xdd, 0x90, 0xfe,
-	0x86, 0x87, 0xf5, 0x1f, 0x01, 0xbc, 0x96, 0x36, 0x0f, 0x1b, 0xd1, 0x80, 0x60, 0x8a, 0x34, 0x0a,
-	0x97, 0xc7, 0xb9, 0x55, 0x2f, 0x72, 0x42, 0x5b, 0xb9, 0x7b, 0x59, 0x49, 0xf6, 0x12, 0xf5, 0x71,
-	0x29, 0xea, 0x43, 0xa6, 0xd7, 0xbf, 0x2d, 0xc0, 0x2a, 0xaf, 0x2a, 0xd8, 0xf5, 0x98, 0x98, 0xd9,
-	0xa9, 0x78, 0x79, 0x94, 0xe0, 0xe5, 0xd6, 0xcc, 0xbc, 0x8c, 0x0b, 0x48, 0x40, 0xf3, 0x01, 0xbc,
-	0x14, 0xcd, 0xde, 0xd9, 0x46, 0x98, 0xf8, 0x02, 0x9d, 0xa5, 0xd6, 0xd5, 0x83, 0x51, 0xed, 0xca,
-	0x61, 0x36, 0xe4, 0xf7, 0xba, 0xfd, 0xba, 0x22, 0x64, 0x93, 0x3f, 0x9e, 0x39, 0x26, 0x75, 0x8e,
-	0xc9, 0xf5, 0x54, 0x4c, 0x78, 0xcf, 0x13, 0x84, 0xfc, 0x0c, 0xe0, 0xcd, 0xec, 0x59, 0x9c, 0x2d,
-	0x2b, 0x2f, 0x0a, 0xf0, 0xca, 0x51, 0x82, 0x3b, 0x21, 0xcb, 0x83, 0x48, 0x3b, 0x81, 0x88, 0x35,
-	0x23, 0x22, 0x9d, 0x30, 0x15, 0x8f, 0xaf, 0xe0, 0x1b, 0xf1, 0xf8, 0x7d, 0x77, 0x18, 0x69, 0x21,
-	0x19, 0x79, 0x90, 0x5b, 0x8b, 0x4a, 0x82, 0xa8, 0x71, 0x48, 0xdd, 0x5e, 0x56, 0x58, 0xb5, 0xdd,
-	0xa1, 0x2c, 0x49, 0x7b, 0x08, 0x97, 0x62, 0xd5, 0x04, 0x4f, 0x99, 0x1b, 0xad, 0xac, 0x36, 0xda,
-	0x72, 0x42, 0x6f, 0xdd, 0x5e, 0x8c, 0x84, 0x6e, 0x9a, 0x1c, 0x96, 0xf5, 0xd9, 0x76, 0x0a, 0x77,
-	0xfd, 0x01, 0xc0, 0xb7, 0x52, 0x47, 0x12, 0x93, 0x12, 0xc0, 0xcb, 0x71, 0x37, 0x87, 0x40, 0xf9,
-	0x24, 0xb7, 0x38, 0x6f, 0x26, 0xc4, 0x89, 0x84, 0xb9, 0xa8, 0x84, 0x51, 0x98, 0x7c, 0x57, 0x80,
-	0xb5, 0x2c, 0x8c, 0x73, 0x02, 0x63, 0x27, 0x80, 0xb9, 0x3d, 0x3b, 0x30, 0xc7, 0x2e, 0x95, 0x56,
-	0x24, 0x0a, 0xc7, 0x7d, 0x72, 0xab, 0x54, 0x92, 0x6d, 0xc6, 0x06, 0x51, 0x9b, 0x9d, 0x90, 0xc9,
-	0xbd, 0x72, 0x0c, 0x79, 0xf3, 0xff, 0x07, 0x79, 0xcd, 0x75, 0xce, 0xc9, 0x8d, 0xa9, 0x4b, 0x85,
-	0x23, 0xf2, 0x13, 0x80, 0x6f, 0x4f, 0x19, 0xc7, 0x19, 0xc2, 0xf2, 0x2f, 0x80, 0x2b, 0xbc, 0x3a,
-	0x24, 0x55, 0x7d, 0xe8, 0x7a, 0x83, 0xcf, 0xdc, 0x1d, 0x34, 0xf8, 0x18, 0xa1, 0x3c, 0x90, 0x3c,
-	0x03, 0xb0, 0x24, 0xc6, 0xe4, 0x04, 0xae, 0x37, 0x70, 0x18, 0x0f, 0xe1, 0x7c, 0x81, 0xd0, 0x4c,
-	0xf7, 0x96, 0x23, 0x99, 0x5b, 0xd7, 0xd5, 0x51, 0x55, 0xbb, 0x3e, 0x2d, 0xb2, 0x6e, 0x17, 0xb7,
-	0x93, 0x7e, 0xcd, 0x06, 0x1f, 0x4b, 0xea, 0x35, 0x8d, 0x22, 0x66, 0x08, 0x7b, 0x83, 0x87, 0x31,
-	0x44, 0x18, 0x83, 0x87, 0xb9, 0x2b, 0x0f, 0x4b, 0x4a, 0xff, 0xf1, 0x54, 0xca, 0xf0, 0x3c, 0x0d,
-	0x7b, 0x3d, 0x44, 0xa9, 0x10, 0x62, 0xd1, 0x8e, 0x1e, 0xf5, 0xdf, 0x01, 0x2c, 0xa6, 0xea, 0x26,
-	0x52, 0xbd, 0x77, 0x54, 0x37, 0xf9, 0x5e, 0xb7, 0x95, 0x41, 0x6c, 0xda, 0x28, 0x9f, 0x4b, 0x35,
-	0x6d, 0x44, 0xa6, 0x0d, 0xcd, 0x81, 0x4b, 0x63, 0x59, 0xe5, 0x69, 0x69, 0xe5, 0xa0, 0x62, 0x13,
-	0xf5, 0x26, 0x76, 0xdf, 0x58, 0xc5, 0x45, 0xa6, 0xca, 0xde, 0xf8, 0xfb, 0x35, 0x58, 0x68, 0xd3,
-	0xbe, 0xf6, 0x0d, 0x80, 0xc5, 0xa3, 0xb7, 0x90, 0x46, 0xe6, 0x08, 0xd3, 0x2e, 0x56, 0x95, 0x3b,
-	0xb9, 0x5d, 0x62, 0xc9, 0x9f, 0x01, 0xa8, 0xa5, 0xac, 0xad, 0x8d, 0x9c, 0x11, 0x3b, 0x21, 0xab,
-	0x34, 0xf3, 0xfb, 0xc4, 0x65, 0xfc, 0x02, 0xe0, 0x6a, 0xd6, 0xd5, 0xec, 0xee, 0xd4, 0xd8, 0xc7,
-	0x3b, 0x57, 0xee, 0x9f, 0xc2, 0x39, 0xae, 0xf0, 0x57, 0x00, 0xaf, 0x65, 0x6e, 0xfa, 0x7b, 0x27,
-	0xce, 0xc2, 0xc5, 0xdb, 0x3c, 0x8d, 0x77, 0x5c, 0xe4, 0x73, 0x00, 0x4b, 0xa9, 0x1b, 0xe6, 0xf6,
-	0xd4, 0xf0, 0x29, 0x5e, 0x95, 0x7b, 0x27, 0xf1, 0x8a, 0x8a, 0x69, 0x3d, 0x7a, 0xb9, 0x57, 0x05,
-	0xaf, 0xf6, 0xaa, 0xe0, 0xaf, 0xbd, 0x2a, 0x78, 0xb1, 0x5f, 0x9d, 0x7b, 0xb5, 0x5f, 0x9d, 0xfb,
-	0x63, 0xbf, 0x3a, 0xf7, 0xf9, 0xfb, 0x13, 0xc7, 0x48, 0x65, 0x30, 0x76, 0xdd, 0x2e, 0x8d, 0x1e,
-	0xac, 0xc7, 0x8d, 0x3b, 0xd6, 0xf0, 0xd0, 0x5a, 0x11, 0x67, 0xab, 0xbb, 0x20, 0x7e, 0xf1, 0xdd,
-	0xfa, 0x2f, 0x00, 0x00, 0xff, 0xff, 0x8b, 0xab, 0x1c, 0xe7, 0xad, 0x0e, 0x00, 0x00,
+	// 991 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x97, 0x4d, 0x6f, 0x1b, 0x45,
+	0x18, 0xc7, 0x33, 0x4e, 0x48, 0x93, 0x29, 0x6d, 0xe3, 0xc5, 0x21, 0xae, 0x53, 0xec, 0x68, 0x5b,
+	0x81, 0x83, 0xd8, 0x5d, 0x9c, 0x56, 0x2a, 0x75, 0x22, 0x21, 0xdc, 0x80, 0x14, 0xa9, 0x96, 0xdb,
+	0xa5, 0x27, 0x2e, 0xab, 0xb1, 0x33, 0xb8, 0x4b, 0xb2, 0x3b, 0x96, 0x67, 0xb6, 0x75, 0x6e, 0x80,
+	0x7a, 0x8a, 0x38, 0xf0, 0x0d, 0x90, 0xf8, 0x04, 0x7c, 0x03, 0xae, 0x3d, 0xf6, 0x88, 0x38, 0x58,
+	0x28, 0x41, 0xe2, 0xee, 0x13, 0x12, 0x08, 0xd0, 0xbc, 0xec, 0xda, 0x5e, 0x6f, 0xfc, 0x92, 0x88,
+	0x5c, 0x22, 0xef, 0xec, 0xf3, 0xfa, 0x7f, 0x7e, 0xfb, 0x68, 0x02, 0xef, 0x10, 0xea, 0x11, 0xea,
+	0x52, 0xab, 0x45, 0xc8, 0xa1, 0x87, 0x7c, 0xd4, 0xc4, 0x6d, 0xeb, 0x79, 0xa9, 0x8e, 0x19, 0x2a,
+	0x59, 0xac, 0x63, 0xb6, 0xda, 0x84, 0x11, 0x6d, 0x5d, 0x59, 0x99, 0x03, 0x56, 0xa6, 0xb2, 0xca,
+	0x65, 0x9a, 0xa4, 0x49, 0x84, 0x9d, 0xc5, 0x7f, 0x49, 0x97, 0x5c, 0x1a, 0x79, 0xae, 0x4f, 0x2c,
+	0xf1, 0x57, 0x1d, 0xe5, 0x1b, 0x22, 0x8c, 0x55, 0x47, 0x14, 0x47, 0x39, 0x1a, 0xc4, 0xf5, 0xd5,
+	0xfb, 0x0f, 0xc6, 0xd5, 0x42, 0x5f, 0xa0, 0x96, 0xd3, 0x26, 0x01, 0xc3, 0xd2, 0x5a, 0xff, 0x3b,
+	0x05, 0x33, 0x55, 0xda, 0xfc, 0xfc, 0x05, 0x6a, 0x7d, 0xda, 0x41, 0x0d, 0xf6, 0x89, 0x47, 0x02,
+	0x9f, 0xed, 0xf9, 0xda, 0x26, 0x5c, 0xa4, 0xd8, 0xdf, 0xc7, 0xed, 0x2c, 0xd8, 0x00, 0xc5, 0xe5,
+	0x4a, 0xba, 0xd7, 0x2d, 0x5c, 0x3b, 0x42, 0xde, 0x61, 0x59, 0x97, 0xe7, 0xba, 0xad, 0x0c, 0xb4,
+	0x47, 0x70, 0x51, 0x84, 0xa4, 0xd9, 0xd4, 0xc6, 0x7c, 0xf1, 0xea, 0x96, 0x69, 0x8e, 0x69, 0xd4,
+	0xe4, 0xa9, 0xc2, 0x2c, 0x36, 0x77, 0xab, 0x2c, 0xbc, 0xea, 0x16, 0xe6, 0x6c, 0x15, 0x43, 0xab,
+	0xc2, 0x25, 0x46, 0x0e, 0xb0, 0xef, 0xb8, 0x7e, 0x76, 0x7e, 0x03, 0x14, 0xaf, 0x6e, 0xdd, 0x34,
+	0x65, 0xcb, 0x26, 0x6f, 0x39, 0x8a, 0xf3, 0x90, 0xb8, 0x7e, 0x65, 0x8d, 0xbb, 0xf6, 0xba, 0x85,
+	0x1b, 0xb2, 0xb2, 0xd0, 0x51, 0xb7, 0xaf, 0x88, 0x9f, 0x7b, 0xbe, 0xe6, 0xc1, 0x8c, 0x3c, 0x25,
+	0x01, 0x73, 0x3c, 0xd7, 0x77, 0x90, 0xc8, 0x9d, 0x5d, 0x10, 0x5d, 0xed, 0x70, 0xff, 0x5f, 0xbb,
+	0x85, 0x55, 0x99, 0x81, 0xee, 0x1f, 0x98, 0x2e, 0xb1, 0x3c, 0xc4, 0x9e, 0x99, 0x7b, 0x3e, 0xeb,
+	0x75, 0x0b, 0xeb, 0x83, 0x81, 0x87, 0x43, 0xe8, 0x76, 0x5a, 0x1c, 0xd7, 0x02, 0x56, 0x75, 0x7d,
+	0xd9, 0x52, 0xd9, 0x38, 0xfe, 0xe3, 0xa7, 0xf7, 0x8b, 0x49, 0x23, 0xe0, 0xd2, 0x1b, 0x98, 0x6b,
+	0x6c, 0x48, 0x7f, 0xc3, 0xf5, 0xf5, 0x6f, 0x01, 0xbc, 0x95, 0x24, 0xbf, 0x8d, 0x69, 0x8b, 0xf8,
+	0x14, 0x6b, 0x75, 0xb8, 0xd2, 0xcf, 0xad, 0x4a, 0x97, 0x03, 0xf9, 0x68, 0x52, 0xe9, 0x6b, 0xf1,
+	0xd2, 0xc3, 0xb2, 0xaf, 0x87, 0x65, 0xcb, 0x6c, 0xfa, 0x9f, 0x29, 0x98, 0xe7, 0x45, 0xb4, 0x0e,
+	0x5d, 0x26, 0x26, 0x72, 0x21, 0x1a, 0x9e, 0xc4, 0x68, 0xb8, 0x3b, 0x35, 0x0d, 0xfd, 0x02, 0x62,
+	0x48, 0x7c, 0x0c, 0xaf, 0x87, 0x93, 0x75, 0xf6, 0xb1, 0x4f, 0x3c, 0x01, 0xc6, 0x72, 0xe5, 0x66,
+	0xaf, 0x5b, 0x58, 0x1d, 0x9e, 0xbc, 0x7c, 0xaf, 0xdb, 0x6f, 0xaa, 0xf9, 0xef, 0xf2, 0xc7, 0xcb,
+	0x86, 0xa0, 0xc8, 0x21, 0xb8, 0x9d, 0x08, 0x01, 0x6f, 0x71, 0x60, 0xfe, 0xdf, 0x01, 0xf8, 0xee,
+	0x78, 0xe9, 0x2f, 0x95, 0x84, 0x7f, 0x53, 0x70, 0x75, 0x14, 0xc7, 0x5a, 0xc0, 0x66, 0x01, 0xa0,
+	0x1a, 0x03, 0xc0, 0x9a, 0x12, 0x80, 0x5a, 0x90, 0x38, 0xfc, 0xaf, 0xe0, 0x5b, 0xd1, 0x70, 0x3d,
+	0xd4, 0x09, 0x5b, 0x97, 0x04, 0x6c, 0x4f, 0x6a, 0x3d, 0x17, 0xc3, 0xa3, 0x1f, 0x41, 0xb7, 0x57,
+	0x14, 0x23, 0x55, 0xd4, 0x91, 0x15, 0x68, 0x8f, 0xe1, 0x72, 0x24, 0x92, 0x80, 0x63, 0xec, 0xf2,
+	0xc9, 0xaa, 0xe5, 0xb3, 0x12, 0x93, 0x57, 0xb7, 0x97, 0x42, 0x5d, 0xcb, 0x26, 0x47, 0x61, 0x73,
+	0xba, 0x7d, 0xc0, 0x5d, 0xbf, 0x06, 0xf0, 0x9d, 0xc4, 0x09, 0x44, 0x1c, 0x38, 0xf0, 0x46, 0xd4,
+	0xcd, 0x10, 0x06, 0xf7, 0x27, 0x69, 0xf1, 0x76, 0x4c, 0x8b, 0x50, 0x87, 0x6b, 0x4a, 0x07, 0x05,
+	0xc1, 0x5f, 0x29, 0x58, 0x18, 0xc7, 0xe4, 0x8c, 0x38, 0xd8, 0x31, 0x1c, 0xee, 0x4d, 0x8f, 0xc3,
+	0x99, 0x0b, 0xa1, 0x12, 0x6a, 0xc0, 0x61, 0x1e, 0xdc, 0x08, 0xb9, 0x78, 0x9b, 0x91, 0x41, 0xd8,
+	0x66, 0x2d, 0x60, 0x72, 0x27, 0x9c, 0xc1, 0xd5, 0xc2, 0xff, 0xc0, 0x55, 0x79, 0x93, 0x53, 0x70,
+	0x67, 0xe2, 0x42, 0xe0, 0x00, 0x1c, 0x03, 0xf8, 0xde, 0x04, 0xf5, 0x2f, 0x0f, 0x85, 0x7f, 0x00,
+	0x5c, 0xe3, 0xc5, 0x60, 0xa9, 0xd9, 0x63, 0xe4, 0xb6, 0x9f, 0xa2, 0x03, 0xdc, 0xfe, 0x0c, 0xe3,
+	0x59, 0x10, 0x78, 0x09, 0x60, 0x46, 0x0c, 0xc1, 0x69, 0x21, 0xb7, 0xed, 0x30, 0x1e, 0xc2, 0xf9,
+	0x12, 0xe3, 0xa9, 0xee, 0x0b, 0x23, 0x99, 0x2b, 0xb7, 0xd5, 0x77, 0xa7, 0xd6, 0x72, 0x52, 0x64,
+	0xdd, 0x4e, 0xef, 0xc7, 0xfd, 0xca, 0x25, 0x3e, 0x85, 0xc4, 0xeb, 0x11, 0xc5, 0xcc, 0x10, 0xf6,
+	0x06, 0x0f, 0x63, 0x88, 0x30, 0x06, 0x0f, 0xb3, 0x2d, 0x3f, 0x85, 0x84, 0xfe, 0xa3, 0x21, 0x64,
+	0xe1, 0x15, 0x1a, 0x34, 0x1a, 0x98, 0x52, 0x21, 0xc4, 0x92, 0x1d, 0x3e, 0xea, 0x3f, 0x03, 0x98,
+	0x4e, 0xd4, 0x4d, 0xa4, 0xfa, 0x70, 0x54, 0x37, 0x79, 0xae, 0xdb, 0xca, 0x20, 0x32, 0x2d, 0x65,
+	0x53, 0x89, 0xa6, 0xa5, 0xd0, 0xb4, 0xa4, 0x3d, 0x85, 0xcb, 0x7d, 0x59, 0xe7, 0x87, 0x20, 0x58,
+	0x1f, 0x85, 0xe0, 0x11, 0x6e, 0xa2, 0xc6, 0xd1, 0x2e, 0x6e, 0x0c, 0x6c, 0xaf, 0xbe, 0x74, 0x4b,
+	0x4c, 0xd5, 0xba, 0xf5, 0xfb, 0x1b, 0x70, 0xbe, 0x4a, 0x9b, 0xda, 0x37, 0x00, 0xa6, 0x47, 0x2f,
+	0x05, 0xa5, 0xb1, 0x73, 0x4b, 0xba, 0xd6, 0xe4, 0x1e, 0xcc, 0xec, 0x12, 0xe9, 0xfc, 0x12, 0x40,
+	0x2d, 0x61, 0x13, 0x6d, 0xcd, 0x18, 0xb1, 0x16, 0xb0, 0x5c, 0x79, 0x76, 0x9f, 0xa8, 0x8c, 0x1f,
+	0x00, 0x5c, 0x1f, 0x77, 0x53, 0xda, 0x9e, 0x18, 0xfb, 0x6c, 0xe7, 0xdc, 0xc3, 0x0b, 0x38, 0x47,
+	0x15, 0xfe, 0x08, 0xe0, 0xad, 0xb1, 0xcb, 0x7b, 0xe7, 0xdc, 0x59, 0xb8, 0x78, 0xbb, 0x17, 0xf1,
+	0x8e, 0x8a, 0x3c, 0x06, 0x30, 0x93, 0xb8, 0x56, 0xee, 0x4d, 0x0c, 0x9f, 0xe0, 0x95, 0xdb, 0x39,
+	0x8f, 0x57, 0x58, 0x4c, 0xe5, 0xc9, 0xab, 0x93, 0x3c, 0x78, 0x7d, 0x92, 0x07, 0xbf, 0x9d, 0xe4,
+	0xc1, 0xf7, 0xa7, 0xf9, 0xb9, 0xd7, 0xa7, 0xf9, 0xb9, 0x5f, 0x4e, 0xf3, 0x73, 0x5f, 0xdc, 0x6f,
+	0xba, 0xec, 0x59, 0x50, 0x37, 0x1b, 0xc4, 0xb3, 0x54, 0x06, 0xe3, 0x10, 0xd5, 0x69, 0xf8, 0x60,
+	0x3d, 0x2f, 0x3d, 0xb0, 0x3a, 0x43, 0xbb, 0x84, 0x1d, 0xb5, 0x30, 0xad, 0x2f, 0x8a, 0x7f, 0xaf,
+	0xee, 0xfe, 0x17, 0x00, 0x00, 0xff, 0xff, 0x40, 0x9e, 0x43, 0x97, 0x1a, 0x0e, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/x/protorev/types/protorev.pb.go b/x/protorev/types/protorev.pb.go
index 62cf571f0a9..141364d65d4 100644
--- a/x/protorev/types/protorev.pb.go
+++ b/x/protorev/types/protorev.pb.go
@@ -4,9 +4,9 @@
 package types
 
 import (
+	cosmossdk_io_math "cosmossdk.io/math"
 	fmt "fmt"
 	_ "github.com/cosmos/cosmos-proto"
-	github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types"
 	types "github.com/cosmos/cosmos-sdk/types"
 	_ "github.com/gogo/protobuf/gogoproto"
 	proto "github.com/gogo/protobuf/proto"
@@ -97,7 +97,7 @@ type Route struct {
 	Trades []Trade `protobuf:"bytes,1,rep,name=trades,proto3" json:"trades" yaml:"trades"`
 	// The step size that will be used to find the optimal swap amount in the
 	// binary search
-	StepSize github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,2,opt,name=step_size,json=stepSize,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"step_size" yaml:"step_size"`
+	StepSize cosmossdk_io_math.Int `protobuf:"bytes,2,opt,name=step_size,json=stepSize,proto3,customtype=cosmossdk.io/math.Int" json:"step_size" yaml:"step_size"`
 }
 
 func (m *Route) Reset()         { *m = Route{} }
@@ -211,7 +211,7 @@ type RouteStatistics struct {
 	Profits []types.Coin `protobuf:"bytes,1,rep,name=profits,proto3" json:"profits" yaml:"profits"`
 	// number_of_trades is the number of trades the module has executed using this
 	// route
-	NumberOfTrades github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,2,opt,name=number_of_trades,json=numberOfTrades,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"number_of_trades" yaml:"number_of_trades"`
+	NumberOfTrades cosmossdk_io_math.Int `protobuf:"bytes,2,opt,name=number_of_trades,json=numberOfTrades,proto3,customtype=cosmossdk.io/math.Int" json:"number_of_trades" yaml:"number_of_trades"`
 	// route is the route that was used (pool ids along the arbitrage route)
 	Route []uint64 `protobuf:"varint,3,rep,packed,name=route,proto3" json:"route,omitempty" yaml:"route"`
 }
@@ -677,7 +677,7 @@ type BaseDenom struct {
 	Denom string `protobuf:"bytes,1,opt,name=denom,proto3" json:"denom,omitempty" yaml:"denom"`
 	// The step size of the binary search that is used to find the optimal swap
 	// amount
-	StepSize github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,2,opt,name=step_size,json=stepSize,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"step_size" yaml:"step_size"`
+	StepSize cosmossdk_io_math.Int `protobuf:"bytes,2,opt,name=step_size,json=stepSize,proto3,customtype=cosmossdk.io/math.Int" json:"step_size" yaml:"step_size"`
 }
 
 func (m *BaseDenom) Reset()         { *m = BaseDenom{} }
@@ -741,66 +741,66 @@ func init() {
 
 var fileDescriptor_1e9f2391fd9fec01 = []byte{
 	// 949 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x56, 0xbf, 0x6f, 0xdb, 0x46,
-	0x14, 0x36, 0x2d, 0xd9, 0xb1, 0x4e, 0x8e, 0x24, 0x9f, 0xdd, 0x44, 0x56, 0x0a, 0xd1, 0xb8, 0x00,
-	0xa9, 0x5a, 0x20, 0x14, 0xec, 0x76, 0x69, 0x8a, 0x0c, 0xa1, 0x8a, 0xa2, 0x46, 0xd1, 0x38, 0x38,
-	0x0b, 0x08, 0xda, 0x85, 0x3d, 0x52, 0x67, 0x87, 0xb0, 0xc8, 0x13, 0x78, 0x27, 0xff, 0xc8, 0xd0,
-	0x7f, 0xa0, 0x4b, 0x87, 0x76, 0xeb, 0xd0, 0xad, 0xff, 0x45, 0xe7, 0x8c, 0x19, 0x83, 0x0e, 0x44,
-	0x61, 0x2f, 0x9d, 0xb9, 0x76, 0x29, 0x78, 0x3f, 0x28, 0x59, 0xb1, 0x8a, 0x6a, 0x68, 0x26, 0xdf,
-	0x7d, 0xef, 0x7b, 0xdf, 0xbb, 0xf7, 0xbd, 0xe3, 0x59, 0xe0, 0x03, 0xc6, 0x23, 0xc6, 0x43, 0xde,
-	0x1d, 0x25, 0x4c, 0xb0, 0x84, 0x9e, 0x76, 0x4f, 0x77, 0x7d, 0x2a, 0xc8, 0x6e, 0x01, 0x38, 0x72,
-	0x01, 0x9b, 0x9a, 0xe8, 0x14, 0xb8, 0x26, 0xb6, 0xb6, 0x03, 0x19, 0xf2, 0x64, 0xa0, 0xab, 0x36,
-	0x8a, 0xd5, 0xda, 0x3a, 0x66, 0xc7, 0x4c, 0xe1, 0xf9, 0x4a, 0xa3, 0x6d, 0xc5, 0xe9, 0xfa, 0x84,
-	0xd3, 0xa2, 0x5c, 0xc0, 0xc2, 0x58, 0xc5, 0xd1, 0x1b, 0x0b, 0xc0, 0x3e, 0x3b, 0xa1, 0xf1, 0x33,
-	0x12, 0x26, 0x4f, 0x12, 0x1f, 0xb3, 0xb1, 0xa0, 0x1c, 0x7e, 0x03, 0x00, 0x49, 0x7c, 0x2f, 0x91,
-	0xbb, 0xa6, 0xb5, 0x53, 0xea, 0x54, 0xf7, 0x6c, 0x67, 0xde, 0xb1, 0x1c, 0x99, 0xe5, 0x6e, 0xbf,
-	0x4a, 0xed, 0xa5, 0x2c, 0xb5, 0x37, 0x2e, 0x48, 0x34, 0x7c, 0x84, 0x26, 0x02, 0x08, 0x57, 0x48,
-	0x21, 0xed, 0x80, 0x35, 0x91, 0x17, 0xf4, 0xc2, 0xb8, 0xb9, 0xbc, 0x63, 0x75, 0x2a, 0xee, 0x66,
-	0x96, 0xda, 0x75, 0x95, 0x63, 0x22, 0x08, 0xdf, 0x92, 0xcb, 0xfd, 0x18, 0xee, 0x82, 0x8a, 0x42,
-	0xd9, 0x58, 0x34, 0x4b, 0x32, 0x61, 0x2b, 0x4b, 0xed, 0xc6, 0x74, 0x02, 0x1b, 0x0b, 0x84, 0x95,
-	0xec, 0xc1, 0x58, 0x3c, 0x2a, 0xff, 0xf5, 0xab, 0x6d, 0xa1, 0xdf, 0x2d, 0xb0, 0x22, 0x6b, 0xc2,
-	0xa7, 0x60, 0x55, 0x24, 0x64, 0xf0, 0x5f, 0x3a, 0xe9, 0xe7, 0x3c, 0xf7, 0x3d, 0xdd, 0xc9, 0x6d,
-	0x5d, 0x44, 0x26, 0x23, 0xac, 0x55, 0xa0, 0x07, 0x2a, 0x5c, 0xd0, 0x91, 0xc7, 0xc3, 0x97, 0x54,
-	0xf7, 0xe0, 0xe6, 0x19, 0x7f, 0xa4, 0xf6, 0x83, 0xe3, 0x50, 0xbc, 0x18, 0xfb, 0x4e, 0xc0, 0x22,
-	0x3d, 0x1e, 0xfd, 0xe7, 0x21, 0x1f, 0x9c, 0x74, 0xc5, 0xc5, 0x88, 0x72, 0x67, 0x3f, 0x16, 0x93,
-	0x06, 0x0a, 0x21, 0x84, 0xd7, 0xf2, 0xf5, 0x61, 0xf8, 0x92, 0xea, 0x06, 0x7e, 0xb6, 0xc0, 0x8a,
-	0x3c, 0x0f, 0xbc, 0x0f, 0xca, 0x23, 0xc6, 0x86, 0x4d, 0x6b, 0xc7, 0xea, 0x94, 0xdd, 0x7a, 0x96,
-	0xda, 0x55, 0x95, 0x9d, 0xa3, 0x08, 0xcb, 0xe0, 0xbb, 0x33, 0xf6, 0x6f, 0x0b, 0xd4, 0xa5, 0xb1,
-	0x87, 0x82, 0x88, 0x90, 0x8b, 0x30, 0xe0, 0xf0, 0x2b, 0x70, 0x6b, 0x94, 0xb0, 0xa3, 0x50, 0x18,
-	0x8f, 0xb7, 0x1d, 0x7d, 0x3b, 0xf3, 0x9b, 0x57, 0xd8, 0xdb, 0x63, 0x61, 0xec, 0xde, 0xd1, 0xee,
-	0xd6, 0x74, 0x0f, 0x2a, 0x0f, 0x61, 0xa3, 0x00, 0x39, 0x68, 0xc4, 0xe3, 0xc8, 0xa7, 0x89, 0xc7,
-	0x8e, 0x3c, 0x3d, 0x39, 0xd5, 0xd1, 0xfe, 0xc2, 0x36, 0xdf, 0x55, 0x45, 0x66, 0xf5, 0x10, 0xae,
-	0x29, 0xe8, 0xe0, 0xa8, 0xaf, 0x86, 0xfa, 0x00, 0xac, 0xc8, 0xdb, 0xda, 0x2c, 0xed, 0x94, 0x3a,
-	0x65, 0xb7, 0x91, 0xa5, 0xf6, 0xba, 0xca, 0x95, 0x30, 0xc2, 0x2a, 0x8c, 0x7e, 0x5b, 0x06, 0xd5,
-	0x67, 0x8c, 0x0d, 0x9f, 0xd3, 0xf0, 0xf8, 0x85, 0xe0, 0xf0, 0x31, 0xb8, 0xcd, 0x05, 0xf1, 0x87,
-	0xd4, 0x3b, 0x93, 0x88, 0x1e, 0x52, 0x33, 0x4b, 0xed, 0x2d, 0x33, 0xe2, 0xa9, 0x30, 0xc2, 0xeb,
-	0x6a, 0xaf, 0xf2, 0x61, 0x0f, 0xd4, 0x7d, 0x32, 0x24, 0x71, 0x40, 0x13, 0x23, 0xb0, 0x2c, 0x05,
-	0x5a, 0x59, 0x6a, 0xdf, 0x51, 0x02, 0x33, 0x04, 0x84, 0x6b, 0x06, 0xd1, 0x22, 0x07, 0x60, 0x33,
-	0x60, 0x71, 0x40, 0x63, 0x91, 0x10, 0x41, 0x07, 0x46, 0xa8, 0x24, 0x85, 0xda, 0x59, 0x6a, 0xb7,
-	0x94, 0xd0, 0x0d, 0x24, 0x84, 0xe1, 0x34, 0x3a, 0x39, 0x55, 0xee, 0xe7, 0x19, 0xe1, 0x91, 0x11,
-	0x2b, 0xcf, 0x9e, 0x6a, 0x86, 0x80, 0x70, 0xcd, 0x20, 0x4a, 0x04, 0xfd, 0x52, 0x02, 0xb5, 0xfd,
-	0xf8, 0x88, 0xb9, 0x17, 0xb9, 0x5f, 0xfd, 0x8b, 0x11, 0x85, 0xcf, 0xc1, 0xaa, 0xea, 0x5e, 0xba,
-	0x54, 0xdd, 0xeb, 0xcc, 0xff, 0x12, 0x0f, 0x25, 0x2f, 0xcf, 0x94, 0x1a, 0x33, 0x9f, 0xa4, 0x52,
-	0x41, 0x58, 0xcb, 0x41, 0x0f, 0xac, 0x19, 0x4f, 0xa4, 0x7f, 0xd5, 0xbd, 0x8f, 0xe6, 0x4b, 0xbb,
-	0x9a, 0x59, 0x88, 0xdf, 0xd5, 0xe2, 0xf5, 0xeb, 0x7e, 0x23, 0x5c, 0x88, 0x42, 0x06, 0xd6, 0xa7,
-	0x7d, 0x92, 0xde, 0x56, 0xf7, 0x9c, 0xf9, 0x45, 0x7a, 0x53, 0xec, 0xa2, 0xd0, 0x3d, 0x5d, 0x68,
-	0xf3, 0xed, 0x79, 0x20, 0x7c, 0xad, 0x40, 0xde, 0x91, 0xf1, 0x53, 0x7a, 0xff, 0xaf, 0x1d, 0xf5,
-	0x34, 0x73, 0x5e, 0x47, 0x46, 0x09, 0xe1, 0x42, 0x14, 0x7d, 0x06, 0x6a, 0xd7, 0x3d, 0x86, 0x1f,
-	0x82, 0xd5, 0x6b, 0x77, 0x78, 0x63, 0xe2, 0xb7, 0x99, 0xb1, 0x26, 0xa0, 0xc7, 0xa0, 0x31, 0xeb,
-	0xe2, 0x22, 0xe9, 0x3f, 0x58, 0x60, 0xeb, 0x26, 0x83, 0x16, 0xd0, 0x80, 0x5f, 0x82, 0x8d, 0x88,
-	0x9c, 0x7b, 0x22, 0x0c, 0x4e, 0xb8, 0x17, 0x24, 0x8c, 0x73, 0x3a, 0xd0, 0xdf, 0xce, 0xfb, 0x59,
-	0x6a, 0x37, 0x55, 0xd6, 0x5b, 0x14, 0x84, 0xeb, 0x11, 0x39, 0xef, 0xe7, 0x50, 0x4f, 0x23, 0x02,
-	0x34, 0x66, 0x0d, 0x84, 0xdf, 0x81, 0xaa, 0xaa, 0xe3, 0x45, 0x64, 0x64, 0x1e, 0xb5, 0xfb, 0xf3,
-	0x27, 0xa0, 0xee, 0xfc, 0xd7, 0x64, 0xe4, 0xb6, 0xb4, 0xf5, 0x70, 0xfa, 0xd8, 0x52, 0x05, 0x61,
-	0x70, 0x66, 0x68, 0x1c, 0x7d, 0x0f, 0x2a, 0x45, 0xd2, 0x22, 0x7d, 0x7f, 0x01, 0x1a, 0x01, 0xcb,
-	0x7d, 0x0b, 0x84, 0x47, 0x06, 0x83, 0x84, 0x72, 0xf3, 0x3a, 0xde, 0x9b, 0xbc, 0x77, 0xb3, 0x0c,
-	0x84, 0xeb, 0x06, 0x7a, 0xa2, 0x91, 0x9f, 0x2c, 0x50, 0x71, 0x09, 0xa7, 0x9f, 0xd3, 0x98, 0x45,
-	0xf9, 0xf3, 0x37, 0xc8, 0x17, 0xb2, 0x7e, 0x65, 0xfa, 0xf9, 0x93, 0x30, 0xc2, 0x2a, 0xfc, 0xbf,
-	0xff, 0xef, 0x73, 0x9f, 0xbe, 0xba, 0x6c, 0x5b, 0xaf, 0x2f, 0xdb, 0xd6, 0x9f, 0x97, 0x6d, 0xeb,
-	0xc7, 0xab, 0xf6, 0xd2, 0xeb, 0xab, 0xf6, 0xd2, 0x9b, 0xab, 0xf6, 0xd2, 0xb7, 0x9f, 0x4c, 0xe9,
-	0xeb, 0x39, 0x3c, 0x1c, 0x12, 0x9f, 0x9b, 0x4d, 0xf7, 0x74, 0xf7, 0xd3, 0xee, 0xf9, 0xe4, 0xd7,
-	0x95, 0xac, 0xe8, 0xaf, 0xca, 0xfd, 0xc7, 0xff, 0x04, 0x00, 0x00, 0xff, 0xff, 0x8b, 0xb5, 0xe3,
-	0x4f, 0x7e, 0x09, 0x00, 0x00,
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x56, 0x4f, 0x6f, 0x1b, 0x45,
+	0x1c, 0xcd, 0xd6, 0x4e, 0x1a, 0x8f, 0x53, 0xdb, 0x99, 0xa4, 0xad, 0xe3, 0x22, 0x6f, 0x34, 0x95,
+	0xc0, 0x20, 0xb1, 0x96, 0x03, 0x07, 0x28, 0xea, 0xa1, 0x6b, 0x84, 0x88, 0x10, 0x49, 0x35, 0xb1,
+	0x54, 0xc1, 0x65, 0x99, 0x5d, 0x4f, 0x92, 0x55, 0xbc, 0x3b, 0xd6, 0xce, 0x38, 0x7f, 0x7a, 0xe0,
+	0xc2, 0x91, 0x0b, 0x17, 0x6e, 0x1c, 0xb8, 0x71, 0xe2, 0x7b, 0xf4, 0xd8, 0x63, 0xc5, 0x61, 0x85,
+	0x92, 0x0b, 0xe2, 0xb8, 0x9f, 0x00, 0xed, 0xfc, 0x59, 0x3b, 0x6e, 0x0d, 0x44, 0x42, 0xdc, 0x66,
+	0xde, 0xbc, 0xf7, 0x7e, 0xf3, 0x7b, 0x33, 0x3b, 0x36, 0x78, 0x87, 0xf1, 0x88, 0xf1, 0x90, 0x77,
+	0xc7, 0x09, 0x13, 0x2c, 0xa1, 0xa7, 0xdd, 0xd3, 0x9e, 0x4f, 0x05, 0xe9, 0x15, 0x80, 0x23, 0x07,
+	0xb0, 0xa9, 0x89, 0x4e, 0x81, 0x6b, 0x62, 0x6b, 0x2b, 0x90, 0x4b, 0x9e, 0x5c, 0xe8, 0xaa, 0x89,
+	0x62, 0xb5, 0x36, 0x8f, 0xd8, 0x11, 0x53, 0x78, 0x3e, 0xd2, 0x68, 0x5b, 0x71, 0xba, 0x3e, 0xe1,
+	0xb4, 0x28, 0x17, 0xb0, 0x30, 0x56, 0xeb, 0xe8, 0x95, 0x05, 0xe0, 0x80, 0x9d, 0xd0, 0xf8, 0x29,
+	0x09, 0x93, 0x27, 0x89, 0x8f, 0xd9, 0x44, 0x50, 0x0e, 0xbf, 0x02, 0x80, 0x24, 0xbe, 0x97, 0xc8,
+	0x59, 0xd3, 0xda, 0x2e, 0x75, 0xaa, 0x3b, 0xb6, 0xb3, 0x68, 0x5b, 0x8e, 0x54, 0xb9, 0x5b, 0x2f,
+	0x52, 0x7b, 0x29, 0x4b, 0xed, 0xf5, 0x0b, 0x12, 0x8d, 0x1e, 0xa1, 0xa9, 0x01, 0xc2, 0x15, 0x52,
+	0x58, 0x3b, 0x60, 0x55, 0xe4, 0x05, 0xbd, 0x30, 0x6e, 0xde, 0xda, 0xb6, 0x3a, 0x15, 0x77, 0x23,
+	0x4b, 0xed, 0xba, 0xd2, 0x98, 0x15, 0x84, 0x6f, 0xcb, 0xe1, 0x6e, 0x0c, 0x7b, 0xa0, 0xa2, 0x50,
+	0x36, 0x11, 0xcd, 0x92, 0x14, 0x6c, 0x66, 0xa9, 0xdd, 0x98, 0x15, 0xb0, 0x89, 0x40, 0x58, 0xd9,
+	0xee, 0x4f, 0xc4, 0xa3, 0xf2, 0x1f, 0x3f, 0xdb, 0x16, 0xfa, 0xd5, 0x02, 0xcb, 0xb2, 0x26, 0xdc,
+	0x03, 0x2b, 0x22, 0x21, 0xc3, 0x7f, 0xd3, 0xc9, 0x20, 0xe7, 0xb9, 0x77, 0x75, 0x27, 0x77, 0x74,
+	0x11, 0x29, 0x46, 0x58, 0xbb, 0xc0, 0x3d, 0x50, 0xe1, 0x82, 0x8e, 0x3d, 0x1e, 0x3e, 0xa7, 0xba,
+	0x87, 0x5e, 0xae, 0xf8, 0x2d, 0xb5, 0xef, 0xaa, 0xbc, 0xf9, 0xf0, 0xc4, 0x09, 0x59, 0x37, 0x22,
+	0xe2, 0xd8, 0xd9, 0x8d, 0xc5, 0x74, 0xbf, 0x85, 0x0e, 0xe1, 0xd5, 0x7c, 0x7c, 0x10, 0x3e, 0xa7,
+	0x7a, 0xbf, 0x3f, 0x5a, 0x60, 0x59, 0x96, 0x87, 0x0f, 0x41, 0x79, 0xcc, 0xd8, 0xa8, 0x69, 0x6d,
+	0x5b, 0x9d, 0xb2, 0x5b, 0xcf, 0x52, 0xbb, 0xaa, 0xd4, 0x39, 0x8a, 0xb0, 0x5c, 0xfc, 0xff, 0x72,
+	0xfc, 0xd3, 0x02, 0x75, 0x99, 0xe3, 0x81, 0x20, 0x22, 0xe4, 0x22, 0x0c, 0x38, 0xfc, 0x02, 0xdc,
+	0x1e, 0x27, 0xec, 0x30, 0x14, 0x26, 0xd2, 0x2d, 0x47, 0x5f, 0xc6, 0xfc, 0xa2, 0x15, 0x69, 0xf6,
+	0x59, 0x18, 0xbb, 0xf7, 0x74, 0x98, 0x35, 0xdd, 0x83, 0xd2, 0x21, 0x6c, 0x1c, 0xa0, 0x0f, 0x1a,
+	0xf1, 0x24, 0xf2, 0x69, 0xe2, 0xb1, 0x43, 0x4f, 0x1f, 0x94, 0xea, 0xe8, 0xa3, 0x7f, 0x4a, 0xf5,
+	0xbe, 0xf2, 0x9c, 0x97, 0x23, 0x5c, 0x53, 0xd0, 0xfe, 0xe1, 0x40, 0x1d, 0xd9, 0xdb, 0x60, 0x59,
+	0xde, 0xc5, 0x66, 0x69, 0xbb, 0xd4, 0x29, 0xbb, 0x8d, 0x2c, 0xb5, 0xd7, 0x94, 0x56, 0xc2, 0x08,
+	0xab, 0x65, 0xf4, 0xcb, 0x2d, 0x50, 0x7d, 0xca, 0xd8, 0xe8, 0x19, 0x0d, 0x8f, 0x8e, 0x05, 0x87,
+	0x8f, 0xc1, 0x1d, 0x2e, 0x88, 0x3f, 0xa2, 0xde, 0x99, 0x44, 0xf4, 0x99, 0x34, 0xb3, 0xd4, 0xde,
+	0x34, 0x27, 0x3a, 0xb3, 0x8c, 0xf0, 0x9a, 0x9a, 0x2b, 0x3d, 0xec, 0x83, 0xba, 0x4f, 0x46, 0x24,
+	0x0e, 0x68, 0x62, 0x0c, 0x6e, 0x49, 0x83, 0x56, 0x96, 0xda, 0xf7, 0x94, 0xc1, 0x1c, 0x01, 0xe1,
+	0x9a, 0x41, 0xb4, 0xc9, 0x3e, 0xd8, 0x08, 0x58, 0x1c, 0xd0, 0x58, 0x24, 0x44, 0xd0, 0xa1, 0x31,
+	0x2a, 0x49, 0xa3, 0x76, 0x96, 0xda, 0x2d, 0x65, 0xf4, 0x06, 0x12, 0xc2, 0x70, 0x16, 0x9d, 0xee,
+	0x2a, 0x0f, 0xf4, 0x8c, 0xf0, 0xc8, 0x98, 0x95, 0xe7, 0x77, 0x35, 0x47, 0x40, 0xb8, 0x66, 0x10,
+	0x65, 0x82, 0x7e, 0x2a, 0x81, 0xda, 0x6e, 0x7c, 0xc8, 0xdc, 0x8b, 0x3c, 0xaf, 0xc1, 0xc5, 0x98,
+	0xc2, 0x67, 0x60, 0x45, 0x75, 0x2f, 0x53, 0xaa, 0xee, 0x74, 0x16, 0x7f, 0x67, 0x07, 0x92, 0x97,
+	0x2b, 0xa5, 0xc7, 0xdc, 0x07, 0xa7, 0x5c, 0x10, 0xd6, 0x76, 0xd0, 0x03, 0xab, 0x26, 0x13, 0x99,
+	0x5f, 0x75, 0xe7, 0xbd, 0xc5, 0xd6, 0xae, 0x66, 0x16, 0xe6, 0xf7, 0xb5, 0x79, 0xfd, 0x7a, 0xde,
+	0x08, 0x17, 0xa6, 0x90, 0x81, 0xb5, 0xd9, 0x9c, 0x64, 0xb6, 0xd5, 0x1d, 0x67, 0x71, 0x91, 0xfe,
+	0x0c, 0xbb, 0x28, 0xf4, 0x40, 0x17, 0xda, 0x78, 0xfd, 0x3c, 0x10, 0xbe, 0x56, 0x20, 0xef, 0xc8,
+	0xe4, 0x29, 0xb3, 0xff, 0xdb, 0x8e, 0xfa, 0x9a, 0xb9, 0xa8, 0x23, 0xe3, 0x84, 0x70, 0x61, 0x8a,
+	0x3e, 0x01, 0xb5, 0xeb, 0x19, 0xc3, 0x77, 0xc1, 0xca, 0xb5, 0x3b, 0xbc, 0x3e, 0xcd, 0xdb, 0x9c,
+	0xb1, 0x26, 0xa0, 0xc7, 0xa0, 0x31, 0x9f, 0xe2, 0x4d, 0xe4, 0xdf, 0x5b, 0x60, 0xf3, 0x4d, 0x01,
+	0xdd, 0xc0, 0x03, 0x7e, 0x0e, 0xd6, 0x23, 0x72, 0xee, 0x89, 0x30, 0x38, 0xe1, 0x5e, 0x90, 0x30,
+	0xce, 0xe9, 0x50, 0x7f, 0x3b, 0x6f, 0x65, 0xa9, 0xdd, 0x54, 0xaa, 0xd7, 0x28, 0x08, 0xd7, 0x23,
+	0x72, 0x3e, 0xc8, 0xa1, 0xbe, 0x46, 0x04, 0x68, 0xcc, 0x07, 0x08, 0xbf, 0x01, 0x55, 0x55, 0xc7,
+	0x8b, 0xc8, 0xd8, 0xbc, 0x61, 0x0f, 0x17, 0x9f, 0x80, 0xba, 0xf3, 0x5f, 0x92, 0xb1, 0xdb, 0xd2,
+	0xd1, 0xc3, 0xd9, 0x6d, 0x4b, 0x17, 0x84, 0xc1, 0x99, 0xa1, 0x71, 0xf4, 0x2d, 0xa8, 0x14, 0xa2,
+	0x9b, 0xf4, 0xfd, 0x19, 0x68, 0x04, 0x2c, 0xcf, 0x2d, 0x10, 0x1e, 0x19, 0x0e, 0x13, 0xca, 0xcd,
+	0x63, 0xf8, 0x60, 0xfa, 0xde, 0xcd, 0x33, 0x10, 0xae, 0x1b, 0xe8, 0x89, 0x46, 0xbe, 0xb3, 0x40,
+	0xc5, 0x25, 0x9c, 0x7e, 0x4a, 0x63, 0x16, 0xe5, 0xcf, 0xdf, 0x30, 0x1f, 0xc8, 0xfa, 0x95, 0xd9,
+	0xe7, 0x4f, 0xc2, 0x08, 0xab, 0xe5, 0xff, 0xfa, 0x97, 0xcd, 0xdd, 0x7b, 0x71, 0xd9, 0xb6, 0x5e,
+	0x5e, 0xb6, 0xad, 0xdf, 0x2f, 0xdb, 0xd6, 0x0f, 0x57, 0xed, 0xa5, 0x97, 0x57, 0xed, 0xa5, 0x57,
+	0x57, 0xed, 0xa5, 0xaf, 0x3f, 0x3c, 0x0a, 0xc5, 0xf1, 0xc4, 0x77, 0x02, 0x16, 0x75, 0x75, 0xec,
+	0xef, 0x8f, 0x88, 0xcf, 0xcd, 0xa4, 0x7b, 0xda, 0xfb, 0xb8, 0x7b, 0x3e, 0xfd, 0xab, 0x24, 0x2e,
+	0xc6, 0x94, 0xfb, 0x2b, 0x72, 0xfe, 0xc1, 0x5f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x95, 0x48, 0x2f,
+	0xfa, 0x4b, 0x09, 0x00, 0x00,
 }
 
 func (this *TokenPairArbRoutes) Equal(that interface{}) bool {
diff --git a/x/protorev/types/query.pb.go b/x/protorev/types/query.pb.go
index 8367a7b1710..d672d14d502 100644
--- a/x/protorev/types/query.pb.go
+++ b/x/protorev/types/query.pb.go
@@ -5,8 +5,8 @@ package types
 
 import (
 	context "context"
+	cosmossdk_io_math "cosmossdk.io/math"
 	fmt "fmt"
-	github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types"
 	types "github.com/cosmos/cosmos-sdk/types"
 	_ "github.com/cosmos/cosmos-sdk/types/query"
 	_ "github.com/gogo/protobuf/gogoproto"
@@ -157,7 +157,7 @@ var xxx_messageInfo_QueryGetProtoRevNumberOfTradesRequest proto.InternalMessageI
 // Query/GetProtoRevNumberOfTrades RPC method.
 type QueryGetProtoRevNumberOfTradesResponse struct {
 	// number_of_trades is the number of trades the module has executed
-	NumberOfTrades github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,1,opt,name=number_of_trades,json=numberOfTrades,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"number_of_trades" yaml:"number_of_trades"`
+	NumberOfTrades cosmossdk_io_math.Int `protobuf:"bytes,1,opt,name=number_of_trades,json=numberOfTrades,proto3,customtype=cosmossdk.io/math.Int" json:"number_of_trades" yaml:"number_of_trades"`
 }
 
 func (m *QueryGetProtoRevNumberOfTradesResponse) Reset() {
@@ -1427,103 +1427,103 @@ func init() {
 }
 
 var fileDescriptor_f5e7ac9973cce389 = []byte{
-	// 1533 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0xdb, 0x6f, 0x1b, 0xc5,
-	0x17, 0xce, 0xf6, 0x92, 0xfc, 0x3a, 0xbd, 0xfc, 0x9a, 0xa1, 0x49, 0x93, 0x6d, 0x6a, 0x3b, 0x93,
-	0x7b, 0xd2, 0xd8, 0xf4, 0xc2, 0xa5, 0x40, 0x81, 0x6c, 0x03, 0x55, 0x54, 0xd1, 0x98, 0x25, 0xbc,
-	0x80, 0x84, 0x59, 0xdb, 0x93, 0x74, 0xd5, 0xf5, 0x8e, 0xbb, 0xbb, 0x8e, 0xe2, 0x57, 0x90, 0x40,
-	0x48, 0x48, 0xdc, 0x9e, 0x11, 0xfc, 0x01, 0xfc, 0x03, 0x7d, 0xe4, 0xad, 0x82, 0x97, 0x22, 0x24,
-	0x84, 0x0a, 0xb2, 0x50, 0xcb, 0x03, 0xcf, 0xfe, 0x0b, 0xd0, 0xce, 0x9c, 0xb5, 0xd7, 0x3b, 0xbb,
-	0x8e, 0x37, 0x91, 0x78, 0x8a, 0xbd, 0xe7, 0x9c, 0xef, 0x7c, 0xdf, 0x9c, 0x9d, 0x99, 0xcf, 0x41,
-	0xb3, 0xcc, 0xad, 0x31, 0xd7, 0x74, 0x0b, 0x75, 0x87, 0x79, 0xcc, 0xa1, 0xbb, 0x85, 0xdd, 0xcb,
-	0x65, 0xea, 0x19, 0x97, 0x0b, 0xf7, 0x1b, 0xd4, 0x69, 0xe6, 0xf9, 0x63, 0x3c, 0x01, 0x59, 0xf9,
-	0x20, 0x2b, 0x0f, 0x59, 0xea, 0xb9, 0x1d, 0xb6, 0xc3, 0xf8, 0xd3, 0x82, 0xff, 0x49, 0x24, 0xa8,
-	0x53, 0x3b, 0x8c, 0xed, 0x58, 0xb4, 0x60, 0xd4, 0xcd, 0x82, 0x61, 0xdb, 0xcc, 0x33, 0x3c, 0x93,
-	0xd9, 0x50, 0xae, 0x2e, 0x57, 0x38, 0x5c, 0xa1, 0x6c, 0xb8, 0x54, 0xb4, 0xe9, 0x34, 0xad, 0x1b,
-	0x3b, 0xa6, 0xcd, 0x93, 0x21, 0x77, 0x2e, 0x91, 0x5f, 0xdd, 0x70, 0x8c, 0x5a, 0x00, 0xb9, 0x90,
-	0x9c, 0x16, 0x30, 0x16, 0x89, 0x99, 0x70, 0xef, 0x20, 0xa7, 0xc2, 0x4c, 0xe8, 0x47, 0xce, 0x21,
-	0xfc, 0xb6, 0xcf, 0xa8, 0xc8, 0xd1, 0x75, 0x7a, 0xbf, 0x41, 0x5d, 0x8f, 0x6c, 0xa3, 0x67, 0x7a,
-	0x9e, 0xba, 0x75, 0x66, 0xbb, 0x14, 0x6f, 0xa2, 0x61, 0xc1, 0x62, 0x42, 0xc9, 0x29, 0x8b, 0x27,
-	0xaf, 0xe4, 0xf2, 0x49, 0xeb, 0x94, 0x17, 0x95, 0xda, 0xd8, 0xc3, 0x56, 0x76, 0xa8, 0xdd, 0xca,
-	0x9e, 0x6e, 0x1a, 0x35, 0xeb, 0x25, 0x22, 0xaa, 0x89, 0x0e, 0x30, 0x64, 0x01, 0xcd, 0xf1, 0x3e,
-	0xb7, 0xa8, 0x57, 0xf4, 0x11, 0x74, 0xba, 0x7b, 0xa7, 0x51, 0x2b, 0x53, 0x67, 0x73, 0x7b, 0xcb,
-	0x31, 0xaa, 0xb4, 0x43, 0xe8, 0x5b, 0x05, 0xcd, 0xef, 0x97, 0x09, 0x24, 0x5d, 0x74, 0xd6, 0xe6,
-	0x91, 0x12, 0xdb, 0x2e, 0x79, 0x3c, 0xc6, 0xe9, 0x9e, 0xd0, 0x36, 0x7c, 0x32, 0x8f, 0x5b, 0xd9,
-	0xf9, 0x1d, 0xd3, 0xbb, 0xdb, 0x28, 0xe7, 0x2b, 0xac, 0x56, 0x80, 0xe5, 0x11, 0x7f, 0x56, 0xdd,
-	0xea, 0xbd, 0x82, 0xd7, 0xac, 0x53, 0x37, 0xbf, 0x61, 0x7b, 0xed, 0x56, 0xf6, 0xbc, 0xa0, 0x1d,
-	0xc5, 0x23, 0xfa, 0x19, 0xbb, 0xa7, 0x39, 0xd9, 0x94, 0x85, 0x14, 0x1d, 0xb6, 0x6d, 0x7a, 0xae,
-	0xd6, 0x5c, 0xa7, 0x36, 0xab, 0x81, 0x10, 0x3c, 0x8f, 0x8e, 0x57, 0xfd, 0xef, 0x40, 0xe9, 0x6c,
-	0xbb, 0x95, 0x3d, 0x25, 0x9a, 0xf0, 0xc7, 0x44, 0x17, 0x61, 0x62, 0xcb, 0x7a, 0xa3, 0x80, 0xa0,
-	0x77, 0x1d, 0x0d, 0xd7, 0x79, 0x04, 0x86, 0x32, 0x99, 0x17, 0x62, 0xf2, 0xfe, 0xc8, 0x3b, 0xf3,
-	0xb8, 0xc9, 0x4c, 0x5b, 0x1b, 0x0d, 0x4d, 0x82, 0x97, 0xf8, 0x93, 0x10, 0x1f, 0x66, 0xd0, 0x74,
-	0xb4, 0xdf, 0x9a, 0x65, 0x41, 0xcb, 0x60, 0x0a, 0xf7, 0x11, 0xe9, 0x97, 0x04, 0x84, 0x6e, 0xa3,
-	0x11, 0x01, 0xea, 0xaf, 0xfb, 0xd1, 0xfe, 0x8c, 0xc6, 0xe1, 0xfd, 0x38, 0x13, 0x66, 0xe5, 0x12,
-	0x7d, 0xa4, 0xf3, 0x09, 0x2d, 0x46, 0x5b, 0xbe, 0xe3, 0xef, 0x2e, 0xd7, 0x33, 0x2b, 0xae, 0xd6,
-	0xd4, 0x59, 0xc3, 0xa3, 0xa1, 0xb5, 0x75, 0xfc, 0xef, 0xbc, 0xed, 0xb1, 0xf0, 0xda, 0xf2, 0xc7,
-	0x44, 0x17, 0x61, 0xf2, 0x95, 0x82, 0x96, 0x06, 0x00, 0x05, 0x39, 0x55, 0x84, 0xdc, 0x4e, 0x10,
-	0xd6, 0x78, 0x29, 0xf9, 0xc5, 0xe7, 0xc5, 0x21, 0xb4, 0x49, 0x50, 0x38, 0x2a, 0x98, 0x74, 0xa1,
-	0x88, 0x1e, 0xc2, 0x25, 0x2b, 0x32, 0xa5, 0x35, 0xcb, 0x8a, 0x80, 0x05, 0x73, 0xf8, 0x5a, 0x41,
-	0xcb, 0x83, 0x64, 0x27, 0x28, 0x38, 0xfa, 0x5f, 0x29, 0xd8, 0x62, 0xf7, 0xa8, 0x5d, 0x34, 0x4c,
-	0x67, 0xcd, 0x29, 0x73, 0xd4, 0x8e, 0x82, 0xcf, 0x62, 0x14, 0xc4, 0x65, 0x83, 0x82, 0xf7, 0xd1,
-	0x30, 0x1f, 0x5d, 0xc0, 0xfe, 0x52, 0x32, 0x7b, 0x19, 0x25, 0x7a, 0x08, 0x09, 0x24, 0xa2, 0x03,
-	0x24, 0x99, 0x43, 0x33, 0xd2, 0x62, 0x56, 0x6b, 0xa6, 0xbd, 0x56, 0xa9, 0xb0, 0x86, 0xed, 0x05,
-	0x94, 0x29, 0x9a, 0xed, 0x9f, 0x06, 0x5c, 0x6f, 0xa0, 0xd3, 0x86, 0xff, 0xbc, 0x64, 0x88, 0x00,
-	0xec, 0xf4, 0x89, 0x76, 0x2b, 0x7b, 0x4e, 0x10, 0xe8, 0x09, 0x13, 0xfd, 0x94, 0x11, 0x82, 0x21,
-	0x4b, 0x68, 0x21, 0xda, 0x66, 0x9d, 0xee, 0x52, 0x8b, 0xd5, 0xa9, 0x13, 0x61, 0xd4, 0x90, 0xf7,
-	0x86, 0x9c, 0x0a, 0xac, 0x36, 0xd0, 0x68, 0x35, 0x88, 0x45, 0x98, 0x4d, 0xb5, 0x5b, 0xd9, 0x89,
-	0xe0, 0x0c, 0x8a, 0xa4, 0x10, 0xfd, 0x6c, 0x35, 0x02, 0x19, 0x77, 0x68, 0x6f, 0xd8, 0xdb, 0x4c,
-	0x6b, 0x16, 0x19, 0xb3, 0xb6, 0x9a, 0xf5, 0x60, 0x3f, 0x92, 0xef, 0x62, 0x0e, 0xed, 0x68, 0x26,
-	0xd0, 0x6b, 0xa0, 0x51, 0xd3, 0xde, 0x66, 0xa5, 0x72, 0xb3, 0x54, 0x67, 0xcc, 0x2a, 0xf9, 0x87,
-	0x30, 0xec, 0xb5, 0xc5, 0xe4, 0x59, 0xf7, 0x82, 0x69, 0x39, 0x98, 0x33, 0x88, 0x91, 0x00, 0x89,
-	0x7e, 0xc6, 0xec, 0xa9, 0x20, 0x79, 0x74, 0x29, 0x4a, 0xf0, 0x2d, 0x63, 0xcf, 0x0f, 0x17, 0x99,
-	0x69, 0x7b, 0x6e, 0x91, 0x3a, 0x9a, 0xc5, 0x2a, 0xf7, 0x02, 0x45, 0x5f, 0x28, 0x68, 0x75, 0xc0,
-	0x02, 0x10, 0xf6, 0x01, 0x9a, 0xac, 0x19, 0x7b, 0x82, 0x43, 0x9d, 0xa7, 0x94, 0xfc, 0xe5, 0x2d,
-	0xfb, 0x49, 0x5c, 0xe0, 0x31, 0x6d, 0xb6, 0xdd, 0xca, 0xe6, 0x04, 0xe5, 0xc4, 0x54, 0xa2, 0x8f,
-	0xd5, 0xe2, 0xfa, 0xc4, 0xed, 0xba, 0x28, 0xa1, 0xad, 0xbd, 0x80, 0xfe, 0xc7, 0x31, 0xbb, 0x2e,
-	0x2e, 0x1b, 0xb8, 0xbf, 0x8b, 0xc6, 0xe3, 0x08, 0x79, 0x7b, 0x40, 0x7c, 0xba, 0xdd, 0xca, 0x5e,
-	0x4c, 0x26, 0xee, 0xed, 0x11, 0x1d, 0xd7, 0x24, 0xf8, 0xb8, 0xab, 0x46, 0x33, 0x5c, 0xca, 0x6f,
-	0xb5, 0xce, 0x01, 0xf1, 0x89, 0x22, 0xdf, 0x35, 0xe1, 0x2c, 0xa0, 0xf8, 0x21, 0x3a, 0xe9, 0x5f,
-	0x2a, 0x25, 0x7e, 0x69, 0x06, 0xa7, 0xc3, 0x4c, 0xf2, 0x1b, 0xd3, 0x81, 0xd0, 0x54, 0x78, 0x59,
-	0xb0, 0x10, 0x10, 0x42, 0x21, 0x3a, 0x2a, 0x77, 0x3a, 0x91, 0x1c, 0xca, 0x44, 0x79, 0xbc, 0x61,
-	0x1b, 0x65, 0x8b, 0x56, 0x03, 0xaa, 0x9b, 0x28, 0x9b, 0x98, 0x01, 0x34, 0x2f, 0xa1, 0x11, 0x2a,
-	0x1e, 0xf1, 0xa5, 0xfb, 0x9f, 0x86, 0xbb, 0x77, 0x1e, 0x04, 0x88, 0x1e, 0xa4, 0x90, 0xcf, 0x15,
-	0x74, 0x41, 0xba, 0xfc, 0x19, 0xb3, 0x82, 0x7b, 0xee, 0x1a, 0x42, 0x5d, 0xba, 0xb0, 0x89, 0xc7,
-	0xba, 0x07, 0x74, 0x37, 0x46, 0xf4, 0x13, 0x1d, 0x25, 0xf8, 0x05, 0x74, 0x92, 0x79, 0x77, 0xa9,
-	0x03, 0x65, 0x47, 0x78, 0xd9, 0x78, 0x77, 0x05, 0x42, 0x41, 0xa2, 0x23, 0xfe, 0x8d, 0x17, 0x92,
-	0xdb, 0x68, 0x2a, 0x9e, 0x0d, 0x88, 0x5b, 0x41, 0x23, 0x7c, 0xf4, 0x66, 0x15, 0xde, 0x8b, 0x90,
-	0x38, 0x08, 0xf8, 0x3e, 0x83, 0x31, 0x6b, 0xa3, 0x7a, 0xe5, 0xc1, 0x79, 0x74, 0x9c, 0xa3, 0xe1,
-	0x4f, 0x15, 0x34, 0x2c, 0x5c, 0x22, 0xee, 0x73, 0x9c, 0xcb, 0xe6, 0x54, 0x5d, 0x1d, 0x30, 0x5b,
-	0xd0, 0x23, 0xb9, 0x8f, 0x7e, 0xfd, 0xfb, 0x9b, 0x23, 0x2a, 0x9e, 0x28, 0x48, 0x9e, 0x59, 0xb8,
-	0x50, 0xfc, 0x93, 0x82, 0x26, 0x13, 0x7d, 0x25, 0x7e, 0x6d, 0x9f, 0x76, 0xfb, 0x79, 0x57, 0xf5,
-	0xf5, 0x83, 0x03, 0x80, 0x84, 0x65, 0x2e, 0x61, 0x16, 0x13, 0x59, 0x42, 0xd4, 0x9a, 0x46, 0xc5,
-	0xf4, 0x9a, 0xc6, 0x34, 0x62, 0x62, 0xfd, 0x6b, 0x1a, 0x31, 0xf1, 0x7e, 0xb5, 0x9f, 0x18, 0x30,
-	0x7d, 0xfe, 0xa1, 0xcd, 0xdf, 0x43, 0xfc, 0x40, 0x41, 0x63, 0xb1, 0x66, 0x13, 0xbf, 0x3c, 0x38,
-	0x0f, 0xc9, 0xc7, 0xaa, 0xaf, 0x1c, 0xac, 0x18, 0x04, 0xcc, 0x71, 0x01, 0x59, 0x7c, 0x51, 0x16,
-	0x60, 0x58, 0x56, 0x09, 0x44, 0xe0, 0xdf, 0x14, 0x34, 0xd5, 0xcf, 0x60, 0x62, 0x6d, 0x70, 0x16,
-	0x49, 0x96, 0x57, 0xbd, 0x79, 0x28, 0x0c, 0x10, 0xb4, 0xca, 0x05, 0x2d, 0xe0, 0x39, 0x59, 0x50,
-	0xd7, 0xdf, 0xf9, 0x43, 0xe1, 0x86, 0x09, 0x3f, 0x56, 0xd0, 0xc5, 0xbe, 0xc6, 0x13, 0xdf, 0x4c,
-	0xb5, 0xbe, 0xf1, 0x26, 0x57, 0x5d, 0x3f, 0x1c, 0x08, 0x68, 0xcb, 0x73, 0x6d, 0x8b, 0x78, 0x3e,
-	0x7e, 0x58, 0x5c, 0x51, 0xa9, 0xab, 0x12, 0xff, 0xd1, 0x2b, 0x4e, 0x76, 0x93, 0x69, 0xc4, 0x25,
-	0xfa, 0xdf, 0x34, 0xe2, 0x92, 0x6d, 0x31, 0x29, 0x70, 0x71, 0x4b, 0x78, 0x41, 0x16, 0xe7, 0xf9,
-	0x55, 0xa5, 0xba, 0x61, 0x3a, 0x25, 0xc3, 0x29, 0x0b, 0x9d, 0x2e, 0xfe, 0x51, 0x41, 0xe7, 0x13,
-	0xfc, 0x2b, 0xbe, 0x91, 0x62, 0xbd, 0x65, 0x7b, 0xac, 0xbe, 0x7a, 0xd0, 0x72, 0xd0, 0xb2, 0xc0,
-	0xb5, 0x4c, 0xe3, 0x6c, 0xcc, 0xa0, 0xc2, 0x7e, 0x19, 0xff, 0xa2, 0xa0, 0x0b, 0x7d, 0x1c, 0x2f,
-	0x5e, 0x1b, 0x9c, 0x48, 0x82, 0xb1, 0x56, 0xb5, 0xc3, 0x40, 0x80, 0x9e, 0x15, 0xae, 0x67, 0x0e,
-	0xcf, 0xc8, 0x7a, 0x24, 0x97, 0x8d, 0x7f, 0xee, 0x3d, 0xb4, 0x7b, 0x7d, 0x6d, 0x9a, 0x43, 0x3b,
-	0xd6, 0x88, 0xa7, 0x39, 0xb4, 0xe3, 0xfd, 0x79, 0x3f, 0x35, 0x92, 0xcd, 0xc6, 0x7f, 0xf6, 0xee,
-	0x21, 0xd9, 0x61, 0xa6, 0xd9, 0x43, 0x89, 0x6e, 0x36, 0xcd, 0x1e, 0x4a, 0x36, 0xb9, 0xe4, 0x59,
-	0xae, 0x6c, 0x19, 0x2f, 0xca, 0xca, 0xe2, 0x4d, 0x2d, 0xfe, 0x47, 0x41, 0xb9, 0xfd, 0xfc, 0x3f,
-	0x7e, 0xf3, 0xe0, 0xe4, 0xc2, 0xbf, 0x38, 0xd4, 0x5b, 0x87, 0xc6, 0x01, 0x9d, 0x57, 0xb9, 0xce,
-	0x55, 0xbc, 0x32, 0x98, 0x4e, 0xfe, 0xab, 0x23, 0x7a, 0xff, 0x76, 0x0d, 0x78, 0x9a, 0xfb, 0x57,
-	0x32, 0xf7, 0x69, 0xee, 0x5f, 0xd9, 0xf3, 0xf7, 0xbb, 0x7f, 0x43, 0x2e, 0x1e, 0xff, 0xa0, 0x20,
-	0x2c, 0x5b, 0x72, 0xfc, 0xe2, 0xe0, 0xbd, 0x7b, 0x7d, 0xbe, 0x7a, 0xfd, 0x00, 0x95, 0x40, 0x79,
-	0x9a, 0x53, 0xbe, 0x80, 0x27, 0x65, 0xca, 0x60, 0xfa, 0xf1, 0xf7, 0x0a, 0xfa, 0x7f, 0xc4, 0x61,
-	0xe3, 0xe7, 0x52, 0x98, 0xad, 0xee, 0xef, 0x03, 0xf5, 0xf9, 0xb4, 0x65, 0xc0, 0x32, 0xc3, 0x59,
-	0x4e, 0xe0, 0xf1, 0x18, 0x67, 0xc6, 0x98, 0xa5, 0xdd, 0x79, 0xf8, 0x24, 0xa3, 0x3c, 0x7a, 0x92,
-	0x51, 0xfe, 0x7a, 0x92, 0x51, 0xbe, 0x7c, 0x9a, 0x19, 0x7a, 0xf4, 0x34, 0x33, 0xf4, 0xfb, 0xd3,
-	0xcc, 0xd0, 0x7b, 0xd7, 0x42, 0xff, 0x51, 0x85, 0xda, 0x55, 0xcb, 0x28, 0xbb, 0x1d, 0xa0, 0xdd,
-	0xcb, 0xd7, 0x0b, 0x7b, 0xa1, 0xdb, 0xa9, 0x59, 0xa7, 0x6e, 0x79, 0x98, 0x7f, 0xbf, 0xfa, 0x6f,
-	0x00, 0x00, 0x00, 0xff, 0xff, 0xfd, 0x88, 0xc0, 0x8b, 0x94, 0x17, 0x00, 0x00,
+	// 1527 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x57, 0x5d, 0x6f, 0x1b, 0x45,
+	0x17, 0xce, 0xf6, 0x23, 0x79, 0x3b, 0xfd, 0x78, 0x9b, 0xa1, 0x49, 0x93, 0x6d, 0x6a, 0x3b, 0x93,
+	0xa4, 0xf9, 0x6a, 0x6c, 0xfa, 0x01, 0xb4, 0x40, 0x81, 0x6c, 0x03, 0x55, 0x54, 0xd1, 0x98, 0x25,
+	0xdc, 0x80, 0x84, 0x59, 0xdb, 0x93, 0x74, 0xd5, 0xf5, 0x8e, 0xbb, 0xbb, 0x8e, 0xe2, 0x5b, 0x90,
+	0x40, 0x48, 0x48, 0x7c, 0xfd, 0x00, 0xf8, 0x01, 0xfc, 0x81, 0x5e, 0x72, 0x57, 0xc1, 0x4d, 0x11,
+	0x12, 0x42, 0x05, 0x59, 0xa8, 0xe1, 0x82, 0x6b, 0xff, 0x02, 0xb4, 0x33, 0x67, 0xed, 0xf5, 0xce,
+	0xae, 0xe3, 0x4d, 0x24, 0xee, 0xbc, 0x7b, 0xce, 0x79, 0xce, 0xf3, 0x9c, 0xd9, 0x99, 0x79, 0x8c,
+	0x66, 0x99, 0x5b, 0x63, 0xae, 0xe9, 0x16, 0xea, 0x0e, 0xf3, 0x98, 0x43, 0x77, 0x0a, 0x3b, 0x57,
+	0xca, 0xd4, 0x33, 0xae, 0x14, 0x1e, 0x36, 0xa8, 0xd3, 0xcc, 0xf3, 0xd7, 0x78, 0x02, 0xb2, 0xf2,
+	0x41, 0x56, 0x1e, 0xb2, 0xd4, 0x73, 0xdb, 0x6c, 0x9b, 0xf1, 0xb7, 0x05, 0xff, 0x97, 0x48, 0x50,
+	0xa7, 0xb6, 0x19, 0xdb, 0xb6, 0x68, 0xc1, 0xa8, 0x9b, 0x05, 0xc3, 0xb6, 0x99, 0x67, 0x78, 0x26,
+	0xb3, 0xa1, 0x5c, 0x5d, 0xaa, 0x70, 0xb8, 0x42, 0xd9, 0x70, 0xa9, 0x68, 0xd3, 0x69, 0x5a, 0x37,
+	0xb6, 0x4d, 0x9b, 0x27, 0x43, 0xee, 0x5c, 0x22, 0xbf, 0xba, 0xe1, 0x18, 0xb5, 0x00, 0x72, 0x3e,
+	0x39, 0x2d, 0x60, 0x2c, 0x12, 0x33, 0xe1, 0xde, 0x41, 0x4e, 0x85, 0x99, 0xd0, 0x8f, 0x9c, 0x43,
+	0xf8, 0x1d, 0x9f, 0x51, 0x91, 0xa3, 0xeb, 0xf4, 0x61, 0x83, 0xba, 0x1e, 0xd9, 0x42, 0xcf, 0xf5,
+	0xbc, 0x75, 0xeb, 0xcc, 0x76, 0x29, 0xde, 0x40, 0xc3, 0x82, 0xc5, 0x84, 0x92, 0x53, 0x16, 0x4e,
+	0x5e, 0xcd, 0xe5, 0x93, 0xe6, 0x94, 0x17, 0x95, 0xda, 0xd8, 0xe3, 0x56, 0x76, 0xa8, 0xdd, 0xca,
+	0x9e, 0x6e, 0x1a, 0x35, 0xeb, 0x65, 0x22, 0xaa, 0x89, 0x0e, 0x30, 0x64, 0x1e, 0xcd, 0xf1, 0x3e,
+	0x77, 0xa8, 0x57, 0xf4, 0x11, 0x74, 0xba, 0x73, 0xaf, 0x51, 0x2b, 0x53, 0x67, 0x63, 0x6b, 0xd3,
+	0x31, 0xaa, 0xb4, 0x43, 0xe8, 0x0b, 0x05, 0x5d, 0xda, 0x2f, 0x13, 0x48, 0x96, 0xd1, 0x59, 0x9b,
+	0x47, 0x4a, 0x6c, 0xab, 0xe4, 0xf1, 0x18, 0xa7, 0x7b, 0x42, 0xbb, 0xe1, 0x93, 0x79, 0xda, 0xca,
+	0x8e, 0x89, 0x99, 0xb8, 0xd5, 0x07, 0x79, 0x93, 0x15, 0x6a, 0x86, 0x77, 0x3f, 0xbf, 0x6e, 0x7b,
+	0xed, 0x56, 0xf6, 0xbc, 0x60, 0x19, 0x2d, 0x27, 0xfa, 0x19, 0xbb, 0xa7, 0x17, 0xd9, 0x90, 0x79,
+	0x17, 0x1d, 0xb6, 0x65, 0x7a, 0xae, 0xd6, 0x5c, 0xa3, 0x36, 0xab, 0x01, 0x6f, 0x7c, 0x09, 0x1d,
+	0xaf, 0xfa, 0xcf, 0xc0, 0xe0, 0x6c, 0xbb, 0x95, 0x3d, 0x25, 0x9a, 0xf0, 0xd7, 0x44, 0x17, 0x61,
+	0x62, 0xcb, 0xf2, 0xa2, 0x80, 0x20, 0x6f, 0x0d, 0x0d, 0xd7, 0x79, 0x04, 0xd6, 0x60, 0x32, 0x2f,
+	0xd4, 0xe4, 0xfd, 0x15, 0xee, 0x8c, 0xff, 0x36, 0x33, 0x6d, 0x6d, 0x34, 0x34, 0x78, 0x5e, 0xe2,
+	0x0f, 0x5e, 0xfc, 0x98, 0x41, 0xd3, 0xd1, 0x7e, 0xab, 0x96, 0x05, 0x2d, 0x83, 0xa1, 0x3f, 0x44,
+	0xa4, 0x5f, 0x12, 0x10, 0xba, 0x8b, 0x46, 0x04, 0xa8, 0x3f, 0xe6, 0xa3, 0xfd, 0x19, 0x8d, 0xc3,
+	0xe7, 0x70, 0x26, 0xcc, 0xca, 0x25, 0xfa, 0x48, 0xe7, 0x17, 0x5a, 0x88, 0xb6, 0x7c, 0xd7, 0xdf,
+	0x4c, 0xae, 0x67, 0x56, 0x5c, 0xad, 0xa9, 0xb3, 0x86, 0x47, 0x43, 0xb3, 0x75, 0xfc, 0x67, 0xde,
+	0xf6, 0x58, 0x78, 0xb6, 0xfc, 0x35, 0xd1, 0x45, 0x98, 0x7c, 0xad, 0xa0, 0xc5, 0x01, 0x40, 0x41,
+	0x4e, 0x15, 0x21, 0xb7, 0x13, 0x84, 0x19, 0x2f, 0x26, 0x7f, 0xe7, 0xbc, 0x38, 0x84, 0x36, 0x09,
+	0x0a, 0x47, 0x05, 0x93, 0x2e, 0x14, 0xd1, 0x43, 0xb8, 0x64, 0x59, 0xa6, 0xb4, 0x6a, 0x59, 0x11,
+	0xb0, 0x60, 0x1d, 0xbe, 0x51, 0xd0, 0xd2, 0x20, 0xd9, 0x09, 0x0a, 0x8e, 0xfe, 0x57, 0x0a, 0x36,
+	0xd9, 0x03, 0x6a, 0x17, 0x0d, 0xd3, 0x59, 0x75, 0xca, 0x1c, 0xb5, 0xa3, 0xe0, 0xf3, 0x18, 0x05,
+	0x71, 0xd9, 0xa0, 0xe0, 0x03, 0x34, 0xcc, 0x97, 0x2e, 0x60, 0x7f, 0x39, 0x99, 0xbd, 0x8c, 0x12,
+	0x3d, 0x73, 0x04, 0x12, 0xd1, 0x01, 0x92, 0xcc, 0xa1, 0x19, 0x69, 0x98, 0xd5, 0x9a, 0x69, 0xaf,
+	0x56, 0x2a, 0xac, 0x61, 0x7b, 0x01, 0x65, 0x8a, 0x66, 0xfb, 0xa7, 0x01, 0xd7, 0x5b, 0xe8, 0xb4,
+	0xe1, 0xbf, 0x2f, 0x19, 0x22, 0x00, 0x3b, 0x7d, 0xa2, 0xdd, 0xca, 0x9e, 0x13, 0x04, 0x7a, 0xc2,
+	0x44, 0x3f, 0x65, 0x84, 0x60, 0xc8, 0x22, 0x9a, 0x8f, 0xb6, 0x59, 0xa3, 0x3b, 0xd4, 0x62, 0x75,
+	0xea, 0x44, 0x18, 0x35, 0xe4, 0xbd, 0x21, 0xa7, 0x02, 0xab, 0x75, 0x34, 0x5a, 0x0d, 0x62, 0x11,
+	0x66, 0x53, 0xed, 0x56, 0x76, 0x22, 0x38, 0x83, 0x22, 0x29, 0x44, 0x3f, 0x5b, 0x8d, 0x40, 0xc6,
+	0x9d, 0xd1, 0xeb, 0xf6, 0x16, 0xd3, 0x9a, 0x45, 0xc6, 0xac, 0xcd, 0x66, 0x3d, 0xd8, 0x8f, 0xe4,
+	0xbb, 0x98, 0x33, 0x3a, 0x9a, 0x09, 0xf4, 0x1a, 0x68, 0xd4, 0xb4, 0xb7, 0x58, 0xa9, 0xdc, 0x2c,
+	0xd5, 0x19, 0xb3, 0x4a, 0x5e, 0xb3, 0x4e, 0x61, 0xaf, 0x2d, 0x24, 0xaf, 0x75, 0x2f, 0x98, 0x96,
+	0x83, 0x75, 0x06, 0x31, 0x12, 0x20, 0xd1, 0xcf, 0x98, 0x3d, 0x15, 0x24, 0x8f, 0x2e, 0x47, 0x09,
+	0xbe, 0x6d, 0xec, 0xfa, 0xe1, 0x22, 0x33, 0x6d, 0xcf, 0x2d, 0x52, 0x47, 0xb3, 0x58, 0xe5, 0x41,
+	0xa0, 0xe8, 0x4b, 0x05, 0xad, 0x0c, 0x58, 0x00, 0xc2, 0x3e, 0x44, 0x93, 0x35, 0x63, 0x57, 0x70,
+	0xa8, 0xf3, 0x94, 0x92, 0x3f, 0xde, 0xb2, 0x9f, 0xc4, 0x05, 0x1e, 0xd3, 0x66, 0xdb, 0xad, 0x6c,
+	0x4e, 0x50, 0x4e, 0x4c, 0x25, 0xfa, 0x58, 0x2d, 0xae, 0x4f, 0xdc, 0xae, 0x8b, 0x12, 0xda, 0xdc,
+	0x0d, 0xe8, 0x7f, 0x12, 0xb3, 0xeb, 0xe2, 0xb2, 0x81, 0xfb, 0x7b, 0x68, 0x3c, 0x8e, 0x90, 0xb7,
+	0x0b, 0xc4, 0xa7, 0xdb, 0xad, 0xec, 0xc5, 0x64, 0xe2, 0xde, 0x2e, 0xd1, 0x71, 0x4d, 0x82, 0x8f,
+	0xbb, 0x6a, 0x34, 0xc3, 0xa5, 0xfc, 0x56, 0xeb, 0x1c, 0x10, 0x9f, 0x2a, 0xf2, 0x5d, 0x13, 0xce,
+	0x02, 0x8a, 0x1f, 0xa1, 0x93, 0xfe, 0xa5, 0x52, 0xe2, 0x97, 0x66, 0x70, 0x3a, 0xcc, 0x24, 0x7f,
+	0x31, 0x1d, 0x08, 0x4d, 0x85, 0x8f, 0x05, 0x0b, 0x01, 0x21, 0x14, 0xa2, 0xa3, 0x72, 0xa7, 0x13,
+	0xc9, 0xa1, 0x4c, 0x94, 0xc7, 0x9b, 0xb6, 0x51, 0xb6, 0x68, 0x35, 0xa0, 0xba, 0x81, 0xb2, 0x89,
+	0x19, 0x40, 0xf3, 0x32, 0x1a, 0xa1, 0xe2, 0x15, 0x1f, 0xdd, 0xff, 0x34, 0xdc, 0xbd, 0xf3, 0x20,
+	0x40, 0xf4, 0x20, 0xc5, 0xf7, 0x36, 0x17, 0xa4, 0xcb, 0x9f, 0x31, 0x2b, 0xb8, 0xe7, 0xae, 0x23,
+	0xd4, 0xa5, 0x0b, 0x9b, 0x78, 0xac, 0x7b, 0x40, 0x77, 0x63, 0x44, 0x3f, 0xd1, 0x51, 0x82, 0x5f,
+	0x42, 0x27, 0x99, 0x77, 0x9f, 0x3a, 0x50, 0x76, 0x84, 0x97, 0x8d, 0x77, 0x27, 0x10, 0x0a, 0x12,
+	0x1d, 0xf1, 0x27, 0x5e, 0x48, 0xee, 0xa2, 0xa9, 0x78, 0x36, 0x20, 0x6e, 0x19, 0x8d, 0xf0, 0xa5,
+	0x37, 0xab, 0xf0, 0x5d, 0x84, 0xc4, 0x41, 0xc0, 0xf7, 0x19, 0x8c, 0x59, 0xeb, 0xd5, 0xab, 0x8f,
+	0xce, 0xa3, 0xe3, 0x1c, 0x0d, 0x7f, 0xa6, 0xa0, 0x61, 0x61, 0x0a, 0x71, 0x9f, 0xe3, 0x5c, 0xf6,
+	0xa2, 0xea, 0xca, 0x80, 0xd9, 0x82, 0x1e, 0xc9, 0x7d, 0xfc, 0xeb, 0xdf, 0xdf, 0x1e, 0x51, 0xf1,
+	0x44, 0x41, 0xb2, 0xc8, 0xc2, 0x74, 0xe2, 0x9f, 0x14, 0x34, 0x99, 0x68, 0x23, 0xf1, 0xeb, 0xfb,
+	0xb4, 0xdb, 0xcf, 0xaa, 0xaa, 0x6f, 0x1c, 0x1c, 0x00, 0x24, 0x2c, 0x71, 0x09, 0xb3, 0x98, 0xc8,
+	0x12, 0xa2, 0xd6, 0x34, 0x2a, 0xa6, 0xd7, 0x34, 0xa6, 0x11, 0x13, 0xeb, 0x5f, 0xd3, 0x88, 0x89,
+	0xf7, 0xab, 0xfd, 0xc4, 0x80, 0xe9, 0xf3, 0x0f, 0x6d, 0xfe, 0x1d, 0xe2, 0x47, 0x0a, 0x1a, 0x8b,
+	0x35, 0x9b, 0xf8, 0x95, 0xc1, 0x79, 0x48, 0x3e, 0x56, 0x7d, 0xf5, 0x60, 0xc5, 0x20, 0x60, 0x8e,
+	0x0b, 0xc8, 0xe2, 0x8b, 0xb2, 0x00, 0xc3, 0xb2, 0x4a, 0x20, 0x02, 0xff, 0xa6, 0xa0, 0xa9, 0x7e,
+	0x06, 0x13, 0x6b, 0x83, 0xb3, 0x48, 0xb2, 0xbc, 0xea, 0xed, 0x43, 0x61, 0x80, 0xa0, 0x15, 0x2e,
+	0x68, 0x1e, 0xcf, 0xc9, 0x82, 0xba, 0xfe, 0xce, 0x5f, 0x14, 0x6e, 0x98, 0xf0, 0x53, 0x05, 0x5d,
+	0xec, 0x6b, 0x3c, 0xf1, 0xed, 0x54, 0xf3, 0x8d, 0x37, 0xb9, 0xea, 0xda, 0xe1, 0x40, 0x40, 0x5b,
+	0x9e, 0x6b, 0x5b, 0xc0, 0x97, 0xe2, 0x17, 0x8b, 0x2b, 0x2a, 0x75, 0x55, 0xe2, 0x3f, 0x7a, 0xc5,
+	0xc9, 0x6e, 0x32, 0x8d, 0xb8, 0x44, 0xff, 0x9b, 0x46, 0x5c, 0xb2, 0x2d, 0x26, 0x05, 0x2e, 0x6e,
+	0x11, 0xcf, 0xcb, 0xe2, 0x3c, 0xbf, 0xaa, 0x54, 0x37, 0x4c, 0xa7, 0x64, 0x38, 0x65, 0xa1, 0xd3,
+	0xc5, 0x3f, 0x2a, 0xe8, 0x7c, 0x82, 0x7f, 0xc5, 0xb7, 0x52, 0xcc, 0x5b, 0xb6, 0xc7, 0xea, 0x6b,
+	0x07, 0x2d, 0x07, 0x2d, 0xf3, 0x5c, 0xcb, 0x34, 0xce, 0xc6, 0x2c, 0x54, 0xd8, 0x2f, 0xe3, 0x5f,
+	0x14, 0x74, 0xa1, 0x8f, 0xe3, 0xc5, 0xab, 0x83, 0x13, 0x49, 0x30, 0xd6, 0xaa, 0x76, 0x18, 0x08,
+	0xd0, 0xb3, 0xcc, 0xf5, 0xcc, 0xe1, 0x19, 0x59, 0x8f, 0xe4, 0xb2, 0xf1, 0xcf, 0xbd, 0x87, 0x76,
+	0xaf, 0xaf, 0x4d, 0x73, 0x68, 0xc7, 0x1a, 0xf1, 0x34, 0x87, 0x76, 0xbc, 0x3f, 0xef, 0xa7, 0x46,
+	0xb2, 0xd9, 0xf8, 0xcf, 0xde, 0x3d, 0x24, 0x3b, 0xcc, 0x34, 0x7b, 0x28, 0xd1, 0xcd, 0xa6, 0xd9,
+	0x43, 0xc9, 0x26, 0x97, 0x3c, 0xcf, 0x95, 0x2d, 0xe1, 0x05, 0x59, 0x59, 0xbc, 0xa9, 0xc5, 0xff,
+	0x28, 0x28, 0xb7, 0x9f, 0xff, 0xc7, 0x6f, 0x1d, 0x9c, 0x5c, 0xf8, 0x1f, 0x87, 0x7a, 0xe7, 0xd0,
+	0x38, 0xa0, 0xf3, 0x1a, 0xd7, 0xb9, 0x82, 0x97, 0x07, 0xd3, 0xc9, 0xff, 0x75, 0x44, 0xef, 0xdf,
+	0xae, 0x01, 0x4f, 0x73, 0xff, 0x4a, 0xe6, 0x3e, 0xcd, 0xfd, 0x2b, 0x7b, 0xfe, 0x7e, 0xf7, 0x6f,
+	0xc8, 0xc5, 0xe3, 0x1f, 0x14, 0x84, 0x65, 0x4b, 0x8e, 0x6f, 0x0c, 0xde, 0xbb, 0xd7, 0xe7, 0xab,
+	0x37, 0x0f, 0x50, 0x09, 0x94, 0xa7, 0x39, 0xe5, 0x0b, 0x78, 0x52, 0xa6, 0x0c, 0xa6, 0x1f, 0x7f,
+	0xaf, 0xa0, 0xff, 0x47, 0x1c, 0x36, 0x7e, 0x21, 0x85, 0xd9, 0xea, 0xfe, 0x3f, 0x50, 0x5f, 0x4c,
+	0x5b, 0x06, 0x2c, 0x33, 0x9c, 0xe5, 0x04, 0x1e, 0x8f, 0x71, 0x66, 0x8c, 0x59, 0xda, 0xbd, 0xc7,
+	0xcf, 0x32, 0xca, 0x93, 0x67, 0x19, 0xe5, 0xaf, 0x67, 0x19, 0xe5, 0xab, 0xbd, 0xcc, 0xd0, 0x93,
+	0xbd, 0xcc, 0xd0, 0xef, 0x7b, 0x99, 0xa1, 0xf7, 0xaf, 0x6f, 0x9b, 0xde, 0xfd, 0x46, 0x39, 0x5f,
+	0x61, 0xb5, 0xa0, 0x76, 0xc5, 0x32, 0xca, 0x6e, 0x07, 0x68, 0xe7, 0xca, 0xcd, 0xc2, 0x6e, 0xe8,
+	0x76, 0x6a, 0xd6, 0xa9, 0x5b, 0x1e, 0xe6, 0xcf, 0xd7, 0xfe, 0x0d, 0x00, 0x00, 0xff, 0xff, 0x7a,
+	0x3a, 0xed, 0xfa, 0x83, 0x17, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/x/superfluid/types/params.pb.go b/x/superfluid/types/params.pb.go
index 0eebc7a1eeb..6a88e0b385d 100644
--- a/x/superfluid/types/params.pb.go
+++ b/x/superfluid/types/params.pb.go
@@ -4,8 +4,8 @@
 package types
 
 import (
+	cosmossdk_io_math "cosmossdk.io/math"
 	fmt "fmt"
-	github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types"
 	_ "github.com/gogo/protobuf/gogoproto"
 	proto "github.com/gogo/protobuf/proto"
 	_ "github.com/gogo/protobuf/types"
@@ -31,7 +31,7 @@ type Params struct {
 	// superfluid staking, default: 5%. The minimum risk factor works
 	// to counter-balance the staked amount on chain's exposure to various asset
 	// volatilities, and have base staking be 'resistant' to volatility.
-	MinimumRiskFactor github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,1,opt,name=minimum_risk_factor,json=minimumRiskFactor,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"minimum_risk_factor" yaml:"minimum_risk_factor"`
+	MinimumRiskFactor cosmossdk_io_math.LegacyDec `protobuf:"bytes,1,opt,name=minimum_risk_factor,json=minimumRiskFactor,proto3,customtype=cosmossdk.io/math.LegacyDec" json:"minimum_risk_factor" yaml:"minimum_risk_factor"`
 }
 
 func (m *Params) Reset()         { *m = Params{} }
@@ -74,24 +74,24 @@ func init() {
 func init() { proto.RegisterFile("osmosis/superfluid/params.proto", fileDescriptor_0985261dfaf2a82e) }
 
 var fileDescriptor_0985261dfaf2a82e = []byte{
-	// 260 bytes of a gzipped FileDescriptorProto
+	// 265 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0xcf, 0x2f, 0xce, 0xcd,
 	0x2f, 0xce, 0x2c, 0xd6, 0x2f, 0x2e, 0x2d, 0x48, 0x2d, 0x4a, 0xcb, 0x29, 0xcd, 0x4c, 0xd1, 0x2f,
 	0x48, 0x2c, 0x4a, 0xcc, 0x2d, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x82, 0x2a, 0xd0,
 	0x43, 0x28, 0x90, 0x12, 0x49, 0xcf, 0x4f, 0xcf, 0x07, 0x4b, 0xeb, 0x83, 0x58, 0x10, 0x95, 0x52,
 	0x72, 0xe9, 0xf9, 0xf9, 0xe9, 0x39, 0xa9, 0xfa, 0x60, 0x5e, 0x52, 0x69, 0x9a, 0x7e, 0x4a, 0x69,
-	0x51, 0x62, 0x49, 0x66, 0x7e, 0x1e, 0x44, 0x5e, 0xa9, 0x8d, 0x91, 0x8b, 0x2d, 0x00, 0x6c, 0xb4,
-	0x50, 0x0d, 0x97, 0x70, 0x6e, 0x66, 0x5e, 0x66, 0x6e, 0x69, 0x6e, 0x7c, 0x51, 0x66, 0x71, 0x76,
-	0x7c, 0x5a, 0x62, 0x72, 0x49, 0x7e, 0x91, 0x04, 0xa3, 0x02, 0xa3, 0x06, 0xa7, 0x93, 0xcf, 0x89,
-	0x7b, 0xf2, 0x0c, 0xb7, 0xee, 0xc9, 0xab, 0xa5, 0x67, 0x96, 0x64, 0x94, 0x26, 0xe9, 0x25, 0xe7,
-	0xe7, 0xea, 0x27, 0x83, 0x5d, 0x01, 0xa5, 0x74, 0x8b, 0x53, 0xb2, 0xf5, 0x4b, 0x2a, 0x0b, 0x52,
-	0x8b, 0xf5, 0x5c, 0x52, 0x93, 0x3f, 0xdd, 0x93, 0x97, 0xaa, 0x4c, 0xcc, 0xcd, 0xb1, 0x52, 0xc2,
-	0x62, 0xa4, 0x52, 0x90, 0x20, 0x54, 0x34, 0x28, 0xb3, 0x38, 0xdb, 0x0d, 0x2c, 0xe6, 0x14, 0x70,
-	0xe2, 0x91, 0x1c, 0xe3, 0x85, 0x47, 0x72, 0x8c, 0x0f, 0x1e, 0xc9, 0x31, 0x4e, 0x78, 0x2c, 0xc7,
-	0x70, 0xe1, 0xb1, 0x1c, 0xc3, 0x8d, 0xc7, 0x72, 0x0c, 0x51, 0x66, 0x48, 0x56, 0x42, 0xfd, 0xad,
-	0x9b, 0x93, 0x98, 0x54, 0x0c, 0xe3, 0xe8, 0x97, 0x19, 0x5a, 0xea, 0x57, 0x20, 0x87, 0x15, 0xd8,
-	0x19, 0x49, 0x6c, 0x60, 0x1f, 0x1a, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0x10, 0x35, 0x2c, 0xbc,
-	0x4e, 0x01, 0x00, 0x00,
+	0x51, 0x62, 0x49, 0x66, 0x7e, 0x1e, 0x44, 0x5e, 0xa9, 0x9a, 0x8b, 0x2d, 0x00, 0x6c, 0xb2, 0x50,
+	0x21, 0x97, 0x70, 0x6e, 0x66, 0x5e, 0x66, 0x6e, 0x69, 0x6e, 0x7c, 0x51, 0x66, 0x71, 0x76, 0x7c,
+	0x5a, 0x62, 0x72, 0x49, 0x7e, 0x91, 0x04, 0xa3, 0x02, 0xa3, 0x06, 0xa7, 0x93, 0xe3, 0x89, 0x7b,
+	0xf2, 0x0c, 0xb7, 0xee, 0xc9, 0x4b, 0x27, 0x83, 0x6d, 0x2e, 0x4e, 0xc9, 0xd6, 0xcb, 0xcc, 0xd7,
+	0xcf, 0x4d, 0x2c, 0xc9, 0xd0, 0xf3, 0x49, 0x4d, 0x4f, 0x4c, 0xae, 0x74, 0x49, 0x4d, 0xfe, 0x74,
+	0x4f, 0x5e, 0xaa, 0x32, 0x31, 0x37, 0xc7, 0x4a, 0x09, 0x8b, 0x39, 0x4a, 0x41, 0x82, 0x50, 0xd1,
+	0xa0, 0xcc, 0xe2, 0x6c, 0x37, 0xb0, 0x98, 0x53, 0xc0, 0x89, 0x47, 0x72, 0x8c, 0x17, 0x1e, 0xc9,
+	0x31, 0x3e, 0x78, 0x24, 0xc7, 0x38, 0xe1, 0xb1, 0x1c, 0xc3, 0x85, 0xc7, 0x72, 0x0c, 0x37, 0x1e,
+	0xcb, 0x31, 0x44, 0x99, 0xa5, 0x67, 0x96, 0x64, 0x94, 0x26, 0xe9, 0x25, 0xe7, 0xe7, 0xea, 0x43,
+	0xfd, 0xaa, 0x9b, 0x93, 0x98, 0x54, 0x0c, 0xe3, 0xe8, 0x97, 0x19, 0x5a, 0xea, 0x57, 0x20, 0x87,
+	0x4f, 0x49, 0x65, 0x41, 0x6a, 0x71, 0x12, 0x1b, 0xd8, 0x57, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff,
+	0xff, 0x85, 0x36, 0x64, 0x0b, 0x42, 0x01, 0x00, 0x00,
 }
 
 func (m *Params) Marshal() (dAtA []byte, err error) {
diff --git a/x/superfluid/types/query.pb.go b/x/superfluid/types/query.pb.go
index 2c8ef01ec1d..e1572518ad8 100644
--- a/x/superfluid/types/query.pb.go
+++ b/x/superfluid/types/query.pb.go
@@ -5,6 +5,7 @@ package types
 
 import (
 	context "context"
+	cosmossdk_io_math "cosmossdk.io/math"
 	fmt "fmt"
 	github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types"
 	types "github.com/cosmos/cosmos-sdk/types"
@@ -721,9 +722,9 @@ func (m *QueryTotalDelegationByValidatorForDenomResponse) GetAssets() []Delegati
 }
 
 type Delegations struct {
-	ValAddr        string                                 `protobuf:"bytes,1,opt,name=val_addr,json=valAddr,proto3" json:"val_addr,omitempty"`
-	AmountSfsd     github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,2,opt,name=amount_sfsd,json=amountSfsd,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"amount_sfsd" yaml:"amount_sfsd"`
-	OsmoEquivalent github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,3,opt,name=osmo_equivalent,json=osmoEquivalent,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"osmo_equivalent" yaml:"osmo_equivalent"`
+	ValAddr        string                `protobuf:"bytes,1,opt,name=val_addr,json=valAddr,proto3" json:"val_addr,omitempty"`
+	AmountSfsd     cosmossdk_io_math.Int `protobuf:"bytes,2,opt,name=amount_sfsd,json=amountSfsd,proto3,customtype=cosmossdk.io/math.Int" json:"amount_sfsd" yaml:"amount_sfsd"`
+	OsmoEquivalent cosmossdk_io_math.Int `protobuf:"bytes,3,opt,name=osmo_equivalent,json=osmoEquivalent,proto3,customtype=cosmossdk.io/math.Int" json:"osmo_equivalent" yaml:"osmo_equivalent"`
 }
 
 func (m *Delegations) Reset()         { *m = Delegations{} }
@@ -803,7 +804,7 @@ func (m *TotalSuperfluidDelegationsRequest) XXX_DiscardUnknown() {
 var xxx_messageInfo_TotalSuperfluidDelegationsRequest proto.InternalMessageInfo
 
 type TotalSuperfluidDelegationsResponse struct {
-	TotalDelegations github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,1,opt,name=total_delegations,json=totalDelegations,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"total_delegations" yaml:"total_superfluid_delegations"`
+	TotalDelegations cosmossdk_io_math.Int `protobuf:"bytes,1,opt,name=total_delegations,json=totalDelegations,proto3,customtype=cosmossdk.io/math.Int" json:"total_delegations" yaml:"total_superfluid_delegations"`
 }
 
 func (m *TotalSuperfluidDelegationsResponse) Reset()         { *m = TotalSuperfluidDelegationsResponse{} }
@@ -1809,135 +1810,135 @@ func init() {
 func init() { proto.RegisterFile("osmosis/superfluid/query.proto", fileDescriptor_e3d9448e4ed3943f) }
 
 var fileDescriptor_e3d9448e4ed3943f = []byte{
-	// 2038 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x5a, 0x4d, 0x6c, 0x14, 0xc9,
-	0x15, 0x76, 0x8f, 0xbd, 0x36, 0x3c, 0x24, 0x30, 0x05, 0x59, 0xec, 0x06, 0xc6, 0x6c, 0x9b, 0xb5,
-	0x1d, 0x2f, 0x4c, 0x2f, 0x66, 0x31, 0x86, 0x0d, 0x68, 0x67, 0x30, 0x06, 0x27, 0xb0, 0x78, 0xc7,
-	0xd8, 0x28, 0x7f, 0x6a, 0xb5, 0xa7, 0xcb, 0x43, 0x8b, 0x9e, 0xee, 0x71, 0x57, 0xb7, 0x77, 0x47,
-	0x2b, 0x12, 0x89, 0x28, 0x52, 0x56, 0x39, 0x24, 0xd2, 0x9e, 0xf6, 0x96, 0x4b, 0x0e, 0xbb, 0x87,
-	0xe4, 0x96, 0x28, 0x52, 0x2e, 0x49, 0x2e, 0x2b, 0x45, 0x91, 0x56, 0xca, 0x25, 0xca, 0x81, 0x8d,
-	0x20, 0xc7, 0xe4, 0x92, 0x63, 0x72, 0x89, 0xba, 0xaa, 0xfa, 0x67, 0x66, 0xaa, 0x7b, 0x7a, 0x06,
-	0x2f, 0x70, 0x62, 0xba, 0xdf, 0xab, 0xf7, 0xde, 0xf7, 0xd5, 0x7b, 0xaf, 0xab, 0x9e, 0x81, 0xa2,
-	0x43, 0x1a, 0x0e, 0x31, 0x89, 0x4a, 0xfc, 0x26, 0x76, 0xb7, 0x2d, 0xdf, 0x34, 0xd4, 0x1d, 0x1f,
-	0xbb, 0xad, 0x52, 0xd3, 0x75, 0x3c, 0x07, 0x21, 0x2e, 0x2f, 0xc5, 0x72, 0xf9, 0x68, 0xdd, 0xa9,
-	0x3b, 0x54, 0xac, 0x06, 0xbf, 0x98, 0xa6, 0x5c, 0xac, 0x51, 0x55, 0x75, 0x4b, 0x27, 0x58, 0xdd,
-	0x3d, 0xb7, 0x85, 0x3d, 0xfd, 0x9c, 0x5a, 0x73, 0x4c, 0x9b, 0xcb, 0x4f, 0xd4, 0x1d, 0xa7, 0x6e,
-	0x61, 0x55, 0x6f, 0x9a, 0xaa, 0x6e, 0xdb, 0x8e, 0xa7, 0x7b, 0xa6, 0x63, 0x13, 0x2e, 0x9d, 0xe2,
-	0x52, 0xfa, 0xb4, 0xe5, 0x6f, 0xab, 0x9e, 0xd9, 0xc0, 0xc4, 0xd3, 0x1b, 0xcd, 0xd0, 0x7c, 0xa7,
-	0x82, 0xe1, 0xbb, 0xd4, 0x02, 0x97, 0x4f, 0x0b, 0x80, 0xc4, 0x3f, 0x43, 0x2f, 0x02, 0xa5, 0xa6,
-	0xee, 0xea, 0x8d, 0x30, 0x8c, 0xc9, 0x50, 0xc1, 0x72, 0x6a, 0x0f, 0xfc, 0x26, 0xfd, 0x87, 0x8b,
-	0xe6, 0x93, 0xf8, 0x28, 0x45, 0x11, 0xca, 0xa6, 0x5e, 0x37, 0xed, 0x64, 0x30, 0xa7, 0xb9, 0x2e,
-	0xf1, 0xf4, 0x07, 0xa6, 0x5d, 0x8f, 0x14, 0xf9, 0x33, 0xd3, 0x52, 0x8e, 0x02, 0x7a, 0x2f, 0xb0,
-	0xb3, 0x46, 0x23, 0xa8, 0xe2, 0x1d, 0x1f, 0x13, 0x4f, 0xb9, 0x03, 0x47, 0xda, 0xde, 0x92, 0xa6,
-	0x63, 0x13, 0x8c, 0x96, 0x60, 0x94, 0x45, 0x3a, 0x21, 0x9d, 0x92, 0xe6, 0x0e, 0x2c, 0xc8, 0xa5,
-	0xee, 0x9d, 0x29, 0xb1, 0x35, 0x95, 0x91, 0xcf, 0x1f, 0x4f, 0x0d, 0x55, 0xb9, 0xbe, 0x32, 0x07,
-	0xe3, 0x65, 0x42, 0xb0, 0x77, 0xb7, 0xd5, 0xc4, 0xdc, 0x09, 0x3a, 0x0a, 0xaf, 0x18, 0xd8, 0x76,
-	0x1a, 0xd4, 0xd8, 0xfe, 0x2a, 0x7b, 0x50, 0xbe, 0x0b, 0x87, 0x13, 0x9a, 0xdc, 0xf1, 0x0a, 0x80,
-	0x1e, 0xbc, 0xd4, 0xbc, 0x56, 0x13, 0x53, 0xfd, 0x83, 0x0b, 0xb3, 0x22, 0xe7, 0xeb, 0xd1, 0xcf,
-	0xd8, 0xc8, 0x7e, 0x3d, 0xfc, 0xa9, 0x20, 0x18, 0x2f, 0x5b, 0x16, 0x15, 0x45, 0x58, 0x37, 0xe1,
-	0x70, 0xe2, 0x1d, 0x77, 0x58, 0x86, 0x51, 0xba, 0x2a, 0x40, 0x3a, 0x3c, 0x77, 0x60, 0x61, 0x3a,
-	0x87, 0xb3, 0x10, 0x32, 0x5b, 0xa8, 0x94, 0xe0, 0x55, 0xfa, 0xfa, 0xb6, 0x6f, 0x79, 0x66, 0xd3,
-	0x32, 0xb1, 0x9b, 0x0d, 0xfc, 0xa7, 0x12, 0x1c, 0xeb, 0x5a, 0xc0, 0xc3, 0x69, 0x82, 0x1c, 0xf8,
-	0xd7, 0xf0, 0x8e, 0x6f, 0xee, 0xea, 0x16, 0xb6, 0x3d, 0xad, 0x11, 0x69, 0xf1, 0xcd, 0x58, 0x10,
-	0x85, 0x78, 0x87, 0x34, 0x9c, 0xeb, 0xd1, 0xa2, 0xa4, 0xe5, 0x9a, 0xe3, 0x1a, 0xd5, 0x09, 0x27,
-	0x45, 0xae, 0x7c, 0x24, 0xc1, 0x6b, 0x31, 0xbe, 0x55, 0xdb, 0xc3, 0x6e, 0x03, 0x1b, 0xa6, 0xee,
-	0xb6, 0xca, 0xb5, 0x9a, 0xe3, 0xdb, 0xde, 0xaa, 0xbd, 0xed, 0x88, 0x91, 0xa0, 0x49, 0xd8, 0xb7,
-	0xab, 0x5b, 0x9a, 0x6e, 0x18, 0xee, 0x44, 0x81, 0x0a, 0xc6, 0x76, 0x75, 0xab, 0x6c, 0x18, 0x6e,
-	0x20, 0xaa, 0xeb, 0x7e, 0x1d, 0x6b, 0xa6, 0x31, 0x31, 0x7c, 0x4a, 0x9a, 0x1b, 0xa9, 0x8e, 0xd1,
-	0xe7, 0x55, 0x03, 0x4d, 0xc0, 0x58, 0xb0, 0x02, 0x13, 0x32, 0x31, 0xc2, 0x16, 0xf1, 0x47, 0xe5,
-	0x3e, 0x14, 0xcb, 0x96, 0x25, 0x88, 0x21, 0xdc, 0xc3, 0x20, 0x3f, 0xe2, 0xfc, 0xe7, 0x7c, 0xcc,
-	0x94, 0x58, 0x01, 0x94, 0x82, 0x62, 0x29, 0xb1, 0x7e, 0xc2, 0x6b, 0xa0, 0xb4, 0xa6, 0xd7, 0xc3,
-	0x34, 0xac, 0x26, 0x56, 0x2a, 0x7f, 0x92, 0x60, 0x2a, 0xd5, 0x15, 0xdf, 0x8b, 0x7b, 0xb0, 0x4f,
-	0xe7, 0xef, 0x78, 0x72, 0x5c, 0xc8, 0x4e, 0x8e, 0x14, 0xf2, 0x78, 0xba, 0x44, 0xc6, 0xd0, 0x8d,
-	0x36, 0x10, 0x05, 0x0a, 0x62, 0xb6, 0x27, 0x08, 0x16, 0x55, 0x1b, 0x8a, 0xab, 0x30, 0x7d, 0xcd,
-	0xb1, 0x6d, 0x5c, 0xf3, 0xb0, 0xc8, 0x79, 0x48, 0xda, 0x31, 0x18, 0x0b, 0x5a, 0x4b, 0xb0, 0x15,
-	0x12, 0xdd, 0x8a, 0xd1, 0xe0, 0x71, 0xd5, 0x50, 0xde, 0x87, 0xd3, 0xd9, 0xeb, 0x39, 0x13, 0x77,
-	0x60, 0x8c, 0x07, 0xcf, 0x29, 0x1f, 0x8c, 0x88, 0x6a, 0x68, 0x45, 0x59, 0x81, 0x12, 0x6d, 0x3b,
-	0x77, 0x1d, 0x4f, 0xb7, 0x96, 0xb1, 0x85, 0xeb, 0x14, 0x50, 0xa5, 0xb5, 0xa9, 0x5b, 0xa6, 0xa1,
-	0x7b, 0x8e, 0xbb, 0xe2, 0xb8, 0xcb, 0x41, 0x8e, 0x65, 0x97, 0x52, 0x13, 0xd4, 0xdc, 0x76, 0x38,
-	0x96, 0x2b, 0x1d, 0x05, 0x3f, 0x25, 0x82, 0x12, 0x9b, 0x22, 0x1d, 0xc5, 0xfe, 0xa8, 0x00, 0x07,
-	0x12, 0xd2, 0xb6, 0x12, 0x90, 0xda, 0x4b, 0x00, 0xc3, 0x01, 0xbd, 0x11, 0xc0, 0xd5, 0xc8, 0x36,
-	0x31, 0x58, 0x81, 0x54, 0x96, 0x03, 0x6b, 0x7f, 0x7f, 0x3c, 0x35, 0x53, 0x37, 0xbd, 0xfb, 0xfe,
-	0x56, 0xa9, 0xe6, 0x34, 0x54, 0xde, 0xbf, 0xd9, 0x3f, 0x67, 0x89, 0xf1, 0x40, 0x0d, 0xba, 0x1f,
-	0x29, 0xad, 0xda, 0xde, 0x7f, 0x1e, 0x4f, 0xa1, 0x96, 0xde, 0xb0, 0x2e, 0x2b, 0x09, 0x53, 0x4a,
-	0x15, 0xd8, 0xd3, 0xfa, 0x36, 0x31, 0xd0, 0x0e, 0x1c, 0xea, 0x68, 0x19, 0xb4, 0xe0, 0xf6, 0x57,
-	0x6e, 0xf6, 0xed, 0xea, 0x55, 0xe6, 0xaa, 0xc3, 0x9c, 0x52, 0x3d, 0xd8, 0xde, 0x3d, 0x94, 0x69,
-	0x78, 0x8d, 0x32, 0x1e, 0xef, 0x78, 0x82, 0x92, 0xb0, 0xdd, 0x7e, 0x2a, 0x81, 0x92, 0xa5, 0xc5,
-	0xf7, 0xe3, 0x91, 0x04, 0x87, 0xbd, 0x40, 0x4d, 0x33, 0x62, 0x29, 0xa3, 0xb2, 0xb2, 0xd1, 0x37,
-	0x82, 0x69, 0x86, 0x80, 0x19, 0x8c, 0x37, 0x34, 0x69, 0x5b, 0xa9, 0x8e, 0x7b, 0xed, 0xe9, 0x42,
-	0x94, 0x8f, 0xdb, 0x9a, 0x60, 0x2c, 0x29, 0x37, 0x92, 0x75, 0xf4, 0x06, 0x1c, 0xe6, 0x76, 0x1c,
-	0x57, 0x0b, 0x5b, 0x18, 0xdb, 0xf4, 0xf1, 0x48, 0x50, 0x66, 0xef, 0x03, 0xe5, 0xdd, 0x30, 0x09,
-	0x23, 0x65, 0xd6, 0x24, 0xc7, 0x23, 0x41, 0xa8, 0x1c, 0x65, 0xf7, 0x70, 0x32, 0xbb, 0x3f, 0x92,
-	0x40, 0xc9, 0x8a, 0x8a, 0x33, 0x58, 0x83, 0x51, 0x96, 0x0e, 0x3c, 0xa3, 0x27, 0xdb, 0x5a, 0x49,
-	0xd8, 0x44, 0xae, 0x39, 0xa6, 0x5d, 0x79, 0x33, 0x20, 0xf4, 0xb3, 0x2f, 0xa7, 0xe6, 0x72, 0x10,
-	0x1a, 0x2c, 0x20, 0x55, 0x6e, 0x5a, 0xd9, 0x84, 0x59, 0xe1, 0x3e, 0x56, 0x5a, 0xcb, 0x21, 0xf2,
-	0x41, 0x68, 0x52, 0x7e, 0x3b, 0x0c, 0x73, 0xbd, 0x0d, 0x73, 0xa4, 0x1f, 0xc0, 0x49, 0xe1, 0x9e,
-	0x6a, 0x2e, 0xfd, 0xca, 0x85, 0x25, 0x5d, 0xca, 0xee, 0x4e, 0xb1, 0x13, 0xf6, 0x71, 0xe4, 0x15,
-	0x7e, 0x9c, 0xa4, 0x6a, 0x10, 0xf4, 0x43, 0xf8, 0x5a, 0x5b, 0x92, 0x62, 0x43, 0x0b, 0x4e, 0x9b,
-	0xc1, 0x8e, 0xee, 0x39, 0xe5, 0x47, 0x92, 0xe9, 0x89, 0x0d, 0xfa, 0x12, 0xfd, 0x4c, 0x82, 0x22,
-	0x8b, 0x20, 0x71, 0x34, 0x08, 0x4e, 0x78, 0xd8, 0xd0, 0xf8, 0xee, 0x0f, 0xd3, 0xd6, 0x9c, 0x11,
-	0x8a, 0xca, 0x43, 0x99, 0xcd, 0x19, 0x4a, 0xf5, 0x38, 0xf5, 0x18, 0x17, 0xfe, 0x3a, 0xf5, 0xc7,
-	0xd2, 0x4f, 0xb1, 0xe1, 0xeb, 0x31, 0xa7, 0x1b, 0xb6, 0xb1, 0x67, 0x39, 0x11, 0x57, 0x43, 0x21,
-	0x59, 0x0d, 0xff, 0x2d, 0xc0, 0x7c, 0x1e, 0x87, 0x2f, 0x3c, 0x57, 0x7e, 0x24, 0xc1, 0x31, 0xb6,
-	0x55, 0xbe, 0xfd, 0x1c, 0xd2, 0x85, 0x25, 0xe6, 0x46, 0xec, 0x8a, 0x25, 0xcc, 0x2d, 0x38, 0x44,
-	0x5a, 0xb6, 0x77, 0x1f, 0x7b, 0x66, 0x4d, 0x0b, 0xbe, 0xf7, 0x64, 0x62, 0x98, 0x3a, 0x3f, 0x19,
-	0x21, 0x66, 0xd7, 0x8e, 0xd2, 0x7a, 0xa8, 0x76, 0xcb, 0xa9, 0x3d, 0xe0, 0x00, 0x0f, 0x92, 0xe4,
-	0x4b, 0xa2, 0xec, 0xc0, 0x99, 0x94, 0x2a, 0x8d, 0xbe, 0xb4, 0x6d, 0x9f, 0x6b, 0x61, 0xf7, 0x93,
-	0x7a, 0x75, 0xbf, 0xb6, 0xfd, 0xfe, 0x54, 0x82, 0xb3, 0x39, 0x7d, 0xbe, 0xe8, 0x2d, 0x57, 0x1e,
-	0xc2, 0xd2, 0x75, 0xe2, 0x99, 0x0d, 0xdd, 0xc3, 0x5d, 0x86, 0xc2, 0x82, 0xf9, 0x0a, 0xa9, 0xfa,
-	0xbd, 0x04, 0x97, 0x06, 0xf0, 0xcf, 0x69, 0x4b, 0xed, 0x6d, 0xd2, 0xf3, 0xe9, 0x6d, 0xca, 0x06,
-	0xcc, 0x88, 0x4f, 0x71, 0xcf, 0xf6, 0x69, 0xf9, 0x64, 0x04, 0x66, 0x7b, 0xda, 0x7d, 0xe1, 0xdd,
-	0x42, 0x87, 0x23, 0x6d, 0xee, 0x58, 0x40, 0xbc, 0x51, 0xcc, 0x87, 0xdc, 0x87, 0x77, 0xf9, 0x90,
-	0xfe, 0xa4, 0x1d, 0xb6, 0x82, 0xfb, 0x42, 0x46, 0x97, 0x24, 0x7d, 0x83, 0x87, 0x5f, 0x9e, 0x8f,
-	0xd7, 0xc8, 0xf3, 0xfd, 0x78, 0x9d, 0x84, 0xe3, 0x34, 0x35, 0x36, 0xec, 0xa6, 0xe3, 0x58, 0xf7,
-	0xee, 0x9b, 0x1e, 0xb6, 0x4c, 0x12, 0x9e, 0xf4, 0x94, 0x4b, 0x70, 0x42, 0x2c, 0xe6, 0x8c, 0x4e,
-	0xc2, 0xbe, 0x40, 0xa0, 0x99, 0x3c, 0x33, 0x46, 0xaa, 0x63, 0xc1, 0xf3, 0xaa, 0x41, 0x94, 0x2d,
-	0x38, 0xbf, 0x41, 0xb0, 0x7b, 0xcd, 0xb1, 0x6b, 0xd8, 0xf6, 0xdc, 0x80, 0x84, 0x38, 0x41, 0xd6,
-	0x1c, 0x62, 0xd2, 0x1e, 0x16, 0x11, 0x34, 0x50, 0x66, 0xff, 0x46, 0x82, 0xb7, 0xfa, 0x73, 0xc2,
-	0xe3, 0xfe, 0x01, 0x9c, 0xac, 0x59, 0x1a, 0x0d, 0xdd, 0x27, 0xd8, 0xd5, 0x9a, 0x5c, 0xb5, 0x23,
-	0xcd, 0x17, 0x45, 0x69, 0x9e, 0x74, 0xb6, 0xe6, 0x38, 0x56, 0x10, 0x40, 0xe8, 0xaa, 0x2d, 0xdd,
-	0x27, 0x6b, 0x96, 0x58, 0x4e, 0x14, 0x0c, 0x8b, 0x39, 0xe2, 0x8e, 0xbf, 0xed, 0x76, 0x7d, 0x20,
-	0x7e, 0x7e, 0x27, 0xc1, 0xc5, 0xbe, 0xfd, 0xbc, 0x1c, 0x14, 0x2d, 0xfc, 0xf1, 0x04, 0xbc, 0x42,
-	0x73, 0x0f, 0xfd, 0x58, 0x82, 0x51, 0x36, 0x63, 0x43, 0x33, 0x22, 0x6f, 0xdd, 0xe3, 0x3c, 0x79,
-	0xb6, 0xa7, 0x1e, 0x43, 0xa9, 0xcc, 0x3f, 0xfa, 0xeb, 0x3f, 0x3f, 0x2e, 0x9c, 0x46, 0x8a, 0x2a,
-	0x18, 0x52, 0xc6, 0x93, 0x46, 0xea, 0xfc, 0x27, 0x12, 0xec, 0x8f, 0x86, 0x6c, 0xe8, 0xb4, 0xc8,
-	0x45, 0xe7, 0xc8, 0x4f, 0x7e, 0xbd, 0x87, 0x16, 0x0f, 0xa3, 0x44, 0xc3, 0x98, 0x43, 0x33, 0x59,
-	0x61, 0xc4, 0x03, 0x41, 0x16, 0x4a, 0x38, 0xc3, 0x4b, 0x09, 0xa5, 0x63, 0xec, 0x97, 0x12, 0x4a,
-	0xe7, 0x20, 0x30, 0x67, 0x28, 0x96, 0xa5, 0xb1, 0x41, 0x00, 0xfa, 0x85, 0x04, 0x87, 0x3a, 0xa6,
-	0x78, 0x68, 0x3e, 0x15, 0x75, 0xd7, 0x6c, 0x50, 0x7e, 0x23, 0x97, 0x2e, 0x0f, 0xee, 0x2d, 0x1a,
-	0x5c, 0x09, 0x9d, 0xe9, 0xcd, 0x53, 0x3c, 0x2e, 0x44, 0x7f, 0x90, 0xe0, 0x58, 0xca, 0x90, 0x0b,
-	0x2d, 0xa4, 0xb0, 0x92, 0x31, 0x7c, 0x93, 0xcf, 0xf7, 0xb5, 0x86, 0x87, 0x7e, 0x85, 0x86, 0x7e,
-	0x11, 0x5d, 0xe8, 0xc5, 0xab, 0x99, 0xb0, 0xa2, 0x45, 0xb3, 0xb2, 0x2f, 0x25, 0x38, 0x91, 0x35,
-	0xa3, 0x42, 0x17, 0x53, 0x0a, 0xb1, 0xd7, 0x54, 0x4c, 0x5e, 0xea, 0x7f, 0x21, 0x87, 0x74, 0x8b,
-	0x42, 0x5a, 0x41, 0xcb, 0x59, 0x90, 0x6a, 0xa1, 0x25, 0x21, 0x30, 0xf5, 0x43, 0x3e, 0x91, 0x7b,
-	0x88, 0x7e, 0x1d, 0xce, 0x49, 0x32, 0xe7, 0x57, 0xa8, 0x92, 0x5a, 0xda, 0xb9, 0x87, 0x68, 0xf2,
-	0xb5, 0x67, 0xb2, 0xc1, 0xd1, 0x0f, 0xa1, 0x3f, 0x4b, 0x20, 0xa7, 0x4f, 0x76, 0x90, 0x70, 0x38,
-	0xd8, 0x73, 0x5e, 0x24, 0x2f, 0xf6, 0xbb, 0x8c, 0xc7, 0x73, 0x95, 0xee, 0xc6, 0x12, 0x5a, 0xec,
-	0x95, 0x60, 0xe2, 0x71, 0x10, 0xfa, 0x8b, 0x04, 0x72, 0xfa, 0x94, 0x05, 0x5d, 0xc8, 0x7b, 0xe4,
-	0x6b, 0x9b, 0x15, 0x89, 0xd1, 0xf4, 0x1e, 0xe6, 0x28, 0xef, 0x50, 0x34, 0x97, 0xd1, 0x52, 0x16,
-	0x1a, 0xf1, 0x51, 0x95, 0x9d, 0xa4, 0xd0, 0xbf, 0x25, 0x38, 0xd5, 0x6b, 0xa2, 0x82, 0xde, 0xce,
-	0x1b, 0x9e, 0xe0, 0x32, 0x2f, 0x7f, 0x63, 0xb0, 0xc5, 0x1c, 0xe1, 0xbb, 0x14, 0xe1, 0x4d, 0xb4,
-	0xd2, 0x37, 0x42, 0xa2, 0x7e, 0xd8, 0x75, 0x06, 0x78, 0x88, 0x1e, 0x15, 0x92, 0x53, 0xb2, 0xb4,
-	0xb9, 0x00, 0xba, 0x92, 0x1d, 0x74, 0x8f, 0x01, 0x86, 0x7c, 0x75, 0xd0, 0xe5, 0x1c, 0xf5, 0xf7,
-	0x29, 0xea, 0x7b, 0x68, 0x23, 0x27, 0x6a, 0x3f, 0x69, 0x50, 0xdb, 0x6a, 0x69, 0x11, 0x72, 0x21,
-	0x09, 0xff, 0x93, 0xe0, 0xf5, 0x5c, 0x97, 0x65, 0xf4, 0x4e, 0x1f, 0x9b, 0x27, 0xbc, 0xb0, 0xca,
-	0xe5, 0x67, 0xb0, 0xc0, 0xd9, 0xb8, 0x4d, 0xd9, 0xb8, 0x81, 0xae, 0xf7, 0x9f, 0x03, 0x01, 0x17,
-	0xf1, 0x7d, 0x99, 0xfd, 0x1d, 0xea, 0x57, 0x05, 0x38, 0xd7, 0xf7, 0xfd, 0x17, 0xdd, 0x12, 0xe1,
-	0x18, 0xf4, 0x1a, 0x2f, 0xdf, 0xde, 0x23, 0x6b, 0x9c, 0xa1, 0xef, 0x51, 0x86, 0x36, 0xd1, 0xdd,
-	0x2c, 0x86, 0x30, 0x37, 0xaf, 0x65, 0x35, 0x04, 0x11, 0x61, 0xff, 0x0a, 0x3b, 0xb8, 0xf0, 0x56,
-	0x8c, 0x2e, 0xe7, 0xff, 0x4e, 0x74, 0x15, 0xca, 0xdb, 0x03, 0xad, 0xe5, 0xa8, 0x37, 0x28, 0xea,
-	0x3b, 0xe8, 0x76, 0x16, 0xea, 0xce, 0xbf, 0x16, 0xf4, 0xae, 0x8e, 0xcf, 0x24, 0x38, 0xd4, 0x71,
-	0x95, 0x43, 0x6a, 0x6a, 0x9c, 0xe2, 0x3b, 0xa1, 0xfc, 0x66, 0xfe, 0x05, 0xfd, 0x9c, 0xda, 0x7c,
-	0xba, 0x58, 0x7b, 0x3f, 0x0a, 0xec, 0x93, 0x02, 0x9c, 0xe9, 0xe7, 0x72, 0x87, 0x6e, 0x88, 0x02,
-	0x1b, 0xe0, 0x0e, 0x2a, 0xdf, 0x7c, 0x76, 0x43, 0x1c, 0xf9, 0x26, 0x45, 0xbe, 0x86, 0xde, 0xcd,
-	0xfc, 0x26, 0xb3, 0xa3, 0x50, 0x72, 0x2a, 0x61, 0x45, 0xd7, 0x2d, 0x71, 0xaf, 0xff, 0x65, 0x01,
-	0xd4, 0x3e, 0x2f, 0x76, 0xe8, 0x9b, 0x03, 0xa2, 0x12, 0xdc, 0x42, 0xe5, 0x6f, 0xed, 0x89, 0x2d,
-	0x4e, 0xd2, 0xb7, 0x29, 0x49, 0xeb, 0xe8, 0xbd, 0x3c, 0x24, 0xf9, 0x09, 0x0b, 0x3d, 0x79, 0xaa,
-	0xac, 0x7d, 0xfe, 0xa4, 0x28, 0x7d, 0xf1, 0xa4, 0x28, 0xfd, 0xe3, 0x49, 0x51, 0xfa, 0xf9, 0xd3,
-	0xe2, 0xd0, 0x17, 0x4f, 0x8b, 0x43, 0x7f, 0x7b, 0x5a, 0x1c, 0xfa, 0xce, 0x62, 0x62, 0x7c, 0xc2,
-	0xdd, 0x9e, 0xb5, 0xf4, 0x2d, 0x12, 0xc5, 0xb0, 0x7b, 0xee, 0x92, 0xfa, 0x41, 0x32, 0x12, 0x3a,
-	0x52, 0xd9, 0x1a, 0xa5, 0xff, 0x8b, 0xe4, 0xfc, 0xff, 0x03, 0x00, 0x00, 0xff, 0xff, 0xf4, 0xc7,
-	0xc3, 0x8a, 0xc3, 0x23, 0x00, 0x00,
+	// 2042 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x5a, 0x4d, 0x6c, 0x14, 0xd7,
+	0x1d, 0x67, 0xd6, 0x8e, 0x0d, 0x7f, 0x24, 0x30, 0x0f, 0x12, 0xec, 0x01, 0xd6, 0x64, 0x4c, 0xb0,
+	0xeb, 0xc0, 0x4c, 0x30, 0xc1, 0x18, 0x52, 0x50, 0x76, 0x31, 0x26, 0x6e, 0x21, 0x38, 0x6b, 0x6c,
+	0xd4, 0x2f, 0x4d, 0xc7, 0x3b, 0xcf, 0xeb, 0x91, 0x67, 0xe7, 0xad, 0xe7, 0xcd, 0x38, 0x59, 0x45,
+	0xb4, 0x52, 0xaa, 0x4a, 0x8d, 0x7a, 0x68, 0xa5, 0x1c, 0xaa, 0xdc, 0x7a, 0xe9, 0xa1, 0x39, 0xb4,
+	0xb7, 0x56, 0x95, 0x7a, 0x69, 0x7b, 0x89, 0x54, 0x55, 0x8a, 0xd4, 0x4b, 0xd5, 0x03, 0x89, 0xa0,
+	0xc7, 0xf6, 0xd2, 0x63, 0x7b, 0xa9, 0xe6, 0xbd, 0x37, 0x1f, 0xbb, 0x9e, 0x8f, 0xdd, 0x85, 0x42,
+	0x4e, 0xec, 0xcc, 0xff, 0xf3, 0xf7, 0xff, 0x7a, 0xf3, 0xfe, 0x06, 0xca, 0x84, 0x36, 0x09, 0xb5,
+	0xa8, 0x46, 0xfd, 0x16, 0x76, 0x37, 0x6d, 0xdf, 0x32, 0xb5, 0x1d, 0x1f, 0xbb, 0x6d, 0xb5, 0xe5,
+	0x12, 0x8f, 0x20, 0x24, 0xe8, 0x6a, 0x4c, 0x97, 0x8f, 0x35, 0x48, 0x83, 0x30, 0xb2, 0x16, 0xfc,
+	0xe2, 0x9c, 0x72, 0xb9, 0xce, 0x58, 0xb5, 0x0d, 0x83, 0x62, 0x6d, 0xf7, 0xc2, 0x06, 0xf6, 0x8c,
+	0x0b, 0x5a, 0x9d, 0x58, 0x8e, 0xa0, 0x9f, 0x6c, 0x10, 0xd2, 0xb0, 0xb1, 0x66, 0xb4, 0x2c, 0xcd,
+	0x70, 0x1c, 0xe2, 0x19, 0x9e, 0x45, 0x1c, 0x2a, 0xa8, 0x93, 0x82, 0xca, 0x9e, 0x36, 0xfc, 0x4d,
+	0xcd, 0xb3, 0x9a, 0x98, 0x7a, 0x46, 0xb3, 0x15, 0xaa, 0xef, 0x66, 0x30, 0x7d, 0x97, 0x69, 0x10,
+	0xf4, 0xa9, 0x14, 0x20, 0xf1, 0xcf, 0xd0, 0x4a, 0x0a, 0x53, 0xcb, 0x70, 0x8d, 0x66, 0xe8, 0xc6,
+	0x44, 0xc8, 0x60, 0x93, 0xfa, 0xb6, 0xdf, 0x62, 0xff, 0x08, 0xd2, 0x6c, 0x12, 0x1f, 0x0b, 0x51,
+	0x84, 0xb2, 0x65, 0x34, 0x2c, 0x27, 0xe9, 0xcc, 0x19, 0xc1, 0x4b, 0x3d, 0x63, 0xdb, 0x72, 0x1a,
+	0x11, 0xa3, 0x78, 0xe6, 0x5c, 0xca, 0x31, 0x40, 0xef, 0x04, 0x7a, 0x56, 0x98, 0x07, 0x35, 0xbc,
+	0xe3, 0x63, 0xea, 0x29, 0x77, 0xe1, 0x68, 0xc7, 0x5b, 0xda, 0x22, 0x0e, 0xc5, 0x68, 0x01, 0x46,
+	0xb8, 0xa7, 0xe3, 0xd2, 0x69, 0x69, 0xe6, 0xe0, 0x9c, 0xac, 0xee, 0xcd, 0x8c, 0xca, 0x65, 0xaa,
+	0xc3, 0x9f, 0x3e, 0x9c, 0xdc, 0x57, 0x13, 0xfc, 0xca, 0x0c, 0x8c, 0x55, 0x28, 0xc5, 0xde, 0xbd,
+	0x76, 0x0b, 0x0b, 0x23, 0xe8, 0x18, 0xbc, 0x60, 0x62, 0x87, 0x34, 0x99, 0xb2, 0x03, 0x35, 0xfe,
+	0xa0, 0x7c, 0x0b, 0x8e, 0x24, 0x38, 0x85, 0xe1, 0x25, 0x00, 0x23, 0x78, 0xa9, 0x7b, 0xed, 0x16,
+	0x66, 0xfc, 0x87, 0xe6, 0xa6, 0xd3, 0x8c, 0xaf, 0x46, 0x3f, 0x63, 0x25, 0x07, 0x8c, 0xf0, 0xa7,
+	0x82, 0x60, 0xac, 0x62, 0xdb, 0x8c, 0x14, 0x61, 0x5d, 0x87, 0x23, 0x89, 0x77, 0xc2, 0x60, 0x05,
+	0x46, 0x98, 0x54, 0x80, 0x74, 0x68, 0xe6, 0xe0, 0xdc, 0x54, 0x0f, 0xc6, 0x42, 0xc8, 0x5c, 0x50,
+	0x51, 0xe1, 0x25, 0xf6, 0xfa, 0x8e, 0x6f, 0x7b, 0x56, 0xcb, 0xb6, 0xb0, 0x9b, 0x0f, 0xfc, 0xc7,
+	0x12, 0x1c, 0xdf, 0x23, 0x20, 0xdc, 0x69, 0x81, 0x1c, 0xd8, 0xd7, 0xf1, 0x8e, 0x6f, 0xed, 0x1a,
+	0x36, 0x76, 0x3c, 0xbd, 0x19, 0x71, 0x89, 0x64, 0xcc, 0xa5, 0xb9, 0x78, 0x97, 0x36, 0xc9, 0xcd,
+	0x48, 0x28, 0xa9, 0xb9, 0x4e, 0x5c, 0xb3, 0x36, 0x4e, 0x32, 0xe8, 0xca, 0x87, 0x12, 0xbc, 0x1c,
+	0xe3, 0x5b, 0x76, 0x3c, 0xec, 0x36, 0xb1, 0x69, 0x19, 0x6e, 0xbb, 0x52, 0xaf, 0x13, 0xdf, 0xf1,
+	0x96, 0x9d, 0x4d, 0x92, 0x8e, 0x04, 0x4d, 0xc0, 0xfe, 0x5d, 0xc3, 0xd6, 0x0d, 0xd3, 0x74, 0xc7,
+	0x4b, 0x8c, 0x30, 0xba, 0x6b, 0xd8, 0x15, 0xd3, 0x74, 0x03, 0x52, 0xc3, 0xf0, 0x1b, 0x58, 0xb7,
+	0xcc, 0xf1, 0xa1, 0xd3, 0xd2, 0xcc, 0x70, 0x6d, 0x94, 0x3d, 0x2f, 0x9b, 0x68, 0x1c, 0x46, 0x03,
+	0x09, 0x4c, 0xe9, 0xf8, 0x30, 0x17, 0x12, 0x8f, 0xca, 0x16, 0x94, 0x2b, 0xb6, 0x9d, 0xe2, 0x43,
+	0x98, 0xc3, 0xa0, 0x3e, 0xe2, 0xfa, 0x17, 0xf1, 0x38, 0xab, 0xf2, 0x06, 0x50, 0x83, 0x66, 0x51,
+	0xf9, 0x3c, 0x11, 0x3d, 0xa0, 0xae, 0x18, 0x8d, 0xb0, 0x0c, 0x6b, 0x09, 0x49, 0xe5, 0x4f, 0x12,
+	0x4c, 0x66, 0x9a, 0x12, 0xb9, 0xb8, 0x0f, 0xfb, 0x0d, 0xf1, 0x4e, 0x14, 0xc7, 0xa5, 0xfc, 0xe2,
+	0xc8, 0x08, 0x9e, 0x28, 0x97, 0x48, 0x19, 0xba, 0xd5, 0x01, 0xa2, 0xc4, 0x40, 0x4c, 0x17, 0x82,
+	0xe0, 0x5e, 0x75, 0xa0, 0xb8, 0x0e, 0x53, 0x37, 0x88, 0xe3, 0xe0, 0xba, 0x87, 0xd3, 0x8c, 0x87,
+	0x41, 0x3b, 0x0e, 0xa3, 0xc1, 0x68, 0x09, 0x52, 0x21, 0xb1, 0x54, 0x8c, 0x04, 0x8f, 0xcb, 0xa6,
+	0xf2, 0x2e, 0x9c, 0xc9, 0x97, 0x17, 0x91, 0xb8, 0x0b, 0xa3, 0xc2, 0x79, 0x11, 0xf2, 0xc1, 0x02,
+	0x51, 0x0b, 0xb5, 0x28, 0x4b, 0xa0, 0xb2, 0xb1, 0x73, 0x8f, 0x78, 0x86, 0xbd, 0x88, 0x6d, 0xdc,
+	0x60, 0x80, 0xaa, 0xed, 0x75, 0xc3, 0xb6, 0x4c, 0xc3, 0x23, 0xee, 0x12, 0x71, 0x17, 0x83, 0x1a,
+	0xcb, 0x6f, 0xa5, 0x16, 0x68, 0x3d, 0xeb, 0x11, 0x58, 0xae, 0x75, 0x35, 0xfc, 0x64, 0x1a, 0x94,
+	0x58, 0x15, 0xed, 0x6a, 0xf6, 0x2f, 0x24, 0x38, 0x98, 0xa0, 0x76, 0xb4, 0x80, 0xd4, 0xd9, 0x02,
+	0xf7, 0xe0, 0xa0, 0xd1, 0x0c, 0xe0, 0xea, 0x74, 0x93, 0x9a, 0xbc, 0x41, 0xaa, 0x17, 0x03, 0x6d,
+	0x7f, 0x7f, 0x38, 0xf9, 0x22, 0x4f, 0x37, 0x35, 0xb7, 0x55, 0x8b, 0x68, 0x4d, 0xc3, 0xdb, 0x52,
+	0x97, 0x1d, 0xef, 0xdf, 0x0f, 0x27, 0x51, 0xdb, 0x68, 0xda, 0x57, 0x95, 0x84, 0xa4, 0x52, 0x03,
+	0xfe, 0xb4, 0xba, 0x49, 0x4d, 0xf4, 0x5d, 0x38, 0xdc, 0x35, 0x21, 0x58, 0x7f, 0x1d, 0xa8, 0x5e,
+	0x2e, 0xd2, 0xfc, 0x12, 0xd7, 0xdc, 0x25, 0xad, 0xd4, 0x0e, 0x75, 0xce, 0x06, 0x65, 0x0a, 0x5e,
+	0x66, 0xf1, 0x8c, 0xf3, 0x99, 0x00, 0x1c, 0x0e, 0xd3, 0x9f, 0x49, 0xa0, 0xe4, 0x71, 0x89, 0x68,
+	0xef, 0xc0, 0x11, 0x2f, 0xe0, 0xd2, 0xcd, 0x98, 0xc8, 0xe3, 0x54, 0x5d, 0x2c, 0xf2, 0x77, 0x8a,
+	0xfb, 0xcb, 0xe5, 0xe3, 0xe4, 0x24, 0x55, 0x29, 0xb5, 0x31, 0xaf, 0x33, 0xf5, 0x54, 0xf9, 0xa8,
+	0x63, 0xa0, 0xc5, 0x94, 0x4a, 0x33, 0xd9, 0x13, 0xaf, 0xc2, 0x11, 0xa1, 0x87, 0xb8, 0x7a, 0x38,
+	0x8e, 0x78, 0x02, 0xc7, 0x22, 0x42, 0x85, 0xbf, 0x0f, 0x98, 0x77, 0xc3, 0x82, 0x8a, 0x98, 0xf9,
+	0xc0, 0x1b, 0x8b, 0x08, 0x21, 0x73, 0x54, 0xa9, 0x43, 0xc9, 0x4a, 0xfd, 0x50, 0x02, 0x25, 0xcf,
+	0x2b, 0x11, 0xaf, 0x3a, 0x8c, 0xf0, 0x5c, 0x8b, 0xea, 0x9c, 0xe8, 0x18, 0x0b, 0xe1, 0x40, 0xb8,
+	0x41, 0x2c, 0xa7, 0xfa, 0x5a, 0x10, 0xbf, 0x4f, 0x3e, 0x9f, 0x9c, 0x69, 0x58, 0xde, 0x96, 0xbf,
+	0xa1, 0xd6, 0x49, 0x53, 0x13, 0x5f, 0x02, 0xfc, 0x9f, 0xf3, 0xd4, 0xdc, 0xd6, 0x82, 0x73, 0x94,
+	0x32, 0x01, 0x5a, 0x13, 0xaa, 0x95, 0x75, 0x98, 0x4e, 0xcd, 0x5a, 0xb5, 0xbd, 0x18, 0x22, 0x1f,
+	0x24, 0x4c, 0xca, 0x6f, 0x87, 0x60, 0xa6, 0x58, 0xb1, 0x40, 0xfa, 0x1e, 0x9c, 0x4a, 0xcd, 0xa9,
+	0xee, 0xb2, 0x13, 0x2b, 0x6c, 0x4f, 0x35, 0x7f, 0xd2, 0xc4, 0x46, 0xf8, 0x41, 0x27, 0xba, 0xf5,
+	0x04, 0xcd, 0xe4, 0xa0, 0xe8, 0xfb, 0xf0, 0x62, 0x47, 0x4d, 0x62, 0x53, 0x0f, 0xbe, 0x1c, 0x83,
+	0x8c, 0x3e, 0xf5, 0x90, 0x1f, 0x4d, 0x96, 0x27, 0x36, 0xd9, 0x4b, 0xf4, 0x13, 0x09, 0xca, 0xdc,
+	0x83, 0xc4, 0x31, 0x1f, 0x7c, 0xad, 0x61, 0x53, 0x17, 0xd9, 0x1f, 0x62, 0x63, 0x36, 0xc7, 0x15,
+	0x4d, 0xb8, 0x32, 0xdd, 0xa3, 0x2b, 0xb5, 0x13, 0xcc, 0x62, 0xdc, 0xe6, 0xab, 0xcc, 0x1e, 0x2f,
+	0x3f, 0xc5, 0x81, 0xaf, 0xc4, 0x31, 0x5d, 0x73, 0xcc, 0xa7, 0x56, 0x13, 0x71, 0x37, 0x94, 0x92,
+	0xdd, 0xf0, 0x9f, 0x12, 0xcc, 0xf6, 0x62, 0xf0, 0xb9, 0xd7, 0xca, 0x0f, 0x24, 0x38, 0xce, 0x53,
+	0xe5, 0x3b, 0xcf, 0xa0, 0x5c, 0x78, 0x61, 0xae, 0xc5, 0xa6, 0x78, 0xc1, 0xdc, 0x86, 0xc3, 0xb4,
+	0xed, 0x78, 0x5b, 0xd8, 0xb3, 0xea, 0x7a, 0x70, 0x76, 0xd3, 0xf1, 0x21, 0x66, 0xfc, 0x54, 0x84,
+	0x98, 0x5f, 0x21, 0xd4, 0xd5, 0x90, 0xed, 0x36, 0xa9, 0x6f, 0x0b, 0x80, 0x87, 0x68, 0xf2, 0x25,
+	0x55, 0x76, 0xe0, 0x5c, 0x46, 0x97, 0x46, 0xa7, 0x66, 0xc7, 0xd1, 0x9b, 0x3a, 0xfd, 0xa4, 0xa2,
+	0xe9, 0xd7, 0x91, 0xef, 0x5f, 0x4a, 0x70, 0xbe, 0x47, 0x9b, 0xcf, 0x3b, 0xe5, 0xca, 0x03, 0x58,
+	0xb8, 0x49, 0x3d, 0xab, 0x69, 0x78, 0x78, 0x8f, 0xa2, 0xb0, 0x61, 0xfe, 0x8f, 0xa1, 0xfa, 0xbd,
+	0x04, 0x57, 0x06, 0xb0, 0x2f, 0xc2, 0x96, 0x39, 0xdb, 0xa4, 0x67, 0x33, 0xdb, 0x94, 0x35, 0x38,
+	0x9b, 0xfe, 0x45, 0xf6, 0x64, 0x47, 0xcb, 0xc7, 0xc3, 0x30, 0x5d, 0xa8, 0xf7, 0xb9, 0x4f, 0x0b,
+	0x03, 0x8e, 0x76, 0x98, 0xe3, 0x0e, 0x89, 0x41, 0x31, 0x1b, 0xc6, 0x3e, 0xbc, 0x97, 0x87, 0xe1,
+	0x4f, 0xea, 0xe1, 0x12, 0xc2, 0x16, 0x32, 0xf7, 0x50, 0xb2, 0x13, 0x3c, 0xf4, 0xe5, 0x39, 0xbc,
+	0x86, 0x9f, 0xed, 0xe1, 0x75, 0x0a, 0x4e, 0xb0, 0xd2, 0x58, 0x73, 0x5a, 0x84, 0xd8, 0xf7, 0xb7,
+	0x2c, 0x0f, 0xdb, 0x16, 0x0d, 0xbf, 0xf4, 0x94, 0x2b, 0x70, 0x32, 0x9d, 0x2c, 0x22, 0x3a, 0x01,
+	0xfb, 0x03, 0x82, 0x6e, 0x89, 0xca, 0x18, 0xae, 0x8d, 0x06, 0xcf, 0xcb, 0x26, 0x55, 0x36, 0xe0,
+	0xe2, 0x1a, 0xc5, 0xee, 0x0d, 0xe2, 0xd4, 0xb1, 0xe3, 0xb9, 0x41, 0x10, 0xe2, 0x02, 0x59, 0x21,
+	0xd4, 0x62, 0x33, 0x2c, 0x0a, 0xd0, 0x40, 0x95, 0xfd, 0x1b, 0x09, 0x5e, 0xef, 0xcf, 0x88, 0xf0,
+	0xfb, 0x7b, 0x70, 0xaa, 0x6e, 0xeb, 0xcc, 0x75, 0x9f, 0x62, 0x57, 0x6f, 0x09, 0xd6, 0xae, 0x32,
+	0x9f, 0x4f, 0x2b, 0xf3, 0xa4, 0xb1, 0x15, 0x42, 0xec, 0xc0, 0x81, 0xd0, 0x54, 0x47, 0xb9, 0x4f,
+	0xd4, 0xed, 0x74, 0x3a, 0x55, 0x30, 0xcc, 0xf7, 0xe0, 0x77, 0x7c, 0xb6, 0x3b, 0x8d, 0x81, 0xe2,
+	0xf3, 0x3b, 0x09, 0x2e, 0xf7, 0x6d, 0xe7, 0xcb, 0x11, 0xa2, 0xb9, 0x3f, 0x9e, 0x84, 0x17, 0x58,
+	0xed, 0xa1, 0x1f, 0x4a, 0x30, 0xc2, 0xf7, 0x65, 0xe8, 0x6c, 0x9a, 0xb5, 0xbd, 0xab, 0x39, 0x79,
+	0xba, 0x90, 0x8f, 0xa3, 0x54, 0x66, 0x3f, 0xf8, 0xeb, 0x3f, 0x3e, 0x2a, 0x9d, 0x41, 0x8a, 0x96,
+	0xb2, 0x70, 0x8c, 0xb7, 0x86, 0xcc, 0xf8, 0x8f, 0x24, 0x38, 0x10, 0x2d, 0xcc, 0xd0, 0x99, 0x34,
+	0x13, 0xdd, 0xeb, 0x3b, 0xf9, 0x95, 0x02, 0x2e, 0xe1, 0x86, 0xca, 0xdc, 0x98, 0x41, 0x67, 0xf3,
+	0xdc, 0x88, 0x97, 0x7b, 0xdc, 0x95, 0x70, 0x1f, 0x97, 0xe1, 0x4a, 0xd7, 0x0a, 0x2f, 0xc3, 0x95,
+	0xee, 0xa5, 0x5e, 0x8f, 0xae, 0xd8, 0xb6, 0xce, 0x2f, 0xf5, 0xe8, 0xe7, 0x12, 0x1c, 0xee, 0xda,
+	0xc8, 0xa1, 0xd9, 0x4c, 0xd4, 0x7b, 0xf6, 0x7c, 0xf2, 0xab, 0x3d, 0xf1, 0x0a, 0xe7, 0x5e, 0x67,
+	0xce, 0xa9, 0xe8, 0x5c, 0x71, 0x9c, 0xe2, 0xd5, 0x1f, 0xfa, 0x83, 0x04, 0xc7, 0x33, 0x16, 0x56,
+	0x68, 0x2e, 0x23, 0x2a, 0x39, 0x8b, 0x34, 0xf9, 0x62, 0x5f, 0x32, 0xc2, 0xf5, 0x6b, 0xcc, 0xf5,
+	0xcb, 0xe8, 0x52, 0x51, 0x5c, 0xad, 0x84, 0x16, 0x3d, 0xda, 0x7b, 0x7d, 0x2e, 0xc1, 0xc9, 0xbc,
+	0x7d, 0x13, 0xba, 0x9c, 0xd1, 0x88, 0x45, 0x1b, 0x2e, 0x79, 0xa1, 0x7f, 0x41, 0x01, 0xe9, 0x36,
+	0x83, 0xb4, 0x84, 0x16, 0xf3, 0x20, 0xd5, 0x43, 0x4d, 0xa9, 0xc0, 0xb4, 0xf7, 0xc5, 0x76, 0xed,
+	0x01, 0xfa, 0x75, 0xb8, 0x15, 0xc9, 0xdd, 0x45, 0xa1, 0x6a, 0x66, 0x6b, 0xf7, 0xbc, 0x10, 0x93,
+	0x6f, 0x3c, 0x91, 0x0e, 0x81, 0x7e, 0x1f, 0xfa, 0xb3, 0x04, 0x72, 0xf6, 0x1e, 0x07, 0xa5, 0x2e,
+	0xfa, 0x0a, 0xb7, 0x43, 0xf2, 0x7c, 0xbf, 0x62, 0xc2, 0x9f, 0xeb, 0x2c, 0x1b, 0x0b, 0x68, 0xbe,
+	0xa8, 0xc0, 0xd2, 0xd7, 0x41, 0xe8, 0x2f, 0x12, 0xc8, 0xd9, 0x5b, 0x16, 0x74, 0xa9, 0xd7, 0x4f,
+	0xbe, 0x8e, 0x5d, 0x51, 0x3a, 0x9a, 0xe2, 0x65, 0x8e, 0xf2, 0x26, 0x43, 0x73, 0x15, 0x2d, 0xe4,
+	0xa1, 0x49, 0xff, 0x54, 0xe5, 0x5f, 0x52, 0xe8, 0x5f, 0x12, 0x9c, 0x2e, 0xda, 0xa8, 0xa0, 0x37,
+	0x7a, 0x75, 0x2f, 0xe5, 0x32, 0x2f, 0x7f, 0x75, 0x30, 0x61, 0x81, 0xf0, 0x6d, 0x86, 0xf0, 0x2d,
+	0xb4, 0xd4, 0x37, 0x42, 0xaa, 0xbd, 0xbf, 0xe7, 0x1b, 0xe0, 0x01, 0xfa, 0xa0, 0x94, 0xdc, 0x92,
+	0x65, 0xed, 0x05, 0xd0, 0xb5, 0x7c, 0xa7, 0x0b, 0x16, 0x18, 0xf2, 0xf5, 0x41, 0xc5, 0x05, 0xea,
+	0xef, 0x30, 0xd4, 0xf7, 0xd1, 0x5a, 0x8f, 0xa8, 0xfd, 0xa4, 0x42, 0x7d, 0xa3, 0xad, 0x47, 0xc8,
+	0x53, 0x83, 0xf0, 0x5f, 0x09, 0x5e, 0xe9, 0xe9, 0xb2, 0x8c, 0xde, 0xec, 0x23, 0x79, 0xa9, 0x17,
+	0x56, 0xb9, 0xf2, 0x04, 0x1a, 0x44, 0x34, 0xee, 0xb0, 0x68, 0xdc, 0x42, 0x37, 0xfb, 0xaf, 0x81,
+	0x20, 0x16, 0xf1, 0x7d, 0x99, 0xff, 0x4d, 0xe9, 0x57, 0x25, 0xb8, 0xd0, 0xf7, 0xfd, 0x17, 0xdd,
+	0x4e, 0xc3, 0x31, 0xe8, 0x35, 0x5e, 0xbe, 0xf3, 0x94, 0xb4, 0x89, 0x08, 0x7d, 0x9b, 0x45, 0x68,
+	0x1d, 0xdd, 0xcb, 0x8b, 0x10, 0x16, 0xea, 0xf5, 0xbc, 0x81, 0x90, 0x16, 0xb0, 0x7f, 0x86, 0x13,
+	0x3c, 0xf5, 0x56, 0x8c, 0xae, 0xf6, 0x7e, 0x4e, 0xec, 0x69, 0x94, 0x37, 0x06, 0x92, 0x15, 0xa8,
+	0xd7, 0x18, 0xea, 0xbb, 0xe8, 0x4e, 0x1e, 0xea, 0xee, 0x3f, 0x0e, 0x14, 0x77, 0xc7, 0x27, 0x12,
+	0x1c, 0xee, 0xba, 0xca, 0x21, 0x2d, 0xd3, 0xcf, 0xf4, 0x3b, 0xa1, 0xfc, 0x5a, 0xef, 0x02, 0xfd,
+	0x7c, 0xb5, 0xf9, 0x4c, 0x58, 0x7f, 0x37, 0x72, 0xec, 0xe3, 0x12, 0x9c, 0xeb, 0xe7, 0x72, 0x87,
+	0x6e, 0xa5, 0x39, 0x36, 0xc0, 0x1d, 0x54, 0x7e, 0xeb, 0xc9, 0x15, 0x09, 0xe4, 0xeb, 0x0c, 0xf9,
+	0x0a, 0x7a, 0x3b, 0xf7, 0x4c, 0xe6, 0x9f, 0x42, 0xc9, 0xad, 0x84, 0x1d, 0x5d, 0xb7, 0xd2, 0x67,
+	0xfd, 0x2f, 0x4a, 0xa0, 0xf5, 0x79, 0xb1, 0x43, 0x5f, 0x1b, 0x10, 0x55, 0xca, 0x2d, 0x54, 0xfe,
+	0xfa, 0x53, 0xd1, 0x25, 0x82, 0xf4, 0x0d, 0x16, 0xa4, 0x55, 0xf4, 0x4e, 0x2f, 0x41, 0xf2, 0x13,
+	0x1a, 0x0a, 0xe3, 0x54, 0x5d, 0xf9, 0xf4, 0x51, 0x59, 0xfa, 0xec, 0x51, 0x59, 0xfa, 0xe2, 0x51,
+	0x59, 0xfa, 0xe9, 0xe3, 0xf2, 0xbe, 0xcf, 0x1e, 0x97, 0xf7, 0xfd, 0xed, 0x71, 0x79, 0xdf, 0x37,
+	0xe7, 0x13, 0xeb, 0x13, 0x61, 0xf6, 0xbc, 0x6d, 0x6c, 0xd0, 0xc8, 0x87, 0xdd, 0x0b, 0x57, 0xb4,
+	0xf7, 0x92, 0x9e, 0xb0, 0x95, 0xca, 0xc6, 0x08, 0xfb, 0x1f, 0x21, 0x17, 0xff, 0x17, 0x00, 0x00,
+	0xff, 0xff, 0xce, 0xa9, 0xbc, 0x78, 0x8f, 0x23, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/x/superfluid/types/superfluid.pb.go b/x/superfluid/types/superfluid.pb.go
index 49dd05e34e3..2de91cc4561 100644
--- a/x/superfluid/types/superfluid.pb.go
+++ b/x/superfluid/types/superfluid.pb.go
@@ -4,8 +4,8 @@
 package types
 
 import (
+	cosmossdk_io_math "cosmossdk.io/math"
 	fmt "fmt"
-	github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types"
 	types "github.com/cosmos/cosmos-sdk/types"
 	_ "github.com/gogo/protobuf/gogoproto"
 	proto "github.com/gogo/protobuf/proto"
@@ -173,8 +173,8 @@ func (m *SuperfluidIntermediaryAccount) GetGaugeId() uint64 {
 type OsmoEquivalentMultiplierRecord struct {
 	EpochNumber int64 `protobuf:"varint,1,opt,name=epoch_number,json=epochNumber,proto3" json:"epoch_number,omitempty"`
 	// superfluid asset denom, can be LP token or native token
-	Denom      string                                 `protobuf:"bytes,2,opt,name=denom,proto3" json:"denom,omitempty"`
-	Multiplier github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,3,opt,name=multiplier,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"multiplier" yaml:"multiplier"`
+	Denom      string                      `protobuf:"bytes,2,opt,name=denom,proto3" json:"denom,omitempty"`
+	Multiplier cosmossdk_io_math.LegacyDec `protobuf:"bytes,3,opt,name=multiplier,proto3,customtype=cosmossdk.io/math.LegacyDec" json:"multiplier" yaml:"multiplier"`
 }
 
 func (m *OsmoEquivalentMultiplierRecord) Reset()         { *m = OsmoEquivalentMultiplierRecord{} }
@@ -493,59 +493,59 @@ func init() {
 }
 
 var fileDescriptor_79d3c29d82dbb734 = []byte{
-	// 818 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x55, 0xcf, 0x8f, 0xdb, 0x44,
-	0x14, 0x8e, 0x93, 0x74, 0xb7, 0x99, 0x85, 0x92, 0xba, 0xab, 0x92, 0x44, 0x5a, 0x7b, 0x71, 0x11,
-	0x8d, 0x5a, 0xd5, 0x56, 0x8a, 0x84, 0x44, 0x6f, 0x49, 0x0a, 0x52, 0x50, 0x29, 0x91, 0x43, 0x85,
-	0xc4, 0xc5, 0x9a, 0x78, 0xa6, 0xce, 0x28, 0x63, 0x8f, 0xeb, 0x19, 0x07, 0x72, 0xe3, 0xc0, 0xa1,
-	0x47, 0xfe, 0x84, 0x4a, 0xdc, 0xf8, 0x23, 0x38, 0xef, 0x71, 0x25, 0x2e, 0x88, 0xc3, 0x82, 0x76,
-	0x2f, 0x9c, 0xf7, 0x2f, 0x40, 0x33, 0xfe, 0x11, 0xef, 0x6e, 0x56, 0xc0, 0x05, 0x4e, 0x99, 0x79,
-	0xdf, 0x9b, 0xf7, 0xbe, 0x6f, 0xde, 0x97, 0x31, 0xb8, 0xc7, 0x78, 0xc8, 0x38, 0xe1, 0x0e, 0x4f,
-	0x63, 0x9c, 0xbc, 0xa4, 0x29, 0x41, 0x95, 0xa5, 0x1d, 0x27, 0x4c, 0x30, 0x5d, 0xcf, 0x93, 0xec,
-	0x0d, 0xd2, 0xdb, 0x0f, 0x58, 0xc0, 0x14, 0xec, 0xc8, 0x55, 0x96, 0xd9, 0x33, 0x02, 0xc6, 0x02,
-	0x8a, 0x1d, 0xb5, 0x9b, 0xa7, 0x2f, 0x1d, 0x94, 0x26, 0x50, 0x10, 0x16, 0xe5, 0xb8, 0x79, 0x19,
-	0x17, 0x24, 0xc4, 0x5c, 0xc0, 0x30, 0x2e, 0x0a, 0xf8, 0xaa, 0x97, 0x33, 0x87, 0x1c, 0x3b, 0xab,
-	0xc1, 0x1c, 0x0b, 0x38, 0x70, 0x7c, 0x46, 0x8a, 0x02, 0xdd, 0x82, 0x2f, 0x65, 0xfe, 0x32, 0x8d,
-	0xd5, 0x4f, 0x06, 0x59, 0x6b, 0xf0, 0xce, 0xac, 0xe4, 0x37, 0xe4, 0x1c, 0x0b, 0x7d, 0x1f, 0xdc,
-	0x40, 0x38, 0x62, 0x61, 0x47, 0x3b, 0xd4, 0xfa, 0x2d, 0x37, 0xdb, 0xe8, 0x9f, 0x02, 0x00, 0x25,
-	0xec, 0x89, 0x75, 0x8c, 0x3b, 0xf5, 0x43, 0xad, 0x7f, 0xeb, 0xf1, 0x7d, 0xfb, 0xaa, 0x46, 0xfb,
-	0x52, 0xb9, 0x2f, 0xd7, 0x31, 0x76, 0x5b, 0xb0, 0x58, 0x3e, 0xb9, 0xf9, 0xfa, 0x8d, 0x59, 0xfb,
-	0xf3, 0x8d, 0xa9, 0x59, 0x4b, 0x70, 0xb0, 0xc9, 0x9d, 0x44, 0x02, 0x27, 0x21, 0x46, 0x04, 0x26,
-	0xeb, 0xa1, 0xef, 0xb3, 0x34, 0xba, 0x8e, 0x48, 0x17, 0xdc, 0x5c, 0x41, 0xea, 0x41, 0x84, 0x12,
-	0x45, 0xa3, 0xe5, 0xee, 0xae, 0x20, 0x1d, 0x22, 0x94, 0x48, 0x28, 0x80, 0x69, 0x80, 0x3d, 0x82,
-	0x3a, 0x8d, 0x43, 0xad, 0xdf, 0x74, 0x77, 0xd5, 0x7e, 0x82, 0xac, 0x9f, 0x35, 0x60, 0x7c, 0xc1,
-	0x43, 0xf6, 0xc9, 0xab, 0x94, 0xac, 0x20, 0xc5, 0x91, 0xf8, 0x3c, 0xa5, 0x82, 0xc4, 0x94, 0xe0,
-	0xc4, 0xc5, 0x3e, 0x4b, 0x90, 0xfe, 0x1e, 0x78, 0x0b, 0xc7, 0xcc, 0x5f, 0x78, 0x51, 0x1a, 0xce,
-	0x71, 0xa2, 0xba, 0x36, 0xdc, 0x3d, 0x15, 0x7b, 0xae, 0x42, 0x1b, 0x46, 0xf5, 0x2a, 0x23, 0x1f,
-	0x80, 0xb0, 0x2c, 0xa6, 0x1a, 0xb7, 0x46, 0xe3, 0xa3, 0x13, 0xb3, 0xf6, 0xdb, 0x89, 0xf9, 0x41,
-	0x40, 0xc4, 0x22, 0x9d, 0xdb, 0x3e, 0x0b, 0x9d, 0x7c, 0x4a, 0xd9, 0xcf, 0x23, 0x8e, 0x96, 0x8e,
-	0xbc, 0x4b, 0x6e, 0x3f, 0xc5, 0xfe, 0xf9, 0x89, 0x79, 0x7b, 0x0d, 0x43, 0xfa, 0xc4, 0xda, 0x54,
-	0xb2, 0xdc, 0x4a, 0x59, 0xeb, 0xbc, 0x0e, 0x7a, 0x9b, 0xeb, 0x7a, 0x8a, 0x29, 0x0e, 0x94, 0x47,
-	0x72, 0xf2, 0x0f, 0xc1, 0x6d, 0x94, 0xc5, 0x58, 0xa2, 0xee, 0x06, 0x73, 0x9e, 0xdf, 0x5b, 0xbb,
-	0x04, 0x86, 0x59, 0x5c, 0x26, 0xaf, 0x20, 0x25, 0xe8, 0x42, 0x72, 0x26, 0xa9, 0x5d, 0x02, 0x45,
-	0xf2, 0x37, 0x65, 0x65, 0xc2, 0x22, 0x0f, 0x86, 0x72, 0x34, 0x4a, 0xe4, 0xde, 0xe3, 0xae, 0x9d,
-	0x69, 0xb1, 0xa5, 0xf1, 0xec, 0xdc, 0x78, 0xf6, 0x98, 0x91, 0x68, 0xe4, 0x48, 0xfd, 0x3f, 0xfd,
-	0x6e, 0xde, 0xff, 0x07, 0xfa, 0xe5, 0x81, 0x92, 0x25, 0x61, 0xd1, 0x50, 0xf5, 0xd0, 0xbf, 0xd3,
-	0x40, 0x07, 0x97, 0xe3, 0xf2, 0xb8, 0x80, 0x4b, 0x8c, 0x0a, 0x02, 0xcd, 0xbf, 0x23, 0xf0, 0xf0,
-	0xdf, 0x34, 0xbf, 0xbb, 0xe9, 0x33, 0x53, 0x6d, 0x32, 0x0a, 0xd6, 0x2b, 0x70, 0xef, 0x19, 0xf3,
-	0x97, 0x93, 0x6d, 0xf6, 0x1c, 0xb3, 0x28, 0xc2, 0xbe, 0xe4, 0xab, 0xbf, 0x0b, 0x76, 0xe5, 0x5f,
-	0x4a, 0xda, 0x4e, 0x53, 0xb6, 0xdb, 0xa1, 0xea, 0x94, 0x3e, 0x00, 0xfb, 0xa4, 0x72, 0xd2, 0x83,
-	0xd9, 0xd1, 0xfc, 0xae, 0xef, 0x90, 0xab, 0x55, 0xad, 0x07, 0xe0, 0xee, 0x8b, 0x28, 0x66, 0x8c,
-	0x7e, 0xb5, 0x20, 0x02, 0x53, 0xc2, 0x05, 0x46, 0x53, 0xc6, 0x28, 0xd7, 0xdb, 0xa0, 0x41, 0x90,
-	0x1c, 0x6a, 0xa3, 0xdf, 0x74, 0xe5, 0xd2, 0xfa, 0xa5, 0x01, 0xac, 0x31, 0x8b, 0x7c, 0x1c, 0x89,
-	0x04, 0xe6, 0x79, 0x2f, 0x38, 0x4e, 0xa6, 0x8c, 0x93, 0x8b, 0xde, 0xb8, 0x3a, 0x6e, 0xed, 0x9a,
-	0x71, 0x9b, 0x60, 0x2f, 0xce, 0x8f, 0x4b, 0x3d, 0x75, 0xa5, 0x07, 0x14, 0xa1, 0x09, 0xaa, 0x8a,
-	0x6d, 0x5c, 0x10, 0xfb, 0x19, 0xb8, 0xc5, 0xd7, 0x91, 0x58, 0x60, 0x41, 0x7c, 0x4f, 0xc6, 0xf2,
-	0x21, 0x1d, 0x94, 0xaf, 0x44, 0xf6, 0xfc, 0xd8, 0xb3, 0x22, 0x4b, 0xde, 0xed, 0xa8, 0x29, 0x9d,
-	0xe2, 0xbe, 0xcd, 0xab, 0xc1, 0xed, 0xa6, 0xbb, 0xf1, 0x7f, 0x9b, 0x6e, 0xe7, 0xbf, 0x30, 0xdd,
-	0x83, 0xef, 0x35, 0x70, 0x67, 0xcb, 0x23, 0xaa, 0x1f, 0x80, 0xee, 0x96, 0xf0, 0x73, 0x28, 0xc8,
-	0x0a, 0xb7, 0x6b, 0xba, 0x51, 0x7d, 0x1f, 0x4a, 0xf8, 0xd9, 0x74, 0xb6, 0x80, 0x09, 0x6e, 0x6b,
-	0x7a, 0x1f, 0xbc, 0xbf, 0x05, 0xaf, 0xda, 0x27, 0xcb, 0xac, 0xf7, 0x9a, 0xaf, 0x7f, 0x34, 0x6a,
-	0xa3, 0xe9, 0xd1, 0xa9, 0xa1, 0x1d, 0x9f, 0x1a, 0xda, 0x1f, 0xa7, 0x86, 0xf6, 0xc3, 0x99, 0x51,
-	0x3b, 0x3e, 0x33, 0x6a, 0xbf, 0x9e, 0x19, 0xb5, 0xaf, 0x3f, 0xaa, 0x28, 0xcc, 0x47, 0xfb, 0x88,
-	0xc2, 0x39, 0x2f, 0x36, 0xce, 0x6a, 0xf0, 0xb1, 0xf3, 0x6d, 0xf5, 0xe3, 0xa8, 0x54, 0xcf, 0x77,
-	0xd4, 0x27, 0xe7, 0xc3, 0xbf, 0x02, 0x00, 0x00, 0xff, 0xff, 0x89, 0xd4, 0x63, 0x39, 0x3f, 0x07,
-	0x00, 0x00,
+	// 831 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x55, 0xcf, 0x6f, 0x1b, 0x45,
+	0x14, 0xf6, 0xda, 0x6e, 0xd2, 0x4c, 0xa0, 0xb8, 0xdb, 0xa8, 0x24, 0x41, 0xd9, 0x0d, 0x5b, 0xa4,
+	0x5a, 0xad, 0xba, 0xab, 0x14, 0x09, 0x41, 0x6f, 0x4e, 0x0a, 0x92, 0x51, 0x28, 0xd6, 0x9a, 0x0a,
+	0xc4, 0x65, 0x35, 0xde, 0x79, 0x5d, 0x8f, 0x3c, 0xbb, 0xb3, 0xdd, 0x99, 0x35, 0xf8, 0xc6, 0x81,
+	0x43, 0x8f, 0xfc, 0x09, 0x95, 0xb8, 0x71, 0xe5, 0x9f, 0xe8, 0xb1, 0x12, 0x17, 0xc4, 0x21, 0xa0,
+	0xe4, 0xc2, 0xb9, 0x7f, 0x01, 0x9a, 0xd9, 0x1f, 0xde, 0x34, 0x8e, 0x10, 0x17, 0x7a, 0xf2, 0xcc,
+	0xfb, 0xde, 0xbc, 0xf7, 0x7d, 0xf3, 0x3e, 0xcf, 0xa2, 0x5b, 0x5c, 0xc4, 0x5c, 0x50, 0xe1, 0x89,
+	0x3c, 0x85, 0xec, 0x09, 0xcb, 0x29, 0x69, 0x2c, 0xdd, 0x34, 0xe3, 0x92, 0x9b, 0x66, 0x99, 0xe4,
+	0x2e, 0x91, 0xdd, 0xad, 0x88, 0x47, 0x5c, 0xc3, 0x9e, 0x5a, 0x15, 0x99, 0xbb, 0x56, 0xc4, 0x79,
+	0xc4, 0xc0, 0xd3, 0xbb, 0x49, 0xfe, 0xc4, 0x23, 0x79, 0x86, 0x25, 0xe5, 0x49, 0x89, 0xdb, 0xaf,
+	0xe3, 0x92, 0xc6, 0x20, 0x24, 0x8e, 0xd3, 0xaa, 0x40, 0xa8, 0x7b, 0x79, 0x13, 0x2c, 0xc0, 0x9b,
+	0x1f, 0x4c, 0x40, 0xe2, 0x03, 0x2f, 0xe4, 0xb4, 0x2a, 0xb0, 0x53, 0xf1, 0x65, 0x3c, 0x9c, 0xe5,
+	0xa9, 0xfe, 0x29, 0x20, 0x67, 0x81, 0xde, 0x19, 0xd7, 0xfc, 0x06, 0x42, 0x80, 0x34, 0xb7, 0xd0,
+	0x15, 0x02, 0x09, 0x8f, 0xb7, 0x8d, 0x7d, 0xa3, 0xbf, 0xe1, 0x17, 0x1b, 0xf3, 0x33, 0x84, 0xb0,
+	0x82, 0x03, 0xb9, 0x48, 0x61, 0xbb, 0xbd, 0x6f, 0xf4, 0xaf, 0xdd, 0xbf, 0xed, 0x5e, 0xd4, 0xe8,
+	0xbe, 0x56, 0xee, 0xab, 0x45, 0x0a, 0xfe, 0x06, 0xae, 0x96, 0x0f, 0xae, 0x3e, 0x7b, 0x6e, 0xb7,
+	0xfe, 0x7e, 0x6e, 0x1b, 0xce, 0x0c, 0xed, 0x2d, 0x73, 0x87, 0x89, 0x84, 0x2c, 0x06, 0x42, 0x71,
+	0xb6, 0x18, 0x84, 0x21, 0xcf, 0x93, 0xcb, 0x88, 0xec, 0xa0, 0xab, 0x73, 0xcc, 0x02, 0x4c, 0x48,
+	0xa6, 0x69, 0x6c, 0xf8, 0xeb, 0x73, 0xcc, 0x06, 0x84, 0x64, 0x0a, 0x8a, 0x70, 0x1e, 0x41, 0x40,
+	0xc9, 0x76, 0x67, 0xdf, 0xe8, 0x77, 0xfd, 0x75, 0xbd, 0x1f, 0x12, 0xe7, 0x57, 0x03, 0x59, 0x5f,
+	0x8a, 0x98, 0x7f, 0xfa, 0x34, 0xa7, 0x73, 0xcc, 0x20, 0x91, 0x5f, 0xe4, 0x4c, 0xd2, 0x94, 0x51,
+	0xc8, 0x7c, 0x08, 0x79, 0x46, 0xcc, 0xf7, 0xd1, 0x5b, 0x90, 0xf2, 0x70, 0x1a, 0x24, 0x79, 0x3c,
+	0x81, 0x4c, 0x77, 0xed, 0xf8, 0x9b, 0x3a, 0xf6, 0x48, 0x87, 0x96, 0x8c, 0xda, 0x4d, 0x46, 0xdf,
+	0x20, 0x14, 0xd7, 0xc5, 0x74, 0xe3, 0x8d, 0xc3, 0x8f, 0x5f, 0x9c, 0xd8, 0xad, 0x3f, 0x4e, 0xec,
+	0xf7, 0x8a, 0xd1, 0x08, 0x32, 0x73, 0x29, 0xf7, 0x62, 0x2c, 0xa7, 0xee, 0x31, 0x44, 0x38, 0x5c,
+	0x3c, 0x84, 0xf0, 0xd5, 0x89, 0x7d, 0x7d, 0x81, 0x63, 0xf6, 0xc0, 0x59, 0x1e, 0x77, 0xfc, 0x46,
+	0x2d, 0xe7, 0x55, 0x1b, 0xed, 0x2e, 0xef, 0xe8, 0x21, 0x30, 0x88, 0xb4, 0x31, 0x4a, 0xc6, 0x77,
+	0xd1, 0x75, 0x52, 0xc4, 0x78, 0xa6, 0x2f, 0x04, 0x84, 0x28, 0x2f, 0xab, 0x57, 0x03, 0x83, 0x22,
+	0xae, 0x92, 0xe7, 0x98, 0x51, 0x72, 0x2e, 0xb9, 0xd0, 0xd1, 0xab, 0x81, 0x2a, 0xf9, 0xbb, 0xba,
+	0x32, 0xe5, 0x49, 0x80, 0x63, 0x35, 0x0f, 0xad, 0x6c, 0xf3, 0xfe, 0x8e, 0x5b, 0x48, 0x72, 0x95,
+	0xdb, 0xdc, 0xd2, 0x6d, 0xee, 0x11, 0xa7, 0xc9, 0xa1, 0xa7, 0x44, 0xff, 0xf2, 0xa7, 0x7d, 0x3b,
+	0xa2, 0x72, 0x9a, 0x4f, 0xdc, 0x90, 0xc7, 0x5e, 0x69, 0xcd, 0xe2, 0xe7, 0x9e, 0x20, 0x33, 0x4f,
+	0x19, 0x48, 0xe8, 0x03, 0x35, 0x4b, 0xca, 0x93, 0x81, 0xee, 0x61, 0xfe, 0x60, 0xa0, 0x6d, 0xa8,
+	0x67, 0x14, 0x08, 0x89, 0x67, 0x40, 0x2a, 0x02, 0xdd, 0x7f, 0x23, 0x70, 0xf7, 0xbf, 0x34, 0xbf,
+	0xb9, 0xec, 0x33, 0xd6, 0x6d, 0x0a, 0x0a, 0xce, 0x53, 0x74, 0xeb, 0x98, 0x87, 0xb3, 0xe1, 0x2a,
+	0x4f, 0x1e, 0xf1, 0x24, 0x81, 0x50, 0xf1, 0x35, 0xdf, 0x45, 0xeb, 0xea, 0x7f, 0xa4, 0xbc, 0x66,
+	0x68, 0xaf, 0xad, 0x31, 0x7d, 0xca, 0x3c, 0x40, 0x5b, 0xb4, 0x71, 0x32, 0xc0, 0xc5, 0xd1, 0xf2,
+	0xae, 0x6f, 0xd0, 0x8b, 0x55, 0x9d, 0x3b, 0xe8, 0xe6, 0xe3, 0x24, 0xe5, 0x9c, 0x7d, 0x3d, 0xa5,
+	0x12, 0x18, 0x15, 0x12, 0xc8, 0x88, 0x73, 0x26, 0xcc, 0x1e, 0xea, 0x50, 0xa2, 0x86, 0xda, 0xe9,
+	0x77, 0x7d, 0xb5, 0x74, 0x7e, 0xeb, 0x20, 0xe7, 0x88, 0x27, 0x21, 0x24, 0x32, 0xc3, 0x65, 0xde,
+	0x63, 0x01, 0xd9, 0x88, 0x0b, 0x7a, 0xde, 0x1b, 0x17, 0xc7, 0x6d, 0x5c, 0x32, 0x6e, 0x1b, 0x6d,
+	0xa6, 0xe5, 0x71, 0xa5, 0xa7, 0xad, 0xf5, 0xa0, 0x2a, 0x34, 0x24, 0x4d, 0xb1, 0x9d, 0x73, 0x62,
+	0x3f, 0x47, 0xd7, 0xc4, 0x22, 0x91, 0x53, 0x90, 0x34, 0x0c, 0x54, 0xac, 0x1c, 0xd2, 0x5e, 0xfd,
+	0x34, 0x14, 0x6f, 0x8e, 0x3b, 0xae, 0xb2, 0xd4, 0xdd, 0x1e, 0x76, 0x95, 0x53, 0xfc, 0xb7, 0x45,
+	0x33, 0xb8, 0xda, 0x74, 0x57, 0xde, 0xb4, 0xe9, 0xd6, 0xfe, 0x0f, 0xd3, 0xdd, 0xf9, 0xd1, 0x40,
+	0x37, 0x56, 0xbc, 0x9c, 0xe6, 0x1e, 0xda, 0x59, 0x11, 0x7e, 0x84, 0x25, 0x9d, 0x43, 0xaf, 0x65,
+	0x5a, 0xcd, 0xf7, 0xa1, 0x86, 0x8f, 0x47, 0xe3, 0x29, 0xce, 0xa0, 0x67, 0x98, 0x7d, 0xf4, 0xc1,
+	0x0a, 0xbc, 0x69, 0x9f, 0x22, 0xb3, 0xbd, 0xdb, 0x7d, 0xf6, 0xb3, 0xd5, 0x3a, 0x1c, 0xbd, 0x38,
+	0xb5, 0x8c, 0x97, 0xa7, 0x96, 0xf1, 0xd7, 0xa9, 0x65, 0xfc, 0x74, 0x66, 0xb5, 0x5e, 0x9e, 0x59,
+	0xad, 0xdf, 0xcf, 0xac, 0xd6, 0xb7, 0x1f, 0x35, 0x14, 0x96, 0xa3, 0xbd, 0xc7, 0xf0, 0x44, 0x54,
+	0x1b, 0x6f, 0x7e, 0xf0, 0x89, 0xf7, 0x7d, 0xf3, 0x8b, 0xa8, 0x55, 0x4f, 0xd6, 0xf4, 0x77, 0xe6,
+	0xc3, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x37, 0xcf, 0x5c, 0x79, 0x34, 0x07, 0x00, 0x00,
 }
 
 func (this *SuperfluidAsset) Equal(that interface{}) bool {
diff --git a/x/superfluid/types/tx.pb.go b/x/superfluid/types/tx.pb.go
index a195571d6e0..d34baaf83ee 100644
--- a/x/superfluid/types/tx.pb.go
+++ b/x/superfluid/types/tx.pb.go
@@ -5,6 +5,7 @@ package types
 
 import (
 	context "context"
+	cosmossdk_io_math "cosmossdk.io/math"
 	fmt "fmt"
 	github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types"
 	types "github.com/cosmos/cosmos-sdk/types"
@@ -836,10 +837,10 @@ func (m *MsgUnlockAndMigrateSharesToFullRangeConcentratedPosition) GetTokenOutMi
 }
 
 type MsgUnlockAndMigrateSharesToFullRangeConcentratedPositionResponse struct {
-	Amount0          github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,1,opt,name=amount0,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"amount0" yaml:"amount0"`
-	Amount1          github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,2,opt,name=amount1,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"amount1" yaml:"amount1"`
-	LiquidityCreated github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,3,opt,name=liquidity_created,json=liquidityCreated,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"liquidity_created" yaml:"liquidity_created"`
-	JoinTime         time.Time                              `protobuf:"bytes,4,opt,name=join_time,json=joinTime,proto3,stdtime" json:"join_time" yaml:"join_time"`
+	Amount0          cosmossdk_io_math.Int       `protobuf:"bytes,1,opt,name=amount0,proto3,customtype=cosmossdk.io/math.Int" json:"amount0" yaml:"amount0"`
+	Amount1          cosmossdk_io_math.Int       `protobuf:"bytes,2,opt,name=amount1,proto3,customtype=cosmossdk.io/math.Int" json:"amount1" yaml:"amount1"`
+	LiquidityCreated cosmossdk_io_math.LegacyDec `protobuf:"bytes,3,opt,name=liquidity_created,json=liquidityCreated,proto3,customtype=cosmossdk.io/math.LegacyDec" json:"liquidity_created" yaml:"liquidity_created"`
+	JoinTime         time.Time                   `protobuf:"bytes,4,opt,name=join_time,json=joinTime,proto3,stdtime" json:"join_time" yaml:"join_time"`
 }
 
 func (m *MsgUnlockAndMigrateSharesToFullRangeConcentratedPositionResponse) Reset() {
@@ -960,14 +961,14 @@ func (m *MsgAddToConcentratedLiquiditySuperfluidPosition) GetTokenDesired1() typ
 }
 
 type MsgAddToConcentratedLiquiditySuperfluidPositionResponse struct {
-	PositionId uint64                                 `protobuf:"varint,1,opt,name=position_id,json=positionId,proto3" json:"position_id,omitempty" yaml:"position_id"`
-	Amount0    github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,2,opt,name=amount0,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"amount0" yaml:"amount0"`
-	Amount1    github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,3,opt,name=amount1,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"amount1" yaml:"amount1"`
+	PositionId uint64                `protobuf:"varint,1,opt,name=position_id,json=positionId,proto3" json:"position_id,omitempty" yaml:"position_id"`
+	Amount0    cosmossdk_io_math.Int `protobuf:"bytes,2,opt,name=amount0,proto3,customtype=cosmossdk.io/math.Int" json:"amount0" yaml:"amount0"`
+	Amount1    cosmossdk_io_math.Int `protobuf:"bytes,3,opt,name=amount1,proto3,customtype=cosmossdk.io/math.Int" json:"amount1" yaml:"amount1"`
 	// new_liquidity is the final liquidity after the add.
 	// It includes the liquidity that existed before in the position
 	// and the new liquidity that was added to the position.
-	NewLiquidity github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,5,opt,name=new_liquidity,json=newLiquidity,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"new_liquidity" yaml:"new_liquidity"`
-	LockId       uint64                                 `protobuf:"varint,4,opt,name=lock_id,json=lockId,proto3" json:"lock_id,omitempty" yaml:"lock_id"`
+	NewLiquidity cosmossdk_io_math.LegacyDec `protobuf:"bytes,5,opt,name=new_liquidity,json=newLiquidity,proto3,customtype=cosmossdk.io/math.LegacyDec" json:"new_liquidity" yaml:"new_liquidity"`
+	LockId       uint64                      `protobuf:"varint,4,opt,name=lock_id,json=lockId,proto3" json:"lock_id,omitempty" yaml:"lock_id"`
 }
 
 func (m *MsgAddToConcentratedLiquiditySuperfluidPositionResponse) Reset() {
@@ -1032,7 +1033,7 @@ type MsgUnbondConvertAndStake struct {
 	// valset-preference module.
 	ValAddr string `protobuf:"bytes,3,opt,name=val_addr,json=valAddr,proto3" json:"val_addr,omitempty"`
 	// min_amt_to_stake indicates the minimum amount to stake after conversion
-	MinAmtToStake github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,4,opt,name=min_amt_to_stake,json=minAmtToStake,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"min_amt_to_stake" yaml:"min_amt_to_stake"`
+	MinAmtToStake cosmossdk_io_math.Int `protobuf:"bytes,4,opt,name=min_amt_to_stake,json=minAmtToStake,proto3,customtype=cosmossdk.io/math.Int" json:"min_amt_to_stake" yaml:"min_amt_to_stake"`
 	// shares_to_convert indicates shares wanted to stake.
 	// Note that this field is only used for liquid(unlocked) gamm shares.
 	// For all other cases, this field would be disregarded.
@@ -1101,7 +1102,7 @@ func (m *MsgUnbondConvertAndStake) GetSharesToConvert() types.Coin {
 }
 
 type MsgUnbondConvertAndStakeResponse struct {
-	TotalAmtStaked github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,1,opt,name=total_amt_staked,json=totalAmtStaked,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"total_amt_staked" yaml:"total_amt_staked"`
+	TotalAmtStaked cosmossdk_io_math.Int `protobuf:"bytes,1,opt,name=total_amt_staked,json=totalAmtStaked,proto3,customtype=cosmossdk.io/math.Int" json:"total_amt_staked" yaml:"total_amt_staked"`
 }
 
 func (m *MsgUnbondConvertAndStakeResponse) Reset()         { *m = MsgUnbondConvertAndStakeResponse{} }
@@ -1163,102 +1164,102 @@ func init() {
 func init() { proto.RegisterFile("osmosis/superfluid/tx.proto", fileDescriptor_55b645f187d22814) }
 
 var fileDescriptor_55b645f187d22814 = []byte{
-	// 1507 bytes of a gzipped FileDescriptorProto
+	// 1519 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x58, 0xcd, 0x6f, 0x13, 0x47,
-	0x14, 0xcf, 0xda, 0x21, 0x81, 0x09, 0x09, 0xc9, 0x96, 0x0f, 0xe3, 0x82, 0x6d, 0x86, 0xaf, 0xf0,
-	0x61, 0x6f, 0x0c, 0x2d, 0xd0, 0x9c, 0x88, 0x63, 0x51, 0x05, 0x12, 0x15, 0x2d, 0x41, 0x95, 0xb8,
-	0x58, 0x6b, 0xcf, 0x64, 0xd9, 0x66, 0x77, 0xc7, 0xec, 0x8c, 0x93, 0xa0, 0x9e, 0xda, 0x1e, 0x2a,
-	0x71, 0x42, 0xbd, 0xb4, 0xb7, 0x9e, 0xdb, 0x43, 0xc5, 0x3f, 0x50, 0xa9, 0x87, 0x1e, 0x50, 0x4f,
-	0x1c, 0xab, 0x56, 0x0a, 0x15, 0x1c, 0x7a, 0xcf, 0xa5, 0xd7, 0x6a, 0x76, 0x67, 0xc7, 0xeb, 0x64,
-	0x37, 0xce, 0x9a, 0xf4, 0xd0, 0x0b, 0x78, 0x67, 0xde, 0xbc, 0xf7, 0x7b, 0x1f, 0xbf, 0xf7, 0x66,
-	0x02, 0xde, 0x27, 0xd4, 0x21, 0xd4, 0xa2, 0x1a, 0xed, 0xb4, 0xb1, 0xb7, 0x62, 0x77, 0x2c, 0xa4,
-	0xb1, 0x8d, 0x4a, 0xdb, 0x23, 0x8c, 0xa8, 0xaa, 0xd8, 0xac, 0x74, 0x37, 0xf3, 0x47, 0x4d, 0x62,
-	0x12, 0x7f, 0x5b, 0xe3, 0xbf, 0x02, 0xc9, 0xfc, 0x94, 0xe1, 0x58, 0x2e, 0xd1, 0xfc, 0x7f, 0xc5,
-	0x52, 0xc1, 0x24, 0xc4, 0xb4, 0xb1, 0xe6, 0x7f, 0x35, 0x3b, 0x2b, 0x1a, 0xea, 0x78, 0x06, 0xb3,
-	0x88, 0x1b, 0xee, 0xb7, 0x7c, 0xed, 0x5a, 0xd3, 0xa0, 0x58, 0x5b, 0xab, 0x36, 0x31, 0x33, 0xaa,
-	0x5a, 0x8b, 0x58, 0xe1, 0x7e, 0x71, 0xfb, 0x79, 0x66, 0x39, 0x98, 0x32, 0xc3, 0x69, 0x0b, 0x81,
-	0xb3, 0x31, 0xd0, 0xbb, 0x3f, 0x03, 0x21, 0xf8, 0x9d, 0x02, 0x8e, 0x2d, 0x51, 0xf3, 0x81, 0x5c,
-	0xaf, 0x63, 0x1b, 0x9b, 0x06, 0xc3, 0xea, 0x25, 0x30, 0x42, 0xb1, 0x8b, 0xb0, 0x97, 0x53, 0x4a,
-	0xca, 0xf4, 0xa1, 0xda, 0xd4, 0xd6, 0x66, 0x71, 0xfc, 0xa9, 0xe1, 0xd8, 0xb3, 0x30, 0x58, 0x87,
-	0xba, 0x10, 0x50, 0x4f, 0x80, 0x51, 0x9b, 0xb4, 0x56, 0x1b, 0x16, 0xca, 0x65, 0x4a, 0xca, 0xf4,
-	0xb0, 0x3e, 0xc2, 0x3f, 0x17, 0x90, 0x7a, 0x12, 0x1c, 0x5c, 0x33, 0xec, 0x86, 0x81, 0x90, 0x97,
-	0xcb, 0x72, 0x2d, 0xfa, 0xe8, 0x9a, 0x61, 0xcf, 0x21, 0xe4, 0xcd, 0x96, 0x9e, 0xfd, 0xfd, 0xe2,
-	0x72, 0x4c, 0x74, 0xcb, 0x48, 0x00, 0x80, 0x45, 0x70, 0x3a, 0x16, 0x99, 0x8e, 0x69, 0x9b, 0xb8,
-	0x14, 0xc3, 0x2f, 0x14, 0x70, 0xa2, 0x47, 0xe2, 0xa1, 0x8b, 0xf6, 0x11, 0xfd, 0x2c, 0xe4, 0x10,
-	0x4f, 0xc7, 0x40, 0xec, 0x48, 0x3b, 0xf0, 0x0c, 0x28, 0x26, 0x40, 0x90, 0x30, 0xbf, 0xdc, 0x09,
-	0xb3, 0x49, 0x5c, 0xb4, 0x48, 0x5a, 0xab, 0xfb, 0x02, 0xf3, 0x2c, 0x87, 0x59, 0x88, 0x85, 0xc9,
-	0xed, 0x94, 0xb9, 0x58, 0x0c, 0xce, 0x10, 0x83, 0xc4, 0xf9, 0x93, 0x02, 0xce, 0x25, 0xf8, 0x32,
-	0xe7, 0xee, 0x33, 0x68, 0xb5, 0x06, 0x86, 0x79, 0x2d, 0xfb, 0x55, 0x31, 0x76, 0xed, 0x64, 0x25,
-	0x28, 0xf6, 0x0a, 0x2f, 0xf6, 0x8a, 0x28, 0xf6, 0xca, 0x3c, 0xb1, 0xdc, 0xda, 0x7b, 0x2f, 0x37,
-	0x8b, 0x43, 0x5b, 0x9b, 0xc5, 0xb1, 0xc0, 0x00, 0x3f, 0x04, 0x75, 0xff, 0x2c, 0xfc, 0x18, 0x5c,
-	0xdd, 0x0b, 0xde, 0xd0, 0xc1, 0x28, 0x18, 0x25, 0x0a, 0x06, 0x6e, 0x29, 0xe0, 0xd4, 0x12, 0x35,
-	0xb9, 0xf0, 0x9c, 0x8b, 0xde, 0x8d, 0x0b, 0x06, 0x38, 0xc0, 0xc1, 0xd1, 0x5c, 0xa6, 0x94, 0xdd,
-	0xdd, 0xb3, 0x19, 0xee, 0xd9, 0x8f, 0xaf, 0x8b, 0xd3, 0xa6, 0xc5, 0x1e, 0x77, 0x9a, 0x95, 0x16,
-	0x71, 0x34, 0xc1, 0xf9, 0xe0, 0xbf, 0x32, 0x45, 0xab, 0x1a, 0x7b, 0xda, 0xc6, 0xd4, 0x3f, 0x40,
-	0xf5, 0x40, 0xf3, 0x6e, 0xac, 0xba, 0xc4, 0x6b, 0xe1, 0x5c, 0x58, 0x0b, 0xdc, 0xbd, 0xb2, 0xe1,
-	0xa2, 0x72, 0x1c, 0xbd, 0x6e, 0xf8, 0xd9, 0x4e, 0xf4, 0x59, 0x46, 0x6d, 0x02, 0x64, 0x16, 0xea,
-	0x22, 0x60, 0x99, 0x85, 0x3a, 0x7c, 0x91, 0x01, 0xda, 0x12, 0x35, 0xe7, 0x3d, 0x6c, 0x30, 0x7c,
-	0xa7, 0x63, 0xdb, 0xba, 0xe1, 0x9a, 0xf8, 0x3e, 0xa1, 0x16, 0x6f, 0x5e, 0xff, 0xef, 0xf8, 0xa9,
-	0x57, 0xc0, 0x68, 0x9b, 0x10, 0x9b, 0x97, 0xc8, 0x30, 0xf7, 0xb8, 0xa6, 0x6e, 0x6d, 0x16, 0x27,
-	0x02, 0xa4, 0x62, 0x03, 0xea, 0x23, 0xfc, 0xd7, 0x02, 0x9a, 0xbd, 0xc8, 0x83, 0x0d, 0xc3, 0x60,
-	0xaf, 0x74, 0x6c, 0xbb, 0xec, 0xf1, 0x58, 0x04, 0x21, 0x5f, 0xe9, 0x86, 0xfa, 0x09, 0xb8, 0x99,
-	0x32, 0x62, 0x32, 0xfa, 0xc7, 0x41, 0x50, 0xa4, 0xf5, 0x9e, 0x92, 0xad, 0xab, 0x05, 0x00, 0xda,
-	0x42, 0xc1, 0x42, 0x5d, 0x70, 0x2b, 0xb2, 0xc2, 0xfb, 0x7a, 0x6e, 0x89, 0x9a, 0x0f, 0xdd, 0xfb,
-	0x84, 0xd8, 0x9f, 0x3e, 0xb6, 0x18, 0xb6, 0x2d, 0xca, 0x30, 0xe2, 0x9f, 0x69, 0xd2, 0x11, 0x09,
-	0x48, 0xa6, 0x6f, 0x40, 0xce, 0xf1, 0x80, 0x14, 0xc3, 0x80, 0x74, 0x5c, 0xbe, 0x5c, 0x5e, 0xef,
-	0x1a, 0x2f, 0xf3, 0x05, 0x78, 0x17, 0x94, 0x92, 0x90, 0x49, 0xb7, 0x2f, 0x80, 0x23, 0x78, 0xc3,
-	0x62, 0x18, 0x35, 0x04, 0x63, 0x69, 0x4e, 0x29, 0x65, 0xa7, 0x87, 0xf5, 0xf1, 0x60, 0x79, 0xd1,
-	0x27, 0x2e, 0x85, 0x3f, 0x64, 0xc1, 0x2d, 0x5f, 0x99, 0x1d, 0xd4, 0xf1, 0x92, 0x65, 0x7a, 0x06,
-	0xc3, 0x0f, 0x1e, 0x1b, 0x1e, 0xa6, 0xcb, 0x44, 0x06, 0x7b, 0x9e, 0xb8, 0x2d, 0xec, 0x32, 0xbe,
-	0x87, 0xc2, 0xc0, 0xa7, 0x0c, 0x43, 0xb4, 0x8f, 0x65, 0xa3, 0x61, 0x10, 0x1b, 0x50, 0xf6, 0x36,
-	0x13, 0x4c, 0x51, 0x1f, 0x40, 0x83, 0x91, 0x86, 0x13, 0x20, 0xea, 0xdf, 0xe8, 0x4a, 0xa2, 0xd1,
-	0xe5, 0x04, 0x82, 0xed, 0x1a, 0xa0, 0x7e, 0x84, 0x0a, 0xb7, 0x84, 0x97, 0xea, 0x33, 0x05, 0x4c,
-	0x30, 0xb2, 0x8a, 0xdd, 0x06, 0xe9, 0xb0, 0x86, 0xc3, 0x59, 0x33, 0xdc, 0x8f, 0x35, 0x0b, 0xc2,
-	0xcc, 0xb1, 0xc0, 0x4c, 0xef, 0x71, 0x98, 0x8a, 0x4e, 0x87, 0xfd, 0xc3, 0x9f, 0x74, 0xd8, 0x92,
-	0xe5, 0xd2, 0xd9, 0x22, 0x4f, 0x7e, 0xbe, 0x9b, 0x7c, 0xd9, 0x7c, 0x42, 0xfc, 0xbf, 0x65, 0xc1,
-	0xed, 0x41, 0x73, 0x25, 0x0b, 0xe3, 0x11, 0x18, 0x35, 0x1c, 0xd2, 0x71, 0xd9, 0x8c, 0x48, 0xda,
-	0x6d, 0xee, 0xcf, 0x1f, 0x9b, 0xc5, 0x0b, 0x7b, 0x80, 0xbd, 0xe0, 0xb2, 0x6e, 0xda, 0x84, 0x1a,
-	0xa8, 0x87, 0x0a, 0xbb, 0xba, 0xab, 0x7e, 0x92, 0xdf, 0x59, 0x77, 0x55, 0xea, 0xae, 0xaa, 0xeb,
-	0x60, 0xca, 0xb6, 0x9e, 0x74, 0x2c, 0x64, 0xb1, 0xa7, 0x8d, 0x96, 0xdf, 0x09, 0x50, 0xd0, 0x7c,
-	0x6a, 0x77, 0x53, 0x58, 0xa9, 0xe3, 0x56, 0xb7, 0x44, 0x76, 0x28, 0x84, 0xfa, 0xa4, 0x5c, 0x0b,
-	0xba, 0x0d, 0x52, 0x1f, 0x82, 0x43, 0x9f, 0x11, 0xcb, 0x6d, 0xf0, 0xdb, 0xa1, 0xdf, 0xd3, 0xc6,
-	0xae, 0xe5, 0x2b, 0xc1, 0xd5, 0xb1, 0x12, 0x5e, 0x1d, 0x2b, 0xcb, 0xe1, 0xd5, 0xb1, 0x76, 0x4a,
-	0x94, 0xc7, 0x64, 0x60, 0x42, 0x1e, 0x85, 0xcf, 0x5f, 0x17, 0x15, 0xfd, 0x20, 0xff, 0xe6, 0xc2,
-	0xf0, 0xab, 0xac, 0x3f, 0x05, 0xe6, 0x10, 0x5a, 0x26, 0xd1, 0x84, 0x2d, 0x86, 0xf6, 0xbb, 0x3d,
-	0x4d, 0xf2, 0xed, 0x26, 0x18, 0x0b, 0x3b, 0x94, 0x9c, 0xc1, 0xb5, 0xe3, 0x5b, 0x9b, 0x45, 0x35,
-	0xec, 0x27, 0x72, 0x13, 0x46, 0x9a, 0x19, 0x8a, 0x10, 0x35, 0xd3, 0x8f, 0xa8, 0x8d, 0x90, 0x11,
-	0x08, 0x53, 0xcb, 0xc3, 0x68, 0xa6, 0x3f, 0xf1, 0x4e, 0xc7, 0x31, 0x22, 0x3c, 0x0e, 0xf5, 0x71,
-	0x7f, 0xa1, 0x2e, 0xbe, 0x77, 0x18, 0xa8, 0x8a, 0xa0, 0x0e, 0x68, 0xa0, 0xba, 0xcd, 0x40, 0x75,
-	0xf6, 0x32, 0xe7, 0xd1, 0xf9, 0x90, 0x47, 0x06, 0x42, 0x65, 0x46, 0xca, 0x2d, 0x3b, 0x3a, 0xc3,
-	0xc3, 0xd0, 0xc0, 0x5f, 0xb3, 0xfe, 0x64, 0x49, 0x93, 0x05, 0xc9, 0xa4, 0x81, 0xb3, 0x11, 0xa1,
-	0x60, 0xe6, 0x3f, 0xa4, 0x60, 0x76, 0xbf, 0x29, 0xb8, 0x0a, 0xc6, 0x5d, 0xbc, 0xde, 0x90, 0x0c,
-	0xc9, 0x1d, 0xf0, 0x2d, 0xdc, 0x49, 0x4d, 0xbf, 0xa3, 0x81, 0x85, 0x1e, 0x65, 0x50, 0x3f, 0xec,
-	0xe2, 0x75, 0x19, 0xf7, 0xe8, 0xc0, 0xd8, 0x71, 0x91, 0xd8, 0x3e, 0x30, 0xe0, 0xcf, 0x59, 0x31,
-	0xac, 0xf9, 0x95, 0x75, 0x9e, 0xb8, 0x6b, 0xd8, 0x63, 0xfc, 0x5a, 0xc0, 0x8c, 0x55, 0x1c, 0xd5,
-	0xa4, 0xf4, 0xd3, 0x94, 0x86, 0x29, 0xbb, 0xdc, 0x82, 0x3c, 0x30, 0xe9, 0x58, 0x6e, 0xc3, 0x70,
-	0x18, 0x9f, 0x3f, 0x94, 0xc3, 0xf0, 0xbd, 0x38, 0x14, 0x4c, 0x8f, 0x54, 0xe9, 0x38, 0x11, 0x58,
-	0xdf, 0xae, 0x0f, 0xea, 0xe3, 0x8e, 0xe5, 0xce, 0x39, 0x6c, 0x99, 0x04, 0x6e, 0x7e, 0xa3, 0x44,
-	0xa7, 0x66, 0x2b, 0x08, 0x82, 0x9f, 0xa2, 0x5d, 0xb9, 0x75, 0x2f, 0x69, 0x6a, 0x0a, 0x0d, 0x7c,
-	0xa2, 0x5d, 0xdc, 0xe3, 0x44, 0xeb, 0x0e, 0x58, 0x91, 0x83, 0xd9, 0xf3, 0x9c, 0x8b, 0xa5, 0xee,
-	0x4c, 0xf3, 0xdf, 0x53, 0x42, 0x73, 0x70, 0xcb, 0xf3, 0x7d, 0xf9, 0x56, 0x11, 0x57, 0x9a, 0x98,
-	0xfc, 0x49, 0xbe, 0x51, 0x30, 0xc9, 0x08, 0xe3, 0x11, 0x77, 0x58, 0x10, 0x03, 0x24, 0x46, 0xd8,
-	0xc0, 0x41, 0xdd, 0xae, 0x0f, 0xea, 0x13, 0xfe, 0xd2, 0x9c, 0xc3, 0x7c, 0xdb, 0xe8, 0xda, 0x3f,
-	0x63, 0x20, 0xbb, 0x44, 0x4d, 0xd5, 0x03, 0x6a, 0xdc, 0xb5, 0xbc, 0xb2, 0xf3, 0x0f, 0x18, 0x95,
-	0xd8, 0x37, 0x77, 0xbe, 0xba, 0x67, 0x51, 0xe9, 0xf0, 0x06, 0x38, 0x1a, 0xfb, 0x34, 0xbf, 0xd2,
-	0x57, 0x55, 0x57, 0x38, 0x7f, 0x3d, 0x85, 0x70, 0x92, 0x65, 0xf9, 0x70, 0xdd, 0x8b, 0xe5, 0x50,
-	0x78, 0x4f, 0x96, 0x77, 0x3c, 0x31, 0xbf, 0x57, 0xc0, 0x99, 0xfe, 0x0f, 0xe8, 0x5b, 0x29, 0x9c,
-	0xea, 0x39, 0x99, 0xbf, 0x3d, 0xe8, 0x49, 0x89, 0xf0, 0x6b, 0x05, 0x9c, 0x4c, 0x7e, 0xe8, 0xce,
-	0x24, 0xe8, 0x4f, 0x3c, 0x91, 0xbf, 0x95, 0xf6, 0x84, 0x44, 0xf2, 0x8b, 0x02, 0xae, 0xa6, 0x7a,
-	0x45, 0xce, 0x27, 0x98, 0x4a, 0xa3, 0x24, 0x7f, 0x6f, 0x1f, 0x94, 0x48, 0x17, 0x3e, 0x07, 0xc7,
-	0xe2, 0x5f, 0x58, 0x57, 0x13, 0xac, 0xc4, 0x4a, 0xe7, 0x3f, 0x48, 0x23, 0x2d, 0x8d, 0xff, 0xa9,
-	0x80, 0x0f, 0x07, 0x7b, 0xf8, 0x2c, 0x26, 0xda, 0x1b, 0x40, 0x5b, 0x7e, 0x79, 0x3f, 0xb5, 0xf5,
-	0x54, 0x47, 0xaa, 0xdb, 0x65, 0x52, 0x75, 0xa4, 0x51, 0x92, 0x58, 0x1d, 0x03, 0xdd, 0xb0, 0xfc,
-	0xea, 0x88, 0x1b, 0xe9, 0xc9, 0xd5, 0x11, 0x23, 0xbd, 0x4b, 0x75, 0xec, 0x32, 0x6e, 0x6a, 0xf7,
-	0x5f, 0xbe, 0x29, 0x28, 0xaf, 0xde, 0x14, 0x94, 0xbf, 0xde, 0x14, 0x94, 0xe7, 0x6f, 0x0b, 0x43,
-	0xaf, 0xde, 0x16, 0x86, 0x7e, 0x7f, 0x5b, 0x18, 0x7a, 0x74, 0x23, 0x32, 0x66, 0x84, 0xe6, 0xb2,
-	0x6d, 0x34, 0x69, 0xf8, 0xa1, 0xad, 0x55, 0x3f, 0xd2, 0x36, 0x7a, 0xfe, 0xe0, 0xcd, 0x47, 0x4f,
-	0x73, 0xc4, 0x7f, 0x2e, 0x5c, 0xff, 0x37, 0x00, 0x00, 0xff, 0xff, 0x6c, 0x6e, 0xdc, 0x7b, 0x13,
-	0x17, 0x00, 0x00,
+	0x1b, 0xcf, 0xda, 0x21, 0x81, 0x09, 0x09, 0xc9, 0xbe, 0x04, 0x8c, 0x01, 0xdb, 0x0c, 0xf0, 0x12,
+	0x3e, 0xbc, 0x1b, 0x43, 0x0b, 0x69, 0x7a, 0x28, 0x71, 0xac, 0x56, 0x2e, 0x89, 0x8a, 0x96, 0xa0,
+	0x4a, 0xbd, 0xb8, 0x6b, 0xcf, 0x64, 0xb3, 0xcd, 0xee, 0x8e, 0xf1, 0x8c, 0x43, 0xa2, 0x9e, 0xda,
+	0x4a, 0xad, 0xc4, 0x09, 0xf5, 0xd2, 0x5e, 0xaa, 0x9e, 0x5b, 0x55, 0x15, 0x7f, 0x42, 0x8f, 0x1c,
+	0x39, 0x56, 0xad, 0x14, 0x2a, 0x38, 0xf4, 0x9e, 0x4b, 0xaf, 0xd5, 0xec, 0xce, 0xae, 0xd7, 0xf1,
+	0x6e, 0xec, 0x35, 0xb9, 0xf4, 0x92, 0xec, 0xcc, 0x3c, 0x1f, 0xbf, 0xe7, 0x7b, 0xc6, 0xe0, 0x2c,
+	0xa1, 0x36, 0xa1, 0x26, 0x55, 0x69, 0xbb, 0x89, 0x5b, 0xeb, 0x56, 0xdb, 0x44, 0x2a, 0xdb, 0x56,
+	0x9a, 0x2d, 0xc2, 0x88, 0x2c, 0x8b, 0x43, 0xa5, 0x73, 0x98, 0x3d, 0x69, 0x10, 0x83, 0xb8, 0xc7,
+	0x2a, 0xff, 0xf2, 0x28, 0xb3, 0x33, 0xba, 0x6d, 0x3a, 0x44, 0x75, 0xff, 0x8a, 0xad, 0x9c, 0x41,
+	0x88, 0x61, 0x61, 0xd5, 0x5d, 0xd5, 0xdb, 0xeb, 0x2a, 0x6a, 0xb7, 0x74, 0x66, 0x12, 0xc7, 0x3f,
+	0x6f, 0xb8, 0xd2, 0xd5, 0xba, 0x4e, 0xb1, 0xba, 0x55, 0xaa, 0x63, 0xa6, 0x97, 0xd4, 0x06, 0x31,
+	0xfd, 0xf3, 0xfc, 0x7e, 0x7e, 0x66, 0xda, 0x98, 0x32, 0xdd, 0x6e, 0x0a, 0x82, 0x8b, 0x11, 0xd0,
+	0x3b, 0x9f, 0x1e, 0x11, 0xfc, 0x5e, 0x02, 0xb3, 0xab, 0xd4, 0x78, 0x10, 0xec, 0x57, 0xb0, 0x85,
+	0x0d, 0x9d, 0x61, 0xf9, 0x2a, 0x18, 0xa3, 0xd8, 0x41, 0xb8, 0x95, 0x91, 0x0a, 0xd2, 0xdc, 0xb1,
+	0xf2, 0xcc, 0xde, 0x6e, 0x7e, 0x72, 0x47, 0xb7, 0xad, 0x45, 0xe8, 0xed, 0x43, 0x4d, 0x10, 0xc8,
+	0xa7, 0xc1, 0xb8, 0x45, 0x1a, 0x9b, 0x35, 0x13, 0x65, 0x52, 0x05, 0x69, 0x6e, 0x54, 0x1b, 0xe3,
+	0xcb, 0x2a, 0x92, 0xcf, 0x80, 0xa3, 0x5b, 0xba, 0x55, 0xd3, 0x11, 0x6a, 0x65, 0xd2, 0x5c, 0x8a,
+	0x36, 0xbe, 0xa5, 0x5b, 0x4b, 0x08, 0xb5, 0x16, 0x0b, 0x4f, 0xfe, 0x7e, 0x76, 0x2d, 0xc2, 0xbb,
+	0x45, 0x24, 0x00, 0xc0, 0x3c, 0x38, 0x1f, 0x89, 0x4c, 0xc3, 0xb4, 0x49, 0x1c, 0x8a, 0xe1, 0x17,
+	0x12, 0x38, 0xdd, 0x45, 0xf1, 0xd0, 0x41, 0x87, 0x88, 0x7e, 0x11, 0x72, 0x88, 0xe7, 0x23, 0x20,
+	0xb6, 0x03, 0x3d, 0xf0, 0x02, 0xc8, 0xc7, 0x40, 0x08, 0x60, 0x7e, 0xd9, 0x0b, 0xb3, 0x4e, 0x1c,
+	0xb4, 0x42, 0x1a, 0x9b, 0x87, 0x02, 0xf3, 0x22, 0x87, 0x99, 0x8b, 0x84, 0xc9, 0xf5, 0x14, 0x39,
+	0x59, 0x04, 0x4e, 0x1f, 0x43, 0x80, 0xf3, 0x57, 0x09, 0x5c, 0x8a, 0xb1, 0x65, 0xc9, 0x39, 0x64,
+	0xd0, 0x72, 0x19, 0x8c, 0xf2, 0x5c, 0x76, 0xb3, 0x62, 0xe2, 0xe6, 0x19, 0xc5, 0x4b, 0x76, 0x85,
+	0x27, 0xbb, 0x22, 0x92, 0x5d, 0x59, 0x26, 0xa6, 0x53, 0xfe, 0xdf, 0xf3, 0xdd, 0xfc, 0xc8, 0xde,
+	0x6e, 0x7e, 0xc2, 0x53, 0xc0, 0x99, 0xa0, 0xe6, 0xf2, 0xc2, 0x0f, 0xc0, 0x8d, 0x41, 0xf0, 0xfa,
+	0x06, 0x86, 0xc1, 0x48, 0x61, 0x30, 0x70, 0x4f, 0x02, 0xe7, 0x56, 0xa9, 0xc1, 0x89, 0x97, 0x1c,
+	0xf4, 0x66, 0xb5, 0xa0, 0x83, 0x23, 0x1c, 0x1c, 0xcd, 0xa4, 0x0a, 0xe9, 0x83, 0x2d, 0x9b, 0xe7,
+	0x96, 0xfd, 0xfc, 0x32, 0x3f, 0x67, 0x98, 0x6c, 0xa3, 0x5d, 0x57, 0x1a, 0xc4, 0x56, 0x45, 0xcd,
+	0x7b, 0xff, 0x8a, 0x14, 0x6d, 0xaa, 0x6c, 0xa7, 0x89, 0xa9, 0xcb, 0x40, 0x35, 0x4f, 0xf2, 0x41,
+	0x55, 0x75, 0x95, 0xe7, 0xc2, 0x25, 0x3f, 0x17, 0xb8, 0x79, 0x45, 0xdd, 0x41, 0xc5, 0xa8, 0xf2,
+	0xba, 0xed, 0x46, 0x3b, 0xd6, 0xe6, 0xc0, 0x6b, 0x53, 0x20, 0x55, 0xad, 0x08, 0x87, 0xa5, 0xaa,
+	0x15, 0xf8, 0x2c, 0x05, 0xd4, 0x55, 0x6a, 0x2c, 0xb7, 0xb0, 0xce, 0xf0, 0xfb, 0x6d, 0xcb, 0xd2,
+	0x74, 0xc7, 0xc0, 0xf7, 0x09, 0x35, 0x79, 0xf3, 0xfa, 0x6f, 0xfb, 0x4f, 0xbe, 0x0e, 0xc6, 0x9b,
+	0x84, 0x58, 0x3c, 0x45, 0x46, 0xb9, 0xc5, 0x65, 0x79, 0x6f, 0x37, 0x3f, 0xe5, 0x21, 0x15, 0x07,
+	0x50, 0x1b, 0xe3, 0x5f, 0x55, 0xb4, 0x78, 0x85, 0x3b, 0x1b, 0xfa, 0xce, 0x5e, 0x6f, 0x5b, 0x56,
+	0xb1, 0xc5, 0x7d, 0xe1, 0xb9, 0x7c, 0xbd, 0xe3, 0xea, 0x47, 0xe0, 0x4e, 0x42, 0x8f, 0x05, 0xde,
+	0x3f, 0x05, 0xbc, 0x24, 0xad, 0x74, 0xa5, 0x6c, 0x45, 0xce, 0x01, 0xd0, 0x14, 0x02, 0xaa, 0x15,
+	0x51, 0x5b, 0xa1, 0x1d, 0xde, 0xd7, 0x33, 0xab, 0xd4, 0x78, 0xe8, 0xdc, 0x27, 0xc4, 0xfa, 0x78,
+	0xc3, 0x64, 0xd8, 0x32, 0x29, 0xc3, 0x88, 0x2f, 0x93, 0x84, 0x23, 0xe4, 0x90, 0x54, 0x5f, 0x87,
+	0x5c, 0xe2, 0x0e, 0xc9, 0xfb, 0x0e, 0x69, 0x3b, 0x7c, 0xbb, 0xf8, 0xb8, 0xa3, 0xbc, 0xc8, 0x37,
+	0xe0, 0x87, 0xa0, 0x10, 0x87, 0x2c, 0x30, 0xfb, 0xff, 0xe0, 0x04, 0xde, 0x36, 0x19, 0x46, 0x35,
+	0x51, 0xb1, 0x34, 0x23, 0x15, 0xd2, 0x73, 0xa3, 0xda, 0xa4, 0xb7, 0xbd, 0xe2, 0x16, 0x2e, 0x85,
+	0x3f, 0xa5, 0xc1, 0x82, 0x2b, 0xcc, 0xf2, 0xf2, 0x78, 0xd5, 0x34, 0x5a, 0x3a, 0xc3, 0x0f, 0x36,
+	0xf4, 0x16, 0xa6, 0x6b, 0x24, 0x70, 0xf6, 0x32, 0x71, 0x1a, 0xd8, 0x61, 0xfc, 0x0c, 0xf9, 0x8e,
+	0x4f, 0xe8, 0x86, 0x70, 0x1f, 0x4b, 0x87, 0xdd, 0x20, 0x0e, 0x60, 0xd0, 0xdb, 0x0c, 0x30, 0x43,
+	0x5d, 0x00, 0x35, 0x46, 0x6a, 0xb6, 0x87, 0xa8, 0x7f, 0xa3, 0x2b, 0x88, 0x46, 0x97, 0x11, 0x08,
+	0xf6, 0x4b, 0x80, 0xda, 0x09, 0x2a, 0xcc, 0x12, 0x56, 0xca, 0x4f, 0x24, 0x30, 0xc5, 0xc8, 0x26,
+	0x76, 0x6a, 0xa4, 0xcd, 0x6a, 0x36, 0xaf, 0x9a, 0xd1, 0x7e, 0x55, 0x53, 0x15, 0x6a, 0x66, 0x3d,
+	0x35, 0xdd, 0xec, 0x30, 0x51, 0x39, 0x1d, 0x77, 0x99, 0x3f, 0x6a, 0xb3, 0x55, 0xd3, 0xa1, 0x8b,
+	0x79, 0x1e, 0xfc, 0x6c, 0x27, 0xf8, 0x41, 0xf3, 0xf1, 0xf1, 0xff, 0x90, 0x06, 0x77, 0x87, 0x8d,
+	0x55, 0x90, 0x18, 0x55, 0x30, 0xae, 0xdb, 0xa4, 0xed, 0xb0, 0x79, 0x11, 0x34, 0x95, 0xdb, 0xf3,
+	0xc7, 0x6e, 0x7e, 0xd6, 0x03, 0x49, 0xd1, 0xa6, 0x62, 0x12, 0xd5, 0xd6, 0xd9, 0x86, 0x52, 0x75,
+	0x58, 0x27, 0x4a, 0x82, 0x0b, 0x6a, 0x3e, 0x7f, 0x47, 0x54, 0xc9, 0x8d, 0x69, 0x52, 0x51, 0xa5,
+	0x40, 0x54, 0x49, 0xb6, 0xc0, 0x8c, 0x65, 0x3e, 0x6a, 0x9b, 0xc8, 0x64, 0x3b, 0xb5, 0x86, 0x5b,
+	0xe7, 0xc8, 0x6b, 0x2d, 0xe5, 0xf7, 0x84, 0xd0, 0xb3, 0xbd, 0x42, 0x57, 0xb0, 0xa1, 0x37, 0x76,
+	0x2a, 0xb8, 0xd1, 0x89, 0x7a, 0x8f, 0x14, 0xa8, 0x4d, 0x07, 0x7b, 0x5e, 0x03, 0x41, 0xf2, 0x43,
+	0x70, 0xec, 0x33, 0x62, 0x3a, 0x35, 0x7e, 0xe1, 0x73, 0xdb, 0xd4, 0xc4, 0xcd, 0xac, 0xe2, 0xdd,
+	0x06, 0x15, 0xff, 0x36, 0xa8, 0xac, 0xf9, 0xb7, 0xc1, 0xf2, 0x39, 0x11, 0xf1, 0x69, 0x4f, 0x45,
+	0xc0, 0x0a, 0x9f, 0xbe, 0xcc, 0x4b, 0xda, 0x51, 0xbe, 0xe6, 0xc4, 0xf0, 0xab, 0xb4, 0xdb, 0xd8,
+	0x97, 0x10, 0x5a, 0x23, 0xe1, 0x18, 0xac, 0xf8, 0xfa, 0x3b, 0x6d, 0x2a, 0x28, 0xa1, 0x3b, 0x60,
+	0xc2, 0x6f, 0x3a, 0xc1, 0x58, 0x2d, 0x9f, 0xda, 0xdb, 0xcd, 0xcb, 0x7e, 0x8b, 0x08, 0x0e, 0x61,
+	0xa8, 0x3f, 0xa1, 0x50, 0xed, 0xa5, 0xfa, 0xd5, 0x5e, 0xcd, 0x4f, 0x72, 0x84, 0xa9, 0xd9, 0xc2,
+	0x68, 0xbe, 0x7f, 0x2d, 0x9d, 0x8f, 0x4a, 0x72, 0x9f, 0x1d, 0x6a, 0x93, 0xee, 0x46, 0x45, 0xac,
+	0x7b, 0x14, 0x94, 0x84, 0x53, 0x87, 0x54, 0x50, 0xda, 0xa7, 0xa0, 0xb4, 0x78, 0x8d, 0x97, 0xc6,
+	0x65, 0xbf, 0x34, 0x74, 0x84, 0x8a, 0x8c, 0x14, 0x1b, 0x56, 0x78, 0x2c, 0xfb, 0xae, 0x81, 0xdf,
+	0xa5, 0xdd, 0x61, 0x91, 0x24, 0x0a, 0x41, 0x71, 0x0c, 0x1d, 0x8d, 0x50, 0x55, 0xa5, 0x0e, 0xaf,
+	0xaa, 0xd2, 0x6f, 0x58, 0x55, 0x9f, 0x82, 0x49, 0x07, 0x3f, 0xae, 0x05, 0xf9, 0x9f, 0x39, 0xe2,
+	0x0a, 0x7c, 0x77, 0xb0, 0x8a, 0x3a, 0xe9, 0x89, 0xed, 0x92, 0x00, 0xb5, 0xe3, 0x0e, 0x7e, 0x1c,
+	0xb8, 0x32, 0xdc, 0xd6, 0x7b, 0xc6, 0xfd, 0xfe, 0xb6, 0x0e, 0x7f, 0x49, 0x8b, 0x91, 0xca, 0x2f,
+	0x96, 0xcb, 0xc4, 0xd9, 0xc2, 0x2d, 0xc6, 0x87, 0x37, 0xd3, 0x37, 0x71, 0x58, 0x92, 0xd4, 0x4f,
+	0x52, 0x92, 0xe4, 0x3f, 0xe0, 0xae, 0xa2, 0x83, 0x69, 0xdb, 0x74, 0x6a, 0xba, 0xcd, 0xf8, 0x94,
+	0xa0, 0x1c, 0x86, 0x6b, 0xc5, 0xb1, 0xf2, 0x42, 0x3f, 0x97, 0x9f, 0xf6, 0x94, 0xed, 0x67, 0x87,
+	0xda, 0xa4, 0x6d, 0x3a, 0x4b, 0x36, 0x5b, 0x23, 0x9e, 0x55, 0xdf, 0x4a, 0xe1, 0x51, 0xd6, 0xf0,
+	0x6c, 0x76, 0xc3, 0x70, 0x60, 0x75, 0xdc, 0x8b, 0x1b, 0x65, 0x42, 0x02, 0x1f, 0x33, 0x57, 0x06,
+	0x1c, 0x33, 0x9d, 0xa9, 0x27, 0x5c, 0xbe, 0x78, 0x99, 0x57, 0x53, 0xa1, 0x33, 0x68, 0xdc, 0x47,
+	0x8e, 0x90, 0xec, 0x5d, 0xbd, 0x5c, 0x5b, 0xbe, 0x96, 0xc4, 0x3d, 0x23, 0x22, 0x5c, 0x41, 0xc5,
+	0xd4, 0xc1, 0x34, 0x23, 0x8c, 0x3b, 0xd8, 0x66, 0x9e, 0x0f, 0x90, 0x98, 0x2b, 0x83, 0xfa, 0x70,
+	0x3f, 0x3b, 0xd4, 0xa6, 0xdc, 0xad, 0x25, 0x9b, 0xb9, 0xaa, 0xd0, 0xcd, 0x7f, 0x26, 0x40, 0x7a,
+	0x95, 0x1a, 0x72, 0x0b, 0xc8, 0x51, 0x57, 0x63, 0xa5, 0xf7, 0x47, 0x04, 0x25, 0xf2, 0xdd, 0x9b,
+	0x2d, 0x0d, 0x4c, 0x1a, 0xd8, 0xb7, 0x0d, 0x4e, 0x46, 0x3e, 0x8f, 0xaf, 0xf7, 0x15, 0xd5, 0x21,
+	0xce, 0xde, 0x4a, 0x40, 0x1c, 0xa7, 0x39, 0x78, 0x3c, 0x0e, 0xa2, 0xd9, 0x27, 0x1e, 0x48, 0x73,
+	0xcf, 0x33, 0xef, 0x47, 0x09, 0x5c, 0xe8, 0xff, 0x88, 0x5d, 0x48, 0x60, 0x54, 0x17, 0x67, 0xf6,
+	0xee, 0xb0, 0x9c, 0x01, 0xc2, 0x6f, 0x24, 0x70, 0x26, 0xfe, 0xb1, 0x39, 0x1f, 0x23, 0x3f, 0x96,
+	0x23, 0xbb, 0x90, 0x94, 0x23, 0x40, 0xf2, 0x9b, 0x04, 0x6e, 0x24, 0x7a, 0xc9, 0x2d, 0xc7, 0xa8,
+	0x4a, 0x22, 0x24, 0x7b, 0xef, 0x10, 0x84, 0x04, 0x26, 0x7c, 0x0e, 0x66, 0xa3, 0x5f, 0x39, 0x37,
+	0x62, 0xb4, 0x44, 0x52, 0x67, 0xdf, 0x4a, 0x42, 0x1d, 0x28, 0xff, 0x53, 0x02, 0x6f, 0x0f, 0xf7,
+	0xf8, 0x58, 0x89, 0xd5, 0x37, 0x84, 0xb4, 0xec, 0xda, 0x61, 0x4a, 0xeb, 0xca, 0x8e, 0x44, 0xd7,
+	0xc1, 0xb8, 0xec, 0x48, 0x22, 0x24, 0x36, 0x3b, 0x86, 0xba, 0x12, 0xb9, 0xd9, 0x11, 0x35, 0xb0,
+	0xe3, 0xb3, 0x23, 0x82, 0xfa, 0x80, 0xec, 0x38, 0x60, 0xba, 0x94, 0xef, 0x3f, 0x7f, 0x95, 0x93,
+	0x5e, 0xbc, 0xca, 0x49, 0x7f, 0xbd, 0xca, 0x49, 0x4f, 0x5f, 0xe7, 0x46, 0x5e, 0xbc, 0xce, 0x8d,
+	0xfc, 0xfe, 0x3a, 0x37, 0xf2, 0xc9, 0xed, 0xd0, 0xf4, 0x13, 0x92, 0x8b, 0x96, 0x5e, 0xa7, 0xfe,
+	0x42, 0xdd, 0x2a, 0xbd, 0xa3, 0x6e, 0x77, 0xfd, 0xe8, 0xcc, 0x27, 0x62, 0x7d, 0xcc, 0xbd, 0xdf,
+	0xdf, 0xfa, 0x37, 0x00, 0x00, 0xff, 0xff, 0x01, 0x69, 0x0d, 0xa8, 0x97, 0x16, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/x/twap/client/queryproto/query.pb.go b/x/twap/client/queryproto/query.pb.go
index 774577f2d88..2e0e02bcb49 100644
--- a/x/twap/client/queryproto/query.pb.go
+++ b/x/twap/client/queryproto/query.pb.go
@@ -5,11 +5,11 @@ package queryproto
 
 import (
 	context "context"
+	cosmossdk_io_math "cosmossdk.io/math"
 	fmt "fmt"
 	_ "github.com/cosmos/cosmos-proto"
 	_ "github.com/cosmos/cosmos-sdk/codec/types"
 	_ "github.com/cosmos/cosmos-sdk/types"
-	github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types"
 	_ "github.com/cosmos/cosmos-sdk/types/query"
 	_ "github.com/gogo/protobuf/gogoproto"
 	grpc1 "github.com/gogo/protobuf/grpc"
@@ -116,7 +116,7 @@ func (m *ArithmeticTwapRequest) GetEndTime() *time.Time {
 }
 
 type ArithmeticTwapResponse struct {
-	ArithmeticTwap github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,1,opt,name=arithmetic_twap,json=arithmeticTwap,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"arithmetic_twap" yaml:"arithmetic_twap"`
+	ArithmeticTwap cosmossdk_io_math.LegacyDec `protobuf:"bytes,1,opt,name=arithmetic_twap,json=arithmeticTwap,proto3,customtype=cosmossdk.io/math.LegacyDec" json:"arithmetic_twap" yaml:"arithmetic_twap"`
 }
 
 func (m *ArithmeticTwapResponse) Reset()         { *m = ArithmeticTwapResponse{} }
@@ -221,7 +221,7 @@ func (m *ArithmeticTwapToNowRequest) GetStartTime() time.Time {
 }
 
 type ArithmeticTwapToNowResponse struct {
-	ArithmeticTwap github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,1,opt,name=arithmetic_twap,json=arithmeticTwap,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"arithmetic_twap" yaml:"arithmetic_twap"`
+	ArithmeticTwap cosmossdk_io_math.LegacyDec `protobuf:"bytes,1,opt,name=arithmetic_twap,json=arithmeticTwap,proto3,customtype=cosmossdk.io/math.LegacyDec" json:"arithmetic_twap" yaml:"arithmetic_twap"`
 }
 
 func (m *ArithmeticTwapToNowResponse) Reset()         { *m = ArithmeticTwapToNowResponse{} }
@@ -334,7 +334,7 @@ func (m *GeometricTwapRequest) GetEndTime() *time.Time {
 }
 
 type GeometricTwapResponse struct {
-	GeometricTwap github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,1,opt,name=geometric_twap,json=geometricTwap,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"geometric_twap" yaml:"geometric_twap"`
+	GeometricTwap cosmossdk_io_math.LegacyDec `protobuf:"bytes,1,opt,name=geometric_twap,json=geometricTwap,proto3,customtype=cosmossdk.io/math.LegacyDec" json:"geometric_twap" yaml:"geometric_twap"`
 }
 
 func (m *GeometricTwapResponse) Reset()         { *m = GeometricTwapResponse{} }
@@ -439,7 +439,7 @@ func (m *GeometricTwapToNowRequest) GetStartTime() time.Time {
 }
 
 type GeometricTwapToNowResponse struct {
-	GeometricTwap github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,1,opt,name=geometric_twap,json=geometricTwap,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"geometric_twap" yaml:"geometric_twap"`
+	GeometricTwap cosmossdk_io_math.LegacyDec `protobuf:"bytes,1,opt,name=geometric_twap,json=geometricTwap,proto3,customtype=cosmossdk.io/math.LegacyDec" json:"geometric_twap" yaml:"geometric_twap"`
 }
 
 func (m *GeometricTwapToNowResponse) Reset()         { *m = GeometricTwapToNowResponse{} }
@@ -571,57 +571,58 @@ func init() {
 func init() { proto.RegisterFile("osmosis/twap/v1beta1/query.proto", fileDescriptor_141a22dba58615af) }
 
 var fileDescriptor_141a22dba58615af = []byte{
-	// 800 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x96, 0x41, 0x4f, 0x1b, 0x47,
-	0x14, 0xc7, 0x3d, 0x2e, 0x98, 0x7a, 0x10, 0x46, 0x9d, 0x02, 0x85, 0x05, 0x76, 0xad, 0x85, 0x22,
-	0x17, 0xc3, 0x2e, 0xa6, 0xa7, 0xa2, 0x5e, 0xb0, 0x2a, 0xd1, 0x4a, 0x55, 0xd5, 0xae, 0x50, 0x55,
-	0xf5, 0x62, 0x8d, 0xed, 0xc9, 0xb2, 0x8a, 0x77, 0x67, 0xbd, 0x3b, 0x86, 0xf8, 0x9a, 0x4b, 0x0e,
-	0xc9, 0x01, 0x25, 0xca, 0x21, 0x87, 0xe4, 0x9e, 0x43, 0xbe, 0x07, 0xa7, 0x04, 0x29, 0x97, 0x28,
-	0x07, 0x27, 0x82, 0x7c, 0x02, 0x3e, 0x41, 0xb4, 0x33, 0xb3, 0x8e, 0xd7, 0x59, 0x11, 0x73, 0x42,
-	0x48, 0x39, 0x99, 0x79, 0xef, 0xff, 0xde, 0xfb, 0xcd, 0x9b, 0x7d, 0x33, 0xc0, 0x22, 0x0d, 0x5d,
-	0x1a, 0x3a, 0xa1, 0xc9, 0x8e, 0xb0, 0x6f, 0x1e, 0x56, 0xea, 0x84, 0xe1, 0x8a, 0xd9, 0xee, 0x90,
-	0xa0, 0x6b, 0xf8, 0x01, 0x65, 0x14, 0xcd, 0x48, 0x85, 0x11, 0x29, 0x0c, 0xa9, 0x50, 0x66, 0x6c,
-	0x6a, 0x53, 0x2e, 0x30, 0xa3, 0xbf, 0x84, 0x56, 0x59, 0x4b, 0xcd, 0x16, 0x2d, 0x6a, 0x01, 0x69,
-	0xd0, 0xa0, 0x29, 0x75, 0x7a, 0xaa, 0xce, 0x26, 0x1e, 0x89, 0x0a, 0x09, 0x8d, 0xda, 0xe0, 0x22,
-	0xb3, 0x8e, 0x43, 0xd2, 0x97, 0x34, 0xa8, 0xe3, 0x49, 0xff, 0xfa, 0xa0, 0x9f, 0x03, 0xf7, 0x55,
-	0x3e, 0xb6, 0x1d, 0x0f, 0x33, 0x87, 0xc6, 0xda, 0x25, 0x9b, 0x52, 0xbb, 0x45, 0x4c, 0xec, 0x3b,
-	0x26, 0xf6, 0x3c, 0xca, 0xb8, 0x33, 0xae, 0xb4, 0x20, 0xbd, 0x7c, 0x55, 0xef, 0xdc, 0x32, 0xb1,
-	0xd7, 0x8d, 0x5d, 0xa2, 0x48, 0x4d, 0xec, 0x54, 0x2c, 0xa4, 0x4b, 0x1b, 0x8e, 0x62, 0x8e, 0x4b,
-	0x42, 0x86, 0x5d, 0x5f, 0x08, 0xf4, 0x67, 0x59, 0x38, 0xbb, 0x1b, 0x38, 0xec, 0xc0, 0x25, 0xcc,
-	0x69, 0xec, 0x1f, 0x61, 0xdf, 0x22, 0xed, 0x0e, 0x09, 0x19, 0xfa, 0x01, 0x4e, 0xf8, 0x94, 0xb6,
-	0x6a, 0x4e, 0x73, 0x1e, 0x14, 0x41, 0x69, 0xcc, 0xca, 0x45, 0xcb, 0x3f, 0x9a, 0x68, 0x19, 0xc2,
-	0x68, 0x3b, 0x35, 0x1c, 0x86, 0x84, 0xcd, 0x67, 0x8b, 0xa0, 0x94, 0xb7, 0xf2, 0x91, 0x65, 0x37,
-	0x32, 0x20, 0x0d, 0x4e, 0xb6, 0x3b, 0x94, 0xc5, 0xfe, 0x6f, 0xb8, 0x1f, 0x72, 0x93, 0x10, 0xfc,
-	0x07, 0x61, 0xc8, 0x70, 0xc0, 0x6a, 0x11, 0xcb, 0xfc, 0x58, 0x11, 0x94, 0x26, 0xb7, 0x15, 0x43,
-	0x80, 0x1a, 0x31, 0xa8, 0xb1, 0x1f, 0x83, 0x56, 0x97, 0x4f, 0x7a, 0x5a, 0xe6, 0xa2, 0xa7, 0x7d,
-	0xd7, 0xc5, 0x6e, 0x6b, 0x47, 0xff, 0x14, 0xab, 0x1f, 0xbf, 0xd3, 0x80, 0x95, 0xe7, 0x86, 0x48,
-	0x8e, 0x2c, 0xf8, 0x2d, 0xf1, 0x9a, 0x22, 0xef, 0xf8, 0x17, 0xf3, 0x2e, 0x9e, 0xf4, 0x34, 0x70,
-	0xd1, 0xd3, 0xa6, 0x45, 0xde, 0x38, 0x52, 0x64, 0x9d, 0x20, 0x5e, 0x33, 0x92, 0xea, 0xf7, 0x01,
-	0x9c, 0x1b, 0x6e, 0x50, 0xe8, 0x53, 0x2f, 0x24, 0xa8, 0x0d, 0xa7, 0x71, 0xdf, 0x53, 0x8b, 0xbe,
-	0x12, 0xde, 0xa9, 0x7c, 0xf5, 0xf7, 0x88, 0xf8, 0x6d, 0x4f, 0x5b, 0xb3, 0x1d, 0x76, 0xd0, 0xa9,
-	0x1b, 0x0d, 0xea, 0xca, 0x63, 0x91, 0x3f, 0x9b, 0x61, 0xf3, 0xb6, 0xc9, 0xba, 0x3e, 0x09, 0x8d,
-	0xdf, 0x48, 0xe3, 0xa2, 0xa7, 0xcd, 0x09, 0x86, 0xa1, 0x74, 0xba, 0x55, 0xc0, 0x89, 0xd2, 0xfa,
-	0x2b, 0x00, 0x95, 0x24, 0xcd, 0x3e, 0xfd, 0x8b, 0x1e, 0xdd, 0xdc, 0x33, 0xd3, 0x8f, 0x01, 0x5c,
-	0x4c, 0xdd, 0xd1, 0xf5, 0x35, 0xf9, 0x69, 0x16, 0xce, 0xec, 0x11, 0xea, 0x12, 0x16, 0x7c, 0x1d,
-	0x89, 0x94, 0x91, 0xb8, 0x07, 0xe0, 0xec, 0x50, 0x7f, 0xe4, 0x61, 0x79, 0xb0, 0x60, 0xc7, 0x8e,
-	0xc1, 0xb3, 0xda, 0xbb, 0xf2, 0x59, 0xcd, 0x0a, 0x82, 0x64, 0x36, 0xdd, 0x9a, 0xb2, 0x07, 0xeb,
-	0xea, 0x2f, 0x01, 0x5c, 0x48, 0x90, 0xdc, 0xf4, 0x69, 0x78, 0x00, 0xa0, 0x92, 0xb6, 0xa1, 0x6b,
-	0xea, 0xef, 0x34, 0x9c, 0xfa, 0x1b, 0x07, 0xd8, 0x0d, 0x65, 0x4b, 0xf5, 0x3f, 0x61, 0x21, 0x36,
-	0x48, 0xa4, 0x1d, 0x98, 0xf3, 0xb9, 0x85, 0xa3, 0x4c, 0x6e, 0x2f, 0x19, 0x69, 0x4f, 0xb1, 0x21,
-	0xa2, 0xaa, 0x63, 0x11, 0xa8, 0x25, 0x23, 0xb6, 0x1f, 0xe6, 0xe0, 0xf8, 0x3f, 0xd1, 0xa3, 0x88,
-	0xba, 0x30, 0x27, 0x14, 0x68, 0xe5, 0xb2, 0x78, 0x89, 0xa1, 0xac, 0x5e, 0x2e, 0x12, 0x68, 0xfa,
-	0xea, 0xdd, 0xd7, 0x1f, 0x1e, 0x65, 0x55, 0xb4, 0x64, 0xa6, 0xbe, 0xe4, 0xb2, 0xe0, 0x13, 0x00,
-	0x0b, 0xc9, 0x0b, 0x08, 0x95, 0xd3, 0xd3, 0xa7, 0xbe, 0x93, 0xca, 0xc6, 0x68, 0x62, 0xc9, 0xb4,
-	0xc1, 0x99, 0xd6, 0xd0, 0x6a, 0x3a, 0xd3, 0x10, 0xc8, 0x0b, 0x00, 0xbf, 0x4f, 0xb9, 0x1c, 0xd1,
-	0xd6, 0x28, 0x35, 0x07, 0x67, 0x41, 0xa9, 0x5c, 0x21, 0x42, 0xa2, 0x56, 0x38, 0x6a, 0x19, 0xfd,
-	0x34, 0x0a, 0xaa, 0xe0, 0x7a, 0x0c, 0xe0, 0x54, 0xe2, 0xf3, 0x45, 0xeb, 0xe9, 0x75, 0xd3, 0xae,
-	0x57, 0xa5, 0x3c, 0x92, 0x56, 0xd2, 0x95, 0x39, 0xdd, 0x8f, 0x68, 0x25, 0x9d, 0x2e, 0x49, 0xf1,
-	0x1c, 0x40, 0xf4, 0xf9, 0x58, 0x21, 0x73, 0x84, 0x82, 0x89, 0x2e, 0x6e, 0x8d, 0x1e, 0x20, 0x31,
-	0xb7, 0x38, 0xe6, 0x3a, 0x2a, 0x8d, 0x80, 0xc9, 0x23, 0xab, 0xff, 0x9e, 0x9c, 0xa9, 0xe0, 0xf4,
-	0x4c, 0x05, 0xef, 0xcf, 0x54, 0x70, 0x7c, 0xae, 0x66, 0x4e, 0xcf, 0xd5, 0xcc, 0x9b, 0x73, 0x35,
-	0xf3, 0xff, 0xaf, 0x03, 0xd3, 0x2d, 0xb3, 0x6d, 0xb6, 0x70, 0x3d, 0xec, 0xa7, 0x3e, 0xac, 0xfc,
-	0x62, 0xde, 0x11, 0x05, 0x1a, 0x2d, 0x87, 0x78, 0x4c, 0xfc, 0xcb, 0x29, 0x6e, 0xa4, 0x1c, 0xff,
-	0xf9, 0xf9, 0x63, 0x00, 0x00, 0x00, 0xff, 0xff, 0x1e, 0xc0, 0xd5, 0xb1, 0x4d, 0x0b, 0x00, 0x00,
+	// 801 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x96, 0x41, 0x4f, 0xe3, 0x46,
+	0x14, 0xc7, 0x33, 0x29, 0x84, 0x66, 0x10, 0x41, 0x9d, 0x02, 0x05, 0x03, 0x76, 0x64, 0x28, 0x4a,
+	0x09, 0xb5, 0x09, 0x3d, 0x15, 0xd1, 0x03, 0x51, 0xa5, 0xaa, 0x12, 0xaa, 0x5a, 0x0b, 0x55, 0x55,
+	0x2f, 0xd1, 0xc4, 0x19, 0x8c, 0xd5, 0xd8, 0x63, 0xec, 0x09, 0x34, 0x52, 0x0f, 0x6d, 0xa5, 0xde,
+	0x51, 0xab, 0x1e, 0x7a, 0x68, 0xef, 0x3d, 0xec, 0xf7, 0xe0, 0xb4, 0x8b, 0xb4, 0x97, 0xd5, 0x1e,
+	0xb2, 0x2b, 0xd8, 0x4f, 0xc0, 0x27, 0x58, 0x79, 0x66, 0x9c, 0x8d, 0xb3, 0x16, 0xeb, 0xbd, 0x20,
+	0x21, 0xed, 0x09, 0x66, 0xde, 0xff, 0xbd, 0xff, 0x6f, 0xde, 0x8c, 0x67, 0x02, 0xab, 0x34, 0xf2,
+	0x68, 0xe4, 0x46, 0x26, 0x3b, 0xc3, 0x81, 0x79, 0xda, 0x68, 0x13, 0x86, 0x1b, 0xe6, 0x49, 0x8f,
+	0x84, 0x7d, 0x23, 0x08, 0x29, 0xa3, 0x68, 0x4e, 0x2a, 0x8c, 0x58, 0x61, 0x48, 0x85, 0x32, 0xe7,
+	0x50, 0x87, 0x72, 0x81, 0x19, 0xff, 0x27, 0xb4, 0xca, 0x46, 0x66, 0xb5, 0x78, 0xd0, 0x0a, 0x89,
+	0x4d, 0xc3, 0x8e, 0xd4, 0xe9, 0x99, 0x3a, 0x87, 0xf8, 0x24, 0x36, 0x12, 0x1a, 0xd5, 0xe6, 0x22,
+	0xb3, 0x8d, 0x23, 0x32, 0x94, 0xd8, 0xd4, 0xf5, 0x65, 0x7c, 0x73, 0x34, 0xce, 0x81, 0x87, 0xaa,
+	0x00, 0x3b, 0xae, 0x8f, 0x99, 0x4b, 0x13, 0xed, 0x8a, 0x43, 0xa9, 0xd3, 0x25, 0x26, 0x0e, 0x5c,
+	0x13, 0xfb, 0x3e, 0x65, 0x3c, 0x98, 0x38, 0x2d, 0xc9, 0x28, 0x1f, 0xb5, 0x7b, 0x47, 0x26, 0xf6,
+	0xfb, 0x49, 0x48, 0x98, 0xb4, 0xc4, 0x4a, 0xc5, 0x40, 0x86, 0xb4, 0xf1, 0x2c, 0xe6, 0x7a, 0x24,
+	0x62, 0xd8, 0x0b, 0x84, 0x40, 0xff, 0xaf, 0x08, 0xe7, 0xf7, 0x43, 0x97, 0x1d, 0x7b, 0x84, 0xb9,
+	0xf6, 0xe1, 0x19, 0x0e, 0x2c, 0x72, 0xd2, 0x23, 0x11, 0x43, 0x1f, 0xc1, 0xa9, 0x80, 0xd2, 0x6e,
+	0xcb, 0xed, 0x2c, 0x82, 0x2a, 0xa8, 0x4d, 0x58, 0xa5, 0x78, 0xf8, 0x75, 0x07, 0xad, 0x42, 0x18,
+	0x2f, 0xa7, 0x85, 0xa3, 0x88, 0xb0, 0xc5, 0x62, 0x15, 0xd4, 0xca, 0x56, 0x39, 0x9e, 0xd9, 0x8f,
+	0x27, 0x90, 0x06, 0xa7, 0x4f, 0x7a, 0x94, 0x25, 0xf1, 0xf7, 0x78, 0x1c, 0xf2, 0x29, 0x21, 0xf8,
+	0x01, 0xc2, 0x88, 0xe1, 0x90, 0xb5, 0x62, 0x96, 0xc5, 0x89, 0x2a, 0xa8, 0x4d, 0xef, 0x28, 0x86,
+	0x00, 0x35, 0x12, 0x50, 0xe3, 0x30, 0x01, 0x6d, 0xae, 0x5e, 0x0c, 0xb4, 0xc2, 0xcd, 0x40, 0xfb,
+	0xa0, 0x8f, 0xbd, 0xee, 0xae, 0xfe, 0x2a, 0x57, 0x3f, 0x7f, 0xa6, 0x01, 0xab, 0xcc, 0x27, 0x62,
+	0x39, 0xb2, 0xe0, 0xfb, 0xc4, 0xef, 0x88, 0xba, 0x93, 0x6f, 0xac, 0xbb, 0x7c, 0x31, 0xd0, 0xc0,
+	0xcd, 0x40, 0x9b, 0x15, 0x75, 0x93, 0x4c, 0x51, 0x75, 0x8a, 0xf8, 0x9d, 0x58, 0xaa, 0xff, 0x0a,
+	0xe0, 0xc2, 0x78, 0x83, 0xa2, 0x80, 0xfa, 0x11, 0x41, 0x47, 0x70, 0x16, 0x0f, 0x23, 0xad, 0xf8,
+	0x94, 0xf0, 0x4e, 0x95, 0x9b, 0x5f, 0xc4, 0xc4, 0x4f, 0x07, 0xda, 0xb2, 0xd8, 0x8b, 0xa8, 0xf3,
+	0x93, 0xe1, 0x52, 0xd3, 0xc3, 0xec, 0xd8, 0x38, 0x20, 0x0e, 0xb6, 0xfb, 0x5f, 0x12, 0xfb, 0x66,
+	0xa0, 0x2d, 0x08, 0xe3, 0xb1, 0x1a, 0xba, 0x55, 0xc1, 0x29, 0x3f, 0xfd, 0x11, 0x80, 0x4a, 0x1a,
+	0xe1, 0x90, 0x7e, 0x43, 0xcf, 0xee, 0xef, 0x46, 0xe9, 0x7f, 0x00, 0xb8, 0x9c, 0xb9, 0xa2, 0x3b,
+	0xee, 0xec, 0xbf, 0x45, 0x38, 0xf7, 0x15, 0xa1, 0x1e, 0x61, 0xe1, 0xbb, 0xc3, 0x9f, 0x71, 0xf8,
+	0x7f, 0x81, 0xf3, 0x63, 0xed, 0x91, 0x1b, 0x64, 0xc3, 0x8a, 0x93, 0x04, 0x46, 0xf7, 0x67, 0x2f,
+	0xdf, 0xfe, 0xcc, 0x0b, 0xd7, 0x74, 0x09, 0xdd, 0x9a, 0x71, 0x46, 0xcd, 0xf4, 0x87, 0x00, 0x2e,
+	0xa5, 0xec, 0xef, 0xfb, 0xb1, 0xff, 0x0d, 0x40, 0x25, 0x6b, 0x41, 0x77, 0xd9, 0xd4, 0x59, 0x38,
+	0xf3, 0x2d, 0x0e, 0xb1, 0x17, 0xc9, 0x3e, 0xea, 0x07, 0xb0, 0x92, 0x4c, 0x48, 0x8e, 0x5d, 0x58,
+	0x0a, 0xf8, 0x0c, 0xf7, 0x9f, 0xde, 0x59, 0x31, 0xb2, 0x5e, 0x57, 0x43, 0x64, 0x35, 0x27, 0x62,
+	0x3a, 0x4b, 0x66, 0xec, 0xfc, 0x59, 0x82, 0x93, 0xdf, 0xc5, 0xef, 0x1c, 0xea, 0xc3, 0x92, 0x50,
+	0xa0, 0xb5, 0xdb, 0xf2, 0x25, 0x86, 0xb2, 0x7e, 0xbb, 0x48, 0xa0, 0xe9, 0xeb, 0xbf, 0x3f, 0x7e,
+	0xf1, 0x57, 0x51, 0x45, 0x2b, 0x66, 0xe6, 0xe3, 0x2c, 0x0d, 0xff, 0x01, 0xb0, 0x92, 0xbe, 0x5e,
+	0x50, 0x3d, 0xbb, 0x7c, 0xe6, 0xd3, 0xa7, 0x6c, 0xe5, 0x13, 0x4b, 0xa6, 0x2d, 0xce, 0xb4, 0x81,
+	0xd6, 0xb3, 0x99, 0xc6, 0x40, 0x1e, 0x00, 0xf8, 0x61, 0xc6, 0xd5, 0x87, 0xb6, 0xf3, 0x78, 0x8e,
+	0x7e, 0x00, 0x4a, 0xe3, 0x2d, 0x32, 0x24, 0x6a, 0x83, 0xa3, 0xd6, 0xd1, 0x27, 0x79, 0x50, 0x05,
+	0xd7, 0xdf, 0x00, 0xce, 0xa4, 0xce, 0x2c, 0xda, 0xcc, 0xf6, 0xcd, 0xba, 0x47, 0x95, 0x7a, 0x2e,
+	0xad, 0xa4, 0xab, 0x73, 0xba, 0x8f, 0xd1, 0x5a, 0x36, 0x5d, 0x9a, 0xe2, 0x7f, 0x00, 0xd1, 0xeb,
+	0xdf, 0x12, 0x32, 0x73, 0x18, 0xa6, 0xba, 0xb8, 0x9d, 0x3f, 0x41, 0x62, 0x6e, 0x73, 0xcc, 0x4d,
+	0x54, 0xcb, 0x81, 0xc9, 0x33, 0x9b, 0xdf, 0x5f, 0x5c, 0xa9, 0xe0, 0xf2, 0x4a, 0x05, 0xcf, 0xaf,
+	0x54, 0x70, 0x7e, 0xad, 0x16, 0x2e, 0xaf, 0xd5, 0xc2, 0x93, 0x6b, 0xb5, 0xf0, 0xe3, 0x9e, 0xe3,
+	0xb2, 0xe3, 0x5e, 0xdb, 0xb0, 0xa9, 0x97, 0x54, 0xfb, 0xb4, 0x8b, 0xdb, 0xd1, 0xb0, 0xf4, 0x69,
+	0xe3, 0x73, 0xf3, 0x67, 0x61, 0x60, 0x77, 0x5d, 0xe2, 0x33, 0xf1, 0x2b, 0x52, 0x5c, 0x43, 0x25,
+	0xfe, 0xe7, 0xb3, 0x97, 0x01, 0x00, 0x00, 0xff, 0xff, 0xed, 0x44, 0x7a, 0xab, 0x20, 0x0b, 0x00,
+	0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/x/twap/types/twap_record.pb.go b/x/twap/types/twap_record.pb.go
index 74b75fb452c..84fc0824f38 100644
--- a/x/twap/types/twap_record.pb.go
+++ b/x/twap/types/twap_record.pb.go
@@ -4,11 +4,11 @@
 package types
 
 import (
+	cosmossdk_io_math "cosmossdk.io/math"
 	fmt "fmt"
 	_ "github.com/cosmos/cosmos-proto"
 	_ "github.com/cosmos/cosmos-sdk/codec/types"
 	_ "github.com/cosmos/cosmos-sdk/types"
-	github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types"
 	_ "github.com/gogo/protobuf/gogoproto"
 	proto "github.com/gogo/protobuf/proto"
 	_ "github.com/gogo/protobuf/types"
@@ -51,11 +51,11 @@ type TwapRecord struct {
 	Time time.Time `protobuf:"bytes,5,opt,name=time,proto3,stdtime" json:"time" yaml:"record_time"`
 	// We store the last spot prices in the struct, so that we can interpolate
 	// accumulator values for times between when accumulator records are stored.
-	P0LastSpotPrice             github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,6,opt,name=p0_last_spot_price,json=p0LastSpotPrice,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"p0_last_spot_price"`
-	P1LastSpotPrice             github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,7,opt,name=p1_last_spot_price,json=p1LastSpotPrice,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"p1_last_spot_price"`
-	P0ArithmeticTwapAccumulator github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,8,opt,name=p0_arithmetic_twap_accumulator,json=p0ArithmeticTwapAccumulator,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"p0_arithmetic_twap_accumulator"`
-	P1ArithmeticTwapAccumulator github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,9,opt,name=p1_arithmetic_twap_accumulator,json=p1ArithmeticTwapAccumulator,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"p1_arithmetic_twap_accumulator"`
-	GeometricTwapAccumulator    github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,10,opt,name=geometric_twap_accumulator,json=geometricTwapAccumulator,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"geometric_twap_accumulator"`
+	P0LastSpotPrice             cosmossdk_io_math.LegacyDec `protobuf:"bytes,6,opt,name=p0_last_spot_price,json=p0LastSpotPrice,proto3,customtype=cosmossdk.io/math.LegacyDec" json:"p0_last_spot_price"`
+	P1LastSpotPrice             cosmossdk_io_math.LegacyDec `protobuf:"bytes,7,opt,name=p1_last_spot_price,json=p1LastSpotPrice,proto3,customtype=cosmossdk.io/math.LegacyDec" json:"p1_last_spot_price"`
+	P0ArithmeticTwapAccumulator cosmossdk_io_math.LegacyDec `protobuf:"bytes,8,opt,name=p0_arithmetic_twap_accumulator,json=p0ArithmeticTwapAccumulator,proto3,customtype=cosmossdk.io/math.LegacyDec" json:"p0_arithmetic_twap_accumulator"`
+	P1ArithmeticTwapAccumulator cosmossdk_io_math.LegacyDec `protobuf:"bytes,9,opt,name=p1_arithmetic_twap_accumulator,json=p1ArithmeticTwapAccumulator,proto3,customtype=cosmossdk.io/math.LegacyDec" json:"p1_arithmetic_twap_accumulator"`
+	GeometricTwapAccumulator    cosmossdk_io_math.LegacyDec `protobuf:"bytes,10,opt,name=geometric_twap_accumulator,json=geometricTwapAccumulator,proto3,customtype=cosmossdk.io/math.LegacyDec" json:"geometric_twap_accumulator"`
 	// This field contains the time in which the last spot price error occured.
 	// It is used to alert the caller if they are getting a potentially erroneous
 	// TWAP, due to an unforeseen underlying error.
@@ -146,41 +146,41 @@ func init() {
 }
 
 var fileDescriptor_dbf5c78678e601aa = []byte{
-	// 540 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x94, 0xbf, 0x6f, 0xd3, 0x40,
-	0x14, 0xc7, 0x63, 0x1a, 0x52, 0x7a, 0xa1, 0xaa, 0x64, 0x45, 0x60, 0x82, 0x64, 0x87, 0x0c, 0x55,
-	0x18, 0xea, 0x1f, 0x30, 0xc1, 0x96, 0xa8, 0x0c, 0x20, 0x84, 0x90, 0xe9, 0x04, 0xc3, 0xe9, 0x6c,
-	0x5f, 0x1d, 0x0b, 0x3b, 0x77, 0xba, 0xbb, 0xb4, 0xe4, 0xbf, 0xe8, 0x9f, 0xd5, 0xb1, 0x23, 0x62,
-	0x30, 0x28, 0xd9, 0x18, 0x3b, 0x31, 0xa2, 0xfb, 0x91, 0xd0, 0x84, 0x5f, 0x52, 0xa6, 0xe4, 0xbd,
-	0xf7, 0x7d, 0x9f, 0xef, 0x7b, 0xf6, 0x93, 0xc1, 0x21, 0xe1, 0x15, 0xe1, 0x05, 0x0f, 0xc4, 0x39,
-	0xa2, 0xc1, 0x59, 0x94, 0x60, 0x81, 0x22, 0x15, 0x40, 0x86, 0x53, 0xc2, 0x32, 0x9f, 0x32, 0x22,
-	0x88, 0xdd, 0x31, 0x3a, 0x5f, 0x96, 0x7c, 0xa3, 0xeb, 0x76, 0x72, 0x92, 0x13, 0x25, 0x08, 0xe4,
-	0x3f, 0xad, 0xed, 0x3e, 0xc8, 0x09, 0xc9, 0x4b, 0x1c, 0xa8, 0x28, 0x99, 0x9e, 0x06, 0x68, 0x32,
-	0x5b, 0x96, 0x52, 0xc5, 0x81, 0xba, 0x47, 0x07, 0xa6, 0xe4, 0xea, 0x28, 0x48, 0x10, 0xc7, 0xab,
-	0x41, 0x52, 0x52, 0x4c, 0x4c, 0xdd, 0xdb, 0xa4, 0x8a, 0xa2, 0xc2, 0x5c, 0xa0, 0x8a, 0x6a, 0x41,
-	0xff, 0x47, 0x0b, 0x80, 0x93, 0x73, 0x44, 0x63, 0x35, 0xb7, 0x7d, 0x1f, 0xec, 0x52, 0x42, 0x4a,
-	0x58, 0x64, 0x8e, 0xd5, 0xb3, 0x06, 0xcd, 0xb8, 0x25, 0xc3, 0x97, 0x99, 0xfd, 0x08, 0xdc, 0x45,
-	0x9c, 0x63, 0x11, 0xc2, 0x0c, 0x4f, 0x48, 0xe5, 0xdc, 0xea, 0x59, 0x83, 0xbd, 0xb8, 0xad, 0x73,
-	0xc7, 0x32, 0xb5, 0x92, 0x44, 0x46, 0xb2, 0x73, 0x43, 0x12, 0x69, 0xc9, 0x10, 0xb4, 0xc6, 0xb8,
-	0xc8, 0xc7, 0xc2, 0x69, 0xf6, 0xac, 0xc1, 0xce, 0xe8, 0xf1, 0xf7, 0xda, 0xdb, 0xd7, 0x8f, 0x0c,
-	0xea, 0xc2, 0x75, 0xed, 0x75, 0x66, 0xa8, 0x2a, 0x9f, 0xf7, 0xd7, 0xd2, 0xfd, 0xd8, 0x34, 0xda,
-	0x6f, 0x40, 0x53, 0xee, 0xe0, 0xdc, 0xee, 0x59, 0x83, 0xf6, 0x93, 0xae, 0xaf, 0x17, 0xf4, 0x97,
-	0x0b, 0xfa, 0x27, 0xcb, 0x05, 0x47, 0xee, 0x65, 0xed, 0x35, 0xae, 0x6b, 0xcf, 0x5e, 0xe3, 0xc9,
-	0xe6, 0xfe, 0xc5, 0x57, 0xcf, 0x8a, 0x15, 0xc7, 0xfe, 0x00, 0x6c, 0x1a, 0xc2, 0x12, 0x71, 0x01,
-	0x39, 0x25, 0x02, 0x52, 0x56, 0xa4, 0xd8, 0x69, 0xc9, 0xd9, 0x47, 0xbe, 0x24, 0x7c, 0xa9, 0xbd,
-	0xc3, 0xbc, 0x10, 0xe3, 0x69, 0xe2, 0xa7, 0xa4, 0x32, 0x8f, 0xdf, 0xfc, 0x1c, 0xf1, 0xec, 0x63,
-	0x20, 0x66, 0x14, 0x73, 0xff, 0x18, 0xa7, 0xf1, 0x01, 0x0d, 0x5f, 0x23, 0x2e, 0xde, 0x51, 0x22,
-	0xde, 0x4a, 0x8c, 0x82, 0x47, 0xbf, 0xc1, 0x77, 0xb7, 0x84, 0x47, 0xeb, 0x70, 0x0e, 0x5c, 0x1a,
-	0x42, 0xc4, 0x0a, 0x31, 0xae, 0xb0, 0x28, 0x52, 0xa8, 0x0e, 0x10, 0xa5, 0xe9, 0xb4, 0x9a, 0x96,
-	0x48, 0x10, 0xe6, 0xdc, 0xd9, 0xca, 0xe8, 0x21, 0x0d, 0x87, 0x2b, 0xa8, 0xbc, 0x8d, 0xe1, 0x2f,
-	0xa4, 0x32, 0x8d, 0xfe, 0x69, 0xba, 0xb7, 0xa5, 0x69, 0xf4, 0x77, 0xd3, 0x12, 0x74, 0x73, 0x4c,
-	0x2a, 0x2c, 0xd8, 0x9f, 0x0c, 0xc1, 0x56, 0x86, 0xce, 0x8a, 0xb8, 0xe9, 0x76, 0x0a, 0x0e, 0xd4,
-	0x1b, 0xc3, 0x8c, 0x11, 0xa6, 0xee, 0xc5, 0x69, 0xff, 0xf7, 0xd8, 0xfa, 0xe6, 0xd8, 0xee, 0xe9,
-	0x63, 0xdb, 0x00, 0xe8, 0x83, 0xdb, 0x97, 0xd9, 0x17, 0x32, 0x29, 0xfb, 0x46, 0xaf, 0x2e, 0xe7,
-	0xae, 0x75, 0x35, 0x77, 0xad, 0x6f, 0x73, 0xd7, 0xba, 0x58, 0xb8, 0x8d, 0xab, 0x85, 0xdb, 0xf8,
-	0xbc, 0x70, 0x1b, 0xef, 0xc3, 0x1b, 0x3b, 0x98, 0x4f, 0xc8, 0x51, 0x89, 0x12, 0xbe, 0x0c, 0x82,
-	0xb3, 0xe8, 0x59, 0xf0, 0x49, 0x7f, 0x7d, 0xd4, 0x46, 0x49, 0x4b, 0x8d, 0xf4, 0xf4, 0x67, 0x00,
-	0x00, 0x00, 0xff, 0xff, 0x24, 0xfc, 0xf7, 0x58, 0x9a, 0x04, 0x00, 0x00,
+	// 544 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x94, 0xcd, 0x6e, 0xd3, 0x40,
+	0x10, 0xc7, 0x63, 0x1a, 0x52, 0xba, 0xa1, 0xaa, 0x64, 0x45, 0x60, 0x52, 0xc9, 0x0e, 0x41, 0x42,
+	0xe1, 0x80, 0x3f, 0xe0, 0x04, 0xb7, 0x44, 0xe5, 0x00, 0xaa, 0x50, 0x65, 0x7a, 0xe2, 0x62, 0xad,
+	0x9d, 0xad, 0x6d, 0x61, 0x67, 0x56, 0xbb, 0x9b, 0x96, 0xbc, 0x45, 0x5f, 0x89, 0x5b, 0x8f, 0x3d,
+	0x22, 0x0e, 0x06, 0x25, 0x37, 0x8e, 0x7d, 0x02, 0xb4, 0xbb, 0x4e, 0x20, 0xe1, 0xab, 0xbd, 0x79,
+	0x66, 0xfe, 0xf3, 0xfb, 0xef, 0x78, 0x47, 0x8b, 0x1e, 0x03, 0x2f, 0x81, 0xe7, 0xdc, 0x13, 0x67,
+	0x98, 0x7a, 0xa7, 0x41, 0x4c, 0x04, 0x0e, 0x54, 0x10, 0x31, 0x92, 0x00, 0x1b, 0xbb, 0x94, 0x81,
+	0x00, 0xb3, 0x53, 0xeb, 0x5c, 0x59, 0x72, 0x6b, 0x5d, 0xb7, 0x93, 0x42, 0x0a, 0x4a, 0xe0, 0xc9,
+	0x2f, 0xad, 0xed, 0x3e, 0x48, 0x01, 0xd2, 0x82, 0x78, 0x2a, 0x8a, 0xa7, 0x27, 0x1e, 0x9e, 0xcc,
+	0x96, 0xa5, 0x44, 0x71, 0x22, 0xdd, 0xa3, 0x83, 0xba, 0x64, 0xeb, 0xc8, 0x8b, 0x31, 0x27, 0xab,
+	0x83, 0x24, 0x90, 0x4f, 0xea, 0xba, 0xb3, 0x49, 0x15, 0x79, 0x49, 0xb8, 0xc0, 0x25, 0xd5, 0x82,
+	0xfe, 0xa7, 0x16, 0x42, 0xc7, 0x67, 0x98, 0x86, 0xea, 0xdc, 0xe6, 0x7d, 0xb4, 0x4d, 0x01, 0x8a,
+	0x28, 0x1f, 0x5b, 0x46, 0xcf, 0x18, 0x34, 0xc3, 0x96, 0x0c, 0x5f, 0x8f, 0xcd, 0x87, 0xe8, 0x2e,
+	0xe6, 0x9c, 0x08, 0x3f, 0x1a, 0x93, 0x09, 0x94, 0xd6, 0xad, 0x9e, 0x31, 0xd8, 0x09, 0xdb, 0x3a,
+	0x77, 0x20, 0x53, 0x2b, 0x49, 0x50, 0x4b, 0xb6, 0x7e, 0x91, 0x04, 0x5a, 0x32, 0x44, 0xad, 0x8c,
+	0xe4, 0x69, 0x26, 0xac, 0x66, 0xcf, 0x18, 0x6c, 0x8d, 0x9e, 0x7c, 0xaf, 0x9c, 0x5d, 0xfd, 0xcb,
+	0x22, 0x5d, 0xb8, 0xaa, 0x9c, 0xce, 0x0c, 0x97, 0xc5, 0xcb, 0xfe, 0x5a, 0xba, 0x1f, 0xd6, 0x8d,
+	0xe6, 0x5b, 0xd4, 0x94, 0x33, 0x58, 0xb7, 0x7b, 0xc6, 0xa0, 0xfd, 0xac, 0xeb, 0xea, 0x01, 0xdd,
+	0xe5, 0x80, 0xee, 0xf1, 0x72, 0xc0, 0x91, 0x7d, 0x51, 0x39, 0x8d, 0xab, 0xca, 0x31, 0xd7, 0x78,
+	0xb2, 0xb9, 0x7f, 0xfe, 0xd5, 0x31, 0x42, 0xc5, 0x31, 0x8f, 0x90, 0x49, 0xfd, 0xa8, 0xc0, 0x5c,
+	0x44, 0x9c, 0x82, 0x88, 0x28, 0xcb, 0x13, 0x62, 0xb5, 0xe4, 0xd9, 0x47, 0x8f, 0x24, 0xe1, 0x4b,
+	0xe5, 0xec, 0xeb, 0xbf, 0xcc, 0xc7, 0x1f, 0xdc, 0x1c, 0xbc, 0x12, 0x8b, 0xcc, 0x3d, 0x24, 0x29,
+	0x4e, 0x66, 0x07, 0x24, 0x09, 0xf7, 0xa8, 0x7f, 0x88, 0xb9, 0x78, 0x47, 0x41, 0x1c, 0xc9, 0x5e,
+	0x45, 0x0c, 0x7e, 0x23, 0x6e, 0xdf, 0x84, 0x18, 0xac, 0x13, 0x33, 0x64, 0x53, 0x3f, 0xc2, 0x2c,
+	0x17, 0x59, 0x49, 0x44, 0x9e, 0x44, 0x6a, 0xd5, 0x70, 0x92, 0x4c, 0xcb, 0x69, 0x81, 0x05, 0x30,
+	0xeb, 0xce, 0xf5, 0xe9, 0xfb, 0xd4, 0x1f, 0xae, 0x48, 0xf2, 0xea, 0x87, 0x3f, 0x39, 0xca, 0x29,
+	0xf8, 0xa7, 0xd3, 0xce, 0x4d, 0x9c, 0x82, 0xbf, 0x3b, 0x61, 0xd4, 0x4d, 0x09, 0x94, 0x44, 0xb0,
+	0x3f, 0xb9, 0xa0, 0xeb, 0xbb, 0x58, 0x2b, 0xcc, 0xa6, 0xc5, 0x09, 0xda, 0x53, 0xb7, 0x40, 0x18,
+	0x03, 0xa6, 0x2e, 0xde, 0x6a, 0xff, 0x77, 0x6b, 0xfa, 0xf5, 0xd6, 0xdc, 0xd3, 0x5b, 0xb3, 0x01,
+	0xd0, 0x9b, 0xb3, 0x2b, 0xb3, 0xaf, 0x64, 0x52, 0xf6, 0x8d, 0xde, 0x5c, 0xcc, 0x6d, 0xe3, 0x72,
+	0x6e, 0x1b, 0xdf, 0xe6, 0xb6, 0x71, 0xbe, 0xb0, 0x1b, 0x97, 0x0b, 0xbb, 0xf1, 0x79, 0x61, 0x37,
+	0xde, 0xfb, 0x69, 0x2e, 0xb2, 0x69, 0xec, 0x26, 0x50, 0x7a, 0xf5, 0x5b, 0xf0, 0xb4, 0xc0, 0x31,
+	0x5f, 0x06, 0xde, 0x69, 0xf0, 0xc2, 0xfb, 0xa8, 0x9f, 0x11, 0x31, 0xa3, 0x84, 0xc7, 0x2d, 0x75,
+	0xa4, 0xe7, 0x3f, 0x02, 0x00, 0x00, 0xff, 0xff, 0xfe, 0xc4, 0xd7, 0x79, 0x63, 0x04, 0x00, 0x00,
 }
 
 func (m *TwapRecord) Marshal() (dAtA []byte, err error) {
diff --git a/x/txfees/types/query.pb.go b/x/txfees/types/query.pb.go
index 13a48b43178..d6b9c11beb0 100644
--- a/x/txfees/types/query.pb.go
+++ b/x/txfees/types/query.pb.go
@@ -5,8 +5,8 @@ package types
 
 import (
 	context "context"
+	cosmossdk_io_math "cosmossdk.io/math"
 	fmt "fmt"
-	github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types"
 	_ "github.com/gogo/protobuf/gogoproto"
 	grpc1 "github.com/gogo/protobuf/grpc"
 	proto "github.com/gogo/protobuf/proto"
@@ -160,8 +160,8 @@ func (m *QueryDenomSpotPriceRequest) GetDenom() string {
 // QueryDenomSpotPriceRequest defines grpc response structure for querying spot
 // price for the specified tx fee denom
 type QueryDenomSpotPriceResponse struct {
-	PoolID    uint64                                 `protobuf:"varint,1,opt,name=poolID,proto3" json:"poolID,omitempty" yaml:"pool_id"`
-	SpotPrice github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,2,opt,name=spot_price,json=spotPrice,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"spot_price" yaml:"spot_price"`
+	PoolID    uint64                      `protobuf:"varint,1,opt,name=poolID,proto3" json:"poolID,omitempty" yaml:"pool_id"`
+	SpotPrice cosmossdk_io_math.LegacyDec `protobuf:"bytes,2,opt,name=spot_price,json=spotPrice,proto3,customtype=cosmossdk.io/math.LegacyDec" json:"spot_price" yaml:"spot_price"`
 }
 
 func (m *QueryDenomSpotPriceResponse) Reset()         { *m = QueryDenomSpotPriceResponse{} }
@@ -388,46 +388,46 @@ func init() {
 }
 
 var fileDescriptor_6cbc1b48c44dfdd6 = []byte{
-	// 612 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x94, 0x41, 0x6f, 0x12, 0x4f,
-	0x18, 0xc6, 0x99, 0xfe, 0xff, 0x34, 0x61, 0x6a, 0x1a, 0x9d, 0xd8, 0x16, 0x57, 0xb3, 0x90, 0x89,
-	0x36, 0x4d, 0x0d, 0x3b, 0x02, 0x7a, 0xd0, 0x9b, 0x48, 0x9a, 0x98, 0x18, 0x53, 0x57, 0x4f, 0xbd,
-	0x6c, 0x76, 0xe1, 0x05, 0x37, 0x05, 0x66, 0xcb, 0x0c, 0x4d, 0x89, 0xf1, 0xe2, 0x27, 0x30, 0xd1,
-	0xf8, 0x15, 0x3c, 0xe9, 0xe7, 0xe8, 0xb1, 0x89, 0x17, 0xe3, 0x81, 0x18, 0xf0, 0x13, 0xf0, 0x09,
-	0xcc, 0xce, 0xce, 0xb2, 0xb4, 0x05, 0x29, 0x27, 0xd8, 0x79, 0x9f, 0x79, 0xde, 0xe7, 0xdd, 0xf9,
-	0xcd, 0x62, 0xca, 0x45, 0x9b, 0x0b, 0x5f, 0x30, 0x79, 0xd2, 0x00, 0x10, 0xec, 0xb8, 0xe8, 0x81,
-	0x74, 0x8b, 0xec, 0xa8, 0x07, 0xdd, 0xbe, 0x15, 0x74, 0xb9, 0xe4, 0x64, 0x53, 0x6b, 0xac, 0x48,
-	0x63, 0x69, 0x8d, 0x71, 0xb3, 0xc9, 0x9b, 0x5c, 0x49, 0x58, 0xf8, 0x2f, 0x52, 0x1b, 0x77, 0x9a,
-	0x9c, 0x37, 0x5b, 0xc0, 0xdc, 0xc0, 0x67, 0x6e, 0xa7, 0xc3, 0xa5, 0x2b, 0x7d, 0xde, 0x11, 0xba,
-	0x6a, 0xea, 0xaa, 0x7a, 0xf2, 0x7a, 0x0d, 0x56, 0xef, 0x75, 0x95, 0x40, 0xd7, 0xef, 0xcd, 0xc9,
-	0xd3, 0x00, 0x90, 0xfc, 0x10, 0xb4, 0x8c, 0x6e, 0xe1, 0x8d, 0x57, 0x61, 0xc2, 0x3d, 0x80, 0x37,
-	0xe1, 0xb2, 0xb0, 0xe1, 0xa8, 0x07, 0x42, 0x52, 0x89, 0x37, 0x2f, 0x16, 0x44, 0xc0, 0x3b, 0x02,
-	0xc8, 0x01, 0xc6, 0x0d, 0x00, 0x47, 0xb9, 0x88, 0x2c, 0xca, 0xff, 0xb7, 0xb3, 0x56, 0xca, 0x5b,
-	0xb3, 0x47, 0xb3, 0xe2, 0xed, 0x95, 0x5b, 0xa7, 0x83, 0x5c, 0x6a, 0x3c, 0xc8, 0xdd, 0xe8, 0xbb,
-	0xed, 0xd6, 0x13, 0x9a, 0x38, 0x50, 0x3b, 0xd3, 0x88, 0x7b, 0xd0, 0x2a, 0x36, 0x54, 0xd7, 0x2a,
-	0x74, 0x78, 0xfb, 0x75, 0xc0, 0xe5, 0x7e, 0xd7, 0xaf, 0x81, 0xce, 0x44, 0xb6, 0x71, 0xba, 0x1e,
-	0x16, 0xb2, 0x28, 0x8f, 0x76, 0x32, 0x95, 0xeb, 0xe3, 0x41, 0xee, 0x5a, 0x64, 0xa7, 0x96, 0xa9,
-	0x1d, 0x95, 0xe9, 0x37, 0x84, 0x6f, 0xcf, 0xb4, 0xd1, 0x13, 0xec, 0xe2, 0xd5, 0x80, 0xf3, 0xd6,
-	0xf3, 0xaa, 0x32, 0xfa, 0xbf, 0x42, 0xc6, 0x83, 0xdc, 0x7a, 0x64, 0x14, 0xae, 0x3b, 0x7e, 0x9d,
-	0xda, 0x5a, 0x41, 0x3c, 0x8c, 0x45, 0xc0, 0xa5, 0x13, 0x84, 0x0e, 0xd9, 0x15, 0xd5, 0xf8, 0x59,
-	0x38, 0xcb, 0xaf, 0x41, 0x6e, 0xbb, 0xe9, 0xcb, 0xb7, 0x3d, 0xcf, 0xaa, 0xf1, 0x36, 0xab, 0xa9,
-	0x17, 0xa0, 0x7f, 0x0a, 0xa2, 0x7e, 0xc8, 0x64, 0x3f, 0x00, 0x61, 0x55, 0xa1, 0x96, 0x4c, 0x9d,
-	0x38, 0x51, 0x3b, 0x23, 0xe2, 0x5c, 0xf4, 0x29, 0xde, 0x4a, 0xe2, 0xee, 0x87, 0x7d, 0xeb, 0xcb,
-	0x8e, 0xbc, 0x87, 0xb3, 0x97, 0x2d, 0x96, 0x1f, 0x77, 0xc2, 0x43, 0xc5, 0x15, 0xa0, 0xbc, 0x62,
-	0x1e, 0x5e, 0x6a, 0x1e, 0xa6, 0x0a, 0xda, 0xfe, 0x21, 0xc6, 0x9e, 0x2b, 0xc0, 0x99, 0xce, 0xb9,
-	0x91, 0xcc, 0x9c, 0xd4, 0xa8, 0x9d, 0xf1, 0xe2, 0xdd, 0xa5, 0xcf, 0x69, 0x9c, 0x56, 0x86, 0xe4,
-	0x0b, 0xc2, 0x99, 0x09, 0x65, 0xa4, 0x30, 0x8f, 0xa4, 0x99, 0x98, 0x1a, 0xd6, 0x55, 0xe5, 0x51,
-	0x58, 0xba, 0xfb, 0xe1, 0xc7, 0x9f, 0x4f, 0x2b, 0x77, 0x09, 0x65, 0xf3, 0xef, 0x87, 0x06, 0x93,
-	0x7c, 0x47, 0x78, 0xfd, 0x3c, 0x41, 0xa4, 0xf4, 0xcf, 0x76, 0x33, 0xa9, 0x35, 0xca, 0x4b, 0xed,
-	0xd1, 0x39, 0xcb, 0x2a, 0x67, 0x81, 0xdc, 0x9f, 0x97, 0x33, 0x41, 0xc9, 0xf1, 0xfa, 0xd1, 0xfb,
-	0x25, 0x5f, 0x11, 0x5e, 0x9b, 0x02, 0x80, 0xb0, 0xc5, 0x9d, 0xcf, 0xd1, 0x66, 0x3c, 0xb8, 0xfa,
-	0x06, 0x9d, 0xf3, 0x91, 0xca, 0xc9, 0x48, 0x61, 0x5e, 0x4e, 0x95, 0xcc, 0xd1, 0x9c, 0xb1, 0x77,
-	0xea, 0xf1, 0xbd, 0x3a, 0xf3, 0x09, 0x49, 0x0b, 0xce, 0xfc, 0x22, 0x8a, 0x0b, 0xce, 0xfc, 0x12,
-	0xa0, 0x8b, 0xcf, 0x3c, 0x41, 0xb4, 0xf2, 0xe2, 0x74, 0x68, 0xa2, 0xb3, 0xa1, 0x89, 0x7e, 0x0f,
-	0x4d, 0xf4, 0x71, 0x64, 0xa6, 0xce, 0x46, 0x66, 0xea, 0xe7, 0xc8, 0x4c, 0x1d, 0x94, 0xa6, 0x2e,
-	0xbb, 0xf6, 0x29, 0xb4, 0x5c, 0x4f, 0x4c, 0x4c, 0x8f, 0x8b, 0x8f, 0xd9, 0x49, 0x6c, 0xad, 0x2e,
-	0xbf, 0xb7, 0xaa, 0x3e, 0xb2, 0xe5, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x2a, 0x88, 0x5d, 0xa8,
-	0x1d, 0x06, 0x00, 0x00,
+	// 614 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x94, 0xc1, 0x6a, 0x13, 0x41,
+	0x18, 0xc7, 0xb3, 0xd5, 0x14, 0x32, 0x95, 0xa2, 0x83, 0x6d, 0xe3, 0x56, 0x36, 0x61, 0x50, 0x29,
+	0x95, 0xec, 0x98, 0x44, 0x41, 0xbd, 0x19, 0x42, 0x41, 0x28, 0x52, 0x57, 0x41, 0xe8, 0x65, 0xd9,
+	0x4d, 0xbe, 0x6c, 0x97, 0x26, 0x99, 0x6d, 0x66, 0x52, 0x1a, 0xc4, 0x8b, 0x4f, 0x20, 0x28, 0x3e,
+	0x80, 0x17, 0x6f, 0x3e, 0x47, 0x8f, 0x05, 0x2f, 0xe2, 0x21, 0x48, 0xe2, 0x13, 0xe4, 0x09, 0x64,
+	0x67, 0x67, 0xb3, 0x69, 0x9b, 0x98, 0xe6, 0x96, 0x99, 0xef, 0xff, 0xfd, 0xbf, 0xff, 0x97, 0xf9,
+	0x25, 0x88, 0x30, 0xde, 0x62, 0xdc, 0xe7, 0x54, 0x9c, 0x34, 0x00, 0x38, 0x3d, 0x2e, 0xba, 0x20,
+	0x9c, 0x22, 0x3d, 0xea, 0x42, 0xa7, 0x67, 0x06, 0x1d, 0x26, 0x18, 0x5e, 0x57, 0x1a, 0x33, 0xd2,
+	0x98, 0x4a, 0xa3, 0xdf, 0xf6, 0x98, 0xc7, 0xa4, 0x84, 0x86, 0x9f, 0x22, 0xb5, 0x7e, 0xd7, 0x63,
+	0xcc, 0x6b, 0x02, 0x75, 0x02, 0x9f, 0x3a, 0xed, 0x36, 0x13, 0x8e, 0xf0, 0x59, 0x9b, 0xab, 0xaa,
+	0xa1, 0xaa, 0xf2, 0xe4, 0x76, 0x1b, 0xb4, 0xde, 0xed, 0x48, 0x81, 0xaa, 0xdf, 0x9f, 0x91, 0xa7,
+	0x01, 0x20, 0xd8, 0x21, 0x28, 0x19, 0xd9, 0x40, 0x6b, 0xaf, 0xc3, 0x84, 0x3b, 0x00, 0x6f, 0xc3,
+	0x6b, 0x6e, 0xc1, 0x51, 0x17, 0xb8, 0x20, 0x02, 0xad, 0x5f, 0x2c, 0xf0, 0x80, 0xb5, 0x39, 0xe0,
+	0x7d, 0x84, 0x1a, 0x00, 0xb6, 0x74, 0xe1, 0x59, 0x2d, 0x7f, 0x6d, 0x6b, 0xa5, 0x94, 0x37, 0xa7,
+	0xaf, 0x66, 0xc6, 0xed, 0x95, 0x3b, 0xa7, 0xfd, 0x5c, 0x6a, 0xd4, 0xcf, 0xdd, 0xea, 0x39, 0xad,
+	0xe6, 0x73, 0x92, 0x38, 0x10, 0x2b, 0xd3, 0x88, 0x67, 0x90, 0x2a, 0xd2, 0xe5, 0xd4, 0x2a, 0xb4,
+	0x59, 0xeb, 0x4d, 0xc0, 0xc4, 0x5e, 0xc7, 0xaf, 0x81, 0xca, 0x84, 0x1f, 0xa0, 0x74, 0x3d, 0x2c,
+	0x64, 0xb5, 0xbc, 0xb6, 0x95, 0xa9, 0xdc, 0x1c, 0xf5, 0x73, 0x37, 0x22, 0x3b, 0x79, 0x4d, 0xac,
+	0xa8, 0x4c, 0xbe, 0x69, 0x68, 0x73, 0xaa, 0x8d, 0xda, 0x60, 0x1b, 0x2d, 0x07, 0x8c, 0x35, 0x5f,
+	0x56, 0xa5, 0xd1, 0xf5, 0x0a, 0x1e, 0xf5, 0x73, 0xab, 0x91, 0x51, 0x78, 0x6f, 0xfb, 0x75, 0x62,
+	0x29, 0x05, 0x7e, 0x87, 0x10, 0x0f, 0x98, 0xb0, 0x83, 0xd0, 0x21, 0xbb, 0x24, 0x07, 0x3f, 0x0d,
+	0x77, 0xf9, 0xdd, 0xcf, 0x6d, 0xd6, 0xe4, 0xd6, 0xbc, 0x7e, 0x68, 0xfa, 0x8c, 0xb6, 0x1c, 0x71,
+	0x60, 0xee, 0x82, 0xe7, 0xd4, 0x7a, 0x55, 0xa8, 0x25, 0xab, 0x26, 0xed, 0xc4, 0xca, 0xf0, 0x38,
+	0x0c, 0x79, 0x81, 0x36, 0x92, 0x8c, 0x7b, 0xe1, 0xb0, 0xfa, 0xa2, 0x7b, 0xee, 0xa0, 0xec, 0x65,
+	0x8b, 0xc5, 0x77, 0x1c, 0x43, 0x50, 0x71, 0x38, 0x48, 0xaf, 0x18, 0x82, 0x57, 0x0a, 0x82, 0x89,
+	0x82, 0xb2, 0x7f, 0x8c, 0x90, 0xeb, 0x70, 0xb0, 0x27, 0x73, 0xae, 0x25, 0x3b, 0x27, 0x35, 0x62,
+	0x65, 0xdc, 0xb8, 0xbb, 0xf4, 0x25, 0x8d, 0xd2, 0xd2, 0x10, 0x7f, 0xd5, 0x50, 0x66, 0x8c, 0x16,
+	0x2e, 0xcc, 0xc2, 0x67, 0x2a, 0x9b, 0xba, 0x79, 0x55, 0x79, 0x14, 0x96, 0x6c, 0x7f, 0xfc, 0xf9,
+	0xf7, 0xf3, 0xd2, 0x3d, 0x4c, 0xe8, 0xec, 0x1f, 0x85, 0xa2, 0x11, 0xff, 0xd0, 0xd0, 0xea, 0x79,
+	0x6c, 0x70, 0xe9, 0xbf, 0xe3, 0xa6, 0xa2, 0xaa, 0x97, 0x17, 0xea, 0x51, 0x39, 0xcb, 0x32, 0x67,
+	0x01, 0x3f, 0x9c, 0x95, 0x33, 0x41, 0xc9, 0x76, 0x7b, 0xd1, 0xf7, 0x8b, 0xbf, 0x6b, 0x68, 0x65,
+	0x02, 0x00, 0x4c, 0xe7, 0x4f, 0x3e, 0x47, 0x9b, 0xfe, 0xe8, 0xea, 0x0d, 0x2a, 0xe7, 0x13, 0x99,
+	0x93, 0xe2, 0xc2, 0xac, 0x9c, 0x32, 0x99, 0xad, 0x38, 0xa3, 0xef, 0xe5, 0xf1, 0x83, 0x7c, 0xf3,
+	0x31, 0x49, 0x73, 0xde, 0xfc, 0x22, 0x8a, 0x73, 0xde, 0xfc, 0x12, 0xa0, 0xf3, 0xdf, 0x3c, 0x41,
+	0xb4, 0xb2, 0x7b, 0x3a, 0x30, 0xb4, 0xb3, 0x81, 0xa1, 0xfd, 0x19, 0x18, 0xda, 0xa7, 0xa1, 0x91,
+	0x3a, 0x1b, 0x1a, 0xa9, 0x5f, 0x43, 0x23, 0xb5, 0x5f, 0xf2, 0x7c, 0x71, 0xd0, 0x75, 0xcd, 0x1a,
+	0x6b, 0xc5, 0x3e, 0x85, 0xa6, 0xe3, 0xf2, 0xb1, 0xe9, 0x71, 0xf1, 0x19, 0x3d, 0x89, 0xad, 0x45,
+	0x2f, 0x00, 0xee, 0x2e, 0xcb, 0x7f, 0xd6, 0xf2, 0xbf, 0x00, 0x00, 0x00, 0xff, 0xff, 0xa7, 0x74,
+	0x5a, 0x70, 0x12, 0x06, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/x/valset-pref/types/state.pb.go b/x/valset-pref/types/state.pb.go
index 4051a934c86..0077ecb568f 100644
--- a/x/valset-pref/types/state.pb.go
+++ b/x/valset-pref/types/state.pb.go
@@ -4,8 +4,8 @@
 package types
 
 import (
+	cosmossdk_io_math "cosmossdk.io/math"
 	fmt "fmt"
-	github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types"
 	_ "github.com/gogo/protobuf/gogoproto"
 	proto "github.com/gogo/protobuf/proto"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
@@ -35,7 +35,7 @@ type ValidatorPreference struct {
 	// funds to.
 	ValOperAddress string `protobuf:"bytes,1,opt,name=val_oper_address,json=valOperAddress,proto3" json:"val_oper_address,omitempty" yaml:"val_oper_address"`
 	// weight is decimal between 0 and 1, and they all sum to 1.
-	Weight github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,2,opt,name=weight,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"weight"`
+	Weight cosmossdk_io_math.LegacyDec `protobuf:"bytes,2,opt,name=weight,proto3,customtype=cosmossdk.io/math.LegacyDec" json:"weight"`
 }
 
 func (m *ValidatorPreference) Reset()         { *m = ValidatorPreference{} }
@@ -123,30 +123,30 @@ func init() {
 }
 
 var fileDescriptor_d3010474a5b89fce = []byte{
-	// 355 bytes of a gzipped FileDescriptorProto
+	// 361 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x91, 0xcf, 0x4a, 0xeb, 0x40,
-	0x18, 0xc5, 0x93, 0x5e, 0x28, 0xdc, 0x14, 0x44, 0xa2, 0xd0, 0x12, 0x25, 0x29, 0x59, 0x68, 0x37,
-	0x9d, 0xa1, 0xba, 0x10, 0xdd, 0x59, 0xd4, 0xad, 0x52, 0xd1, 0x85, 0x9b, 0x32, 0x49, 0xbe, 0xa6,
-	0xc1, 0x49, 0x66, 0x98, 0x19, 0xa3, 0x7d, 0x03, 0x97, 0x3e, 0x84, 0x0f, 0xd3, 0x65, 0x97, 0xe2,
-	0x22, 0x68, 0xfb, 0x06, 0x7d, 0x02, 0x69, 0x12, 0xda, 0x2a, 0xba, 0x9a, 0x7f, 0xbf, 0xf3, 0x71,
-	0xce, 0x1c, 0x63, 0x9f, 0xc9, 0x98, 0xc9, 0x48, 0xe2, 0x94, 0x50, 0x09, 0xaa, 0xcd, 0x05, 0x0c,
-	0x70, 0xda, 0xf1, 0x40, 0x91, 0x0e, 0x96, 0x8a, 0x28, 0x40, 0x5c, 0x30, 0xc5, 0x4c, 0xab, 0x04,
-	0x51, 0x01, 0x2e, 0x38, 0x54, 0x72, 0xd6, 0x76, 0xc8, 0x42, 0x96, 0x63, 0x78, 0xb1, 0x2b, 0x14,
-	0xd6, 0x6e, 0xc8, 0x58, 0x48, 0x01, 0x13, 0x1e, 0x61, 0x92, 0x24, 0x4c, 0x11, 0x15, 0xb1, 0x44,
-	0x16, 0xaf, 0xee, 0xab, 0x6e, 0x6c, 0xdd, 0x12, 0x1a, 0x05, 0x44, 0x31, 0x71, 0x25, 0x60, 0x00,
-	0x02, 0x12, 0x1f, 0xcc, 0x73, 0x63, 0x33, 0x25, 0xb4, 0xcf, 0x38, 0x88, 0x3e, 0x09, 0x02, 0x01,
-	0x52, 0x36, 0xf4, 0xa6, 0xde, 0xfa, 0xdf, 0xdd, 0x99, 0x67, 0x4e, 0x7d, 0x44, 0x62, 0x7a, 0xe2,
-	0xfe, 0x24, 0xdc, 0xde, 0x46, 0x4a, 0xe8, 0x25, 0x07, 0x71, 0x5a, 0x5c, 0x98, 0x17, 0x46, 0xf5,
-	0x11, 0xa2, 0x70, 0xa8, 0x1a, 0x95, 0x5c, 0x8c, 0xc6, 0x99, 0xa3, 0xbd, 0x67, 0xce, 0x5e, 0x18,
-	0xa9, 0xe1, 0x83, 0x87, 0x7c, 0x16, 0x63, 0x3f, 0x8f, 0x54, 0x2e, 0x6d, 0x19, 0xdc, 0x63, 0x35,
-	0xe2, 0x20, 0xd1, 0x19, 0xf8, 0xbd, 0x52, 0xed, 0x3e, 0xeb, 0x46, 0x7d, 0x69, 0xf3, 0x1a, 0xd4,
-	0xca, 0xa9, 0x34, 0x63, 0xa3, 0xc6, 0x57, 0xc7, 0x46, 0xa5, 0xf9, 0xaf, 0x55, 0x3b, 0xc0, 0xe8,
-	0xef, 0x8f, 0x42, 0xbf, 0x04, 0xee, 0x5a, 0x0b, 0x67, 0xf3, 0xcc, 0x31, 0x8b, 0x68, 0x6b, 0x13,
-	0xdd, 0xde, 0xfa, 0xfc, 0xee, 0xcd, 0xf8, 0xd3, 0xd6, 0xc6, 0x53, 0x5b, 0x9f, 0x4c, 0x6d, 0xfd,
-	0x63, 0x6a, 0xeb, 0x2f, 0x33, 0x5b, 0x9b, 0xcc, 0x6c, 0xed, 0x6d, 0x66, 0x6b, 0x77, 0x47, 0x6b,
-	0xc1, 0x4a, 0x07, 0x6d, 0x4a, 0x3c, 0x89, 0x97, 0x05, 0x77, 0x8e, 0xf1, 0xd3, 0xb7, 0x9a, 0xf3,
-	0xb4, 0x5e, 0x35, 0xef, 0xe3, 0xf0, 0x2b, 0x00, 0x00, 0xff, 0xff, 0xa3, 0x25, 0xf2, 0x5a, 0x0a,
-	0x02, 0x00, 0x00,
+	0x14, 0xc6, 0x93, 0x5e, 0x28, 0xdc, 0x14, 0x2e, 0x97, 0xdc, 0x0b, 0x2d, 0xa9, 0x24, 0x25, 0x2e,
+	0xec, 0xa6, 0x33, 0x54, 0x17, 0xa2, 0xae, 0x2c, 0xba, 0x13, 0x94, 0x8a, 0x2e, 0xdc, 0x94, 0x93,
+	0xe4, 0x34, 0x0d, 0x26, 0x99, 0x30, 0x33, 0x46, 0xfb, 0x06, 0x2e, 0xdd, 0xfa, 0x46, 0x5d, 0x76,
+	0x29, 0x2e, 0x82, 0xb6, 0x6f, 0xd0, 0x27, 0x90, 0x26, 0xa1, 0xad, 0xa2, 0xbb, 0xf9, 0xf3, 0xfb,
+	0x0e, 0xdf, 0x77, 0x3e, 0x6d, 0x87, 0x89, 0x88, 0x89, 0x40, 0xd0, 0x14, 0x42, 0x81, 0xb2, 0x93,
+	0x70, 0x1c, 0xd2, 0xb4, 0xeb, 0xa0, 0x84, 0x2e, 0x15, 0x12, 0x24, 0x92, 0x84, 0x33, 0xc9, 0x74,
+	0xa3, 0x04, 0x49, 0x01, 0x2e, 0x39, 0x52, 0x72, 0xc6, 0x7f, 0x9f, 0xf9, 0x2c, 0xc7, 0xe8, 0xf2,
+	0x54, 0x28, 0x8c, 0x2d, 0x9f, 0x31, 0x3f, 0x44, 0x0a, 0x49, 0x40, 0x21, 0x8e, 0x99, 0x04, 0x19,
+	0xb0, 0x58, 0x14, 0xbf, 0xf6, 0xb3, 0xaa, 0xfd, 0xbb, 0x86, 0x30, 0xf0, 0x40, 0x32, 0x7e, 0xc1,
+	0x71, 0x88, 0x1c, 0x63, 0x17, 0xf5, 0x53, 0xed, 0x6f, 0x0a, 0xe1, 0x80, 0x25, 0xc8, 0x07, 0xe0,
+	0x79, 0x1c, 0x85, 0x68, 0xa8, 0x2d, 0xb5, 0xfd, 0xbb, 0xd7, 0x5c, 0x64, 0x56, 0x7d, 0x0c, 0x51,
+	0x78, 0x68, 0x7f, 0x25, 0xec, 0xfe, 0x9f, 0x14, 0xc2, 0xf3, 0x04, 0xf9, 0x71, 0xf1, 0xa0, 0x1f,
+	0x69, 0xd5, 0x7b, 0x0c, 0xfc, 0x91, 0x6c, 0x54, 0x72, 0xf1, 0xf6, 0x24, 0xb3, 0x94, 0xd7, 0xcc,
+	0x6a, 0xba, 0x79, 0x0e, 0xe1, 0xdd, 0x92, 0x80, 0xd1, 0x08, 0xe4, 0x88, 0x9c, 0xa1, 0x0f, 0xee,
+	0xf8, 0x04, 0xdd, 0x7e, 0x29, 0xb1, 0x1f, 0x55, 0xad, 0xbe, 0xf2, 0x76, 0x89, 0x72, 0x6d, 0x4f,
+	0xe8, 0x91, 0x56, 0x4b, 0xd6, 0xd7, 0x46, 0xa5, 0xf5, 0xab, 0x5d, 0xdb, 0xa5, 0xe4, 0xe7, 0xed,
+	0x90, 0x6f, 0x52, 0xf6, 0x8c, 0xa5, 0x9d, 0x45, 0x66, 0xe9, 0x45, 0x9e, 0x8d, 0x89, 0x76, 0x7f,
+	0x73, 0x7e, 0xef, 0x6a, 0xf2, 0x6e, 0x2a, 0x93, 0x99, 0xa9, 0x4e, 0x67, 0xa6, 0xfa, 0x36, 0x33,
+	0xd5, 0xa7, 0xb9, 0xa9, 0x4c, 0xe7, 0xa6, 0xf2, 0x32, 0x37, 0x95, 0x9b, 0x7d, 0x3f, 0x90, 0xa3,
+	0x3b, 0x87, 0xb8, 0x2c, 0xa2, 0xa5, 0x83, 0x4e, 0x08, 0x8e, 0xa0, 0xab, 0x56, 0xbb, 0x07, 0xf4,
+	0xe1, 0x53, 0xb7, 0x72, 0x9c, 0xa0, 0x70, 0xaa, 0x79, 0x09, 0x7b, 0x1f, 0x01, 0x00, 0x00, 0xff,
+	0xff, 0x96, 0xde, 0x34, 0x00, 0xff, 0x01, 0x00, 0x00,
 }
 
 func (m *ValidatorPreference) Marshal() (dAtA []byte, err error) {