Skip to content

refactor: use named imports, properly implement interfaces, and fix ERC-165 compliance #37

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
Mannan-Goyal merged 1 commit into from
May 7, 2025
Merged

refactor: use named imports, properly implement interfaces, and fix ERC-165 compliance #37

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 12 additions & 4 deletions src/Pectra.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.28;

import "@openzeppelin/contracts/utils/introspection/IERC165.sol";
import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
import {IERC721Receiver} from "@openzeppelin/contracts/token/ERC721/IERC721Receiver.sol";
import {IERC1155Receiver} from "@openzeppelin/contracts/token/ERC1155/IERC1155Receiver.sol";

contract Pectra is IERC165 {
contract Pectra is IERC165, IERC721Receiver, IERC1155Receiver {
address public constant consolidationTarget = 0x0000BBdDc7CE488642fb579F8B00f3a590007251;
address public constant exitTarget = 0x00000961Ef480Eb55e80D19ad83579A64c007002;

Expand Down Expand Up @@ -66,17 +68,23 @@ contract Pectra is IERC165 {
|| interfaceId == _INTERFACE_ID_ERC1155_RECEIVER;
}

function onERC721Received(address, address, uint256, bytes calldata) external pure returns (bytes4) {
function onERC721Received(address, address, uint256, bytes calldata) external pure override returns (bytes4) {
return this.onERC721Received.selector;
}

function onERC1155Received(address, address, uint256, uint256, bytes calldata) external pure returns (bytes4) {
function onERC1155Received(address, address, uint256, uint256, bytes calldata)
external
pure
override
returns (bytes4)
{
return this.onERC1155Received.selector;
}

function onERC1155BatchReceived(address, address, uint256[] calldata, uint256[] calldata, bytes calldata)
external
pure
override
returns (bytes4)
{
return this.onERC1155BatchReceived.selector;
Expand Down