diff --git a/proto/planetmintgo/dao/tx.proto b/proto/planetmintgo/dao/tx.proto index 133664a..d9674ab 100644 --- a/proto/planetmintgo/dao/tx.proto +++ b/proto/planetmintgo/dao/tx.proto @@ -108,7 +108,6 @@ message MsgInitPopResponse {} message MsgCreateRedeemClaim { string creator = 1; string beneficiary = 2; - uint64 amount = 3; } message MsgCreateRedeemClaimResponse {} diff --git a/tests/e2e/dao/pop/selection_suite.go b/tests/e2e/dao/pop/selection_suite.go index f99f13e..dbe0619 100644 --- a/tests/e2e/dao/pop/selection_suite.go +++ b/tests/e2e/dao/pop/selection_suite.go @@ -258,7 +258,7 @@ func (s *SelectionE2ETestSuite) TestTokenRedeemClaim() { addr, _ := k.GetAddress() // Addr sends CreateRedeemClaim => accepted query redeem claim - createClaimMsg := daotypes.NewMsgCreateRedeemClaim(addr.String(), "liquidAddress", 10000) + createClaimMsg := daotypes.NewMsgCreateRedeemClaim(addr.String(), "liquidAddress") out, err := lib.BroadcastTxWithFileLock(addr, createClaimMsg) s.Require().NoError(err) @@ -275,7 +275,7 @@ func (s *SelectionE2ETestSuite) TestTokenRedeemClaim() { fmt.Sprintf(s.errormsg, bank.FlagDenom, s.claimDenom), }) s.Require().NoError(err) - assert.Equal(s.T(), "amount: \"5993140682\"\ndenom: crddl\n", balanceOut.String()) // 3 * 1997716894 - 10000 = 5993140682 + assert.Equal(s.T(), "amount: \"0\"\ndenom: crddl\n", balanceOut.String()) // consumes all claims // Addr sends ConfirmRedeemClaim => rejected not claim address confirmMsg := daotypes.NewMsgConfirmRedeemClaim(addr.String(), 0, "liquidAddress") @@ -302,11 +302,11 @@ func (s *SelectionE2ETestSuite) TestTokenRedeemClaim() { // QueryRedeemClaim qOut, err := clitestutil.ExecTestCLICmd(val.ClientCtx, daocli.CmdShowRedeemClaim(), []string{"liquidAddress", "0"}) s.Require().NoError(err) - assert.Equal(s.T(), "redeemClaim:\n amount: \"10000\"\n beneficiary: liquidAddress\n confirmed: true\n creator: plmnt1kp93kns6hs2066d8qw0uz84fw3vlthewt2ck6p\n id: \"0\"\n liquidTxHash: \"0000000000000000000000000000000000000000000000000000000000000000\"\n", qOut.String()) + assert.Equal(s.T(), "redeemClaim:\n amount: \"5993150682\"\n beneficiary: liquidAddress\n confirmed: true\n creator: plmnt1kp93kns6hs2066d8qw0uz84fw3vlthewt2ck6p\n id: \"0\"\n liquidTxHash: \"0000000000000000000000000000000000000000000000000000000000000000\"\n", qOut.String()) qOut, err = clitestutil.ExecTestCLICmd(val.ClientCtx, daocli.CmdRedeemClaimByLiquidTxHash(), []string{"0000000000000000000000000000000000000000000000000000000000000000"}) s.Require().NoError(err) - assert.Equal(s.T(), "redeemClaim:\n amount: \"10000\"\n beneficiary: liquidAddress\n confirmed: true\n creator: plmnt1kp93kns6hs2066d8qw0uz84fw3vlthewt2ck6p\n id: \"0\"\n liquidTxHash: \"0000000000000000000000000000000000000000000000000000000000000000\"\n", qOut.String()) + assert.Equal(s.T(), "redeemClaim:\n amount: \"5993150682\"\n beneficiary: liquidAddress\n confirmed: true\n creator: plmnt1kp93kns6hs2066d8qw0uz84fw3vlthewt2ck6p\n id: \"0\"\n liquidTxHash: \"0000000000000000000000000000000000000000000000000000000000000000\"\n", qOut.String()) } func (s *SelectionE2ETestSuite) createValAccount(cfg network.Config) (address sdk.AccAddress, err error) { diff --git a/x/dao/client/cli/tx_redeem_claim.go b/x/dao/client/cli/tx_redeem_claim.go index 793e638..997d6c9 100644 --- a/x/dao/client/cli/tx_redeem_claim.go +++ b/x/dao/client/cli/tx_redeem_claim.go @@ -19,12 +19,6 @@ func CmdCreateRedeemClaim() *cobra.Command { // Get indexes indexBeneficiary := args[0] - // Get value arguments - argAmount, err := strconv.ParseUint(args[1], 10, 64) - if err != nil { - return err - } - clientCtx, err := client.GetClientTxContext(cmd) if err != nil { return err @@ -33,7 +27,6 @@ func CmdCreateRedeemClaim() *cobra.Command { msg := types.NewMsgCreateRedeemClaim( clientCtx.GetFromAddress().String(), indexBeneficiary, - argAmount, ) if err := msg.ValidateBasic(); err != nil { return err diff --git a/x/dao/keeper/msg_server_redeem_claim.go b/x/dao/keeper/msg_server_redeem_claim.go index b47be69..1cc8ca0 100644 --- a/x/dao/keeper/msg_server_redeem_claim.go +++ b/x/dao/keeper/msg_server_redeem_claim.go @@ -20,18 +20,16 @@ func (k msgServer) CreateRedeemClaim(goCtx context.Context, msg *types.MsgCreate ctx := sdk.UnwrapSDKContext(goCtx) params := k.GetParams(ctx) - err := k.validateCreateRedeemClaim(ctx, msg) - if err != nil { - return nil, err - } + addr := sdk.MustAccAddressFromBech32(msg.Creator) + burnCoins := k.bankKeeper.GetBalance(ctx, addr, params.ClaimDenom) var redeemClaim = types.RedeemClaim{ Creator: msg.Creator, Beneficiary: msg.Beneficiary, - Amount: msg.Amount, + Amount: burnCoins.Amount.Uint64(), } - err = k.burnClaimAmount(ctx, sdk.MustAccAddressFromBech32(msg.Creator), msg.Amount) + err := k.burnClaimAmount(ctx, sdk.MustAccAddressFromBech32(msg.Creator), sdk.NewCoins(burnCoins)) if err != nil { util.GetAppLogger().Error(ctx, createRedeemClaimTag+"could not burn claim") } @@ -43,7 +41,7 @@ func (k msgServer) CreateRedeemClaim(goCtx context.Context, msg *types.MsgCreate if util.IsValidatorBlockProposer(ctx, ctx.BlockHeader().ProposerAddress, k.RootDir) { util.GetAppLogger().Info(ctx, fmt.Sprintf("Issuing RDDL claim: %s/%d", msg.Beneficiary, id)) - txID, err := util.DistributeAsset(msg.Beneficiary, util.UintValueToRDDLTokenString(msg.Amount), params.ReissuanceAsset) + txID, err := util.DistributeAsset(msg.Beneficiary, util.UintValueToRDDLTokenString(burnCoins.Amount.Uint64()), params.ReissuanceAsset) if err != nil { util.GetAppLogger().Error(ctx, createRedeemClaimTag+"could not issue claim to beneficiary: "+msg.GetBeneficiary()) } @@ -53,19 +51,6 @@ func (k msgServer) CreateRedeemClaim(goCtx context.Context, msg *types.MsgCreate return &types.MsgCreateRedeemClaimResponse{}, nil } -func (k msgServer) validateCreateRedeemClaim(ctx sdk.Context, msg *types.MsgCreateRedeemClaim) (err error) { - addr := sdk.MustAccAddressFromBech32(msg.Creator) - - params := k.GetParams(ctx) - balance := k.bankKeeper.GetBalance(ctx, addr, params.ClaimDenom) - - if !balance.Amount.GTE(sdk.NewIntFromUint64(msg.Amount)) { - return errorsmod.Wrap(sdkerrors.ErrInsufficientFunds, redeemClaimContext) - } - - return nil -} - func (k msgServer) UpdateRedeemClaim(goCtx context.Context, msg *types.MsgUpdateRedeemClaim) (*types.MsgUpdateRedeemClaimResponse, error) { ctx := sdk.UnwrapSDKContext(goCtx) @@ -134,9 +119,7 @@ func (k msgServer) validateConfirmRedeemClaim(ctx sdk.Context, msg *types.MsgCon return nil } -func (k msgServer) burnClaimAmount(ctx sdk.Context, addr sdk.AccAddress, amount uint64) (err error) { - params := k.GetParams(ctx) - burnCoins := sdk.NewCoins(sdk.NewCoin(params.ClaimDenom, sdk.NewIntFromUint64(amount))) +func (k msgServer) burnClaimAmount(ctx sdk.Context, addr sdk.AccAddress, burnCoins sdk.Coins) (err error) { err = k.bankKeeper.SendCoinsFromAccountToModule(ctx, addr, types.ModuleName, burnCoins) if err != nil { return err diff --git a/x/dao/types/messages_redeem_claim.go b/x/dao/types/messages_redeem_claim.go index 7400902..8dbd3e7 100644 --- a/x/dao/types/messages_redeem_claim.go +++ b/x/dao/types/messages_redeem_claim.go @@ -18,13 +18,11 @@ var _ sdk.Msg = &MsgCreateRedeemClaim{} func NewMsgCreateRedeemClaim( creator string, beneficiary string, - amount uint64, ) *MsgCreateRedeemClaim { return &MsgCreateRedeemClaim{ Creator: creator, Beneficiary: beneficiary, - Amount: amount, } } diff --git a/x/dao/types/tx.pb.go b/x/dao/types/tx.pb.go index 84801dd..6016217 100644 --- a/x/dao/types/tx.pb.go +++ b/x/dao/types/tx.pb.go @@ -852,7 +852,6 @@ var xxx_messageInfo_MsgInitPopResponse proto.InternalMessageInfo type MsgCreateRedeemClaim struct { Creator string `protobuf:"bytes,1,opt,name=creator,proto3" json:"creator,omitempty"` Beneficiary string `protobuf:"bytes,2,opt,name=beneficiary,proto3" json:"beneficiary,omitempty"` - Amount uint64 `protobuf:"varint,3,opt,name=amount,proto3" json:"amount,omitempty"` } func (m *MsgCreateRedeemClaim) Reset() { *m = MsgCreateRedeemClaim{} } @@ -902,13 +901,6 @@ func (m *MsgCreateRedeemClaim) GetBeneficiary() string { return "" } -func (m *MsgCreateRedeemClaim) GetAmount() uint64 { - if m != nil { - return m.Amount - } - return 0 -} - type MsgCreateRedeemClaimResponse struct { } @@ -1173,76 +1165,75 @@ func init() { func init() { proto.RegisterFile("planetmintgo/dao/tx.proto", fileDescriptor_7117c47dbc1828c7) } var fileDescriptor_7117c47dbc1828c7 = []byte{ - // 1094 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x57, 0xcf, 0x4f, 0xdc, 0xc6, - 0x17, 0xc7, 0x40, 0x20, 0xfb, 0xe0, 0x1b, 0x82, 0xc3, 0x97, 0x2c, 0x2e, 0x38, 0x5b, 0x07, 0xd1, - 0x0d, 0x4a, 0xd6, 0x6d, 0x2a, 0x55, 0x6a, 0x7b, 0xa8, 0x0a, 0x48, 0x0d, 0x52, 0x57, 0x45, 0x0e, - 0xbd, 0x54, 0x95, 0xd0, 0x60, 0x0f, 0xde, 0x29, 0xb6, 0xc7, 0xcc, 0xcc, 0x46, 0xa0, 0xde, 0x72, - 0xe8, 0xb9, 0xa7, 0x9e, 0xfa, 0x07, 0xf4, 0x98, 0x43, 0xff, 0x88, 0x1c, 0xa3, 0x9e, 0x7a, 0xaa, - 0x22, 0x38, 0xe4, 0x4f, 0xe8, 0xa1, 0x97, 0xca, 0xe3, 0x59, 0xaf, 0x77, 0xc7, 0xfb, 0xe3, 0xd2, - 0x4b, 0x32, 0xef, 0xbd, 0xcf, 0x9b, 0xf7, 0xf1, 0x9b, 0x37, 0x9f, 0x61, 0x61, 0x23, 0x8d, 0x50, - 0x82, 0x45, 0x4c, 0x12, 0x11, 0x52, 0x37, 0x40, 0xd4, 0x15, 0x97, 0xad, 0x94, 0x51, 0x41, 0xcd, - 0xbb, 0xe5, 0x50, 0x2b, 0x40, 0xd4, 0x6a, 0x68, 0x60, 0xbf, 0x83, 0xa2, 0x08, 0x27, 0x21, 0xce, - 0x73, 0xac, 0x87, 0x1a, 0x22, 0x5b, 0x9e, 0x30, 0x7c, 0xd1, 0xc5, 0x5c, 0x28, 0xd0, 0x23, 0x0d, - 0x14, 0x10, 0x2e, 0x18, 0x39, 0xed, 0x0a, 0x42, 0x93, 0x13, 0xca, 0x02, 0xcc, 0x14, 0x74, 0x4b, - 0x83, 0xa6, 0x88, 0xa1, 0x98, 0xab, 0xf0, 0x2a, 0x8a, 0x49, 0x42, 0x5d, 0xf9, 0xaf, 0x72, 0xad, - 0x85, 0x34, 0xa4, 0x72, 0xe9, 0x66, 0x2b, 0xe5, 0xdd, 0xf0, 0x29, 0x8f, 0x29, 0x3f, 0xc9, 0x03, - 0xb9, 0xa1, 0x42, 0xf7, 0x73, 0xcb, 0x8d, 0x79, 0xe8, 0xbe, 0xf8, 0x28, 0xfb, 0x6f, 0xe4, 0xb7, - 0x30, 0x1c, 0x60, 0x1c, 0x9f, 0xf8, 0x11, 0x22, 0x71, 0x0e, 0x72, 0x08, 0x98, 0x6d, 0x1e, 0x7a, - 0x38, 0xa5, 0x4c, 0x1c, 0xd1, 0xd4, 0xc3, 0xbc, 0x1b, 0x09, 0xb3, 0x0e, 0x8b, 0x3e, 0xc3, 0x48, - 0x50, 0x56, 0x37, 0x1a, 0x46, 0xb3, 0xe6, 0xf5, 0x4c, 0xf3, 0x53, 0xa8, 0x15, 0x3d, 0xab, 0xcf, - 0x36, 0x8c, 0xe6, 0xd2, 0xd3, 0xf7, 0x5a, 0xc3, 0x8d, 0x6e, 0xed, 0xf7, 0x20, 0x5e, 0x1f, 0xed, - 0x6c, 0x82, 0xa5, 0x97, 0xf2, 0x30, 0x4f, 0x69, 0xc2, 0xb1, 0xf3, 0xd6, 0x80, 0x75, 0x19, 0x26, - 0x9c, 0x77, 0xb1, 0x77, 0x70, 0xf0, 0xf5, 0x11, 0xa3, 0x29, 0xe5, 0x28, 0x1a, 0xc3, 0xc6, 0x82, - 0xdb, 0xa9, 0x44, 0x61, 0x26, 0xc9, 0xd4, 0xbc, 0xc2, 0x96, 0x59, 0x34, 0x8e, 0x51, 0x12, 0xd4, - 0xe7, 0x54, 0x56, 0x6e, 0x9a, 0x0d, 0x58, 0x3a, 0x8d, 0xa8, 0x7f, 0xfe, 0x0c, 0x93, 0xb0, 0x23, - 0xea, 0xf3, 0x0d, 0xa3, 0x39, 0xe7, 0x95, 0x5d, 0xe6, 0x2e, 0xdc, 0x3d, 0x23, 0x8c, 0x8b, 0xc3, - 0xc4, 0x8f, 0xba, 0x01, 0x0e, 0x8e, 0x68, 0x5a, 0xbf, 0x25, 0x61, 0x9a, 0xdf, 0x6c, 0xc2, 0x4a, - 0x84, 0x06, 0xa1, 0x0b, 0x12, 0x3a, 0xec, 0x76, 0x1a, 0x60, 0x57, 0x7f, 0x61, 0xd1, 0x04, 0x02, - 0xcb, 0x6d, 0x1e, 0xb6, 0x49, 0x22, 0x8e, 0xe9, 0x39, 0x4e, 0xc6, 0x7c, 0xf9, 0x17, 0xb0, 0x94, - 0xf5, 0xdb, 0xcb, 0x07, 0x53, 0x9d, 0xc4, 0x96, 0x7e, 0x12, 0xed, 0x3e, 0xc8, 0x2b, 0x67, 0x38, - 0xeb, 0xb0, 0x56, 0x2e, 0x55, 0x50, 0x78, 0x69, 0xc8, 0x40, 0x89, 0xe5, 0xc4, 0x99, 0x18, 0x77, - 0x0a, 0x26, 0xcc, 0x8b, 0xcb, 0xc3, 0x03, 0x75, 0x04, 0x72, 0x3d, 0xb9, 0xff, 0x8e, 0x0d, 0x9b, - 0x55, 0x1c, 0x0a, 0x92, 0x7f, 0x1b, 0xf0, 0xff, 0x36, 0x0f, 0x0f, 0x4a, 0xd7, 0x6e, 0x22, 0xcb, - 0x3a, 0x2c, 0x66, 0x07, 0x92, 0x9d, 0xcf, 0xac, 0xac, 0xd8, 0x33, 0xb3, 0x48, 0x80, 0xe8, 0x71, - 0x9f, 0x66, 0xcf, 0x34, 0x1d, 0x58, 0x26, 0xc9, 0x0b, 0xcc, 0x05, 0x65, 0x32, 0x3c, 0x2f, 0xc3, - 0x03, 0xbe, 0x2c, 0x3b, 0xa5, 0xa9, 0x0c, 0xdf, 0xca, 0xb3, 0x95, 0x69, 0x3e, 0x86, 0x55, 0x8c, - 0x58, 0x74, 0x75, 0x58, 0xde, 0x62, 0x41, 0x62, 0xf4, 0x80, 0xb9, 0x0d, 0xff, 0xe3, 0x82, 0x21, - 0x81, 0x43, 0xe2, 0x4b, 0xe4, 0xa2, 0x44, 0x0e, 0x3a, 0x9d, 0x07, 0xb0, 0x55, 0xf9, 0xe1, 0x45, - 0x6b, 0x7e, 0x94, 0xd7, 0x68, 0x10, 0x20, 0x4f, 0x7c, 0x4c, 0x6b, 0xbe, 0x82, 0xe5, 0xb2, 0x82, - 0xa9, 0x69, 0x7a, 0xa8, 0x4f, 0x53, 0x79, 0xdb, 0x6f, 0x32, 0x99, 0xf3, 0x06, 0x12, 0xd5, 0x84, - 0x57, 0x14, 0x2f, 0xe8, 0xfd, 0x62, 0xc0, 0x4a, 0x9b, 0x87, 0xdf, 0xa6, 0x01, 0x12, 0xf8, 0x48, - 0x6a, 0xa1, 0xf9, 0x09, 0xd4, 0x50, 0x57, 0x74, 0x28, 0x23, 0xe2, 0x2a, 0xa7, 0xb6, 0x57, 0xff, - 0xe3, 0xf7, 0x27, 0x6b, 0x4a, 0xe6, 0xbe, 0x0c, 0x02, 0x86, 0x39, 0x7f, 0x2e, 0x18, 0x49, 0x42, - 0xaf, 0x0f, 0x35, 0x3f, 0x87, 0x85, 0x5c, 0x4d, 0x15, 0xe1, 0xba, 0x4e, 0x38, 0xaf, 0xb0, 0x57, - 0x7b, 0xfd, 0xd7, 0x83, 0x99, 0xdf, 0xde, 0xbd, 0xda, 0x35, 0x3c, 0x95, 0xf2, 0xd9, 0x9d, 0x97, - 0xef, 0x5e, 0xed, 0xf6, 0x37, 0x73, 0x36, 0xe0, 0xfe, 0x10, 0xaf, 0x82, 0xf3, 0xaf, 0x06, 0x40, - 0x9b, 0x87, 0x87, 0x09, 0xe9, 0x8d, 0xcb, 0x88, 0x3e, 0x6e, 0x42, 0x8d, 0x24, 0x44, 0x10, 0x19, - 0xcb, 0x6f, 0x42, 0xdf, 0x61, 0xda, 0x00, 0x85, 0x18, 0x32, 0x35, 0x69, 0x25, 0xcf, 0x40, 0x1c, - 0xab, 0x51, 0x2b, 0x79, 0xcc, 0x75, 0x58, 0xe8, 0xe4, 0x37, 0x26, 0x97, 0x22, 0x65, 0x39, 0x6b, - 0x52, 0xc2, 0x15, 0xbb, 0x82, 0xf4, 0x0f, 0xf2, 0x1a, 0xef, 0x67, 0xcc, 0xb0, 0x27, 0x75, 0x7f, - 0x3f, 0x93, 0xfd, 0x31, 0xec, 0xb3, 0x6b, 0x89, 0x13, 0x7c, 0x46, 0x7c, 0x82, 0xd8, 0x95, 0xe2, - 0x5f, 0x76, 0x65, 0x0c, 0x50, 0x4c, 0xbb, 0x89, 0x90, 0xec, 0xe7, 0x3d, 0x65, 0xa9, 0xeb, 0xaa, - 0xd5, 0x2a, 0xb8, 0xfc, 0x94, 0x6b, 0x4a, 0xde, 0xdc, 0xe9, 0xc8, 0xdc, 0x81, 0x59, 0x12, 0x48, - 0x0e, 0xf3, 0xde, 0x2c, 0x09, 0x86, 0xc9, 0xcd, 0xe9, 0xe4, 0x1c, 0x58, 0x8e, 0xc8, 0x45, 0x97, - 0x04, 0xc7, 0x97, 0xcf, 0x10, 0xef, 0xf4, 0xee, 0x6a, 0xd9, 0xa7, 0x88, 0x6a, 0x3c, 0x0a, 0xa2, - 0xbe, 0x94, 0x95, 0x7d, 0x9a, 0x9c, 0x11, 0x16, 0xff, 0x47, 0x44, 0xd5, 0x15, 0xd6, 0x8b, 0xf4, - 0x58, 0x3c, 0xfd, 0xe7, 0x36, 0xcc, 0xb5, 0x79, 0x68, 0x5e, 0xc0, 0xbd, 0xaa, 0xe7, 0xb0, 0x59, - 0xa1, 0xf2, 0x95, 0xcf, 0x8a, 0xf5, 0xe1, 0xb4, 0xc8, 0x5e, 0x69, 0xf3, 0x39, 0xd4, 0xfa, 0xaf, - 0x8f, 0x5d, 0x99, 0x5e, 0xc4, 0xad, 0x9d, 0xf1, 0xf1, 0x62, 0xd3, 0x73, 0x58, 0xd5, 0x9f, 0x93, - 0x9d, 0x49, 0xdc, 0x72, 0x9c, 0xd5, 0x9a, 0x0e, 0x57, 0x14, 0x4b, 0xc0, 0xac, 0x78, 0x16, 0x3e, - 0xa8, 0xdc, 0x45, 0x07, 0x5a, 0xee, 0x94, 0xc0, 0xa2, 0xde, 0x05, 0xdc, 0xab, 0x12, 0xdb, 0xe6, - 0x14, 0xfb, 0x48, 0xe4, 0x88, 0x43, 0x1a, 0xa3, 0xa1, 0xe6, 0xf7, 0xb0, 0x3c, 0xa0, 0x9f, 0xef, - 0x57, 0xee, 0x50, 0x86, 0x58, 0x8f, 0x26, 0x42, 0x8a, 0xdd, 0x31, 0xac, 0x0c, 0xff, 0x39, 0xb8, - 0x3d, 0xe2, 0x0c, 0x06, 0x50, 0xd6, 0xe3, 0x69, 0x50, 0x45, 0x99, 0x36, 0x2c, 0xf6, 0x04, 0x75, - 0xb3, 0x32, 0x51, 0x45, 0xad, 0xed, 0x71, 0xd1, 0xf2, 0x8c, 0xe9, 0x5a, 0x57, 0x3d, 0x63, 0x1a, - 0x6e, 0xc4, 0x8c, 0x8d, 0xd4, 0xb3, 0xac, 0x98, 0xae, 0x65, 0x3b, 0x63, 0x5a, 0x3c, 0xb9, 0xd8, - 0x48, 0x4d, 0xca, 0x06, 0xba, 0x42, 0x90, 0xaa, 0x07, 0x5a, 0x07, 0x8e, 0x18, 0xe8, 0xd1, 0xea, - 0xb3, 0x77, 0xf8, 0xfa, 0xda, 0x36, 0xde, 0x5c, 0xdb, 0xc6, 0xdb, 0x6b, 0xdb, 0xf8, 0xf9, 0xc6, - 0x9e, 0x79, 0x73, 0x63, 0xcf, 0xfc, 0x79, 0x63, 0xcf, 0x7c, 0xe7, 0x86, 0x44, 0x74, 0xba, 0xa7, - 0x2d, 0x9f, 0xc6, 0x6e, 0x7f, 0xd3, 0xd2, 0xf2, 0x49, 0x48, 0xdd, 0xcb, 0xfc, 0x47, 0xd8, 0x55, - 0x8a, 0xf9, 0xe9, 0x82, 0xfc, 0x8d, 0xf1, 0xf1, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x81, 0x5c, - 0x0d, 0x9f, 0xa5, 0x0d, 0x00, 0x00, + // 1080 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x57, 0x4f, 0x6f, 0xdc, 0x44, + 0x14, 0x8f, 0x93, 0x34, 0xe9, 0xbe, 0x84, 0xa6, 0x71, 0x43, 0xba, 0x31, 0x89, 0xbb, 0xb8, 0x51, + 0xd8, 0x46, 0xed, 0x1a, 0x8a, 0x84, 0x04, 0x1c, 0x10, 0x49, 0x24, 0x1a, 0x89, 0x15, 0x91, 0x1b, + 0x2e, 0x08, 0x29, 0x9a, 0xd8, 0x13, 0xef, 0x28, 0xb6, 0xc7, 0x99, 0x99, 0xad, 0x12, 0x71, 0xeb, + 0x81, 0x33, 0x27, 0x4e, 0x7c, 0x00, 0x8e, 0x3d, 0xf0, 0x21, 0x7a, 0xac, 0x38, 0x71, 0x42, 0x55, + 0x72, 0xe8, 0x47, 0xe0, 0xc0, 0x05, 0x79, 0x3c, 0xeb, 0xf5, 0xee, 0x78, 0xff, 0x5c, 0xb8, 0xb4, + 0x9e, 0xf7, 0x7e, 0xef, 0xbd, 0x9f, 0xdf, 0xbc, 0xf7, 0x73, 0x16, 0x36, 0xd2, 0x08, 0x25, 0x58, + 0xc4, 0x24, 0x11, 0x21, 0x75, 0x03, 0x44, 0x5d, 0x71, 0xd9, 0x4a, 0x19, 0x15, 0xd4, 0xbc, 0x5b, + 0x76, 0xb5, 0x02, 0x44, 0xad, 0x86, 0x06, 0xf6, 0x3b, 0x28, 0x8a, 0x70, 0x12, 0xe2, 0x3c, 0xc6, + 0x7a, 0xa8, 0x21, 0xb2, 0xc7, 0x13, 0x86, 0x2f, 0xba, 0x98, 0x0b, 0x05, 0x7a, 0xa4, 0x81, 0x02, + 0xc2, 0x05, 0x23, 0xa7, 0x5d, 0x41, 0x68, 0x72, 0x42, 0x59, 0x80, 0x99, 0x82, 0x6e, 0x69, 0xd0, + 0x14, 0x31, 0x14, 0x73, 0xe5, 0x5e, 0x45, 0x31, 0x49, 0xa8, 0x2b, 0xff, 0x55, 0xa6, 0xb5, 0x90, + 0x86, 0x54, 0x3e, 0xba, 0xd9, 0x93, 0xb2, 0x6e, 0xf8, 0x94, 0xc7, 0x94, 0x9f, 0xe4, 0x8e, 0xfc, + 0xa0, 0x5c, 0xf7, 0xf3, 0x93, 0x1b, 0xf3, 0xd0, 0x7d, 0xf1, 0x49, 0xf6, 0xdf, 0xc8, 0x77, 0x61, + 0x38, 0xc0, 0x38, 0x3e, 0xf1, 0x23, 0x44, 0xe2, 0x1c, 0xe4, 0x10, 0x30, 0xdb, 0x3c, 0xf4, 0x70, + 0x4a, 0x99, 0x38, 0xa2, 0xa9, 0x87, 0x79, 0x37, 0x12, 0x66, 0x1d, 0x16, 0x7d, 0x86, 0x91, 0xa0, + 0xac, 0x6e, 0x34, 0x8c, 0x66, 0xcd, 0xeb, 0x1d, 0xcd, 0xcf, 0xa1, 0x56, 0xf4, 0xac, 0x3e, 0xdb, + 0x30, 0x9a, 0x4b, 0x4f, 0x3f, 0x68, 0x0d, 0x37, 0xba, 0xb5, 0xdf, 0x83, 0x78, 0x7d, 0xb4, 0xb3, + 0x09, 0x96, 0x5e, 0xca, 0xc3, 0x3c, 0xa5, 0x09, 0xc7, 0xce, 0x5b, 0x03, 0xd6, 0xa5, 0x9b, 0x70, + 0xde, 0xc5, 0xde, 0xc1, 0xc1, 0xb7, 0x47, 0x8c, 0xa6, 0x94, 0xa3, 0x68, 0x0c, 0x1b, 0x0b, 0x6e, + 0xa7, 0x12, 0x85, 0x99, 0x24, 0x53, 0xf3, 0x8a, 0xb3, 0x8c, 0xa2, 0x71, 0x8c, 0x92, 0xa0, 0x3e, + 0xa7, 0xa2, 0xf2, 0xa3, 0xd9, 0x80, 0xa5, 0xd3, 0x88, 0xfa, 0xe7, 0xcf, 0x30, 0x09, 0x3b, 0xa2, + 0x3e, 0xdf, 0x30, 0x9a, 0x73, 0x5e, 0xd9, 0x64, 0xee, 0xc2, 0xdd, 0x33, 0xc2, 0xb8, 0x38, 0x4c, + 0xfc, 0xa8, 0x1b, 0xe0, 0xe0, 0x88, 0xa6, 0xf5, 0x5b, 0x12, 0xa6, 0xd9, 0xcd, 0x26, 0xac, 0x44, + 0x68, 0x10, 0xba, 0x20, 0xa1, 0xc3, 0x66, 0xa7, 0x01, 0x76, 0xf5, 0x1b, 0x16, 0x4d, 0x20, 0xb0, + 0xdc, 0xe6, 0x61, 0x9b, 0x24, 0xe2, 0x98, 0x9e, 0xe3, 0x64, 0xcc, 0x9b, 0x7f, 0x05, 0x4b, 0x59, + 0xbf, 0xbd, 0x7c, 0x30, 0xd5, 0x4d, 0x6c, 0xe9, 0x37, 0xd1, 0xee, 0x83, 0xbc, 0x72, 0x84, 0xb3, + 0x0e, 0x6b, 0xe5, 0x52, 0x05, 0x85, 0x97, 0x86, 0x74, 0x94, 0x58, 0x4e, 0x9c, 0x89, 0x71, 0xb7, + 0x60, 0xc2, 0xbc, 0xb8, 0x3c, 0x3c, 0x50, 0x57, 0x20, 0x9f, 0x27, 0xf7, 0xdf, 0xb1, 0x61, 0xb3, + 0x8a, 0x43, 0x41, 0xf2, 0x1f, 0x03, 0xde, 0x6f, 0xf3, 0xf0, 0xa0, 0xb4, 0x76, 0x13, 0x59, 0xd6, + 0x61, 0x31, 0xbb, 0x90, 0xec, 0x7e, 0x66, 0x65, 0xc5, 0xde, 0x31, 0xf3, 0x04, 0x88, 0x1e, 0xf7, + 0x69, 0xf6, 0x8e, 0xa6, 0x03, 0xcb, 0x24, 0x79, 0x81, 0xb9, 0xa0, 0x4c, 0xba, 0xe7, 0xa5, 0x7b, + 0xc0, 0x96, 0x45, 0xa7, 0x34, 0x95, 0xee, 0x5b, 0x79, 0xb4, 0x3a, 0x9a, 0x8f, 0x61, 0x15, 0x23, + 0x16, 0x5d, 0x1d, 0x96, 0x53, 0x2c, 0x48, 0x8c, 0xee, 0x30, 0xb7, 0xe1, 0x3d, 0x2e, 0x18, 0x12, + 0x38, 0x24, 0xbe, 0x44, 0x2e, 0x4a, 0xe4, 0xa0, 0xd1, 0x79, 0x00, 0x5b, 0x95, 0x2f, 0x5e, 0xb4, + 0xe6, 0x27, 0xb9, 0x46, 0x83, 0x00, 0x79, 0xe3, 0x63, 0x5a, 0xf3, 0x0d, 0x2c, 0x97, 0x15, 0x4c, + 0x4d, 0xd3, 0x43, 0x7d, 0x9a, 0xca, 0x69, 0xbf, 0xcb, 0x64, 0xce, 0x1b, 0x08, 0x54, 0x13, 0x5e, + 0x51, 0xbc, 0xa0, 0xf7, 0xab, 0x01, 0x2b, 0x6d, 0x1e, 0x7e, 0x9f, 0x06, 0x48, 0xe0, 0x23, 0xa9, + 0x85, 0xe6, 0x67, 0x50, 0x43, 0x5d, 0xd1, 0xa1, 0x8c, 0x88, 0xab, 0x9c, 0xda, 0x5e, 0xfd, 0xcf, + 0x3f, 0x9e, 0xac, 0x29, 0x99, 0xfb, 0x3a, 0x08, 0x18, 0xe6, 0xfc, 0xb9, 0x60, 0x24, 0x09, 0xbd, + 0x3e, 0xd4, 0xfc, 0x12, 0x16, 0x72, 0x35, 0x55, 0x84, 0xeb, 0x3a, 0xe1, 0xbc, 0xc2, 0x5e, 0xed, + 0xf5, 0xdf, 0x0f, 0x66, 0x7e, 0x7f, 0xf7, 0x6a, 0xd7, 0xf0, 0x54, 0xc8, 0x17, 0x77, 0x5e, 0xbe, + 0x7b, 0xb5, 0xdb, 0x4f, 0xe6, 0x6c, 0xc0, 0xfd, 0x21, 0x5e, 0x05, 0xe7, 0xdf, 0x0c, 0x80, 0x36, + 0x0f, 0x0f, 0x13, 0xd2, 0x1b, 0x97, 0x11, 0x7d, 0xdc, 0x84, 0x1a, 0x49, 0x88, 0x20, 0xd2, 0x97, + 0x6f, 0x42, 0xdf, 0x60, 0xda, 0x00, 0x85, 0x18, 0x32, 0x35, 0x69, 0x25, 0xcb, 0x80, 0x1f, 0xab, + 0x51, 0x2b, 0x59, 0xcc, 0x75, 0x58, 0xe8, 0xe4, 0x1b, 0x93, 0x4b, 0x91, 0x3a, 0x39, 0x6b, 0x52, + 0xc2, 0x15, 0xbb, 0x82, 0xb4, 0x27, 0xd7, 0x78, 0x3f, 0x63, 0x86, 0x3d, 0xa9, 0xfb, 0xfb, 0x99, + 0xec, 0x8f, 0x61, 0x9f, 0xad, 0x25, 0x4e, 0xf0, 0x19, 0xf1, 0x09, 0x62, 0x57, 0x8a, 0x7f, 0xd9, + 0xa4, 0xd6, 0x52, 0xcb, 0x59, 0xd4, 0xfc, 0x39, 0xd7, 0x8e, 0xbc, 0x89, 0xd3, 0x15, 0xbd, 0x03, + 0xb3, 0x24, 0x90, 0xb5, 0xe6, 0xbd, 0x59, 0x12, 0x0c, 0x93, 0x98, 0xd3, 0x48, 0x64, 0x3b, 0x19, + 0x91, 0x8b, 0x2e, 0x09, 0x8e, 0x2f, 0x9f, 0x21, 0xde, 0xe9, 0xed, 0x64, 0xd9, 0xa6, 0x88, 0x6a, + 0x3c, 0x0a, 0xa2, 0xbe, 0x94, 0x8f, 0x7d, 0x9a, 0x9c, 0x11, 0x16, 0xff, 0x4f, 0x44, 0xd5, 0xaa, + 0xea, 0x45, 0x7a, 0x2c, 0x9e, 0xfe, 0x7b, 0x1b, 0xe6, 0xda, 0x3c, 0x34, 0x2f, 0xe0, 0x5e, 0xd5, + 0x67, 0xaf, 0x59, 0xa1, 0xe6, 0x95, 0x9f, 0x0f, 0xeb, 0xe3, 0x69, 0x91, 0xbd, 0xd2, 0xe6, 0x73, + 0xa8, 0xf5, 0xbf, 0x32, 0x76, 0x65, 0x78, 0xe1, 0xb7, 0x76, 0xc6, 0xfb, 0x8b, 0xa4, 0xe7, 0xb0, + 0xaa, 0x7f, 0x36, 0x76, 0x26, 0x71, 0xcb, 0x71, 0x56, 0x6b, 0x3a, 0x5c, 0x51, 0x2c, 0x01, 0xb3, + 0x42, 0xfe, 0x3f, 0xaa, 0xcc, 0xa2, 0x03, 0x2d, 0x77, 0x4a, 0x60, 0x51, 0xef, 0x02, 0xee, 0x55, + 0x89, 0x6a, 0x73, 0x8a, 0x3c, 0x12, 0x39, 0xe2, 0x92, 0xc6, 0x68, 0xa5, 0xf9, 0x23, 0x2c, 0x0f, + 0xe8, 0xe4, 0x87, 0x95, 0x19, 0xca, 0x10, 0xeb, 0xd1, 0x44, 0x48, 0x91, 0x1d, 0xc3, 0xca, 0xf0, + 0x9f, 0x7d, 0xdb, 0x23, 0xee, 0x60, 0x00, 0x65, 0x3d, 0x9e, 0x06, 0x55, 0x94, 0x69, 0xc3, 0x62, + 0x4f, 0x38, 0x37, 0x2b, 0x03, 0x95, 0xd7, 0xda, 0x1e, 0xe7, 0x2d, 0xcf, 0x98, 0xae, 0x69, 0xd5, + 0x33, 0xa6, 0xe1, 0x46, 0xcc, 0xd8, 0x48, 0x3d, 0xcb, 0x8a, 0xe9, 0x5a, 0xb6, 0x33, 0xa6, 0xc5, + 0x93, 0x8b, 0x8d, 0xd4, 0xa4, 0x6c, 0xa0, 0x2b, 0x04, 0xa9, 0x7a, 0xa0, 0x75, 0xe0, 0x88, 0x81, + 0x1e, 0xad, 0x3e, 0x7b, 0x87, 0xaf, 0xaf, 0x6d, 0xe3, 0xcd, 0xb5, 0x6d, 0xbc, 0xbd, 0xb6, 0x8d, + 0x5f, 0x6e, 0xec, 0x99, 0x37, 0x37, 0xf6, 0xcc, 0x5f, 0x37, 0xf6, 0xcc, 0x0f, 0x6e, 0x48, 0x44, + 0xa7, 0x7b, 0xda, 0xf2, 0x69, 0xec, 0xf6, 0x93, 0x96, 0x1e, 0x9f, 0x84, 0xd4, 0xbd, 0xcc, 0x7f, + 0x6c, 0x5d, 0xa5, 0x98, 0x9f, 0x2e, 0xc8, 0xdf, 0x12, 0x9f, 0xfe, 0x17, 0x00, 0x00, 0xff, 0xff, + 0x09, 0x2c, 0x96, 0x95, 0x8d, 0x0d, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -2289,11 +2280,6 @@ func (m *MsgCreateRedeemClaim) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if m.Amount != 0 { - i = encodeVarintTx(dAtA, i, uint64(m.Amount)) - i-- - dAtA[i] = 0x18 - } if len(m.Beneficiary) > 0 { i -= len(m.Beneficiary) copy(dAtA[i:], m.Beneficiary) @@ -2752,9 +2738,6 @@ func (m *MsgCreateRedeemClaim) Size() (n int) { if l > 0 { n += 1 + l + sovTx(uint64(l)) } - if m.Amount != 0 { - n += 1 + sovTx(uint64(m.Amount)) - } return n } @@ -4623,25 +4606,6 @@ func (m *MsgCreateRedeemClaim) Unmarshal(dAtA []byte) error { } m.Beneficiary = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex - case 3: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Amount", wireType) - } - m.Amount = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTx - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.Amount |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } default: iNdEx = preIndex skippy, err := skipTx(dAtA[iNdEx:])