introduce validation for timeout timestamp for eth ibc bridge

ComposableFi · Mar 19, 2024 · f4ff771 · f4ff771
1 parent d662505
commit f4ff771
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 35 deletions.
diff --git a/custom/ibc-transfer/keeper/msg_server.go b/custom/ibc-transfer/keeper/msg_server.go
@@ -3,6 +3,7 @@ package keeper
 import (
 	"context"
 	"fmt"
+	"time"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/ibc-go/v7/modules/apps/transfer/types"
@@ -30,8 +31,17 @@ func (k msgServer) Transfer(goCtx context.Context, msg *types.MsgTransfer) (*typ
 	if params.ChannelFees != nil && len(params.ChannelFees) > 0 {
 		channelFee := findChannelParams(params.ChannelFees, msg.SourceChannel)
 		if channelFee != nil {
-			if channelFee.MinTimeoutTimestamp > 0 && msg.TimeoutTimestamp < channelFee.MinTimeoutTimestamp {
-				return nil, fmt.Errorf("incorrect timeout timestamp found during ibc transfer")
+			if channelFee.MinTimeoutTimestamp > 0 {
+
+				goCtx := sdk.UnwrapSDKContext(goCtx)
+				blockTime := goCtx.BlockTime()
+
+				timeoutTimeInFuture := time.Unix(0, int64(msg.TimeoutTimestamp))
+				difference := timeoutTimeInFuture.Sub(blockTime).Nanoseconds()
+
+				if difference < channelFee.MinTimeoutTimestamp {
+					return nil, fmt.Errorf("incorrect timeout timestamp found during ibc transfer")
+				}
 			}
 			coin := findCoinByDenom(channelFee.AllowedTokens, msg.Token.Denom)
 			if coin != nil {

diff --git a/proto/composable/ibctransfermiddleware/v1beta1/ibctransfermiddleware.proto b/proto/composable/ibctransfermiddleware/v1beta1/ibctransfermiddleware.proto
@@ -19,7 +19,7 @@ message ChannelFee{
   string channel  = 1;
   repeated CoinItem allowed_tokens = 2;
   string fee_address = 3 [(cosmos_proto.scalar) = "cosmos.AddressString"];
-  uint64 min_timeout_timestamp = 4;
+  int64 min_timeout_timestamp = 4;
 }
 
 message CoinItem{

diff --git a/x/ibctransfermiddleware/types/ibctransfermiddleware.pb.go b/x/ibctransfermiddleware/types/ibctransfermiddleware.pb.go