diff --git a/x/gov/types/codec.pb.go b/x/gov/types/types.pb.go
similarity index 71%
rename from x/gov/types/codec.pb.go
rename to x/gov/types/types.pb.go
index be21d7f2c6..3f7a18cceb 100644
--- a/x/gov/types/codec.pb.go
+++ b/x/gov/types/types.pb.go
@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-gogo. DO NOT EDIT.
-// source: x/gov/types/codec.proto
+// source: x/gov/types/types.proto
 
 package types
 
@@ -61,7 +61,7 @@ var VoteOption_value = map[string]int32{
 }
 
 func (VoteOption) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_4ed4b2a5a30fa918, []int{0}
+	return fileDescriptor_a5ae5e91b5b3fb03, []int{0}
 }
 
 // ProposalStatus is a type alias that represents a proposal status as a byte
@@ -95,91 +95,7 @@ var ProposalStatus_value = map[string]int32{
 }
 
 func (ProposalStatus) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_4ed4b2a5a30fa918, []int{1}
-}
-
-type MsgCommon struct {
-	// Types that are valid to be assigned to Sum:
-	//	*MsgCommon_GovDeposit
-	//	*MsgCommon_GovVote
-	Sum isMsgCommon_Sum `protobuf_oneof:"sum"`
-}
-
-func (m *MsgCommon) Reset()      { *m = MsgCommon{} }
-func (*MsgCommon) ProtoMessage() {}
-func (*MsgCommon) Descriptor() ([]byte, []int) {
-	return fileDescriptor_4ed4b2a5a30fa918, []int{0}
-}
-func (m *MsgCommon) XXX_Unmarshal(b []byte) error {
-	return m.Unmarshal(b)
-}
-func (m *MsgCommon) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	if deterministic {
-		return xxx_messageInfo_MsgCommon.Marshal(b, m, deterministic)
-	} else {
-		b = b[:cap(b)]
-		n, err := m.MarshalToSizedBuffer(b)
-		if err != nil {
-			return nil, err
-		}
-		return b[:n], nil
-	}
-}
-func (m *MsgCommon) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MsgCommon.Merge(m, src)
-}
-func (m *MsgCommon) XXX_Size() int {
-	return m.Size()
-}
-func (m *MsgCommon) XXX_DiscardUnknown() {
-	xxx_messageInfo_MsgCommon.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_MsgCommon proto.InternalMessageInfo
-
-type isMsgCommon_Sum interface {
-	isMsgCommon_Sum()
-	MarshalTo([]byte) (int, error)
-	Size() int
-}
-
-type MsgCommon_GovDeposit struct {
-	GovDeposit *MsgDeposit `protobuf:"bytes,1,opt,name=gov_deposit,json=govDeposit,proto3,oneof" json:"gov_deposit,omitempty"`
-}
-type MsgCommon_GovVote struct {
-	GovVote *MsgVote `protobuf:"bytes,2,opt,name=gov_vote,json=govVote,proto3,oneof" json:"gov_vote,omitempty"`
-}
-
-func (*MsgCommon_GovDeposit) isMsgCommon_Sum() {}
-func (*MsgCommon_GovVote) isMsgCommon_Sum()    {}
-
-func (m *MsgCommon) GetSum() isMsgCommon_Sum {
-	if m != nil {
-		return m.Sum
-	}
-	return nil
-}
-
-func (m *MsgCommon) GetGovDeposit() *MsgDeposit {
-	if x, ok := m.GetSum().(*MsgCommon_GovDeposit); ok {
-		return x.GovDeposit
-	}
-	return nil
-}
-
-func (m *MsgCommon) GetGovVote() *MsgVote {
-	if x, ok := m.GetSum().(*MsgCommon_GovVote); ok {
-		return x.GovVote
-	}
-	return nil
-}
-
-// XXX_OneofWrappers is for the internal use of the proto package.
-func (*MsgCommon) XXX_OneofWrappers() []interface{} {
-	return []interface{}{
-		(*MsgCommon_GovDeposit)(nil),
-		(*MsgCommon_GovVote)(nil),
-	}
+	return fileDescriptor_a5ae5e91b5b3fb03, []int{1}
 }
 
 type MsgSubmitProposalBase struct {
@@ -190,7 +106,7 @@ type MsgSubmitProposalBase struct {
 func (m *MsgSubmitProposalBase) Reset()      { *m = MsgSubmitProposalBase{} }
 func (*MsgSubmitProposalBase) ProtoMessage() {}
 func (*MsgSubmitProposalBase) Descriptor() ([]byte, []int) {
-	return fileDescriptor_4ed4b2a5a30fa918, []int{1}
+	return fileDescriptor_a5ae5e91b5b3fb03, []int{0}
 }
 func (m *MsgSubmitProposalBase) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -229,7 +145,7 @@ type MsgDeposit struct {
 func (m *MsgDeposit) Reset()      { *m = MsgDeposit{} }
 func (*MsgDeposit) ProtoMessage() {}
 func (*MsgDeposit) Descriptor() ([]byte, []int) {
-	return fileDescriptor_4ed4b2a5a30fa918, []int{2}
+	return fileDescriptor_a5ae5e91b5b3fb03, []int{1}
 }
 func (m *MsgDeposit) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -268,7 +184,7 @@ type MsgVote struct {
 func (m *MsgVote) Reset()      { *m = MsgVote{} }
 func (*MsgVote) ProtoMessage() {}
 func (*MsgVote) Descriptor() ([]byte, []int) {
-	return fileDescriptor_4ed4b2a5a30fa918, []int{3}
+	return fileDescriptor_a5ae5e91b5b3fb03, []int{2}
 }
 func (m *MsgVote) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -307,7 +223,7 @@ type TextProposal struct {
 func (m *TextProposal) Reset()      { *m = TextProposal{} }
 func (*TextProposal) ProtoMessage() {}
 func (*TextProposal) Descriptor() ([]byte, []int) {
-	return fileDescriptor_4ed4b2a5a30fa918, []int{4}
+	return fileDescriptor_a5ae5e91b5b3fb03, []int{3}
 }
 func (m *TextProposal) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -346,7 +262,7 @@ type Deposit struct {
 func (m *Deposit) Reset()      { *m = Deposit{} }
 func (*Deposit) ProtoMessage() {}
 func (*Deposit) Descriptor() ([]byte, []int) {
-	return fileDescriptor_4ed4b2a5a30fa918, []int{5}
+	return fileDescriptor_a5ae5e91b5b3fb03, []int{4}
 }
 func (m *Deposit) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -390,7 +306,7 @@ func (m *ProposalBase) Reset()         { *m = ProposalBase{} }
 func (m *ProposalBase) String() string { return proto.CompactTextString(m) }
 func (*ProposalBase) ProtoMessage()    {}
 func (*ProposalBase) Descriptor() ([]byte, []int) {
-	return fileDescriptor_4ed4b2a5a30fa918, []int{6}
+	return fileDescriptor_a5ae5e91b5b3fb03, []int{5}
 }
 func (m *ProposalBase) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -430,7 +346,7 @@ type TallyResult struct {
 func (m *TallyResult) Reset()      { *m = TallyResult{} }
 func (*TallyResult) ProtoMessage() {}
 func (*TallyResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_4ed4b2a5a30fa918, []int{7}
+	return fileDescriptor_a5ae5e91b5b3fb03, []int{6}
 }
 func (m *TallyResult) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -468,7 +384,7 @@ type Vote struct {
 func (m *Vote) Reset()      { *m = Vote{} }
 func (*Vote) ProtoMessage() {}
 func (*Vote) Descriptor() ([]byte, []int) {
-	return fileDescriptor_4ed4b2a5a30fa918, []int{8}
+	return fileDescriptor_a5ae5e91b5b3fb03, []int{7}
 }
 func (m *Vote) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -505,7 +421,7 @@ type BasicProposal struct {
 func (m *BasicProposal) Reset()      { *m = BasicProposal{} }
 func (*BasicProposal) ProtoMessage() {}
 func (*BasicProposal) Descriptor() ([]byte, []int) {
-	return fileDescriptor_4ed4b2a5a30fa918, []int{9}
+	return fileDescriptor_a5ae5e91b5b3fb03, []int{8}
 }
 func (m *BasicProposal) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -543,7 +459,7 @@ type BasicContent struct {
 func (m *BasicContent) Reset()      { *m = BasicContent{} }
 func (*BasicContent) ProtoMessage() {}
 func (*BasicContent) Descriptor() ([]byte, []int) {
-	return fileDescriptor_4ed4b2a5a30fa918, []int{10}
+	return fileDescriptor_a5ae5e91b5b3fb03, []int{9}
 }
 func (m *BasicContent) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -608,7 +524,6 @@ func (*BasicContent) XXX_OneofWrappers() []interface{} {
 func init() {
 	proto.RegisterEnum("cosmos_sdk.x.gov.v1.VoteOption", VoteOption_name, VoteOption_value)
 	proto.RegisterEnum("cosmos_sdk.x.gov.v1.ProposalStatus", ProposalStatus_name, ProposalStatus_value)
-	proto.RegisterType((*MsgCommon)(nil), "cosmos_sdk.x.gov.v1.MsgCommon")
 	proto.RegisterType((*MsgSubmitProposalBase)(nil), "cosmos_sdk.x.gov.v1.MsgSubmitProposalBase")
 	proto.RegisterType((*MsgDeposit)(nil), "cosmos_sdk.x.gov.v1.MsgDeposit")
 	proto.RegisterType((*MsgVote)(nil), "cosmos_sdk.x.gov.v1.MsgVote")
@@ -621,90 +536,86 @@ func init() {
 	proto.RegisterType((*BasicContent)(nil), "cosmos_sdk.x.gov.v1.BasicContent")
 }
 
-func init() { proto.RegisterFile("x/gov/types/codec.proto", fileDescriptor_4ed4b2a5a30fa918) }
+func init() { proto.RegisterFile("x/gov/types/types.proto", fileDescriptor_a5ae5e91b5b3fb03) }
 
-var fileDescriptor_4ed4b2a5a30fa918 = []byte{
-	// 1279 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x57, 0xcf, 0x6b, 0x1b, 0xc7,
-	0x17, 0xdf, 0x95, 0x64, 0xcb, 0x7e, 0xfa, 0x91, 0xcd, 0x38, 0xdf, 0xc4, 0x2c, 0x41, 0xbb, 0x5f,
-	0xb5, 0x04, 0x37, 0x21, 0x72, 0xe3, 0x1c, 0x42, 0x1d, 0x28, 0xd5, 0x5a, 0x9b, 0x58, 0x21, 0x96,
-	0xc4, 0x4a, 0x38, 0xa4, 0x50, 0x96, 0xb5, 0x76, 0xb3, 0xde, 0x44, 0xda, 0x11, 0x9a, 0x91, 0x6a,
-	0xdf, 0x72, 0x2a, 0xad, 0x4e, 0xa1, 0x50, 0xe8, 0x45, 0x10, 0x68, 0x0e, 0xa1, 0xf4, 0xd0, 0x43,
-	0xff, 0x81, 0xf6, 0x14, 0x7a, 0x69, 0x8e, 0xa1, 0x14, 0xa5, 0x71, 0x6e, 0xa5, 0xa7, 0x40, 0x2f,
-	0x3d, 0x95, 0x9d, 0xd9, 0x8d, 0xd7, 0xd4, 0x09, 0x11, 0x49, 0x29, 0xf4, 0x62, 0x34, 0x33, 0x9f,
-	0xcf, 0x67, 0xdf, 0xfb, 0xcc, 0xdb, 0xf7, 0xd6, 0x70, 0x62, 0x67, 0xd9, 0xc5, 0xc3, 0x65, 0xba,
-	0xdb, 0x73, 0xc8, 0x72, 0x1b, 0xdb, 0x4e, 0xbb, 0xd4, 0xeb, 0x63, 0x8a, 0xd1, 0x42, 0x1b, 0x93,
-	0x2e, 0x26, 0x26, 0xb1, 0x6f, 0x95, 0x76, 0x4a, 0x2e, 0x1e, 0x96, 0x86, 0xe7, 0xe4, 0xa3, 0x1c,
-	0xc7, 0xfe, 0x72, 0x9c, 0x7c, 0x8a, 0x6e, 0x7b, 0x7d, 0xdb, 0xec, 0x59, 0x7d, 0xba, 0xbb, 0xcc,
-	0xb6, 0x96, 0x5d, 0xec, 0xe2, 0xfd, 0x5f, 0x21, 0xee, 0xcc, 0xdf, 0x71, 0xfc, 0x09, 0x67, 0xe3,
-	0x8b, 0x10, 0xac, 0xb8, 0x18, 0xbb, 0x1d, 0x87, 0xe3, 0xb6, 0x06, 0x37, 0x96, 0xa9, 0xd7, 0x75,
-	0x08, 0xb5, 0xba, 0x3d, 0x0e, 0x28, 0x7e, 0x2f, 0xc2, 0xfc, 0x06, 0x71, 0xd7, 0x70, 0xb7, 0x8b,
-	0x7d, 0xa4, 0x41, 0xc6, 0xc5, 0x43, 0xd3, 0x76, 0x7a, 0x98, 0x78, 0x74, 0x51, 0x54, 0xc5, 0xa5,
-	0xcc, 0x8a, 0x52, 0x3a, 0x24, 0x83, 0xd2, 0x06, 0x71, 0x2b, 0x1c, 0xb6, 0x2e, 0x18, 0xe0, 0xe2,
-	0x61, 0xb8, 0x42, 0xef, 0xc1, 0x5c, 0xa0, 0x31, 0xc4, 0xd4, 0x59, 0x4c, 0x30, 0x81, 0x93, 0x2f,
-	0x12, 0xd8, 0xc4, 0xd4, 0x59, 0x17, 0x8c, 0xb4, 0x8b, 0x87, 0xc1, 0xcf, 0xd5, 0xd2, 0xed, 0x5f,
-	0x54, 0xf1, 0xc7, 0xef, 0xce, 0x9e, 0x72, 0x3d, 0xba, 0x3d, 0xd8, 0x2a, 0xb5, 0x71, 0x37, 0x4c,
-	0x27, 0x4a, 0x91, 0xd8, 0xb7, 0x42, 0xd3, 0x36, 0x88, 0xab, 0xcd, 0x40, 0x92, 0x0c, 0xba, 0xc5,
-	0x3f, 0x44, 0xf8, 0xdf, 0x06, 0x71, 0x9b, 0x83, 0xad, 0xae, 0x47, 0x1b, 0x7d, 0xdc, 0xc3, 0xc4,
-	0xea, 0x68, 0x16, 0x71, 0xd0, 0x27, 0x22, 0xe4, 0x3d, 0x9f, 0x7a, 0x56, 0x27, 0x96, 0x53, 0x72,
-	0x29, 0xb3, 0xb2, 0x10, 0x0f, 0x69, 0x78, 0xae, 0xb4, 0x86, 0x3d, 0x5f, 0xbb, 0xf2, 0x60, 0xa2,
-	0x08, 0xcf, 0x26, 0xca, 0xf1, 0x5d, 0xab, 0xdb, 0x59, 0x2d, 0x7a, 0xbe, 0x17, 0x67, 0x16, 0xbf,
-	0x7e, 0xac, 0x2c, 0xbd, 0x42, 0x60, 0x81, 0x14, 0x31, 0x72, 0xfc, 0xb1, 0x91, 0x29, 0x1b, 0x30,
-	0xd7, 0x63, 0x81, 0x39, 0x7d, 0x66, 0x4a, 0x56, 0x3b, 0xf7, 0xe7, 0x44, 0x39, 0xfb, 0x0a, 0x72,
-	0xe5, 0x76, 0xbb, 0x6c, 0xdb, 0x7d, 0x87, 0x10, 0xe3, 0xb9, 0xc4, 0x6a, 0x2a, 0x30, 0xaa, 0xf8,
-	0x79, 0x02, 0x60, 0xff, 0x1a, 0x50, 0x0b, 0x32, 0xbd, 0x30, 0x79, 0xd3, 0xb3, 0xd9, 0xe5, 0xa5,
-	0xb4, 0xf3, 0x7b, 0x13, 0x05, 0x22, 0x4f, 0xaa, 0x95, 0xdf, 0x26, 0x4a, 0x1c, 0xf4, 0x6c, 0xa2,
-	0x20, 0x9e, 0x6c, 0x6c, 0xb3, 0x68, 0x40, 0xb4, 0xaa, 0xda, 0xa8, 0x0e, 0xf3, 0xa1, 0x01, 0xf8,
-	0x35, 0x42, 0xdf, 0xd7, 0x40, 0x1f, 0xc1, 0xac, 0xd5, 0xc5, 0x03, 0x9f, 0x2e, 0x26, 0x5f, 0x7c,
-	0x15, 0xef, 0x06, 0x57, 0x31, 0x95, 0xe1, 0xa1, 0x68, 0xf1, 0x89, 0x08, 0xe9, 0xb0, 0xb4, 0xfe,
-	0x21, 0x47, 0x2e, 0xc3, 0x4c, 0x50, 0xdc, 0xaf, 0xe1, 0x06, 0xe7, 0xa3, 0x0b, 0x30, 0x8b, 0x7b,
-	0xd4, 0xc3, 0xfe, 0x62, 0x52, 0x15, 0x97, 0xf2, 0x2f, 0x78, 0xd1, 0x82, 0x4c, 0xea, 0x0c, 0x66,
-	0x84, 0xf0, 0xe2, 0x25, 0xc8, 0xb6, 0x9c, 0x9d, 0xe7, 0xa5, 0x8e, 0x8e, 0xc1, 0x0c, 0xf5, 0x68,
-	0xc7, 0x61, 0x19, 0xce, 0x1b, 0x7c, 0x81, 0x54, 0xc8, 0xd8, 0x0e, 0x69, 0xf7, 0x3d, 0xfe, 0x8c,
-	0x04, 0x3b, 0x8b, 0x6f, 0x15, 0x6f, 0x27, 0x20, 0x1d, 0x55, 0x8f, 0x7e, 0x98, 0x57, 0x6f, 0x1f,
-	0xf4, 0xea, 0x3f, 0x58, 0x2e, 0x5f, 0xcc, 0x40, 0xf6, 0x40, 0xcb, 0x78, 0x43, 0x3e, 0x5c, 0x84,
-	0x59, 0x42, 0x2d, 0x3a, 0x20, 0xcc, 0x84, 0xfc, 0xca, 0x5b, 0x87, 0xde, 0x6d, 0x24, 0xd9, 0x64,
-	0x50, 0x23, 0xa4, 0xa0, 0x16, 0xa0, 0x1b, 0x9e, 0x6f, 0x75, 0x4c, 0x6a, 0x75, 0x3a, 0xbb, 0x66,
-	0xdf, 0x21, 0x83, 0x0e, 0x65, 0x45, 0x92, 0x59, 0x51, 0x0f, 0x15, 0x6a, 0x05, 0x40, 0x83, 0xe1,
-	0xb4, 0x54, 0x60, 0x86, 0x21, 0x31, 0x85, 0xd8, 0x7e, 0x90, 0x19, 0x61, 0x2d, 0xd2, 0x0c, 0x86,
-	0xc0, 0x62, 0x8a, 0xc9, 0xc9, 0x25, 0x3e, 0x21, 0x4a, 0xd1, 0x84, 0x28, 0xb5, 0xa2, 0x09, 0xa1,
-	0xcd, 0x05, 0x42, 0x77, 0x1e, 0x2b, 0xa2, 0x01, 0x9c, 0x18, 0x1c, 0xa1, 0x1a, 0x48, 0xe1, 0xed,
-	0x98, 0x8e, 0x6f, 0x73, 0xad, 0x99, 0x29, 0xb4, 0xf2, 0x21, 0x5b, 0xf7, 0x6d, 0xa6, 0x77, 0x13,
-	0x72, 0x14, 0xd3, 0x58, 0x87, 0x9e, 0x7d, 0x93, 0xf7, 0x9c, 0x65, 0xda, 0x51, 0x91, 0x37, 0xe0,
-	0xe8, 0x10, 0x53, 0xcf, 0x77, 0x4d, 0x42, 0xad, 0x7e, 0x68, 0x44, 0x7a, 0x8a, 0xe0, 0x8f, 0x70,
-	0x7a, 0x33, 0x60, 0xb3, 0xe8, 0xaf, 0x42, 0xb8, 0xb5, 0x6f, 0xc6, 0xdc, 0x14, 0x7a, 0x39, 0x4e,
-	0x0e, 0xbd, 0x58, 0x9d, 0xfb, 0xf2, 0xae, 0x22, 0xde, 0xbf, 0xab, 0x88, 0xc5, 0x1f, 0x12, 0x90,
-	0x89, 0x5f, 0xde, 0x07, 0x90, 0xdc, 0x75, 0x08, 0x2b, 0xc7, 0xac, 0x56, 0x0a, 0xf8, 0x3f, 0x4f,
-	0x94, 0x57, 0x99, 0x93, 0x55, 0x9f, 0x1a, 0x01, 0x15, 0xad, 0x43, 0xda, 0xda, 0x22, 0xd4, 0xf2,
-	0xfc, 0xf0, 0xbd, 0x9c, 0x56, 0x25, 0xa2, 0xa3, 0xf7, 0x21, 0xe1, 0x63, 0x56, 0x8e, 0xd3, 0x8b,
-	0x24, 0x7c, 0x8c, 0x5c, 0xc8, 0xfa, 0xd8, 0xfc, 0xd8, 0xa3, 0xdb, 0xe6, 0xd0, 0xa1, 0x98, 0x55,
-	0x62, 0x56, 0xd3, 0xa7, 0x53, 0x7a, 0x36, 0x51, 0x16, 0xf8, 0x3b, 0x18, 0xd7, 0x2a, 0x1a, 0xe0,
-	0xe3, 0x6b, 0x1e, 0xdd, 0xde, 0x0c, 0x16, 0x3f, 0x89, 0x90, 0x62, 0x83, 0xe0, 0x0d, 0xbd, 0xd4,
-	0xff, 0x7e, 0xe7, 0xff, 0x4c, 0x84, 0x9c, 0x66, 0x11, 0xaf, 0xfd, 0xbc, 0xf7, 0x5f, 0x84, 0xd4,
-	0x96, 0x45, 0x9c, 0xf0, 0x5b, 0xed, 0xff, 0x2f, 0x6d, 0x33, 0x41, 0x83, 0xd3, 0x52, 0x0f, 0x27,
-	0x8a, 0x68, 0x30, 0x12, 0xba, 0x08, 0xe9, 0x36, 0xf6, 0xa9, 0xe3, 0xd3, 0xf0, 0x53, 0xed, 0x70,
-	0x3e, 0x7b, 0xe2, 0x1a, 0x07, 0x1a, 0x11, 0xa3, 0x68, 0x42, 0x36, 0x7e, 0x80, 0x2e, 0x40, 0x8a,
-	0x3a, 0x3b, 0xf4, 0xa5, 0x91, 0xc4, 0xc7, 0xd6, 0xba, 0x60, 0x30, 0xc2, 0xea, 0x91, 0xf0, 0xb3,
-	0x2f, 0x1d, 0x2a, 0x85, 0xdf, 0x75, 0xa7, 0xbf, 0x11, 0x01, 0xf6, 0x3d, 0x40, 0x32, 0xcc, 0xe8,
-	0x1b, 0x8d, 0xd6, 0x75, 0x49, 0x90, 0x8f, 0x8c, 0xc6, 0x6a, 0x86, 0x6f, 0xeb, 0xdd, 0x1e, 0xdd,
-	0x45, 0xc7, 0x21, 0x79, 0x5d, 0x6f, 0x4a, 0xa2, 0x9c, 0x1b, 0x8d, 0xd5, 0x79, 0x7e, 0x72, 0xdd,
-	0x21, 0xa8, 0x00, 0xe9, 0xb2, 0xd6, 0x6c, 0x95, 0xab, 0x35, 0x29, 0x21, 0x1f, 0x1d, 0x8d, 0xd5,
-	0x1c, 0x3f, 0x2b, 0x87, 0xa5, 0x7c, 0x0c, 0x12, 0xb5, 0xba, 0x94, 0x94, 0xb3, 0xa3, 0xb1, 0x3a,
-	0xc7, 0x8f, 0x6a, 0x18, 0x9d, 0x82, 0x6c, 0xad, 0x6e, 0x5e, 0xab, 0xb6, 0xd6, 0xcd, 0x4d, 0xbd,
-	0x55, 0x97, 0x52, 0xf2, 0xb1, 0xd1, 0x58, 0x95, 0xa2, 0xf3, 0xa8, 0xbe, 0xe4, 0xec, 0xa7, 0x5f,
-	0x15, 0x84, 0xfb, 0xf7, 0x0a, 0xc2, 0xb7, 0xf7, 0x0a, 0xc2, 0xe9, 0xdf, 0x45, 0xc8, 0x1f, 0x6c,
-	0xe8, 0x41, 0x58, 0xb5, 0xea, 0x55, 0x49, 0xe0, 0x61, 0xf1, 0xcd, 0x9a, 0xd7, 0x41, 0x67, 0x20,
-	0x5f, 0xd1, 0x1b, 0xf5, 0x66, 0xb5, 0x65, 0x36, 0x74, 0xa3, 0x5a, 0xaf, 0x48, 0xa2, 0x7c, 0x62,
-	0x34, 0x56, 0x17, 0x38, 0x24, 0x6c, 0x57, 0x0d, 0xa7, 0xef, 0x61, 0x1b, 0xbd, 0x03, 0xb9, 0xcd,
-	0x7a, 0xab, 0x5a, 0xbb, 0x1c, 0x61, 0x13, 0xf2, 0xf1, 0xd1, 0x58, 0x45, 0x1c, 0xbb, 0xc9, 0x1a,
-	0x48, 0x08, 0x3d, 0x09, 0xb3, 0x8d, 0x72, 0xb3, 0xa9, 0x57, 0xa4, 0xa4, 0x2c, 0x8d, 0xc6, 0x6a,
-	0x96, 0x63, 0x1a, 0x16, 0x21, 0x8e, 0x8d, 0x54, 0x98, 0x33, 0xf4, 0x2b, 0xfa, 0x5a, 0x4b, 0xaf,
-	0x48, 0x29, 0x19, 0x8d, 0xc6, 0x6a, 0x3e, 0x1c, 0x3c, 0xce, 0x4d, 0xa7, 0x4d, 0x1d, 0xc6, 0xbf,
-	0x54, 0xae, 0x5e, 0xd5, 0x2b, 0xd2, 0x4c, 0x9c, 0x7f, 0xc9, 0xf2, 0x3a, 0x8e, 0x7d, 0x30, 0x5d,
-	0xad, 0xf6, 0xe0, 0x49, 0x41, 0x78, 0xf4, 0xa4, 0x20, 0xdc, 0xde, 0x2b, 0x08, 0x0f, 0xf6, 0x0a,
-	0xe2, 0xc3, 0xbd, 0x82, 0xf8, 0xeb, 0x5e, 0x41, 0xbc, 0xf3, 0xb4, 0x20, 0x3c, 0x7c, 0x5a, 0x10,
-	0x1e, 0x3d, 0x2d, 0x08, 0x1f, 0xbe, 0xbc, 0x53, 0xc7, 0xfe, 0x67, 0xda, 0x9a, 0x65, 0x8d, 0xf2,
-	0xfc, 0x5f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xb4, 0xd5, 0x14, 0x59, 0x49, 0x0d, 0x00, 0x00,
+var fileDescriptor_a5ae5e91b5b3fb03 = []byte{
+	// 1208 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x57, 0xcf, 0x8b, 0xdb, 0x46,
+	0x1b, 0x96, 0x6c, 0xef, 0x7a, 0xf3, 0xfa, 0x47, 0x94, 0xd9, 0x7c, 0xc9, 0x22, 0x3e, 0x24, 0xd5,
+	0x2d, 0x61, 0x9b, 0x10, 0x6d, 0xb3, 0x39, 0x04, 0x36, 0x50, 0x6a, 0xc5, 0x4a, 0xe2, 0x90, 0xb5,
+	0x8d, 0x6c, 0x36, 0xa4, 0x50, 0x84, 0xd6, 0x52, 0xbc, 0x4a, 0x6c, 0x8d, 0xf1, 0x8c, 0xdd, 0xdd,
+	0x5b, 0x4e, 0xa5, 0xf5, 0x29, 0x14, 0x0a, 0xbd, 0x18, 0x02, 0xcd, 0x21, 0x94, 0x1e, 0x7a, 0xe8,
+	0x5f, 0xd0, 0x53, 0xe8, 0xa5, 0x39, 0x86, 0x52, 0x9c, 0x66, 0x73, 0x2b, 0x3d, 0x05, 0x7a, 0xe9,
+	0xa9, 0x68, 0x46, 0xca, 0x6a, 0xc9, 0x26, 0xc4, 0x24, 0xa5, 0xd0, 0xcb, 0xb2, 0x9a, 0x79, 0x9e,
+	0x67, 0xde, 0xf7, 0x99, 0x57, 0x8f, 0x76, 0xe1, 0xf8, 0xf6, 0x4a, 0x07, 0x8f, 0x56, 0xe8, 0x4e,
+	0xdf, 0x23, 0xfc, 0xa7, 0xde, 0x1f, 0x60, 0x8a, 0xd1, 0x62, 0x1b, 0x93, 0x1e, 0x26, 0x36, 0x71,
+	0x6f, 0xe9, 0xdb, 0x7a, 0x07, 0x8f, 0xf4, 0xd1, 0x19, 0xf9, 0xc8, 0x0b, 0x38, 0xf9, 0x04, 0xdd,
+	0xf2, 0x07, 0xae, 0xdd, 0x77, 0x06, 0x74, 0x67, 0x85, 0x2d, 0xad, 0x74, 0x70, 0x07, 0xef, 0xfd,
+	0x16, 0xe1, 0x4e, 0xbd, 0x88, 0xe3, 0x27, 0x9c, 0x4e, 0x3e, 0x44, 0x60, 0xb5, 0x83, 0x71, 0xa7,
+	0xeb, 0x71, 0xdc, 0xe6, 0xf0, 0xc6, 0x0a, 0xf5, 0x7b, 0x1e, 0xa1, 0x4e, 0xaf, 0xcf, 0x01, 0xa5,
+	0x3f, 0x45, 0xf8, 0xdf, 0x3a, 0xe9, 0x34, 0x87, 0x9b, 0x3d, 0x9f, 0x36, 0x06, 0xb8, 0x8f, 0x89,
+	0xd3, 0x35, 0x1c, 0xe2, 0xa1, 0xcf, 0x44, 0x28, 0xfa, 0x01, 0xf5, 0x9d, 0xae, 0xed, 0x7a, 0x7d,
+	0x4c, 0x7c, 0xba, 0x24, 0x6a, 0xe9, 0xe5, 0xdc, 0xea, 0xa2, 0x9e, 0xe8, 0x68, 0x74, 0x46, 0xbf,
+	0x80, 0xfd, 0xc0, 0xb8, 0xf2, 0x60, 0xaa, 0x0a, 0xcf, 0xa6, 0xea, 0xb1, 0x1d, 0xa7, 0xd7, 0x5d,
+	0x2b, 0xf9, 0x81, 0x9f, 0x64, 0x96, 0xbe, 0x7d, 0xac, 0x2e, 0x77, 0x7c, 0xba, 0x35, 0xdc, 0xd4,
+	0xdb, 0xb8, 0x17, 0xd5, 0x18, 0xd7, 0x4d, 0xdc, 0x5b, 0x91, 0x13, 0xa1, 0x14, 0xb1, 0x0a, 0xfc,
+	0xd8, 0x0a, 0xe7, 0xa2, 0x75, 0x58, 0xe8, 0xb3, 0xc2, 0xbc, 0xc1, 0x52, 0x4a, 0x13, 0x97, 0xf3,
+	0xc6, 0x99, 0xbf, 0xa6, 0xea, 0xe9, 0xd7, 0x90, 0x2b, 0xb7, 0xdb, 0x65, 0xd7, 0x1d, 0x78, 0x84,
+	0x58, 0xcf, 0x25, 0xd6, 0x32, 0xb7, 0x7f, 0xd5, 0xc4, 0xd2, 0x97, 0x29, 0x80, 0x75, 0xd2, 0x89,
+	0xcf, 0x68, 0x41, 0xae, 0x1f, 0x35, 0x6f, 0xfb, 0xee, 0x92, 0xa8, 0x89, 0xcb, 0x19, 0xe3, 0xec,
+	0xee, 0x54, 0x85, 0xd8, 0x93, 0x6a, 0xe5, 0xf7, 0xa9, 0x9a, 0x04, 0x3d, 0x9b, 0xaa, 0x88, 0x37,
+	0x9b, 0x58, 0x2c, 0x59, 0x10, 0x3f, 0x55, 0x5d, 0x54, 0x87, 0x43, 0x91, 0x01, 0xf8, 0x0d, 0x4a,
+	0xdf, 0xd3, 0x40, 0x9f, 0xc0, 0xbc, 0xd3, 0xc3, 0xc3, 0x80, 0x2e, 0xa5, 0x5f, 0x7e, 0x15, 0x1f,
+	0x84, 0x57, 0x31, 0x93, 0xe1, 0x91, 0x68, 0xe9, 0x89, 0x08, 0xd9, 0x75, 0xd2, 0xd9, 0xc0, 0xd4,
+	0xfb, 0x87, 0x1c, 0xb9, 0x04, 0x73, 0x23, 0x4c, 0xdf, 0xe4, 0x22, 0x39, 0x1f, 0x9d, 0x83, 0x79,
+	0xdc, 0xa7, 0x3e, 0x0e, 0x96, 0xd2, 0x9a, 0xb8, 0x5c, 0x5c, 0x55, 0xf5, 0x03, 0x5e, 0x33, 0x3d,
+	0xec, 0xa4, 0xce, 0x60, 0x56, 0x04, 0x2f, 0x5d, 0x84, 0x7c, 0xcb, 0xdb, 0x7e, 0x3e, 0xea, 0xe8,
+	0x28, 0xcc, 0x51, 0x9f, 0x76, 0x3d, 0xd6, 0xe1, 0x21, 0x8b, 0x3f, 0x20, 0x0d, 0x72, 0xae, 0x47,
+	0xda, 0x03, 0x9f, 0x9f, 0x91, 0x62, 0x7b, 0xc9, 0xa5, 0xd2, 0xed, 0x14, 0x64, 0xe3, 0xe9, 0x31,
+	0x0f, 0xf2, 0xea, 0xbd, 0xfd, 0x5e, 0xfd, 0x07, 0xc7, 0xe5, 0xab, 0x39, 0xc8, 0xef, 0x8b, 0x8c,
+	0xb7, 0xe4, 0xc3, 0x79, 0x98, 0x27, 0xd4, 0xa1, 0x43, 0xc2, 0x4c, 0x28, 0xae, 0xbe, 0x7b, 0xe0,
+	0xdd, 0xc6, 0x92, 0x4d, 0x06, 0xb5, 0x22, 0x0a, 0x6a, 0x01, 0xba, 0xe1, 0x07, 0x4e, 0xd7, 0xa6,
+	0x4e, 0xb7, 0xbb, 0x63, 0x0f, 0x3c, 0x32, 0xec, 0x52, 0x36, 0x24, 0xb9, 0x55, 0xed, 0x40, 0xa1,
+	0x56, 0x08, 0xb4, 0x18, 0xce, 0xc8, 0x84, 0x66, 0x58, 0x12, 0x53, 0x48, 0xac, 0x87, 0x9d, 0x11,
+	0x16, 0x91, 0x76, 0x18, 0xa0, 0x4b, 0x19, 0x26, 0x27, 0xeb, 0x3c, 0x5d, 0xf5, 0x38, 0x5d, 0xf5,
+	0x56, 0x9c, 0xae, 0xc6, 0x42, 0x28, 0x74, 0xe7, 0xb1, 0x2a, 0x5a, 0xc0, 0x89, 0xe1, 0x16, 0xaa,
+	0x81, 0x14, 0xdd, 0x8e, 0xed, 0x05, 0x2e, 0xd7, 0x9a, 0x9b, 0x41, 0xab, 0x18, 0xb1, 0xcd, 0xc0,
+	0x65, 0x7a, 0x37, 0xa1, 0x40, 0x31, 0x4d, 0x24, 0xf4, 0xfc, 0xdb, 0xbc, 0xe7, 0x3c, 0xd3, 0x8e,
+	0x87, 0xbc, 0x01, 0x47, 0x46, 0x98, 0xfa, 0x41, 0xc7, 0x26, 0xd4, 0x19, 0x44, 0x46, 0x64, 0x67,
+	0x28, 0xfe, 0x30, 0xa7, 0x37, 0x43, 0x36, 0xab, 0xfe, 0x2a, 0x44, 0x4b, 0x7b, 0x66, 0x2c, 0xcc,
+	0xa0, 0x57, 0xe0, 0xe4, 0xc8, 0x8b, 0xb5, 0x85, 0xaf, 0xef, 0xaa, 0xe2, 0xfd, 0xbb, 0xaa, 0x58,
+	0xfa, 0x31, 0x05, 0xb9, 0xe4, 0xe5, 0x7d, 0x04, 0xe9, 0x1d, 0x8f, 0xb0, 0x71, 0xcc, 0x1b, 0x7a,
+	0xc8, 0xff, 0x65, 0xaa, 0x9e, 0x78, 0x0d, 0x1b, 0xaa, 0x01, 0xb5, 0x42, 0x2a, 0xba, 0x0c, 0x59,
+	0x67, 0x93, 0x50, 0xc7, 0x0f, 0xa2, 0xf7, 0x72, 0x56, 0x95, 0x98, 0x8e, 0x3e, 0x84, 0x54, 0x80,
+	0xd9, 0x38, 0xce, 0x2e, 0x92, 0x0a, 0x30, 0xea, 0x40, 0x3e, 0xc0, 0xf6, 0xa7, 0x3e, 0xdd, 0xb2,
+	0x47, 0x1e, 0xc5, 0x6c, 0x12, 0xf3, 0x86, 0x39, 0x9b, 0xd2, 0xb3, 0xa9, 0xba, 0xc8, 0xdf, 0xc1,
+	0xa4, 0x56, 0xc9, 0x82, 0x00, 0x5f, 0xf3, 0xe9, 0xd6, 0x46, 0xf8, 0xf0, 0xb3, 0x08, 0x19, 0xf6,
+	0x21, 0x78, 0x4b, 0x2f, 0xf5, 0xbf, 0x9f, 0xfc, 0x5f, 0x88, 0x50, 0x30, 0x1c, 0xe2, 0xb7, 0x9f,
+	0x67, 0xff, 0x79, 0xc8, 0x6c, 0x3a, 0x84, 0x47, 0x7f, 0x6e, 0xf5, 0x9d, 0x57, 0xc6, 0x4c, 0x18,
+	0x70, 0x46, 0xe6, 0xe1, 0x54, 0x15, 0x2d, 0x46, 0x42, 0xe7, 0x21, 0xdb, 0xc6, 0x01, 0xf5, 0x02,
+	0xca, 0x5a, 0x7a, 0x19, 0x9f, 0x9d, 0x78, 0x81, 0x03, 0xad, 0x98, 0x51, 0xb2, 0x21, 0x9f, 0xdc,
+	0x40, 0xe7, 0x20, 0x43, 0xbd, 0x6d, 0xfa, 0xca, 0x4a, 0x92, 0x9f, 0xad, 0xcb, 0x82, 0xc5, 0x08,
+	0x6b, 0x87, 0xc3, 0xbf, 0x66, 0x7e, 0xfa, 0xe1, 0x74, 0x36, 0x52, 0x32, 0xe6, 0x20, 0x4d, 0x86,
+	0xbd, 0x93, 0xdf, 0x89, 0x00, 0x7b, 0x1e, 0x20, 0x19, 0xe6, 0xcc, 0xf5, 0x46, 0xeb, 0xba, 0x24,
+	0xc8, 0x87, 0xc7, 0x13, 0x2d, 0xc7, 0x97, 0xcd, 0x5e, 0x9f, 0xee, 0xa0, 0x63, 0x90, 0xbe, 0x6e,
+	0x36, 0x25, 0x51, 0x2e, 0x8c, 0x27, 0xda, 0x21, 0xbe, 0x73, 0xdd, 0x23, 0x48, 0x81, 0x6c, 0xd9,
+	0x68, 0xb6, 0xca, 0xd5, 0x9a, 0x94, 0x92, 0x8f, 0x8c, 0x27, 0x5a, 0x81, 0xef, 0x95, 0xa3, 0x51,
+	0x3e, 0x0a, 0xa9, 0x5a, 0x5d, 0x4a, 0xcb, 0xf9, 0xf1, 0x44, 0x5b, 0xe0, 0x5b, 0x35, 0x8c, 0x4e,
+	0x40, 0xbe, 0x56, 0xb7, 0xaf, 0x55, 0x5b, 0x97, 0xed, 0x0d, 0xb3, 0x55, 0x97, 0x32, 0xf2, 0xd1,
+	0xf1, 0x44, 0x93, 0xe2, 0xfd, 0x78, 0xbe, 0xe4, 0xfc, 0xe7, 0xdf, 0x28, 0xc2, 0xfd, 0x7b, 0x8a,
+	0xf0, 0xfd, 0x3d, 0x45, 0x38, 0xf9, 0x87, 0x08, 0xc5, 0xfd, 0x81, 0x1e, 0x96, 0x55, 0xab, 0x5e,
+	0x95, 0x04, 0x5e, 0x16, 0x5f, 0xac, 0xf9, 0x5d, 0x74, 0x0a, 0x8a, 0x15, 0xb3, 0x51, 0x6f, 0x56,
+	0x5b, 0x76, 0xc3, 0xb4, 0xaa, 0xf5, 0x8a, 0x24, 0xca, 0xc7, 0xc7, 0x13, 0x6d, 0x91, 0x43, 0xa2,
+	0xb8, 0x6a, 0x78, 0x03, 0x1f, 0xbb, 0xe8, 0x7d, 0x28, 0x6c, 0xd4, 0x5b, 0xd5, 0xda, 0xa5, 0x18,
+	0x9b, 0x92, 0x8f, 0x8d, 0x27, 0x1a, 0xe2, 0xd8, 0x0d, 0x16, 0x20, 0x11, 0xf4, 0xff, 0x30, 0xdf,
+	0x28, 0x37, 0x9b, 0x66, 0x45, 0x4a, 0xcb, 0xd2, 0x78, 0xa2, 0xe5, 0x39, 0xa6, 0xe1, 0x10, 0xe2,
+	0xb9, 0x48, 0x83, 0x05, 0xcb, 0xbc, 0x62, 0x5e, 0x68, 0x99, 0x15, 0x29, 0x23, 0xa3, 0xf1, 0x44,
+	0x2b, 0x46, 0x1f, 0x1e, 0xef, 0xa6, 0xd7, 0xa6, 0x1e, 0xe3, 0x5f, 0x2c, 0x57, 0xaf, 0x9a, 0x15,
+	0x69, 0x2e, 0xc9, 0xbf, 0xe8, 0xf8, 0x5d, 0xcf, 0xdd, 0xdf, 0xae, 0x51, 0x7b, 0xf0, 0x44, 0x11,
+	0x1e, 0x3d, 0x51, 0x84, 0xdb, 0xbb, 0x8a, 0xf0, 0x60, 0x57, 0x11, 0x1f, 0xee, 0x2a, 0xe2, 0x6f,
+	0xbb, 0x8a, 0x78, 0xe7, 0xa9, 0x22, 0x3c, 0x7c, 0xaa, 0x08, 0x8f, 0x9e, 0x2a, 0xc2, 0xc7, 0xaf,
+	0x4e, 0xea, 0xc4, 0xff, 0x1b, 0x9b, 0xf3, 0x2c, 0x28, 0xcf, 0xfe, 0x1d, 0x00, 0x00, 0xff, 0xff,
+	0xaa, 0x0c, 0xd1, 0xcc, 0x85, 0x0c, 0x00, 0x00,
 }
 
 type ProposalBaseFace interface {
@@ -772,38 +683,6 @@ func NewProposalBaseFromFace(that ProposalBaseFace) *ProposalBase {
 	return this
 }
 
-func (this *MsgCommon) GetMsg() github_com_cosmos_cosmos_sdk_types.Msg {
-	if x := this.GetGovDeposit(); x != nil {
-		return x
-	}
-	if x := this.GetGovVote(); x != nil {
-		return x
-	}
-	return nil
-}
-
-func (this *MsgCommon) SetMsg(value github_com_cosmos_cosmos_sdk_types.Msg) error {
-	if value == nil {
-		this.Sum = nil
-		return nil
-	}
-	switch vt := value.(type) {
-	case *MsgDeposit:
-		this.Sum = &MsgCommon_GovDeposit{vt}
-		return nil
-	case MsgDeposit:
-		this.Sum = &MsgCommon_GovDeposit{&vt}
-		return nil
-	case *MsgVote:
-		this.Sum = &MsgCommon_GovVote{vt}
-		return nil
-	case MsgVote:
-		this.Sum = &MsgCommon_GovVote{&vt}
-		return nil
-	}
-	return fmt.Errorf("can't encode value of type %T as message MsgCommon", value)
-}
-
 func (this *BasicContent) GetContent() Content {
 	if x := this.GetText(); x != nil {
 		return x
@@ -827,80 +706,6 @@ func (this *BasicContent) SetContent(value Content) error {
 	return fmt.Errorf("can't encode value of type %T as message BasicContent", value)
 }
 
-func (m *MsgCommon) Marshal() (dAtA []byte, err error) {
-	size := m.Size()
-	dAtA = make([]byte, size)
-	n, err := m.MarshalToSizedBuffer(dAtA[:size])
-	if err != nil {
-		return nil, err
-	}
-	return dAtA[:n], nil
-}
-
-func (m *MsgCommon) MarshalTo(dAtA []byte) (int, error) {
-	size := m.Size()
-	return m.MarshalToSizedBuffer(dAtA[:size])
-}
-
-func (m *MsgCommon) MarshalToSizedBuffer(dAtA []byte) (int, error) {
-	i := len(dAtA)
-	_ = i
-	var l int
-	_ = l
-	if m.Sum != nil {
-		{
-			size := m.Sum.Size()
-			i -= size
-			if _, err := m.Sum.MarshalTo(dAtA[i:]); err != nil {
-				return 0, err
-			}
-		}
-	}
-	return len(dAtA) - i, nil
-}
-
-func (m *MsgCommon_GovDeposit) MarshalTo(dAtA []byte) (int, error) {
-	size := m.Size()
-	return m.MarshalToSizedBuffer(dAtA[:size])
-}
-
-func (m *MsgCommon_GovDeposit) MarshalToSizedBuffer(dAtA []byte) (int, error) {
-	i := len(dAtA)
-	if m.GovDeposit != nil {
-		{
-			size, err := m.GovDeposit.MarshalToSizedBuffer(dAtA[:i])
-			if err != nil {
-				return 0, err
-			}
-			i -= size
-			i = encodeVarintCodec(dAtA, i, uint64(size))
-		}
-		i--
-		dAtA[i] = 0xa
-	}
-	return len(dAtA) - i, nil
-}
-func (m *MsgCommon_GovVote) MarshalTo(dAtA []byte) (int, error) {
-	size := m.Size()
-	return m.MarshalToSizedBuffer(dAtA[:size])
-}
-
-func (m *MsgCommon_GovVote) MarshalToSizedBuffer(dAtA []byte) (int, error) {
-	i := len(dAtA)
-	if m.GovVote != nil {
-		{
-			size, err := m.GovVote.MarshalToSizedBuffer(dAtA[:i])
-			if err != nil {
-				return 0, err
-			}
-			i -= size
-			i = encodeVarintCodec(dAtA, i, uint64(size))
-		}
-		i--
-		dAtA[i] = 0x12
-	}
-	return len(dAtA) - i, nil
-}
 func (m *MsgSubmitProposalBase) Marshal() (dAtA []byte, err error) {
 	size := m.Size()
 	dAtA = make([]byte, size)
@@ -924,7 +729,7 @@ func (m *MsgSubmitProposalBase) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	if len(m.Proposer) > 0 {
 		i -= len(m.Proposer)
 		copy(dAtA[i:], m.Proposer)
-		i = encodeVarintCodec(dAtA, i, uint64(len(m.Proposer)))
+		i = encodeVarintTypes(dAtA, i, uint64(len(m.Proposer)))
 		i--
 		dAtA[i] = 0x12
 	}
@@ -936,7 +741,7 @@ func (m *MsgSubmitProposalBase) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 					return 0, err
 				}
 				i -= size
-				i = encodeVarintCodec(dAtA, i, uint64(size))
+				i = encodeVarintTypes(dAtA, i, uint64(size))
 			}
 			i--
 			dAtA[i] = 0xa
@@ -973,7 +778,7 @@ func (m *MsgDeposit) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 					return 0, err
 				}
 				i -= size
-				i = encodeVarintCodec(dAtA, i, uint64(size))
+				i = encodeVarintTypes(dAtA, i, uint64(size))
 			}
 			i--
 			dAtA[i] = 0x1a
@@ -982,12 +787,12 @@ func (m *MsgDeposit) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	if len(m.Depositor) > 0 {
 		i -= len(m.Depositor)
 		copy(dAtA[i:], m.Depositor)
-		i = encodeVarintCodec(dAtA, i, uint64(len(m.Depositor)))
+		i = encodeVarintTypes(dAtA, i, uint64(len(m.Depositor)))
 		i--
 		dAtA[i] = 0x12
 	}
 	if m.ProposalID != 0 {
-		i = encodeVarintCodec(dAtA, i, uint64(m.ProposalID))
+		i = encodeVarintTypes(dAtA, i, uint64(m.ProposalID))
 		i--
 		dAtA[i] = 0x8
 	}
@@ -1015,19 +820,19 @@ func (m *MsgVote) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	var l int
 	_ = l
 	if m.Option != 0 {
-		i = encodeVarintCodec(dAtA, i, uint64(m.Option))
+		i = encodeVarintTypes(dAtA, i, uint64(m.Option))
 		i--
 		dAtA[i] = 0x18
 	}
 	if len(m.Voter) > 0 {
 		i -= len(m.Voter)
 		copy(dAtA[i:], m.Voter)
-		i = encodeVarintCodec(dAtA, i, uint64(len(m.Voter)))
+		i = encodeVarintTypes(dAtA, i, uint64(len(m.Voter)))
 		i--
 		dAtA[i] = 0x12
 	}
 	if m.ProposalID != 0 {
-		i = encodeVarintCodec(dAtA, i, uint64(m.ProposalID))
+		i = encodeVarintTypes(dAtA, i, uint64(m.ProposalID))
 		i--
 		dAtA[i] = 0x8
 	}
@@ -1057,14 +862,14 @@ func (m *TextProposal) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	if len(m.Description) > 0 {
 		i -= len(m.Description)
 		copy(dAtA[i:], m.Description)
-		i = encodeVarintCodec(dAtA, i, uint64(len(m.Description)))
+		i = encodeVarintTypes(dAtA, i, uint64(len(m.Description)))
 		i--
 		dAtA[i] = 0x12
 	}
 	if len(m.Title) > 0 {
 		i -= len(m.Title)
 		copy(dAtA[i:], m.Title)
-		i = encodeVarintCodec(dAtA, i, uint64(len(m.Title)))
+		i = encodeVarintTypes(dAtA, i, uint64(len(m.Title)))
 		i--
 		dAtA[i] = 0xa
 	}
@@ -1099,7 +904,7 @@ func (m *Deposit) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 					return 0, err
 				}
 				i -= size
-				i = encodeVarintCodec(dAtA, i, uint64(size))
+				i = encodeVarintTypes(dAtA, i, uint64(size))
 			}
 			i--
 			dAtA[i] = 0x1a
@@ -1108,12 +913,12 @@ func (m *Deposit) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	if len(m.Depositor) > 0 {
 		i -= len(m.Depositor)
 		copy(dAtA[i:], m.Depositor)
-		i = encodeVarintCodec(dAtA, i, uint64(len(m.Depositor)))
+		i = encodeVarintTypes(dAtA, i, uint64(len(m.Depositor)))
 		i--
 		dAtA[i] = 0x12
 	}
 	if m.ProposalID != 0 {
-		i = encodeVarintCodec(dAtA, i, uint64(m.ProposalID))
+		i = encodeVarintTypes(dAtA, i, uint64(m.ProposalID))
 		i--
 		dAtA[i] = 0x8
 	}
@@ -1140,20 +945,20 @@ func (m *ProposalBase) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	_ = i
 	var l int
 	_ = l
-	n3, err3 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.VotingEndTime, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.VotingEndTime):])
-	if err3 != nil {
-		return 0, err3
+	n1, err1 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.VotingEndTime, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.VotingEndTime):])
+	if err1 != nil {
+		return 0, err1
 	}
-	i -= n3
-	i = encodeVarintCodec(dAtA, i, uint64(n3))
+	i -= n1
+	i = encodeVarintTypes(dAtA, i, uint64(n1))
 	i--
 	dAtA[i] = 0x42
-	n4, err4 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.VotingStartTime, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.VotingStartTime):])
-	if err4 != nil {
-		return 0, err4
+	n2, err2 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.VotingStartTime, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.VotingStartTime):])
+	if err2 != nil {
+		return 0, err2
 	}
-	i -= n4
-	i = encodeVarintCodec(dAtA, i, uint64(n4))
+	i -= n2
+	i = encodeVarintTypes(dAtA, i, uint64(n2))
 	i--
 	dAtA[i] = 0x3a
 	if len(m.TotalDeposit) > 0 {
@@ -1164,26 +969,26 @@ func (m *ProposalBase) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 					return 0, err
 				}
 				i -= size
-				i = encodeVarintCodec(dAtA, i, uint64(size))
+				i = encodeVarintTypes(dAtA, i, uint64(size))
 			}
 			i--
 			dAtA[i] = 0x32
 		}
 	}
