NFTManager

Author: Oren Sokolowsky

contracts/misc/NFTManager.sol

@@ -1,15 +1,16 @@
-pragma solidity ^0.5.17;
+pragma solidity ^0.6.10;
 
-import "@openzeppelin/upgrades/contracts/Initializable.sol";
 import "@openzeppelin/contracts-ethereum-package/contracts/token/ERC721/IERC721.sol";
 import "@openzeppelin/contracts-ethereum-package/contracts/token/ERC721/IERC721Receiver.sol";
-import "@openzeppelin/contracts-ethereum-package/contracts/ownership/Ownable.sol";
+import "@openzeppelin/contracts-ethereum-package/contracts/access/Ownable.sol";
 
-contract NFTManager is Initializable, Ownable, IERC721Receiver {
+
+contract NFTManager is Initializable, OwnableUpgradeSafe, IERC721Receiver {
     event SendNFT(address indexed recipient, IERC721 indexed nftContract, uint256 tokenId);
 
-    function initialize() public initializer {
-        Ownable.initialize(msg.sender);
+    function initialize(address _owner) external initializer {
+        __Ownable_init_unchained();
+        transferOwnership(_owner);
     }
 
     /// @notice Safe Transfer specified NFT to a given recipient, with arbitrary extra data
@@ -34,7 +35,8 @@ contract NFTManager is Initializable, Ownable, IERC721Receiver {
     /**
      * @notice Handle the receipt of an NFT
      * @dev The ERC721 smart contract calls this function on the recipient
-     * @dev The NFTManager uses this to notify other contracts that it accepts NFTs, and does not have any extra functionality on this hook.
+     * @dev The NFTManager uses this to notify other contracts that it accepts NFTs,
+     * and does not have any extra functionality on this hook.
      * after a {IERC721-safeTransferFrom}. This function MUST return the function selector,
      * otherwise the caller will revert the transaction. The selector to be
      * returned can be obtained as `this.onERC721Received.selector`. This
@@ -43,8 +45,8 @@ contract NFTManager is Initializable, Ownable, IERC721Receiver {
      * @return bytes4 `bytes4(keccak256("onERC721Received(address,address,uint256,bytes)"))`
      */
     function onERC721Received(address, address, uint256, bytes memory)
-    public returns (bytes4)
+    public override returns (bytes4)
     {
         return bytes4(keccak256("onERC721Received(address,address,uint256,bytes)"));
     }
-}
+}

contracts/test/ERC721Mock.sol

@@ -1,11 +1,20 @@
-pragma solidity  ^0.5.17;
+pragma solidity  ^0.6.10;
 
-import "@openzeppelin/upgrades/contracts/Initializable.sol";
-import "@openzeppelin/contracts-ethereum-package/contracts/token/ERC721/ERC721Mintable.sol";
+import "@openzeppelin/contracts-ethereum-package/contracts/access/Ownable.sol";
+import "@openzeppelin/contracts-ethereum-package/contracts/token/ERC721/ERC721.sol";
 
-contract ERC721Mock is Initializable, ERC721Mintable {
-    function __ERC721Mock_initialize() public initializer {
-        ERC721.initialize();
-        ERC721Mintable.initialize(msg.sender);
+
+
+contract ERC721Mock is Initializable, ERC721UpgradeSafe, OwnableUpgradeSafe {
+
+    function initialize(address _owner) public initializer {
+        __ERC721_init_unchained("ERC721Mock", "721");
+        __Ownable_init_unchained();
+        transferOwnership(_owner);
+    }
+
+    function mint(address _to, uint256 _tokenId) public onlyOwner returns (bool) {
+        _mint(_to, _tokenId);
+        return true;
     }
-}
+}

contracts/test/IERC721NonReceiverMock.sol

@@ -1,11 +1,11 @@
-pragma solidity  ^0.5.17;
+pragma solidity  ^0.6.10;
 
 import "@openzeppelin/contracts-ethereum-package/contracts/token/ERC721/IERC721Receiver.sol";
 
 contract IERC721NonReceiverMock is IERC721Receiver {
     function onERC721Received(address, address, uint256, bytes memory)
-    public returns (bytes4)
+    public override returns (bytes4)
     {
         return bytes4(keccak256("Don't Receive ERC721"));
     }
-}
+}

contracts/test/IERC721ReceiverMock.sol

@@ -1,11 +1,11 @@
-pragma solidity  ^0.5.17;
+pragma solidity  ^0.6.10;
 
 import "@openzeppelin/contracts-ethereum-package/contracts/token/ERC721/IERC721Receiver.sol";
 
 contract IERC721ReceiverMock is IERC721Receiver {
     function onERC721Received(address, address, uint256, bytes memory)
-    public returns (bytes4)
+    public override returns (bytes4)
     {
         return bytes4(keccak256("onERC721Received(address,address,uint256,bytes)"));
     }
-}
+}

test/nftmanager.js

@@ -184,10 +184,10 @@ const assertEventParams = (event, params, expectedParams) => {
 
 const setupNFT = async (owner, nftMinter, nftSender) => {
   const nftMock = await ERC721Mock.new({ from: nftMinter });
-  await nftMock.__ERC721Mock_initialize({ from: nftMinter });
+  await nftMock.initialize(nftMinter ,{ from: nftMinter });
 
   const nftManager = await NFTManager.new({ from: owner });
-  await nftManager.initialize({ from: owner });
+  await nftManager.initialize(owner, { from: owner });
 
   await nftMock.mint(nftManager.address, 0, { from: nftMinter });
   await nftMock.mint(nftSender, 1, { from: nftMinter });