Merge branch 'master' into feature/Governor-storage

This commit is contained in:
Hadrien Croubois
2023-07-07 16:11:40 +02:00
82 changed files with 876 additions and 1058 deletions

View File

@ -26,8 +26,6 @@ import {Checkpoints} from "../../../utils/structs/Checkpoints.sol";
* IMPORTANT: When overriding {_afterTokenTransfer}, be careful about call ordering. {ownerOf} may return invalid
* values during the {_afterTokenTransfer} execution if the super call is not called first. To be safe, execute the
* super call before your custom logic.
*
* _Available since v4.8._
*/
abstract contract ERC721Consecutive is IERC2309, ERC721 {
using BitMaps for BitMaps.BitMap;

View File

@ -17,8 +17,6 @@ import {ERC165} from "../../../utils/introspection/ERC165.sol";
* IMPORTANT: ERC-2981 only specifies a way to signal royalty information and does not enforce its payment. See
* https://eips.ethereum.org/EIPS/eip-2981#optional-royalty-payments[Rationale] in the EIP. Marketplaces are expected to
* voluntarily pay royalties together with sales, but note that this standard is not yet widely supported.
*
* _Available since v4.5._
*/
abstract contract ERC721Royalty is ERC2981, ERC721 {
/**

View File

@ -13,8 +13,6 @@ import {Votes} from "../../../governance/utils/Votes.sol";
* Tokens do not count as votes until they are delegated, because votes must be tracked which incurs an additional cost
* on every transfer. Token holders can either delegate to a trusted representative who will decide how to make use of
* the votes in governance decisions, or they can delegate to themselves to be their own representative.
*
* _Available since v4.5._
*/
abstract contract ERC721Votes is ERC721, Votes {
/**

View File

@ -12,8 +12,6 @@ import {IERC721Receiver} from "../IERC721Receiver.sol";
* Users can deposit and withdraw an "underlying token" and receive a "wrapped token" with a matching tokenId. This is useful
* in conjunction with other modules. For example, combining this wrapping mechanism with {ERC721Votes} will allow the
* wrapping of an existing "basic" ERC721 into a governance token.
*
* _Available since v4.9.0_
*/
abstract contract ERC721Wrapper is ERC721, IERC721Receiver {
IERC721 private immutable _underlying;