From 1dc01419e463179fbfc6f600a2ec9e909a7fb0ea Mon Sep 17 00:00:00 2001 From: Hadrien Croubois Date: Fri, 12 Mar 2021 09:43:55 +0100 Subject: [PATCH] update interface folder for new 4.0 branch --- contracts/interfaces/ERC1155.sol | 2 +- contracts/interfaces/ERC1363.sol | 2 +- contracts/interfaces/ERC165.sol | 2 +- contracts/interfaces/ERC173.sol | 2 +- contracts/interfaces/ERC1820.sol | 4 ++-- contracts/interfaces/ERC20.sol | 1 + contracts/interfaces/ERC2612.sol | 2 +- contracts/interfaces/ERC721.sol | 4 ++-- 8 files changed, 10 insertions(+), 9 deletions(-) diff --git a/contracts/interfaces/ERC1155.sol b/contracts/interfaces/ERC1155.sol index 77c8c70ff10..a6c38077651 100644 --- a/contracts/interfaces/ERC1155.sol +++ b/contracts/interfaces/ERC1155.sol @@ -3,5 +3,5 @@ pragma solidity ^0.8.0; import "../token/ERC1155/IERC1155.sol"; -import "../token/ERC1155/IERC1155MetadataURI.sol"; import "../token/ERC1155/IERC1155Receiver.sol"; +import "../token/ERC1155/extensions/IERC1155MetadataURI.sol"; diff --git a/contracts/interfaces/ERC1363.sol b/contracts/interfaces/ERC1363.sol index 471d2bb69fb..8350faf6e9d 100644 --- a/contracts/interfaces/ERC1363.sol +++ b/contracts/interfaces/ERC1363.sol @@ -3,7 +3,7 @@ pragma solidity ^0.8.0; import "../token/ERC20/IERC20.sol"; -import "../introspection/IERC165.sol"; +import "../utils/introspection/IERC165.sol"; interface IERC1363 is IERC20, IERC165 { /* diff --git a/contracts/interfaces/ERC165.sol b/contracts/interfaces/ERC165.sol index 381a93926cc..e9f6b057ad8 100644 --- a/contracts/interfaces/ERC165.sol +++ b/contracts/interfaces/ERC165.sol @@ -2,4 +2,4 @@ pragma solidity ^0.8.0; -import "../introspection/IERC165.sol"; +import "../utils/introspection/IERC165.sol"; diff --git a/contracts/interfaces/ERC173.sol b/contracts/interfaces/ERC173.sol index ea32a1cce04..b982b900810 100644 --- a/contracts/interfaces/ERC173.sol +++ b/contracts/interfaces/ERC173.sol @@ -2,7 +2,7 @@ pragma solidity ^0.8.0; -import "../introspection/IERC165.sol"; +import "../utils/introspection/IERC165.sol"; interface IERC173 is IERC165 { /// @dev This emits when ownership of a contract changes. diff --git a/contracts/interfaces/ERC1820.sol b/contracts/interfaces/ERC1820.sol index 2b4fd352003..0be9158b68e 100644 --- a/contracts/interfaces/ERC1820.sol +++ b/contracts/interfaces/ERC1820.sol @@ -2,5 +2,5 @@ pragma solidity ^0.8.0; -import "../introspection/IERC1820Implementer.sol"; -import "../introspection/IERC1820Registry.sol"; +import "../utils/introspection/IERC1820Implementer.sol"; +import "../utils/introspection/IERC1820Registry.sol"; diff --git a/contracts/interfaces/ERC20.sol b/contracts/interfaces/ERC20.sol index 0072add5e29..43e195ce8a4 100644 --- a/contracts/interfaces/ERC20.sol +++ b/contracts/interfaces/ERC20.sol @@ -3,3 +3,4 @@ pragma solidity ^0.8.0; import "../token/ERC20/IERC20.sol"; +import "../token/ERC20/extensions/IERC20Metadata.sol"; diff --git a/contracts/interfaces/ERC2612.sol b/contracts/interfaces/ERC2612.sol index 1bedd6165f1..83a80ac93ff 100644 --- a/contracts/interfaces/ERC2612.sol +++ b/contracts/interfaces/ERC2612.sol @@ -2,6 +2,6 @@ pragma solidity ^0.8.0; -import "../drafts/IERC20Permit.sol"; +import "../token/ERC20/extensions/draft-IERC20Permit.sol"; interface IERC2612 is IERC20Permit {} diff --git a/contracts/interfaces/ERC721.sol b/contracts/interfaces/ERC721.sol index ea42ced18e6..445f70c6b74 100644 --- a/contracts/interfaces/ERC721.sol +++ b/contracts/interfaces/ERC721.sol @@ -3,6 +3,6 @@ pragma solidity ^0.8.0; import "../token/ERC721/IERC721.sol"; -import "../token/ERC721/IERC721Enumerable.sol"; -import "../token/ERC721/IERC721Metadata.sol"; import "../token/ERC721/IERC721Receiver.sol"; +import "../token/ERC721/extensions/IERC721Enumerable.sol"; +import "../token/ERC721/extensions/IERC721Metadata.sol";