Skip to content

fix(evm): L02 _destinationSettler Can Return Zero Address #834

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 4 commits into from
Feb 5, 2025
Merged

fix(evm): L02 _destinationSettler Can Return Zero Address #834

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b75b898
fix: L02 _destinationSettler Can Return Zero Address
mrice32 Jan 6, 2025
9be1c99
updated implementation to be in internal function
chrismaree Jan 8, 2025
69b4265
Merge branch 'svm-dev' into mrice32/l02
chrismaree Jan 9, 2025
9749a7b
Merge branch 'svm-dev' into mrice32/l02
nicholaspai Feb 5, 2025
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
9 changes: 9 additions & 0 deletions contracts/erc7683/ERC7683OrderDepositor.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ abstract contract ERC7683OrderDepositor is IOriginSettler {
error WrongChainId();
error WrongOrderDataType();
error WrongExclusiveRelayer();
error NoDestinationSettlerForChain(uint256 chainId);

// Permit2 contract for this network.
IPermit2 public immutable PERMIT2;
Expand Down Expand Up @@ -191,6 +192,10 @@ abstract contract ERC7683OrderDepositor is IOriginSettler {
revert WrongExclusiveRelayer();
}

if (_destinationSettler(acrossOrderData.destinationChainId) == address(0)) {
revert NoDestinationSettlerForChain(acrossOrderData.destinationChainId);
}

Output[] memory maxSpent = new Output[](1);
maxSpent[0] = Output({
token: _toBytes32(acrossOrderData.outputToken),
Expand Down Expand Up @@ -255,6 +260,10 @@ abstract contract ERC7683OrderDepositor is IOriginSettler {
// Extract Across-specific params.
acrossOrderData = abi.decode(order.orderData, (AcrossOrderData));

if (_destinationSettler(acrossOrderData.destinationChainId) == address(0)) {
revert NoDestinationSettlerForChain(acrossOrderData.destinationChainId);
}

Output[] memory maxSpent = new Output[](1);
maxSpent[0] = Output({
token: _toBytes32(acrossOrderData.outputToken),
Expand Down
Loading