Vault updates (#1409)

* register missing messages

* default param

* query fix

Author: amityadav0

x/vaults/keeper/msg_withdraw.go

@@ -5,6 +5,7 @@ import (
 	"strings"
 
 	errorsmod "cosmossdk.io/errors"
+	sdkmath "cosmossdk.io/math"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	ammtypes "github.com/elys-network/elys/v7/x/amm/types"
 	"github.com/elys-network/elys/v7/x/vaults/types"
@@ -144,8 +145,7 @@ func (k Keeper) SwapToDepositDenom(ctx sdk.Context, depositDenom string, toSendC
 				DenomIn:   coin.Denom,
 				DenomOut:  depositDenom,
 				Recipient: recipient.String(),
-				// MinAmount: sdk.NewInt(0)
-				// MaxAmount: ,
+				MinAmount: sdk.NewCoin(depositDenom, sdkmath.ZeroInt()),
 			})
 			if err != nil {
 				return nil, err

x/vaults/keeper/query_estimation.go

@@ -21,10 +21,9 @@ func (k Keeper) DepositEstimation(goCtx context.Context, req *types.QueryDeposit
 	}
 
 	redemptionRate := k.CalculateRedemptionRateForVault(ctx, vault.Id)
-	var usdValue osmomath.BigDec
+	usdValue := k.amm.CalculateUSDValue(ctx, vault.DepositDenom, req.Amount)
 	var shareAmount sdkmath.Int
 	if redemptionRate.IsZero() {
-		usdValue = k.amm.CalculateUSDValue(ctx, vault.DepositDenom, req.Amount)
 		if usdValue.IsZero() {
 			return nil, types.ErrDepositValueZero
 		}

x/vaults/keeper/query_vault.go

@@ -65,9 +65,9 @@ func (k Keeper) GetVaultAndData(ctx sdk.Context, vaultId uint64, days uint64) (t
 	depositDenomUsdValue := k.amm.CalculateUSDValue(ctx, vault.DepositDenom, balance.Amount)
 	var depositsUsed osmomath.BigDec
 	if totalDepositsUsd.Equal(depositDenomUsdValue) {
-		depositsUsed = osmomath.OneBigDec()
+		depositsUsed = osmomath.ZeroBigDec()
 	} else {
-		depositsUsed = depositDenomUsdValue.Quo(totalDepositsUsd.Sub(depositDenomUsdValue))
+		depositsUsed = osmomath.OneBigDec().Sub(depositDenomUsdValue.Quo(totalDepositsUsd.Sub(depositDenomUsdValue)))
 	}
 	positions, err := k.GetVaultPositions(ctx, vaultId)
 	if err != nil {

x/vaults/types/codec.go

@@ -21,7 +21,8 @@ func RegisterLegacyAminoCodec(cdc *codec.LegacyAmino) {
 	legacy.RegisterAminoMsg(cdc, &MsgUpdateVaultFees{}, "vaults/MsgUpdateVaultFees")
 	legacy.RegisterAminoMsg(cdc, &MsgUpdateVaultLockupPeriod{}, "vaults/MsgUpdateVaultLockupPeriod")
 	legacy.RegisterAminoMsg(cdc, &MsgUpdateVaultMaxAmountUsd{}, "vaults/MsgUpdateVaultMaxAmountUsd")
-
+	legacy.RegisterAminoMsg(cdc, &MsgClaimRewards{}, "vaults/MsgClaimRewards")
+	legacy.RegisterAminoMsg(cdc, &MsgUpdateVaultAllowedActions{}, "vaults/MsgUpdateVaultAllowedActions")
 }
 
 func RegisterInterfaces(registry cdctypes.InterfaceRegistry) {
@@ -39,6 +40,8 @@ func RegisterInterfaces(registry cdctypes.InterfaceRegistry) {
 		&MsgUpdateVaultFees{},
 		&MsgUpdateVaultLockupPeriod{},
 		&MsgUpdateVaultMaxAmountUsd{},
+		&MsgClaimRewards{},
+		&MsgUpdateVaultAllowedActions{},
 	)
 	msgservice.RegisterMsgServiceDesc(registry, &_Msg_serviceDesc)
 }

x/vaults/types/params.go

@@ -1,41 +1,34 @@
 package types
 
 import (
-	
-
 	paramtypes "github.com/cosmos/cosmos-sdk/x/params/types"
 )
 
 var _ paramtypes.ParamSet = (*Params)(nil)
 
-
-
 // ParamKeyTable the param key table for launch module
 func ParamKeyTable() paramtypes.KeyTable {
 	return paramtypes.NewKeyTable().RegisterParamSet(&Params{})
 }
 
 // NewParams creates a new Params instance
-func NewParams(
-) Params {
+func NewParams() Params {
 	return Params{
+		PerformanceFeeEpochLength: 100,
 	}
 }
 
 // DefaultParams returns a default set of parameters
 func DefaultParams() Params {
-	return NewParams(
-	)
+	return NewParams()
 }
 
 // ParamSetPairs get the params.ParamSet
 func (p *Params) ParamSetPairs() paramtypes.ParamSetPairs {
-	return paramtypes.ParamSetPairs{
-	}
+	return paramtypes.ParamSetPairs{}
 }
 
 // Validate validates the set of params
 func (p Params) Validate() error {
 	return nil
 }
-