Merge pull request #465 from ComposableFi/rustninja/eth-bridge-ibc-mi…

…n-timestamp Introduced the validation to not allow ibc with timeout timestamp less then X nanos.
ComposableFi · Mar 19, 2024 · cb00202 · cb00202
2 parents 3bcb8c6 + d662505
commit cb00202
Show file tree

Hide file tree

Showing 4 changed files with 73 additions and 31 deletions.
diff --git a/custom/ibc-transfer/keeper/msg_server.go b/custom/ibc-transfer/keeper/msg_server.go
@@ -2,6 +2,7 @@ package keeper
 
 import (
 	"context"
+	"fmt"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/ibc-go/v7/modules/apps/transfer/types"
@@ -29,6 +30,9 @@ 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")
+			}
 			coin := findCoinByDenom(channelFee.AllowedTokens, msg.Token.Denom)
 			if coin != nil {
 				return &types.MsgTransferResponse{}, nil

diff --git a/proto/composable/ibctransfermiddleware/v1beta1/ibctransfermiddleware.proto b/proto/composable/ibctransfermiddleware/v1beta1/ibctransfermiddleware.proto
@@ -19,6 +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;
 }
 
 message CoinItem{

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