Merge branch 'master' into feat/UniswapV3Oracle

contracts/contracts-registry/pools/proxy/ProxyBeacon.sol

@@ -35,7 +35,7 @@ contract ProxyBeacon is IBeacon {
         emit Upgraded(newImplementation_);
     }
 
-    function implementation() external view override returns (address) {
+    function implementation() public view override returns (address) {
         return _implementation;
     }
 }

contracts/diamond/tokens/ERC721/DiamondERC721.sol

@@ -0,0 +1,361 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.4;
+
+import {IERC721} from "@openzeppelin/contracts/token/ERC721/IERC721.sol";
+import {IERC721Receiver} from "@openzeppelin/contracts/token/ERC721/IERC721Receiver.sol";
+import {Address} from "@openzeppelin/contracts/utils/Address.sol";
+
+import {DiamondERC721Storage} from "./DiamondERC721Storage.sol";
+
+/**
+ * @notice This is modified version of OpenZeppelin's ERC721 contract to be used as a Storage contract
+ * by the Diamond Standard.
+ */
+contract DiamondERC721 is DiamondERC721Storage {
+    using Address for address;
+
+    /**
+     * @notice Sets the values for {name} and {symbol}.
+     */
+    function __DiamondERC721_init(
+        string memory name_,
+        string memory symbol_
+    ) internal onlyInitializing(DIAMOND_ERC721_STORAGE_SLOT) {
+        DERC721Storage storage _erc721Storage = _getErc721Storage();
+
+        _erc721Storage.name = name_;
+        _erc721Storage.symbol = symbol_;
+    }
+
+    /**
+     * @inheritdoc IERC721
+     */
+    function approve(address to_, uint256 tokenId_) public virtual override {
+        address owner_ = ownerOf(tokenId_);
+        require(to_ != owner_, "ERC721: approval to current owner");
+
+        require(
+            msg.sender == owner_ || isApprovedForAll(owner_, msg.sender),
+            "ERC721: approve caller is not token owner or approved for all"
+        );
+
+        _approve(to_, tokenId_);
+    }
+
+    /**
+     * @inheritdoc IERC721
+     */
+    function setApprovalForAll(address operator_, bool approved_) public virtual override {
+        _setApprovalForAll(msg.sender, operator_, approved_);
+    }
+
+    /**
+     * @inheritdoc IERC721
+     */
+    function transferFrom(address from_, address to_, uint256 tokenId_) public virtual override {
+        require(
+            _isApprovedOrOwner(msg.sender, tokenId_),
+            "ERC721: caller is not token owner or approved"
+        );
+
+        _transfer(from_, to_, tokenId_);
+    }
+
+    /**
+     * @inheritdoc IERC721
+     */
+    function safeTransferFrom(
+        address from_,
+        address to_,
+        uint256 tokenId_
+    ) public virtual override {
+        safeTransferFrom(from_, to_, tokenId_, "");
+    }
+
+    /**
+     * @inheritdoc IERC721
+     */
+    function safeTransferFrom(
+        address from_,
+        address to_,
+        uint256 tokenId_,
+        bytes memory data_
+    ) public virtual override {
+        require(
+            _isApprovedOrOwner(msg.sender, tokenId_),
+            "ERC721: caller is not token owner or approved"
+        );
+
+        _safeTransfer(from_, to_, tokenId_, data_);
+    }
+
+    /**
+     * @notice Safely transfers `tokenId` token from `from` to `to`, checking first that contract recipients
+     * are aware of the ERC721 protocol to prevent tokens from being forever locked.
+     */
+    function _safeTransfer(
+        address from_,
+        address to_,
+        uint256 tokenId_,
+        bytes memory data_
+    ) internal virtual {
+        _transfer(from_, to_, tokenId_);
+
+        require(
+            _checkOnERC721Received(from_, to_, tokenId_, data_),
+            "ERC721: transfer to non ERC721Receiver implementer"
+        );
+    }
+
+    /**
+     * @notice Safely mints `tokenId` and transfers it to `to`.
+     */
+    function _safeMint(address to_, uint256 tokenId_) internal virtual {
+        _safeMint(to_, tokenId_, "");
+    }
+
+    /**
+     * @notice Same as _safeMint, with an additional `data` parameter.
+     */
+    function _safeMint(address to_, uint256 tokenId_, bytes memory data_) internal virtual {
+        _mint(to_, tokenId_);
+
+        require(
+            _checkOnERC721Received(address(0), to_, tokenId_, data_),
+            "ERC721: transfer to non ERC721Receiver implementer"
+        );
+    }
+
+    /**
+     * @notice Mints `tokenId` and transfers it to `to`.
+     */
+    function _mint(address to_, uint256 tokenId_) internal virtual {
+        require(to_ != address(0), "ERC721: mint to the zero address");
+        require(!_exists(tokenId_), "ERC721: token already minted");
+
+        _beforeTokenTransfer(address(0), to_, tokenId_, 1);
+
+        // Check that tokenId was not minted by `_beforeTokenTransfer` hook
+        require(!_exists(tokenId_), "ERC721: token already minted");
+
+        DERC721Storage storage _erc721Storage = _getErc721Storage();
+
+        unchecked {
+            _erc721Storage.balances[to_] += 1;
+        }
+
+        _erc721Storage.owners[tokenId_] = to_;
+
+        emit Transfer(address(0), to_, tokenId_);
+
+        _afterTokenTransfer(address(0), to_, tokenId_, 1);
+    }
+
+    /**
+     * @notice Destroys `tokenId`.
+     */
+    function _burn(uint256 tokenId_) internal virtual {
+        address owner_ = ownerOf(tokenId_);
+
+        _beforeTokenTransfer(owner_, address(0), tokenId_, 1);
+
+        // Update ownership in case tokenId was transferred by `_beforeTokenTransfer` hook
+        owner_ = ownerOf(tokenId_);
+
+        DERC721Storage storage _erc721Storage = _getErc721Storage();
+
+        // Clear approvals
+        delete _erc721Storage.tokenApprovals[tokenId_];
+
+        unchecked {
+            _erc721Storage.balances[owner_] -= 1;
+        }
+
+        delete _erc721Storage.owners[tokenId_];
+
+        emit Transfer(owner_, address(0), tokenId_);
+
+        _afterTokenTransfer(owner_, address(0), tokenId_, 1);
+    }
+
+    /**
+     * @notice Transfers `tokenId` from `from` to `to`.
+     */
+    function _transfer(address from_, address to_, uint256 tokenId_) internal virtual {
+        require(ownerOf(tokenId_) == from_, "ERC721: transfer from incorrect owner");
+        require(to_ != address(0), "ERC721: transfer to the zero address");
+
+        _beforeTokenTransfer(from_, to_, tokenId_, 1);
+
+        // Check that tokenId was not transferred by `_beforeTokenTransfer` hook
+        require(ownerOf(tokenId_) == from_, "ERC721: transfer from incorrect owner");
+
+        DERC721Storage storage _erc721Storage = _getErc721Storage();
+
+        // Clear approvals from the previous owner
+        delete _erc721Storage.tokenApprovals[tokenId_];
+
+        unchecked {
+            _erc721Storage.balances[from_] -= 1;
+            _erc721Storage.balances[to_] += 1;
+        }
+
+        _getErc721Storage().owners[tokenId_] = to_;
+
+        emit Transfer(from_, to_, tokenId_);
+
+        _afterTokenTransfer(from_, to_, tokenId_, 1);
+    }
+
+    /**
+     * @notice Approve `to` to operate on `tokenId`.
+     */
+    function _approve(address to_, uint256 tokenId_) internal virtual {
+        _getErc721Storage().tokenApprovals[tokenId_] = to_;
+
+        emit Approval(ownerOf(tokenId_), to_, tokenId_);
+    }
+
+    /**
+     * @notice Approve `operator` to operate on all of `owner` tokens.
+     */
+    function _setApprovalForAll(
+        address owner_,
+        address operator_,
+        bool approved_
+    ) internal virtual {
+        require(owner_ != operator_, "ERC721: approve to caller");
+
+        _getErc721Storage().operatorApprovals[owner_][operator_] = approved_;
+
+        emit ApprovalForAll(owner_, operator_, approved_);
+    }
+
+    /**
+     * @notice Function to check if the 'to' can receive token.
+     * The call is not executed if the target address is not a contract.
+     */
+    function _checkOnERC721Received(
+        address from_,
+        address to_,
+        uint256 tokenId_,
+        bytes memory data_
+    ) private returns (bool) {
+        if (to_.isContract()) {
+            try IERC721Receiver(to_).onERC721Received(msg.sender, from_, tokenId_, data_) returns (
+                bytes4 retval
+            ) {
+                return retval == IERC721Receiver.onERC721Received.selector;
+            } catch (bytes memory reason) {
+                if (reason.length == 0) {
+                    revert("ERC721: transfer to non ERC721Receiver implementer");
+                } else {
+                    // @solidity memory-safe-assembly
+                    assembly {
+                        revert(add(32, reason), mload(reason))
+                    }
+                }
+            }
+        } else {
+            return true;
+        }
+    }
+
+    /**
+     * @notice Hook that is called before any token transfer. This includes minting and burning.
+     */
+    function _beforeTokenTransfer(
+        address from_,
+        address to_,
+        uint256 firstTokenId_,
+        uint256 batchSize_
+    ) internal virtual {
+        if (batchSize_ > 1) {
+            // Will only trigger during construction. Batch transferring (minting) is not available afterwards.
+            revert("ERC721Enumerable: consecutive transfers not supported");
+        }
+
+        uint256 tokenId_ = firstTokenId_;
+
+        if (from_ == address(0)) {
+            _addTokenToAllTokensEnumeration(tokenId_);
+        } else if (from_ != to_) {
+            _removeTokenFromOwnerEnumeration(from_, tokenId_);
+        }
+
+        if (to_ == address(0)) {
+            _removeTokenFromAllTokensEnumeration(tokenId_);
+        } else if (to_ != from_) {
+            _addTokenToOwnerEnumeration(to_, tokenId_);
+        }
+    }
+
+    /**
+     * @notice Hook that is called after any token transfer. This includes minting and burning.
+     */
+    function _afterTokenTransfer(
+        address from_,
+        address to_,
+        uint256 firstTokenId_,
+        uint256 batchSize_
+    ) internal virtual {}
+
+    /**
+     * @notice Private function to add a token to ownership-tracking data structures.
+     */
+    function _addTokenToOwnerEnumeration(address to, uint256 tokenId) private {
+        DERC721Storage storage _erc721Storage = _getErc721Storage();
+
+        uint256 length_ = balanceOf(to);
+        _erc721Storage.ownedTokens[to][length_] = tokenId;
+        _erc721Storage.ownedTokensIndex[tokenId] = length_;
+    }
+
+    /**
+     * @notice Private function to add a token to token tracking data structures.
+     */
+    function _addTokenToAllTokensEnumeration(uint256 tokenId) private {
+        DERC721Storage storage _erc721Storage = _getErc721Storage();
+
+        _erc721Storage.allTokensIndex[tokenId] = _erc721Storage.allTokens.length;
+        _erc721Storage.allTokens.push(tokenId);
+    }
+
+    /**
+     * @dev Private function to remove a token from ownership-tracking data structures.
+     */
+    function _removeTokenFromOwnerEnumeration(address from, uint256 tokenId) private {
+        DERC721Storage storage _erc721Storage = _getErc721Storage();
+
+        uint256 lastTokenIndex_ = balanceOf(from) - 1;
+        uint256 tokenIndex_ = _erc721Storage.ownedTokensIndex[tokenId];
+
+        if (tokenIndex_ != lastTokenIndex_) {
+            uint256 lastTokenId = _erc721Storage.ownedTokens[from][lastTokenIndex_];
+
+            _erc721Storage.ownedTokens[from][tokenIndex_] = lastTokenId;
+            _erc721Storage.ownedTokensIndex[lastTokenId] = tokenIndex_;
+        }
+
+        delete _erc721Storage.ownedTokensIndex[tokenId];
+        delete _erc721Storage.ownedTokens[from][lastTokenIndex_];
+    }
+
+    /**
+     * @dev Private function to remove a token from token tracking data structures.
+     */
+    function _removeTokenFromAllTokensEnumeration(uint256 tokenId) private {
+        DERC721Storage storage _erc721Storage = _getErc721Storage();
+
+        // "swap and pop" pattern is used
+        uint256 lastTokenIndex_ = _erc721Storage.allTokens.length - 1;
+        uint256 tokenIndex_ = _erc721Storage.allTokensIndex[tokenId];
+        uint256 lastTokenId_ = _erc721Storage.allTokens[lastTokenIndex_];
+
+        _erc721Storage.allTokens[tokenIndex_] = lastTokenId_;
+        _erc721Storage.allTokensIndex[lastTokenId_] = tokenIndex_;
+
+        delete _erc721Storage.allTokensIndex[tokenId];
+        _erc721Storage.allTokens.pop();
+    }
+}