Skip to content

Propagate InsufficientGasLimit errors from v2_dispatch #1688

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
yrong merged 4 commits into from
Jan 26, 2026
Merged

Propagate InsufficientGasLimit errors from v2_dispatch #1688

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
703d7b3
Initial plan
Copilot Jan 26, 2026
317bcee
Implement Option A: Propagate InsufficientGasLimit from v2_dispatch
Copilot Jan 26, 2026
cb1e273
Simplify InsufficientGasLimit rethrow logic
Copilot Jan 26, 2026
c20fc68
Fix tests
yrong Jan 26, 2026
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,4 @@ lodestar
db.sqlite*
.pnpm-store
/deploy
lib/
6 changes: 5 additions & 1 deletion contracts/src/Gateway.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -567,7 +567,11 @@ contract Gateway is IGatewayBase, IGatewayV1, IGatewayV2, IInitializable, IUpgra
for (uint256 i = 0; i < message.commands.length; i++) {
CommandV2 calldata command = message.commands[i];
try this.v2_dispatchCommand(command, message.origin) {}
catch {
catch (bytes memory reason) {
// Check if the error is InsufficientGasLimit and rethrow it
if (reason.length >= 4 && bytes4(reason) == IGatewayV2.InsufficientGasLimit.selector) {
revert IGatewayV2.InsufficientGasLimit();
}
emit IGatewayV2.CommandFailed(message.nonce, i);
if (command.atomic) {
revert IGatewayV2.AtomicCommandFailed();
Expand Down
61 changes: 30 additions & 31 deletions contracts/test/GatewayV2.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,15 +428,12 @@ contract GatewayV2Test is Test {
// Limit the gas for this test to ensure we hit the NotEnoughGas error
uint256 gasLimit = 100_000;
vm.deal(relayer, 1 ether);

vm.expectEmit(true, false, false, true);
emit IGatewayV2.CommandFailed(2, 0);
vm.expectEmit(true, false, false, true);
emit IGatewayV2.InboundMessageDispatched(2, topic, false, relayerRewardAddress);

vm.prank(relayer);
IGatewayV2(address(gateway))
.v2_submit{gas: gasLimit}(message, proof, makeMockProof(), relayerRewardAddress);

vm.expectRevert(IGatewayV2.InsufficientGasLimit.selector);
IGatewayV2(address(gateway)).v2_submit{gas: gasLimit}(
message, proof, makeMockProof(), relayerRewardAddress
);
}

function mockNativeTokenForSend(address user, uint128 amount)
Expand Down Expand Up @@ -507,8 +504,9 @@ contract GatewayV2Test is Test {
);

hoax(user1);
IGatewayV2(payable(address(gateway)))
.v2_sendMessage{value: 1 ether}("", assets, "", 0.1 ether, 0.4 ether);
IGatewayV2(payable(address(gateway))).v2_sendMessage{value: 1 ether}(
"", assets, "", 0.1 ether, 0.4 ether
);

// Verify asset balances
assertEq(assetHubAgent.balance, 1 ether);
Expand All @@ -533,25 +531,28 @@ contract GatewayV2Test is Test {

vm.expectRevert();
hoax(user1);
IGatewayV2(payable(address(gateway)))
.v2_sendMessage{value: 1 ether}("", assets, "", 0.1 ether, 0.4 ether);
IGatewayV2(payable(address(gateway))).v2_sendMessage{value: 1 ether}(
"", assets, "", 0.1 ether, 0.4 ether
);

assertEq(feeToken.balanceOf(assetHubAgent), 0);
}

function testSendMessageFailsWithInsufficentValue() public {
vm.expectRevert(IGatewayV2.InsufficientValue.selector);
hoax(user1, 1 ether);
IGatewayV2(payable(address(gateway)))
.v2_sendMessage{value: 0.4 ether}("", new bytes[](0), "", 0.1 ether, 0.4 ether);
IGatewayV2(payable(address(gateway))).v2_sendMessage{value: 0.4 ether}(
"", new bytes[](0), "", 0.1 ether, 0.4 ether
);
}

function testSendMessageFailsWithExceededMaximumValue() public {
vm.expectRevert(IGatewayV2.ExceededMaximumValue.selector);
uint256 value = uint256(type(uint128).max) + 1;
hoax(user1, value);
IGatewayV2(payable(address(gateway)))
.v2_sendMessage{value: value}("", new bytes[](0), "", 0.1 ether, 0.4 ether);
IGatewayV2(payable(address(gateway))).v2_sendMessage{value: value}(
"", new bytes[](0), "", 0.1 ether, 0.4 ether
);
}

function testUnlockWethSuccess() public {
Expand Down Expand Up @@ -717,10 +718,9 @@ contract GatewayV2Test is Test {
uint256 totalRequired = executionFee + relayerFee;

hoax(user1, totalRequired);
IGatewayV2(payable(address(gateway)))
.v2_registerToken{
value: totalRequired
}(validTokenContract, uint8(0), executionFee, relayerFee);
IGatewayV2(payable(address(gateway))).v2_registerToken{value: totalRequired}(
validTokenContract, uint8(0), executionFee, relayerFee
);

// Verify the token is registered
assertTrue(IGatewayV2(address(gateway)).isTokenRegistered(validTokenContract));
Expand All @@ -737,10 +737,9 @@ contract GatewayV2Test is Test {

vm.expectRevert(IGatewayV2.InsufficientValue.selector);
hoax(user1, totalRequired);
IGatewayV2(payable(address(gateway)))
.v2_registerToken{
value: totalRequired - 1
}(validTokenContract, uint8(0), executionFee, relayerFee);
IGatewayV2(payable(address(gateway))).v2_registerToken{value: totalRequired - 1}(
validTokenContract, uint8(0), executionFee, relayerFee
);

// Verify token still is not registered after the failed attempt
assertFalse(IGatewayV2(address(gateway)).isTokenRegistered(validTokenContract));
Expand All @@ -757,8 +756,9 @@ contract GatewayV2Test is Test {
vm.expectRevert(IGatewayV2.ExceededMaximumValue.selector);
uint256 value = uint256(type(uint128).max) + 1;
hoax(user1, value);
IGatewayV2(payable(address(gateway)))
.v2_registerToken{value: value}(validTokenContract, uint8(0), executionFee, relayerFee);
IGatewayV2(payable(address(gateway))).v2_registerToken{value: value}(
validTokenContract, uint8(0), executionFee, relayerFee
);

// Verify token still is not registered after the failed attempt
assertFalse(IGatewayV2(address(gateway)).isTokenRegistered(validTokenContract));
Expand Down Expand Up @@ -1135,16 +1135,15 @@ contract GatewayV2Test is Test {
);
}

function testAgentCallContractRevertedForInsufficientGas() public {
function testAgentCallContractWontRevertForInsufficientGas() public {
bytes32 topic = keccak256("topic");

vm.deal(assetHubAgent, 1 ether);
hoax(relayer, 1 ether);

// InsufficientGasLimit during dispatch is caught and emits CommandFailed
// but with very low gas (1), the dispatch might fail differently
vm.expectEmit(true, false, false, true);
emit IGatewayV2.InboundMessageDispatched(1, topic, true, relayerRewardAddress);
// After Option A implementation, InsufficientGasLimit is now propagated
// and causes the entire v2_submit to revert
vm.expectRevert(IGatewayV2.InsufficientGasLimit.selector);

IGatewayV2(address(gateway))
.v2_submit(
Expand Down
Loading