develop to main (#355)

* Puneet/fixes (#354)

* use ibc transfer hook to remove transient state.

* use ibc transfer hook to remove transient state.

* fix spelling

* Puneet/fixes (#356)

* fix spelling

* add validation to genesis state.

* fix tests.

* increase ibc transfer revision height and undelegation buffers.

* remove unwanted todo

Author: puneet2019

x/lscosmos/keeper/handshake.go

@@ -495,7 +495,6 @@ func (k Keeper) handleResetMsgs(ctx sdk.Context, msg sdk.Msg, hostChainParams ty
 		hostAccounts := k.GetHostAccounts(ctx)
 		err := k.GenerateAndExecuteICATx(ctx, hostChainParams.ConnectionID, hostAccounts.DelegatorAccountPortID(), []sdk.Msg{parsedMsg})
 		if err != nil {
-			//TODO disable module?
 			return err
 		}
 

x/lscosmos/keeper/hooks.go

@@ -325,7 +325,37 @@ func (k Keeper) OnAcknowledgementIBCTransferPacket(ctx sdk.Context, packet chann
 }
 
 func (k Keeper) OnTimeoutIBCTransferPacket(ctx sdk.Context, packet channeltypes.Packet, relayer sdk.AccAddress, transferTimeoutErr error) error {
-	// Do nothing because amount will be reverted to delegationModuleAccount.
+	// transient store needs to be reverted here.
+	if transferTimeoutErr != nil {
+		return transferTimeoutErr
+	}
+	var data ibctransfertypes.FungibleTokenPacketData
+	if err := ibctransfertypes.ModuleCdc.UnmarshalJSON(packet.GetData(), &data); err != nil {
+		return err
+	}
+	// check for tokens moved from delegationModuleAccount to it's ica counterpart.
+	hostChainParams := k.GetHostChainParams(ctx)
+	delegationState := k.GetDelegationState(ctx)
+	if packet.GetSourceChannel() != hostChainParams.TransferChannel ||
+		packet.GetSourcePort() != hostChainParams.TransferPort {
+		// no need to return err, since most likely code is expected to enter this condition
+		return nil
+	}
+
+	if data.GetSender() != authtypes.NewModuleAddress(lscosmostypes.DelegationModuleAccount).String() ||
+		data.GetReceiver() != delegationState.HostChainDelegationAddress ||
+		data.GetDenom() != ibctransfertypes.GetPrefixedDenom(hostChainParams.TransferPort, hostChainParams.TransferChannel, hostChainParams.BaseDenom) {
+		// no need to return err, since most likely code is expected to enter this condition
+		return nil
+	}
+	k.Logger(ctx).Info(fmt.Sprintf("atoms tokens timedout while transferring to host chain address %s, amount: %s, denom: %s", data.Receiver, data.Amount, data.Denom))
+
+	amount, ok := sdk.NewIntFromString(data.GetAmount())
+	if !ok {
+		return ibctransfertypes.ErrInvalidAmount
+	}
+	ibcDenom := ibctransfertypes.ParseDenomTrace(data.GetDenom())
+	k.RemoveIBCTransferFromTransientStore(ctx, sdk.NewCoin(ibcDenom.IBCDenom(), amount))
 	return nil
 }
 

x/lscosmos/keeper/msg_server.go

@@ -127,7 +127,7 @@ func (m msgServer) LiquidStake(goCtx context.Context, msg *types.MsgLiquidStake)
 			types.EventTypeLiquidStake,
 			sdktypes.NewAttribute(types.AttributeDelegatorAddress, delegatorAddress.String()),
 			sdktypes.NewAttribute(types.AttributeAmount, mintToken.String()),
-			sdktypes.NewAttribute(types.AttributeAmountRecieved, mintToken.Sub(protocolCoin).String()),
+			sdktypes.NewAttribute(types.AttributeAmountReceived, mintToken.Sub(protocolCoin).String()),
 			sdktypes.NewAttribute(types.AttributePstakeDepositFee, protocolCoin.String()),
 		),
 		sdktypes.NewEvent(
@@ -193,7 +193,7 @@ func (m msgServer) Juice(goCtx context.Context, msg *types.MsgJuice) (*types.Msg
 		sdktypes.NewEvent(
 			types.EventTypeRewardBoost,
 			sdktypes.NewAttribute(types.AttributeRewarderAddress, rewarderAddress.String()),
-			sdktypes.NewAttribute(types.AttributeAmountRecieved, rewardsBoostAmount.String()),
+			sdktypes.NewAttribute(types.AttributeAmountReceived, rewardsBoostAmount.String()),
 		),
 		sdktypes.NewEvent(
 			sdktypes.EventTypeMessage,
@@ -256,16 +256,16 @@ func (m msgServer) LiquidUnstake(goCtx context.Context, msg *types.MsgLiquidUnst
 		return nil, err
 	}
 	totalDelegations := delegationState.TotalDelegations(hostChainParams.BaseDenom)
-	baseDenomUndelegtions, _ := m.ConvertStkToToken(ctx, sdktypes.NewDecCoinFromCoin(undelegations.TotalUndelegationAmount), m.GetCValue(ctx))
-	if totalDelegations.IsLT(sdktypes.NewCoin(hostChainParams.BaseDenom, baseDenomUndelegtions.Amount)) {
+	baseDenomUndelegations, _ := m.ConvertStkToToken(ctx, sdktypes.NewDecCoinFromCoin(undelegations.TotalUndelegationAmount), m.GetCValue(ctx))
+	if totalDelegations.IsLT(sdktypes.NewCoin(hostChainParams.BaseDenom, baseDenomUndelegations.Amount)) {
 		return nil, sdkerrors.Wrapf(types.ErrHostChainDelegationsLTUndelegations, "Delegated amount: %s is less than total undelegations for the epoch: %s", totalDelegations, undelegations.TotalUndelegationAmount)
 	}
 
 	ctx.EventManager().EmitEvents(sdktypes.Events{
 		sdktypes.NewEvent(
 			types.EventTypeLiquidUnstake,
 			sdktypes.NewAttribute(types.AttributeDelegatorAddress, msg.GetDelegatorAddress()),
-			sdktypes.NewAttribute(types.AttributeAmountRecieved, msg.Amount.String()),
+			sdktypes.NewAttribute(types.AttributeAmountReceived, msg.Amount.String()),
 			sdktypes.NewAttribute(types.AttributePstakeUnstakeFee, pstakeFee.String()),
 			sdktypes.NewAttribute(types.AttributeUnstakeAmount, unstakeCoin.String()),
 		),
@@ -365,7 +365,7 @@ func (m msgServer) Redeem(goCtx context.Context, msg *types.MsgRedeem) (*types.M
 			types.EventTypeRedeem,
 			sdktypes.NewAttribute(types.AttributeDelegatorAddress, redeemAddress.String()),
 			sdktypes.NewAttribute(types.AttributeAmount, msg.Amount.String()),
-			sdktypes.NewAttribute(types.AttributeAmountRecieved, redeemToken.String()),
+			sdktypes.NewAttribute(types.AttributeAmountReceived, redeemToken.String()),
 			sdktypes.NewAttribute(types.AttributePstakeRedeemFee, protocolCoin.String()),
 		),
 		sdktypes.NewEvent(

x/lscosmos/types/events.go

@@ -16,7 +16,7 @@ const (
 	AttributeKeyAck           = "acknowledgement"
 	AttributeKeyAckError      = "error"
 	AttributeAmount           = "amount"
-	AttributeAmountRecieved   = "received"
+	AttributeAmountReceived   = "received"
 	AttributeUnstakeAmount    = "undelegation-amount"
 	AttributePstakeDepositFee = "pstake-deposit-fee"
 	AttributePstakeRedeemFee  = "pstake-redeem-fee"

x/lscosmos/types/genesis.go

@@ -26,6 +26,15 @@ func DefaultGenesis() *GenesisState {
 func (gs GenesisState) Validate() error {
 
 	// this line is used by starport scaffolding # genesis/types/validate
-
+	if !gs.AllowListedValidators.Equal(AllowListedValidators{}) {
+		ok := gs.AllowListedValidators.Valid()
+		if !ok {
+			return ErrInValidAllowListedValidators
+		}
+	}
+	err := gs.HostAccounts.Validate()
+	if err != nil {
+		return err
+	}
 	return gs.Params.Validate()
 }

x/lscosmos/types/genesis_test.go

@@ -20,11 +20,11 @@ func TestGenesisState_Validate(t *testing.T) {
 			valid:    true,
 		},
 		{
-			desc:     "valid genesis state",
+			desc:     "invalid genesis state, host accounts not set",
 			genState: &types.GenesisState{
 				// this line is used by starport scaffolding # types/genesis/validField
 			},
-			valid: true,
+			valid: false,
 		},
 		// this line is used by starport scaffolding # types/genesis/testcase
 	} {

x/lscosmos/types/keys.go

@@ -62,9 +62,9 @@ const (
 	RewardEpochIdentifier                  = "day"
 	UndelegationEpochIdentifier            = "day"
 	UndelegationEpochNumberFactor    int64 = 4
-	UndelegationCompletionTimeBuffer       = time.Second * 10 //TODO change
+	UndelegationCompletionTimeBuffer       = time.Second * 60 //Does tendermint still have time drifts?
 
-	IBCTimeoutHeightIncrement uint64 = 100
+	IBCTimeoutHeightIncrement uint64 = 1000
 	ICATimeoutTimestamp              = time.Minute
 
 	CosmosValOperPrefix = "cosmosvaloper"