-	n5, err5 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.DepositEndTime, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.DepositEndTime):])
-	if err5 != nil {
-		return 0, err5
+	n3, err3 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.DepositEndTime, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.DepositEndTime):])
+	if err3 != nil {
+		return 0, err3
 	}
-	i -= n5
-	i = encodeVarintCodec(dAtA, i, uint64(n5))
+	i -= n3
+	i = encodeVarintTypes(dAtA, i, uint64(n3))
 	i--
 	dAtA[i] = 0x2a
-	n6, err6 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.SubmitTime, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.SubmitTime):])
-	if err6 != nil {
-		return 0, err6
+	n4, err4 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.SubmitTime, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.SubmitTime):])
+	if err4 != nil {
+		return 0, err4
 	}
-	i -= n6
-	i = encodeVarintCodec(dAtA, i, uint64(n6))
+	i -= n4
+	i = encodeVarintTypes(dAtA, i, uint64(n4))
 	i--
 	dAtA[i] = 0x22
 	{
@@ -1192,17 +997,17 @@ func (m *ProposalBase) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 			return 0, err
 		}
 		i -= size
-		i = encodeVarintCodec(dAtA, i, uint64(size))
+		i = encodeVarintTypes(dAtA, i, uint64(size))
 	}
 	i--
 	dAtA[i] = 0x1a
 	if m.Status != 0 {
-		i = encodeVarintCodec(dAtA, i, uint64(m.Status))
+		i = encodeVarintTypes(dAtA, i, uint64(m.Status))
 		i--
 		dAtA[i] = 0x10
 	}
 	if m.ProposalID != 0 {
-		i = encodeVarintCodec(dAtA, i, uint64(m.ProposalID))
+		i = encodeVarintTypes(dAtA, i, uint64(m.ProposalID))
 		i--
 		dAtA[i] = 0x8
 	}
@@ -1235,7 +1040,7 @@ func (m *TallyResult) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 		if _, err := m.NoWithVeto.MarshalTo(dAtA[i:]); err != nil {
 			return 0, err
 		}
-		i = encodeVarintCodec(dAtA, i, uint64(size))
+		i = encodeVarintTypes(dAtA, i, uint64(size))
 	}
 	i--
 	dAtA[i] = 0x22
@@ -1245,7 +1050,7 @@ func (m *TallyResult) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 		if _, err := m.No.MarshalTo(dAtA[i:]); err != nil {
 			return 0, err
 		}
-		i = encodeVarintCodec(dAtA, i, uint64(size))
+		i = encodeVarintTypes(dAtA, i, uint64(size))
 	}
 	i--
 	dAtA[i] = 0x1a
@@ -1255,7 +1060,7 @@ func (m *TallyResult) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 		if _, err := m.Abstain.MarshalTo(dAtA[i:]); err != nil {
 			return 0, err
 		}
-		i = encodeVarintCodec(dAtA, i, uint64(size))
+		i = encodeVarintTypes(dAtA, i, uint64(size))
 	}
 	i--
 	dAtA[i] = 0x12
@@ -1265,7 +1070,7 @@ func (m *TallyResult) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 		if _, err := m.Yes.MarshalTo(dAtA[i:]); err != nil {
 			return 0, err
 		}
