reverts ibc from delegation account to puneet/handle-deposits-to-delegation-acc account, removes delegation acc from c_value. (#386)

Author: puneet2019

x/lscosmos/keeper/c_value.go

@@ -21,15 +21,6 @@ func (k Keeper) GetDepositAccountAmount(ctx sdk.Context) sdk.Int {
 	).Amount
 }
 
-// GetDelegationAccountAmount returns the delegation account amount of the IBC denom
-func (k Keeper) GetDelegationAccountAmount(ctx sdk.Context) sdk.Int {
-	return k.bankKeeper.GetBalance(
-		ctx,
-		authtypes.NewModuleAddress(types.DelegationModuleAccount),
-		k.GetIBCDenom(ctx),
-	).Amount
-}
-
 // GetIBCTransferTransientAmount returns the IBC transfer transient amount of the IBC denom
 func (k Keeper) GetIBCTransferTransientAmount(ctx sdk.Context) sdk.Int {
 	transferAmount := k.GetIBCTransientStore(ctx).IBCTransfer
@@ -70,7 +61,6 @@ func (k Keeper) GetHostDelegationAccountAmount(ctx sdk.Context) sdk.Int {
 // function is called. Returns 1 if stakedAmount or mintedAmount is zero.
 func (k Keeper) GetCValue(ctx sdk.Context) sdk.Dec {
 	stakedAmount := k.GetDepositAccountAmount(ctx).
-		Add(k.GetDelegationAccountAmount(ctx)).
 		Add(k.GetIBCTransferTransientAmount(ctx)).
 		Add(k.GetDelegationTransientAmount(ctx)).
 		Add(k.GetStakedAmount(ctx)).

x/lscosmos/keeper/c_value_test.go

@@ -89,6 +89,7 @@ func (suite *IntegrationTestSuite) TestCValue() {
 	)
 	suite.NoError(err)
 
+	// Delegation module account should not be counted in c_value.
 	err = app.BankKeeper.SendCoinsFromModuleToModule(ctx,
 		types.ModuleName,
 		types.DelegationModuleAccount,
@@ -97,15 +98,15 @@ func (suite *IntegrationTestSuite) TestCValue() {
 	suite.NoError(err)
 
 	cValue = lscosmosKeeper.GetCValue(ctx)
-	suite.Equal(sdk.NewDecWithPrec(979431929480901077, 18), cValue)
+	suite.Equal(sdk.NewDecWithPrec(989119683481701286, 18), cValue)
 
 	cValue = lscosmosKeeper.GetCValue(ctx)
 	tokenValue, residue = lscosmosKeeper.ConvertStkToToken(ctx, sdk.NewDecCoin(lscosmosKeeper.GetHostChainParams(ctx).MintDenom, sdk.NewInt(1000000)), cValue)
-	suite.True(sdk.NewInt64Coin(lscosmosKeeper.GetIBCDenom(ctx), 1021000).IsEqual(tokenValue))
+	suite.True(sdk.NewInt64Coin(lscosmosKeeper.GetIBCDenom(ctx), 1011000).IsEqual(tokenValue))
 	suite.True(sdk.NewDecCoinFromDec(lscosmosKeeper.GetIBCDenom(ctx), sdk.ZeroDec()).IsEqual(residue))
 
 	cValue = lscosmosKeeper.GetCValue(ctx)
 	stkValue, residue = lscosmosKeeper.ConvertTokenToStk(ctx, sdk.NewDecCoin(lscosmosKeeper.GetIBCDenom(ctx), sdk.NewInt(1000000)), cValue)
-	suite.True(sdk.NewInt64Coin(lscosmosKeeper.GetHostChainParams(ctx).MintDenom, 979431).IsEqual(stkValue))
-	suite.True(sdk.NewDecCoinFromDec(lscosmosKeeper.GetHostChainParams(ctx).MintDenom, sdk.NewDecWithPrec(929480901077000000, 18)).IsEqual(residue))
+	suite.True(sdk.NewInt64Coin(lscosmosKeeper.GetHostChainParams(ctx).MintDenom, 989119).IsEqual(stkValue))
+	suite.True(sdk.NewDecCoinFromDec(lscosmosKeeper.GetHostChainParams(ctx).MintDenom, sdk.NewDecWithPrec(683481701286000000, 18)).IsEqual(residue))
 }

x/lscosmos/keeper/hooks.go

@@ -124,7 +124,7 @@ func (k Keeper) DelegationEpochWorkFlow(ctx sdk.Context, hostChainParams lscosmo
 	}
 	allDelegationBalances := k.bankKeeper.GetAllBalances(ctx, authtypes.NewModuleAddress(lscosmostypes.DelegationModuleAccount))
 	delegationBalance := sdk.NewCoin(ibcDenom, allDelegationBalances.AmountOf(ibcDenom))
-	if delegationBalance.IsPositive() {
+	if delegationBalance.IsPositive() && depositBalance.IsPositive() && delegationBalance.IsGTE(depositBalance) {
 		delegationState := k.GetDelegationState(ctx)
 		_, clientState, err := k.channelKeeper.GetChannelClientState(ctx, hostChainParams.TransferPort, hostChainParams.TransferChannel)
 		if err != nil {
@@ -134,7 +134,7 @@ func (k Keeper) DelegationEpochWorkFlow(ctx sdk.Context, hostChainParams lscosmo
 		timeoutHeight := clienttypes.NewHeight(clientState.GetLatestHeight().GetRevisionNumber(), clientState.GetLatestHeight().GetRevisionHeight()+lscosmostypes.IBCTimeoutHeightIncrement)
 
 		msg := ibctransfertypes.NewMsgTransfer(hostChainParams.TransferPort, hostChainParams.TransferChannel,
-			delegationBalance, authtypes.NewModuleAddress(lscosmostypes.DelegationModuleAccount).String(),
+			depositBalance, authtypes.NewModuleAddress(lscosmostypes.DelegationModuleAccount).String(),
 			delegationState.HostChainDelegationAddress, timeoutHeight, 0)
 
 		handler := k.msgRouter.Handler(msg)
@@ -144,14 +144,14 @@ func (k Keeper) DelegationEpochWorkFlow(ctx sdk.Context, hostChainParams lscosmo
 			k.Logger(ctx).Error(fmt.Sprintf("could not send transfer msg via MsgServiceRouter, error: %s", err))
 			return err
 		}
-		k.AddIBCTransferToTransientStore(ctx, delegationBalance)
+		k.AddIBCTransferToTransientStore(ctx, depositBalance)
 
 		ctx.EventManager().EmitEvents(res.GetEvents())
 	}
 	// move extra tokens to pstake address - anyone can send tokens to delegation address.
 	// deposit address is deny-listed address - can only accept tokens via transactions, so should not have any extra tokens
 	// should be transferred to pstake address.
-	remainingDelegationBalance := allDelegationBalances.Sub(sdk.NewCoins(delegationBalance))
+	remainingDelegationBalance := k.bankKeeper.GetAllBalances(ctx, authtypes.NewModuleAddress(lscosmostypes.DelegationModuleAccount))
 
 	if remainingDelegationBalance.IsAllPositive() {
 		feeAddr, err := sdk.AccAddressFromBech32(hostChainParams.PstakeParams.PstakeFeeAddress)
@@ -375,7 +375,8 @@ func (k Keeper) OnTimeoutIBCTransferPacket(ctx sdk.Context, packet channeltypes.
 	}
 	ibcDenom := ibctransfertypes.ParseDenomTrace(data.GetDenom())
 	k.RemoveIBCTransferFromTransientStore(ctx, sdk.NewCoin(ibcDenom.IBCDenom(), amount))
-	return nil
+	//move tokens to deposit account
+	return k.bankKeeper.SendCoinsFromModuleToModule(ctx, lscosmostypes.DelegationModuleAccount, lscosmostypes.DepositModuleAccount, sdk.NewCoins(sdk.NewCoin(ibcDenom.IBCDenom(), amount)))
 }
 
 type IBCTransferHooks struct {