Migrate missing `x/distribution` CLI queries to proto (#7244)

* migrate CommunityPoolSpendProposalJSON to proto

* migrate NewWithdrawAllRewardsCmd to proto

* fix ineffectual issue

* refactor

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>

proto/cosmos/distribution/v1beta1/distribution.proto

@@ -152,3 +152,15 @@ message DelegationDelegatorReward {
     (gogoproto.nullable)     = false
   ];
 }
+
+// CommunityPoolSpendProposalWithDeposit defines a CommunityPoolSpendProposal with a deposit
+message CommunityPoolSpendProposalWithDeposit {
+  string title = 1 [(gogoproto.moretags) = "yaml:\"title\""];
+  string description = 2 [(gogoproto.moretags) = "yaml:\"description\""];
+  bytes recipient = 3 [
+    (gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress",
+    (gogoproto.moretags) = "yaml:\"recipient\""
+  ];
+  string amount = 4 [(gogoproto.moretags) = "yaml:\"amount\""];
+  string deposit = 5 [(gogoproto.moretags) = "yaml:\"deposit\""];
+}

x/distribution/client/cli/tx.go

@@ -1,6 +1,7 @@
 package cli
 
 import (
+	"context"
 	"fmt"
 	"strings"
 
@@ -12,7 +13,6 @@ import (
 	"github.com/cosmos/cosmos-sdk/client/tx"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/version"
-	"github.com/cosmos/cosmos-sdk/x/distribution/client/common"
 	"github.com/cosmos/cosmos-sdk/x/distribution/types"
 	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
 )
@@ -158,11 +158,23 @@ $ %s tx distribution withdraw-all-rewards --from mykey
 				return fmt.Errorf("cannot generate tx in offline mode")
 			}
 
-			msgs, err := common.WithdrawAllDelegatorRewards(clientCtx, delAddr)
+			queryClient := types.NewQueryClient(clientCtx)
+			delValsRes, err := queryClient.DelegatorValidators(context.Background(), &types.QueryDelegatorValidatorsRequest{DelegatorAddress: delAddr})
 			if err != nil {
 				return err
 			}
 
+			validators := delValsRes.Validators
+			// build multi-message transaction
+			msgs := make([]sdk.Msg, 0, len(validators))
+			for _, valAddr := range validators {
+				msg := types.NewMsgWithdrawDelegatorReward(delAddr, valAddr)
+				if err := msg.ValidateBasic(); err != nil {
+					return err
+				}
+				msgs = append(msgs, msg)
+			}
+
 			chunkSize, _ := cmd.Flags().GetInt(FlagMaxMessagesPerTx)
 			return newSplitAndApply(tx.GenerateOrBroadcastTxCLI, clientCtx, cmd.Flags(), msgs, chunkSize)
 		},
@@ -293,7 +305,7 @@ Where proposal.json contains:
 				return err
 			}
 
-			proposal, err := ParseCommunityPoolSpendProposalJSON(clientCtx.LegacyAmino, args[0])
+			proposal, err := ParseCommunityPoolSpendProposalWithDeposit(clientCtx.JSONMarshaler, args[0])
 			if err != nil {
 				return err
 			}

x/distribution/client/cli/tx_test.go

