Skip to content

Commit 4c6b84a

Browse files
move timestamp checks in SendPacket earlier (#7637)
1 parent 96bdd56 commit 4c6b84a

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

modules/core/04-channel/v2/keeper/msg_server.go

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,6 @@ func (k *Keeper) RegisterCounterparty(goCtx context.Context, msg *types.MsgRegis
6464
// SendPacket implements the PacketMsgServer SendPacket method.
6565
func (k *Keeper) SendPacket(ctx context.Context, msg *types.MsgSendPacket) (*types.MsgSendPacketResponse, error) {
6666
sdkCtx := sdk.UnwrapSDKContext(ctx)
67-
sequence, destChannel, err := k.sendPacket(ctx, msg.SourceChannel, msg.TimeoutTimestamp, msg.Payloads)
68-
if err != nil {
69-
sdkCtx.Logger().Error("send packet failed", "source-channel", msg.SourceChannel, "error", errorsmod.Wrap(err, "send packet failed"))
70-
return nil, errorsmod.Wrapf(err, "send packet failed for source id: %s", msg.SourceChannel)
71-
}
7267

7368
// Note, the validate basic function in sendPacket does the timeoutTimestamp != 0 check and other stateless checks on the packet.
7469
// timeoutTimestamp must be greater than current block time
@@ -88,6 +83,12 @@ func (k *Keeper) SendPacket(ctx context.Context, msg *types.MsgSendPacket) (*typ
8883
return nil, errorsmod.Wrap(err, "invalid address for msg Signer")
8984
}
9085

86+
sequence, destChannel, err := k.sendPacket(ctx, msg.SourceChannel, msg.TimeoutTimestamp, msg.Payloads)
87+
if err != nil {
88+
sdkCtx.Logger().Error("send packet failed", "source-channel", msg.SourceChannel, "error", errorsmod.Wrap(err, "send packet failed"))
89+
return nil, errorsmod.Wrapf(err, "send packet failed for source id: %s", msg.SourceChannel)
90+
}
91+
9192
for _, pd := range msg.Payloads {
9293
cbs := k.Router.Route(pd.SourcePort)
9394
err := cbs.OnSendPacket(ctx, msg.SourceChannel, destChannel, sequence, pd, signer)

0 commit comments

Comments
 (0)