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

chore: backport gas limit fix #371

Merged
merged 2 commits into from
Sep 30, 2024
Merged

chore: backport gas limit fix #371

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
65fb21c
backport gas limit fix
skosito Sep 30, 2024
a710937
generate
skosito Sep 30, 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
2 changes: 2 additions & 0 deletions v2/contracts/zevm/GatewayZEVM.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,7 @@ contract GatewayZEVM is
{
if (receiver.length == 0) revert ZeroAddress();
if (amount == 0) revert InsufficientZRC20Amount();
if (gasLimit == 0) revert InsufficientGasLimit();

uint256 gasFee = _withdrawZRC20WithGasLimit(amount, zrc20, gasLimit);
emit Withdrawn(
Expand Down Expand Up @@ -257,6 +258,7 @@ contract GatewayZEVM is
{
if (receiver.length == 0) revert ZeroAddress();
if (message.length == 0) revert EmptyMessage();
if (gasLimit == 0) revert InsufficientGasLimit();

(address gasZRC20, uint256 gasFee) = IZRC20(zrc20).withdrawGasFeeWithGasLimit(gasLimit);
if (!IZRC20(gasZRC20).transferFrom(msg.sender, FUNGIBLE_MODULE_ADDRESS, gasFee)) {
Expand Down
3 changes: 3 additions & 0 deletions v2/contracts/zevm/interfaces/IGatewayZEVM.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,9 @@ interface IGatewayZEVMErrors {

/// @notice Error indicating call method received empty message as argument.
error EmptyMessage();

/// @notice Error indicating an insufficient gas limit.
error InsufficientGasLimit();
}

/// @title IGatewayZEVM
Expand Down
4 changes: 2 additions & 2 deletions v2/pkg/gatewayevmzevm.t.sol/gatewayevmzevmtest.go
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions v2/pkg/gatewayzevm.sol/gatewayzevm.go
View file
Open in desktop

Large diffs are not rendered by default.

46 changes: 44 additions & 2 deletions v2/pkg/gatewayzevm.t.sol/gatewayzevminboundtest.go
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions v2/pkg/gatewayzevm.t.sol/gatewayzevmoutboundtest.go
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion v2/pkg/igatewayzevm.sol/igatewayzevm.go
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion v2/pkg/igatewayzevm.sol/igatewayzevmerrors.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion v2/pkg/senderzevm.sol/senderzevm.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading