From 3d0edbecf1ce98d0f0960094c9ec7ee2b3947cc2 Mon Sep 17 00:00:00 2001
From: Francisco <fg@frang.io>
Date: Tue, 11 Jul 2023 14:49:58 -0300
Subject: [PATCH] Remove ERC1155Receiver in favor of ERC1155Holder (#4450)

---
 .changeset/afraid-walls-smell.md              |  5 +++++
 contracts/governance/TimelockController.sol   |  3 +--
 contracts/token/ERC1155/README.adoc           |  2 --
 .../token/ERC1155/utils/ERC1155Holder.sol     | 14 ++++++++++---
 .../token/ERC1155/utils/ERC1155Receiver.sol   | 21 -------------------
 5 files changed, 17 insertions(+), 28 deletions(-)
 create mode 100644 .changeset/afraid-walls-smell.md
 delete mode 100644 contracts/token/ERC1155/utils/ERC1155Receiver.sol

diff --git a/.changeset/afraid-walls-smell.md b/.changeset/afraid-walls-smell.md
new file mode 100644
index 000000000..682fdde5e
--- /dev/null
+++ b/.changeset/afraid-walls-smell.md
@@ -0,0 +1,5 @@
+---
+'openzeppelin-solidity': major
+---
+
+`ERC1155Receiver`: Removed in favor of `ERC1155Holder`.
diff --git a/contracts/governance/TimelockController.sol b/contracts/governance/TimelockController.sol
index 2cf954d12..be86f7b88 100644
--- a/contracts/governance/TimelockController.sol
+++ b/contracts/governance/TimelockController.sol
@@ -6,7 +6,6 @@ pragma solidity ^0.8.19;
 import {AccessControl} from "../access/AccessControl.sol";
 import {ERC721Holder} from "../token/ERC721/utils/ERC721Holder.sol";
 import {ERC1155Holder} from "../token/ERC1155/utils/ERC1155Holder.sol";
-import {ERC1155Receiver} from "../token/ERC1155/utils/ERC1155Receiver.sol";
 import {Address} from "../utils/Address.sol";
 
 /**
@@ -160,7 +159,7 @@ contract TimelockController is AccessControl, ERC721Holder, ERC1155Holder {
      */
     function supportsInterface(
         bytes4 interfaceId
-    ) public view virtual override(AccessControl, ERC1155Receiver) returns (bool) {
+    ) public view virtual override(AccessControl, ERC1155Holder) returns (bool) {
         return super.supportsInterface(interfaceId);
     }
 
diff --git a/contracts/token/ERC1155/README.adoc b/contracts/token/ERC1155/README.adoc
index 48c7faa0a..1a56358ef 100644
--- a/contracts/token/ERC1155/README.adoc
+++ b/contracts/token/ERC1155/README.adoc
@@ -26,8 +26,6 @@ NOTE: This core set of contracts is designed to be unopinionated, allowing devel
 
 {{IERC1155Receiver}}
 
-{{ERC1155Receiver}}
-
 == Extensions
 
 {{ERC1155Pausable}}
diff --git a/contracts/token/ERC1155/utils/ERC1155Holder.sol b/contracts/token/ERC1155/utils/ERC1155Holder.sol
index e288f8692..908ad82c5 100644
--- a/contracts/token/ERC1155/utils/ERC1155Holder.sol
+++ b/contracts/token/ERC1155/utils/ERC1155Holder.sol
@@ -3,15 +3,23 @@
 
 pragma solidity ^0.8.19;
 
-import {ERC1155Receiver} from "./ERC1155Receiver.sol";
+import {IERC165, ERC165} from "../../../utils/introspection/ERC165.sol";
+import {IERC1155Receiver} from "../IERC1155Receiver.sol";
 
 /**
- * @dev Simple implementation of `ERC1155Receiver` that will allow a contract to hold ERC1155 tokens.
+ * @dev Simple implementation of `IERC1155Receiver` that will allow a contract to hold ERC1155 tokens.
  *
  * IMPORTANT: When inheriting this contract, you must include a way to use the received tokens, otherwise they will be
  * stuck.
  */
-abstract contract ERC1155Holder is ERC1155Receiver {
+abstract contract ERC1155Holder is ERC165, IERC1155Receiver {
+    /**
+     * @dev See {IERC165-supportsInterface}.
+     */
+    function supportsInterface(bytes4 interfaceId) public view virtual override(ERC165, IERC165) returns (bool) {
+        return interfaceId == type(IERC1155Receiver).interfaceId || super.supportsInterface(interfaceId);
+    }
+
     function onERC1155Received(
         address,
         address,
diff --git a/contracts/token/ERC1155/utils/ERC1155Receiver.sol b/contracts/token/ERC1155/utils/ERC1155Receiver.sol
deleted file mode 100644
index 02f922cf8..000000000
--- a/contracts/token/ERC1155/utils/ERC1155Receiver.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-// SPDX-License-Identifier: MIT
-// OpenZeppelin Contracts v4.4.1 (token/ERC1155/utils/ERC1155Receiver.sol)
-
-pragma solidity ^0.8.19;
-
-import {IERC1155Receiver} from "../IERC1155Receiver.sol";
-import {IERC165, ERC165} from "../../../utils/introspection/ERC165.sol";
-
-/**
- * @dev Basic contract implementing the ERC-165 interface for {IERC1155Receiver}.
- *
- * NOTE: This contract does not suffice to receive tokens. See {ERC1155Holder}.
- */
-abstract contract ERC1155Receiver is ERC165, IERC1155Receiver {
-    /**
-     * @dev See {IERC165-supportsInterface}.
-     */
-    function supportsInterface(bytes4 interfaceId) public view virtual override(ERC165, IERC165) returns (bool) {
-        return interfaceId == type(IERC1155Receiver).interfaceId || super.supportsInterface(interfaceId);
-    }
-}