From 523c4c1ee157ba063203d9a7100e90da89b0483f Mon Sep 17 00:00:00 2001 From: Vishnu Kumavat Date: Tue, 18 Oct 2022 18:25:11 +0530 Subject: [PATCH 1/8] vault module aliag.go removed --- x/vault/keeper/alias.go | 105 ------------- x/vault/keeper/msg_server.go | 259 ++++++++++++++++++--------------- x/vault/keeper/query_server.go | 66 ++++----- x/vault/keeper/vault.go | 32 ++-- 4 files changed, 194 insertions(+), 268 deletions(-) delete mode 100644 x/vault/keeper/alias.go diff --git a/x/vault/keeper/alias.go b/x/vault/keeper/alias.go deleted file mode 100644 index 334aea89e..000000000 --- a/x/vault/keeper/alias.go +++ /dev/null @@ -1,105 +0,0 @@ -package keeper - -import ( - sdk "github.com/cosmos/cosmos-sdk/types" - - assettypes "github.com/comdex-official/comdex/x/asset/types" - esmtypes "github.com/comdex-official/comdex/x/esm/types" - rewardstypes "github.com/comdex-official/comdex/x/rewards/types" - vaulttypes "github.com/comdex-official/comdex/x/vault/types" -) - -func (k Keeper) BurnCoin(ctx sdk.Context, name string, coin sdk.Coin) error { - if coin.IsZero() { - return vaulttypes.BurnCoinValueInVaultIsZero - } - - return k.bank.BurnCoins(ctx, name, sdk.NewCoins(coin)) -} - -func (k Keeper) MintCoin(ctx sdk.Context, name string, coin sdk.Coin) error { - if coin.IsZero() { - return vaulttypes.MintCoinValueInVaultIsZero - } - - return k.bank.MintCoins(ctx, name, sdk.NewCoins(coin)) -} - -func (k Keeper) SendCoinFromAccountToModule(ctx sdk.Context, address sdk.AccAddress, name string, coin sdk.Coin) error { - if coin.IsZero() { - return vaulttypes.SendCoinsFromAccountToModuleInVaultIsZero - } - - return k.bank.SendCoinsFromAccountToModule(ctx, address, name, sdk.NewCoins(coin)) -} - -func (k Keeper) SendCoinFromModuleToAccount(ctx sdk.Context, name string, address sdk.AccAddress, coin sdk.Coin) error { - if coin.IsZero() { - return vaulttypes.SendCoinsFromModuleToAccountInVaultIsZero - } - - return k.bank.SendCoinsFromModuleToAccount(ctx, name, address, sdk.NewCoins(coin)) -} - -func (k Keeper) SendCoinFromModuleToModule(ctx sdk.Context, senderModule, recipientModule string, coin sdk.Coins) error { - if coin.IsZero() { - return vaulttypes.SendCoinsFromModuleToModuleInVaultIsZero - } - return k.bank.SendCoinsFromModuleToModule(ctx, senderModule, recipientModule, coin) -} - -func (k Keeper) SpendableCoins(ctx sdk.Context, address sdk.AccAddress) sdk.Coins { - return k.bank.SpendableCoins(ctx, address) -} - -func (k Keeper) GetAsset(ctx sdk.Context, id uint64) (assettypes.Asset, bool) { - return k.asset.GetAsset(ctx, id) -} - -func (k Keeper) GetPair(ctx sdk.Context, id uint64) (assettypes.Pair, bool) { - return k.asset.GetPair(ctx, id) -} - -func (k Keeper) GetApp(ctx sdk.Context, id uint64) (assettypes.AppData, bool) { - return k.asset.GetApp(ctx, id) -} - -func (k Keeper) GetPairsVault(ctx sdk.Context, pairID uint64) (assettypes.ExtendedPairVault, bool) { - return k.asset.GetPairsVault(ctx, pairID) -} - -func (k Keeper) UpdateCollector(ctx sdk.Context, appID, assetID uint64, CollectedStabilityFee, CollectedClosingFee, CollectedOpeningFee, LiquidationRewardsCollected sdk.Int) error { - return k.collector.UpdateCollector(ctx, appID, assetID, CollectedStabilityFee, CollectedClosingFee, CollectedOpeningFee, LiquidationRewardsCollected) -} - -func (k Keeper) GetKillSwitchData(ctx sdk.Context, appID uint64) (esmtypes.KillSwitchParams, bool) { - return k.esm.GetKillSwitchData(ctx, appID) -} - -func (k Keeper) GetESMStatus(ctx sdk.Context, id uint64) (esmtypes.ESMStatus, bool) { - return k.esm.GetESMStatus(ctx, id) -} - -func (k Keeper) GetSnapshotOfPrices(ctx sdk.Context, appID, assetID uint64) (price uint64, found bool) { - return k.esm.GetSnapshotOfPrices(ctx, appID, assetID) -} - -func (k Keeper) GetESMTriggerParams(ctx sdk.Context, id uint64) (esmTriggerParams esmtypes.ESMTriggerParams, found bool) { - return k.esm.GetESMTriggerParams(ctx, id) -} - -func (k Keeper) UpdateAssetDataInTokenMintByApp(ctx sdk.Context, appMappingID uint64, assetID uint64, changeType bool, amount sdk.Int) { - k.tokenmint.UpdateAssetDataInTokenMintByApp(ctx, appMappingID, assetID, changeType, amount) -} - -func (k Keeper) CalculateVaultInterest(ctx sdk.Context, appID, assetID, lockerID uint64, NetBalance sdk.Int, blockHeight int64, lockerBlockTime int64) error { - return k.rewards.CalculateVaultInterest(ctx, appID, assetID, lockerID, NetBalance, blockHeight, lockerBlockTime) -} - -func (k Keeper) DeleteVaultInterestTracker(ctx sdk.Context, vault rewardstypes.VaultInterestTracker) { - k.rewards.DeleteVaultInterestTracker(ctx, vault) -} - -func (k Keeper) CalcAssetPrice(ctx sdk.Context, id uint64, amt sdk.Int) (price sdk.Dec, err error) { - return k.oracle.CalcAssetPrice(ctx, id, amt) -} diff --git a/x/vault/keeper/msg_server.go b/x/vault/keeper/msg_server.go index 1fe0a81b5..7795ce97c 100644 --- a/x/vault/keeper/msg_server.go +++ b/x/vault/keeper/msg_server.go @@ -9,6 +9,7 @@ import ( esmtypes "github.com/comdex-official/comdex/x/esm/types" rewardstypes "github.com/comdex-official/comdex/x/rewards/types" "github.com/comdex-official/comdex/x/vault/types" + vaulttypes "github.com/comdex-official/comdex/x/vault/types" ) var _ types.MsgServer = msgServer{} @@ -26,7 +27,7 @@ func NewMsgServer(keeper Keeper) types.MsgServer { // MsgCreate Creating a new CDP. func (k msgServer) MsgCreate(c context.Context, msg *types.MsgCreateRequest) (*types.MsgCreateResponse, error) { ctx := sdk.UnwrapSDKContext(c) - esmStatus, found := k.GetESMStatus(ctx, msg.AppId) + esmStatus, found := k.esm.GetESMStatus(ctx, msg.AppId) status := false if found { status = esmStatus.Status @@ -34,28 +35,28 @@ func (k msgServer) MsgCreate(c context.Context, msg *types.MsgCreateRequest) (*t if status { return nil, esmtypes.ErrESMAlreadyExecuted } - killSwitchParams, _ := k.GetKillSwitchData(ctx, msg.AppId) + killSwitchParams, _ := k.esm.GetKillSwitchData(ctx, msg.AppId) if killSwitchParams.BreakerEnable { return nil, esmtypes.ErrCircuitBreakerEnabled } - extendedPairVault, found := k.GetPairsVault(ctx, msg.ExtendedPairVaultId) + extendedPairVault, found := k.asset.GetPairsVault(ctx, msg.ExtendedPairVaultId) if !found { return nil, types.ErrorExtendedPairVaultDoesNotExists } - pairData, found := k.GetPair(ctx, extendedPairVault.PairId) + pairData, found := k.asset.GetPair(ctx, extendedPairVault.PairId) if !found { return nil, types.ErrorPairDoesNotExist } - assetInData, found := k.GetAsset(ctx, pairData.AssetIn) + assetInData, found := k.asset.GetAsset(ctx, pairData.AssetIn) if !found { return nil, types.ErrorAssetDoesNotExist } - assetOutData, found := k.GetAsset(ctx, pairData.AssetOut) + assetOutData, found := k.asset.GetAsset(ctx, pairData.AssetOut) if !found { return nil, types.ErrorAssetDoesNotExist } - appMapping, found := k.GetApp(ctx, msg.AppId) + appMapping, found := k.asset.GetApp(ctx, msg.AppId) if !found { return nil, types.ErrorAppMappingDoesNotExist } @@ -104,20 +105,24 @@ func (k msgServer) MsgCreate(c context.Context, msg *types.MsgCreateRequest) (*t } // Take amount from user if msg.AmountIn.GT(sdk.ZeroInt()) { - if err := k.SendCoinFromAccountToModule(ctx, depositorAddress, types.ModuleName, sdk.NewCoin(assetInData.Denom, msg.AmountIn)); err != nil { + if err := k.bank.SendCoinsFromAccountToModule(ctx, depositorAddress, types.ModuleName, sdk.NewCoins(sdk.NewCoin(assetInData.Denom, msg.AmountIn))); err != nil { return nil, err } } // Mint Tokens for user - if err := k.MintCoin(ctx, types.ModuleName, sdk.NewCoin(assetOutData.Denom, msg.AmountOut)); err != nil { + mintCoin := sdk.NewCoin(assetOutData.Denom, msg.AmountOut) + if mintCoin.IsZero() { + return nil, vaulttypes.MintCoinValueInVaultIsZero + } + if err := k.bank.MintCoins(ctx, types.ModuleName, sdk.NewCoins(mintCoin)); err != nil { return nil, err } // Send Fees to Accumulator // Deducting Opening Fee if 0 opening fee then act accordingly if extendedPairVault.DrawDownFee.IsZero() && msg.AmountOut.GT(sdk.ZeroInt()) { // Send Rest to user - if err := k.SendCoinFromModuleToAccount(ctx, types.ModuleName, depositorAddress, sdk.NewCoin(assetOutData.Denom, msg.AmountOut)); err != nil { + if err := k.bank.SendCoinsFromModuleToAccount(ctx, types.ModuleName, depositorAddress, sdk.NewCoins(sdk.NewCoin(assetOutData.Denom, msg.AmountOut))); err != nil { return nil, err } } else { @@ -126,11 +131,11 @@ func (k msgServer) MsgCreate(c context.Context, msg *types.MsgCreateRequest) (*t collectorShare := (msg.AmountOut.Mul(sdk.Int(extendedPairVault.DrawDownFee))).Quo(sdk.Int(sdk.OneDec())) if collectorShare.GT(sdk.ZeroInt()) { - if err := k.SendCoinFromModuleToModule(ctx, types.ModuleName, collectortypes.ModuleName, sdk.NewCoins(sdk.NewCoin(assetOutData.Denom, collectorShare))); err != nil { + if err := k.bank.SendCoinsFromModuleToModule(ctx, types.ModuleName, collectortypes.ModuleName, sdk.NewCoins(sdk.NewCoin(assetOutData.Denom, collectorShare))); err != nil { return nil, err } - err := k.UpdateCollector(ctx, appMapping.Id, pairData.AssetOut, sdk.ZeroInt(), sdk.ZeroInt(), collectorShare, sdk.ZeroInt()) + err := k.collector.UpdateCollector(ctx, appMapping.Id, pairData.AssetOut, sdk.ZeroInt(), sdk.ZeroInt(), collectorShare, sdk.ZeroInt()) if err != nil { return nil, err } @@ -139,7 +144,7 @@ func (k msgServer) MsgCreate(c context.Context, msg *types.MsgCreateRequest) (*t // and send the rest to the user amountToUser := msg.AmountOut.Sub(collectorShare) if amountToUser.GT(sdk.ZeroInt()) { - if err := k.SendCoinFromModuleToAccount(ctx, types.ModuleName, depositorAddress, sdk.NewCoin(assetOutData.Denom, amountToUser)); err != nil { + if err := k.bank.SendCoinsFromModuleToAccount(ctx, types.ModuleName, depositorAddress, sdk.NewCoins(sdk.NewCoin(assetOutData.Denom, amountToUser))); err != nil { return nil, err } } @@ -196,7 +201,7 @@ func (k msgServer) MsgCreate(c context.Context, msg *types.MsgCreateRequest) (*t // MsgDeposit Only for depositing new collateral. func (k msgServer) MsgDeposit(c context.Context, msg *types.MsgDepositRequest) (*types.MsgDepositResponse, error) { ctx := sdk.UnwrapSDKContext(c) - esmStatus, found := k.GetESMStatus(ctx, msg.AppId) + esmStatus, found := k.esm.GetESMStatus(ctx, msg.AppId) status := false if found { status = esmStatus.Status @@ -204,7 +209,7 @@ func (k msgServer) MsgDeposit(c context.Context, msg *types.MsgDepositRequest) ( if status { return nil, esmtypes.ErrESMAlreadyExecuted } - klwsParams, _ := k.GetKillSwitchData(ctx, msg.AppId) + klwsParams, _ := k.esm.GetKillSwitchData(ctx, msg.AppId) if klwsParams.BreakerEnable { return nil, esmtypes.ErrCircuitBreakerEnabled } @@ -214,21 +219,21 @@ func (k msgServer) MsgDeposit(c context.Context, msg *types.MsgDepositRequest) ( } // checks if extended pair exists - extendedPairVault, found := k.GetPairsVault(ctx, msg.ExtendedPairVaultId) + extendedPairVault, found := k.asset.GetPairsVault(ctx, msg.ExtendedPairVaultId) if !found { return nil, types.ErrorExtendedPairVaultDoesNotExists } - pairData, found := k.GetPair(ctx, extendedPairVault.PairId) + pairData, found := k.asset.GetPair(ctx, extendedPairVault.PairId) if !found { return nil, types.ErrorPairDoesNotExist } - assetInData, found := k.GetAsset(ctx, pairData.AssetIn) + assetInData, found := k.asset.GetAsset(ctx, pairData.AssetIn) if !found { return nil, types.ErrorAssetDoesNotExist } // Checking if appMapping_id exists - appMapping, found := k.GetApp(ctx, msg.AppId) + appMapping, found := k.asset.GetApp(ctx, msg.AppId) if !found { return nil, types.ErrorAppMappingDoesNotExist } @@ -258,7 +263,7 @@ func (k msgServer) MsgDeposit(c context.Context, msg *types.MsgDepositRequest) ( } totalDebt := userVault.AmountOut.Add(userVault.InterestAccumulated) - err1 := k.CalculateVaultInterest(ctx, appMapping.Id, msg.ExtendedPairVaultId, msg.UserVaultId, totalDebt, userVault.BlockHeight, userVault.BlockTime.Unix()) + err1 := k.rewards.CalculateVaultInterest(ctx, appMapping.Id, msg.ExtendedPairVaultId, msg.UserVaultId, totalDebt, userVault.BlockHeight, userVault.BlockTime.Unix()) if err1 != nil { return nil, err1 } @@ -272,7 +277,7 @@ func (k msgServer) MsgDeposit(c context.Context, msg *types.MsgDepositRequest) ( } if msg.Amount.GT(sdk.ZeroInt()) { - if err := k.SendCoinFromAccountToModule(ctx, depositor, types.ModuleName, sdk.NewCoin(assetInData.Denom, msg.Amount)); err != nil { + if err := k.bank.SendCoinsFromAccountToModule(ctx, depositor, types.ModuleName, sdk.NewCoins(sdk.NewCoin(assetInData.Denom, msg.Amount))); err != nil { return nil, err } } @@ -292,11 +297,11 @@ func (k msgServer) MsgDeposit(c context.Context, msg *types.MsgDepositRequest) ( // MsgWithdraw Withdrawing collateral. func (k msgServer) MsgWithdraw(c context.Context, msg *types.MsgWithdrawRequest) (*types.MsgWithdrawResponse, error) { ctx := sdk.UnwrapSDKContext(c) - killSwitchParams, _ := k.GetKillSwitchData(ctx, msg.AppId) + killSwitchParams, _ := k.esm.GetKillSwitchData(ctx, msg.AppId) if killSwitchParams.BreakerEnable { return nil, esmtypes.ErrCircuitBreakerEnabled } - esmStatus, found := k.GetESMStatus(ctx, msg.AppId) + esmStatus, found := k.esm.GetESMStatus(ctx, msg.AppId) status := false if found { status = esmStatus.Status @@ -312,21 +317,21 @@ func (k msgServer) MsgWithdraw(c context.Context, msg *types.MsgWithdrawRequest) } // checks if extended pair exists - extendedPairVault, found := k.GetPairsVault(ctx, msg.ExtendedPairVaultId) + extendedPairVault, found := k.asset.GetPairsVault(ctx, msg.ExtendedPairVaultId) if !found { return nil, types.ErrorExtendedPairVaultDoesNotExists } - pairData, found := k.GetPair(ctx, extendedPairVault.PairId) + pairData, found := k.asset.GetPair(ctx, extendedPairVault.PairId) if !found { return nil, types.ErrorPairDoesNotExist } - assetInData, found := k.GetAsset(ctx, pairData.AssetIn) + assetInData, found := k.asset.GetAsset(ctx, pairData.AssetIn) if !found { return nil, types.ErrorAssetDoesNotExist } // Checking if appMapping_id exists - appMapping, found := k.GetApp(ctx, msg.AppId) + appMapping, found := k.asset.GetApp(ctx, msg.AppId) if !found { return nil, types.ErrorAppMappingDoesNotExist } @@ -355,7 +360,7 @@ func (k msgServer) MsgWithdraw(c context.Context, msg *types.MsgWithdrawRequest) } totalDebt := userVault.AmountOut.Add(userVault.InterestAccumulated) - err1 := k.CalculateVaultInterest(ctx, appMapping.Id, msg.ExtendedPairVaultId, msg.UserVaultId, totalDebt, userVault.BlockHeight, userVault.BlockTime.Unix()) + err1 := k.rewards.CalculateVaultInterest(ctx, appMapping.Id, msg.ExtendedPairVaultId, msg.UserVaultId, totalDebt, userVault.BlockHeight, userVault.BlockTime.Unix()) if err1 != nil { return nil, err1 } @@ -377,7 +382,7 @@ func (k msgServer) MsgWithdraw(c context.Context, msg *types.MsgWithdrawRequest) return nil, err } if msg.Amount.GT(sdk.ZeroInt()) { - if err := k.SendCoinFromModuleToAccount(ctx, types.ModuleName, depositor, sdk.NewCoin(assetInData.Denom, msg.Amount)); err != nil { + if err := k.bank.SendCoinsFromModuleToAccount(ctx, types.ModuleName, depositor, sdk.NewCoins(sdk.NewCoin(assetInData.Denom, msg.Amount))); err != nil { return nil, err } } @@ -397,7 +402,7 @@ func (k msgServer) MsgWithdraw(c context.Context, msg *types.MsgWithdrawRequest) // MsgDraw To borrow more amount. func (k msgServer) MsgDraw(c context.Context, msg *types.MsgDrawRequest) (*types.MsgDrawResponse, error) { ctx := sdk.UnwrapSDKContext(c) - esmStatus, found := k.GetESMStatus(ctx, msg.AppId) + esmStatus, found := k.esm.GetESMStatus(ctx, msg.AppId) status := false if found { status = esmStatus.Status @@ -405,7 +410,7 @@ func (k msgServer) MsgDraw(c context.Context, msg *types.MsgDrawRequest) (*types if status { return nil, esmtypes.ErrESMAlreadyExecuted } - killSwitchParams, _ := k.GetKillSwitchData(ctx, msg.AppId) + killSwitchParams, _ := k.esm.GetKillSwitchData(ctx, msg.AppId) if killSwitchParams.BreakerEnable { return nil, esmtypes.ErrCircuitBreakerEnabled } @@ -415,21 +420,21 @@ func (k msgServer) MsgDraw(c context.Context, msg *types.MsgDrawRequest) (*types } // checks if extended pair exists - extendedPairVault, found := k.GetPairsVault(ctx, msg.ExtendedPairVaultId) + extendedPairVault, found := k.asset.GetPairsVault(ctx, msg.ExtendedPairVaultId) if !found { return nil, types.ErrorExtendedPairVaultDoesNotExists } - pairData, found := k.GetPair(ctx, extendedPairVault.PairId) + pairData, found := k.asset.GetPair(ctx, extendedPairVault.PairId) if !found { return nil, types.ErrorPairDoesNotExist } - assetOutData, found := k.GetAsset(ctx, pairData.AssetOut) + assetOutData, found := k.asset.GetAsset(ctx, pairData.AssetOut) if !found { return nil, types.ErrorAssetDoesNotExist } // Checking if appMapping_id exists - appMapping, found := k.GetApp(ctx, msg.AppId) + appMapping, found := k.asset.GetApp(ctx, msg.AppId) if !found { return nil, types.ErrorAppMappingDoesNotExist } @@ -461,7 +466,7 @@ func (k msgServer) MsgDraw(c context.Context, msg *types.MsgDrawRequest) (*types } totalCalDebt := userVault.AmountOut.Add(userVault.InterestAccumulated) - err1 := k.CalculateVaultInterest(ctx, appMapping.Id, msg.ExtendedPairVaultId, msg.UserVaultId, totalCalDebt, userVault.BlockHeight, userVault.BlockTime.Unix()) + err1 := k.rewards.CalculateVaultInterest(ctx, appMapping.Id, msg.ExtendedPairVaultId, msg.UserVaultId, totalCalDebt, userVault.BlockHeight, userVault.BlockTime.Unix()) if err1 != nil { return nil, err1 } @@ -488,13 +493,17 @@ func (k msgServer) MsgDraw(c context.Context, msg *types.MsgDrawRequest) (*types return nil, err } - if err := k.MintCoin(ctx, types.ModuleName, sdk.NewCoin(assetOutData.Denom, msg.Amount)); err != nil { + mintCoin := sdk.NewCoin(assetOutData.Denom, msg.Amount) + if mintCoin.IsZero() { + return nil, vaulttypes.MintCoinValueInVaultIsZero + } + if err := k.bank.MintCoins(ctx, types.ModuleName, sdk.NewCoins(mintCoin)); err != nil { return nil, err } if extendedPairVault.DrawDownFee.IsZero() && msg.Amount.GT(sdk.ZeroInt()) { // Send Rest to user - if err := k.SendCoinFromModuleToAccount(ctx, types.ModuleName, depositor, sdk.NewCoin(assetOutData.Denom, msg.Amount)); err != nil { + if err := k.bank.SendCoinsFromModuleToAccount(ctx, types.ModuleName, depositor, sdk.NewCoins(sdk.NewCoin(assetOutData.Denom, msg.Amount))); err != nil { return nil, err } } else { @@ -503,11 +512,11 @@ func (k msgServer) MsgDraw(c context.Context, msg *types.MsgDrawRequest) (*types collectorShare := (msg.Amount.Mul(sdk.Int(extendedPairVault.DrawDownFee))).Quo(sdk.Int(sdk.OneDec())) if collectorShare.GT(sdk.ZeroInt()) { - if err := k.SendCoinFromModuleToModule(ctx, types.ModuleName, collectortypes.ModuleName, sdk.NewCoins(sdk.NewCoin(assetOutData.Denom, collectorShare))); err != nil { + if err := k.bank.SendCoinsFromModuleToModule(ctx, types.ModuleName, collectortypes.ModuleName, sdk.NewCoins(sdk.NewCoin(assetOutData.Denom, collectorShare))); err != nil { return nil, err } - err := k.UpdateCollector(ctx, appMapping.Id, pairData.AssetOut, sdk.ZeroInt(), sdk.ZeroInt(), collectorShare, sdk.ZeroInt()) + err := k.collector.UpdateCollector(ctx, appMapping.Id, pairData.AssetOut, sdk.ZeroInt(), sdk.ZeroInt(), collectorShare, sdk.ZeroInt()) if err != nil { return nil, err } @@ -515,7 +524,7 @@ func (k msgServer) MsgDraw(c context.Context, msg *types.MsgDrawRequest) (*types // and send the rest to the user amountToUser := msg.Amount.Sub(collectorShare) if amountToUser.GT(sdk.ZeroInt()) { - if err := k.SendCoinFromModuleToAccount(ctx, types.ModuleName, depositor, sdk.NewCoin(assetOutData.Denom, amountToUser)); err != nil { + if err := k.bank.SendCoinsFromModuleToAccount(ctx, types.ModuleName, depositor, sdk.NewCoins(sdk.NewCoin(assetOutData.Denom, amountToUser))); err != nil { return nil, err } } @@ -537,7 +546,7 @@ func (k msgServer) MsgDraw(c context.Context, msg *types.MsgDrawRequest) (*types func (k msgServer) MsgRepay(c context.Context, msg *types.MsgRepayRequest) (*types.MsgRepayResponse, error) { ctx := sdk.UnwrapSDKContext(c) - esmStatus, found := k.GetESMStatus(ctx, msg.AppId) + esmStatus, found := k.esm.GetESMStatus(ctx, msg.AppId) status := false if found { status = esmStatus.Status @@ -545,7 +554,7 @@ func (k msgServer) MsgRepay(c context.Context, msg *types.MsgRepayRequest) (*typ if status { return nil, esmtypes.ErrESMAlreadyExecuted } - killSwitchParams, _ := k.GetKillSwitchData(ctx, msg.AppId) + killSwitchParams, _ := k.esm.GetKillSwitchData(ctx, msg.AppId) if killSwitchParams.BreakerEnable { return nil, esmtypes.ErrCircuitBreakerEnabled } @@ -555,21 +564,21 @@ func (k msgServer) MsgRepay(c context.Context, msg *types.MsgRepayRequest) (*typ } // checks if extended pair exists - extendedPairVault, found := k.GetPairsVault(ctx, msg.ExtendedPairVaultId) + extendedPairVault, found := k.asset.GetPairsVault(ctx, msg.ExtendedPairVaultId) if !found { return nil, types.ErrorExtendedPairVaultDoesNotExists } - pairData, found := k.GetPair(ctx, extendedPairVault.PairId) + pairData, found := k.asset.GetPair(ctx, extendedPairVault.PairId) if !found { return nil, types.ErrorPairDoesNotExist } - assetOutData, found := k.GetAsset(ctx, pairData.AssetOut) + assetOutData, found := k.asset.GetAsset(ctx, pairData.AssetOut) if !found { return nil, types.ErrorAssetDoesNotExist } // Checking if appMapping_id exists - appMapping, found := k.GetApp(ctx, msg.AppId) + appMapping, found := k.asset.GetApp(ctx, msg.AppId) if !found { return nil, types.ErrorAppMappingDoesNotExist } @@ -599,7 +608,7 @@ func (k msgServer) MsgRepay(c context.Context, msg *types.MsgRepayRequest) (*typ } totalDebt := userVault.AmountOut.Add(userVault.InterestAccumulated) - err1 := k.CalculateVaultInterest(ctx, appMapping.Id, msg.ExtendedPairVaultId, msg.UserVaultId, totalDebt, userVault.BlockHeight, userVault.BlockTime.Unix()) + err1 := k.rewards.CalculateVaultInterest(ctx, appMapping.Id, msg.ExtendedPairVaultId, msg.UserVaultId, totalDebt, userVault.BlockHeight, userVault.BlockTime.Unix()) if err1 != nil { return nil, err1 } @@ -622,14 +631,14 @@ func (k msgServer) MsgRepay(c context.Context, msg *types.MsgRepayRequest) (*typ userVault.InterestAccumulated = reducedFees // and send it to the collector module if msg.Amount.GT(sdk.ZeroInt()) { - if err := k.SendCoinFromAccountToModule(ctx, depositor, types.ModuleName, sdk.NewCoin(assetOutData.Denom, msg.Amount)); err != nil { + if err := k.bank.SendCoinsFromAccountToModule(ctx, depositor, types.ModuleName, sdk.NewCoins(sdk.NewCoin(assetOutData.Denom, msg.Amount))); err != nil { return nil, err } // SEND TO COLLECTOR- msg.Amount - if err := k.SendCoinFromModuleToModule(ctx, types.ModuleName, collectortypes.ModuleName, sdk.NewCoins(sdk.NewCoin(assetOutData.Denom, msg.Amount))); err != nil { + if err := k.bank.SendCoinsFromModuleToModule(ctx, types.ModuleName, collectortypes.ModuleName, sdk.NewCoins(sdk.NewCoin(assetOutData.Denom, msg.Amount))); err != nil { return nil, err } - err := k.UpdateCollector(ctx, appMapping.Id, pairData.AssetOut, msg.Amount, sdk.ZeroInt(), sdk.ZeroInt(), sdk.ZeroInt()) + err := k.collector.UpdateCollector(ctx, appMapping.Id, pairData.AssetOut, msg.Amount, sdk.ZeroInt(), sdk.ZeroInt(), sdk.ZeroInt()) if err != nil { return nil, err } @@ -648,21 +657,25 @@ func (k msgServer) MsgRepay(c context.Context, msg *types.MsgRepayRequest) (*typ return nil, types.ErrorAmountOutLessThanDebtFloor } if msg.Amount.GT(sdk.ZeroInt()) { - if err := k.SendCoinFromAccountToModule(ctx, depositor, types.ModuleName, sdk.NewCoin(assetOutData.Denom, msg.Amount)); err != nil { + if err := k.bank.SendCoinsFromAccountToModule(ctx, depositor, types.ModuleName, sdk.NewCoins(sdk.NewCoin(assetOutData.Denom, msg.Amount))); err != nil { return nil, err } } if updatedUserSentAmountAfterFeesDeduction.GT(sdk.ZeroInt()) { - if err := k.BurnCoin(ctx, types.ModuleName, sdk.NewCoin(assetOutData.Denom, updatedUserSentAmountAfterFeesDeduction)); err != nil { + burnCoin := sdk.NewCoin(assetOutData.Denom, updatedUserSentAmountAfterFeesDeduction) + if burnCoin.IsZero() { + return nil, vaulttypes.BurnCoinValueInVaultIsZero + } + if err := k.bank.BurnCoins(ctx, types.ModuleName, sdk.NewCoins(burnCoin)); err != nil { return nil, err } } // SEND TO COLLECTOR----userVault.InterestAccumulated if userVault.InterestAccumulated.GT(sdk.ZeroInt()) { - if err := k.SendCoinFromModuleToModule(ctx, types.ModuleName, collectortypes.ModuleName, sdk.NewCoins(sdk.NewCoin(assetOutData.Denom, userVault.InterestAccumulated))); err != nil { + if err := k.bank.SendCoinsFromModuleToModule(ctx, types.ModuleName, collectortypes.ModuleName, sdk.NewCoins(sdk.NewCoin(assetOutData.Denom, userVault.InterestAccumulated))); err != nil { return nil, err } - err := k.UpdateCollector(ctx, appMapping.Id, pairData.AssetOut, userVault.InterestAccumulated, sdk.ZeroInt(), sdk.ZeroInt(), sdk.ZeroInt()) + err := k.collector.UpdateCollector(ctx, appMapping.Id, pairData.AssetOut, userVault.InterestAccumulated, sdk.ZeroInt(), sdk.ZeroInt(), sdk.ZeroInt()) if err != nil { return nil, err } @@ -685,7 +698,7 @@ func (k msgServer) MsgRepay(c context.Context, msg *types.MsgRepayRequest) (*typ func (k msgServer) MsgClose(c context.Context, msg *types.MsgCloseRequest) (*types.MsgCloseResponse, error) { ctx := sdk.UnwrapSDKContext(c) - esmStatus, found := k.GetESMStatus(ctx, msg.AppId) + esmStatus, found := k.esm.GetESMStatus(ctx, msg.AppId) status := false if found { status = esmStatus.Status @@ -693,7 +706,7 @@ func (k msgServer) MsgClose(c context.Context, msg *types.MsgCloseRequest) (*typ if status { return nil, esmtypes.ErrESMAlreadyExecuted } - killSwitchParams, _ := k.GetKillSwitchData(ctx, msg.AppId) + killSwitchParams, _ := k.esm.GetKillSwitchData(ctx, msg.AppId) if killSwitchParams.BreakerEnable { return nil, esmtypes.ErrCircuitBreakerEnabled } @@ -703,25 +716,25 @@ func (k msgServer) MsgClose(c context.Context, msg *types.MsgCloseRequest) (*typ } // checks if extended pair exists - extendedPairVault, found := k.GetPairsVault(ctx, msg.ExtendedPairVaultId) + extendedPairVault, found := k.asset.GetPairsVault(ctx, msg.ExtendedPairVaultId) if !found { return nil, types.ErrorExtendedPairVaultDoesNotExists } - pairData, found := k.GetPair(ctx, extendedPairVault.PairId) + pairData, found := k.asset.GetPair(ctx, extendedPairVault.PairId) if !found { return nil, types.ErrorPairDoesNotExist } - assetInData, found := k.GetAsset(ctx, pairData.AssetIn) + assetInData, found := k.asset.GetAsset(ctx, pairData.AssetIn) if !found { return nil, types.ErrorAssetDoesNotExist } - assetOutData, found := k.GetAsset(ctx, pairData.AssetOut) + assetOutData, found := k.asset.GetAsset(ctx, pairData.AssetOut) if !found { return nil, types.ErrorAssetDoesNotExist } // Checking if appMapping_id exists - appMapping, found := k.GetApp(ctx, msg.AppId) + appMapping, found := k.asset.GetApp(ctx, msg.AppId) if !found { return nil, types.ErrorAppMappingDoesNotExist } @@ -748,7 +761,7 @@ func (k msgServer) MsgClose(c context.Context, msg *types.MsgCloseRequest) (*typ } totalDebt := userVault.AmountOut.Add(userVault.InterestAccumulated) - err1 := k.CalculateVaultInterest(ctx, appMapping.Id, msg.ExtendedPairVaultId, msg.UserVaultId, totalDebt, userVault.BlockHeight, userVault.BlockTime.Unix()) + err1 := k.rewards.CalculateVaultInterest(ctx, appMapping.Id, msg.ExtendedPairVaultId, msg.UserVaultId, totalDebt, userVault.BlockHeight, userVault.BlockTime.Unix()) if err1 != nil { return nil, err1 } @@ -761,34 +774,38 @@ func (k msgServer) MsgClose(c context.Context, msg *types.MsgCloseRequest) (*typ totalUserDebt := userVault.AmountOut.Add(userVault.InterestAccumulated) totalUserDebt = totalUserDebt.Add(userVault.ClosingFeeAccumulated) if totalUserDebt.GT(sdk.ZeroInt()) { - if err := k.SendCoinFromAccountToModule(ctx, depositor, types.ModuleName, sdk.NewCoin(assetOutData.Denom, totalUserDebt)); err != nil { + if err := k.bank.SendCoinsFromAccountToModule(ctx, depositor, types.ModuleName, sdk.NewCoins(sdk.NewCoin(assetOutData.Denom, totalUserDebt))); err != nil { return nil, err } } // SEND TO COLLECTOR----userVault.InterestAccumulated & userVault.ClosingFees - err = k.UpdateCollector(ctx, appMapping.Id, pairData.AssetOut, userVault.InterestAccumulated, userVault.ClosingFeeAccumulated, sdk.ZeroInt(), sdk.ZeroInt()) + err = k.collector.UpdateCollector(ctx, appMapping.Id, pairData.AssetOut, userVault.InterestAccumulated, userVault.ClosingFeeAccumulated, sdk.ZeroInt(), sdk.ZeroInt()) if err != nil { return nil, err } if userVault.InterestAccumulated.GT(sdk.ZeroInt()) { - if err := k.SendCoinFromModuleToModule(ctx, types.ModuleName, collectortypes.ModuleName, sdk.NewCoins(sdk.NewCoin(assetOutData.Denom, userVault.InterestAccumulated))); err != nil { + if err := k.bank.SendCoinsFromModuleToModule(ctx, types.ModuleName, collectortypes.ModuleName, sdk.NewCoins(sdk.NewCoin(assetOutData.Denom, userVault.InterestAccumulated))); err != nil { return nil, err } } if userVault.ClosingFeeAccumulated.GT(sdk.ZeroInt()) { - if err := k.SendCoinFromModuleToModule(ctx, types.ModuleName, collectortypes.ModuleName, sdk.NewCoins(sdk.NewCoin(assetOutData.Denom, userVault.ClosingFeeAccumulated))); err != nil { + if err := k.bank.SendCoinsFromModuleToModule(ctx, types.ModuleName, collectortypes.ModuleName, sdk.NewCoins(sdk.NewCoin(assetOutData.Denom, userVault.ClosingFeeAccumulated))); err != nil { return nil, err } } if userVault.AmountOut.GT(sdk.ZeroInt()) { - if err := k.BurnCoin(ctx, types.ModuleName, sdk.NewCoin(assetOutData.Denom, userVault.AmountOut)); err != nil { + burnCoin := sdk.NewCoin(assetOutData.Denom, userVault.AmountOut) + if burnCoin.IsZero() { + return nil, vaulttypes.BurnCoinValueInVaultIsZero + } + if err := k.bank.BurnCoins(ctx, types.ModuleName, sdk.NewCoins(burnCoin)); err != nil { return nil, err } } if userVault.AmountIn.GT(sdk.ZeroInt()) { - if err := k.SendCoinFromModuleToAccount(ctx, types.ModuleName, depositor, sdk.NewCoin(assetInData.Denom, userVault.AmountIn)); err != nil { + if err := k.bank.SendCoinsFromModuleToAccount(ctx, types.ModuleName, depositor, sdk.NewCoins(sdk.NewCoin(assetInData.Denom, userVault.AmountIn))); err != nil { return nil, err } } @@ -814,7 +831,7 @@ func (k msgServer) MsgClose(c context.Context, msg *types.MsgCloseRequest) (*typ var rewards rewardstypes.VaultInterestTracker rewards.AppMappingId = appMapping.Id rewards.VaultId = userVault.Id - k.DeleteVaultInterestTracker(ctx, rewards) + k.rewards.DeleteVaultInterestTracker(ctx, rewards) ctx.GasMeter().ConsumeGas(types.CloseVaultGas, "CloseVaultGas") @@ -857,7 +874,7 @@ func (k msgServer) MsgDepositAndDraw(c context.Context, msg *types.MsgDepositAnd func (k msgServer) MsgCreateStableMint(c context.Context, msg *types.MsgCreateStableMintRequest) (*types.MsgCreateStableMintResponse, error) { ctx := sdk.UnwrapSDKContext(c) - esmStatus, found := k.GetESMStatus(ctx, msg.AppId) + esmStatus, found := k.esm.GetESMStatus(ctx, msg.AppId) status := false if found { status = esmStatus.Status @@ -865,29 +882,29 @@ func (k msgServer) MsgCreateStableMint(c context.Context, msg *types.MsgCreateSt if status { return nil, esmtypes.ErrESMAlreadyExecuted } - killSwitchParams, _ := k.GetKillSwitchData(ctx, msg.AppId) + killSwitchParams, _ := k.esm.GetKillSwitchData(ctx, msg.AppId) if killSwitchParams.BreakerEnable { return nil, esmtypes.ErrCircuitBreakerEnabled } // Checking if extended pair exists - extendedPairVault, found := k.GetPairsVault(ctx, msg.ExtendedPairVaultId) + extendedPairVault, found := k.asset.GetPairsVault(ctx, msg.ExtendedPairVaultId) if !found { return nil, types.ErrorExtendedPairVaultDoesNotExists } - pairData, found := k.GetPair(ctx, extendedPairVault.PairId) + pairData, found := k.asset.GetPair(ctx, extendedPairVault.PairId) if !found { return nil, types.ErrorPairDoesNotExist } - assetInData, found := k.GetAsset(ctx, pairData.AssetIn) + assetInData, found := k.asset.GetAsset(ctx, pairData.AssetIn) if !found { return nil, types.ErrorAssetDoesNotExist } - assetOutData, found := k.GetAsset(ctx, pairData.AssetOut) + assetOutData, found := k.asset.GetAsset(ctx, pairData.AssetOut) if !found { return nil, types.ErrorAssetDoesNotExist } // Checking if appMapping_id exists - appMapping, found := k.GetApp(ctx, msg.AppId) + appMapping, found := k.asset.GetApp(ctx, msg.AppId) if !found { return nil, types.ErrorAppMappingDoesNotExist } @@ -929,19 +946,22 @@ func (k msgServer) MsgCreateStableMint(c context.Context, msg *types.MsgCreateSt if msg.Amount.GT(sdk.ZeroInt()) { // Take amount from user - if err := k.SendCoinFromAccountToModule(ctx, depositorAddress, types.ModuleName, sdk.NewCoin(assetInData.Denom, msg.Amount)); err != nil { + if err := k.bank.SendCoinsFromAccountToModule(ctx, depositorAddress, types.ModuleName, sdk.NewCoins(sdk.NewCoin(assetInData.Denom, msg.Amount))); err != nil { return nil, err } // Mint Tokens for user - - if err := k.MintCoin(ctx, types.ModuleName, sdk.NewCoin(assetOutData.Denom, msg.Amount)); err != nil { + mintCoin := sdk.NewCoin(assetOutData.Denom, msg.Amount) + if mintCoin.IsZero() { + return nil, vaulttypes.MintCoinValueInVaultIsZero + } + if err := k.bank.MintCoins(ctx, types.ModuleName, sdk.NewCoins(mintCoin)); err != nil { return nil, err } } if extendedPairVault.DrawDownFee.IsZero() && msg.Amount.GT(sdk.ZeroInt()) { // Send Rest to user - if err := k.SendCoinFromModuleToAccount(ctx, types.ModuleName, depositorAddress, sdk.NewCoin(assetOutData.Denom, msg.Amount)); err != nil { + if err := k.bank.SendCoinsFromModuleToAccount(ctx, types.ModuleName, depositorAddress, sdk.NewCoins(sdk.NewCoin(assetOutData.Denom, msg.Amount))); err != nil { return nil, err } } else { @@ -949,10 +969,10 @@ func (k msgServer) MsgCreateStableMint(c context.Context, msg *types.MsgCreateSt // COLLECTOR FUNCTION collectorShare := (msg.Amount.Mul(sdk.Int(extendedPairVault.DrawDownFee))).Quo(sdk.Int(sdk.OneDec())) if collectorShare.GT(sdk.ZeroInt()) { - if err := k.SendCoinFromModuleToModule(ctx, types.ModuleName, collectortypes.ModuleName, sdk.NewCoins(sdk.NewCoin(assetOutData.Denom, collectorShare))); err != nil { + if err := k.bank.SendCoinsFromModuleToModule(ctx, types.ModuleName, collectortypes.ModuleName, sdk.NewCoins(sdk.NewCoin(assetOutData.Denom, collectorShare))); err != nil { return nil, err } - err := k.UpdateCollector(ctx, appMapping.Id, pairData.AssetOut, sdk.ZeroInt(), sdk.ZeroInt(), collectorShare, sdk.ZeroInt()) + err := k.collector.UpdateCollector(ctx, appMapping.Id, pairData.AssetOut, sdk.ZeroInt(), sdk.ZeroInt(), collectorShare, sdk.ZeroInt()) if err != nil { return nil, err } @@ -961,7 +981,7 @@ func (k msgServer) MsgCreateStableMint(c context.Context, msg *types.MsgCreateSt // and send the rest to the user amountToUser := msg.Amount.Sub(collectorShare) if amountToUser.GT(sdk.ZeroInt()) { - if err := k.SendCoinFromModuleToAccount(ctx, types.ModuleName, depositorAddress, sdk.NewCoin(assetOutData.Denom, amountToUser)); err != nil { + if err := k.bank.SendCoinsFromModuleToAccount(ctx, types.ModuleName, depositorAddress, sdk.NewCoins(sdk.NewCoin(assetOutData.Denom, amountToUser))); err != nil { return nil, err } } @@ -990,7 +1010,7 @@ func (k msgServer) MsgCreateStableMint(c context.Context, msg *types.MsgCreateSt func (k msgServer) MsgDepositStableMint(c context.Context, msg *types.MsgDepositStableMintRequest) (*types.MsgDepositStableMintResponse, error) { ctx := sdk.UnwrapSDKContext(c) - esmStatus, found := k.GetESMStatus(ctx, msg.AppId) + esmStatus, found := k.esm.GetESMStatus(ctx, msg.AppId) status := false if found { status = esmStatus.Status @@ -998,7 +1018,7 @@ func (k msgServer) MsgDepositStableMint(c context.Context, msg *types.MsgDeposit if status { return nil, esmtypes.ErrESMAlreadyExecuted } - killSwitchParams, _ := k.GetKillSwitchData(ctx, msg.AppId) + killSwitchParams, _ := k.esm.GetKillSwitchData(ctx, msg.AppId) if killSwitchParams.BreakerEnable { return nil, esmtypes.ErrCircuitBreakerEnabled } @@ -1008,25 +1028,25 @@ func (k msgServer) MsgDepositStableMint(c context.Context, msg *types.MsgDeposit } // checks if extended pair exists - extendedPairVault, found := k.GetPairsVault(ctx, msg.ExtendedPairVaultId) + extendedPairVault, found := k.asset.GetPairsVault(ctx, msg.ExtendedPairVaultId) if !found { return nil, types.ErrorExtendedPairVaultDoesNotExists } - pairData, found := k.GetPair(ctx, extendedPairVault.PairId) + pairData, found := k.asset.GetPair(ctx, extendedPairVault.PairId) if !found { return nil, types.ErrorPairDoesNotExist } - assetInData, found := k.GetAsset(ctx, pairData.AssetIn) + assetInData, found := k.asset.GetAsset(ctx, pairData.AssetIn) if !found { return nil, types.ErrorAssetDoesNotExist } - assetOutData, found := k.GetAsset(ctx, pairData.AssetOut) + assetOutData, found := k.asset.GetAsset(ctx, pairData.AssetOut) if !found { return nil, types.ErrorAssetDoesNotExist } // Checking if appMapping_id exists - appMapping, found := k.GetApp(ctx, msg.AppId) + appMapping, found := k.asset.GetApp(ctx, msg.AppId) if !found { return nil, types.ErrorAppMappingDoesNotExist } @@ -1069,18 +1089,21 @@ func (k msgServer) MsgDepositStableMint(c context.Context, msg *types.MsgDeposit if msg.Amount.GT(sdk.ZeroInt()) { // Take amount from user - if err := k.SendCoinFromAccountToModule(ctx, depositorAddress, types.ModuleName, sdk.NewCoin(assetInData.Denom, msg.Amount)); err != nil { + if err := k.bank.SendCoinsFromAccountToModule(ctx, depositorAddress, types.ModuleName, sdk.NewCoins(sdk.NewCoin(assetInData.Denom, msg.Amount))); err != nil { return nil, err } // Mint Tokens for user - - if err := k.MintCoin(ctx, types.ModuleName, sdk.NewCoin(assetOutData.Denom, msg.Amount)); err != nil { + mintCoin := sdk.NewCoin(assetOutData.Denom, msg.Amount) + if mintCoin.IsZero() { + return nil, vaulttypes.MintCoinValueInVaultIsZero + } + if err := k.bank.MintCoins(ctx, types.ModuleName, sdk.NewCoins(mintCoin)); err != nil { return nil, err } } if extendedPairVault.DrawDownFee.IsZero() && msg.Amount.GT(sdk.ZeroInt()) { // Send Rest to user - if err := k.SendCoinFromModuleToAccount(ctx, types.ModuleName, depositorAddress, sdk.NewCoin(assetOutData.Denom, msg.Amount)); err != nil { + if err := k.bank.SendCoinsFromModuleToAccount(ctx, types.ModuleName, depositorAddress, sdk.NewCoins(sdk.NewCoin(assetOutData.Denom, msg.Amount))); err != nil { return nil, err } } else { @@ -1090,10 +1113,10 @@ func (k msgServer) MsgDepositStableMint(c context.Context, msg *types.MsgDeposit collectorShare := (msg.Amount.Mul(sdk.Int(extendedPairVault.DrawDownFee))).Quo(sdk.Int(sdk.OneDec())) if collectorShare.GT(sdk.ZeroInt()) { - if err := k.SendCoinFromModuleToModule(ctx, types.ModuleName, collectortypes.ModuleName, sdk.NewCoins(sdk.NewCoin(assetOutData.Denom, collectorShare))); err != nil { + if err := k.bank.SendCoinsFromModuleToModule(ctx, types.ModuleName, collectortypes.ModuleName, sdk.NewCoins(sdk.NewCoin(assetOutData.Denom, collectorShare))); err != nil { return nil, err } - err := k.UpdateCollector(ctx, appMapping.Id, pairData.AssetOut, sdk.ZeroInt(), sdk.ZeroInt(), collectorShare, sdk.ZeroInt()) + err := k.collector.UpdateCollector(ctx, appMapping.Id, pairData.AssetOut, sdk.ZeroInt(), sdk.ZeroInt(), collectorShare, sdk.ZeroInt()) if err != nil { return nil, err } @@ -1102,7 +1125,7 @@ func (k msgServer) MsgDepositStableMint(c context.Context, msg *types.MsgDeposit // and send the rest to the user amountToUser := msg.Amount.Sub(collectorShare) if amountToUser.GT(sdk.ZeroInt()) { - if err := k.SendCoinFromModuleToAccount(ctx, types.ModuleName, depositorAddress, sdk.NewCoin(assetOutData.Denom, amountToUser)); err != nil { + if err := k.bank.SendCoinsFromModuleToAccount(ctx, types.ModuleName, depositorAddress, sdk.NewCoins(sdk.NewCoin(assetOutData.Denom, amountToUser))); err != nil { return nil, err } } @@ -1121,7 +1144,7 @@ func (k msgServer) MsgDepositStableMint(c context.Context, msg *types.MsgDeposit func (k msgServer) MsgWithdrawStableMint(c context.Context, msg *types.MsgWithdrawStableMintRequest) (*types.MsgWithdrawStableMintResponse, error) { ctx := sdk.UnwrapSDKContext(c) - esmStatus, found := k.GetESMStatus(ctx, msg.AppId) + esmStatus, found := k.esm.GetESMStatus(ctx, msg.AppId) status := false if found { status = esmStatus.Status @@ -1129,7 +1152,7 @@ func (k msgServer) MsgWithdrawStableMint(c context.Context, msg *types.MsgWithdr if status { return nil, esmtypes.ErrESMAlreadyExecuted } - killSwitchParams, _ := k.GetKillSwitchData(ctx, msg.AppId) + killSwitchParams, _ := k.esm.GetKillSwitchData(ctx, msg.AppId) if killSwitchParams.BreakerEnable { return nil, esmtypes.ErrCircuitBreakerEnabled } @@ -1139,25 +1162,25 @@ func (k msgServer) MsgWithdrawStableMint(c context.Context, msg *types.MsgWithdr } // checks if extended pair exists - extendedPairVault, found := k.GetPairsVault(ctx, msg.ExtendedPairVaultId) + extendedPairVault, found := k.asset.GetPairsVault(ctx, msg.ExtendedPairVaultId) if !found { return nil, types.ErrorExtendedPairVaultDoesNotExists } - pairData, found := k.GetPair(ctx, extendedPairVault.PairId) + pairData, found := k.asset.GetPair(ctx, extendedPairVault.PairId) if !found { return nil, types.ErrorPairDoesNotExist } - assetInData, found := k.GetAsset(ctx, pairData.AssetIn) + assetInData, found := k.asset.GetAsset(ctx, pairData.AssetIn) if !found { return nil, types.ErrorAssetDoesNotExist } - assetOutData, found := k.GetAsset(ctx, pairData.AssetOut) + assetOutData, found := k.asset.GetAsset(ctx, pairData.AssetOut) if !found { return nil, types.ErrorAssetDoesNotExist } // Checking if appMapping_id exists - appMapping, found := k.GetApp(ctx, msg.AppId) + appMapping, found := k.asset.GetApp(ctx, msg.AppId) if !found { return nil, types.ErrorAppMappingDoesNotExist } @@ -1189,19 +1212,23 @@ func (k msgServer) MsgWithdrawStableMint(c context.Context, msg *types.MsgWithdr var updatedAmount sdk.Int // Take amount from user if msg.Amount.GT(sdk.ZeroInt()) { - if err := k.SendCoinFromAccountToModule(ctx, depositorAddress, types.ModuleName, sdk.NewCoin(assetOutData.Denom, msg.Amount)); err != nil { + if err := k.bank.SendCoinsFromAccountToModule(ctx, depositorAddress, types.ModuleName, sdk.NewCoins(sdk.NewCoin(assetOutData.Denom, msg.Amount))); err != nil { return nil, err } } if extendedPairVault.DrawDownFee.IsZero() && msg.Amount.GT(sdk.ZeroInt()) { // BurnTokens for user - if err := k.BurnCoin(ctx, types.ModuleName, sdk.NewCoin(assetOutData.Denom, msg.Amount)); err != nil { + burnCoin := sdk.NewCoin(assetOutData.Denom, msg.Amount) + if burnCoin.IsZero() { + return nil, vaulttypes.BurnCoinValueInVaultIsZero + } + if err := k.bank.BurnCoins(ctx, types.ModuleName, sdk.NewCoins(burnCoin)); err != nil { return nil, err } // Send Rest to user - if err := k.SendCoinFromModuleToAccount(ctx, types.ModuleName, depositorAddress, sdk.NewCoin(assetInData.Denom, msg.Amount)); err != nil { + if err := k.bank.SendCoinsFromModuleToAccount(ctx, types.ModuleName, depositorAddress, sdk.NewCoins(sdk.NewCoin(assetInData.Denom, msg.Amount))); err != nil { return nil, err } updatedAmount = msg.Amount @@ -1211,10 +1238,10 @@ func (k msgServer) MsgWithdrawStableMint(c context.Context, msg *types.MsgWithdr ///////////////////////////////////////////////// collectorShare := (msg.Amount.Mul(sdk.Int(extendedPairVault.DrawDownFee))).Quo(sdk.Int(sdk.OneDec())) if collectorShare.GT(sdk.ZeroInt()) { - if err := k.SendCoinFromModuleToModule(ctx, types.ModuleName, collectortypes.ModuleName, sdk.NewCoins(sdk.NewCoin(assetOutData.Denom, collectorShare))); err != nil { + if err := k.bank.SendCoinsFromModuleToModule(ctx, types.ModuleName, collectortypes.ModuleName, sdk.NewCoins(sdk.NewCoin(assetOutData.Denom, collectorShare))); err != nil { return nil, err } - err := k.UpdateCollector(ctx, appMapping.Id, pairData.AssetOut, sdk.ZeroInt(), sdk.ZeroInt(), collectorShare, sdk.ZeroInt()) + err := k.collector.UpdateCollector(ctx, appMapping.Id, pairData.AssetOut, sdk.ZeroInt(), sdk.ZeroInt(), collectorShare, sdk.ZeroInt()) if err != nil { return nil, err } @@ -1224,13 +1251,17 @@ func (k msgServer) MsgWithdrawStableMint(c context.Context, msg *types.MsgWithdr if updatedAmount.GT(sdk.ZeroInt()) { // BurnTokens for user - if err := k.BurnCoin(ctx, types.ModuleName, sdk.NewCoin(assetOutData.Denom, updatedAmount)); err != nil { + burnCoin := sdk.NewCoin(assetOutData.Denom, updatedAmount) + if burnCoin.IsZero() { + return nil, vaulttypes.BurnCoinValueInVaultIsZero + } + if err := k.bank.BurnCoins(ctx, types.ModuleName, sdk.NewCoins(burnCoin)); err != nil { return nil, err } // and send the rest to the user - if err := k.SendCoinFromModuleToAccount(ctx, types.ModuleName, depositorAddress, sdk.NewCoin(assetInData.Denom, updatedAmount)); err != nil { + if err := k.bank.SendCoinsFromModuleToAccount(ctx, types.ModuleName, depositorAddress, sdk.NewCoins(sdk.NewCoin(assetInData.Denom, updatedAmount))); err != nil { return nil, err } } @@ -1256,7 +1287,7 @@ func (k msgServer) MsgWithdrawStableMint(c context.Context, msg *types.MsgWithdr // exit function func (k msgServer) MsgVaultInterestCalc(c context.Context, msg *types.MsgVaultInterestCalcRequest) (*types.MsgVaultInterestCalcResponse, error) { ctx := sdk.UnwrapSDKContext(c) - appMapping, found := k.GetApp(ctx, msg.AppId) + appMapping, found := k.asset.GetApp(ctx, msg.AppId) if !found { return nil, types.ErrorAppMappingDoesNotExist } @@ -1266,7 +1297,7 @@ func (k msgServer) MsgVaultInterestCalc(c context.Context, msg *types.MsgVaultIn } totalDebt := userVault.AmountOut.Add(userVault.InterestAccumulated) - err1 := k.CalculateVaultInterest(ctx, appMapping.Id, userVault.ExtendedPairVaultID, msg.UserVaultId, totalDebt, userVault.BlockHeight, userVault.BlockTime.Unix()) + err1 := k.rewards.CalculateVaultInterest(ctx, appMapping.Id, userVault.ExtendedPairVaultID, msg.UserVaultId, totalDebt, userVault.BlockHeight, userVault.BlockTime.Unix()) if err1 != nil { return nil, err1 } diff --git a/x/vault/keeper/query_server.go b/x/vault/keeper/query_server.go index f30cbdaf5..a204b630e 100644 --- a/x/vault/keeper/query_server.go +++ b/x/vault/keeper/query_server.go @@ -122,10 +122,10 @@ func (q QueryServer) QueryVaultInfoByVaultID(c context.Context, req *types.Query if err != nil { return nil, err } - pairVaults, _ := q.GetPairsVault(ctx, vault.ExtendedPairVaultID) - pairID, _ := q.GetPair(ctx, pairVaults.PairId) - assetIn, _ := q.GetAsset(ctx, pairID.AssetIn) - assetOut, _ := q.GetAsset(ctx, pairID.AssetOut) + pairVaults, _ := q.asset.GetPairsVault(ctx, vault.ExtendedPairVaultID) + pairID, _ := q.asset.GetPair(ctx, pairVaults.PairId) + assetIn, _ := q.asset.GetAsset(ctx, pairID.AssetIn) + assetOut, _ := q.asset.GetAsset(ctx, pairID.AssetOut) return &types.QueryVaultInfoByVaultIDResponse{ VaultsInfo: types.VaultInfo{ Id: req.Id, @@ -175,10 +175,10 @@ func (q QueryServer) QueryVaultInfoOfOwnerByApp(c context.Context, req *types.Qu if err != nil { return nil, err } - pairVaults, _ := q.GetPairsVault(ctx, vault.ExtendedPairVaultID) - pairID, _ := q.GetPair(ctx, pairVaults.PairId) - assetIn, _ := q.GetAsset(ctx, pairID.AssetIn) - assetOut, _ := q.GetAsset(ctx, pairID.AssetOut) + pairVaults, _ := q.asset.GetPairsVault(ctx, vault.ExtendedPairVaultID) + pairID, _ := q.asset.GetPair(ctx, pairVaults.PairId) + assetIn, _ := q.asset.GetAsset(ctx, pairID.AssetIn) + assetOut, _ := q.asset.GetAsset(ctx, pairID.AssetOut) vaults := types.VaultInfo{ Id: vault.Id, @@ -324,12 +324,12 @@ func (q QueryServer) QueryTokenMintedAssetWiseByApp(c context.Context, req *type return &types.QueryTokenMintedAssetWiseByAppResponse{}, nil } for _, data := range appExtendedPairVaultData { - extPairVault, _ := q.GetPairsVault(ctx, data.ExtendedPairId) - pairID, _ := q.GetPair(ctx, extPairVault.PairId) + extPairVault, _ := q.asset.GetPairsVault(ctx, data.ExtendedPairId) + pairID, _ := q.asset.GetPair(ctx, extPairVault.PairId) var minted types.MintedDataMap - denom, found := q.GetAsset(ctx, pairID.AssetOut) + denom, found := q.asset.GetAsset(ctx, pairID.AssetOut) if !found { return nil, types.ErrorAssetDoesNotExist } @@ -352,7 +352,7 @@ func (q QueryServer) QueryVaultCountByApp(c context.Context, req *types.QueryVau ctx = sdk.UnwrapSDKContext(c) count uint64 ) - _, found := q.GetApp(ctx, req.AppId) + _, found := q.asset.GetApp(ctx, req.AppId) if !found { return nil, status.Errorf(codes.NotFound, "App does not exist for id %d", req.AppId) } @@ -378,7 +378,7 @@ func (q QueryServer) QueryVaultCountByAppAndExtendedPair(c context.Context, req ctx = sdk.UnwrapSDKContext(c) count uint64 ) - _, found := q.GetApp(ctx, req.AppId) + _, found := q.asset.GetApp(ctx, req.AppId) if !found { return nil, status.Errorf(codes.NotFound, "App does not exist for id %d", req.AppId) } @@ -403,11 +403,11 @@ func (q QueryServer) QueryTotalValueLockedByAppAndExtendedPair(c context.Context ctx = sdk.UnwrapSDKContext(c) valueLocked = sdk.ZeroInt() ) - _, found := q.GetApp(ctx, req.AppId) + _, found := q.asset.GetApp(ctx, req.AppId) if !found { return nil, status.Errorf(codes.NotFound, "App does not exist for id %d", req.AppId) } - _, nfound := q.GetPairsVault(ctx, req.ExtendedPairId) + _, nfound := q.asset.GetPairsVault(ctx, req.ExtendedPairId) if !nfound { return &types.QueryTotalValueLockedByAppAndExtendedPairResponse{}, nil } @@ -509,7 +509,7 @@ func (q QueryServer) QueryExtendedPairVaultMappingByAppAndExtendedPair(c context return nil, status.Error(codes.InvalidArgument, "request cannot be empty") } ctx := sdk.UnwrapSDKContext(c) - _, found := q.GetApp(ctx, req.AppId) + _, found := q.asset.GetApp(ctx, req.AppId) if !found { return nil, status.Errorf(codes.NotFound, "App does not exist for id %d", req.AppId) } @@ -529,7 +529,7 @@ func (q QueryServer) QueryExtendedPairVaultMappingByApp(c context.Context, req * return nil, status.Error(codes.InvalidArgument, "request cannot be empty") } ctx := sdk.UnwrapSDKContext(c) - _, found := q.GetApp(ctx, req.AppId) + _, found := q.asset.GetApp(ctx, req.AppId) if !found { return nil, status.Errorf(codes.NotFound, "App does not exist for id %d", req.AppId) } @@ -559,12 +559,12 @@ func (q QueryServer) QueryTVLByAppOfAllExtendedPairs(c context.Context, req *typ return &types.QueryTVLByAppOfAllExtendedPairsResponse{}, nil } for _, data := range appExtendedPairVaultData { - extPairVault, _ := q.GetPairsVault(ctx, data.ExtendedPairId) - pairID, _ := q.GetPair(ctx, extPairVault.PairId) + extPairVault, _ := q.asset.GetPairsVault(ctx, data.ExtendedPairId) + pairID, _ := q.asset.GetPair(ctx, extPairVault.PairId) var tvl types.TvlLockedDataMap - denom, found := q.GetAsset(ctx, pairID.AssetIn) + denom, found := q.asset.GetAsset(ctx, pairID.AssetIn) if !found { return nil, types.ErrorAssetDoesNotExist } @@ -587,7 +587,7 @@ func (q QueryServer) QueryTVLByApp(c context.Context, req *types.QueryTVLByAppRe ctx = sdk.UnwrapSDKContext(c) locked = sdk.ZeroDec() ) - _, found := q.GetApp(ctx, req.AppId) + _, found := q.asset.GetApp(ctx, req.AppId) if !found { return nil, status.Errorf(codes.NotFound, "App does not exist for id %d", req.AppId) } @@ -597,10 +597,10 @@ func (q QueryServer) QueryTVLByApp(c context.Context, req *types.QueryTVLByAppRe return &types.QueryTVLByAppResponse{}, nil } for _, data := range appExtendedPairVaultData { - extPairVault, _ := q.GetPairsVault(ctx, data.ExtendedPairId) - pairID, _ := q.GetPair(ctx, extPairVault.PairId) + extPairVault, _ := q.asset.GetPairsVault(ctx, data.ExtendedPairId) + pairID, _ := q.asset.GetPair(ctx, extPairVault.PairId) - twaData, _ := q.CalcAssetPrice(ctx, pairID.AssetIn, data.CollateralLockedAmount) + twaData, _ := q.oracle.CalcAssetPrice(ctx, pairID.AssetIn, data.CollateralLockedAmount) locked = twaData.Add(locked) } // locked = locked.Quo(sdk.NewInt(1000000)) @@ -649,19 +649,19 @@ func (q QueryServer) QueryUserMyPositionByApp(c context.Context, req *types.Quer continue } - extPairVault, _ := q.GetPairsVault(ctx, vault.ExtendedPairVaultID) - pairID, _ := q.GetPair(ctx, extPairVault.PairId) - assetOutData, found := q.GetAsset(ctx, pairID.AssetOut) + extPairVault, _ := q.asset.GetPairsVault(ctx, vault.ExtendedPairVaultID) + pairID, _ := q.asset.GetPair(ctx, extPairVault.PairId) + assetOutData, found := q.asset.GetAsset(ctx, pairID.AssetOut) if !found { continue } - assetInTotalPrice, _ := q.CalcAssetPrice(ctx, pairID.AssetIn, vault.AmountIn) + assetInTotalPrice, _ := q.oracle.CalcAssetPrice(ctx, pairID.AssetIn, vault.AmountIn) var assetOutTotalPrice sdk.Dec totalLocked = assetInTotalPrice.Add(totalLocked) if extPairVault.AssetOutOraclePrice { - assetOutTotalPrice, _ = q.CalcAssetPrice(ctx, pairID.AssetOut, vault.AmountOut) + assetOutTotalPrice, _ = q.oracle.CalcAssetPrice(ctx, pairID.AssetOut, vault.AmountOut) } else { assetOutTotalPrice = (sdk.NewDecFromInt(sdk.NewIntFromUint64(extPairVault.AssetOutPrice)).Mul(sdk.NewDecFromInt(vault.AmountOut))).Quo(sdk.NewDecFromInt(sdk.NewIntFromUint64(uint64(assetOutData.Decimals)))) } @@ -723,12 +723,12 @@ func (q QueryServer) QueryPairsLockedAndMintedStatisticByApp(c context.Context, } for _, data := range appExtendedPairVaultData { - extPairVault, _ := q.GetPairsVault(ctx, data.ExtendedPairId) - pairID, _ := q.GetPair(ctx, extPairVault.PairId) + extPairVault, _ := q.asset.GetPairsVault(ctx, data.ExtendedPairId) + pairID, _ := q.asset.GetPair(ctx, extPairVault.PairId) var statistics types.PairStatisticData - inDenom, _ := q.GetAsset(ctx, pairID.AssetIn) - outDenom, _ := q.GetAsset(ctx, pairID.AssetOut) + inDenom, _ := q.asset.GetAsset(ctx, pairID.AssetIn) + outDenom, _ := q.asset.GetAsset(ctx, pairID.AssetOut) statistics.AssetInDenom = inDenom.Denom statistics.AssetOutDenom = outDenom.Denom diff --git a/x/vault/keeper/vault.go b/x/vault/keeper/vault.go index 8958a85b2..26af518f0 100644 --- a/x/vault/keeper/vault.go +++ b/x/vault/keeper/vault.go @@ -297,28 +297,28 @@ func (k Keeper) UpdateAppExtendedPairVaultMappingDataOnMsgCreateStableMintVault( // CalculateCollateralizationRatio Calculate Collaterlization Ratio . func (k Keeper) CalculateCollateralizationRatio(ctx sdk.Context, extendedPairVaultID uint64, amountIn sdk.Int, amountOut sdk.Int) (sdk.Dec, error) { - extendedPairVault, found := k.GetPairsVault(ctx, extendedPairVaultID) + extendedPairVault, found := k.asset.GetPairsVault(ctx, extendedPairVaultID) if !found { return sdk.ZeroDec(), types.ErrorExtendedPairVaultDoesNotExists } - pairData, found := k.GetPair(ctx, extendedPairVault.PairId) + pairData, found := k.asset.GetPair(ctx, extendedPairVault.PairId) if !found { return sdk.ZeroDec(), types.ErrorPairDoesNotExist } - assetInData, found := k.GetAsset(ctx, pairData.AssetIn) + assetInData, found := k.asset.GetAsset(ctx, pairData.AssetIn) if !found { return sdk.ZeroDec(), types.ErrorAssetDoesNotExist } - assetOutData, found := k.GetAsset(ctx, pairData.AssetOut) + assetOutData, found := k.asset.GetAsset(ctx, pairData.AssetOut) if !found { return sdk.ZeroDec(), types.ErrorAssetDoesNotExist } // calculating price of the asset_in - assetInTotalPrice, err := k.CalcAssetPrice(ctx, assetInData.Id, amountIn) + assetInTotalPrice, err := k.oracle.CalcAssetPrice(ctx, assetInData.Id, amountIn) if err != nil { return sdk.ZeroDec(), err } - esmStatus, found := k.GetESMStatus(ctx, extendedPairVault.AppId) + esmStatus, found := k.esm.GetESMStatus(ctx, extendedPairVault.AppId) statusEsm := false if found { statusEsm = esmStatus.Status @@ -328,7 +328,7 @@ func (k Keeper) CalculateCollateralizationRatio(ctx sdk.Context, extendedPairVau if statusEsm && esmStatus.SnapshotStatus { // TODO: function update - price, found := k.GetSnapshotOfPrices(ctx, extendedPairVault.AppId, assetInData.Id) + price, found := k.esm.GetSnapshotOfPrices(ctx, extendedPairVault.AppId, assetInData.Id) if !found { return sdk.ZeroDec(), types.ErrorPriceDoesNotExist } @@ -340,13 +340,13 @@ func (k Keeper) CalculateCollateralizationRatio(ctx sdk.Context, extendedPairVau // If oracle Price required for the assetOut if statusEsm && esmStatus.SnapshotStatus { // TODO: function update - price, found := k.GetSnapshotOfPrices(ctx, extendedPairVault.AppId, assetOutData.Id) + price, found := k.esm.GetSnapshotOfPrices(ctx, extendedPairVault.AppId, assetOutData.Id) if !found { return sdk.ZeroDec(), types.ErrorPriceDoesNotExist } assetInTotalPrice = sdk.NewDecFromInt(sdk.NewIntFromUint64(price)) } else { - assetOutTotalPrice, err = k.CalcAssetPrice(ctx, assetOutData.Id, amountOut) + assetOutTotalPrice, err = k.oracle.CalcAssetPrice(ctx, assetOutData.Id, amountOut) if err != nil { return sdk.ZeroDec(), err } @@ -566,8 +566,8 @@ func (k Keeper) GetStableMintVaults(ctx sdk.Context) (stableVaults []types.Stabl } func (k Keeper) CreateNewVault(ctx sdk.Context, From string, AppID uint64, ExtendedPairVaultID uint64, AmountIn sdk.Int, AmountOut sdk.Int) error { - appMapping, _ := k.GetApp(ctx, AppID) - extendedPairVault, _ := k.GetPairsVault(ctx, ExtendedPairVaultID) + appMapping, _ := k.asset.GetApp(ctx, AppID) + extendedPairVault, _ := k.asset.GetPairsVault(ctx, ExtendedPairVaultID) zeroVal := sdk.ZeroInt() oldID := k.GetIDForVault(ctx) @@ -613,21 +613,21 @@ func (k Keeper) WasmMsgAddEmissionRewards(ctx sdk.Context, appID uint64, amount var vaultsData types.AppExtendedPairVaultMappingData totalVote := sdk.ZeroInt() - app, _ := k.GetApp(ctx, appID) + app, _ := k.asset.GetApp(ctx, appID) govToken := app.GenesisToken for _, v := range govToken { if v.IsGovToken { assetID = v.AssetId } } - asset, _ := k.GetAsset(ctx, assetID) + asset, _ := k.asset.GetAsset(ctx, assetID) if amount.GT(sdk.ZeroInt()) { - err := k.MintCoin(ctx, tokenminttypes.ModuleName, sdk.NewCoin(asset.Denom, amount)) + err := k.bank.MintCoins(ctx, tokenminttypes.ModuleName, sdk.NewCoins(sdk.NewCoin(asset.Denom, amount))) if err != nil { return err } } - k.UpdateAssetDataInTokenMintByApp(ctx, appID, assetID, true, amount) + k.tokenmint.UpdateAssetDataInTokenMintByApp(ctx, appID, assetID, true, amount) for i := range votingRatio { totalVote = totalVote.Add(votingRatio[i]) } @@ -647,7 +647,7 @@ func (k Keeper) WasmMsgAddEmissionRewards(ctx sdk.Context, appID uint64, amount amt := vault.AmountOut.Mul(perUserShareByAmt) addr, _ := sdk.AccAddressFromBech32(vault.Owner) if amt.GT(sdk.ZeroInt()) { - err := k.SendCoinFromModuleToAccount(ctx, tokenminttypes.ModuleName, addr, sdk.NewCoin(asset.Denom, amt)) + err := k.bank.SendCoinsFromModuleToAccount(ctx, tokenminttypes.ModuleName, addr, sdk.NewCoins(sdk.NewCoin(asset.Denom, amt))) if err != nil { return err } From f918b91994e6962fa2151c515c73b691d48f3b92 Mon Sep 17 00:00:00 2001 From: Vishnu Kumavat Date: Tue, 18 Oct 2022 18:26:36 +0530 Subject: [PATCH 2/8] removed redundant/unused imports --- x/vault/keeper/msg_server.go | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/x/vault/keeper/msg_server.go b/x/vault/keeper/msg_server.go index 7795ce97c..03f44a386 100644 --- a/x/vault/keeper/msg_server.go +++ b/x/vault/keeper/msg_server.go @@ -9,7 +9,6 @@ import ( esmtypes "github.com/comdex-official/comdex/x/esm/types" rewardstypes "github.com/comdex-official/comdex/x/rewards/types" "github.com/comdex-official/comdex/x/vault/types" - vaulttypes "github.com/comdex-official/comdex/x/vault/types" ) var _ types.MsgServer = msgServer{} @@ -113,7 +112,7 @@ func (k msgServer) MsgCreate(c context.Context, msg *types.MsgCreateRequest) (*t // Mint Tokens for user mintCoin := sdk.NewCoin(assetOutData.Denom, msg.AmountOut) if mintCoin.IsZero() { - return nil, vaulttypes.MintCoinValueInVaultIsZero + return nil, types.MintCoinValueInVaultIsZero } if err := k.bank.MintCoins(ctx, types.ModuleName, sdk.NewCoins(mintCoin)); err != nil { return nil, err @@ -495,7 +494,7 @@ func (k msgServer) MsgDraw(c context.Context, msg *types.MsgDrawRequest) (*types mintCoin := sdk.NewCoin(assetOutData.Denom, msg.Amount) if mintCoin.IsZero() { - return nil, vaulttypes.MintCoinValueInVaultIsZero + return nil, types.MintCoinValueInVaultIsZero } if err := k.bank.MintCoins(ctx, types.ModuleName, sdk.NewCoins(mintCoin)); err != nil { return nil, err @@ -664,7 +663,7 @@ func (k msgServer) MsgRepay(c context.Context, msg *types.MsgRepayRequest) (*typ if updatedUserSentAmountAfterFeesDeduction.GT(sdk.ZeroInt()) { burnCoin := sdk.NewCoin(assetOutData.Denom, updatedUserSentAmountAfterFeesDeduction) if burnCoin.IsZero() { - return nil, vaulttypes.BurnCoinValueInVaultIsZero + return nil, types.BurnCoinValueInVaultIsZero } if err := k.bank.BurnCoins(ctx, types.ModuleName, sdk.NewCoins(burnCoin)); err != nil { return nil, err @@ -798,7 +797,7 @@ func (k msgServer) MsgClose(c context.Context, msg *types.MsgCloseRequest) (*typ if userVault.AmountOut.GT(sdk.ZeroInt()) { burnCoin := sdk.NewCoin(assetOutData.Denom, userVault.AmountOut) if burnCoin.IsZero() { - return nil, vaulttypes.BurnCoinValueInVaultIsZero + return nil, types.BurnCoinValueInVaultIsZero } if err := k.bank.BurnCoins(ctx, types.ModuleName, sdk.NewCoins(burnCoin)); err != nil { return nil, err @@ -952,7 +951,7 @@ func (k msgServer) MsgCreateStableMint(c context.Context, msg *types.MsgCreateSt // Mint Tokens for user mintCoin := sdk.NewCoin(assetOutData.Denom, msg.Amount) if mintCoin.IsZero() { - return nil, vaulttypes.MintCoinValueInVaultIsZero + return nil, types.MintCoinValueInVaultIsZero } if err := k.bank.MintCoins(ctx, types.ModuleName, sdk.NewCoins(mintCoin)); err != nil { return nil, err @@ -1095,7 +1094,7 @@ func (k msgServer) MsgDepositStableMint(c context.Context, msg *types.MsgDeposit // Mint Tokens for user mintCoin := sdk.NewCoin(assetOutData.Denom, msg.Amount) if mintCoin.IsZero() { - return nil, vaulttypes.MintCoinValueInVaultIsZero + return nil, types.MintCoinValueInVaultIsZero } if err := k.bank.MintCoins(ctx, types.ModuleName, sdk.NewCoins(mintCoin)); err != nil { return nil, err @@ -1221,7 +1220,7 @@ func (k msgServer) MsgWithdrawStableMint(c context.Context, msg *types.MsgWithdr // BurnTokens for user burnCoin := sdk.NewCoin(assetOutData.Denom, msg.Amount) if burnCoin.IsZero() { - return nil, vaulttypes.BurnCoinValueInVaultIsZero + return nil, types.BurnCoinValueInVaultIsZero } if err := k.bank.BurnCoins(ctx, types.ModuleName, sdk.NewCoins(burnCoin)); err != nil { return nil, err @@ -1253,7 +1252,7 @@ func (k msgServer) MsgWithdrawStableMint(c context.Context, msg *types.MsgWithdr // BurnTokens for user burnCoin := sdk.NewCoin(assetOutData.Denom, updatedAmount) if burnCoin.IsZero() { - return nil, vaulttypes.BurnCoinValueInVaultIsZero + return nil, types.BurnCoinValueInVaultIsZero } if err := k.bank.BurnCoins(ctx, types.ModuleName, sdk.NewCoins(burnCoin)); err != nil { return nil, err From 3b84a2cc959a4475ee735f368dc710eb227812b2 Mon Sep 17 00:00:00 2001 From: Vishnu Kumavat Date: Tue, 18 Oct 2022 18:34:10 +0530 Subject: [PATCH 3/8] tokenmint module alias removed --- x/tokenmint/keeper/alias.go | 72 -------------------------------- x/tokenmint/keeper/mint.go | 34 +++++++-------- x/tokenmint/keeper/mint_test.go | 8 ++-- x/tokenmint/keeper/msg_server.go | 14 +++---- 4 files changed, 28 insertions(+), 100 deletions(-) delete mode 100644 x/tokenmint/keeper/alias.go diff --git a/x/tokenmint/keeper/alias.go b/x/tokenmint/keeper/alias.go deleted file mode 100644 index e6f0c2577..000000000 --- a/x/tokenmint/keeper/alias.go +++ /dev/null @@ -1,72 +0,0 @@ -package keeper - -import ( - sdk "github.com/cosmos/cosmos-sdk/types" - - "github.com/comdex-official/comdex/x/tokenmint/types" - - assettypes "github.com/comdex-official/comdex/x/asset/types" -) - -func (k Keeper) BurnCoin(ctx sdk.Context, name string, coin sdk.Coin) error { - if coin.IsZero() { - return types.BurnCoinValueInTokenmintIsZero - } - - return k.bank.BurnCoins(ctx, name, sdk.NewCoins(coin)) -} - -func (k Keeper) MintCoin(ctx sdk.Context, name string, coin sdk.Coin) error { - if coin.IsZero() { - return types.ErrorMintingGenesisSupplyLessThanOne - } - - return k.bank.MintCoins(ctx, name, sdk.NewCoins(coin)) -} - -func (k Keeper) SendCoinFromAccountToModule(ctx sdk.Context, address sdk.AccAddress, name string, coin sdk.Coin) error { - if coin.IsZero() { - return types.SendCoinsFromAccountToModuleInTokenmintIsZero - } - - return k.bank.SendCoinsFromAccountToModule(ctx, address, name, sdk.NewCoins(coin)) -} - -func (k Keeper) SendCoinFromModuleToAccount(ctx sdk.Context, name string, address sdk.AccAddress, coin sdk.Coin) error { - if coin.IsZero() { - return types.SendCoinsFromModuleToAccountInTokenmintIsZero - } - - return k.bank.SendCoinsFromModuleToAccount(ctx, name, address, sdk.NewCoins(coin)) -} - -func (k Keeper) SendCoinFromModuleToModule(ctx sdk.Context, senderModule, recipientModule string, coin sdk.Coins) error { - if coin.IsZero() { - return types.SendCoinsFromModuleToModuleInTokenmintIsZero - } - return k.bank.SendCoinsFromModuleToModule(ctx, senderModule, recipientModule, coin) -} - -func (k Keeper) SpendableCoins(ctx sdk.Context, address sdk.AccAddress) sdk.Coins { - return k.bank.SpendableCoins(ctx, address) -} - -func (k Keeper) GetAsset(ctx sdk.Context, id uint64) (assettypes.Asset, bool) { - return k.asset.GetAsset(ctx, id) -} - -func (k Keeper) GetApp(ctx sdk.Context, id uint64) (assettypes.AppData, bool) { - return k.asset.GetApp(ctx, id) -} - -func (k Keeper) GetApps(ctx sdk.Context) ([]assettypes.AppData, bool) { - return k.asset.GetApps(ctx) -} - -func (k Keeper) GetMintGenesisTokenData(ctx sdk.Context, appID, assetID uint64) (assettypes.MintGenesisToken, bool) { - return k.asset.GetMintGenesisTokenData(ctx, appID, assetID) -} - -func (k Keeper) GetAssetForDenom(ctx sdk.Context, denom string) (assettypes.Asset, bool) { - return k.asset.GetAssetForDenom(ctx, denom) -} diff --git a/x/tokenmint/keeper/mint.go b/x/tokenmint/keeper/mint.go index 829decb49..a25dd4c7a 100644 --- a/x/tokenmint/keeper/mint.go +++ b/x/tokenmint/keeper/mint.go @@ -77,7 +77,7 @@ func (k Keeper) GetAssetDataInTokenMintByAppSupply(ctx sdk.Context, appMappingID } func (k Keeper) MintNewTokensForApp(ctx sdk.Context, appMappingID uint64, assetID uint64, address string, amount sdk.Int) error { - assetData, found := k.GetAsset(ctx, assetID) + assetData, found := k.asset.GetAsset(ctx, assetID) if !found { return types.ErrorAssetDoesNotExist } @@ -91,14 +91,14 @@ func (k Keeper) MintNewTokensForApp(ctx sdk.Context, appMappingID uint64, assetI return types.ErrorAssetNotWhiteListedForGenesisMinting } if amount.GT(sdk.ZeroInt()) { - if err := k.MintCoin(ctx, types.ModuleName, sdk.NewCoin(assetData.Denom, amount)); err != nil { + if err := k.bank.MintCoins(ctx, types.ModuleName, sdk.NewCoins(sdk.NewCoin(assetData.Denom, amount))); err != nil { return err } userAddress, err := sdk.AccAddressFromBech32(address) if err != nil { return err } - if err = k.SendCoinFromModuleToAccount(ctx, types.ModuleName, userAddress, sdk.NewCoin(assetData.Denom, amount)); err != nil { + if err = k.bank.SendCoinsFromModuleToAccount(ctx, types.ModuleName, userAddress, sdk.NewCoins(sdk.NewCoin(assetData.Denom, amount))); err != nil { return err } k.UpdateAssetDataInTokenMintByApp(ctx, appMappingID, assetID, true, amount) @@ -107,7 +107,7 @@ func (k Keeper) MintNewTokensForApp(ctx sdk.Context, appMappingID uint64, assetI } func (k Keeper) BurnTokensForApp(ctx sdk.Context, appMappingID uint64, assetID uint64, amount sdk.Int) error { - assetData, found := k.GetAsset(ctx, assetID) + assetData, found := k.asset.GetAsset(ctx, assetID) if !found { return types.ErrorAssetDoesNotExist } @@ -123,7 +123,7 @@ func (k Keeper) BurnTokensForApp(ctx sdk.Context, appMappingID uint64, assetID u if tokenData.CurrentSupply.Sub(amount).LTE(sdk.NewInt(0)) || amount.LTE(sdk.ZeroInt()) { return types.ErrorBurningMakesSupplyLessThanZero } - if err := k.BurnCoin(ctx, types.ModuleName, sdk.NewCoin(assetData.Denom, amount)); err != nil { + if err := k.bank.BurnCoins(ctx, types.ModuleName, sdk.NewCoins(sdk.NewCoin(assetData.Denom, amount))); err != nil { return err } @@ -154,7 +154,7 @@ func (k Keeper) UpdateAssetDataInTokenMintByApp(ctx sdk.Context, appMappingID ui } func (k Keeper) BurnGovTokensForApp(ctx sdk.Context, appMappingID uint64, from sdk.AccAddress, amount sdk.Coin) error { - _, found := k.GetApp(ctx, appMappingID) + _, found := k.asset.GetApp(ctx, appMappingID) if !found { return types.ErrorAppMappingDoesNotExists } @@ -163,7 +163,7 @@ func (k Keeper) BurnGovTokensForApp(ctx sdk.Context, appMappingID uint64, from s if err != nil { return err } - asset, _ := k.GetAssetForDenom(ctx, amount.Denom) + asset, _ := k.asset.GetAssetForDenom(ctx, amount.Denom) k.UpdateAssetDataInTokenMintByApp(ctx, appMappingID, asset.Id, false, amount.Amount) @@ -171,11 +171,11 @@ func (k Keeper) BurnGovTokensForApp(ctx sdk.Context, appMappingID uint64, from s } func (k Keeper) BurnFrom(ctx sdk.Context, amount sdk.Coin, burnFrom sdk.AccAddress) error { - err := k.SendCoinFromAccountToModule(ctx, burnFrom, types.ModuleName, amount) + err := k.bank.SendCoinsFromAccountToModule(ctx, burnFrom, types.ModuleName, sdk.NewCoins(amount)) if err != nil { return err } - err = k.BurnCoin(ctx, types.ModuleName, amount) + err = k.bank.BurnCoins(ctx, types.ModuleName, sdk.NewCoins(amount)) if err != nil { return err } @@ -185,16 +185,16 @@ func (k Keeper) BurnFrom(ctx sdk.Context, amount sdk.Coin, burnFrom sdk.AccAddre func (k Keeper) WasmMsgFoundationEmission(ctx sdk.Context, appID uint64, amount sdk.Int, foundationAddr []string) error { s := len(foundationAddr) var assetID uint64 - app, _ := k.GetApp(ctx, appID) + app, _ := k.asset.GetApp(ctx, appID) govToken := app.GenesisToken for _, v := range govToken { if v.IsGovToken { assetID = v.AssetId } } - asset, _ := k.GetAsset(ctx, assetID) + asset, _ := k.asset.GetAsset(ctx, assetID) if amount.GT(sdk.ZeroInt()) { - err := k.MintCoin(ctx, types.ModuleName, sdk.NewCoin(asset.Denom, amount)) + err := k.bank.MintCoins(ctx, types.ModuleName, sdk.NewCoins(sdk.NewCoin(asset.Denom, amount))) if err != nil { return err } @@ -204,7 +204,7 @@ func (k Keeper) WasmMsgFoundationEmission(ctx sdk.Context, appID uint64, amount for _, addr := range foundationAddr { newAddr, _ := sdk.AccAddressFromBech32(addr) if amountToIndividualFoundationAddr.GT(sdk.ZeroInt()) { - err := k.SendCoinFromModuleToAccount(ctx, types.ModuleName, newAddr, sdk.NewCoin(asset.Denom, amountToIndividualFoundationAddr)) + err := k.bank.SendCoinsFromModuleToAccount(ctx, types.ModuleName, newAddr, sdk.NewCoins(sdk.NewCoin(asset.Denom, amountToIndividualFoundationAddr))) if err != nil { return err } @@ -217,20 +217,20 @@ func (k Keeper) WasmMsgFoundationEmission(ctx sdk.Context, appID uint64, amount func (k Keeper) WasmMsgRebaseMint(ctx sdk.Context, appID uint64, amount sdk.Int, contractAddr sdk.AccAddress) error { var assetID uint64 - app, _ := k.GetApp(ctx, appID) + app, _ := k.asset.GetApp(ctx, appID) govToken := app.GenesisToken for _, v := range govToken { if v.IsGovToken { assetID = v.AssetId } } - asset, _ := k.GetAsset(ctx, assetID) + asset, _ := k.asset.GetAsset(ctx, assetID) if amount.GT(sdk.ZeroInt()) { - err := k.MintCoin(ctx, types.ModuleName, sdk.NewCoin(asset.Denom, amount)) + err := k.bank.MintCoins(ctx, types.ModuleName, sdk.NewCoins(sdk.NewCoin(asset.Denom, amount))) if err != nil { return err } - err = k.SendCoinFromModuleToAccount(ctx, types.ModuleName, contractAddr, sdk.NewCoin(asset.Denom, amount)) + err = k.bank.SendCoinsFromModuleToAccount(ctx, types.ModuleName, contractAddr, sdk.NewCoins(sdk.NewCoin(asset.Denom, amount))) if err != nil { return err } diff --git a/x/tokenmint/keeper/mint_test.go b/x/tokenmint/keeper/mint_test.go index 37c604c35..a433f09c0 100644 --- a/x/tokenmint/keeper/mint_test.go +++ b/x/tokenmint/keeper/mint_test.go @@ -149,7 +149,7 @@ func (s *KeeperTestSuite) TestMsgMintNewTokens() { } { s.Run(tc.name, func() { genesisSupply := sdk.NewIntFromUint64(9000000) - asset, found := tokenmintKeeper.GetAsset(*ctx, tc.msg.AssetId) + asset, found := s.assetKeeper.GetAsset(*ctx, tc.msg.AssetId) s.Require().True(found) previousCoin, err := s.getBalance(userAddress, asset.Denom) _, err = server.MsgMintNewTokens(wctx, &tc.msg) @@ -205,7 +205,7 @@ func (s *KeeperTestSuite) TestMintNewTokensForApp() { }, } { s.Run(tc.name, func() { - asset, found := tokenmintKeeper.GetAsset(*ctx, tc.assetID) + asset, found := s.assetKeeper.GetAsset(*ctx, tc.assetID) s.Require().True(found) previousCoin, err := s.getBalance(userAddress, asset.Denom) s.Require().NoError(err) @@ -273,7 +273,7 @@ func (s *KeeperTestSuite) TestBurnTokensForApp() { }, } { s.Run(tc.name, func() { - asset, found := tokenmintKeeper.GetAsset(*ctx, tc.assetID) + asset, found := s.assetKeeper.GetAsset(*ctx, tc.assetID) s.Require().True(found) sender, err := sdk.AccAddressFromBech32(tc.address) s.Require().NoError(err) @@ -339,7 +339,7 @@ func (s *KeeperTestSuite) TestBurnGovTokensForApp() { }, } { s.Run(tc.name, func() { - asset, found := tokenmintKeeper.GetAsset(*ctx, tc.assetID) + asset, found := s.assetKeeper.GetAsset(*ctx, tc.assetID) s.Require().True(found) sender, err := sdk.AccAddressFromBech32(tc.address) s.Require().NoError(err) diff --git a/x/tokenmint/keeper/msg_server.go b/x/tokenmint/keeper/msg_server.go index 3e6782e2e..b82aac85d 100644 --- a/x/tokenmint/keeper/msg_server.go +++ b/x/tokenmint/keeper/msg_server.go @@ -22,17 +22,17 @@ func NewMsgServer(keeper Keeper) types.MsgServer { func (k msgServer) MsgMintNewTokens(c context.Context, msg *types.MsgMintNewTokensRequest) (*types.MsgMintNewTokensResponse, error) { ctx := sdk.UnwrapSDKContext(c) - assetData, found := k.GetAsset(ctx, msg.AssetId) + assetData, found := k.asset.GetAsset(ctx, msg.AssetId) if !found { return nil, types.ErrorAssetDoesNotExist } - appMappingData, found := k.GetApp(ctx, msg.AppId) + appMappingData, found := k.asset.GetApp(ctx, msg.AppId) if !found { return nil, types.ErrorAppMappingDoesNotExists } // Checking if asset exists in the app - assetDataInApp, found := k.GetMintGenesisTokenData(ctx, appMappingData.Id, assetData.Id) + assetDataInApp, found := k.asset.GetMintGenesisTokenData(ctx, appMappingData.Id, assetData.Id) if !found { return nil, types.ErrorAssetNotWhiteListedForGenesisMinting } @@ -42,7 +42,7 @@ func (k msgServer) MsgMintNewTokens(c context.Context, msg *types.MsgMintNewToke var newTokenMintAppData types.MintedTokens var appData types.TokenMint - if err := k.MintCoin(ctx, types.ModuleName, sdk.NewCoin(assetData.Denom, assetDataInApp.GenesisSupply)); err != nil { + if err := k.bank.MintCoins(ctx, types.ModuleName, sdk.NewCoins(sdk.NewCoin(assetData.Denom, assetDataInApp.GenesisSupply))); err != nil { return nil, err } userAddress, err := sdk.AccAddressFromBech32(assetDataInApp.Recipient) @@ -50,7 +50,7 @@ func (k msgServer) MsgMintNewTokens(c context.Context, msg *types.MsgMintNewToke return nil, err } if assetDataInApp.GenesisSupply.GT(sdk.ZeroInt()) { - if err := k.SendCoinFromModuleToAccount(ctx, types.ModuleName, userAddress, sdk.NewCoin(assetData.Denom, assetDataInApp.GenesisSupply)); err != nil { + if err := k.bank.SendCoinsFromModuleToAccount(ctx, types.ModuleName, userAddress, sdk.NewCoins(sdk.NewCoin(assetData.Denom, assetDataInApp.GenesisSupply))); err != nil { return nil, err } } @@ -75,10 +75,10 @@ func (k msgServer) MsgMintNewTokens(c context.Context, msg *types.MsgMintNewToke return nil, err } if assetDataInApp.GenesisSupply.GT(sdk.ZeroInt()) { - if err = k.MintCoin(ctx, types.ModuleName, sdk.NewCoin(assetData.Denom, assetDataInApp.GenesisSupply)); err != nil { + if err = k.bank.MintCoins(ctx, types.ModuleName, sdk.NewCoins(sdk.NewCoin(assetData.Denom, assetDataInApp.GenesisSupply))); err != nil { return nil, err } - if err = k.SendCoinFromModuleToAccount(ctx, types.ModuleName, userAddress, sdk.NewCoin(assetData.Denom, assetDataInApp.GenesisSupply)); err != nil { + if err = k.bank.SendCoinsFromModuleToAccount(ctx, types.ModuleName, userAddress, sdk.NewCoins(sdk.NewCoin(assetData.Denom, assetDataInApp.GenesisSupply))); err != nil { return nil, err } } From 037c45e2a5497cb4c1bddb8c9f2ceb49f24b17a1 Mon Sep 17 00:00:00 2001 From: Vishnu Kumavat Date: Tue, 18 Oct 2022 18:43:52 +0530 Subject: [PATCH 4/8] rewards module alias removed --- x/rewards/keeper/alias.go | 219 --------------------------------- x/rewards/keeper/iter.go | 56 ++++----- x/rewards/keeper/keeper.go | 12 +- x/rewards/keeper/msg_server.go | 14 +-- x/rewards/keeper/rewards.go | 44 +++---- 5 files changed, 63 insertions(+), 282 deletions(-) delete mode 100644 x/rewards/keeper/alias.go diff --git a/x/rewards/keeper/alias.go b/x/rewards/keeper/alias.go deleted file mode 100644 index 3ad23c587..000000000 --- a/x/rewards/keeper/alias.go +++ /dev/null @@ -1,219 +0,0 @@ -package keeper - -import ( - lendtypes "github.com/comdex-official/comdex/x/lend/types" - "github.com/comdex-official/comdex/x/liquidity/amm" - liquiditytypes "github.com/comdex-official/comdex/x/liquidity/types" - sdk "github.com/cosmos/cosmos-sdk/types" - - assettypes "github.com/comdex-official/comdex/x/asset/types" - collectortypes "github.com/comdex-official/comdex/x/collector/types" - esmtypes "github.com/comdex-official/comdex/x/esm/types" - "github.com/comdex-official/comdex/x/locker/types" - markettypes "github.com/comdex-official/comdex/x/market/types" - rewardstypes "github.com/comdex-official/comdex/x/rewards/types" - vaulttypes "github.com/comdex-official/comdex/x/vault/types" -) - -func (k Keeper) GetLockerProductAssetMapping(ctx sdk.Context, appID, assetID uint64) (lockerProductMapping types.LockerProductAssetMapping, found bool) { - return k.locker.GetLockerProductAssetMapping(ctx, appID, assetID) -} - -func (k Keeper) GetAppidToAssetCollectorMapping(ctx sdk.Context, appID, assetID uint64) (appAssetCollectorData collectortypes.AppToAssetIdCollectorMapping, found bool) { - return k.collector.GetAppidToAssetCollectorMapping(ctx, appID, assetID) -} - -func (k Keeper) GetCollectorLookupTable(ctx sdk.Context, appID, assetID uint64) (collectorLookup collectortypes.CollectorLookupTableData, found bool) { - return k.collector.GetCollectorLookupTable(ctx, appID, assetID) -} - -func (k Keeper) GetAppToDenomsMapping(ctx sdk.Context, appID uint64) (appToDenom collectortypes.AppToDenomsMapping, found bool) { - return k.collector.GetAppToDenomsMapping(ctx, appID) -} - -func (k Keeper) GetLocker(ctx sdk.Context, lockerID uint64) (locker types.Locker, found bool) { - return k.locker.GetLocker(ctx, lockerID) -} - -func (k Keeper) GetSupply(ctx sdk.Context, denom string) sdk.Coin { - return k.bank.GetSupply(ctx, denom) -} - -func (k Keeper) GetLockerLookupTableByApp(ctx sdk.Context, appID uint64) (lockerLookupData []types.LockerLookupTableData, found bool) { - return k.locker.GetLockerLookupTableByApp(ctx, appID) -} - -// func (k Keeper) GetCollectorLookupByAsset(ctx sdk.Context, appID, assetID uint64) (collectorLookup collectortypes.CollectorLookupTable, found bool) { -// return k.collector.GetCollectorLookupByAsset(ctx, appID, assetID) -// } - -func (k Keeper) SetLocker(ctx sdk.Context, locker types.Locker) { - k.locker.SetLocker(ctx, locker) -} - -func (k Keeper) GetAppMappingData(ctx sdk.Context, appMappingID uint64) (appExtendedPairVaultData []vaulttypes.AppExtendedPairVaultMappingData, found bool) { - return k.vault.GetAppMappingData(ctx, appMappingID) -} - -func (k Keeper) CalculateCollateralizationRatio(ctx sdk.Context, extendedPairVaultID uint64, amountIn sdk.Int, amountOut sdk.Int) (sdk.Dec, error) { - return k.vault.CalculateCollateralizationRatio(ctx, extendedPairVaultID, amountIn, amountOut) -} - -func (k Keeper) GetAsset(ctx sdk.Context, id uint64) (assettypes.Asset, bool) { - return k.asset.GetAsset(ctx, id) -} - -func (k Keeper) GetVault(ctx sdk.Context, id uint64) (vault vaulttypes.Vault, found bool) { - return k.vault.GetVault(ctx, id) -} - -func (k Keeper) DeleteVault(ctx sdk.Context, id uint64) { - k.vault.DeleteVault(ctx, id) -} - -func (k Keeper) UpdateAppExtendedPairVaultMappingDataOnMsgCreate(ctx sdk.Context, vaultData vaulttypes.Vault) { - k.vault.UpdateAppExtendedPairVaultMappingDataOnMsgCreate(ctx, vaultData) -} - -func (k Keeper) UpdateCollateralLockedAmountLockerMapping(ctx sdk.Context, appMappingID uint64, extendedPairID uint64, amount sdk.Int, changeType bool) { - k.vault.UpdateCollateralLockedAmountLockerMapping(ctx, appMappingID, extendedPairID, amount, changeType) -} - -func (k Keeper) DeleteUserVaultExtendedPairMapping(ctx sdk.Context, address string, appID uint64, pairVaultID uint64) { - k.vault.DeleteUserVaultExtendedPairMapping(ctx, address, appID, pairVaultID) -} - -func (k Keeper) DeleteAddressFromAppExtendedPairVaultMapping(ctx sdk.Context, extendedPairID uint64, userVaultID uint64, appMappingID uint64) { - k.vault.DeleteAddressFromAppExtendedPairVaultMapping(ctx, extendedPairID, userVaultID, appMappingID) -} - -func (k Keeper) GetPairsVault(ctx sdk.Context, id uint64) (pairs assettypes.ExtendedPairVault, found bool) { - return k.asset.GetPairsVault(ctx, id) -} - -func (k Keeper) SetVault(ctx sdk.Context, vault vaulttypes.Vault) { - k.vault.SetVault(ctx, vault) -} - -func (k Keeper) BurnCoin(ctx sdk.Context, name string, coin sdk.Coin) error { - if coin.IsZero() { - return rewardstypes.BurnCoinValueInRewardsIsZero - } - - return k.bank.BurnCoins(ctx, name, sdk.NewCoins(coin)) -} - -func (k Keeper) MintCoin(ctx sdk.Context, name string, coin sdk.Coin) error { - if coin.IsZero() { - return rewardstypes.MintCoinValueInRewardsIsZero - } - - return k.bank.MintCoins(ctx, name, sdk.NewCoins(coin)) -} - -func (k Keeper) SendCoinFromAccountToModule(ctx sdk.Context, address sdk.AccAddress, name string, coin sdk.Coin) error { - if coin.IsZero() { - return rewardstypes.SendCoinsFromAccountToModuleInRewardsIsZero - } - - return k.bank.SendCoinsFromAccountToModule(ctx, address, name, sdk.NewCoins(coin)) -} - -func (k Keeper) SendCoinFromModuleToAccount(ctx sdk.Context, name string, address sdk.AccAddress, coin sdk.Coin) error { - if coin.IsZero() { - return rewardstypes.SendCoinsFromModuleToAccountInRewardsIsZero - } - - return k.bank.SendCoinsFromModuleToAccount(ctx, name, address, sdk.NewCoins(coin)) -} - -func (k Keeper) SendCoinFromModuleToModule(ctx sdk.Context, senderModule, recipientModule string, coin sdk.Coins) error { - if coin.IsZero() { - return rewardstypes.SendCoinsFromModuleToModuleInRewardsIsZero - } - return k.bank.SendCoinsFromModuleToModule(ctx, senderModule, recipientModule, coin) -} - -func (k Keeper) SpendableCoins(ctx sdk.Context, address sdk.AccAddress) sdk.Coins { - return k.bank.SpendableCoins(ctx, address) -} - -func (k Keeper) GetNetFeeCollectedData(ctx sdk.Context, appID, assetID uint64) (netFeeData collectortypes.AppAssetIdToFeeCollectedData, found bool) { - return k.collector.GetNetFeeCollectedData(ctx, appID, assetID) -} - -func (k Keeper) SetNetFeeCollectedData(ctx sdk.Context, appID, assetID uint64, fee sdk.Int) error { - return k.collector.SetNetFeeCollectedData(ctx, appID, assetID, fee) -} - -func (k Keeper) DecreaseNetFeeCollectedData(ctx sdk.Context, appID, assetID uint64, fee sdk.Int, netFeeCollectedData collectortypes.AppAssetIdToFeeCollectedData) error { - return k.collector.DecreaseNetFeeCollectedData(ctx, appID, assetID, fee, netFeeCollectedData) -} - -func (k Keeper) SetLockerTotalRewardsByAssetAppWise(ctx sdk.Context, lockerRewardsMapping types.LockerTotalRewardsByAssetAppWise) error { - return k.locker.SetLockerTotalRewardsByAssetAppWise(ctx, lockerRewardsMapping) -} - -func (k Keeper) GetLockerTotalRewardsByAssetAppWise(ctx sdk.Context, appID, assetID uint64) (lockerRewardsMapping types.LockerTotalRewardsByAssetAppWise, found bool) { - return k.locker.GetLockerTotalRewardsByAssetAppWise(ctx, appID, assetID) -} - -func (k Keeper) GetKillSwitchData(ctx sdk.Context, appID uint64) (esmtypes.KillSwitchParams, bool) { - return k.esm.GetKillSwitchData(ctx, appID) -} - -func (k Keeper) GetESMStatus(ctx sdk.Context, id uint64) (esmtypes.ESMStatus, bool) { - return k.esm.GetESMStatus(ctx, id) -} - -func (k Keeper) GetLockers(ctx sdk.Context) (locker []types.Locker) { - return k.locker.GetLockers(ctx) -} - -func (k Keeper) SetLockerLookupTable(ctx sdk.Context, lockerLookupData types.LockerLookupTableData) { - k.locker.SetLockerLookupTable(ctx, lockerLookupData) -} - -func (k Keeper) GetLockerLookupTable(ctx sdk.Context, appID, assetID uint64) (lockerLookupData types.LockerLookupTableData, found bool) { - return k.locker.GetLockerLookupTable(ctx, appID, assetID) -} - -func (k Keeper) GetAppExtendedPairVaultMappingData(ctx sdk.Context, appMappingID uint64, pairVaultID uint64) (appExtendedPairVaultData vaulttypes.AppExtendedPairVaultMappingData, found bool) { - return k.vault.GetAppExtendedPairVaultMappingData(ctx, appMappingID, pairVaultID) -} - -func (k Keeper) CalcAssetPrice(ctx sdk.Context, id uint64, amt sdk.Int) (price sdk.Dec, err error) { - return k.marketKeeper.CalcAssetPrice(ctx, id, amt) -} - -func (k Keeper) GetTwa(ctx sdk.Context, id uint64) (twa markettypes.TimeWeightedAverage, found bool) { - return k.marketKeeper.GetTwa(ctx, id) -} - -func (k Keeper) GetBorrow(ctx sdk.Context, id uint64) (borrow lendtypes.BorrowAsset, found bool) { - return k.lend.GetBorrow(ctx, id) -} - -func (k Keeper) GetLend(ctx sdk.Context, id uint64) (lend lendtypes.LendAsset, found bool) { - return k.lend.GetLend(ctx, id) -} - -func (k Keeper) GetAssetStatsByPoolIDAndAssetID(ctx sdk.Context, poolID, assetID uint64) (PoolAssetLBMapping lendtypes.PoolAssetLBMapping, found bool) { - return k.lend.GetAssetStatsByPoolIDAndAssetID(ctx, poolID, assetID) -} - -func (k Keeper) GetActiveFarmer(ctx sdk.Context, appID, poolID uint64, farmer sdk.AccAddress) (activeFarmer liquiditytypes.ActiveFarmer, found bool) { - return k.liquidityKeeper.GetActiveFarmer(ctx, appID, poolID, farmer) -} - -func (k Keeper) GetAMMPoolInterfaceObject(ctx sdk.Context, appID, poolID uint64) (*liquiditytypes.Pool, *liquiditytypes.Pair, *amm.BasicPool, error) { - return k.liquidityKeeper.GetAMMPoolInterfaceObject(ctx, appID, poolID) -} - -func (k Keeper) CalculateXYFromPoolCoin(ctx sdk.Context, ammPool *amm.BasicPool, poolCoin sdk.Coin) (sdk.Int, sdk.Int, error) { - return k.liquidityKeeper.CalculateXYFromPoolCoin(ctx, ammPool, poolCoin) -} - -func (k Keeper) GetAssetForDenom(ctx sdk.Context, denom string) (asset assettypes.Asset, found bool) { - return k.asset.GetAssetForDenom(ctx, denom) -} diff --git a/x/rewards/keeper/iter.go b/x/rewards/keeper/iter.go index 8b3aec08d..552a8d76f 100644 --- a/x/rewards/keeper/iter.go +++ b/x/rewards/keeper/iter.go @@ -16,11 +16,11 @@ func (k Keeper) DistributeExtRewardLocker(ctx sdk.Context) error { // Give external rewards to locker owners for creating locker with specific assetID extRewards := k.GetExternalRewardsLockers(ctx) for _, v := range extRewards { - klwsParams, _ := k.GetKillSwitchData(ctx, v.AppMappingId) + klwsParams, _ := k.esm.GetKillSwitchData(ctx, v.AppMappingId) if klwsParams.BreakerEnable { return esmtypes.ErrCircuitBreakerEnabled } - esmStatus, found := k.GetESMStatus(ctx, v.AppMappingId) + esmStatus, found := k.esm.GetESMStatus(ctx, v.AppMappingId) status := false if found { status = esmStatus.Status @@ -41,13 +41,13 @@ func (k Keeper) DistributeExtRewardLocker(ctx sdk.Context) error { if et < timeNow { if epoch.Count < uint64(v.DurationDays) { // rewards will be given till the duration defined in the ext rewards // getting the total share of Deposited amount of Lockers of specific assetID and AppID - lockerLookup, _ := k.GetLockerLookupTable(ctx, v.AppMappingId, v.AssetId) + lockerLookup, _ := k.locker.GetLockerLookupTable(ctx, v.AppMappingId, v.AssetId) totalShare := lockerLookup.DepositedAmount // initializing amountRewardedTracker to keep a track of daily rewards given to locker owners amountRewardedTracker := sdk.NewCoin(v.TotalRewards.Denom, sdk.ZeroInt()) for _, lockerID := range lockerLookup.LockerIds { - locker, found := k.GetLocker(ctx, lockerID) + locker, found := k.locker.GetLocker(ctx, lockerID) if !found { continue } @@ -69,7 +69,7 @@ func (k Keeper) DistributeExtRewardLocker(ctx sdk.Context) error { // after calculating final daily rewards, the amount is sent to the user if finalDailyRewards.GT(sdk.ZeroInt()) { amountRewardedTracker.Amount = amountRewardedTracker.Amount.Add(finalDailyRewards) - err := k.SendCoinFromModuleToAccount(ctx, types.ModuleName, user, sdk.NewCoin(availableRewards.Denom, finalDailyRewards)) + err := k.bank.SendCoinsFromModuleToAccount(ctx, types.ModuleName, user, sdk.NewCoins(sdk.NewCoin(availableRewards.Denom, finalDailyRewards))) if err != nil { continue } @@ -98,11 +98,11 @@ func (k Keeper) DistributeExtRewardVault(ctx sdk.Context) error { // Give external rewards to vault owners for opening a vault with specific assetID extRewards := k.GetExternalRewardVaults(ctx) for _, v := range extRewards { - klwsParams, _ := k.GetKillSwitchData(ctx, v.AppMappingId) + klwsParams, _ := k.esm.GetKillSwitchData(ctx, v.AppMappingId) if klwsParams.BreakerEnable { return esmtypes.ErrCircuitBreakerEnabled } - esmStatus, found := k.GetESMStatus(ctx, v.AppMappingId) + esmStatus, found := k.esm.GetESMStatus(ctx, v.AppMappingId) status := false if found { status = esmStatus.Status @@ -121,14 +121,14 @@ func (k Keeper) DistributeExtRewardVault(ctx sdk.Context) error { if et < timeNow { if epoch.Count < uint64(v.DurationDays) { // rewards will be given till the duration defined in the ext rewards - appExtPairVaultData, _ := k.GetAppExtendedPairVaultMappingData(ctx, v.AppMappingId, v.ExtendedPairId) + appExtPairVaultData, _ := k.vault.GetAppExtendedPairVaultMappingData(ctx, v.AppMappingId, v.ExtendedPairId) // initializing amountRewardedTracker to keep a track of daily rewards given to locker owners amountRewardedTracker := sdk.NewCoin(v.TotalRewards.Denom, sdk.ZeroInt()) for _, vaultID := range appExtPairVaultData.VaultIds { totalRewards := v.AvailableRewards - userVault, found := k.GetVault(ctx, vaultID) + userVault, found := k.vault.GetVault(ctx, vaultID) if !found { continue } @@ -148,7 +148,7 @@ func (k Keeper) DistributeExtRewardVault(ctx sdk.Context) error { user, _ := sdk.AccAddressFromBech32(userVault.Owner) if finalDailyRewards.GT(sdk.ZeroInt()) { amountRewardedTracker = amountRewardedTracker.Add(sdk.NewCoin(totalRewards.Denom, finalDailyRewards)) - err := k.SendCoinFromModuleToAccount(ctx, types.ModuleName, user, sdk.NewCoin(totalRewards.Denom, finalDailyRewards)) + err := k.bank.SendCoinsFromModuleToAccount(ctx, types.ModuleName, user, sdk.NewCoins(sdk.NewCoin(totalRewards.Denom, finalDailyRewards))) if err != nil { continue } @@ -209,7 +209,7 @@ func (k Keeper) DistributeExtRewardLend(ctx sdk.Context) error { // Give external rewards to borrowers for opening a vault with specific assetID extRewards := k.GetExternalRewardLends(ctx) for _, v := range extRewards { - klwsParams, _ := k.GetKillSwitchData(ctx, v.AppMappingId) + klwsParams, _ := k.esm.GetKillSwitchData(ctx, v.AppMappingId) if klwsParams.BreakerEnable { return esmtypes.ErrCircuitBreakerEnabled } @@ -226,19 +226,19 @@ func (k Keeper) DistributeExtRewardLend(ctx sdk.Context) error { totalBorrowedAmt := sdk.ZeroInt() rewardsAssetPoolData := v.RewardsAssetPoolData for _, assetID := range rewardsAssetPoolData.AssetId { - borrowByPoolIDAssetID, _ := k.GetAssetStatsByPoolIDAndAssetID(ctx, rewardsAssetPoolData.CPoolId, assetID) - price, err := k.CalcAssetPrice(ctx, assetID, borrowByPoolIDAssetID.TotalBorrowed.Add(borrowByPoolIDAssetID.TotalStableBorrowed)) + borrowByPoolIDAssetID, _ := k.lend.GetAssetStatsByPoolIDAndAssetID(ctx, rewardsAssetPoolData.CPoolId, assetID) + price, err := k.marketKeeper.CalcAssetPrice(ctx, assetID, borrowByPoolIDAssetID.TotalBorrowed.Add(borrowByPoolIDAssetID.TotalStableBorrowed)) if err != nil { return err } totalBorrowedAmt = totalBorrowedAmt.Add(price.TruncateInt()) } // calculating totalAPR - rewardAsset, found := k.GetAssetForDenom(ctx, v.TotalRewards.Denom) + rewardAsset, found := k.asset.GetAssetForDenom(ctx, v.TotalRewards.Denom) if !found { continue } - totalRewardAmt, _ := k.CalcAssetPrice(ctx, rewardAsset.Id, v.TotalRewards.Amount) + totalRewardAmt, _ := k.marketKeeper.CalcAssetPrice(ctx, rewardAsset.Id, v.TotalRewards.Amount) totalAPR := totalRewardAmt.Quo(sdk.NewDecFromInt(totalBorrowedAmt)) var inverseRatesSum sdk.Dec // inverting the rate to enable low apr for assets which are more borrowed @@ -251,13 +251,13 @@ func (k Keeper) DistributeExtRewardLend(ctx sdk.Context) error { amountRewardedTracker := sdk.NewCoin(v.TotalRewards.Denom, sdk.ZeroInt()) for _, assetID := range rewardsAssetPoolData.AssetId { // iterating over assetIDs - borrowIDs, _ := k.GetAssetStatsByPoolIDAndAssetID(ctx, rewardsAssetPoolData.CPoolId, assetID) + borrowIDs, _ := k.lend.GetAssetStatsByPoolIDAndAssetID(ctx, rewardsAssetPoolData.CPoolId, assetID) for _, borrowID := range borrowIDs.BorrowIds { // iterating over borrowIDs - borrow, found := k.GetBorrow(ctx, borrowID) + borrow, found := k.lend.GetBorrow(ctx, borrowID) if !found { continue } - lend, found := k.GetLend(ctx, borrow.LendingID) + lend, found := k.lend.GetLend(ctx, borrow.LendingID) if !found { continue } @@ -275,7 +275,7 @@ func (k Keeper) DistributeExtRewardLend(ctx sdk.Context) error { if finalDailyRewardsPerUser.TruncateInt().GT(sdk.ZeroInt()) { amountRewardedTracker = amountRewardedTracker.Sub(sdk.NewCoin(v.TotalRewards.Denom, finalDailyRewardsPerUser.TruncateInt())) - err := k.SendCoinFromModuleToAccount(ctx, types.ModuleName, user, sdk.NewCoin(v.TotalRewards.Denom, finalDailyRewardsPerUser.TruncateInt())) + err := k.bank.SendCoinsFromModuleToAccount(ctx, types.ModuleName, user, sdk.NewCoins(sdk.NewCoin(v.TotalRewards.Denom, finalDailyRewardsPerUser.TruncateInt()))) if err != nil { continue } @@ -302,36 +302,36 @@ func (k Keeper) DistributeExtRewardLend(ctx sdk.Context) error { } func (k Keeper) InvertingRates(ctx sdk.Context, assetID, poolID uint64, totalRewardAmt sdk.Int) sdk.Dec { - assetBorrowedByPoolIDAndAssetID, _ := k.GetAssetStatsByPoolIDAndAssetID(ctx, poolID, assetID) - assetBorrowedByPoolIDAndAssetIDAmt, _ := k.CalcAssetPrice(ctx, assetID, assetBorrowedByPoolIDAndAssetID.TotalBorrowed.Add(assetBorrowedByPoolIDAndAssetID.TotalStableBorrowed)) + assetBorrowedByPoolIDAndAssetID, _ := k.lend.GetAssetStatsByPoolIDAndAssetID(ctx, poolID, assetID) + assetBorrowedByPoolIDAndAssetIDAmt, _ := k.marketKeeper.CalcAssetPrice(ctx, assetID, assetBorrowedByPoolIDAndAssetID.TotalBorrowed.Add(assetBorrowedByPoolIDAndAssetID.TotalStableBorrowed)) tempRate := assetBorrowedByPoolIDAndAssetIDAmt.Quo(sdk.NewDecFromInt(totalRewardAmt)) inverseRate := sdk.OneDec().Sub(tempRate) return inverseRate } func (k Keeper) CheckBorrowersLiquidity(ctx sdk.Context, addr sdk.AccAddress, masterPoolID int64, appID uint64, amount sdk.Int) bool { - farmedCoin, found := k.GetActiveFarmer(ctx, appID, uint64(masterPoolID), addr) + farmedCoin, found := k.liquidityKeeper.GetActiveFarmer(ctx, appID, uint64(masterPoolID), addr) if !found { return false } - pool, pair, ammPool, err := k.GetAMMPoolInterfaceObject(ctx, appID, uint64(masterPoolID)) + pool, pair, ammPool, err := k.liquidityKeeper.GetAMMPoolInterfaceObject(ctx, appID, uint64(masterPoolID)) if err != nil { return false } poolCoin := sdk.NewCoin(pool.PoolCoinDenom, farmedCoin.FarmedPoolCoin.Amount) - x, y, err := k.CalculateXYFromPoolCoin(ctx, ammPool, poolCoin) + x, y, err := k.liquidityKeeper.CalculateXYFromPoolCoin(ctx, ammPool, poolCoin) if err != nil { return false } - quoteCoinAsset, _ := k.GetAssetForDenom(ctx, pair.QuoteCoinDenom) - baseCoinAsset, _ := k.GetAssetForDenom(ctx, pair.BaseCoinDenom) - priceQuoteCoin, err := k.CalcAssetPrice(ctx, quoteCoinAsset.Id, x) + quoteCoinAsset, _ := k.asset.GetAssetForDenom(ctx, pair.QuoteCoinDenom) + baseCoinAsset, _ := k.asset.GetAssetForDenom(ctx, pair.BaseCoinDenom) + priceQuoteCoin, err := k.marketKeeper.CalcAssetPrice(ctx, quoteCoinAsset.Id, x) if err != nil { return false } - priceBaseCoin, err := k.CalcAssetPrice(ctx, baseCoinAsset.Id, y) + priceBaseCoin, err := k.marketKeeper.CalcAssetPrice(ctx, baseCoinAsset.Id, y) if err != nil { return false } diff --git a/x/rewards/keeper/keeper.go b/x/rewards/keeper/keeper.go index bed4118d2..b595c0c8a 100644 --- a/x/rewards/keeper/keeper.go +++ b/x/rewards/keeper/keeper.go @@ -124,7 +124,7 @@ func (k Keeper) ActExternalRewardsLockers( minLockupTimeSeconds int64, ) error { id := k.GetExternalRewardsLockersID(ctx) - _, found := k.GetLockerProductAssetMapping(ctx, appMappingID, assetID) + _, found := k.locker.GetLockerProductAssetMapping(ctx, appMappingID, assetID) if !found { return types.ErrAssetIDDoesNotExist } @@ -172,7 +172,7 @@ func (k Keeper) ActExternalRewardsVaults( ) error { id := k.GetExternalRewardsVaultID(ctx) - appExtPairVaultData, found := k.GetAppMappingData(ctx, appMappingID) + appExtPairVaultData, found := k.vault.GetAppMappingData(ctx, appMappingID) if !found { return types.ErrAppIDDoesNotExists } @@ -219,11 +219,11 @@ func (k Keeper) ActExternalRewardsVaults( // WasmRemoveWhitelistAssetLocker tx and query binding functions func (k Keeper) WasmRemoveWhitelistAssetLocker(ctx sdk.Context, appMappingID uint64, assetID uint64) error { - klwsParams, _ := k.GetKillSwitchData(ctx, appMappingID) + klwsParams, _ := k.esm.GetKillSwitchData(ctx, appMappingID) if klwsParams.BreakerEnable { return esmtypes.ErrCircuitBreakerEnabled } - esmStatus, found := k.GetESMStatus(ctx, appMappingID) + esmStatus, found := k.esm.GetESMStatus(ctx, appMappingID) status := false if found { status = esmStatus.Status @@ -249,11 +249,11 @@ func (k Keeper) WasmRemoveWhitelistAssetLockerQuery(ctx sdk.Context, appMappingI } func (k Keeper) WasmRemoveWhitelistAppIDVaultInterest(ctx sdk.Context, appMappingID uint64) error { - klwsParams, _ := k.GetKillSwitchData(ctx, appMappingID) + klwsParams, _ := k.esm.GetKillSwitchData(ctx, appMappingID) if klwsParams.BreakerEnable { return esmtypes.ErrCircuitBreakerEnabled } - esmStatus, found := k.GetESMStatus(ctx, appMappingID) + esmStatus, found := k.esm.GetESMStatus(ctx, appMappingID) status := false if found { status = esmStatus.Status diff --git a/x/rewards/keeper/msg_server.go b/x/rewards/keeper/msg_server.go index fe168d97f..eae9f2ee8 100644 --- a/x/rewards/keeper/msg_server.go +++ b/x/rewards/keeper/msg_server.go @@ -40,11 +40,11 @@ func (m msgServer) CreateGauge(goCtx context.Context, msg *types.MsgCreateGauge) func (m msgServer) ExternalRewardsLockers(goCtx context.Context, msg *types.ActivateExternalRewardsLockers) (*types.ActivateExternalRewardsLockersResponse, error) { ctx := sdk.UnwrapSDKContext(goCtx) - klwsParams, _ := m.GetKillSwitchData(ctx, msg.AppMappingId) + klwsParams, _ := m.esm.GetKillSwitchData(ctx, msg.AppMappingId) if klwsParams.BreakerEnable { return nil, esmtypes.ErrCircuitBreakerEnabled } - esmStatus, found := m.GetESMStatus(ctx, msg.AppMappingId) + esmStatus, found := m.esm.GetESMStatus(ctx, msg.AppMappingId) status := false if found { status = esmStatus.Status @@ -64,11 +64,11 @@ func (m msgServer) ExternalRewardsLockers(goCtx context.Context, msg *types.Acti func (m msgServer) ExternalRewardsVault(goCtx context.Context, msg *types.ActivateExternalRewardsVault) (*types.ActivateExternalRewardsVaultResponse, error) { ctx := sdk.UnwrapSDKContext(goCtx) - klwsParams, _ := m.GetKillSwitchData(ctx, msg.AppMappingId) + klwsParams, _ := m.esm.GetKillSwitchData(ctx, msg.AppMappingId) if klwsParams.BreakerEnable { return nil, esmtypes.ErrCircuitBreakerEnabled } - esmStatus, found := m.GetESMStatus(ctx, msg.AppMappingId) + esmStatus, found := m.esm.GetESMStatus(ctx, msg.AppMappingId) status := false if found { status = esmStatus.Status @@ -80,7 +80,7 @@ func (m msgServer) ExternalRewardsVault(goCtx context.Context, msg *types.Activa if err != nil { return nil, err } - pairVault, found := m.GetPairsVault(ctx, msg.ExtendedPairId) + pairVault, found := m.asset.GetPairsVault(ctx, msg.ExtendedPairId) if !found { return nil, assettypes.ErrorExtendedPairDoesNotExistForTheApp } @@ -95,11 +95,11 @@ func (m msgServer) ExternalRewardsVault(goCtx context.Context, msg *types.Activa func (m msgServer) ExternalRewardsLend(goCtx context.Context, msg *types.ActivateExternalRewardsLend) (*types.ActivateExternalRewardsLendResponse, error) { ctx := sdk.UnwrapSDKContext(goCtx) - klwsParams, _ := m.GetKillSwitchData(ctx, msg.AppMappingId) + klwsParams, _ := m.esm.GetKillSwitchData(ctx, msg.AppMappingId) if klwsParams.BreakerEnable { return nil, esmtypes.ErrCircuitBreakerEnabled } - esmStatus, found := m.GetESMStatus(ctx, msg.AppMappingId) + esmStatus, found := m.esm.GetESMStatus(ctx, msg.AppMappingId) status := false if found { status = esmStatus.Status diff --git a/x/rewards/keeper/rewards.go b/x/rewards/keeper/rewards.go index b7d3d8f57..0e5ac390b 100644 --- a/x/rewards/keeper/rewards.go +++ b/x/rewards/keeper/rewards.go @@ -376,7 +376,7 @@ func (k Keeper) GetWhitelistAppIDLockerRewardsCheck(ctx sdk.Context, appMappingI } func (k Keeper) GetExternalLockerRewardsCheck(ctx sdk.Context, appMappingID uint64, assetID uint64) (found bool, err string) { - _, found = k.GetLockerProductAssetMapping(ctx, appMappingID, assetID) + _, found = k.locker.GetLockerProductAssetMapping(ctx, appMappingID, assetID) if !found { return false, "asset id does not exist" } @@ -390,11 +390,11 @@ func (k Keeper) GetExternalVaultRewardsCheck(ctx sdk.Context, appMappingID uint6 // Whitelist an asset of an app for internal rewards func (k Keeper) Whitelist(goCtx context.Context, msg *types.WhitelistAsset) (*types.MsgWhitelistAssetResponse, error) { ctx := sdk.UnwrapSDKContext(goCtx) - klwsParams, _ := k.GetKillSwitchData(ctx, msg.AppMappingId) + klwsParams, _ := k.esm.GetKillSwitchData(ctx, msg.AppMappingId) if klwsParams.BreakerEnable { return nil, esmtypes.ErrCircuitBreakerEnabled } - esmStatus, found := k.GetESMStatus(ctx, msg.AppMappingId) + esmStatus, found := k.esm.GetESMStatus(ctx, msg.AppMappingId) status := false if found { status = esmStatus.Status @@ -411,11 +411,11 @@ func (k Keeper) Whitelist(goCtx context.Context, msg *types.WhitelistAsset) (*ty func (k Keeper) WhitelistAppVault(goCtx context.Context, msg *types.WhitelistAppIdVault) (*types.MsgWhitelistAppIdVaultResponse, error) { ctx := sdk.UnwrapSDKContext(goCtx) - klwsParams, _ := k.GetKillSwitchData(ctx, msg.AppMappingId) + klwsParams, _ := k.esm.GetKillSwitchData(ctx, msg.AppMappingId) if klwsParams.BreakerEnable { return nil, esmtypes.ErrCircuitBreakerEnabled } - esmStatus, found := k.GetESMStatus(ctx, msg.AppMappingId) + esmStatus, found := k.esm.GetESMStatus(ctx, msg.AppMappingId) status := false if found { status = esmStatus.Status @@ -544,9 +544,9 @@ func (k Keeper) CalculateLockerRewards(ctx sdk.Context, appID, assetID, lockerID if !found { return nil } - lockers, _ := k.GetLockerLookupTable(ctx, appID, assetID) + lockers, _ := k.locker.GetLockerLookupTable(ctx, appID, assetID) - collectorLookup, found := k.GetCollectorLookupTable(ctx, appID, assetID) + collectorLookup, found := k.collector.GetCollectorLookupTable(ctx, appID, assetID) if !found { return collectortypes.ErrorAssetDoesNotExist } @@ -569,7 +569,7 @@ func (k Keeper) CalculateLockerRewards(ctx sdk.Context, appID, assetID, lockerID return nil } } - lockerData, _ := k.GetLocker(ctx, lockerID) + lockerData, _ := k.locker.GetLocker(ctx, lockerID) lockerRewardsTracker, found := k.GetLockerRewardTracker(ctx, lockerData.LockerId, appID) if !found { lockerRewardsTracker = types.LockerRewardsTracker{ @@ -587,35 +587,35 @@ func (k Keeper) CalculateLockerRewards(ctx sdk.Context, appID, assetID, lockerID newRewardDec := sdk.NewDec(newReward.Int64()) lockerRewardsTracker.RewardsAccumulated = lockerRewardsTracker.RewardsAccumulated.Sub(newRewardDec) k.SetLockerRewardTracker(ctx, lockerRewardsTracker) - netFeeCollectedData, found := k.GetNetFeeCollectedData(ctx, appID, lockerData.AssetDepositId) + netFeeCollectedData, found := k.collector.GetNetFeeCollectedData(ctx, appID, lockerData.AssetDepositId) if !found { return nil } - err = k.DecreaseNetFeeCollectedData(ctx, appID, lockerData.AssetDepositId, newReward, netFeeCollectedData) + err = k.collector.DecreaseNetFeeCollectedData(ctx, appID, lockerData.AssetDepositId, newReward, netFeeCollectedData) if err != nil { return nil } - assetData, _ := k.GetAsset(ctx, assetID) + assetData, _ := k.asset.GetAsset(ctx, assetID) if newReward.GT(sdk.ZeroInt()) { - err = k.SendCoinFromModuleToModule(ctx, collectortypes.ModuleName, lockertypes.ModuleName, sdk.NewCoins(sdk.NewCoin(assetData.Denom, newReward))) + err = k.bank.SendCoinsFromModuleToModule(ctx, collectortypes.ModuleName, lockertypes.ModuleName, sdk.NewCoins(sdk.NewCoin(assetData.Denom, newReward))) if err != nil { return nil } } - lockerRewardsMapping, found := k.GetLockerTotalRewardsByAssetAppWise(ctx, appID, lockerData.AssetDepositId) + lockerRewardsMapping, found := k.locker.GetLockerTotalRewardsByAssetAppWise(ctx, appID, lockerData.AssetDepositId) if !found { var lockerReward lockertypes.LockerTotalRewardsByAssetAppWise lockerReward.AppId = appID lockerReward.AssetId = lockerData.AssetDepositId lockerReward.TotalRewards = newReward - err = k.SetLockerTotalRewardsByAssetAppWise(ctx, lockerReward) + err = k.locker.SetLockerTotalRewardsByAssetAppWise(ctx, lockerReward) if err != nil { return nil } } else { lockerRewardsMapping.TotalRewards = lockerRewardsMapping.TotalRewards.Add(newReward) - err = k.SetLockerTotalRewardsByAssetAppWise(ctx, lockerRewardsMapping) + err = k.locker.SetLockerTotalRewardsByAssetAppWise(ctx, lockerRewardsMapping) if err != nil { return nil } @@ -626,15 +626,15 @@ func (k Keeper) CalculateLockerRewards(ctx sdk.Context, appID, assetID, lockerID lockerData.NetBalance = lockerData.NetBalance.Add(newReward) lockerData.ReturnsAccumulated = lockerData.ReturnsAccumulated.Add(newReward) - k.SetLocker(ctx, lockerData) + k.locker.SetLocker(ctx, lockerData) lockers.DepositedAmount = lockers.DepositedAmount.Add(newReward) - k.SetLockerLookupTable(ctx, lockers) + k.locker.SetLockerLookupTable(ctx, lockers) } else { // set tracker rewards k.SetLockerRewardTracker(ctx, lockerRewardsTracker) lockerData.BlockTime = ctx.BlockTime() lockerData.BlockHeight = ctx.BlockHeight() - k.SetLocker(ctx, lockerData) + k.locker.SetLocker(ctx, lockerData) } return nil @@ -645,7 +645,7 @@ func (k Keeper) CalculateVaultInterest(ctx sdk.Context, appID, extendedPairID, v if !found { return nil } - ExtPairVaultData, found := k.GetPairsVault(ctx, extendedPairID) + ExtPairVaultData, found := k.asset.GetPairsVault(ctx, extendedPairID) if !found { return assettypes.ErrorPairDoesNotExist } @@ -664,7 +664,7 @@ func (k Keeper) CalculateVaultInterest(ctx sdk.Context, appID, extendedPairID, v return err } - vaultData, _ := k.GetVault(ctx, vaultID) + vaultData, _ := k.vault.GetVault(ctx, vaultID) vaultInterestTracker, found := k.GetVaultInterestTracker(ctx, vaultData.Id, appID) if !found { vaultInterestTracker = types.VaultInterestTracker{ @@ -688,12 +688,12 @@ func (k Keeper) CalculateVaultInterest(ctx sdk.Context, appID, extendedPairID, v intAcc := vaultData.InterestAccumulated updatedIntAcc := (intAcc).Add(newInterest) vaultData.InterestAccumulated = updatedIntAcc - k.SetVault(ctx, vaultData) + k.vault.SetVault(ctx, vaultData) } else { k.SetVaultInterestTracker(ctx, vaultInterestTracker) vaultData.BlockTime = ctx.BlockTime() vaultData.BlockHeight = ctx.BlockHeight() - k.SetVault(ctx, vaultData) + k.vault.SetVault(ctx, vaultData) } return nil From 09599e89baabe0e54ab902e2de1a4d8fd0dbefe4 Mon Sep 17 00:00:00 2001 From: Vishnu Kumavat Date: Tue, 18 Oct 2022 19:02:43 +0530 Subject: [PATCH 5/8] market module alias removed --- app/app.go | 2 +- x/market/abci.go | 20 +++++++------- x/market/keeper/alias.go | 57 --------------------------------------- x/market/keeper/oracle.go | 2 +- x/market/module.go | 14 +++++++--- 5 files changed, 23 insertions(+), 72 deletions(-) delete mode 100644 x/market/keeper/alias.go diff --git a/app/app.go b/app/app.go index 46ef01b02..18f53b718 100644 --- a/app/app.go +++ b/app/app.go @@ -788,7 +788,7 @@ func New( ibcRouter = ibcporttypes.NewRouter() transferModule = ibctransfer.NewAppModule(app.IbcTransferKeeper) transferIBCModule = ibctransfer.NewIBCModule(app.IbcTransferKeeper) - oracleModule = market.NewAppModule(app.cdc, app.MarketKeeper) + oracleModule = market.NewAppModule(app.cdc, app.MarketKeeper, app.BandoracleKeeper, app.AssetKeeper) bandOracleIBCModule = bandoraclemodule.NewIBCModule(app.BandoracleKeeper) ) diff --git a/x/market/abci.go b/x/market/abci.go index 1751e54f7..63748b491 100644 --- a/x/market/abci.go +++ b/x/market/abci.go @@ -2,6 +2,8 @@ package market import ( utils "github.com/comdex-official/comdex/types" + assetkeeper "github.com/comdex-official/comdex/x/asset/keeper" + bandkeeper "github.com/comdex-official/comdex/x/bandoracle/keeper" bandoraclemoduletypes "github.com/comdex-official/comdex/x/bandoracle/types" "github.com/comdex-official/comdex/x/market/keeper" "github.com/comdex-official/comdex/x/market/types" @@ -10,18 +12,18 @@ import ( abci "github.com/tendermint/tendermint/abci/types" ) -func BeginBlocker(ctx sdk.Context, _ abci.RequestBeginBlock, k keeper.Keeper) { +func BeginBlocker(ctx sdk.Context, _ abci.RequestBeginBlock, k keeper.Keeper, bandKeeper bandkeeper.Keeper, assetKeeper assetkeeper.Keeper) { defer telemetry.ModuleMeasureSince(types.ModuleName, ctx.BlockTime(), telemetry.MetricKeyBeginBlocker) _ = utils.ApplyFuncIfNoError(ctx, func(ctx sdk.Context) error { - if k.GetOracleValidationResult(ctx) { - block := k.GetLastBlockheight(ctx) + if bandKeeper.GetOracleValidationResult(ctx) { + block := bandKeeper.GetLastBlockHeight(ctx) if block != types.Int64Zero { - if ctx.BlockHeight()%types.Int64Twenty == types.Int64Zero && ctx.BlockHeight() != block && k.GetCheckFlag(ctx) { - assets := k.GetAssets(ctx) - id := k.GetLastFetchPriceID(ctx) - data, _ := k.GetFetchPriceResult(ctx, bandoraclemoduletypes.OracleRequestID(id)) - scriptID := k.GetFetchPriceMsg(ctx).OracleScriptID + if ctx.BlockHeight()%types.Int64Twenty == types.Int64Zero && ctx.BlockHeight() != block && bandKeeper.GetCheckFlag(ctx) { + assets := assetKeeper.GetAssets(ctx) + id := bandKeeper.GetLastFetchPriceID(ctx) + data, _ := bandKeeper.GetFetchPriceResult(ctx, bandoraclemoduletypes.OracleRequestID(id)) + scriptID := bandKeeper.GetFetchPriceMsg(ctx).OracleScriptID index := -1 length := len(data.Rates) for _, asset := range assets { @@ -35,7 +37,7 @@ func BeginBlocker(ctx sdk.Context, _ abci.RequestBeginBlock, k keeper.Keeper) { } } } else { - assets := k.GetAssets(ctx) + assets := assetKeeper.GetAssets(ctx) for _, asset := range assets { twa, found := k.GetTwa(ctx, asset.Id) if !found { diff --git a/x/market/keeper/alias.go b/x/market/keeper/alias.go deleted file mode 100644 index 9e5157004..000000000 --- a/x/market/keeper/alias.go +++ /dev/null @@ -1,57 +0,0 @@ -package keeper - -import ( - sdk "github.com/cosmos/cosmos-sdk/types" - capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" - - "github.com/comdex-official/comdex/x/asset/types" - bandoraclemoduletypes "github.com/comdex-official/comdex/x/bandoracle/types" -) - -func (k Keeper) AuthenticateCapability(ctx sdk.Context, cap *capabilitytypes.Capability, name string) bool { - return k.scoped.AuthenticateCapability(ctx, cap, name) -} - -func (k Keeper) ClaimCapability(ctx sdk.Context, cap *capabilitytypes.Capability, name string) error { - return k.scoped.ClaimCapability(ctx, cap, name) -} - -func (k Keeper) HasAsset(ctx sdk.Context, id uint64) bool { - return k.assetKeeper.HasAsset(ctx, id) -} - -func (k Keeper) GetAssets(ctx sdk.Context) (assets []types.Asset) { - return k.assetKeeper.GetAssets(ctx) -} - -func (k Keeper) GetAsset(ctx sdk.Context, id uint64) (asset types.Asset, found bool) { - return k.assetKeeper.GetAsset(ctx, id) -} - -func (k Keeper) GetLastFetchPriceID(ctx sdk.Context) int64 { - return k.bandoraclekeeper.GetLastFetchPriceID(ctx) -} - -func (k Keeper) GetLastBlockheight(ctx sdk.Context) int64 { - return k.bandoraclekeeper.GetLastBlockHeight(ctx) -} - -func (k Keeper) GetFetchPriceMsg(ctx sdk.Context) bandoraclemoduletypes.MsgFetchPriceData { - return k.bandoraclekeeper.GetFetchPriceMsg(ctx) -} - -func (k Keeper) GetFetchPriceResult(ctx sdk.Context, id bandoraclemoduletypes.OracleRequestID) (bandoraclemoduletypes.FetchPriceResult, error) { - return k.bandoraclekeeper.GetFetchPriceResult(ctx, id) -} - -func (k Keeper) GetCheckFlag(ctx sdk.Context) bool { - return k.bandoraclekeeper.GetCheckFlag(ctx) -} - -func (k Keeper) SetCheckFlag(ctx sdk.Context, flag bool) { - k.bandoraclekeeper.SetCheckFlag(ctx, flag) -} - -func (k Keeper) GetOracleValidationResult(ctx sdk.Context) bool { - return k.bandoraclekeeper.GetOracleValidationResult(ctx) -} diff --git a/x/market/keeper/oracle.go b/x/market/keeper/oracle.go index 28e0e2164..6073f5f2d 100644 --- a/x/market/keeper/oracle.go +++ b/x/market/keeper/oracle.go @@ -103,7 +103,7 @@ func (k Keeper) GetLatestPrice(ctx sdk.Context, id uint64) (price uint64, err er } func (k Keeper) CalcAssetPrice(ctx sdk.Context, id uint64, amt sdk.Int) (price sdk.Dec, err error) { - asset, found := k.GetAsset(ctx, id) + asset, found := k.assetKeeper.GetAsset(ctx, id) if !found { return sdk.ZeroDec(), assetTypes.ErrorAssetDoesNotExist } diff --git a/x/market/module.go b/x/market/module.go index da93246bb..790075616 100644 --- a/x/market/module.go +++ b/x/market/module.go @@ -16,6 +16,8 @@ import ( "github.com/spf13/cobra" abcitypes "github.com/tendermint/tendermint/abci/types" + assetkeeper "github.com/comdex-official/comdex/x/asset/keeper" + bandkeeper "github.com/comdex-official/comdex/x/bandoracle/keeper" "github.com/comdex-official/comdex/x/market/client/cli" "github.com/comdex-official/comdex/x/market/keeper" "github.com/comdex-official/comdex/x/market/types" @@ -33,10 +35,12 @@ func (a AppModuleBasic) Name() string { return types.ModuleName } -func NewAppModule(cdc codec.Codec, keeper keeper.Keeper) AppModule { +func NewAppModule(cdc codec.Codec, keeper keeper.Keeper, bandKeeper bandkeeper.Keeper, assetKeeper assetkeeper.Keeper) AppModule { return AppModule{ AppModuleBasic: NewAppModuleBasic(cdc), keeper: keeper, + bandKeeper: bandKeeper, + assetKeeper: assetKeeper, } } @@ -81,8 +85,10 @@ func (a AppModuleBasic) GetQueryCmd() *cobra.Command { type AppModule struct { AppModuleBasic - cdc codec.JSONCodec //nolint:unused - keeper keeper.Keeper + cdc codec.JSONCodec //nolint:unused + keeper keeper.Keeper + bandKeeper bandkeeper.Keeper + assetKeeper assetkeeper.Keeper } func (a AppModule) ConsensusVersion() uint64 { @@ -118,7 +124,7 @@ func (a AppModule) RegisterServices(configurator module.Configurator) { } func (a AppModule) BeginBlock(ctx sdk.Context, req abcitypes.RequestBeginBlock) { - BeginBlocker(ctx, req, a.keeper) + BeginBlocker(ctx, req, a.keeper, a.bandKeeper, a.assetKeeper) } func (a AppModule) EndBlock(_ sdk.Context, _ abcitypes.RequestEndBlock) []abcitypes.ValidatorUpdate { From d0eb6a1fe2fb8e631fff73e11b2e34dc3e67938d Mon Sep 17 00:00:00 2001 From: Vishnu Kumavat Date: Tue, 18 Oct 2022 19:07:48 +0530 Subject: [PATCH 6/8] locker module alis removed --- x/locker/keeper/alias.go | 78 ----------------------------------- x/locker/keeper/grpc_query.go | 6 +-- x/locker/keeper/locker.go | 12 +++--- x/locker/keeper/msg_server.go | 46 ++++++++++----------- 4 files changed, 32 insertions(+), 110 deletions(-) delete mode 100644 x/locker/keeper/alias.go diff --git a/x/locker/keeper/alias.go b/x/locker/keeper/alias.go deleted file mode 100644 index a0fa02aea..000000000 --- a/x/locker/keeper/alias.go +++ /dev/null @@ -1,78 +0,0 @@ -package keeper - -import ( - sdk "github.com/cosmos/cosmos-sdk/types" - - assettypes "github.com/comdex-official/comdex/x/asset/types" - collectortypes "github.com/comdex-official/comdex/x/collector/types" - esmtypes "github.com/comdex-official/comdex/x/esm/types" - lockertypes "github.com/comdex-official/comdex/x/locker/types" - rewardstypes "github.com/comdex-official/comdex/x/rewards/types" -) - -func (k Keeper) SendCoinFromAccountToModule(ctx sdk.Context, address sdk.AccAddress, name string, coin sdk.Coin) error { - if coin.IsZero() { - return lockertypes.SendCoinsFromAccountToModuleInLockerIsZero - } - - return k.bank.SendCoinsFromAccountToModule(ctx, address, name, sdk.NewCoins(coin)) -} - -func (k Keeper) SendCoinFromModuleToAccount(ctx sdk.Context, name string, address sdk.AccAddress, coin sdk.Coin) error { - if coin.IsZero() { - return lockertypes.SendCoinsFromModuleToAccountInLockerIsZero - } - - return k.bank.SendCoinsFromModuleToAccount(ctx, name, address, sdk.NewCoins(coin)) -} - -func (k Keeper) SpendableCoins(ctx sdk.Context, address sdk.AccAddress) sdk.Coins { - return k.bank.SpendableCoins(ctx, address) -} - -func (k Keeper) GetAsset(ctx sdk.Context, id uint64) (assettypes.Asset, bool) { - return k.asset.GetAsset(ctx, id) -} - -func (k Keeper) GetPair(ctx sdk.Context, id uint64) (assettypes.Pair, bool) { - return k.asset.GetPair(ctx, id) -} - -func (k Keeper) GetApp(ctx sdk.Context, id uint64) (assettypes.AppData, bool) { - return k.asset.GetApp(ctx, id) -} - -func (k Keeper) GetApps(ctx sdk.Context) (apps []assettypes.AppData, found bool) { - return k.asset.GetApps(ctx) -} - -func (k Keeper) UpdateCollector(ctx sdk.Context, appID, assetID uint64, collectedStabilityFee, collectedClosingFee, collectedOpeningFee, liquidationRewardsCollected sdk.Int) error { - return k.collector.UpdateCollector(ctx, appID, assetID, collectedStabilityFee, collectedClosingFee, collectedOpeningFee, liquidationRewardsCollected) -} - -func (k Keeper) GetCollectorLookupTable(ctx sdk.Context, appID, assetID uint64) (collectorLookup collectortypes.CollectorLookupTableData, found bool) { - return k.collector.GetCollectorLookupTable(ctx, appID, assetID) -} - -func (k Keeper) SendCoinFromModuleToModule(ctx sdk.Context, senderModule, recipientModule string, coin sdk.Coins) error { - if coin.IsZero() { - return lockertypes.SendCoinsFromModuleToModuleInLockerIsZero - } - return k.bank.SendCoinsFromModuleToModule(ctx, senderModule, recipientModule, coin) -} - -func (k Keeper) GetKillSwitchData(ctx sdk.Context, appID uint64) (esmtypes.KillSwitchParams, bool) { - return k.esm.GetKillSwitchData(ctx, appID) -} - -func (k Keeper) GetESMStatus(ctx sdk.Context, id uint64) (esmtypes.ESMStatus, bool) { - return k.esm.GetESMStatus(ctx, id) -} - -func (k Keeper) CalculateLockerRewards(ctx sdk.Context, appID, assetID, lockerID uint64, Depositor string, NetBalance sdk.Int, blockHeight int64, lockerBlockTime int64) error { - return k.rewards.CalculateLockerRewards(ctx, appID, assetID, lockerID, Depositor, NetBalance, blockHeight, lockerBlockTime) -} - -func (k Keeper) DeleteLockerRewardTracker(ctx sdk.Context, rewards rewardstypes.LockerRewardsTracker) { - k.rewards.DeleteLockerRewardTracker(ctx, rewards) -} diff --git a/x/locker/keeper/grpc_query.go b/x/locker/keeper/grpc_query.go index b7e8e905b..cbd0f754b 100644 --- a/x/locker/keeper/grpc_query.go +++ b/x/locker/keeper/grpc_query.go @@ -75,7 +75,7 @@ func (q QueryServer) QueryLockerInfoByAppID(c context.Context, request *types.Qu ctx := sdk.UnwrapSDKContext(c) - app, found := q.GetApp(ctx, request.AppId) + app, found := q.asset.GetApp(ctx, request.AppId) if !found { return nil, status.Errorf(codes.NotFound, "app does not exist for appID %d", request.AppId) @@ -222,7 +222,7 @@ func (q QueryServer) QueryLockerCountByAppID(c context.Context, request *types.Q ctx := sdk.UnwrapSDKContext(c) - app, found := q.GetApp(ctx, request.AppId) + app, found := q.asset.GetApp(ctx, request.AppId) if !found { return nil, status.Errorf(codes.NotFound, "app does not exist for appID %d", request.AppId) @@ -387,7 +387,7 @@ func (q QueryServer) QueryLockerTotalRewardsByAssetAppWise(c context.Context, re ctx := sdk.UnwrapSDKContext(c) - _, found := q.GetApp(ctx, request.AppId) + _, found := q.asset.GetApp(ctx, request.AppId) if !found { return nil, status.Errorf(codes.NotFound, "app does not exist for appID %d", request.AppId) diff --git a/x/locker/keeper/locker.go b/x/locker/keeper/locker.go index 6bd74879e..c370c33bd 100644 --- a/x/locker/keeper/locker.go +++ b/x/locker/keeper/locker.go @@ -430,11 +430,11 @@ func (k Keeper) GetLockers(ctx sdk.Context) (locker []types.Locker) { } func (k Keeper) WasmAddWhiteListedAssetQuery(ctx sdk.Context, appMappingID, AssetID uint64) (bool, string) { - _, found := k.GetApp(ctx, appMappingID) + _, found := k.asset.GetApp(ctx, appMappingID) if !found { return false, types.ErrorAppMappingDoesNotExist.Error() } - _, found = k.GetAsset(ctx, AssetID) + _, found = k.asset.GetAsset(ctx, AssetID) if !found { return false, types.ErrorAssetDoesNotExist.Error() } @@ -448,7 +448,7 @@ func (k Keeper) WasmAddWhiteListedAssetQuery(ctx sdk.Context, appMappingID, Asse func (k Keeper) AddWhiteListedAsset(c context.Context, msg *types.MsgAddWhiteListedAssetRequest) (*types.MsgAddWhiteListedAssetResponse, error) { ctx := sdk.UnwrapSDKContext(c) - esmStatus, found := k.GetESMStatus(ctx, msg.AppId) + esmStatus, found := k.esm.GetESMStatus(ctx, msg.AppId) status := false if found { status = esmStatus.Status @@ -456,15 +456,15 @@ func (k Keeper) AddWhiteListedAsset(c context.Context, msg *types.MsgAddWhiteLis if status { return nil, esmtypes.ErrESMAlreadyExecuted } - klwsParams, _ := k.GetKillSwitchData(ctx, msg.AppId) + klwsParams, _ := k.esm.GetKillSwitchData(ctx, msg.AppId) if klwsParams.BreakerEnable { return nil, esmtypes.ErrCircuitBreakerEnabled } - appMapping, found := k.GetApp(ctx, msg.AppId) + appMapping, found := k.asset.GetApp(ctx, msg.AppId) if !found { return nil, types.ErrorAppMappingDoesNotExist } - asset, found := k.GetAsset(ctx, msg.AssetId) + asset, found := k.asset.GetAsset(ctx, msg.AssetId) if !found { return nil, types.ErrorAssetDoesNotExist } diff --git a/x/locker/keeper/msg_server.go b/x/locker/keeper/msg_server.go index 31926c216..0591e1674 100644 --- a/x/locker/keeper/msg_server.go +++ b/x/locker/keeper/msg_server.go @@ -25,7 +25,7 @@ func NewMsgServer(keeper Keeper) types.MsgServer { func (k msgServer) MsgCreateLocker(c context.Context, msg *types.MsgCreateLockerRequest) (*types.MsgCreateLockerResponse, error) { ctx := sdk.UnwrapSDKContext(c) - esmStatus, found := k.GetESMStatus(ctx, msg.AppId) + esmStatus, found := k.esm.GetESMStatus(ctx, msg.AppId) status := false if found { status = esmStatus.Status @@ -33,15 +33,15 @@ func (k msgServer) MsgCreateLocker(c context.Context, msg *types.MsgCreateLocker if status { return nil, esmtypes.ErrESMAlreadyExecuted } - klwsParams, _ := k.GetKillSwitchData(ctx, msg.AppId) + klwsParams, _ := k.esm.GetKillSwitchData(ctx, msg.AppId) if klwsParams.BreakerEnable { return nil, esmtypes.ErrCircuitBreakerEnabled } - asset, found := k.GetAsset(ctx, msg.AssetId) + asset, found := k.asset.GetAsset(ctx, msg.AssetId) if !found { return nil, types.ErrorAssetDoesNotExist } - appMapping, found := k.GetApp(ctx, msg.AppId) + appMapping, found := k.asset.GetApp(ctx, msg.AppId) if !found { return nil, types.ErrorAppMappingDoesNotExist } @@ -50,7 +50,7 @@ func (k msgServer) MsgCreateLocker(c context.Context, msg *types.MsgCreateLocker if userDataForLocker.LockerId != 0 { return nil, types.ErrorUserLockerAlreadyExists } - Collector, found := k.GetCollectorLookupTable(ctx, msg.AppId, msg.AssetId) + Collector, found := k.collector.GetCollectorLookupTable(ctx, msg.AppId, msg.AssetId) if !found { return nil, types.ErrorCollectorLookupDoesNotExists } @@ -73,7 +73,7 @@ func (k msgServer) MsgCreateLocker(c context.Context, msg *types.MsgCreateLocker return nil, err } if msg.Amount.GT(sdk.ZeroInt()) { - if err := k.SendCoinFromAccountToModule(ctx, depositor, types.ModuleName, sdk.NewCoin(asset.Denom, msg.Amount)); err != nil { + if err := k.bank.SendCoinsFromAccountToModule(ctx, depositor, types.ModuleName, sdk.NewCoins(sdk.NewCoin(asset.Denom, msg.Amount))); err != nil { return nil, err } } @@ -129,7 +129,7 @@ func (k msgServer) MsgCreateLocker(c context.Context, msg *types.MsgCreateLocker // MsgDepositAsset Remove asset id from Deposit & Withdraw redundant. func (k msgServer) MsgDepositAsset(c context.Context, msg *types.MsgDepositAssetRequest) (*types.MsgDepositAssetResponse, error) { ctx := sdk.UnwrapSDKContext(c) - esmStatus, found := k.GetESMStatus(ctx, msg.AppId) + esmStatus, found := k.esm.GetESMStatus(ctx, msg.AppId) status := false if found { status = esmStatus.Status @@ -137,15 +137,15 @@ func (k msgServer) MsgDepositAsset(c context.Context, msg *types.MsgDepositAsset if status { return nil, esmtypes.ErrESMAlreadyExecuted } - klwsParams, _ := k.GetKillSwitchData(ctx, msg.AppId) + klwsParams, _ := k.esm.GetKillSwitchData(ctx, msg.AppId) if klwsParams.BreakerEnable { return nil, esmtypes.ErrCircuitBreakerEnabled } - asset, found := k.GetAsset(ctx, msg.AssetId) + asset, found := k.asset.GetAsset(ctx, msg.AssetId) if !found { return nil, types.ErrorAssetDoesNotExist } - appMapping, found := k.GetApp(ctx, msg.AppId) + appMapping, found := k.asset.GetApp(ctx, msg.AppId) if !found { return nil, types.ErrorAppMappingDoesNotExist } @@ -173,14 +173,14 @@ func (k msgServer) MsgDepositAsset(c context.Context, msg *types.MsgDepositAsset if err != nil { return nil, err } - err1 := k.CalculateLockerRewards(ctx, appMapping.Id, msg.AssetId, lockerData.LockerId, string(depositor), lockerData.NetBalance, lockerData.BlockHeight, lockerData.BlockTime.Unix()) + err1 := k.rewards.CalculateLockerRewards(ctx, appMapping.Id, msg.AssetId, lockerData.LockerId, string(depositor), lockerData.NetBalance, lockerData.BlockHeight, lockerData.BlockTime.Unix()) if err1 != nil { return nil, err1 } lockerData, _ = k.GetLocker(ctx, msg.LockerId) if msg.Amount.GT(sdk.ZeroInt()) { - if err := k.SendCoinFromAccountToModule(ctx, depositor, types.ModuleName, sdk.NewCoin(asset.Denom, msg.Amount)); err != nil { + if err := k.bank.SendCoinsFromAccountToModule(ctx, depositor, types.ModuleName, sdk.NewCoins(sdk.NewCoin(asset.Denom, msg.Amount))); err != nil { return nil, err } } @@ -215,11 +215,11 @@ func (k msgServer) MsgDepositAsset(c context.Context, msg *types.MsgDepositAsset // MsgWithdrawAsset Remove asset id from Deposit & Withdraw-redundant. func (k msgServer) MsgWithdrawAsset(c context.Context, msg *types.MsgWithdrawAssetRequest) (*types.MsgWithdrawAssetResponse, error) { ctx := sdk.UnwrapSDKContext(c) - asset, found := k.GetAsset(ctx, msg.AssetId) + asset, found := k.asset.GetAsset(ctx, msg.AssetId) if !found { return nil, types.ErrorAssetDoesNotExist } - appMapping, found := k.GetApp(ctx, msg.AppId) + appMapping, found := k.asset.GetApp(ctx, msg.AppId) if !found { return nil, types.ErrorAppMappingDoesNotExist } @@ -250,7 +250,7 @@ func (k msgServer) MsgWithdrawAsset(c context.Context, msg *types.MsgWithdrawAss if lockerData.NetBalance.LT(msg.Amount) { return nil, types.ErrorRequestedAmountExceedsDepositAmount } - err1 := k.CalculateLockerRewards(ctx, appMapping.Id, msg.AssetId, lockerData.LockerId, string(depositor), lockerData.NetBalance, lockerData.BlockHeight, lockerData.BlockTime.Unix()) + err1 := k.rewards.CalculateLockerRewards(ctx, appMapping.Id, msg.AssetId, lockerData.LockerId, string(depositor), lockerData.NetBalance, lockerData.BlockHeight, lockerData.BlockTime.Unix()) if err1 != nil { return nil, err1 } @@ -259,7 +259,7 @@ func (k msgServer) MsgWithdrawAsset(c context.Context, msg *types.MsgWithdrawAss lockerData.NetBalance = lockerData.NetBalance.Sub(msg.Amount) if msg.Amount.GT(sdk.ZeroInt()) { - if err := k.SendCoinFromModuleToAccount(ctx, types.ModuleName, depositor, sdk.NewCoin(asset.Denom, msg.Amount)); err != nil { + if err := k.bank.SendCoinsFromModuleToAccount(ctx, types.ModuleName, depositor, sdk.NewCoins(sdk.NewCoin(asset.Denom, msg.Amount))); err != nil { return nil, err } } @@ -292,11 +292,11 @@ func (k msgServer) MsgWithdrawAsset(c context.Context, msg *types.MsgWithdrawAss func (k msgServer) MsgCloseLocker(c context.Context, msg *types.MsgCloseLockerRequest) (*types.MsgCloseLockerResponse, error) { ctx := sdk.UnwrapSDKContext(c) - asset, found := k.GetAsset(ctx, msg.AssetId) + asset, found := k.asset.GetAsset(ctx, msg.AssetId) if !found { return nil, types.ErrorAssetDoesNotExist } - appMapping, found := k.GetApp(ctx, msg.AppId) + appMapping, found := k.asset.GetApp(ctx, msg.AppId) if !found { return nil, types.ErrorAppMappingDoesNotExist } @@ -325,7 +325,7 @@ func (k msgServer) MsgCloseLocker(c context.Context, msg *types.MsgCloseLockerRe return nil, err } - err1 := k.CalculateLockerRewards(ctx, appMapping.Id, msg.AssetId, lockerData.LockerId, string(depositor), lockerData.NetBalance, lockerData.BlockHeight, lockerData.BlockTime.Unix()) + err1 := k.rewards.CalculateLockerRewards(ctx, appMapping.Id, msg.AssetId, lockerData.LockerId, string(depositor), lockerData.NetBalance, lockerData.BlockHeight, lockerData.BlockTime.Unix()) if err1 != nil { return nil, err1 } @@ -333,7 +333,7 @@ func (k msgServer) MsgCloseLocker(c context.Context, msg *types.MsgCloseLockerRe lockerData, _ = k.GetLocker(ctx, msg.LockerId) if lockerData.NetBalance.GT(sdk.ZeroInt()) { - if err := k.SendCoinFromModuleToAccount(ctx, types.ModuleName, depositor, sdk.NewCoin(asset.Denom, lockerData.NetBalance)); err != nil { + if err := k.bank.SendCoinsFromModuleToAccount(ctx, types.ModuleName, depositor, sdk.NewCoins(sdk.NewCoin(asset.Denom, lockerData.NetBalance))); err != nil { return nil, err } } @@ -364,7 +364,7 @@ func (k msgServer) MsgCloseLocker(c context.Context, msg *types.MsgCloseLockerRe var rewards rewardstypes.LockerRewardsTracker rewards.AppMappingId = appMapping.Id rewards.LockerId = lockerData.LockerId - k.DeleteLockerRewardTracker(ctx, rewards) + k.rewards.DeleteLockerRewardTracker(ctx, rewards) ctx.GasMeter().ConsumeGas(types.CloseLockerGas, "CloseLockerGas") @@ -374,7 +374,7 @@ func (k msgServer) MsgCloseLocker(c context.Context, msg *types.MsgCloseLockerRe func (k msgServer) MsgLockerRewardCalc(c context.Context, msg *types.MsgLockerRewardCalcRequest) (*types.MsgLockerRewardCalcResponse, error) { ctx := sdk.UnwrapSDKContext(c) - appMapping, found := k.GetApp(ctx, msg.AppId) + appMapping, found := k.asset.GetApp(ctx, msg.AppId) if !found { return nil, types.ErrorAppMappingDoesNotExist } @@ -387,7 +387,7 @@ func (k msgServer) MsgLockerRewardCalc(c context.Context, msg *types.MsgLockerRe if !found { return nil, types.ErrorLockerDoesNotExists } - err1 := k.CalculateLockerRewards(ctx, appMapping.Id, lockerData.AssetDepositId, lockerData.LockerId, string(depositor), lockerData.NetBalance, lockerData.BlockHeight, lockerData.BlockTime.Unix()) + err1 := k.rewards.CalculateLockerRewards(ctx, appMapping.Id, lockerData.AssetDepositId, lockerData.LockerId, string(depositor), lockerData.NetBalance, lockerData.BlockHeight, lockerData.BlockTime.Unix()) if err1 != nil { return nil, err1 } From 0cd326cd2c32f668b7c1ced5e7246b1a2adbb4fa Mon Sep 17 00:00:00 2001 From: Vishnu Kumavat Date: Tue, 18 Oct 2022 19:29:55 +0530 Subject: [PATCH 7/8] liquidation modules's alias.go removed --- x/liquidation/keeper/alias.go | 362 +++++++++--------- x/liquidation/keeper/liquidate_borrow.go | 124 +++--- x/liquidation/keeper/liquidate_vaults.go | 40 +- x/liquidation/keeper/liquidate_vaults_test.go | 2 +- 4 files changed, 264 insertions(+), 264 deletions(-) diff --git a/x/liquidation/keeper/alias.go b/x/liquidation/keeper/alias.go index a862033f7..9c474387c 100644 --- a/x/liquidation/keeper/alias.go +++ b/x/liquidation/keeper/alias.go @@ -1,206 +1,206 @@ package keeper -import ( - sdk "github.com/cosmos/cosmos-sdk/types" - authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" - - assettypes "github.com/comdex-official/comdex/x/asset/types" - auctiontypes "github.com/comdex-official/comdex/x/auction/types" - esmtypes "github.com/comdex-official/comdex/x/esm/types" - lendtypes "github.com/comdex-official/comdex/x/lend/types" - liquidationtypes "github.com/comdex-official/comdex/x/liquidation/types" - rewardstypes "github.com/comdex-official/comdex/x/rewards/types" - "github.com/comdex-official/comdex/x/vault/types" -) - -func (k Keeper) GetModuleAccount(ctx sdk.Context, name string) authtypes.ModuleAccountI { - return k.account.GetModuleAccount(ctx, name) -} - -func (k Keeper) GetBalance(ctx sdk.Context, addr sdk.AccAddress, denom string) sdk.Coin { - return k.bank.GetBalance(ctx, addr, denom) -} - -func (k Keeper) GetPair(ctx sdk.Context, id uint64) (assettypes.Pair, bool) { - return k.asset.GetPair(ctx, id) -} - -func (k Keeper) GetAsset(ctx sdk.Context, id uint64) (assettypes.Asset, bool) { - return k.asset.GetAsset(ctx, id) -} - -func (k Keeper) GetApps(ctx sdk.Context) (apps []assettypes.AppData, found bool) { - return k.asset.GetApps(ctx) -} - -func (k Keeper) SendCoinFromModuleToAccount(ctx sdk.Context, name string, address sdk.AccAddress, coin sdk.Coin) error { - if coin.IsZero() { - return liquidationtypes.SendCoinsFromModuleToAccountInLiquidationIsZero - } - - return k.bank.SendCoinsFromModuleToAccount(ctx, name, address, sdk.NewCoins(coin)) -} - -func (k Keeper) GetAppMappingData(ctx sdk.Context, appMappingID uint64) (appExtendedPairVaultData []types.AppExtendedPairVaultMappingData, found bool) { - return k.vault.GetAppMappingData(ctx, appMappingID) -} - -func (k Keeper) CalculateCollateralizationRatio(ctx sdk.Context, extendedPairVaultID uint64, amountIn sdk.Int, amountOut sdk.Int) (sdk.Dec, error) { - return k.vault.CalculateCollateralizationRatio(ctx, extendedPairVaultID, amountIn, amountOut) -} - -func (k Keeper) GetVault(ctx sdk.Context, id uint64) (vault types.Vault, found bool) { - return k.vault.GetVault(ctx, id) -} - -func (k Keeper) GetVaults(ctx sdk.Context) (vaults []types.Vault) { - return k.vault.GetVaults(ctx) -} - -func (k Keeper) GetIDForVault(ctx sdk.Context) uint64 { - return k.vault.GetIDForVault(ctx) -} - -func (k Keeper) GetLengthOfVault(ctx sdk.Context) uint64 { - return k.vault.GetLengthOfVault(ctx) -} - -func (k Keeper) SetLengthOfVault(ctx sdk.Context, length uint64) { - k.vault.SetLengthOfVault(ctx, length) -} - -func (k Keeper) DeleteVault(ctx sdk.Context, id uint64) { - k.vault.DeleteVault(ctx, id) -} - -func (k Keeper) UpdateAppExtendedPairVaultMappingDataOnMsgCreate(ctx sdk.Context, vaultData types.Vault) { - k.vault.UpdateAppExtendedPairVaultMappingDataOnMsgCreate(ctx, vaultData) -} - -func (k Keeper) UpdateCollateralLockedAmountLockerMapping(ctx sdk.Context, appMappingID uint64, extendedPairID uint64, amount sdk.Int, changeType bool) { - k.vault.UpdateCollateralLockedAmountLockerMapping(ctx, appMappingID, extendedPairID, amount, changeType) -} - -func (k Keeper) DeleteUserVaultExtendedPairMapping(ctx sdk.Context, address string, appID uint64, pairVaultID uint64) { - k.vault.DeleteUserVaultExtendedPairMapping(ctx, address, appID, pairVaultID) -} - -func (k Keeper) DeleteAddressFromAppExtendedPairVaultMapping(ctx sdk.Context, extendedPairID uint64, userVaultID uint64, appMappingID uint64) { - k.vault.DeleteAddressFromAppExtendedPairVaultMapping(ctx, extendedPairID, userVaultID, appMappingID) -} - -func (k Keeper) GetPairsVault(ctx sdk.Context, id uint64) (pairs assettypes.ExtendedPairVault, found bool) { - return k.asset.GetPairsVault(ctx, id) -} - -func (k Keeper) GetAuctionParams(ctx sdk.Context) auctiontypes.Params { - return k.auction.GetParams(ctx) -} - -func (k Keeper) SetVault(ctx sdk.Context, vault types.Vault) { - k.vault.SetVault(ctx, vault) -} - -func (k Keeper) GetKillSwitchData(ctx sdk.Context, appID uint64) (esmtypes.KillSwitchParams, bool) { - return k.esm.GetKillSwitchData(ctx, appID) -} - -func (k Keeper) GetESMStatus(ctx sdk.Context, id uint64) (esmtypes.ESMStatus, bool) { - return k.esm.GetESMStatus(ctx, id) -} - -func (k Keeper) GetBorrows(ctx sdk.Context) (userBorrows []uint64, found bool) { - return k.lend.GetBorrows(ctx) -} +// import ( +// sdk "github.com/cosmos/cosmos-sdk/types" +// authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" + +// assettypes "github.com/comdex-official/comdex/x/asset/types" +// auctiontypes "github.com/comdex-official/comdex/x/auction/types" +// esmtypes "github.com/comdex-official/comdex/x/esm/types" +// lendtypes "github.com/comdex-official/comdex/x/lend/types" +// liquidationtypes "github.com/comdex-official/comdex/x/liquidation/types" +// rewardstypes "github.com/comdex-official/comdex/x/rewards/types" +// "github.com/comdex-official/comdex/x/vault/types" +// ) + +// func (k Keeper) GetModuleAccount(ctx sdk.Context, name string) authtypes.ModuleAccountI { +// return k.account.GetModuleAccount(ctx, name) +// } + +// func (k Keeper) GetBalance(ctx sdk.Context, addr sdk.AccAddress, denom string) sdk.Coin { +// return k.bank.GetBalance(ctx, addr, denom) +// } + +// func (k Keeper) GetPair(ctx sdk.Context, id uint64) (assettypes.Pair, bool) { +// return k.asset.GetPair(ctx, id) +// } + +// func (k Keeper) GetAsset(ctx sdk.Context, id uint64) (assettypes.Asset, bool) { +// return k.asset.GetAsset(ctx, id) +// } + +// func (k Keeper) GetApps(ctx sdk.Context) (apps []assettypes.AppData, found bool) { +// return k.asset.GetApps(ctx) +// } + +// func (k Keeper) SendCoinFromModuleToAccount(ctx sdk.Context, name string, address sdk.AccAddress, coin sdk.Coin) error { +// if coin.IsZero() { +// return liquidationtypes.SendCoinsFromModuleToAccountInLiquidationIsZero +// } + +// return k.bank.SendCoinsFromModuleToAccount(ctx, name, address, sdk.NewCoins(coin)) +// } + +// func (k Keeper) GetAppMappingData(ctx sdk.Context, appMappingID uint64) (appExtendedPairVaultData []types.AppExtendedPairVaultMappingData, found bool) { +// return k.vault.GetAppMappingData(ctx, appMappingID) +// } + +// func (k Keeper) CalculateCollateralizationRatio(ctx sdk.Context, extendedPairVaultID uint64, amountIn sdk.Int, amountOut sdk.Int) (sdk.Dec, error) { +// return k.vault.CalculateCollateralizationRatio(ctx, extendedPairVaultID, amountIn, amountOut) +// } + +// func (k Keeper) GetVault(ctx sdk.Context, id uint64) (vault types.Vault, found bool) { +// return k.vault.GetVault(ctx, id) +// } + +// func (k Keeper) GetVaults(ctx sdk.Context) (vaults []types.Vault) { +// return k.vault.GetVaults(ctx) +// } + +// func (k Keeper) GetIDForVault(ctx sdk.Context) uint64 { +// return k.vault.GetIDForVault(ctx) +// } + +// func (k Keeper) GetLengthOfVault(ctx sdk.Context) uint64 { +// return k.vault.GetLengthOfVault(ctx) +// } + +// func (k Keeper) SetLengthOfVault(ctx sdk.Context, length uint64) { +// k.vault.SetLengthOfVault(ctx, length) +// } + +// func (k Keeper) DeleteVault(ctx sdk.Context, id uint64) { +// k.vault.DeleteVault(ctx, id) +// } + +// func (k Keeper) UpdateAppExtendedPairVaultMappingDataOnMsgCreate(ctx sdk.Context, vaultData types.Vault) { +// k.vault.UpdateAppExtendedPairVaultMappingDataOnMsgCreate(ctx, vaultData) +// } + +// func (k Keeper) UpdateCollateralLockedAmountLockerMapping(ctx sdk.Context, appMappingID uint64, extendedPairID uint64, amount sdk.Int, changeType bool) { +// k.vault.UpdateCollateralLockedAmountLockerMapping(ctx, appMappingID, extendedPairID, amount, changeType) +// } + +// func (k Keeper) DeleteUserVaultExtendedPairMapping(ctx sdk.Context, address string, appID uint64, pairVaultID uint64) { +// k.vault.DeleteUserVaultExtendedPairMapping(ctx, address, appID, pairVaultID) +// } + +// func (k Keeper) DeleteAddressFromAppExtendedPairVaultMapping(ctx sdk.Context, extendedPairID uint64, userVaultID uint64, appMappingID uint64) { +// k.vault.DeleteAddressFromAppExtendedPairVaultMapping(ctx, extendedPairID, userVaultID, appMappingID) +// } + +// func (k Keeper) GetPairsVault(ctx sdk.Context, id uint64) (pairs assettypes.ExtendedPairVault, found bool) { +// return k.asset.GetPairsVault(ctx, id) +// } + +// func (k Keeper) GetAuctionParams(ctx sdk.Context) auctiontypes.Params { +// return k.auction.GetParams(ctx) +// } + +// func (k Keeper) SetVault(ctx sdk.Context, vault types.Vault) { +// k.vault.SetVault(ctx, vault) +// } + +// func (k Keeper) GetKillSwitchData(ctx sdk.Context, appID uint64) (esmtypes.KillSwitchParams, bool) { +// return k.esm.GetKillSwitchData(ctx, appID) +// } + +// func (k Keeper) GetESMStatus(ctx sdk.Context, id uint64) (esmtypes.ESMStatus, bool) { +// return k.esm.GetESMStatus(ctx, id) +// } + +// func (k Keeper) GetBorrows(ctx sdk.Context) (userBorrows []uint64, found bool) { +// return k.lend.GetBorrows(ctx) +// } -func (k Keeper) GetBorrow(ctx sdk.Context, id uint64) (borrow lendtypes.BorrowAsset, found bool) { - return k.lend.GetBorrow(ctx, id) -} +// func (k Keeper) GetBorrow(ctx sdk.Context, id uint64) (borrow lendtypes.BorrowAsset, found bool) { +// return k.lend.GetBorrow(ctx, id) +// } -func (k Keeper) GetLendPair(ctx sdk.Context, id uint64) (pair lendtypes.Extended_Pair, found bool) { - return k.lend.GetLendPair(ctx, id) -} +// func (k Keeper) GetLendPair(ctx sdk.Context, id uint64) (pair lendtypes.Extended_Pair, found bool) { +// return k.lend.GetLendPair(ctx, id) +// } -func (k Keeper) GetAssetRatesParams(ctx sdk.Context, assetID uint64) (assetRatesStats lendtypes.AssetRatesParams, found bool) { - return k.lend.GetAssetRatesParams(ctx, assetID) -} +// func (k Keeper) GetAssetRatesParams(ctx sdk.Context, assetID uint64) (assetRatesStats lendtypes.AssetRatesParams, found bool) { +// return k.lend.GetAssetRatesParams(ctx, assetID) +// } -func (k Keeper) VerifyCollateralizationRatio(ctx sdk.Context, amountIn sdk.Int, assetIn assettypes.Asset, amountOut sdk.Int, assetOut assettypes.Asset, liquidationThreshold sdk.Dec) error { - return k.lend.VerifyCollateralizationRatio(ctx, amountIn, assetIn, amountOut, assetOut, liquidationThreshold) -} +// func (k Keeper) VerifyCollateralizationRatio(ctx sdk.Context, amountIn sdk.Int, assetIn assettypes.Asset, amountOut sdk.Int, assetOut assettypes.Asset, liquidationThreshold sdk.Dec) error { +// return k.lend.VerifyCollateralizationRatio(ctx, amountIn, assetIn, amountOut, assetOut, liquidationThreshold) +// } -func (k Keeper) CalculateLendCollateralizationRatio(ctx sdk.Context, amountIn sdk.Int, assetIn assettypes.Asset, amountOut sdk.Int, assetOut assettypes.Asset) (sdk.Dec, error) { - return k.lend.CalculateCollateralizationRatio(ctx, amountIn, assetIn, amountOut, assetOut) -} +// func (k Keeper) CalculateLendCollateralizationRatio(ctx sdk.Context, amountIn sdk.Int, assetIn assettypes.Asset, amountOut sdk.Int, assetOut assettypes.Asset) (sdk.Dec, error) { +// return k.lend.CalculateCollateralizationRatio(ctx, amountIn, assetIn, amountOut, assetOut) +// } -func (k Keeper) GetLend(ctx sdk.Context, id uint64) (lend lendtypes.LendAsset, found bool) { - return k.lend.GetLend(ctx, id) -} +// func (k Keeper) GetLend(ctx sdk.Context, id uint64) (lend lendtypes.LendAsset, found bool) { +// return k.lend.GetLend(ctx, id) +// } -func (k Keeper) CreteNewBorrow(ctx sdk.Context, liqBorrow liquidationtypes.LockedVault) { - k.lend.CreteNewBorrow(ctx, liqBorrow) -} +// func (k Keeper) CreteNewBorrow(ctx sdk.Context, liqBorrow liquidationtypes.LockedVault) { +// k.lend.CreteNewBorrow(ctx, liqBorrow) +// } -func (k Keeper) GetPool(ctx sdk.Context, id uint64) (pool lendtypes.Pool, found bool) { - return k.lend.GetPool(ctx, id) -} +// func (k Keeper) GetPool(ctx sdk.Context, id uint64) (pool lendtypes.Pool, found bool) { +// return k.lend.GetPool(ctx, id) +// } -func (k Keeper) GetAssetStatsByPoolIDAndAssetID(ctx sdk.Context, poolID, assetID uint64) (AssetStats lendtypes.PoolAssetLBMapping, found bool) { - return k.lend.GetAssetStatsByPoolIDAndAssetID(ctx, poolID, assetID) -} +// func (k Keeper) GetAssetStatsByPoolIDAndAssetID(ctx sdk.Context, poolID, assetID uint64) (AssetStats lendtypes.PoolAssetLBMapping, found bool) { +// return k.lend.GetAssetStatsByPoolIDAndAssetID(ctx, poolID, assetID) +// } -func (k Keeper) SetAssetStatsByPoolIDAndAssetID(ctx sdk.Context, AssetStats lendtypes.PoolAssetLBMapping) { - k.lend.SetAssetStatsByPoolIDAndAssetID(ctx, AssetStats) -} +// func (k Keeper) SetAssetStatsByPoolIDAndAssetID(ctx sdk.Context, AssetStats lendtypes.PoolAssetLBMapping) { +// k.lend.SetAssetStatsByPoolIDAndAssetID(ctx, AssetStats) +// } -//func (k Keeper) UpdateBorrowStats(ctx sdk.Context, pair lendtypes.Extended_Pair, borrowPos lendtypes.BorrowAsset, amount sdk.Int, inc bool) { -// k.lend.UpdateBorrowStats(ctx, pair, borrowPos, amount, inc) -//} +// //func (k Keeper) UpdateBorrowStats(ctx sdk.Context, pair lendtypes.Extended_Pair, borrowPos lendtypes.BorrowAsset, amount sdk.Int, inc bool) { +// // k.lend.UpdateBorrowStats(ctx, pair, borrowPos, amount, inc) +// //} -func (k Keeper) SendCoinsFromModuleToModule(ctx sdk.Context, senderModule string, recipientModule string, coin sdk.Coins) error { - if coin.IsZero() { - return auctiontypes.SendCoinsFromModuleToModuleInAuctionIsZero - } +// func (k Keeper) SendCoinsFromModuleToModule(ctx sdk.Context, senderModule string, recipientModule string, coin sdk.Coins) error { +// if coin.IsZero() { +// return auctiontypes.SendCoinsFromModuleToModuleInAuctionIsZero +// } - return k.bank.SendCoinsFromModuleToModule(ctx, senderModule, recipientModule, coin) -} +// return k.bank.SendCoinsFromModuleToModule(ctx, senderModule, recipientModule, coin) +// } -func (k Keeper) UpdateReserveBalances(ctx sdk.Context, assetID uint64, moduleName string, payment sdk.Coin, inc bool) error { - return k.lend.UpdateReserveBalances(ctx, assetID, moduleName, payment, inc) -} +// func (k Keeper) UpdateReserveBalances(ctx sdk.Context, assetID uint64, moduleName string, payment sdk.Coin, inc bool) error { +// return k.lend.UpdateReserveBalances(ctx, assetID, moduleName, payment, inc) +// } -func (k Keeper) SetLend(ctx sdk.Context, lend lendtypes.LendAsset) { - k.lend.SetLend(ctx, lend) -} +// func (k Keeper) SetLend(ctx sdk.Context, lend lendtypes.LendAsset) { +// k.lend.SetLend(ctx, lend) +// } -func (k Keeper) BurnCoin(ctx sdk.Context, name string, coin sdk.Coin) error { - if coin.IsZero() { - return lendtypes.BurnCoinValueInLendIsZero - } +// func (k Keeper) BurnCoin(ctx sdk.Context, name string, coin sdk.Coin) error { +// if coin.IsZero() { +// return lendtypes.BurnCoinValueInLendIsZero +// } - return k.bank.BurnCoins(ctx, name, sdk.NewCoins(coin)) -} +// return k.bank.BurnCoins(ctx, name, sdk.NewCoins(coin)) +// } -func (k Keeper) CalculateVaultInterest(ctx sdk.Context, appID, assetID, lockerID uint64, NetBalance sdk.Int, blockHeight int64, lockerBlockTime int64) error { - return k.rewards.CalculateVaultInterest(ctx, appID, assetID, lockerID, NetBalance, blockHeight, lockerBlockTime) -} +// func (k Keeper) CalculateVaultInterest(ctx sdk.Context, appID, assetID, lockerID uint64, NetBalance sdk.Int, blockHeight int64, lockerBlockTime int64) error { +// return k.rewards.CalculateVaultInterest(ctx, appID, assetID, lockerID, NetBalance, blockHeight, lockerBlockTime) +// } -func (k Keeper) DeleteVaultInterestTracker(ctx sdk.Context, vault rewardstypes.VaultInterestTracker) { - k.rewards.DeleteVaultInterestTracker(ctx, vault) -} +// func (k Keeper) DeleteVaultInterestTracker(ctx sdk.Context, vault rewardstypes.VaultInterestTracker) { +// k.rewards.DeleteVaultInterestTracker(ctx, vault) +// } -func (k Keeper) DutchActivator(ctx sdk.Context, lockedVault liquidationtypes.LockedVault) error { - return k.auction.DutchActivator(ctx, lockedVault) -} +// func (k Keeper) DutchActivator(ctx sdk.Context, lockedVault liquidationtypes.LockedVault) error { +// return k.auction.DutchActivator(ctx, lockedVault) +// } -func (k Keeper) LendDutchActivator(ctx sdk.Context, lockedVault liquidationtypes.LockedVault) error { - return k.auction.LendDutchActivator(ctx, lockedVault) -} +// func (k Keeper) LendDutchActivator(ctx sdk.Context, lockedVault liquidationtypes.LockedVault) error { +// return k.auction.LendDutchActivator(ctx, lockedVault) +// } -func (k Keeper) SetBorrow(ctx sdk.Context, borrow lendtypes.BorrowAsset) { - k.lend.SetBorrow(ctx, borrow) -} +// func (k Keeper) SetBorrow(ctx sdk.Context, borrow lendtypes.BorrowAsset) { +// k.lend.SetBorrow(ctx, borrow) +// } -func (k Keeper) CalcAssetPrice(ctx sdk.Context, id uint64, amt sdk.Int) (price sdk.Dec, err error) { - return k.market.CalcAssetPrice(ctx, id, amt) -} +// func (k Keeper) CalcAssetPrice(ctx sdk.Context, id uint64, amt sdk.Int) (price sdk.Dec, err error) { +// return k.market.CalcAssetPrice(ctx, id, amt) +// } diff --git a/x/liquidation/keeper/liquidate_borrow.go b/x/liquidation/keeper/liquidate_borrow.go index 3968e412d..01efb566f 100644 --- a/x/liquidation/keeper/liquidate_borrow.go +++ b/x/liquidation/keeper/liquidate_borrow.go @@ -9,7 +9,7 @@ import ( ) func (k Keeper) LiquidateBorrows(ctx sdk.Context) error { - borrows, found := k.GetBorrows(ctx) + borrows, found := k.lend.GetBorrows(ctx) params := k.GetParams(ctx) if !found { return nil @@ -27,25 +27,25 @@ func (k Keeper) LiquidateBorrows(ctx sdk.Context) error { } newBorrowIDs := borrowIDs[start:end] for l := range newBorrowIDs { - borrowPos, found := k.GetBorrow(ctx, newBorrowIDs[l]) + borrowPos, found := k.lend.GetBorrow(ctx, newBorrowIDs[l]) if !found { continue } if borrowPos.IsLiquidated { continue } - lendPair, _ := k.GetLendPair(ctx, borrowPos.PairID) - lendPos, found := k.GetLend(ctx, borrowPos.LendingID) + lendPair, _ := k.lend.GetLendPair(ctx, borrowPos.PairID) + lendPos, found := k.lend.GetLend(ctx, borrowPos.LendingID) if !found { continue } - killSwitchParams, _ := k.GetKillSwitchData(ctx, lendPos.AppID) + killSwitchParams, _ := k.esm.GetKillSwitchData(ctx, lendPos.AppID) if killSwitchParams.BreakerEnable { continue } - pool, _ := k.GetPool(ctx, lendPos.PoolID) - assetIn, _ := k.GetAsset(ctx, lendPair.AssetIn) - assetOut, _ := k.GetAsset(ctx, lendPair.AssetOut) + pool, _ := k.lend.GetPool(ctx, lendPos.PoolID) + assetIn, _ := k.asset.GetAsset(ctx, lendPair.AssetIn) + assetOut, _ := k.asset.GetAsset(ctx, lendPair.AssetOut) var currentCollateralizationRatio sdk.Dec var firstTransitAssetID, secondTransitAssetID uint64 @@ -59,16 +59,16 @@ func (k Keeper) LiquidateBorrows(ctx sdk.Context) error { } } - liqThreshold, _ := k.GetAssetRatesParams(ctx, lendPair.AssetIn) - liqThresholdBridgedAssetOne, _ := k.GetAssetRatesParams(ctx, firstTransitAssetID) - liqThresholdBridgedAssetTwo, _ := k.GetAssetRatesParams(ctx, secondTransitAssetID) - firstBridgedAsset, _ := k.GetAsset(ctx, firstTransitAssetID) + liqThreshold, _ := k.lend.GetAssetRatesParams(ctx, lendPair.AssetIn) + liqThresholdBridgedAssetOne, _ := k.lend.GetAssetRatesParams(ctx, firstTransitAssetID) + liqThresholdBridgedAssetTwo, _ := k.lend.GetAssetRatesParams(ctx, secondTransitAssetID) + firstBridgedAsset, _ := k.asset.GetAsset(ctx, firstTransitAssetID) // there are three possible cases // a. if borrow is from same pool // b. if borrow is from first transit asset // c. if borrow is from second transit asset if borrowPos.BridgedAssetAmount.Amount.Equal(sdk.ZeroInt()) { // first condition - currentCollateralizationRatio, _ = k.CalculateLendCollateralizationRatio(ctx, borrowPos.AmountIn.Amount, assetIn, borrowPos.AmountOut.Amount.Add(borrowPos.InterestAccumulated.TruncateInt()), assetOut) + currentCollateralizationRatio, _ = k.lend.CalculateCollateralizationRatio(ctx, borrowPos.AmountIn.Amount, assetIn, borrowPos.AmountOut.Amount.Add(borrowPos.InterestAccumulated.TruncateInt()), assetOut) if sdk.Dec.GT(currentCollateralizationRatio, liqThreshold.LiquidationThreshold) { // after checking the currentCollateralizationRatio with LiquidationThreshold if borrow is to be liquidated then // CreateLockedBorrow function is called @@ -77,7 +77,7 @@ func (k Keeper) LiquidateBorrows(ctx sdk.Context) error { continue } borrowPos.IsLiquidated = true // isLiquidated flag is set to true - k.SetBorrow(ctx, borrowPos) + k.lend.SetBorrow(ctx, borrowPos) lockedVaultID := k.GetLockedVaultID(ctx) lockedVault, _ := k.GetLockedVault(ctx, lendPos.AppID, lockedVaultID) err = k.UpdateLockedBorrows(ctx, lockedVault) @@ -87,14 +87,14 @@ func (k Keeper) LiquidateBorrows(ctx sdk.Context) error { } } else { if borrowPos.BridgedAssetAmount.Denom == firstBridgedAsset.Denom { - currentCollateralizationRatio, _ = k.CalculateLendCollateralizationRatio(ctx, borrowPos.AmountIn.Amount, assetIn, borrowPos.AmountOut.Amount.Add(borrowPos.InterestAccumulated.TruncateInt()), assetOut) + currentCollateralizationRatio, _ = k.lend.CalculateCollateralizationRatio(ctx, borrowPos.AmountIn.Amount, assetIn, borrowPos.AmountOut.Amount.Add(borrowPos.InterestAccumulated.TruncateInt()), assetOut) if sdk.Dec.GT(currentCollateralizationRatio, liqThreshold.LiquidationThreshold.Mul(liqThresholdBridgedAssetOne.LiquidationThreshold)) { err := k.CreateLockedBorrow(ctx, borrowPos, currentCollateralizationRatio, lendPos.AppID) if err != nil { continue } borrowPos.IsLiquidated = true - k.SetBorrow(ctx, borrowPos) + k.lend.SetBorrow(ctx, borrowPos) lockedVaultID := k.GetLockedVaultID(ctx) lockedVault, _ := k.GetLockedVault(ctx, lendPos.AppID, lockedVaultID) err = k.UpdateLockedBorrows(ctx, lockedVault) @@ -103,7 +103,7 @@ func (k Keeper) LiquidateBorrows(ctx sdk.Context) error { } } } else { - currentCollateralizationRatio, _ = k.CalculateLendCollateralizationRatio(ctx, borrowPos.AmountIn.Amount, assetIn, borrowPos.AmountOut.Amount.Add(borrowPos.InterestAccumulated.TruncateInt()), assetOut) + currentCollateralizationRatio, _ = k.lend.CalculateCollateralizationRatio(ctx, borrowPos.AmountIn.Amount, assetIn, borrowPos.AmountOut.Amount.Add(borrowPos.InterestAccumulated.TruncateInt()), assetOut) if sdk.Dec.GT(currentCollateralizationRatio, liqThreshold.LiquidationThreshold.Mul(liqThresholdBridgedAssetTwo.LiquidationThreshold)) { err := k.CreateLockedBorrow(ctx, borrowPos, currentCollateralizationRatio, lendPos.AppID) @@ -111,7 +111,7 @@ func (k Keeper) LiquidateBorrows(ctx sdk.Context) error { continue } borrowPos.IsLiquidated = true - k.SetBorrow(ctx, borrowPos) + k.lend.SetBorrow(ctx, borrowPos) lockedVaultID := k.GetLockedVaultID(ctx) lockedVault, _ := k.GetLockedVault(ctx, lendPos.AppID, lockedVaultID) err = k.UpdateLockedBorrows(ctx, lockedVault) @@ -130,7 +130,7 @@ func (k Keeper) LiquidateBorrows(ctx sdk.Context) error { func (k Keeper) CreateLockedBorrow(ctx sdk.Context, borrow lendtypes.BorrowAsset, collateralizationRatio sdk.Dec, appID uint64) error { lockedVaultID := k.GetLockedVaultID(ctx) - lendPos, _ := k.GetLend(ctx, borrow.LendingID) + lendPos, _ := k.lend.GetLend(ctx, borrow.LendingID) kind := &types.LockedVault_BorrowMetaData{ BorrowMetaData: &types.BorrowMetaData{ LendingId: borrow.LendingID, @@ -165,11 +165,11 @@ func (k Keeper) CreateLockedBorrow(ctx sdk.Context, borrow lendtypes.BorrowAsset } func (k Keeper) UpdateLockedBorrows(ctx sdk.Context, lockedVault types.LockedVault) error { - pair, _ := k.GetLendPair(ctx, lockedVault.ExtendedPairId) + pair, _ := k.lend.GetLendPair(ctx, lockedVault.ExtendedPairId) borrowMetaData := lockedVault.GetBorrowMetaData() if borrowMetaData != nil { - lendPos, _ := k.GetLend(ctx, borrowMetaData.LendingId) - pool, _ := k.GetPool(ctx, lendPos.PoolID) + lendPos, _ := k.lend.GetLend(ctx, borrowMetaData.LendingId) + pool, _ := k.lend.GetPool(ctx, lendPos.PoolID) var unliquidatePointPercentage sdk.Dec // retrieving transit asset details from cPool var firstTransitAssetID, secondTransitAssetID uint64 @@ -182,10 +182,10 @@ func (k Keeper) UpdateLockedBorrows(ctx sdk.Context, lockedVault types.LockedVau } } - firstBridgeAsset, _ := k.GetAsset(ctx, firstTransitAssetID) - firstBridgeAssetStats, _ := k.GetAssetRatesParams(ctx, firstTransitAssetID) - secondBridgeAssetStats, _ := k.GetAssetRatesParams(ctx, secondTransitAssetID) - liqThreshold, _ := k.GetAssetRatesParams(ctx, pair.AssetIn) + firstBridgeAsset, _ := k.asset.GetAsset(ctx, firstTransitAssetID) + firstBridgeAssetStats, _ := k.lend.GetAssetRatesParams(ctx, firstTransitAssetID) + secondBridgeAssetStats, _ := k.lend.GetAssetRatesParams(ctx, secondTransitAssetID) + liqThreshold, _ := k.lend.GetAssetRatesParams(ctx, pair.AssetIn) // finding unLiquidate Point percentage if !borrowMetaData.BridgedAssetAmount.Amount.Equal(sdk.ZeroInt()) { @@ -198,19 +198,19 @@ func (k Keeper) UpdateLockedBorrows(ctx sdk.Context, lockedVault types.LockedVau unliquidatePointPercentage = liqThreshold.LiquidationThreshold } - assetRatesStats, _ := k.GetAssetRatesParams(ctx, pair.AssetIn) + assetRatesStats, _ := k.lend.GetAssetRatesParams(ctx, pair.AssetIn) updatedLockedVault := lockedVault // Checking required flags if (!lockedVault.IsAuctionInProgress && !lockedVault.IsAuctionComplete) || (lockedVault.IsAuctionComplete && lockedVault.CurrentCollaterlisationRatio.GTE(unliquidatePointPercentage)) { - assetIn, _ := k.GetAsset(ctx, pair.AssetIn) - assetOut, _ := k.GetAsset(ctx, pair.AssetOut) - collateralizationRatio, err := k.CalculateLendCollateralizationRatio(ctx, lockedVault.AmountIn, assetIn, lockedVault.UpdatedAmountOut, assetOut) + assetIn, _ := k.asset.GetAsset(ctx, pair.AssetIn) + assetOut, _ := k.asset.GetAsset(ctx, pair.AssetOut) + collateralizationRatio, err := k.lend.CalculateCollateralizationRatio(ctx, lockedVault.AmountIn, assetIn, lockedVault.UpdatedAmountOut, assetOut) if err != nil { return nil } - assetInTotal, _ := k.CalcAssetPrice(ctx, assetIn.Id, lockedVault.AmountIn) - assetOutTotal, _ := k.CalcAssetPrice(ctx, assetOut.Id, lockedVault.AmountOut) + assetInTotal, _ := k.market.CalcAssetPrice(ctx, assetIn.Id, lockedVault.AmountIn) + assetOutTotal, _ := k.market.CalcAssetPrice(ctx, assetOut.Id, lockedVault.AmountOut) deductionPercentage, _ := sdk.NewDecFromStr("1.0") var c sdk.Dec @@ -245,15 +245,15 @@ func (k Keeper) UpdateLockedBorrows(ctx sdk.Context, lockedVault types.LockedVau bonusToBidderAmount := bonusToBidderAmt.Quo(aip) penaltyToReserveAmt := selloffAmount.Mul(assetRatesStats.LiquidationPenalty) penaltyToReserveAmount := penaltyToReserveAmt.Quo(aip) - err = k.SendCoinsFromModuleToModule(ctx, pool.ModuleName, auctiontypes.ModuleName, sdk.NewCoins(sdk.NewCoin(assetIn.Denom, sdk.NewInt(bonusToBidderAmount.TruncateInt64())))) + err = k.bank.SendCoinsFromModuleToModule(ctx, pool.ModuleName, auctiontypes.ModuleName, sdk.NewCoins(sdk.NewCoin(assetIn.Denom, sdk.NewInt(bonusToBidderAmount.TruncateInt64())))) if err != nil { return err } - err = k.UpdateReserveBalances(ctx, pair.AssetIn, pool.ModuleName, sdk.NewCoin(assetIn.Denom, sdk.NewInt(penaltyToReserveAmount.TruncateInt64())), true) + err = k.lend.UpdateReserveBalances(ctx, pair.AssetIn, pool.ModuleName, sdk.NewCoin(assetIn.Denom, sdk.NewInt(penaltyToReserveAmount.TruncateInt64())), true) if err != nil { return err } - cAsset, _ := k.GetAsset(ctx, assetRatesStats.CAssetID) + cAsset, _ := k.asset.GetAsset(ctx, assetRatesStats.CAssetID) // totalDeduction is the sum of liquidationDeductionAmount and selloffAmount totalDeduction := liquidationDeductionAmount.TruncateInt().Add(selloffAmount.TruncateInt()) updatedLockedVault.AmountIn = updatedLockedVault.AmountIn.Sub(totalDeduction) @@ -263,17 +263,17 @@ func (k Keeper) UpdateLockedBorrows(ctx sdk.Context, lockedVault types.LockedVau lendPos.AmountIn.Amount = sdk.ZeroInt() } // also global lend data is subtracted by totalDeduction amount - assetStats, _ := k.GetAssetStatsByPoolIDAndAssetID(ctx, lendPos.PoolID, lendPos.AssetID) + assetStats, _ := k.lend.GetAssetStatsByPoolIDAndAssetID(ctx, lendPos.PoolID, lendPos.AssetID) assetStats.TotalLend = assetStats.TotalLend.Sub(totalDeduction) // setting the updated global lend data - k.SetAssetStatsByPoolIDAndAssetID(ctx, assetStats) + k.lend.SetAssetStatsByPoolIDAndAssetID(ctx, assetStats) // users cToken present in pool's module will be burnt - err = k.BurnCoin(ctx, pool.ModuleName, sdk.NewCoin(cAsset.Denom, sdk.NewInt(penaltyToReserveAmount.TruncateInt64()))) + err = k.bank.BurnCoins(ctx, pool.ModuleName, sdk.NewCoins(sdk.NewCoin(cAsset.Denom, sdk.NewInt(penaltyToReserveAmount.TruncateInt64())))) if err != nil { return err } - k.SetLend(ctx, lendPos) + k.lend.SetLend(ctx, lendPos) var collateralToBeAuctioned sdk.Dec @@ -288,7 +288,7 @@ func (k Keeper) UpdateLockedBorrows(ctx sdk.Context, lockedVault types.LockedVau } // now the auction will be started from the auction module for the lockedVault - err := k.LendDutchActivator(ctx, updatedLockedVault) + err := k.auction.LendDutchActivator(ctx, updatedLockedVault) if err != nil { ctx.Logger().Error("error in dutch lend activator") } @@ -300,8 +300,8 @@ func (k Keeper) UnLiquidateLockedBorrows(ctx sdk.Context, appID, id uint64, dutc lockedVault, _ := k.GetLockedVault(ctx, appID, id) borrowMetadata := lockedVault.GetBorrowMetaData() if borrowMetadata != nil { - lendPos, _ := k.GetLend(ctx, borrowMetadata.LendingId) - assetInPool, _ := k.GetPool(ctx, lendPos.PoolID) + lendPos, _ := k.lend.GetLend(ctx, borrowMetadata.LendingId) + assetInPool, _ := k.lend.GetPool(ctx, lendPos.PoolID) var firstTransitAssetID, secondTransitAssetID uint64 for _, data := range assetInPool.AssetData { if data.AssetTransitType == 2 { @@ -311,18 +311,18 @@ func (k Keeper) UnLiquidateLockedBorrows(ctx sdk.Context, appID, id uint64, dutc secondTransitAssetID = data.AssetID } } - firstBridgedAsset, _ := k.GetAsset(ctx, firstTransitAssetID) + firstBridgedAsset, _ := k.asset.GetAsset(ctx, firstTransitAssetID) userAddress, _ := sdk.AccAddressFromBech32(lockedVault.Owner) - pair, _ := k.GetLendPair(ctx, lockedVault.ExtendedPairId) - assetStats, _ := k.GetAssetRatesParams(ctx, pair.AssetIn) - assetIn, _ := k.GetAsset(ctx, pair.AssetIn) - assetOut, _ := k.GetAsset(ctx, pair.AssetOut) - cAssetIn, _ := k.GetAsset(ctx, assetStats.CAssetID) + pair, _ := k.lend.GetLendPair(ctx, lockedVault.ExtendedPairId) + assetStats, _ := k.lend.GetAssetRatesParams(ctx, pair.AssetIn) + assetIn, _ := k.asset.GetAsset(ctx, pair.AssetIn) + assetOut, _ := k.asset.GetAsset(ctx, pair.AssetOut) + cAssetIn, _ := k.asset.GetAsset(ctx, assetStats.CAssetID) if lockedVault.IsAuctionComplete { if borrowMetadata.BridgedAssetAmount.IsZero() { // also calculate the current collaterlization ratio to ensure there is no sudden changes - liqThreshold, _ := k.GetAssetRatesParams(ctx, pair.AssetIn) + liqThreshold, _ := k.lend.GetAssetRatesParams(ctx, pair.AssetIn) unliquidatePointPercentage := liqThreshold.LiquidationThreshold if lockedVault.AmountOut.IsZero() { @@ -331,11 +331,11 @@ func (k Keeper) UnLiquidateLockedBorrows(ctx sdk.Context, appID, id uint64, dutc return err } k.DeleteLockedVault(ctx, lockedVault.AppId, lockedVault.LockedVaultId) - if err = k.SendCoinFromModuleToAccount(ctx, assetInPool.ModuleName, userAddress, sdk.NewCoin(cAssetIn.Denom, lockedVault.AmountIn)); err != nil { + if err = k.bank.SendCoinsFromModuleToAccount(ctx, assetInPool.ModuleName, userAddress, sdk.NewCoins(sdk.NewCoin(cAssetIn.Denom, lockedVault.AmountIn))); err != nil { return err } } - newCalculatedCollateralizationRatio, _ := k.CalculateLendCollateralizationRatio(ctx, lockedVault.AmountIn, assetIn, lockedVault.UpdatedAmountOut, assetOut) + newCalculatedCollateralizationRatio, _ := k.lend.CalculateCollateralizationRatio(ctx, lockedVault.AmountIn, assetIn, lockedVault.UpdatedAmountOut, assetOut) if newCalculatedCollateralizationRatio.GT(unliquidatePointPercentage) { updatedLockedVault := lockedVault updatedLockedVault.CurrentCollaterlisationRatio = newCalculatedCollateralizationRatio @@ -351,13 +351,13 @@ func (k Keeper) UnLiquidateLockedBorrows(ctx sdk.Context, appID, id uint64, dutc if err != nil { return err } - k.CreteNewBorrow(ctx, lockedVault) + k.lend.CreteNewBorrow(ctx, lockedVault) k.DeleteLockedVault(ctx, lockedVault.AppId, lockedVault.LockedVaultId) } } else { if borrowMetadata.BridgedAssetAmount.Denom == firstBridgedAsset.Denom { - liqThresholdAssetIn, _ := k.GetAssetRatesParams(ctx, pair.AssetIn) - liqThresholdFirstBridgedAsset, _ := k.GetAssetRatesParams(ctx, firstTransitAssetID) + liqThresholdAssetIn, _ := k.lend.GetAssetRatesParams(ctx, pair.AssetIn) + liqThresholdFirstBridgedAsset, _ := k.lend.GetAssetRatesParams(ctx, firstTransitAssetID) liqThreshold := liqThresholdAssetIn.LiquidationThreshold.Mul(liqThresholdFirstBridgedAsset.LiquidationThreshold) unliquidatePointPercentage := liqThreshold @@ -367,11 +367,11 @@ func (k Keeper) UnLiquidateLockedBorrows(ctx sdk.Context, appID, id uint64, dutc return err } k.DeleteLockedVault(ctx, lockedVault.AppId, lockedVault.LockedVaultId) - if err = k.SendCoinFromModuleToAccount(ctx, assetInPool.ModuleName, userAddress, sdk.NewCoin(cAssetIn.Denom, lockedVault.AmountIn)); err != nil { + if err = k.bank.SendCoinsFromModuleToAccount(ctx, assetInPool.ModuleName, userAddress, sdk.NewCoins(sdk.NewCoin(cAssetIn.Denom, lockedVault.AmountIn))); err != nil { return err } } - newCalculatedCollateralizationRatio, _ := k.CalculateLendCollateralizationRatio(ctx, lockedVault.AmountIn, assetIn, lockedVault.UpdatedAmountOut, assetOut) + newCalculatedCollateralizationRatio, _ := k.lend.CalculateCollateralizationRatio(ctx, lockedVault.AmountIn, assetIn, lockedVault.UpdatedAmountOut, assetOut) if newCalculatedCollateralizationRatio.GT(unliquidatePointPercentage) { updatedLockedVault := lockedVault updatedLockedVault.CurrentCollaterlisationRatio = newCalculatedCollateralizationRatio @@ -387,12 +387,12 @@ func (k Keeper) UnLiquidateLockedBorrows(ctx sdk.Context, appID, id uint64, dutc if err != nil { return err } - k.CreteNewBorrow(ctx, lockedVault) + k.lend.CreteNewBorrow(ctx, lockedVault) k.DeleteLockedVault(ctx, lockedVault.AppId, lockedVault.LockedVaultId) } } else { - liqThresholdAssetIn, _ := k.GetAssetRatesParams(ctx, pair.AssetIn) - liqThresholdSecondBridgedAsset, _ := k.GetAssetRatesParams(ctx, secondTransitAssetID) + liqThresholdAssetIn, _ := k.lend.GetAssetRatesParams(ctx, pair.AssetIn) + liqThresholdSecondBridgedAsset, _ := k.lend.GetAssetRatesParams(ctx, secondTransitAssetID) liqThreshold := liqThresholdAssetIn.LiquidationThreshold.Mul(liqThresholdSecondBridgedAsset.LiquidationThreshold) unliquidatePointPercentage := liqThreshold @@ -402,11 +402,11 @@ func (k Keeper) UnLiquidateLockedBorrows(ctx sdk.Context, appID, id uint64, dutc return err } k.DeleteLockedVault(ctx, lockedVault.AppId, lockedVault.LockedVaultId) - if err = k.SendCoinFromModuleToAccount(ctx, assetInPool.ModuleName, userAddress, sdk.NewCoin(cAssetIn.Denom, lockedVault.AmountIn)); err != nil { + if err = k.bank.SendCoinsFromModuleToAccount(ctx, assetInPool.ModuleName, userAddress, sdk.NewCoins(sdk.NewCoin(cAssetIn.Denom, lockedVault.AmountIn))); err != nil { return err } } - newCalculatedCollateralizationRatio, _ := k.CalculateLendCollateralizationRatio(ctx, lockedVault.AmountIn, assetIn, lockedVault.UpdatedAmountOut, assetOut) + newCalculatedCollateralizationRatio, _ := k.lend.CalculateCollateralizationRatio(ctx, lockedVault.AmountIn, assetIn, lockedVault.UpdatedAmountOut, assetOut) if newCalculatedCollateralizationRatio.GT(unliquidatePointPercentage) { updatedLockedVault := lockedVault updatedLockedVault.CurrentCollaterlisationRatio = newCalculatedCollateralizationRatio @@ -422,7 +422,7 @@ func (k Keeper) UnLiquidateLockedBorrows(ctx sdk.Context, appID, id uint64, dutc if err != nil { return err } - k.CreteNewBorrow(ctx, lockedVault) + k.lend.CreteNewBorrow(ctx, lockedVault) k.DeleteLockedVault(ctx, lockedVault.AppId, lockedVault.LockedVaultId) } } diff --git a/x/liquidation/keeper/liquidate_vaults.go b/x/liquidation/keeper/liquidate_vaults.go index be025c711..35bb84583 100644 --- a/x/liquidation/keeper/liquidate_vaults.go +++ b/x/liquidation/keeper/liquidate_vaults.go @@ -14,12 +14,12 @@ func (k Keeper) LiquidateVaults(ctx sdk.Context) error { params := k.GetParams(ctx) for i := range appIds { - esmStatus, found := k.GetESMStatus(ctx, appIds[i]) + esmStatus, found := k.esm.GetESMStatus(ctx, appIds[i]) status := false if found { status = esmStatus.Status } - klwsParams, _ := k.GetKillSwitchData(ctx, appIds[i]) + klwsParams, _ := k.esm.GetKillSwitchData(ctx, appIds[i]) if klwsParams.BreakerEnable || status { continue } @@ -28,8 +28,8 @@ func (k Keeper) LiquidateVaults(ctx sdk.Context) error { if !found { liquidationOffsetHolder = types.NewLiquidationOffsetHolder(appIds[i], 0) } - totalVaults := k.GetVaults(ctx) - lengthOfVaults := int(k.GetLengthOfVault(ctx)) + totalVaults := k.vault.GetVaults(ctx) + lengthOfVaults := int(k.vault.GetLengthOfVault(ctx)) //// get all vaults /// range over those vaults //// for length of vaults use vault counter @@ -46,13 +46,13 @@ func (k Keeper) LiquidateVaults(ctx sdk.Context) error { if vault.AppId != appIds[i] { continue } - extPair, _ := k.GetPairsVault(ctx, vault.ExtendedPairVaultID) - pair, _ := k.GetPair(ctx, extPair.PairId) - assetIn, found := k.GetAsset(ctx, pair.AssetIn) + extPair, _ := k.asset.GetPairsVault(ctx, vault.ExtendedPairVaultID) + pair, _ := k.asset.GetPair(ctx, extPair.PairId) + assetIn, found := k.asset.GetAsset(ctx, pair.AssetIn) if !found { continue } - totalRate, err := k.CalcAssetPrice(ctx, assetIn.Id, vault.AmountIn) + totalRate, err := k.market.CalcAssetPrice(ctx, assetIn.Id, vault.AmountIn) if err != nil { continue } @@ -60,20 +60,20 @@ func (k Keeper) LiquidateVaults(ctx sdk.Context) error { liqRatio := extPair.MinCr totalOut := vault.AmountOut.Add(vault.InterestAccumulated).Add(vault.ClosingFeeAccumulated) - collateralizationRatio, err := k.CalculateCollateralizationRatio(ctx, vault.ExtendedPairVaultID, vault.AmountIn, totalOut) + collateralizationRatio, err := k.vault.CalculateCollateralizationRatio(ctx, vault.ExtendedPairVaultID, vault.AmountIn, totalOut) if err != nil { continue } if collateralizationRatio.LT(liqRatio) { // calculate interest and update vault totalDebt := vault.AmountOut.Add(vault.InterestAccumulated) - err1 := k.CalculateVaultInterest(ctx, vault.AppId, vault.ExtendedPairVaultID, vault.Id, totalDebt, vault.BlockHeight, vault.BlockTime.Unix()) + err1 := k.rewards.CalculateVaultInterest(ctx, vault.AppId, vault.ExtendedPairVaultID, vault.Id, totalDebt, vault.BlockHeight, vault.BlockTime.Unix()) if err1 != nil { continue } - vault, _ := k.GetVault(ctx, vault.Id) + vault, _ := k.vault.GetVault(ctx, vault.Id) totalFees := vault.InterestAccumulated.Add(vault.ClosingFeeAccumulated) - collateralizationRatio, err := k.CalculateCollateralizationRatio(ctx, vault.ExtendedPairVaultID, vault.AmountIn, totalOut) + collateralizationRatio, err := k.vault.CalculateCollateralizationRatio(ctx, vault.ExtendedPairVaultID, vault.AmountIn, totalOut) if err != nil { continue } @@ -81,12 +81,12 @@ func (k Keeper) LiquidateVaults(ctx sdk.Context) error { if err != nil { continue } - k.DeleteVault(ctx, vault.Id) + k.vault.DeleteVault(ctx, vault.Id) var rewards rewardstypes.VaultInterestTracker rewards.AppMappingId = appIds[i] rewards.VaultId = vault.Id - k.DeleteVaultInterestTracker(ctx, rewards) - k.DeleteAddressFromAppExtendedPairVaultMapping(ctx, vault.ExtendedPairVaultID, vault.Id, appIds[i]) + k.rewards.DeleteVaultInterestTracker(ctx, rewards) + k.vault.DeleteAddressFromAppExtendedPairVaultMapping(ctx, vault.ExtendedPairVaultID, vault.Id, appIds[i]) } } liquidationOffsetHolder.CurrentOffset = uint64(end) @@ -119,9 +119,9 @@ func (k Keeper) CreateLockedVault(ctx sdk.Context, vault vaulttypes.Vault, total k.SetLockedVault(ctx, value) k.SetLockedVaultID(ctx, value.LockedVaultId) - length := k.GetLengthOfVault(ctx) - k.SetLengthOfVault(ctx, length-1) - err := k.DutchActivator(ctx, value) + length := k.vault.GetLengthOfVault(ctx) + k.vault.SetLengthOfVault(ctx, length-1) + err := k.auction.DutchActivator(ctx, value) if err != nil { ctx.Logger().Error("error in dutch activator") } @@ -129,8 +129,8 @@ func (k Keeper) CreateLockedVault(ctx sdk.Context, vault vaulttypes.Vault, total } func (k Keeper) GetModAccountBalances(ctx sdk.Context, accountName string, denom string) sdk.Int { - macc := k.GetModuleAccount(ctx, accountName) - return k.GetBalance(ctx, macc.GetAddress(), denom).Amount + macc := k.account.GetModuleAccount(ctx, accountName) + return k.bank.GetBalance(ctx, macc.GetAddress(), denom).Amount } // Locked vault history kv diff --git a/x/liquidation/keeper/liquidate_vaults_test.go b/x/liquidation/keeper/liquidate_vaults_test.go index 0325a09ee..df49534a1 100644 --- a/x/liquidation/keeper/liquidate_vaults_test.go +++ b/x/liquidation/keeper/liquidate_vaults_test.go @@ -233,7 +233,7 @@ func (s *KeeperTestSuite) TestLiquidateVaults1() { currentVaultsCount := 2 s.Require().Equal(s.GetVaultCount(), currentVaultsCount) s.Require().Equal(s.GetVaultCountForExtendedPairIDbyAppID(uint64(1), 1), currentVaultsCount) - beforeVault, found := liquidationKeeper.GetVault(*ctx, 1) + beforeVault, found := s.vaultKeeper.GetVault(*ctx, 1) s.Require().True(found) // Liquidation shouldn't happen as price not changed From 91e45385f9b2d8f326e623b7e92cf6829a568563 Mon Sep 17 00:00:00 2001 From: Vishnu Kumavat Date: Tue, 18 Oct 2022 19:30:50 +0530 Subject: [PATCH 8/8] liquidation alias.go removed --- x/liquidation/keeper/alias.go | 206 ---------------------------------- 1 file changed, 206 deletions(-) delete mode 100644 x/liquidation/keeper/alias.go diff --git a/x/liquidation/keeper/alias.go b/x/liquidation/keeper/alias.go deleted file mode 100644 index 9c474387c..000000000 --- a/x/liquidation/keeper/alias.go +++ /dev/null @@ -1,206 +0,0 @@ -package keeper - -// import ( -// sdk "github.com/cosmos/cosmos-sdk/types" -// authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" - -// assettypes "github.com/comdex-official/comdex/x/asset/types" -// auctiontypes "github.com/comdex-official/comdex/x/auction/types" -// esmtypes "github.com/comdex-official/comdex/x/esm/types" -// lendtypes "github.com/comdex-official/comdex/x/lend/types" -// liquidationtypes "github.com/comdex-official/comdex/x/liquidation/types" -// rewardstypes "github.com/comdex-official/comdex/x/rewards/types" -// "github.com/comdex-official/comdex/x/vault/types" -// ) - -// func (k Keeper) GetModuleAccount(ctx sdk.Context, name string) authtypes.ModuleAccountI { -// return k.account.GetModuleAccount(ctx, name) -// } - -// func (k Keeper) GetBalance(ctx sdk.Context, addr sdk.AccAddress, denom string) sdk.Coin { -// return k.bank.GetBalance(ctx, addr, denom) -// } - -// func (k Keeper) GetPair(ctx sdk.Context, id uint64) (assettypes.Pair, bool) { -// return k.asset.GetPair(ctx, id) -// } - -// func (k Keeper) GetAsset(ctx sdk.Context, id uint64) (assettypes.Asset, bool) { -// return k.asset.GetAsset(ctx, id) -// } - -// func (k Keeper) GetApps(ctx sdk.Context) (apps []assettypes.AppData, found bool) { -// return k.asset.GetApps(ctx) -// } - -// func (k Keeper) SendCoinFromModuleToAccount(ctx sdk.Context, name string, address sdk.AccAddress, coin sdk.Coin) error { -// if coin.IsZero() { -// return liquidationtypes.SendCoinsFromModuleToAccountInLiquidationIsZero -// } - -// return k.bank.SendCoinsFromModuleToAccount(ctx, name, address, sdk.NewCoins(coin)) -// } - -// func (k Keeper) GetAppMappingData(ctx sdk.Context, appMappingID uint64) (appExtendedPairVaultData []types.AppExtendedPairVaultMappingData, found bool) { -// return k.vault.GetAppMappingData(ctx, appMappingID) -// } - -// func (k Keeper) CalculateCollateralizationRatio(ctx sdk.Context, extendedPairVaultID uint64, amountIn sdk.Int, amountOut sdk.Int) (sdk.Dec, error) { -// return k.vault.CalculateCollateralizationRatio(ctx, extendedPairVaultID, amountIn, amountOut) -// } - -// func (k Keeper) GetVault(ctx sdk.Context, id uint64) (vault types.Vault, found bool) { -// return k.vault.GetVault(ctx, id) -// } - -// func (k Keeper) GetVaults(ctx sdk.Context) (vaults []types.Vault) { -// return k.vault.GetVaults(ctx) -// } - -// func (k Keeper) GetIDForVault(ctx sdk.Context) uint64 { -// return k.vault.GetIDForVault(ctx) -// } - -// func (k Keeper) GetLengthOfVault(ctx sdk.Context) uint64 { -// return k.vault.GetLengthOfVault(ctx) -// } - -// func (k Keeper) SetLengthOfVault(ctx sdk.Context, length uint64) { -// k.vault.SetLengthOfVault(ctx, length) -// } - -// func (k Keeper) DeleteVault(ctx sdk.Context, id uint64) { -// k.vault.DeleteVault(ctx, id) -// } - -// func (k Keeper) UpdateAppExtendedPairVaultMappingDataOnMsgCreate(ctx sdk.Context, vaultData types.Vault) { -// k.vault.UpdateAppExtendedPairVaultMappingDataOnMsgCreate(ctx, vaultData) -// } - -// func (k Keeper) UpdateCollateralLockedAmountLockerMapping(ctx sdk.Context, appMappingID uint64, extendedPairID uint64, amount sdk.Int, changeType bool) { -// k.vault.UpdateCollateralLockedAmountLockerMapping(ctx, appMappingID, extendedPairID, amount, changeType) -// } - -// func (k Keeper) DeleteUserVaultExtendedPairMapping(ctx sdk.Context, address string, appID uint64, pairVaultID uint64) { -// k.vault.DeleteUserVaultExtendedPairMapping(ctx, address, appID, pairVaultID) -// } - -// func (k Keeper) DeleteAddressFromAppExtendedPairVaultMapping(ctx sdk.Context, extendedPairID uint64, userVaultID uint64, appMappingID uint64) { -// k.vault.DeleteAddressFromAppExtendedPairVaultMapping(ctx, extendedPairID, userVaultID, appMappingID) -// } - -// func (k Keeper) GetPairsVault(ctx sdk.Context, id uint64) (pairs assettypes.ExtendedPairVault, found bool) { -// return k.asset.GetPairsVault(ctx, id) -// } - -// func (k Keeper) GetAuctionParams(ctx sdk.Context) auctiontypes.Params { -// return k.auction.GetParams(ctx) -// } - -// func (k Keeper) SetVault(ctx sdk.Context, vault types.Vault) { -// k.vault.SetVault(ctx, vault) -// } - -// func (k Keeper) GetKillSwitchData(ctx sdk.Context, appID uint64) (esmtypes.KillSwitchParams, bool) { -// return k.esm.GetKillSwitchData(ctx, appID) -// } - -// func (k Keeper) GetESMStatus(ctx sdk.Context, id uint64) (esmtypes.ESMStatus, bool) { -// return k.esm.GetESMStatus(ctx, id) -// } - -// func (k Keeper) GetBorrows(ctx sdk.Context) (userBorrows []uint64, found bool) { -// return k.lend.GetBorrows(ctx) -// } - -// func (k Keeper) GetBorrow(ctx sdk.Context, id uint64) (borrow lendtypes.BorrowAsset, found bool) { -// return k.lend.GetBorrow(ctx, id) -// } - -// func (k Keeper) GetLendPair(ctx sdk.Context, id uint64) (pair lendtypes.Extended_Pair, found bool) { -// return k.lend.GetLendPair(ctx, id) -// } - -// func (k Keeper) GetAssetRatesParams(ctx sdk.Context, assetID uint64) (assetRatesStats lendtypes.AssetRatesParams, found bool) { -// return k.lend.GetAssetRatesParams(ctx, assetID) -// } - -// func (k Keeper) VerifyCollateralizationRatio(ctx sdk.Context, amountIn sdk.Int, assetIn assettypes.Asset, amountOut sdk.Int, assetOut assettypes.Asset, liquidationThreshold sdk.Dec) error { -// return k.lend.VerifyCollateralizationRatio(ctx, amountIn, assetIn, amountOut, assetOut, liquidationThreshold) -// } - -// func (k Keeper) CalculateLendCollateralizationRatio(ctx sdk.Context, amountIn sdk.Int, assetIn assettypes.Asset, amountOut sdk.Int, assetOut assettypes.Asset) (sdk.Dec, error) { -// return k.lend.CalculateCollateralizationRatio(ctx, amountIn, assetIn, amountOut, assetOut) -// } - -// func (k Keeper) GetLend(ctx sdk.Context, id uint64) (lend lendtypes.LendAsset, found bool) { -// return k.lend.GetLend(ctx, id) -// } - -// func (k Keeper) CreteNewBorrow(ctx sdk.Context, liqBorrow liquidationtypes.LockedVault) { -// k.lend.CreteNewBorrow(ctx, liqBorrow) -// } - -// func (k Keeper) GetPool(ctx sdk.Context, id uint64) (pool lendtypes.Pool, found bool) { -// return k.lend.GetPool(ctx, id) -// } - -// func (k Keeper) GetAssetStatsByPoolIDAndAssetID(ctx sdk.Context, poolID, assetID uint64) (AssetStats lendtypes.PoolAssetLBMapping, found bool) { -// return k.lend.GetAssetStatsByPoolIDAndAssetID(ctx, poolID, assetID) -// } - -// func (k Keeper) SetAssetStatsByPoolIDAndAssetID(ctx sdk.Context, AssetStats lendtypes.PoolAssetLBMapping) { -// k.lend.SetAssetStatsByPoolIDAndAssetID(ctx, AssetStats) -// } - -// //func (k Keeper) UpdateBorrowStats(ctx sdk.Context, pair lendtypes.Extended_Pair, borrowPos lendtypes.BorrowAsset, amount sdk.Int, inc bool) { -// // k.lend.UpdateBorrowStats(ctx, pair, borrowPos, amount, inc) -// //} - -// func (k Keeper) SendCoinsFromModuleToModule(ctx sdk.Context, senderModule string, recipientModule string, coin sdk.Coins) error { -// if coin.IsZero() { -// return auctiontypes.SendCoinsFromModuleToModuleInAuctionIsZero -// } - -// return k.bank.SendCoinsFromModuleToModule(ctx, senderModule, recipientModule, coin) -// } - -// func (k Keeper) UpdateReserveBalances(ctx sdk.Context, assetID uint64, moduleName string, payment sdk.Coin, inc bool) error { -// return k.lend.UpdateReserveBalances(ctx, assetID, moduleName, payment, inc) -// } - -// func (k Keeper) SetLend(ctx sdk.Context, lend lendtypes.LendAsset) { -// k.lend.SetLend(ctx, lend) -// } - -// func (k Keeper) BurnCoin(ctx sdk.Context, name string, coin sdk.Coin) error { -// if coin.IsZero() { -// return lendtypes.BurnCoinValueInLendIsZero -// } - -// return k.bank.BurnCoins(ctx, name, sdk.NewCoins(coin)) -// } - -// func (k Keeper) CalculateVaultInterest(ctx sdk.Context, appID, assetID, lockerID uint64, NetBalance sdk.Int, blockHeight int64, lockerBlockTime int64) error { -// return k.rewards.CalculateVaultInterest(ctx, appID, assetID, lockerID, NetBalance, blockHeight, lockerBlockTime) -// } - -// func (k Keeper) DeleteVaultInterestTracker(ctx sdk.Context, vault rewardstypes.VaultInterestTracker) { -// k.rewards.DeleteVaultInterestTracker(ctx, vault) -// } - -// func (k Keeper) DutchActivator(ctx sdk.Context, lockedVault liquidationtypes.LockedVault) error { -// return k.auction.DutchActivator(ctx, lockedVault) -// } - -// func (k Keeper) LendDutchActivator(ctx sdk.Context, lockedVault liquidationtypes.LockedVault) error { -// return k.auction.LendDutchActivator(ctx, lockedVault) -// } - -// func (k Keeper) SetBorrow(ctx sdk.Context, borrow lendtypes.BorrowAsset) { -// k.lend.SetBorrow(ctx, borrow) -// } - -// func (k Keeper) CalcAssetPrice(ctx sdk.Context, id uint64, amt sdk.Int) (price sdk.Dec, err error) { -// return k.market.CalcAssetPrice(ctx, id, amt) -// }