remove packet fee

proto/band/tunnel/v1beta1/tunnel.proto

@@ -74,14 +74,8 @@ message Packet {
   repeated band.feeds.v1beta1.Price prices = 3 [(gogoproto.nullable) = false];
   // receipt represents the confirmation of the packet delivery to the destination via the specified route.
   google.protobuf.Any receipt = 4 [(cosmos_proto.accepts_interface) = "PacketReceiptI"];
-  // base_fee is the base fee of the packet
-  repeated cosmos.base.v1beta1.Coin base_fee = 5
-      [(gogoproto.nullable) = false, (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"];
-  // route_fee is the route fee of the packet
-  repeated cosmos.base.v1beta1.Coin route_fee = 6
-      [(gogoproto.nullable) = false, (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"];
   // created_at is the timestamp when the packet is created
-  int64 created_at = 7;
+  int64 created_at = 5;
 }
 
 // Deposit defines an amount deposited by an account address to the tunnel.

x/tunnel/keeper/keeper_packet.go

@@ -145,9 +145,6 @@ func (k Keeper) CreatePacket(
 	tunnelID uint64,
 	prices []feedstypes.Price,
 ) (types.Packet, error) {
-	// get tunnel and prices info
-	params := k.GetParams(ctx)
-
 	tunnel, err := k.GetTunnel(ctx, tunnelID)
 	if err != nil {
 		return types.Packet{}, err
@@ -159,25 +156,11 @@ func (k Keeper) CreatePacket(
 		return types.Packet{}, sdkerrors.Wrapf(err, "failed to deduct base packet fee for tunnel %d", tunnel.ID)
 	}
 
-	// get the route
-	route, err := tunnel.GetRouteValue()
-	if err != nil {
-		return types.Packet{}, err
-	}
-
-	// get the route fee
-	routeFee, err := k.GetRouteFee(ctx, route)
-	if err != nil {
-		return types.Packet{}, err
-	}
-
 	tunnel.Sequence++
 	packet := types.NewPacket(
 		tunnelID,
 		tunnel.Sequence,
 		prices,
-		params.BasePacketFee,
-		routeFee,
 		ctx.BlockTime().Unix(),
 	)
 

x/tunnel/keeper/keeper_packet_test.go

@@ -55,8 +55,6 @@ func (s *KeeperTestSuite) TestGetSetPacket() {
 func (s *KeeperTestSuite) TestCreatePacket() {
 	ctx, k := s.ctx, s.keeper
 
-	params := k.GetParams(ctx)
-
 	feePayer := sdk.AccAddress([]byte("fee_payer_address"))
 	tunnel := types.Tunnel{
 		ID:       1,
@@ -75,10 +73,6 @@ func (s *KeeperTestSuite) TestCreatePacket() {
 		{Status: feedstypes.PRICE_STATUS_AVAILABLE, SignalID: "CS:BAND-USD", Price: 5000000, Timestamp: 1733000000},
 	}
 
-	s.bandtssKeeper.EXPECT().GetSigningFee(gomock.Any()).Return(
-		sdk.NewCoins(sdk.NewCoin("uband", sdkmath.NewInt(20))), nil,
-	)
-
 	s.bankKeeper.EXPECT().
 		SendCoinsFromAccountToModule(ctx, feePayer, types.ModuleName, k.GetParams(ctx).BasePacketFee).
 		Return(nil)
@@ -93,8 +87,6 @@ func (s *KeeperTestSuite) TestCreatePacket() {
 		TunnelID:  1,
 		Sequence:  1,
 		Prices:    prices,
-		BaseFee:   params.BasePacketFee,
-		RouteFee:  sdk.NewCoins(sdk.NewCoin("uband", sdkmath.NewInt(20))),
 		CreatedAt: ctx.BlockTime().Unix(),
 	}
 

x/tunnel/keeper/keeper_packet_tss.go

@@ -20,6 +20,11 @@ func (k Keeper) SendTSSPacket(
 		route.Encoder,
 	)
 
+	tssFee, err := k.bandtssKeeper.GetSigningFee(ctx)
+	if err != nil {
+		return nil, err
+	}
+
 	// try signing TSS packet, if success, write the context.
 	signingID, err := k.bandtssKeeper.CreateTunnelSigningRequest(
 		ctx,
@@ -28,7 +33,7 @@ func (k Keeper) SendTSSPacket(
 		route.DestinationContractAddress,
 		content,
 		feePayer,
-		packet.RouteFee,
+		tssFee,
 	)
 	if err != nil {
 		return nil, err

x/tunnel/keeper/keeper_packet_tss_test.go

@@ -27,11 +27,11 @@ func (s *KeeperTestSuite) TestSendTSSPacket() {
 		1,                    // tunnelID
 		1,                    // sequence
 		[]feedstypes.Price{}, // priceInfos[]
-		sdk.NewCoins(),       // baseFee
-		sdk.NewCoins(sdk.NewCoin("uband", sdkmath.NewInt(20))), // routeFee
 		time.Now().Unix(),
 	)
 
+	s.bandtssKeeper.EXPECT().GetSigningFee(ctx).Return(sdk.NewCoins(sdk.NewCoin("uband", sdkmath.NewInt(20))), nil)
+
 	// Mock the TSS keeper and set the state for checking later
 	s.bandtssKeeper.EXPECT().CreateTunnelSigningRequest(
 		gomock.Any(),

x/tunnel/keeper/keeper_tunnel.go

@@ -288,15 +288,3 @@ func (k Keeper) GenerateTunnelAccount(ctx sdk.Context, key string) (sdk.AccAddre
 
 	return tunnelAccAddr, nil
 }
-
-// GetRouteFee returns the fee of the given route
-func (k Keeper) GetRouteFee(ctx sdk.Context, route types.RouteI) (sdk.Coins, error) {
-	switch route.(type) {
-	case *types.TSSRoute:
-		return k.bandtssKeeper.GetSigningFee(ctx)
-	case *types.IBCRoute:
-		return sdk.Coins{}, nil
-	default:
-		return sdk.Coins{}, types.ErrInvalidRoute
-	}
-}

x/tunnel/types/packet.go

@@ -6,7 +6,6 @@ import (
 	proto "github.com/cosmos/gogoproto/proto"
 
 	"github.com/cosmos/cosmos-sdk/codec/types"
-	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 
 	feedstypes "github.com/bandprotocol/chain/v3/x/feeds/types"
@@ -18,17 +17,13 @@ func NewPacket(
 	tunnelID uint64,
 	sequence uint64,
 	prices []feedstypes.Price,
-	baseFee sdk.Coins,
-	routeFee sdk.Coins,
 	createdAt int64,
 ) Packet {
 	return Packet{
 		TunnelID:  tunnelID,
 		Sequence:  sequence,
 		Prices:    prices,
 		Receipt:   nil,
-		BaseFee:   baseFee,
-		RouteFee:  routeFee,
 		CreatedAt: createdAt,
 	}
 }

x/tunnel/types/packet_test.go

@@ -11,7 +11,7 @@ import (
 )
 
 func TestGetSetPacketReceipt(t *testing.T) {
-	packet := types.NewPacket(1, 1, nil, nil, nil, 0)
+	packet := types.NewPacket(1, 1, nil, 0)
 	receipt := &types.TSSPacketReceipt{SigningID: 1}
 
 	err := packet.SetReceipt(receipt)
@@ -23,7 +23,7 @@ func TestGetSetPacketReceipt(t *testing.T) {
 }
 
 func TestPacketUnpackInterfaces(t *testing.T) {
-	packet := types.NewPacket(1, 1, nil, nil, nil, 0)
+	packet := types.NewPacket(1, 1, nil, 0)
 	packetResult := &types.TSSPacketReceipt{SigningID: 1}
 
 	err := packet.SetReceipt(packetResult)