Skip to content

IBC-5: delete packet commitment in timeoutOnClose() #307

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 24, 2024
+17 −0
Merged

IBC-5: delete packet commitment in timeoutOnClose() #307

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
IBC-5: delete packet commitment in timeoutOnClose() 
Signed-off-by: Jun Kimura <[email protected]>
  • Loading branch information
@bluele
bluele committed Nov 24, 2024
commit 2b908894e790716c5c65aff3de151d63b17dae14
5 changes: 5 additions & 0 deletions contracts/core/04-channel/IBCChannelPacketTimeout.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,6 +266,11 @@ contract IBCChannelPacketTimeout is IBCModuleManager, IIBCChannelPacketTimeout,
} else {
revert IBCChannelUnknownChannelOrder(channel.ordering);
}

delete getCommitments()[IBCCommitment.packetCommitmentKeyCalldata(
msg_.packet.sourcePort, msg_.packet.sourceChannel, msg_.packet.sequence
)];

lookupModuleByChannel(msg_.packet.sourcePort, msg_.packet.sourceChannel).onTimeoutPacket(
msg_.packet, _msgSender()
);
Expand Down
12 changes: 12 additions & 0 deletions tests/foundry/src/ICS04Packet.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -450,6 +450,10 @@ contract TestICS04Packet is
ensureChannelCommitment(handler, channelInfo, c);
}
assertEq(handler.getPacketCommitment(channelInfo.portId, channelInfo.channelId, p0.sequence), bytes32(0));
// same packet timeout must be failed
IIBCChannelPacketTimeout.MsgTimeoutPacket memory msg2_ = msgTimeoutPacket(channelInfo.ordering, p0, H(getBlockNumber()));
vm.expectRevert();
handler.timeoutPacket(msg2_);
}
}

Expand Down Expand Up @@ -506,6 +510,10 @@ contract TestICS04Packet is
ensureChannelCommitment(handler, channelInfo, c);
}
assertEq(handler.getPacketCommitment(channelInfo.portId, channelInfo.channelId, p0.sequence), bytes32(0));
// same packet timeout must be failed
IIBCChannelPacketTimeout.MsgTimeoutPacket memory msg2_ = msgTimeoutPacket(channelInfo.ordering, p0, H(getBlockNumber()));
vm.expectRevert();
handler.timeoutPacket(msg2_);
}
}

Expand Down Expand Up @@ -534,6 +542,10 @@ contract TestICS04Packet is
}
counterpartyHandler.channelCloseInit(msgChannelCloseInit(counterpartyChannelInfo));
handler.timeoutOnClose(msgTimeoutOnClose(counterpartyHandler, orders[i], p0, H(1)));
// same packet timeout must be failed
IIBCChannelPacketTimeout.MsgTimeoutOnClose memory msg_ = msgTimeoutOnClose(counterpartyHandler, orders[i], p0, H(1));
vm.expectRevert();
handler.timeoutOnClose(msg_);
}
}

Expand Down