Skip to content
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

fix(protocol): check invocation gas limit also in retryMessage #16660

Merged
merged 9 commits into from
Apr 5, 2024
Merged

fix(protocol): check invocation gas limit also in retryMessage #16660

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
0cc3cf3
Add check not to supply less gas than initially specified to be required
Apr 5, 2024
7564c6c
move check lower and add comment
Apr 5, 2024
b58f76a
add destOwner gas limit check
Apr 5, 2024
d8e6be5
Update packages/protocol/contracts/bridge/Bridge.sol
dantaik Apr 5, 2024
b87cef9
simplify check
Apr 5, 2024
8f8af77
typo
Apr 5, 2024
25f4444
Merge branch 'fix_gasLeft_supplied' of https://github.com/taikoxyz/ta…
dantaik Apr 5, 2024
7e00308
Update Bridge.sol
dantaik Apr 5, 2024
56b5529
Update Bridge.sol
dantaik Apr 5, 2024
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
10 changes: 10 additions & 0 deletions packages/protocol/contracts/bridge/Bridge.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,6 +352,16 @@ contract Bridge is EssentialContract, IBridge {
revert B_NON_RETRIABLE();
}

// We check gasleft() against _message.gasLimit to make sure we not only need to bridge
// invocation call to succeed, we also need it to succeed with a gas limit no smaller than
// the message's gasLimit.
if (
_message.gasLimit != 0 && msg.sender != _message.destOwner
&& _message.gasLimit > (gasleft() * 63) >> 6
) {
revert B_NOT_ENOUGH_GASLEFT();
}

// Attempt to invoke the messageCall.
if (_invokeMessageCall(_message, msgHash, gasleft())) {
_updateMessageStatus(msgHash, Status.DONE);
Expand Down
Loading