@@ -6,6 +6,7 @@ import (
 	"github.com/spf13/pflag"
 
 	"github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1"
+	"github.com/cosmos/cosmos-sdk/simapp/params"
 	"github.com/cosmos/cosmos-sdk/testutil"
 	"github.com/cosmos/cosmos-sdk/testutil/testdata"
 
@@ -14,7 +15,6 @@ import (
 	"github.com/stretchr/testify/assert"
 
 	"github.com/cosmos/cosmos-sdk/client"
-	"github.com/cosmos/cosmos-sdk/codec"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
 
@@ -65,7 +65,8 @@ func Test_splitAndCall_Splitting(t *testing.T) {
 }
 
 func TestParseProposal(t *testing.T) {
-	cdc := codec.New()
+	encodingConfig := params.MakeEncodingConfig()
+
 	okJSON, cleanup := testutil.WriteToNewTempFile(t, `
 {
   "title": "Community Pool Spend",
@@ -77,7 +78,7 @@ func TestParseProposal(t *testing.T) {
 `)
 	t.Cleanup(cleanup)
 
-	proposal, err := ParseCommunityPoolSpendProposalJSON(cdc, okJSON.Name())
+	proposal, err := ParseCommunityPoolSpendProposalWithDeposit(encodingConfig.Marshaler, okJSON.Name())
 	require.NoError(t, err)
 
 	addr, err := sdk.AccAddressFromBech32("cosmos1s5afhd6gxevu37mkqcvvsj8qeylhn0rz46zdlq")

x/distribution/client/cli/utils.go

@@ -4,24 +4,12 @@ import (
 	"io/ioutil"
 
 	"github.com/cosmos/cosmos-sdk/codec"
-	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/cosmos/cosmos-sdk/x/distribution/types"
 )
 
-type (
+// ParseCommunityPoolSpendProposalWithDeposit reads and parses a CommunityPoolSpendProposalWithDeposit from a file.
-	// CommunityPoolSpendProposalJSON defines a CommunityPoolSpendProposal with a deposit
+func ParseCommunityPoolSpendProposalWithDeposit(cdc codec.JSONMarshaler, proposalFile string) (types.CommunityPoolSpendProposalWithDeposit, error) {
-	CommunityPoolSpendProposalJSON struct {
+	proposal := types.CommunityPoolSpendProposalWithDeposit{}
-		Title       string         `json:"title" yaml:"title"`
-		Description string         `json:"description" yaml:"description"`
-		Recipient   sdk.AccAddress `json:"recipient" yaml:"recipient"`
-		Amount      string         `json:"amount" yaml:"amount"`
-		Deposit     string         `json:"deposit" yaml:"deposit"`
-	}
-)
-
-// ParseCommunityPoolSpendProposalJSON reads and parses a CommunityPoolSpendProposalJSON from a file.
-// TODO: migrate this to protobuf
-func ParseCommunityPoolSpendProposalJSON(cdc *codec.LegacyAmino, proposalFile string) (CommunityPoolSpendProposalJSON, error) {
-	proposal := CommunityPoolSpendProposalJSON{}
 
 	contents, err := ioutil.ReadFile(proposalFile)
 	if err != nil {

x/distribution/types/distribution.pb.go

@@ -577,6 +577,83 @@ func (m *DelegationDelegatorReward) GetReward() github_com_cosmos_cosmos_sdk_typ
 	return nil
 }
 
+// CommunityPoolSpendProposalWithDeposit defines a CommunityPoolSpendProposal with a deposit
+type CommunityPoolSpendProposalWithDeposit struct {
+	Title       string                                        `protobuf:"bytes,1,opt,name=title,proto3" json:"title,omitempty" yaml:"title"`
+	Description string                                        `protobuf:"bytes,2,opt,name=description,proto3" json:"description,omitempty" yaml:"description"`
+	Recipient   github_com_cosmos_cosmos_sdk_types.AccAddress `protobuf:"bytes,3,opt,name=recipient,proto3,casttype=github.com/cosmos/cosmos-sdk/types.AccAddress" json:"recipient,omitempty" yaml:"recipient"`
+	Amount      string                                        `protobuf:"bytes,4,opt,name=amount,proto3" json:"amount,omitempty" yaml:"amount"`
+	Deposit     string                                        `protobuf:"bytes,5,opt,name=deposit,proto3" json:"deposit,omitempty" yaml:"deposit"`
+}
+
+func (m *CommunityPoolSpendProposalWithDeposit) Reset()         { *m = CommunityPoolSpendProposalWithDeposit{} }
+func (m *CommunityPoolSpendProposalWithDeposit) String() string { return proto.CompactTextString(m) }
+func (*CommunityPoolSpendProposalWithDeposit) ProtoMessage()    {}
+func (*CommunityPoolSpendProposalWithDeposit) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cd78a31ea281a992, []int{11}
+}
+func (m *CommunityPoolSpendProposalWithDeposit) XXX_Unmarshal(b []byte) error {
+	return m.Unmarshal(b)
+}
+func (m *CommunityPoolSpendProposalWithDeposit) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	if deterministic {
+		return xxx_messageInfo_CommunityPoolSpendProposalWithDeposit.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 *CommunityPoolSpendProposalWithDeposit) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CommunityPoolSpendProposalWithDeposit.Merge(m, src)
+}
+func (m *CommunityPoolSpendProposalWithDeposit) XXX_Size() int {
+	return m.Size()
+}
+func (m *CommunityPoolSpendProposalWithDeposit) XXX_DiscardUnknown() {
+	xxx_messageInfo_CommunityPoolSpendProposalWithDeposit.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CommunityPoolSpendProposalWithDeposit proto.InternalMessageInfo
+
+func (m *CommunityPoolSpendProposalWithDeposit) GetTitle() string {
+	if m != nil {
+		return m.Title
+	}
+	return ""
+}
+
+func (m *CommunityPoolSpendProposalWithDeposit) GetDescription() string {
+	if m != nil {
+		return m.Description
+	}
+	return ""
+}
+
+func (m *CommunityPoolSpendProposalWithDeposit) GetRecipient() github_com_cosmos_cosmos_sdk_types.AccAddress {
+	if m != nil {
+		return m.Recipient
+	}
+	return nil
+}
+
+func (m *CommunityPoolSpendProposalWithDeposit) GetAmount() string {
+	if m != nil {
+		return m.Amount
+	}
+	return ""
+}
+
+func (m *CommunityPoolSpendProposalWithDeposit) GetDeposit() string {
+	if m != nil {
+		return m.Deposit
+	}
+	return ""
+}
+
 func init() {
 	proto.RegisterType((*Params)(nil), "cosmos.distribution.v1beta1.Params")
 	proto.RegisterType((*ValidatorHistoricalRewards)(nil), "cosmos.distribution.v1beta1.ValidatorHistoricalRewards")
@@ -589,6 +666,7 @@ func init() {
 	proto.RegisterType((*CommunityPoolSpendProposal)(nil), "cosmos.distribution.v1beta1.CommunityPoolSpendProposal")
 	proto.RegisterType((*DelegatorStartingInfo)(nil), "cosmos.distribution.v1beta1.DelegatorStartingInfo")
 	proto.RegisterType((*DelegationDelegatorReward)(nil), "cosmos.distribution.v1beta1.DelegationDelegatorReward")
+	proto.RegisterType((*CommunityPoolSpendProposalWithDeposit)(nil), "cosmos.distribution.v1beta1.CommunityPoolSpendProposalWithDeposit")
 }
 
 func init() {
@@ -596,71 +674,77 @@ func init() {
 }
 
 var fileDescriptor_cd78a31ea281a992 = []byte{
-	// 1017 bytes of a gzipped FileDescriptorProto
+	// 1114 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x56, 0xcf, 0x6f, 0x1b, 0x45,
-	0x14, 0xf6, 0x26, 0xae, 0x9b, 0x4e, 0xd3, 0x04, 0x36, 0x4e, 0xe2, 0x3a, 0x65, 0xd7, 0x1a, 0x09,
+	0x14, 0xf6, 0xa6, 0xae, 0xdb, 0x4e, 0xd3, 0xb4, 0x9d, 0x38, 0x89, 0x9b, 0x14, 0x6f, 0x34, 0x52,
-	0x14, 0x09, 0xc5, 0x6e, 0xe8, 0x2d, 0x07, 0xa4, 0xac, 0x9b, 0x08, 0x10, 0x25, 0xd1, 0x36, 0xf4,
+	0xab, 0x20, 0x88, 0xd3, 0xd0, 0x0b, 0xca, 0x01, 0x29, 0xeb, 0x24, 0x02, 0x44, 0x49, 0xb4, 0x0d,
-	0xc0, 0x65, 0x35, 0xde, 0x9d, 0xd8, 0xa3, 0xec, 0xee, 0x2c, 0x33, 0x63, 0x27, 0x41, 0x42, 0x48,
+	0x45, 0xe2, 0x62, 0x8d, 0x77, 0x27, 0xf6, 0x28, 0xeb, 0x1d, 0x33, 0x33, 0x76, 0x12, 0x24, 0x84,
-	0x3d, 0x71, 0x41, 0x80, 0xe0, 0xc0, 0x01, 0x50, 0x8f, 0xfc, 0xfa, 0x43, 0x7a, 0xec, 0x0d, 0xc4,
+	0xd4, 0x13, 0x17, 0x04, 0x08, 0x0e, 0x1c, 0x00, 0xf5, 0xc8, 0xaf, 0xff, 0x83, 0x1e, 0x7b, 0x03,
-	0xc1, 0xa0, 0xe4, 0xc6, 0xd1, 0x37, 0x38, 0xa1, 0x9d, 0x19, 0xef, 0x3a, 0xc6, 0xaa, 0x6c, 0xa4,
+	0x71, 0x58, 0x50, 0x72, 0xe3, 0xe8, 0x1b, 0x9c, 0xd0, 0xce, 0xcc, 0xee, 0xda, 0xae, 0xa9, 0x6c,
-	0x9e, 0xec, 0xf9, 0xe6, 0xcd, 0xf7, 0xbe, 0xf9, 0xde, 0xcc, 0x9b, 0x05, 0x75, 0x9f, 0xf2, 0x88,
+	0x50, 0x4f, 0xf6, 0x7e, 0xf3, 0xf6, 0x7b, 0xdf, 0x7c, 0x6f, 0xde, 0x9b, 0x05, 0x15, 0x8f, 0x89,
-	0xf2, 0x46, 0x40, 0xb8, 0x60, 0xa4, 0xd5, 0x15, 0x84, 0xc6, 0x8d, 0xde, 0x76, 0x0b, 0x0b, 0xb4,
+	0x16, 0x13, 0x6b, 0x3e, 0x15, 0x92, 0xd3, 0x7a, 0x47, 0x52, 0x16, 0xae, 0x75, 0xd7, 0xeb, 0x44,
-	0x7d, 0x05, 0xac, 0x27, 0x8c, 0x0a, 0x6a, 0x6e, 0xa8, 0xf8, 0xfa, 0x95, 0x29, 0x1d, 0x5f, 0x2d,
+	0xe2, 0xf5, 0x01, 0xb0, 0xd2, 0xe6, 0x4c, 0x32, 0xb8, 0xa4, 0xe3, 0x2b, 0x03, 0x4b, 0x26, 0x7e,
-	0xb7, 0x69, 0x9b, 0xca, 0xb8, 0x46, 0xfa, 0x4f, 0x2d, 0xa9, 0x5a, 0x3a, 0x45, 0x0b, 0x71, 0x9c,
+	0xb1, 0xd8, 0x60, 0x0d, 0xa6, 0xe2, 0xd6, 0xe2, 0x7f, 0xfa, 0x95, 0xc5, 0xb2, 0x49, 0x51, 0xc7,
-	0x51, 0xfb, 0x94, 0x68, 0x4a, 0xf8, 0xeb, 0x3c, 0x28, 0x1d, 0x22, 0x86, 0x22, 0x6e, 0x9e, 0x80,
+	0x82, 0xa4, 0xd4, 0x1e, 0xa3, 0x86, 0x12, 0xfd, 0x72, 0x0e, 0x14, 0xf6, 0x30, 0xc7, 0x2d, 0x01,
-	0x5b, 0x3e, 0x8d, 0xa2, 0x6e, 0x4c, 0xc4, 0xb9, 0x27, 0xd0, 0x59, 0xc5, 0xa8, 0x19, 0x9b, 0x37,
+	0x0f, 0xc1, 0x15, 0x8f, 0xb5, 0x5a, 0x9d, 0x90, 0xca, 0x93, 0x9a, 0xc4, 0xc7, 0x25, 0x6b, 0xd9,
-	0x9c, 0xfd, 0xa7, 0x7d, 0xbb, 0xf0, 0x7b, 0xdf, 0x7e, 0xad, 0x4d, 0x44, 0xa7, 0xdb, 0xaa, 0xfb,
+	0x5a, 0xb9, 0xe4, 0xec, 0x3c, 0x8e, 0xec, 0xdc, 0x6f, 0x91, 0x7d, 0xbb, 0x41, 0x65, 0xb3, 0x53,
-	0x34, 0x6a, 0x68, 0x52, 0xf5, 0xb3, 0xc5, 0x83, 0x93, 0x86, 0x38, 0x4f, 0x30, 0xaf, 0xdf, 0xc7,
+	0xaf, 0x78, 0xac, 0xb5, 0x66, 0x48, 0xf5, 0xcf, 0xaa, 0xf0, 0x0f, 0xd7, 0xe4, 0x49, 0x9b, 0x88,
-	0xfe, 0xa0, 0x6f, 0x97, 0xcf, 0x51, 0x14, 0xee, 0xc0, 0x2b, 0x64, 0xd0, 0x5d, 0xcc, 0xc6, 0x47,
+	0xca, 0x16, 0xf1, 0x7a, 0x91, 0x5d, 0x3c, 0xc1, 0xad, 0x60, 0x03, 0x0d, 0x90, 0x21, 0x77, 0x3a,
-	0xe8, 0xcc, 0xfc, 0x04, 0x94, 0x53, 0x49, 0x5e, 0xc2, 0x68, 0x42, 0x39, 0x66, 0x1e, 0xc3, 0xa7,
+	0x7d, 0xde, 0xc7, 0xc7, 0xf0, 0x23, 0x50, 0x8c, 0x25, 0xd5, 0xda, 0x9c, 0xb5, 0x99, 0x20, 0xbc,
-	0x88, 0x05, 0x95, 0x39, 0x99, 0xf3, 0xc1, 0xcc, 0x39, 0x37, 0x54, 0xce, 0x49, 0x9c, 0xd0, 0x35,
+	0xc6, 0xc9, 0x11, 0xe6, 0x7e, 0x69, 0x4a, 0xe5, 0xbc, 0x37, 0x71, 0xce, 0x25, 0x9d, 0x73, 0x14,
-	0x53, 0xf8, 0x50, 0xa3, 0xae, 0x04, 0xcd, 0xc7, 0x06, 0x58, 0x6d, 0xd1, 0xb8, 0xcb, 0xff, 0x23,
+	0x27, 0x72, 0x61, 0x0c, 0xef, 0x19, 0xd4, 0x55, 0x20, 0x7c, 0x68, 0x81, 0xb9, 0x3a, 0x0b, 0x3b,
-	0x61, 0x5e, 0x4a, 0x78, 0x6f, 0x66, 0x09, 0x77, 0xb4, 0x84, 0x49, 0xa4, 0xd0, 0x5d, 0x91, 0xf8,
+	0xe2, 0x29, 0x09, 0xe7, 0x94, 0x84, 0xb7, 0x27, 0x96, 0x70, 0xd3, 0x48, 0x18, 0x45, 0x8a, 0xdc,
-	0x98, 0x88, 0x23, 0xb0, 0x7a, 0x4a, 0x44, 0x27, 0x60, 0xe8, 0xd4, 0x43, 0x41, 0xc0, 0x3c, 0x1c,
+	0x59, 0x85, 0x0f, 0x89, 0xd8, 0x07, 0x73, 0x47, 0x54, 0x36, 0x7d, 0x8e, 0x8f, 0x6a, 0xd8, 0xf7,
-	0xa3, 0x56, 0x88, 0x83, 0x4a, 0xb1, 0x66, 0x6c, 0x2e, 0x38, 0xb5, 0x9c, 0x75, 0x62, 0x18, 0x74,
+	0x79, 0x8d, 0x84, 0xb8, 0x1e, 0x10, 0xbf, 0x94, 0x5f, 0xb6, 0x56, 0x2e, 0x3a, 0xcb, 0x19, 0xeb,
-	0x57, 0x86, 0xf8, 0x6e, 0x10, 0xb0, 0x3d, 0x85, 0xee, 0x14, 0xbf, 0x79, 0x62, 0x17, 0xe0, 0xe7,
+	0xc8, 0x30, 0xe4, 0xce, 0x26, 0xf8, 0xa6, 0xef, 0xf3, 0x6d, 0x8d, 0x6e, 0xe4, 0xbf, 0x7a, 0x64,
-	0x73, 0xa0, 0xfa, 0x08, 0x85, 0x24, 0x40, 0x82, 0xb2, 0xb7, 0x08, 0x17, 0x94, 0x11, 0x1f, 0x85,
+	0xe7, 0xd0, 0xa7, 0x53, 0x60, 0xf1, 0x01, 0x0e, 0xa8, 0x8f, 0x25, 0xe3, 0xaf, 0x53, 0x21, 0x19,
-	0x2a, 0x33, 0x37, 0x7f, 0x36, 0xc0, 0xba, 0xdf, 0x8d, 0xba, 0x21, 0x12, 0xa4, 0x87, 0xb5, 0x4c,
+	0xa7, 0x1e, 0x0e, 0x74, 0x66, 0x01, 0x7f, 0xb4, 0xc0, 0x82, 0xd7, 0x69, 0x75, 0x02, 0x2c, 0x69,
-	0x8f, 0x21, 0x41, 0x68, 0xc5, 0xa8, 0xcd, 0x6f, 0xde, 0x7c, 0xe3, 0x8e, 0x3e, 0x9e, 0xf5, 0xd4,
+	0x97, 0x18, 0x99, 0x35, 0x8e, 0x25, 0x65, 0x25, 0x6b, 0xf9, 0xdc, 0xca, 0xe5, 0x57, 0x6e, 0x9a,
-	0xbd, 0xe1, 0x31, 0x4b, 0xf7, 0xda, 0xa4, 0x24, 0x76, 0xde, 0x4f, 0xfd, 0x19, 0xf4, 0x6d, 0x4b,
+	0xe3, 0x59, 0x89, 0xdd, 0x4b, 0x8e, 0x59, 0xbc, 0xd7, 0x2a, 0xa3, 0xa1, 0xf3, 0x4e, 0xec, 0x4f,
-	0x17, 0x7b, 0x32, 0x15, 0xfc, 0xe9, 0x0f, 0xfb, 0xf5, 0xe9, 0x1c, 0x4c, 0x59, 0xb9, 0xbb, 0x9a,
+	0x2f, 0xb2, 0xcb, 0xa6, 0xd8, 0xa3, 0xa9, 0xd0, 0x0f, 0xbf, 0xdb, 0x2f, 0x8d, 0xe7, 0x60, 0xcc,
-	0x13, 0x29, 0xa5, 0x6e, 0x4a, 0x63, 0x36, 0xc1, 0x32, 0xc3, 0xc7, 0x98, 0xe1, 0xd8, 0xc7, 0x9e,
+	0x2a, 0xdc, 0xb9, 0x8c, 0x48, 0x2b, 0x75, 0x63, 0x1a, 0x58, 0x05, 0x57, 0x39, 0x39, 0x20, 0x9c,
-	0x4f, 0xbb, 0xb1, 0x90, 0x27, 0xe5, 0x96, 0x53, 0x1d, 0xf4, 0xed, 0x35, 0x25, 0x61, 0x2c, 0x00,
+	0x84, 0x1e, 0xa9, 0x79, 0xac, 0x13, 0x4a, 0x75, 0x52, 0xae, 0x38, 0x8b, 0xbd, 0xc8, 0x9e, 0xd7,
-	0xba, 0x4b, 0x19, 0xd2, 0x94, 0xc0, 0xf7, 0x06, 0x58, 0xcf, 0x1c, 0x69, 0x76, 0x19, 0xc3, 0xb1,
+	0x12, 0x86, 0x02, 0x90, 0x3b, 0x93, 0x22, 0x55, 0x05, 0x7c, 0x6b, 0x81, 0x85, 0xd4, 0x91, 0x6a,
-	0x18, 0xda, 0x71, 0x02, 0xae, 0x2b, 0xdd, 0x7c, 0xaa, 0xdd, 0xdf, 0x4b, 0x77, 0x3f, 0xeb, 0xde,
+	0x87, 0x73, 0x12, 0xca, 0xc4, 0x8e, 0x43, 0x70, 0x41, 0xeb, 0x16, 0x63, 0xed, 0xfe, 0x6e, 0xbc,
-	0x86, 0x19, 0xcc, 0x35, 0x50, 0x4a, 0x30, 0x23, 0x54, 0x1d, 0xf7, 0xa2, 0xab, 0x47, 0xf0, 0x2b,
+	0xfb, 0x49, 0xf7, 0x96, 0x64, 0x80, 0xf3, 0xa0, 0xd0, 0x26, 0x9c, 0x32, 0x7d, 0xdc, 0xf3, 0xae,
-	0x03, 0x58, 0x99, 0xc0, 0x5d, 0x5f, 0x5b, 0x81, 0x83, 0x26, 0x8d, 0x22, 0xc2, 0x39, 0xa1, 0xb1,
+	0x79, 0x42, 0x5f, 0x58, 0xa0, 0x9c, 0x0a, 0xdc, 0xf4, 0x8c, 0x15, 0xc4, 0xaf, 0xb2, 0x56, 0x8b,
-	0xf9, 0x21, 0x00, 0x7e, 0x36, 0x7a, 0x71, 0x52, 0x47, 0x92, 0xc0, 0x6f, 0x0d, 0xb0, 0x91, 0xa9,
+	0x0a, 0x41, 0x59, 0x08, 0xdf, 0x07, 0xc0, 0x4b, 0x9f, 0x9e, 0x9f, 0xd4, 0xbe, 0x24, 0xe8, 0x6b,
-	0x3a, 0xe8, 0x0a, 0x2e, 0x50, 0x1c, 0x90, 0xb8, 0x3d, 0xb4, 0xee, 0xe3, 0xd9, 0xac, 0xdb, 0xd3,
+	0x0b, 0x2c, 0xa5, 0xaa, 0x76, 0x3b, 0x52, 0x48, 0x1c, 0xfa, 0x34, 0x6c, 0x24, 0xd6, 0x7d, 0x38,
-	0x07, 0x67, 0x69, 0x58, 0x35, 0xb9, 0x14, 0xfe, 0x5f, 0x33, 0xe1, 0x8f, 0x06, 0x58, 0xc9, 0xe4,
+	0x99, 0x75, 0xdb, 0xe6, 0xe0, 0xcc, 0x24, 0x55, 0x53, 0xaf, 0xa2, 0xff, 0x6a, 0x26, 0xfa, 0xde,
-	0x3d, 0x0c, 0x11, 0xef, 0xec, 0xf5, 0x70, 0x2c, 0xcc, 0x7d, 0xf0, 0x52, 0x6f, 0x08, 0x7b, 0xda,
+	0x02, 0xb3, 0xa9, 0xbc, 0xfb, 0x01, 0x16, 0xcd, 0xed, 0x2e, 0x09, 0x25, 0xdc, 0x01, 0xd7, 0xba,
-	0xee, 0xb4, 0xa3, 0x15, 0x9d, 0x8d, 0x41, 0xdf, 0x5e, 0x57, 0xd9, 0xc7, 0x23, 0xa0, 0xbb, 0x9c,
+	0x09, 0x5c, 0x33, 0x76, 0xc7, 0x13, 0x2d, 0xef, 0x2c, 0xf5, 0x22, 0x7b, 0x41, 0x67, 0x1f, 0x8e,
-	0x41, 0x87, 0x12, 0x31, 0xdf, 0x01, 0x0b, 0xc7, 0x0c, 0xf9, 0x69, 0xaf, 0xd5, 0xdd, 0xa9, 0x3e,
+	0x40, 0xee, 0xd5, 0x14, 0xda, 0x53, 0x08, 0x7c, 0x13, 0x5c, 0x3c, 0xe0, 0xd8, 0x8b, 0x67, 0xad,
-	0x5b, 0x6b, 0x70, 0xb3, 0xf5, 0xf0, 0x17, 0x03, 0x94, 0x27, 0x68, 0xe5, 0xe6, 0x67, 0x06, 0x58,
+	0x99, 0x4e, 0x95, 0xc9, 0x46, 0x83, 0x9b, 0xbe, 0x8f, 0x7e, 0xb2, 0x40, 0x71, 0x84, 0x56, 0x01,
-	0xcb, 0xb5, 0xf0, 0x74, 0xc6, 0xc3, 0x72, 0x4a, 0x7b, 0x7a, 0xb7, 0xfe, 0x9c, 0xde, 0x5f, 0x9f,
+	0x3f, 0xb1, 0xc0, 0x7c, 0xa6, 0x45, 0xc4, 0x2b, 0x35, 0xa2, 0x96, 0x8c, 0xa7, 0x77, 0x2a, 0xcf,
-	0xc0, 0xe9, 0xbc, 0xaa, 0x7d, 0x7e, 0x65, 0x7c, 0xa7, 0xa3, 0xec, 0xd0, 0x2d, 0xf7, 0x26, 0xe8,
+	0x98, 0xfd, 0x95, 0x11, 0x9c, 0xce, 0x2d, 0xe3, 0xf3, 0x0b, 0xc3, 0x3b, 0xed, 0x67, 0x47, 0x6e,
-	0xd1, 0x2d, 0xe4, 0x3b, 0x03, 0x5c, 0xdf, 0xc7, 0xf8, 0x90, 0xd2, 0xd0, 0xfc, 0xd2, 0x00, 0x4b,
+	0xb1, 0x3b, 0x42, 0x8f, 0x19, 0x21, 0xdf, 0x58, 0xe0, 0xc2, 0x0e, 0x21, 0x7b, 0x8c, 0x05, 0xf0,
-	0x79, 0x47, 0x4f, 0x28, 0x0d, 0xa7, 0xaa, 0xf6, 0xbb, 0x5a, 0xc5, 0xea, 0xf8, 0x9b, 0x90, 0x32,
+	0x73, 0x0b, 0xcc, 0x64, 0x13, 0xbd, 0xcd, 0x58, 0x30, 0x56, 0xb5, 0xdf, 0x32, 0x2a, 0xe6, 0x86,
-	0xcc, 0x5c, 0xf4, 0xfc, 0x81, 0x4a, 0x35, 0xc1, 0xaf, 0xe7, 0x40, 0xb5, 0x39, 0x8a, 0x3c, 0x4c,
+	0xef, 0x84, 0x98, 0x61, 0xe2, 0xa2, 0x67, 0x17, 0x54, 0xac, 0x09, 0x7d, 0x39, 0x05, 0x16, 0xab,
-	0x70, 0x1c, 0xa8, 0x1e, 0x8b, 0x42, 0xb3, 0x0c, 0xae, 0x09, 0x22, 0x42, 0xac, 0x1e, 0x32, 0x57,
+	0xfd, 0xc8, 0xfd, 0x36, 0x09, 0x7d, 0x3d, 0x63, 0x71, 0x00, 0x8b, 0xe0, 0xbc, 0xa4, 0x32, 0x20,
-	0x0d, 0xcc, 0x1a, 0xb8, 0x19, 0x60, 0xee, 0x33, 0x92, 0xe4, 0x25, 0x75, 0x47, 0x21, 0xf3, 0x00,
+	0xfa, 0x22, 0x73, 0xf5, 0x03, 0x5c, 0x06, 0x97, 0x7d, 0x22, 0x3c, 0x4e, 0xdb, 0x59, 0x49, 0xdd,
-	0xdc, 0x60, 0xd8, 0x27, 0x09, 0xc1, 0xb1, 0x90, 0xaf, 0xc1, 0xa2, 0xb3, 0xfd, 0x4f, 0xdf, 0xde,
+	0x7e, 0x08, 0xee, 0x82, 0x4b, 0x9c, 0x78, 0xb4, 0x4d, 0x49, 0x28, 0xd5, 0x6d, 0x30, 0xed, 0xac,
-	0x9a, 0x42, 0xe9, 0xae, 0xef, 0xa7, 0x9d, 0x18, 0x73, 0xee, 0xe6, 0x1c, 0xa6, 0x0f, 0x4a, 0x28,
+	0xff, 0x1d, 0xd9, 0xab, 0x63, 0x28, 0xdd, 0xf4, 0xbc, 0x78, 0x12, 0x13, 0x21, 0xdc, 0x8c, 0x03,
-	0x92, 0x4d, 0xab, 0x28, 0x2d, 0xbb, 0x3d, 0xd1, 0x32, 0xe9, 0xd7, 0x5d, 0x7d, 0x5b, 0x37, 0xa7,
+	0x7a, 0xa0, 0x80, 0x5b, 0x6a, 0x68, 0xe5, 0x95, 0x65, 0x37, 0x46, 0x5a, 0xa6, 0xfc, 0xba, 0x63,
-	0x48, 0xa6, 0x3c, 0xd1, 0xd4, 0x3b, 0x0b, 0x9f, 0x3e, 0xb1, 0x0b, 0xb2, 0x6c, 0x7f, 0x1b, 0x60,
+	0xba, 0x75, 0x65, 0x8c, 0x64, 0xda, 0x13, 0x43, 0xbd, 0x71, 0xf1, 0xe3, 0x47, 0x76, 0x4e, 0x95,
-	0xf5, 0x3e, 0x0e, 0x71, 0x5b, 0x56, 0x55, 0x20, 0x26, 0x48, 0xdc, 0x7e, 0x3b, 0x3e, 0x96, 0x6d,
+	0xed, 0x2f, 0x0b, 0xcc, 0x6d, 0x91, 0x80, 0x34, 0x54, 0x55, 0x25, 0xe6, 0x92, 0x86, 0x8d, 0x37,
-	0x34, 0x61, 0xb8, 0x47, 0x68, 0xfa, 0x42, 0x8d, 0x5e, 0x89, 0x91, 0x36, 0x3a, 0x16, 0x00, 0xdd,
+	0xc2, 0x03, 0x35, 0x46, 0xdb, 0x9c, 0x74, 0x29, 0x8b, 0x6f, 0xa8, 0xfe, 0x96, 0xe8, 0x1b, 0xa3,
-	0xa5, 0x21, 0xa2, 0x2f, 0xc4, 0x11, 0xb8, 0xc6, 0x05, 0x3a, 0xc1, 0xfa, 0x36, 0xbc, 0x39, 0xf3,
+	0x43, 0x01, 0xc8, 0x9d, 0x49, 0x10, 0xd3, 0x10, 0xfb, 0xe0, 0xbc, 0x90, 0xf8, 0x90, 0x98, 0x6e,
-	0x43, 0xb9, 0xa8, 0x12, 0x49, 0x12, 0xe8, 0x2a, 0x32, 0x73, 0x0f, 0x94, 0x3a, 0x98, 0xb4, 0x3b,
+	0x78, 0x6d, 0xe2, 0x8b, 0x72, 0x5a, 0x27, 0x52, 0x24, 0xc8, 0xd5, 0x64, 0x70, 0x1b, 0x14, 0x9a,
-	0xca, 0xf1, 0xa2, 0xb3, 0xf5, 0x57, 0xdf, 0x5e, 0xf6, 0x19, 0x4e, 0xdb, 0x7f, 0xec, 0xa9, 0xa9,
+	0x84, 0x36, 0x9a, 0xda, 0xf1, 0xbc, 0xb3, 0xfa, 0x67, 0x64, 0x5f, 0xf5, 0x38, 0x89, 0xc7, 0x7f,
-	0x5c, 0xe4, 0xd8, 0x04, 0x74, 0xf5, 0x62, 0xf8, 0x78, 0x0e, 0xdc, 0xd6, 0x7b, 0x27, 0x34, 0xce,
+	0x58, 0xd3, 0x4b, 0x99, 0xc8, 0xa1, 0x05, 0xe4, 0x9a, 0x97, 0xd1, 0xc3, 0x29, 0x70, 0xc3, 0xec,
-	0x5c, 0xd0, 0xef, 0xed, 0x47, 0xe0, 0xe5, 0xfc, 0x1e, 0x20, 0x55, 0x28, 0xe9, 0xc0, 0xa2, 0xf3,
+	0x9d, 0xb2, 0x30, 0x75, 0xc1, 0xdc, 0xb7, 0x1f, 0x80, 0xeb, 0x59, 0x1f, 0x60, 0x5d, 0x28, 0xe5,
-	0x60, 0xd0, 0xb7, 0x2b, 0xe3, 0x57, 0x45, 0x87, 0xc0, 0x29, 0xab, 0xff, 0x08, 0x85, 0xc3, 0xea,
+	0xc0, 0xb4, 0x73, 0xaf, 0x17, 0xd9, 0xa5, 0xe1, 0x56, 0x31, 0x21, 0x68, 0xcc, 0xea, 0x3f, 0xc0,
-	0xe7, 0xbd, 0x47, 0x23, 0x26, 0x01, 0xa5, 0xec, 0x1b, 0xe7, 0x05, 0x75, 0x6d, 0x9d, 0xc0, 0x39,
+	0x41, 0x52, 0xfd, 0x6c, 0xf6, 0x18, 0x04, 0x52, 0x50, 0x48, 0xbf, 0x71, 0x9e, 0xd3, 0xd4, 0x36,
-	0xf8, 0xe1, 0xc2, 0x32, 0x9e, 0x5e, 0x58, 0xc6, 0xb3, 0x0b, 0xcb, 0xf8, 0xf3, 0xc2, 0x32, 0xbe,
+	0x09, 0xd0, 0xcf, 0x53, 0xe0, 0xd6, 0xbf, 0xf7, 0xc5, 0xbb, 0x54, 0x36, 0xb7, 0x48, 0x9b, 0x09,
-	0xb8, 0xb4, 0x0a, 0xcf, 0x2e, 0xad, 0xc2, 0x6f, 0x97, 0x56, 0xe1, 0x83, 0xed, 0xe7, 0x52, 0x9e,
+	0x2a, 0xe1, 0xed, 0x81, 0x16, 0x71, 0xae, 0x65, 0xd5, 0x51, 0x30, 0x4a, 0x9a, 0xe6, 0xd5, 0x11,
-	0x5d, 0xfd, 0x1a, 0x95, 0x19, 0x5a, 0x25, 0xf9, 0xb1, 0x78, 0xef, 0xdf, 0x00, 0x00, 0x00, 0xff,
+	0x4d, 0xe3, 0xcc, 0xf7, 0x22, 0x1b, 0xea, 0xe8, 0xbe, 0x45, 0x34, 0xd8, 0x4c, 0xde, 0xd3, 0xcd,
-	0xff, 0x07, 0x68, 0xf1, 0xe3, 0xb1, 0x0a, 0x00, 0x00,
+	0xb4, 0xdd, 0x8b, 0xec, 0x6b, 0xc9, 0xf4, 0x37, 0x4b, 0xe8, 0x7f, 0x35, 0xd8, 0x8b, 0x7d, 0x0d,
+	0x16, 0x2b, 0xbb, 0xde, 0x8b, 0xec, 0x2b, 0x3a, 0x83, 0xc6, 0x51, 0xd2, 0x26, 0xf0, 0x65, 0x70,
+	0xc1, 0xd7, 0x9b, 0x2f, 0x9d, 0x57, 0xb1, 0x30, 0xbb, 0x8b, 0xcc, 0x02, 0x72, 0x93, 0x10, 0x67,
+	0xf7, 0xbb, 0xd3, 0xb2, 0xf5, 0xf8, 0xb4, 0x6c, 0x3d, 0x39, 0x2d, 0x5b, 0x7f, 0x9c, 0x96, 0xad,
+	0xcf, 0xce, 0xca, 0xb9, 0x27, 0x67, 0xe5, 0xdc, 0xaf, 0x67, 0xe5, 0xdc, 0x7b, 0xeb, 0xcf, 0x14,
+	0x7c, 0x3c, 0xf8, 0x5d, 0xaf, 0xf4, 0xd7, 0x0b, 0xea, 0xb3, 0xfb, 0xee, 0x3f, 0x01, 0x00, 0x00,
+	0xff, 0xff, 0xb8, 0x54, 0xa7, 0x44, 0xfb, 0x0b, 0x00, 0x00,
 }
 
 func (this *Params) Equal(that interface{}) bool {
@@ -1003,6 +1087,42 @@ func (this *DelegationDelegatorReward) Equal(that interface{}) bool {
 	}
 	return true
 }
+func (this *CommunityPoolSpendProposalWithDeposit) Equal(that interface{}) bool {
+	if that == nil {
+		return this == nil
+	}
+
+	that1, ok := that.(*CommunityPoolSpendProposalWithDeposit)
+	if !ok {
+		that2, ok := that.(CommunityPoolSpendProposalWithDeposit)
+		if ok {
+			that1 = &that2
+		} else {
+			return false
+		}
+	}
+	if that1 == nil {
+		return this == nil
+	} else if this == nil {
+		return false
+	}
+	if this.Title != that1.Title {
+		return false
+	}
+	if this.Description != that1.Description {
+		return false
+	}
+	if !bytes.Equal(this.Recipient, that1.Recipient) {
+		return false
+	}
+	if this.Amount != that1.Amount {
+		return false
+	}
+	if this.Deposit != that1.Deposit {
+		return false
+	}
+	return true
+}
 func (m *Params) Marshal() (dAtA []byte, err error) {
 	size := m.Size()
 	dAtA = make([]byte, size)
@@ -1481,6 +1601,64 @@ func (m *DelegationDelegatorReward) MarshalToSizedBuffer(dAtA []byte) (int, erro
 	return len(dAtA) - i, nil
 }
 
+func (m *CommunityPoolSpendProposalWithDeposit) 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 *CommunityPoolSpendProposalWithDeposit) MarshalTo(dAtA []byte) (int, error) {
+	size := m.Size()
+	return m.MarshalToSizedBuffer(dAtA[:size])
+}
+
+func (m *CommunityPoolSpendProposalWithDeposit) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+	i := len(dAtA)
+	_ = i
+	var l int
+	_ = l
+	if len(m.Deposit) > 0 {
+		i -= len(m.Deposit)
+		copy(dAtA[i:], m.Deposit)
+		i = encodeVarintDistribution(dAtA, i, uint64(len(m.Deposit)))
+		i--
+		dAtA[i] = 0x2a
+	}
+	if len(m.Amount) > 0 {
+		i -= len(m.Amount)
+		copy(dAtA[i:], m.Amount)
+		i = encodeVarintDistribution(dAtA, i, uint64(len(m.Amount)))
+		i--
+		dAtA[i] = 0x22
+	}
+	if len(m.Recipient) > 0 {
+		i -= len(m.Recipient)
+		copy(dAtA[i:], m.Recipient)
+		i = encodeVarintDistribution(dAtA, i, uint64(len(m.Recipient)))
+		i--
+		dAtA[i] = 0x1a
+	}
+	if len(m.Description) > 0 {
+		i -= len(m.Description)
+		copy(dAtA[i:], m.Description)
+		i = encodeVarintDistribution(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 = encodeVarintDistribution(dAtA, i, uint64(len(m.Title)))
+		i--
+		dAtA[i] = 0xa
+	}
+	return len(dAtA) - i, nil
+}
+
 func encodeVarintDistribution(dAtA []byte, offset int, v uint64) int {
 	offset -= sovDistribution(v)
 	base := offset
@@ -1683,6 +1861,35 @@ func (m *DelegationDelegatorReward) Size() (n int) {
 	return n
 }
 
+func (m *CommunityPoolSpendProposalWithDeposit) Size() (n int) {
+	if m == nil {
+		return 0
+	}
+	var l int
+	_ = l
+	l = len(m.Title)
+	if l > 0 {
+		n += 1 + l + sovDistribution(uint64(l))
+	}
+	l = len(m.Description)
+	if l > 0 {
+		n += 1 + l + sovDistribution(uint64(l))
+	}
+	l = len(m.Recipient)
+	if l > 0 {
+		n += 1 + l + sovDistribution(uint64(l))
+	}
+	l = len(m.Amount)
+	if l > 0 {
+		n += 1 + l + sovDistribution(uint64(l))
+	}
+	l = len(m.Deposit)
+	if l > 0 {
+		n += 1 + l + sovDistribution(uint64(l))
+	}
+	return n
+}
+
 func sovDistribution(x uint64) (n int) {
 	return (math_bits.Len64(x|1) + 6) / 7
 }
@@ -2961,6 +3168,221 @@ func (m *DelegationDelegatorReward) Unmarshal(dAtA []byte) error {
 	}
 	return nil
 }
+func (m *CommunityPoolSpendProposalWithDeposit) 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 ErrIntOverflowDistribution
+			}
+			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: CommunityPoolSpendProposalWithDeposit: wiretype end group for non-group")
+		}
+		if fieldNum <= 0 {
+			return fmt.Errorf("proto: CommunityPoolSpendProposalWithDeposit: illegal tag %d (wire type %d)", fieldNum, wire)
+		}
+		switch fieldNum {
+		case 1:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Title", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowDistribution
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				stringLen |= uint64(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			intStringLen := int(stringLen)
+			if intStringLen < 0 {
+				return ErrInvalidLengthDistribution
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex < 0 {
+				return ErrInvalidLengthDistribution
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.Title = string(dAtA[iNdEx:postIndex])
+			iNdEx = postIndex
+		case 2:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Description", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowDistribution
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				stringLen |= uint64(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			intStringLen := int(stringLen)
+			if intStringLen < 0 {
+				return ErrInvalidLengthDistribution
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex < 0 {
+				return ErrInvalidLengthDistribution
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.Description = string(dAtA[iNdEx:postIndex])
+			iNdEx = postIndex
+		case 3:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Recipient", wireType)
+			}
+			var byteLen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowDistribution
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				byteLen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if byteLen < 0 {
+				return ErrInvalidLengthDistribution
+			}
+			postIndex := iNdEx + byteLen
+			if postIndex < 0 {
+				return ErrInvalidLengthDistribution
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.Recipient = append(m.Recipient[:0], dAtA[iNdEx:postIndex]...)
+			if m.Recipient == nil {
+				m.Recipient = []byte{}
+			}
+			iNdEx = postIndex
+		case 4:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Amount", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowDistribution
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				stringLen |= uint64(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			intStringLen := int(stringLen)
+			if intStringLen < 0 {
+				return ErrInvalidLengthDistribution
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex < 0 {
+				return ErrInvalidLengthDistribution
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.Amount = string(dAtA[iNdEx:postIndex])
+			iNdEx = postIndex
+		case 5:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Deposit", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowDistribution
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				stringLen |= uint64(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			intStringLen := int(stringLen)
+			if intStringLen < 0 {
+				return ErrInvalidLengthDistribution
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex < 0 {
+				return ErrInvalidLengthDistribution
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.Deposit = string(dAtA[iNdEx:postIndex])
+			iNdEx = postIndex
+		default:
+			iNdEx = preIndex
+			skippy, err := skipDistribution(dAtA[iNdEx:])
+			if err != nil {
+				return err
+			}
+			if skippy < 0 {
+				return ErrInvalidLengthDistribution
+			}
+			if (iNdEx + skippy) < 0 {
+				return ErrInvalidLengthDistribution
+			}
+			if (iNdEx + skippy) > l {
+				return io.ErrUnexpectedEOF
+			}
+			iNdEx += skippy
+		}
+	}
+
+	if iNdEx > l {
+		return io.ErrUnexpectedEOF
+	}
+	return nil
+}
 func skipDistribution(dAtA []byte) (n int, err error) {
 	l := len(dAtA)
 	iNdEx := 0