update interface folder for new 4.0 branch

OpenZeppelin · Mar 12, 2021 · 1dc0141 · 1dc0141
1 parent 3c470e5
commit 1dc0141
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 9 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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";