From babc9b03aaa4140b9dde3e023d8b7e0d128b83a2 Mon Sep 17 00:00:00 2001 From: Eric Zhong Date: Thu, 7 Dec 2023 14:11:12 -0500 Subject: [PATCH] Revert "Add IERC69009, does not compile" This reverts commit 4e894083eb57366bfc2385d5dce4f27da4512f66. --- src/interfaces/IPoolManager.sol | 3 +- src/interfaces/external/IERC165.sol | 10 ----- src/interfaces/external/IERC6909Minimal.sol | 49 --------------------- 3 files changed, 1 insertion(+), 61 deletions(-) delete mode 100644 src/interfaces/external/IERC165.sol delete mode 100644 src/interfaces/external/IERC6909Minimal.sol diff --git a/src/interfaces/IPoolManager.sol b/src/interfaces/IPoolManager.sol index aaf5110da..156fe7c9d 100644 --- a/src/interfaces/IPoolManager.sol +++ b/src/interfaces/IPoolManager.sol @@ -5,13 +5,12 @@ import {Currency} from "../types/Currency.sol"; import {PoolKey} from "../types/PoolKey.sol"; import {Pool} from "../libraries/Pool.sol"; import {IHooks} from "./IHooks.sol"; -import {IERC6909Minimal} from "../interfaces/external/IERC6909Minimal.sol"; import {IFees} from "./IFees.sol"; import {BalanceDelta} from "../types/BalanceDelta.sol"; import {PoolId} from "../types/PoolId.sol"; import {Position} from "../libraries/Position.sol"; -interface IPoolManager is IFees, IERC6909Minimal { +interface IPoolManager is IFees { /// @notice Thrown when currencies touched has exceeded max of 256 error MaxCurrenciesTouched(); diff --git a/src/interfaces/external/IERC165.sol b/src/interfaces/external/IERC165.sol deleted file mode 100644 index 8bda84943..000000000 --- a/src/interfaces/external/IERC165.sol +++ /dev/null @@ -1,10 +0,0 @@ -// SPDX-License-Identifier: MIT -pragma solidity ^0.8.19; - -interface IERC165 { - /// @notice Checks if a contract implements an interface. - /// @param interfaceId The interface identifier, as specified in ERC-165. - /// @return supported True if the contract implements `interfaceId` and - /// `interfaceId` is not 0xffffffff, false otherwise. - function supportsInterface(bytes4 interfaceId) external view returns (bool supported); -} \ No newline at end of file diff --git a/src/interfaces/external/IERC6909Minimal.sol b/src/interfaces/external/IERC6909Minimal.sol deleted file mode 100644 index 176f2ffd0..000000000 --- a/src/interfaces/external/IERC6909Minimal.sol +++ /dev/null @@ -1,49 +0,0 @@ -// SPDX-License-Identifier: MIT -pragma solidity ^0.8.19; - -import "./IERC165.sol"; - -interface IERC6909Minimal is IERC165 { - /// @notice Owner balance of an id. - /// @param owner The address of the owner. - /// @param id The id of the token. - /// @return amount The balance of the token. - function balanceOf(address owner, uint256 id) external view returns (uint256 amount); - - /// @notice Spender allowance of an id. - /// @param owner The address of the owner. - /// @param spender The address of the spender. - /// @param id The id of the token. - /// @return amount The allowance of the token. - function allowance(address owner, address spender, uint256 id) external view returns (uint256 amount); - - /// @notice Checks if a spender is approved by an owner as an operator - /// @param owner The address of the owner. - /// @param spender The address of the spender. - /// @return approved The approval status. - function isOperator(address owner, address spender) external view returns (bool approved); - - /// @notice Transfers an amount of an id from the caller to a receiver. - /// @param receiver The address of the receiver. - /// @param id The id of the token. - /// @param amount The amount of the token. - function transfer(address receiver, uint256 id, uint256 amount) external returns (bool); - - /// @notice Transfers an amount of an id from a sender to a receiver. - /// @param sender The address of the sender. - /// @param receiver The address of the receiver. - /// @param id The id of the token. - /// @param amount The amount of the token. - function transferFrom(address sender, address receiver, uint256 id, uint256 amount) external returns (bool); - - /// @notice Approves an amount of an id to a spender. - /// @param spender The address of the spender. - /// @param id The id of the token. - /// @param amount The amount of the token. - function approve(address spender, uint256 id, uint256 amount) external returns (bool); - - /// @notice Sets or removes a spender as an operator for the caller. - /// @param spender The address of the spender. - /// @param approved The approval status. - function setOperator(address spender, bool approved) external returns (bool); -} \ No newline at end of file