-		i = encodeVarintCodec(dAtA, i, uint64(size))
+		i = encodeVarintTypes(dAtA, i, uint64(size))
 	}
 	i--
 	dAtA[i] = 0xa
@@ -1293,19 +1098,19 @@ func (m *Vote) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	var l int
 	_ = l
 	if m.Option != 0 {
-		i = encodeVarintCodec(dAtA, i, uint64(m.Option))
+		i = encodeVarintTypes(dAtA, i, uint64(m.Option))
 		i--
 		dAtA[i] = 0x18
 	}
 	if len(m.Voter) > 0 {
 		i -= len(m.Voter)
 		copy(dAtA[i:], m.Voter)
-		i = encodeVarintCodec(dAtA, i, uint64(len(m.Voter)))
+		i = encodeVarintTypes(dAtA, i, uint64(len(m.Voter)))
 		i--
 		dAtA[i] = 0x12
 	}
 	if m.ProposalID != 0 {
-		i = encodeVarintCodec(dAtA, i, uint64(m.ProposalID))
+		i = encodeVarintTypes(dAtA, i, uint64(m.ProposalID))
 		i--
 		dAtA[i] = 0x8
 	}
@@ -1339,7 +1144,7 @@ func (m *BasicProposal) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 				return 0, err
 			}
 			i -= size
