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): fix LibAddress.supportsInterface to handle undecodeable return data #18286

Merged
merged 3 commits into from
Oct 24, 2024
Merged

fix(protocol): fix LibAddress.supportsInterface to handle undecodeable return data #18286

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f2835dd
Update LibAddress.sol
dantaik Oct 24, 2024
7fb4b2a
Update LibAddress.sol
dantaik Oct 24, 2024
38077c7
Update LibAddress.sol
dantaik Oct 24, 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
12 changes: 5 additions & 7 deletions packages/protocol/contracts/shared/common/LibAddress.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.24;

import "@openzeppelin/contracts/utils/Address.sol";
import "@openzeppelin/contracts/utils/introspection/IERC165.sol";
import "@openzeppelin/contracts/interfaces/IERC1271.sol";

/// @title LibAddress
/// @dev Provides utilities for address-related operations.
Expand Down Expand Up @@ -74,10 +72,10 @@ library LibAddress {
view
returns (bool result_)
{
if (!Address.isContract(_addr)) return false;

try IERC165(_addr).supportsInterface(_interfaceId) returns (bool _result) {
result_ = _result;
} catch { }
(bool success, bytes memory data) =
_addr.staticcall(abi.encodeCall(IERC165.supportsInterface, (_interfaceId)));
if (success && data.length == 32) {
result_ = abi.decode(data, (bool));
}
}
}