Refactor HTLC to support HTLT

CHANGELOG.md

@@ -40,6 +40,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
 ### Improvements
 
 * (modules/coinswap)[\#151](https://github.com/irisnet/irismod/pull/151) Replace prefix `swap/` with `swap`
+* (modules/htlc)[\#146](https://github.com/irisnet/irismod/pull/146) Refactor HTLC module to support HTLT.
 
 ## [v1.3.1] - 2021-02-09
 

modules/coinswap/types/params.go

@@ -73,16 +73,3 @@ func validateFee(i interface{}) error {
 
 	return nil
 }
-
-func validateStandardDenom(i interface{}) error {
-	v, ok := i.(string)
-	if !ok {
-		return fmt.Errorf("invalid parameter type: %T", i)
-	}
-
-	if err := sdk.ValidateDenom(v); err != nil {
-		return err
-	}
-
-	return nil
-}

modules/coinswap/types/validation.go

@@ -15,7 +15,7 @@ func ValidateInput(input Input) error {
 	}
 
 	if strings.HasPrefix(input.Coin.Denom, FormatUniABSPrefix) {
-		return sdkerrors.Wrapf(sdkerrors.ErrInvalidRequest, "invalid input denom,shoule not be begin with (%s)", FormatUniABSPrefix)
+		return sdkerrors.Wrapf(sdkerrors.ErrInvalidRequest, "invalid input denom, should not begin with (%s)", FormatUniABSPrefix)
 	}
 
 	if _, err := sdk.AccAddressFromBech32(input.Address); err != nil {
@@ -31,7 +31,7 @@ func ValidateOutput(output Output) error {
 	}
 
 	if strings.HasPrefix(output.Coin.Denom, FormatUniABSPrefix) {
-		return sdkerrors.Wrapf(sdkerrors.ErrInvalidRequest, "invalid output denom,shoule not be begin with (%s)", FormatUniABSPrefix)
+		return sdkerrors.Wrapf(sdkerrors.ErrInvalidRequest, "invalid output denom, should not begin with (%s)", FormatUniABSPrefix)
 	}
 
 	if _, err := sdk.AccAddressFromBech32(output.Address); err != nil {

modules/htlc/abci.go

@@ -16,28 +16,26 @@ func BeginBlocker(ctx sdk.Context, k keeper.Keeper) {
 	ctx = ctx.WithLogger(ctx.Logger().With("handler", "beginBlock").With("module", "irismod/htlc"))
 
 	currentBlockHeight := uint64(ctx.BlockHeight())
-
 	k.IterateHTLCExpiredQueueByHeight(
-		ctx,
-		currentBlockHeight,
-		func(hlock tmbytes.HexBytes, h types.HTLC) (stop bool) {
-			// update the state
-			h.State = types.Expired
-			k.SetHTLC(ctx, h, hlock)
-
+		ctx, currentBlockHeight,
+		func(id tmbytes.HexBytes, h types.HTLC) (stop bool) {
+			// refund HTLC
+			_ = k.RefundHTLC(ctx, h, id)
 			// delete from the expiration queue
-			k.DeleteHTLCFromExpiredQueue(ctx, currentBlockHeight, hlock)
+			k.DeleteHTLCFromExpiredQueue(ctx, currentBlockHeight, id)
 
 			ctx.EventManager().EmitEvents(sdk.Events{
 				sdk.NewEvent(
-					types.EventTypeHTLCExpired,
-					sdk.NewAttribute(types.AttributeKeyHashLock, hlock.String()),
+					types.EventTypeRefundHTLC,
+					sdk.NewAttribute(types.AttributeKeyID, id.String()),
 				),
 			})
 
-			ctx.Logger().Info(fmt.Sprintf("HTLC [%s] is expired", hlock.String()))
+			ctx.Logger().Info(fmt.Sprintf("HTLC [%s] is refunded", id.String()))
 
 			return false
 		},
 	)
+
+	k.UpdateTimeBasedSupplyLimits(ctx)
 }