-			i = encodeVarintCodec(dAtA, i, uint64(size))
+			i = encodeVarintTypes(dAtA, i, uint64(size))
 		}
 		i--
 		dAtA[i] = 0x12
@@ -1351,7 +1156,7 @@ func (m *BasicProposal) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 				return 0, err
 			}
 			i -= size
-			i = encodeVarintCodec(dAtA, i, uint64(size))
+			i = encodeVarintTypes(dAtA, i, uint64(size))
 		}
 		i--
 		dAtA[i] = 0xa
@@ -1405,15 +1210,15 @@ func (m *BasicContent_Text) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 				return 0, err
 			}
 			i -= size
-			i = encodeVarintCodec(dAtA, i, uint64(size))
+			i = encodeVarintTypes(dAtA, i, uint64(size))
 		}
 		i--
 		dAtA[i] = 0xa
 	}
 	return len(dAtA) - i, nil
 }
-func encodeVarintCodec(dAtA []byte, offset int, v uint64) int {
-	offset -= sovCodec(v)
+func encodeVarintTypes(dAtA []byte, offset int, v uint64) int {
+	offset -= sovTypes(v)
 	base := offset
 	for v >= 1<<7 {
 		dAtA[offset] = uint8(v&0x7f | 0x80)
@@ -1423,42 +1228,6 @@ func encodeVarintCodec(dAtA []byte, offset int, v uint64) int {
 	dAtA[offset] = uint8(v)
 	return base
 }
-func (m *MsgCommon) Size() (n int) {
-	if m == nil {
-		return 0
-	}
-	var l int
-	_ = l
-	if m.Sum != nil {
-		n += m.Sum.Size()
-	}
-	return n
-}
-
-func (m *MsgCommon_GovDeposit) Size() (n int) {
-	if m == nil {
-		return 0
-	}
-	var l int
-	_ = l
-	if m.GovDeposit != nil {
-		l = m.GovDeposit.Size()
-		n += 1 + l + sovCodec(uint64(l))
-	}
-	return n
-}
-func (m *MsgCommon_GovVote) Size() (n int) {
-	if m == nil {
-		return 0
-	}
-	var l int
-	_ = l
-	if m.GovVote != nil {
-		l = m.GovVote.Size()
-		n += 1 + l + sovCodec(uint64(l))
-	}
-	return n
-}
 func (m *MsgSubmitProposalBase) Size() (n int) {
 	if m == nil {
 		return 0
@@ -1468,12 +1237,12 @@ func (m *MsgSubmitProposalBase) Size() (n int) {
 	if len(m.IntialDeposit) > 0 {
 		for _, e := range m.IntialDeposit {
 			l = e.Size()
-			n += 1 + l + sovCodec(uint64(l))
+			n += 1 + l + sovTypes(uint64(l))
 		}
 	}
 	l = len(m.Proposer)
 	if l > 0 {
-		n += 1 + l + sovCodec(uint64(l))
+		n += 1 + l + sovTypes(uint64(l))
 	}
 	return n
 }
@@ -1485,16 +1254,16 @@ func (m *MsgDeposit) Size() (n int) {
 	var l int
 	_ = l
 	if m.ProposalID != 0 {
-		n += 1 + sovCodec(uint64(m.ProposalID))
+		n += 1 + sovTypes(uint64(m.ProposalID))
 	}
 	l = len(m.Depositor)
 	if l > 0 {
-		n += 1 + l + sovCodec(uint64(l))
+		n += 1 + l + sovTypes(uint64(l))
 	}
 	if len(m.Amount) > 0 {
 		for _, e := range m.Amount {
 			l = e.Size()
-			n += 1 + l + sovCodec(uint64(l))
+			n += 1 + l + sovTypes(uint64(l))
 		}
 	}
 	return n
@@ -1507,14 +1276,14 @@ func (m *MsgVote) Size() (n int) {
 	var l int
 	_ = l
 	if m.ProposalID != 0 {
-		n += 1 + sovCodec(uint64(m.ProposalID))
+		n += 1 + sovTypes(uint64(m.ProposalID))
 	}
 	l = len(m.Voter)
 	if l > 0 {
-		n += 1 + l + sovCodec(uint64(l))
+		n += 1 + l + sovTypes(uint64(l))
 	}
 	if m.Option != 0 {
-		n += 1 + sovCodec(uint64(m.Option))
+		n += 1 + sovTypes(uint64(m.Option))
 	}
 	return n
 }
@@ -1527,11 +1296,11 @@ func (m *TextProposal) Size() (n int) {
 	_ = l
 	l = len(m.Title)
 	if l > 0 {
-		n += 1 + l + sovCodec(uint64(l))
+		n += 1 + l + sovTypes(uint64(l))
 	}
 	l = len(m.Description)
 	if l > 0 {
-		n += 1 + l + sovCodec(uint64(l))
+		n += 1 + l + sovTypes(uint64(l))
 	}
 	return n
 }
@@ -1543,16 +1312,16 @@ func (m *Deposit) Size() (n int) {
 	var l int
 	_ = l
 	if m.ProposalID != 0 {
-		n += 1 + sovCodec(uint64(m.ProposalID))
+		n += 1 + sovTypes(uint64(m.ProposalID))
 	}
 	l = len(m.Depositor)
 	if l > 0 {
-		n += 1 + l + sovCodec(uint64(l))
+		n += 1 + l + sovTypes(uint64(l))
 	}
 	if len(m.Amount) > 0 {
 		for _, e := range m.Amount {
 			l = e.Size()
-			n += 1 + l + sovCodec(uint64(l))
+			n += 1 + l + sovTypes(uint64(l))
 		}
 	}
 	return n
@@ -1565,27 +1334,27 @@ func (m *ProposalBase) Size() (n int) {
 	var l int
 	_ = l
 	if m.ProposalID != 0 {
-		n += 1 + sovCodec(uint64(m.ProposalID))
+		n += 1 + sovTypes(uint64(m.ProposalID))
 	}
 	if m.Status != 0 {
-		n += 1 + sovCodec(uint64(m.Status))
+		n += 1 + sovTypes(uint64(m.Status))
 	}
 	l = m.FinalTallyResult.Size()
-	n += 1 + l + sovCodec(uint64(l))
+	n += 1 + l + sovTypes(uint64(l))
 	l = github_com_gogo_protobuf_types.SizeOfStdTime(m.SubmitTime)
-	n += 1 + l + sovCodec(uint64(l))
+	n += 1 + l + sovTypes(uint64(l))
 	l = github_com_gogo_protobuf_types.SizeOfStdTime(m.DepositEndTime)
-	n += 1 + l + sovCodec(uint64(l))
+	n += 1 + l + sovTypes(uint64(l))
 	if len(m.TotalDeposit) > 0 {
 		for _, e := range m.TotalDeposit {
 			l = e.Size()
-			n += 1 + l + sovCodec(uint64(l))
+			n += 1 + l + sovTypes(uint64(l))
 		}
 	}
 	l = github_com_gogo_protobuf_types.SizeOfStdTime(m.VotingStartTime)
-	n += 1 + l + sovCodec(uint64(l))
+	n += 1 + l + sovTypes(uint64(l))
 	l = github_com_gogo_protobuf_types.SizeOfStdTime(m.VotingEndTime)
-	n += 1 + l + sovCodec(uint64(l))
+	n += 1 + l + sovTypes(uint64(l))
 	return n
 }
 
@@ -1596,13 +1365,13 @@ func (m *TallyResult) Size() (n int) {
 	var l int
 	_ = l
 	l = m.Yes.Size()
-	n += 1 + l + sovCodec(uint64(l))
+	n += 1 + l + sovTypes(uint64(l))
 	l = m.Abstain.Size()
-	n += 1 + l + sovCodec(uint64(l))
+	n += 1 + l + sovTypes(uint64(l))
 	l = m.No.Size()
-	n += 1 + l + sovCodec(uint64(l))
+	n += 1 + l + sovTypes(uint64(l))
 	l = m.NoWithVeto.Size()
-	n += 1 + l + sovCodec(uint64(l))
+	n += 1 + l + sovTypes(uint64(l))
 	return n
 }
 
@@ -1613,14 +1382,14 @@ func (m *Vote) Size() (n int) {
 	var l int
 	_ = l
 	if m.ProposalID != 0 {
-		n += 1 + sovCodec(uint64(m.ProposalID))
+		n += 1 + sovTypes(uint64(m.ProposalID))
 	}
 	l = len(m.Voter)
 	if l > 0 {
-		n += 1 + l + sovCodec(uint64(l))
+		n += 1 + l + sovTypes(uint64(l))
 	}
 	if m.Option != 0 {
-		n += 1 + sovCodec(uint64(m.Option))
+		n += 1 + sovTypes(uint64(m.Option))
 	}
 	return n
 }
@@ -1633,11 +1402,11 @@ func (m *BasicProposal) Size() (n int) {
 	_ = l
 	if m.ProposalBase != nil {
 		l = m.ProposalBase.Size()
-		n += 1 + l + sovCodec(uint64(l))
+		n += 1 + l + sovTypes(uint64(l))
 	}
 	if m.Content != nil {
 		l = m.Content.Size()
-		n += 1 + l + sovCodec(uint64(l))
+		n += 1 + l + sovTypes(uint64(l))
 	}
 	return n
 }
@@ -1662,46 +1431,16 @@ func (m *BasicContent_Text) Size() (n int) {
 	_ = l
 	if m.Text != nil {
 		l = m.Text.Size()
-		n += 1 + l + sovCodec(uint64(l))
+		n += 1 + l + sovTypes(uint64(l))
 	}
 	return n
 }
 
-func sovCodec(x uint64) (n int) {
+func sovTypes(x uint64) (n int) {
 	return (math_bits.Len64(x|1) + 6) / 7
 }
-func sozCodec(x uint64) (n int) {
-	return sovCodec(uint64((x << 1) ^ uint64((int64(x) >> 63))))
-}
-func (this *MsgCommon) String() string {
-	if this == nil {
-		return "nil"
-	}
-	s := strings.Join([]string{`&MsgCommon{`,
-		`Sum:` + fmt.Sprintf("%v", this.Sum) + `,`,
-		`}`,
-	}, "")
-	return s
-}
-func (this *MsgCommon_GovDeposit) String() string {
-	if this == nil {
-		return "nil"
-	}
-	s := strings.Join([]string{`&MsgCommon_GovDeposit{`,
-		`GovDeposit:` + strings.Replace(fmt.Sprintf("%v", this.GovDeposit), "MsgDeposit", "MsgDeposit", 1) + `,`,
-		`}`,
-	}, "")
-	return s
-}
-func (this *MsgCommon_GovVote) String() string {
-	if this == nil {
-		return "nil"
-	}
-	s := strings.Join([]string{`&MsgCommon_GovVote{`,
-		`GovVote:` + strings.Replace(fmt.Sprintf("%v", this.GovVote), "MsgVote", "MsgVote", 1) + `,`,
-		`}`,
-	}, "")
-	return s
+func sozTypes(x uint64) (n int) {
+	return sovTypes(uint64((x << 1) ^ uint64((int64(x) >> 63))))
 }
 func (this *MsgSubmitProposalBase) String() string {
 	if this == nil {
@@ -1739,7 +1478,7 @@ func (this *BasicContent_Text) String() string {
 	}, "")
 	return s
 }
-func valueToStringCodec(v interface{}) string {
+func valueToStringTypes(v interface{}) string {
 	rv := reflect.ValueOf(v)
 	if rv.IsNil() {
 		return "nil"
@@ -1747,129 +1486,6 @@ func valueToStringCodec(v interface{}) string {
 	pv := reflect.Indirect(rv).Interface()
 	return fmt.Sprintf("*%v", pv)
 }
-func (m *MsgCommon) Unmarshal(dAtA []byte) error {
-	l := len(dAtA)
-	iNdEx := 0
-	for iNdEx < l {
-		preIndex := iNdEx
-		var wire uint64
-		for shift := uint(0); ; shift += 7 {
-			if shift >= 64 {
-				return ErrIntOverflowCodec
-			}
-			if iNdEx >= l {
-				return io.ErrUnexpectedEOF
-			}
-			b := dAtA[iNdEx]
-			iNdEx++
-			wire |= uint64(b&0x7F) << shift
-			if b < 0x80 {
-				break
-			}
-		}
-		fieldNum := int32(wire >> 3)
-		wireType := int(wire & 0x7)
-		if wireType == 4 {
-			return fmt.Errorf("proto: MsgCommon: wiretype end group for non-group")
-		}
-		if fieldNum <= 0 {
-			return fmt.Errorf("proto: MsgCommon: illegal tag %d (wire type %d)", fieldNum, wire)
-		}
-		switch fieldNum {
-		case 1:
-			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field GovDeposit", wireType)
-			}
-			var msglen int
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowCodec
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				msglen |= int(b&0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			if msglen < 0 {
-				return ErrInvalidLengthCodec
-			}
-			postIndex := iNdEx + msglen
-			if postIndex < 0 {
-				return ErrInvalidLengthCodec
-			}
-			if postIndex > l {
-				return io.ErrUnexpectedEOF
-			}
-			v := &MsgDeposit{}
-			if err := v.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
-				return err
-			}
-			m.Sum = &MsgCommon_GovDeposit{v}
-			iNdEx = postIndex
-		case 2:
-			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field GovVote", wireType)
-			}
-			var msglen int
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowCodec
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				msglen |= int(b&0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			if msglen < 0 {
-				return ErrInvalidLengthCodec
-			}
-			postIndex := iNdEx + msglen
-			if postIndex < 0 {
-				return ErrInvalidLengthCodec
-			}
-			if postIndex > l {
-				return io.ErrUnexpectedEOF
-			}
-			v := &MsgVote{}
-			if err := v.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
-				return err
-			}
-			m.Sum = &MsgCommon_GovVote{v}
-			iNdEx = postIndex
-		default:
-			iNdEx = preIndex
-			skippy, err := skipCodec(dAtA[iNdEx:])
-			if err != nil {
-				return err
-			}
-			if skippy < 0 {
-				return ErrInvalidLengthCodec
-			}
-			if (iNdEx + skippy) < 0 {
-				return ErrInvalidLengthCodec
-			}
-			if (iNdEx + skippy) > l {
-				return io.ErrUnexpectedEOF
-			}
-			iNdEx += skippy
-		}
-	}
-
-	if iNdEx > l {
-		return io.ErrUnexpectedEOF
-	}
-	return nil
-}
 func (m *MsgSubmitProposalBase) Unmarshal(dAtA []byte) error {
 	l := len(dAtA)
 	iNdEx := 0
@@ -1878,7 +1494,7 @@ func (m *MsgSubmitProposalBase) Unmarshal(dAtA []byte) error {
 		var wire uint64
 		for shift := uint(0); ; shift += 7 {
 			if shift >= 64 {
-				return ErrIntOverflowCodec
+				return ErrIntOverflowTypes
 			}
 			if iNdEx >= l {
 				return io.ErrUnexpectedEOF
@@ -1906,7 +1522,7 @@ func (m *MsgSubmitProposalBase) Unmarshal(dAtA []byte) error {
 			var msglen int
 			for shift := uint(0); ; shift += 7 {
 				if shift >= 64 {
-					return ErrIntOverflowCodec
+					return ErrIntOverflowTypes
 				}
 				if iNdEx >= l {
 					return io.ErrUnexpectedEOF
@@ -1919,11 +1535,11 @@ func (m *MsgSubmitProposalBase) Unmarshal(dAtA []byte) error {
 				}
 			}
 			if msglen < 0 {
-				return ErrInvalidLengthCodec
+				return ErrInvalidLengthTypes
 			}
 			postIndex := iNdEx + msglen
 			if postIndex < 0 {
-				return ErrInvalidLengthCodec
+				return ErrInvalidLengthTypes
 			}
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
@@ -1940,7 +1556,7 @@ func (m *MsgSubmitProposalBase) Unmarshal(dAtA []byte) error {
 			var byteLen int
 			for shift := uint(0); ; shift += 7 {
 				if shift >= 64 {
-					return ErrIntOverflowCodec
+					return ErrIntOverflowTypes
 				}
 				if iNdEx >= l {
 					return io.ErrUnexpectedEOF
@@ -1953,11 +1569,11 @@ func (m *MsgSubmitProposalBase) Unmarshal(dAtA []byte) error {
 				}
 			}
 			if byteLen < 0 {
-				return ErrInvalidLengthCodec
+				return ErrInvalidLengthTypes
 			}
 			postIndex := iNdEx + byteLen
 			if postIndex < 0 {
-				return ErrInvalidLengthCodec
+				return ErrInvalidLengthTypes
 			}
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
@@ -1969,15 +1585,15 @@ func (m *MsgSubmitProposalBase) Unmarshal(dAtA []byte) error {
 			iNdEx = postIndex
 		default:
 			iNdEx = preIndex
-			skippy, err := skipCodec(dAtA[iNdEx:])
+			skippy, err := skipTypes(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
 			if skippy < 0 {
-				return ErrInvalidLengthCodec
+				return ErrInvalidLengthTypes
 			}
 			if (iNdEx + skippy) < 0 {
-				return ErrInvalidLengthCodec
+				return ErrInvalidLengthTypes
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
@@ -1999,7 +1615,7 @@ func (m *MsgDeposit) Unmarshal(dAtA []byte) error {
 		var wire uint64
 		for shift := uint(0); ; shift += 7 {
 			if shift >= 64 {
-				return ErrIntOverflowCodec
+				return ErrIntOverflowTypes
 			}
 			if iNdEx >= l {
 				return io.ErrUnexpectedEOF
@@ -2027,7 +1643,7 @@ func (m *MsgDeposit) Unmarshal(dAtA []byte) error {
 			m.ProposalID = 0
 			for shift := uint(0); ; shift += 7 {
 				if shift >= 64 {
-					return ErrIntOverflowCodec
+					return ErrIntOverflowTypes
 				}
 				if iNdEx >= l {
 					return io.ErrUnexpectedEOF
@@ -2046,7 +1662,7 @@ func (m *MsgDeposit) Unmarshal(dAtA []byte) error {
 			var byteLen int
 			for shift := uint(0); ; shift += 7 {
 				if shift >= 64 {
-					return ErrIntOverflowCodec
+					return ErrIntOverflowTypes
 				}
 				if iNdEx >= l {
 					return io.ErrUnexpectedEOF
@@ -2059,11 +1675,11 @@ func (m *MsgDeposit) Unmarshal(dAtA []byte) error {
 				}
 			}
 			if byteLen < 0 {
-				return ErrInvalidLengthCodec
+				return ErrInvalidLengthTypes
 			}
 			postIndex := iNdEx + byteLen
 			if postIndex < 0 {
-				return ErrInvalidLengthCodec
+				return ErrInvalidLengthTypes
 			}
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
@@ -2080,7 +1696,7 @@ func (m *MsgDeposit) Unmarshal(dAtA []byte) error {
 			var msglen int
 			for shift := uint(0); ; shift += 7 {
 				if shift >= 64 {
-					return ErrIntOverflowCodec
+					return ErrIntOverflowTypes
 				}
 				if iNdEx >= l {
 					return io.ErrUnexpectedEOF
@@ -2093,11 +1709,11 @@ func (m *MsgDeposit) Unmarshal(dAtA []byte) error {
 				}
 			}
 			if msglen < 0 {
-				return ErrInvalidLengthCodec
+				return ErrInvalidLengthTypes
 			}
 			postIndex := iNdEx + msglen
 			if postIndex < 0 {
-				return ErrInvalidLengthCodec
+				return ErrInvalidLengthTypes
 			}
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
@@ -2109,15 +1725,15 @@ func (m *MsgDeposit) Unmarshal(dAtA []byte) error {
 			iNdEx = postIndex
 		default:
 			iNdEx = preIndex
-			skippy, err := skipCodec(dAtA[iNdEx:])
+			skippy, err := skipTypes(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
 			if skippy < 0 {
-				return ErrInvalidLengthCodec
+				return ErrInvalidLengthTypes
 			}
 			if (iNdEx + skippy) < 0 {
-				return ErrInvalidLengthCodec
+				return ErrInvalidLengthTypes
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
@@ -2139,7 +1755,7 @@ func (m *MsgVote) Unmarshal(dAtA []byte) error {
 		var wire uint64
 		for shift := uint(0); ; shift += 7 {
 			if shift >= 64 {
-				return ErrIntOverflowCodec
+				return ErrIntOverflowTypes
 			}
 			if iNdEx >= l {
 				return io.ErrUnexpectedEOF
@@ -2167,7 +1783,7 @@ func (m *MsgVote) Unmarshal(dAtA []byte) error {
 			m.ProposalID = 0
 			for shift := uint(0); ; shift += 7 {
 				if shift >= 64 {
-					return ErrIntOverflowCodec
+					return ErrIntOverflowTypes
 				}
 				if iNdEx >= l {
 					return io.ErrUnexpectedEOF
@@ -2186,7 +1802,7 @@ func (m *MsgVote) Unmarshal(dAtA []byte) error {
 			var byteLen int
 			for shift := uint(0); ; shift += 7 {
 				if shift >= 64 {
-					return ErrIntOverflowCodec
+					return ErrIntOverflowTypes
 				}
 				if iNdEx >= l {
 					return io.ErrUnexpectedEOF
@@ -2199,11 +1815,11 @@ func (m *MsgVote) Unmarshal(dAtA []byte) error {
 				}
 			}
 			if byteLen < 0 {
-				return ErrInvalidLengthCodec
+				return ErrInvalidLengthTypes
 			}
 			postIndex := iNdEx + byteLen
 			if postIndex < 0 {
-				return ErrInvalidLengthCodec
+				return ErrInvalidLengthTypes
 			}
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
@@ -2220,7 +1836,7 @@ func (m *MsgVote) Unmarshal(dAtA []byte) error {
 			m.Option = 0
 			for shift := uint(0); ; shift += 7 {
 				if shift >= 64 {
-					return ErrIntOverflowCodec
+					return ErrIntOverflowTypes
 				}
 				if iNdEx >= l {
 					return io.ErrUnexpectedEOF
@@ -2234,15 +1850,15 @@ func (m *MsgVote) Unmarshal(dAtA []byte) error {
 			}
 		default:
 			iNdEx = preIndex
-			skippy, err := skipCodec(dAtA[iNdEx:])
+			skippy, err := skipTypes(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
 			if skippy < 0 {
-				return ErrInvalidLengthCodec
+				return ErrInvalidLengthTypes
 			}
 			if (iNdEx + skippy) < 0 {
-				return ErrInvalidLengthCodec
+				return ErrInvalidLengthTypes
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
@@ -2264,7 +1880,7 @@ func (m *TextProposal) Unmarshal(dAtA []byte) error {
 		var wire uint64
 		for shift := uint(0); ; shift += 7 {
 			if shift >= 64 {
-				return ErrIntOverflowCodec
+				return ErrIntOverflowTypes
 			}
 			if iNdEx >= l {
 				return io.ErrUnexpectedEOF
@@ -2292,7 +1908,7 @@ func (m *TextProposal) Unmarshal(dAtA []byte) error {
 			var stringLen uint64
 			for shift := uint(0); ; shift += 7 {
 				if shift >= 64 {
-					return ErrIntOverflowCodec
+					return ErrIntOverflowTypes
 				}
 				if iNdEx >= l {
 					return io.ErrUnexpectedEOF
@@ -2306,11 +1922,11 @@ func (m *TextProposal) Unmarshal(dAtA []byte) error {
 			}
 			intStringLen := int(stringLen)
 			if intStringLen < 0 {
-				return ErrInvalidLengthCodec
+				return ErrInvalidLengthTypes
 			}
 			postIndex := iNdEx + intStringLen
 			if postIndex < 0 {
-				return ErrInvalidLengthCodec
+				return ErrInvalidLengthTypes
 			}
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
@@ -2324,7 +1940,7 @@ func (m *TextProposal) Unmarshal(dAtA []byte) error {
 			var stringLen uint64
 			for shift := uint(0); ; shift += 7 {
 				if shift >= 64 {
-					return ErrIntOverflowCodec
+					return ErrIntOverflowTypes
 				}
 				if iNdEx >= l {
 					return io.ErrUnexpectedEOF
@@ -2338,11 +1954,11 @@ func (m *TextProposal) Unmarshal(dAtA []byte) error {
 			}
 			intStringLen := int(stringLen)
 			if intStringLen < 0 {
-				return ErrInvalidLengthCodec
+				return ErrInvalidLengthTypes
 			}
 			postIndex := iNdEx + intStringLen
 			if postIndex < 0 {
-				return ErrInvalidLengthCodec
+				return ErrInvalidLengthTypes
 			}
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
@@ -2351,15 +1967,15 @@ func (m *TextProposal) Unmarshal(dAtA []byte) error {
 			iNdEx = postIndex
 		default:
 			iNdEx = preIndex
-			skippy, err := skipCodec(dAtA[iNdEx:])
+			skippy, err := skipTypes(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
 			if skippy < 0 {
-				return ErrInvalidLengthCodec
+				return ErrInvalidLengthTypes
 			}
 			if (iNdEx + skippy) < 0 {
-				return ErrInvalidLengthCodec
+				return ErrInvalidLengthTypes
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
@@ -2381,7 +1997,7 @@ func (m *Deposit) Unmarshal(dAtA []byte) error {
 		var wire uint64
 		for shift := uint(0); ; shift += 7 {
 			if shift >= 64 {
-				return ErrIntOverflowCodec
+				return ErrIntOverflowTypes
 			}
 			if iNdEx >= l {
 				return io.ErrUnexpectedEOF
@@ -2409,7 +2025,7 @@ func (m *Deposit) Unmarshal(dAtA []byte) error {
 			m.ProposalID = 0
 			for shift := uint(0); ; shift += 7 {
 				if shift >= 64 {
-					return ErrIntOverflowCodec
+					return ErrIntOverflowTypes
 				}
 				if iNdEx >= l {
 					return io.ErrUnexpectedEOF
@@ -2428,7 +2044,7 @@ func (m *Deposit) Unmarshal(dAtA []byte) error {
 			var byteLen int
 			for shift := uint(0); ; shift += 7 {
 				if shift >= 64 {
-					return ErrIntOverflowCodec
+					return ErrIntOverflowTypes
 				}
 				if iNdEx >= l {
 					return io.ErrUnexpectedEOF
@@ -2441,11 +2057,11 @@ func (m *Deposit) Unmarshal(dAtA []byte) error {
 				}
 			}
 			if byteLen < 0 {
-				return ErrInvalidLengthCodec
+				return ErrInvalidLengthTypes
 			}
 			postIndex := iNdEx + byteLen
 			if postIndex < 0 {
-				return ErrInvalidLengthCodec
+				return ErrInvalidLengthTypes
 			}
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
@@ -2462,7 +2078,7 @@ func (m *Deposit) Unmarshal(dAtA []byte) error {
 			var msglen int
 			for shift := uint(0); ; shift += 7 {
 				if shift >= 64 {
-					return ErrIntOverflowCodec
+					return ErrIntOverflowTypes
 				}
 				if iNdEx >= l {
 					return io.ErrUnexpectedEOF
@@ -2475,11 +2091,11 @@ func (m *Deposit) Unmarshal(dAtA []byte) error {
 				}
 			}
 			if msglen < 0 {
-				return ErrInvalidLengthCodec
+				return ErrInvalidLengthTypes
 			}
 			postIndex := iNdEx + msglen
 			if postIndex < 0 {
-				return ErrInvalidLengthCodec
+				return ErrInvalidLengthTypes
 			}
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
@@ -2491,15 +2107,15 @@ func (m *Deposit) Unmarshal(dAtA []byte) error {
 			iNdEx = postIndex
 		default:
 			iNdEx = preIndex
-			skippy, err := skipCodec(dAtA[iNdEx:])
+			skippy, err := skipTypes(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
 			if skippy < 0 {
-				return ErrInvalidLengthCodec
+				return ErrInvalidLengthTypes
 			}
 			if (iNdEx + skippy) < 0 {
-				return ErrInvalidLengthCodec
+				return ErrInvalidLengthTypes
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
@@ -2521,7 +2137,7 @@ func (m *ProposalBase) Unmarshal(dAtA []byte) error {
 		var wire uint64
 		for shift := uint(0); ; shift += 7 {
 			if shift >= 64 {
-				return ErrIntOverflowCodec
+				return ErrIntOverflowTypes
 			}
 			if iNdEx >= l {
 				return io.ErrUnexpectedEOF
@@ -2549,7 +2165,7 @@ func (m *ProposalBase) Unmarshal(dAtA []byte) error {
 			m.ProposalID = 0
 			for shift := uint(0); ; shift += 7 {
 				if shift >= 64 {
-					return ErrIntOverflowCodec
+					return ErrIntOverflowTypes
 				}
 				if iNdEx >= l {
 					return io.ErrUnexpectedEOF
@@ -2568,7 +2184,7 @@ func (m *ProposalBase) Unmarshal(dAtA []byte) error {
 			m.Status = 0
 			for shift := uint(0); ; shift += 7 {
 				if shift >= 64 {
-					return ErrIntOverflowCodec
+					return ErrIntOverflowTypes
 				}
 				if iNdEx >= l {
 					return io.ErrUnexpectedEOF
@@ -2587,7 +2203,7 @@ func (m *ProposalBase) Unmarshal(dAtA []byte) error {
 			var msglen int
 			for shift := uint(0); ; shift += 7 {
 				if shift >= 64 {
-					return ErrIntOverflowCodec
+					return ErrIntOverflowTypes
 				}
 				if iNdEx >= l {
 					return io.ErrUnexpectedEOF
@@ -2600,11 +2216,11 @@ func (m *ProposalBase) Unmarshal(dAtA []byte) error {
 				}
 			}
 			if msglen < 0 {
-				return ErrInvalidLengthCodec
+				return ErrInvalidLengthTypes
 			}
 			postIndex := iNdEx + msglen
 			if postIndex < 0 {
-				return ErrInvalidLengthCodec
+				return ErrInvalidLengthTypes
 			}
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
@@ -2620,7 +2236,7 @@ func (m *ProposalBase) Unmarshal(dAtA []byte) error {
 			var msglen int
 			for shift := uint(0); ; shift += 7 {
 				if shift >= 64 {
-					return ErrIntOverflowCodec
+					return ErrIntOverflowTypes
 				}
 				if iNdEx >= l {
 					return io.ErrUnexpectedEOF
@@ -2633,11 +2249,11 @@ func (m *ProposalBase) Unmarshal(dAtA []byte) error {
 				}
 			}
 			if msglen < 0 {
-				return ErrInvalidLengthCodec
+				return ErrInvalidLengthTypes
 			}
 			postIndex := iNdEx + msglen
 			if postIndex < 0 {
-				return ErrInvalidLengthCodec
+				return ErrInvalidLengthTypes
 			}
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
@@ -2653,7 +2269,7 @@ func (m *ProposalBase) Unmarshal(dAtA []byte) error {
 			var msglen int
 			for shift := uint(0); ; shift += 7 {
 				if shift >= 64 {
-					return ErrIntOverflowCodec
+					return ErrIntOverflowTypes
 				}
 				if iNdEx >= l {
 					return io.ErrUnexpectedEOF
@@ -2666,11 +2282,11 @@ func (m *ProposalBase) Unmarshal(dAtA []byte) error {
 				}
 			}
 			if msglen < 0 {
-				return ErrInvalidLengthCodec
+				return ErrInvalidLengthTypes
 			}
 			postIndex := iNdEx + msglen
 			if postIndex < 0 {
-				return ErrInvalidLengthCodec
+				return ErrInvalidLengthTypes
 			}
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
@@ -2686,7 +2302,7 @@ func (m *ProposalBase) Unmarshal(dAtA []byte) error {
 			var msglen int
 			for shift := uint(0); ; shift += 7 {
 				if shift >= 64 {
-					return ErrIntOverflowCodec
+					return ErrIntOverflowTypes
 				}
 				if iNdEx >= l {
 					return io.ErrUnexpectedEOF
@@ -2699,11 +2315,11 @@ func (m *ProposalBase) Unmarshal(dAtA []byte) error {
 				}
 			}
 			if msglen < 0 {
-				return ErrInvalidLengthCodec
+				return ErrInvalidLengthTypes
 			}
 			postIndex := iNdEx + msglen
 			if postIndex < 0 {
-				return ErrInvalidLengthCodec
+				return ErrInvalidLengthTypes
 			}
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
@@ -2720,7 +2336,7 @@ func (m *ProposalBase) Unmarshal(dAtA []byte) error {
 			var msglen int
 			for shift := uint(0); ; shift += 7 {
 				if shift >= 64 {
-					return ErrIntOverflowCodec
+					return ErrIntOverflowTypes
 				}
 				if iNdEx >= l {
 					return io.ErrUnexpectedEOF
@@ -2733,11 +2349,11 @@ func (m *ProposalBase) Unmarshal(dAtA []byte) error {
 				}
 			}
 			if msglen < 0 {
-				return ErrInvalidLengthCodec
+				return ErrInvalidLengthTypes
 			}
 			postIndex := iNdEx + msglen
 			if postIndex < 0 {
-				return ErrInvalidLengthCodec
+				return ErrInvalidLengthTypes
 			}
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
@@ -2753,7 +2369,7 @@ func (m *ProposalBase) Unmarshal(dAtA []byte) error {
 			var msglen int
 			for shift := uint(0); ; shift += 7 {
 				if shift >= 64 {
-					return ErrIntOverflowCodec
+					return ErrIntOverflowTypes
 				}
 				if iNdEx >= l {
 					return io.ErrUnexpectedEOF
@@ -2766,11 +2382,11 @@ func (m *ProposalBase) Unmarshal(dAtA []byte) error {
 				}
 			}
 			if msglen < 0 {
-				return ErrInvalidLengthCodec
+				return ErrInvalidLengthTypes
 			}
 			postIndex := iNdEx + msglen
 			if postIndex < 0 {
-				return ErrInvalidLengthCodec
+				return ErrInvalidLengthTypes
 			}
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
@@ -2781,15 +2397,15 @@ func (m *ProposalBase) Unmarshal(dAtA []byte) error {
 			iNdEx = postIndex
 		default:
 			iNdEx = preIndex
-			skippy, err := skipCodec(dAtA[iNdEx:])
+			skippy, err := skipTypes(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
 			if skippy < 0 {
-				return ErrInvalidLengthCodec
+				return ErrInvalidLengthTypes
 			}
 			if (iNdEx + skippy) < 0 {
-				return ErrInvalidLengthCodec
+				return ErrInvalidLengthTypes
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
@@ -2811,7 +2427,7 @@ func (m *TallyResult) Unmarshal(dAtA []byte) error {
 		var wire uint64
 		for shift := uint(0); ; shift += 7 {
 			if shift >= 64 {
-				return ErrIntOverflowCodec
+				return ErrIntOverflowTypes
 			}
 			if iNdEx >= l {
 				return io.ErrUnexpectedEOF
@@ -2839,7 +2455,7 @@ func (m *TallyResult) Unmarshal(dAtA []byte) error {
 			var byteLen int
 			for shift := uint(0); ; shift += 7 {
 				if shift >= 64 {
-					return ErrIntOverflowCodec
+					return ErrIntOverflowTypes
 				}
 				if iNdEx >= l {
 					return io.ErrUnexpectedEOF
@@ -2852,11 +2468,11 @@ func (m *TallyResult) Unmarshal(dAtA []byte) error {
 				}
 			}
 			if byteLen < 0 {
-				return ErrInvalidLengthCodec
+				return ErrInvalidLengthTypes
 			}
 			postIndex := iNdEx + byteLen
 			if postIndex < 0 {
-				return ErrInvalidLengthCodec
+				return ErrInvalidLengthTypes
 			}
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
@@ -2872,7 +2488,7 @@ func (m *TallyResult) Unmarshal(dAtA []byte) error {
 			var byteLen int
 			for shift := uint(0); ; shift += 7 {
 				if shift >= 64 {
-					return ErrIntOverflowCodec
+					return ErrIntOverflowTypes
 				}
 				if iNdEx >= l {
 					return io.ErrUnexpectedEOF
@@ -2885,11 +2501,11 @@ func (m *TallyResult) Unmarshal(dAtA []byte) error {
 				}
 			}
 			if byteLen < 0 {
-				return ErrInvalidLengthCodec
+				return ErrInvalidLengthTypes
 			}
 			postIndex := iNdEx + byteLen
 			if postIndex < 0 {
-				return ErrInvalidLengthCodec
+				return ErrInvalidLengthTypes
 			}
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
@@ -2905,7 +2521,7 @@ func (m *TallyResult) Unmarshal(dAtA []byte) error {
 			var byteLen int
 			for shift := uint(0); ; shift += 7 {
 				if shift >= 64 {
-					return ErrIntOverflowCodec
+					return ErrIntOverflowTypes
 				}
 				if iNdEx >= l {
 					return io.ErrUnexpectedEOF
@@ -2918,11 +2534,11 @@ func (m *TallyResult) Unmarshal(dAtA []byte) error {
 				}
 			}
 			if byteLen < 0 {
-				return ErrInvalidLengthCodec
+				return ErrInvalidLengthTypes
 			}
 			postIndex := iNdEx + byteLen
 			if postIndex < 0 {
-				return ErrInvalidLengthCodec
+				return ErrInvalidLengthTypes
 			}
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
@@ -2938,7 +2554,7 @@ func (m *TallyResult) Unmarshal(dAtA []byte) error {
 			var byteLen int
 			for shift := uint(0); ; shift += 7 {
 				if shift >= 64 {
-					return ErrIntOverflowCodec
+					return ErrIntOverflowTypes
 				}
 				if iNdEx >= l {
 					return io.ErrUnexpectedEOF
@@ -2951,11 +2567,11 @@ func (m *TallyResult) Unmarshal(dAtA []byte) error {
 				}
 			}
 			if byteLen < 0 {
-				return ErrInvalidLengthCodec
+				return ErrInvalidLengthTypes
 			}
 			postIndex := iNdEx + byteLen
 			if postIndex < 0 {
-				return ErrInvalidLengthCodec
+				return ErrInvalidLengthTypes
 			}
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
@@ -2966,15 +2582,15 @@ func (m *TallyResult) Unmarshal(dAtA []byte) error {
 			iNdEx = postIndex
 		default:
 			iNdEx = preIndex
-			skippy, err := skipCodec(dAtA[iNdEx:])
+			skippy, err := skipTypes(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
 			if skippy < 0 {
-				return ErrInvalidLengthCodec
+				return ErrInvalidLengthTypes
 			}
 			if (iNdEx + skippy) < 0 {
-				return ErrInvalidLengthCodec
+				return ErrInvalidLengthTypes
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
@@ -2996,7 +2612,7 @@ func (m *Vote) Unmarshal(dAtA []byte) error {
 		var wire uint64
 		for shift := uint(0); ; shift += 7 {
 			if shift >= 64 {
-				return ErrIntOverflowCodec
+				return ErrIntOverflowTypes
 			}
 			if iNdEx >= l {
 				return io.ErrUnexpectedEOF
@@ -3024,7 +2640,7 @@ func (m *Vote) Unmarshal(dAtA []byte) error {
 			m.ProposalID = 0
 			for shift := uint(0); ; shift += 7 {
 				if shift >= 64 {
-					return ErrIntOverflowCodec
+					return ErrIntOverflowTypes
 				}
 				if iNdEx >= l {
 					return io.ErrUnexpectedEOF
@@ -3043,7 +2659,7 @@ func (m *Vote) Unmarshal(dAtA []byte) error {
 			var byteLen int
 			for shift := uint(0); ; shift += 7 {
 				if shift >= 64 {
-					return ErrIntOverflowCodec
+					return ErrIntOverflowTypes
 				}
 				if iNdEx >= l {
 					return io.ErrUnexpectedEOF
@@ -3056,11 +2672,11 @@ func (m *Vote) Unmarshal(dAtA []byte) error {
 				}
 			}
 			if byteLen < 0 {
-				return ErrInvalidLengthCodec
+				return ErrInvalidLengthTypes
 			}
 			postIndex := iNdEx + byteLen
 			if postIndex < 0 {
-				return ErrInvalidLengthCodec
+				return ErrInvalidLengthTypes
 			}
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
@@ -3077,7 +2693,7 @@ func (m *Vote) Unmarshal(dAtA []byte) error {
 			m.Option = 0
 			for shift := uint(0); ; shift += 7 {
 				if shift >= 64 {
-					return ErrIntOverflowCodec
+					return ErrIntOverflowTypes
 				}
 				if iNdEx >= l {
 					return io.ErrUnexpectedEOF
@@ -3091,15 +2707,15 @@ func (m *Vote) Unmarshal(dAtA []byte) error {
 			}
 		default:
 			iNdEx = preIndex
-			skippy, err := skipCodec(dAtA[iNdEx:])
+			skippy, err := skipTypes(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
 			if skippy < 0 {
-				return ErrInvalidLengthCodec
+				return ErrInvalidLengthTypes
 			}
 			if (iNdEx + skippy) < 0 {
-				return ErrInvalidLengthCodec
+				return ErrInvalidLengthTypes
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
@@ -3121,7 +2737,7 @@ func (m *BasicProposal) Unmarshal(dAtA []byte) error {
 		var wire uint64
 		for shift := uint(0); ; shift += 7 {
 			if shift >= 64 {
-				return ErrIntOverflowCodec
+				return ErrIntOverflowTypes
 			}
 			if iNdEx >= l {
 				return io.ErrUnexpectedEOF
@@ -3149,7 +2765,7 @@ func (m *BasicProposal) Unmarshal(dAtA []byte) error {
 			var msglen int
 			for shift := uint(0); ; shift += 7 {
 				if shift >= 64 {
-					return ErrIntOverflowCodec
+					return ErrIntOverflowTypes
 				}
 				if iNdEx >= l {
 					return io.ErrUnexpectedEOF
@@ -3162,11 +2778,11 @@ func (m *BasicProposal) Unmarshal(dAtA []byte) error {
 				}
 			}
 			if msglen < 0 {
-				return ErrInvalidLengthCodec
+				return ErrInvalidLengthTypes
 			}
 			postIndex := iNdEx + msglen
 			if postIndex < 0 {
-				return ErrInvalidLengthCodec
+				return ErrInvalidLengthTypes
 			}
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
@@ -3185,7 +2801,7 @@ func (m *BasicProposal) Unmarshal(dAtA []byte) error {
 			var msglen int
 			for shift := uint(0); ; shift += 7 {
 				if shift >= 64 {
-					return ErrIntOverflowCodec
+					return ErrIntOverflowTypes
 				}
 				if iNdEx >= l {
 					return io.ErrUnexpectedEOF
@@ -3198,11 +2814,11 @@ func (m *BasicProposal) Unmarshal(dAtA []byte) error {
 				}
 			}
 			if msglen < 0 {
-				return ErrInvalidLengthCodec
+				return ErrInvalidLengthTypes
 			}
 			postIndex := iNdEx + msglen
 			if postIndex < 0 {
-				return ErrInvalidLengthCodec
+				return ErrInvalidLengthTypes
 			}
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
@@ -3216,15 +2832,15 @@ func (m *BasicProposal) Unmarshal(dAtA []byte) error {
 			iNdEx = postIndex
 		default:
 			iNdEx = preIndex
-			skippy, err := skipCodec(dAtA[iNdEx:])
+			skippy, err := skipTypes(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
 			if skippy < 0 {
-				return ErrInvalidLengthCodec
+				return ErrInvalidLengthTypes
 			}
 			if (iNdEx + skippy) < 0 {
-				return ErrInvalidLengthCodec
+				return ErrInvalidLengthTypes
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
@@ -3246,7 +2862,7 @@ func (m *BasicContent) Unmarshal(dAtA []byte) error {
 		var wire uint64
 		for shift := uint(0); ; shift += 7 {
 			if shift >= 64 {
-				return ErrIntOverflowCodec
+				return ErrIntOverflowTypes
 			}
 			if iNdEx >= l {
 				return io.ErrUnexpectedEOF
@@ -3274,7 +2890,7 @@ func (m *BasicContent) Unmarshal(dAtA []byte) error {
 			var msglen int
 			for shift := uint(0); ; shift += 7 {
 				if shift >= 64 {
-					return ErrIntOverflowCodec
+					return ErrIntOverflowTypes
 				}
 				if iNdEx >= l {
 					return io.ErrUnexpectedEOF
@@ -3287,11 +2903,11 @@ func (m *BasicContent) Unmarshal(dAtA []byte) error {
 				}
 			}
 			if msglen < 0 {
-				return ErrInvalidLengthCodec
+				return ErrInvalidLengthTypes
 			}
 			postIndex := iNdEx + msglen
 			if postIndex < 0 {
-				return ErrInvalidLengthCodec
+				return ErrInvalidLengthTypes
 			}
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
@@ -3304,15 +2920,15 @@ func (m *BasicContent) Unmarshal(dAtA []byte) error {
 			iNdEx = postIndex
 		default:
 			iNdEx = preIndex
-			skippy, err := skipCodec(dAtA[iNdEx:])
+			skippy, err := skipTypes(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
 			if skippy < 0 {
-				return ErrInvalidLengthCodec
+				return ErrInvalidLengthTypes
 			}
 			if (iNdEx + skippy) < 0 {
-				return ErrInvalidLengthCodec
+				return ErrInvalidLengthTypes
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
@@ -3326,7 +2942,7 @@ func (m *BasicContent) Unmarshal(dAtA []byte) error {
 	}
 	return nil
 }
-func skipCodec(dAtA []byte) (n int, err error) {
+func skipTypes(dAtA []byte) (n int, err error) {
 	l := len(dAtA)
 	iNdEx := 0
 	depth := 0
@@ -3334,7 +2950,7 @@ func skipCodec(dAtA []byte) (n int, err error) {
 		var wire uint64
 		for shift := uint(0); ; shift += 7 {
 			if shift >= 64 {
-				return 0, ErrIntOverflowCodec
+				return 0, ErrIntOverflowTypes
 			}
 			if iNdEx >= l {
 				return 0, io.ErrUnexpectedEOF
@@ -3351,7 +2967,7 @@ func skipCodec(dAtA []byte) (n int, err error) {
 		case 0:
 			for shift := uint(0); ; shift += 7 {
 				if shift >= 64 {
-					return 0, ErrIntOverflowCodec
+					return 0, ErrIntOverflowTypes
 				}
 				if iNdEx >= l {
 					return 0, io.ErrUnexpectedEOF
@@ -3367,7 +2983,7 @@ func skipCodec(dAtA []byte) (n int, err error) {
 			var length int
 			for shift := uint(0); ; shift += 7 {
 				if shift >= 64 {
-					return 0, ErrIntOverflowCodec
+					return 0, ErrIntOverflowTypes
 				}
 				if iNdEx >= l {
 					return 0, io.ErrUnexpectedEOF
@@ -3380,14 +2996,14 @@ func skipCodec(dAtA []byte) (n int, err error) {
 				}
 			}
 			if length < 0 {
-				return 0, ErrInvalidLengthCodec
+				return 0, ErrInvalidLengthTypes
 			}
 			iNdEx += length
 		case 3:
 			depth++
 		case 4:
 			if depth == 0 {
-				return 0, ErrUnexpectedEndOfGroupCodec
+				return 0, ErrUnexpectedEndOfGroupTypes
 			}
 			depth--
 		case 5:
@@ -3396,7 +3012,7 @@ func skipCodec(dAtA []byte) (n int, err error) {
 			return 0, fmt.Errorf("proto: illegal wireType %d", wireType)
 		}
 		if iNdEx < 0 {
-			return 0, ErrInvalidLengthCodec
+			return 0, ErrInvalidLengthTypes
 		}
 		if depth == 0 {
 			return iNdEx, nil
@@ -3406,7 +3022,7 @@ func skipCodec(dAtA []byte) (n int, err error) {
 }
 
 var (
-	ErrInvalidLengthCodec        = fmt.Errorf("proto: negative length found during unmarshaling")
-	ErrIntOverflowCodec          = fmt.Errorf("proto: integer overflow")
-	ErrUnexpectedEndOfGroupCodec = fmt.Errorf("proto: unexpected end of group")
+	ErrInvalidLengthTypes        = fmt.Errorf("proto: negative length found during unmarshaling")
+	ErrIntOverflowTypes          = fmt.Errorf("proto: integer overflow")
+	ErrUnexpectedEndOfGroupTypes = fmt.Errorf("proto: unexpected end of group")
 )
diff --git a/x/gov/types/codec.proto b/x/gov/types/types.proto
similarity index 100%
rename from x/gov/types/codec.proto
rename to x/gov/types/types.proto