Addendum [Q-12]: fully comply with ERC7201

thirdweb-dev · Oct 4, 2023 · 72edf45 · 72edf45
1 parent e994c83
commit 72edf45
Show file tree

Hide file tree

Showing 24 changed files with 29 additions and 24 deletions.
diff --git a/contracts/extension/upgradeable/AccountPermissions.sol b/contracts/extension/upgradeable/AccountPermissions.sol
@@ -10,7 +10,7 @@ import "../../external-deps/openzeppelin/utils/structs/EnumerableSet.sol";
 library AccountPermissionsStorage {
     /// @custom:storage-location erc7201:extension.manager.storage
     bytes32 public constant ACCOUNT_PERMISSIONS_STORAGE_POSITION =
-        keccak256(abi.encode(uint256(keccak256("account.permissions.storage")) - 1));
+        keccak256(abi.encode(uint256(keccak256("account.permissions.storage")) - 1)) & ~bytes32(uint256(0xff));
 
     struct Data {
         /// @dev The set of all admins of the wallet.

diff --git a/contracts/extension/upgradeable/BatchMintMetadata.sol b/contracts/extension/upgradeable/BatchMintMetadata.sol
@@ -4,7 +4,7 @@ pragma solidity ^0.8.0;
 library BatchMintMetadataStorage {
     /// @custom:storage-location erc7201:extension.manager.storage
     bytes32 public constant BATCH_MINT_METADATA_STORAGE_POSITION =
-        keccak256(abi.encode(uint256(keccak256("batch.mint.metadata.storage")) - 1));
+        keccak256(abi.encode(uint256(keccak256("batch.mint.metadata.storage")) - 1)) & ~bytes32(uint256(0xff));
 
     struct Data {
         /// @dev Largest tokenId of each batch of tokens with the same baseURI.

diff --git a/contracts/extension/upgradeable/BurnToClaim.sol b/contracts/extension/upgradeable/BurnToClaim.sol
@@ -14,7 +14,7 @@ import "../interface/IBurnToClaim.sol";
 library BurnToClaimStorage {
     /// @custom:storage-location erc7201:extension.manager.storage
     bytes32 public constant BURN_TO_CLAIM_STORAGE_POSITION =
-        keccak256(abi.encode(uint256(keccak256("burn.to.claim.storage")) - 1));
+        keccak256(abi.encode(uint256(keccak256("burn.to.claim.storage")) - 1)) & ~bytes32(uint256(0xff));
 
     struct Data {
         IBurnToClaim.BurnToClaimInfo burnToClaimInfo;

diff --git a/contracts/extension/upgradeable/ContractMetadata.sol b/contracts/extension/upgradeable/ContractMetadata.sol
@@ -17,7 +17,7 @@ import "../interface/IContractMetadata.sol";
 library ContractMetadataStorage {
     /// @custom:storage-location erc7201:extension.manager.storage
     bytes32 public constant CONTRACT_METADATA_STORAGE_POSITION =
-        keccak256(abi.encode(uint256(keccak256("contract.metadata.storage")) - 1));
+        keccak256(abi.encode(uint256(keccak256("contract.metadata.storage")) - 1)) & ~bytes32(uint256(0xff));
 
     struct Data {
         /// @notice Returns the contract metadata URI.

diff --git a/contracts/extension/upgradeable/DelayedReveal.sol b/contracts/extension/upgradeable/DelayedReveal.sol
@@ -8,7 +8,7 @@ import "../interface/IDelayedReveal.sol";
 library DelayedRevealStorage {
     /// @custom:storage-location erc7201:extension.manager.storage
     bytes32 public constant DELAYED_REVEAL_STORAGE_POSITION =
-        keccak256(abi.encode(uint256(keccak256("delayed.reveal.storage")) - 1));
+        keccak256(abi.encode(uint256(keccak256("delayed.reveal.storage")) - 1)) & ~bytes32(uint256(0xff));
 
     struct Data {
         /// @dev Mapping from tokenId of a batch of tokens => to delayed reveal data.

diff --git a/contracts/extension/upgradeable/Drop.sol b/contracts/extension/upgradeable/Drop.sol
@@ -8,7 +8,8 @@ import "../../lib/MerkleProof.sol";
 
 library DropStorage {
     /// @custom:storage-location erc7201:extension.manager.storage
-    bytes32 public constant DROP_STORAGE_POSITION = keccak256(abi.encode(uint256(keccak256("drop.storage")) - 1));
+    bytes32 public constant DROP_STORAGE_POSITION =
+        keccak256(abi.encode(uint256(keccak256("drop.storage")) - 1)) & ~bytes32(uint256(0xff));
 
     struct Data {
         /// @dev The active conditions for claiming tokens.

diff --git a/contracts/extension/upgradeable/ERC2771Context.sol b/contracts/extension/upgradeable/ERC2771Context.sol
@@ -10,7 +10,7 @@ import "../interface/IERC2771Context.sol";
 library ERC2771ContextStorage {
     /// @custom:storage-location erc7201:extension.manager.storage
     bytes32 public constant ERC2771_CONTEXT_STORAGE_POSITION =
-        keccak256(abi.encode(uint256(keccak256("erc2771.context.storage")) - 1));
+        keccak256(abi.encode(uint256(keccak256("erc2771.context.storage")) - 1)) & ~bytes32(uint256(0xff));
 
     struct Data {
         mapping(address => bool) trustedForwarder;

diff --git a/contracts/extension/upgradeable/ERC2771ContextUpgradeable.sol b/contracts/extension/upgradeable/ERC2771ContextUpgradeable.sol
@@ -11,7 +11,7 @@ import "./Initializable.sol";
 library ERC2771ContextStorage {
     /// @custom:storage-location erc7201:extension.manager.storage
     bytes32 public constant ERC2771_CONTEXT_STORAGE_POSITION =
-        keccak256(abi.encode(uint256(keccak256("erc2771.context.storage")) - 1));
+        keccak256(abi.encode(uint256(keccak256("erc2771.context.storage")) - 1)) & ~bytes32(uint256(0xff));
 
     struct Data {
         mapping(address => bool) trustedForwarder;

diff --git a/contracts/extension/upgradeable/Initializable.sol b/contracts/extension/upgradeable/Initializable.sol
@@ -5,7 +5,8 @@ import "../../lib/TWAddress.sol";
 
 library InitStorage {
     /// @custom:storage-location erc7201:extension.manager.storage
-    bytes32 constant INIT_STORAGE_POSITION = keccak256(abi.encode(uint256(keccak256("init.storage")) - 1));
+    bytes32 constant INIT_STORAGE_POSITION =
+        keccak256(abi.encode(uint256(keccak256("init.storage")) - 1)) & ~bytes32(uint256(0xff));
 
     /// @dev Layout of the entrypoint contract's storage.
     struct Data {

diff --git a/contracts/extension/upgradeable/LazyMint.sol b/contracts/extension/upgradeable/LazyMint.sol
@@ -9,7 +9,7 @@ import "./BatchMintMetadata.sol";
 library LazyMintStorage {
     /// @custom:storage-location erc7201:extension.manager.storage
     bytes32 public constant LAZY_MINT_STORAGE_POSITION =
-        keccak256(abi.encode(uint256(keccak256("lazy.mint.storage")) - 1));
+        keccak256(abi.encode(uint256(keccak256("lazy.mint.storage")) - 1)) & ~bytes32(uint256(0xff));
 
     struct Data {
         /// @notice The tokenId assigned to the next new NFT to be lazy minted.

diff --git a/contracts/extension/upgradeable/OperatorFilterToggle.sol b/contracts/extension/upgradeable/OperatorFilterToggle.sol
@@ -8,7 +8,7 @@ import "../interface/IOperatorFilterToggle.sol";
 library OperatorFilterToggleStorage {
     /// @custom:storage-location erc7201:extension.manager.storage
     bytes32 public constant OPERATOR_FILTER_TOGGLE_STORAGE_POSITION =
-        keccak256(abi.encode(uint256(keccak256("operator.filter.toggle.storage")) - 1));
+        keccak256(abi.encode(uint256(keccak256("operator.filter.toggle.storage")) - 1)) & ~bytes32(uint256(0xff));
 
     struct Data {
         bool operatorRestriction;

diff --git a/contracts/extension/upgradeable/Ownable.sol b/contracts/extension/upgradeable/Ownable.sol
@@ -14,7 +14,8 @@ import "../interface/IOwnable.sol";
 
 library OwnableStorage {
     /// @custom:storage-location erc7201:extension.manager.storage
-    bytes32 public constant OWNABLE_STORAGE_POSITION = keccak256(abi.encode(uint256(keccak256("ownable.storage")) - 1));
+    bytes32 public constant OWNABLE_STORAGE_POSITION =
+        keccak256(abi.encode(uint256(keccak256("ownable.storage")) - 1)) & ~bytes32(uint256(0xff));
 
     struct Data {
         /// @dev Owner of the contract (purpose: OpenSea compatibility)

diff --git a/contracts/extension/upgradeable/Permissions.sol b/contracts/extension/upgradeable/Permissions.sol
@@ -14,7 +14,7 @@ import "../../lib/TWStrings.sol";
 library PermissionsStorage {
     /// @custom:storage-location erc7201:extension.manager.storage
     bytes32 public constant PERMISSIONS_STORAGE_POSITION =
-        keccak256(abi.encode(uint256(keccak256("permissions.storage")) - 1));
+        keccak256(abi.encode(uint256(keccak256("permissions.storage")) - 1)) & ~bytes32(uint256(0xff));
 
     struct Data {
         /// @dev Map from keccak256 hash of a role => a map from address => whether address has role.

diff --git a/contracts/extension/upgradeable/PermissionsEnumerable.sol b/contracts/extension/upgradeable/PermissionsEnumerable.sol
@@ -15,7 +15,7 @@ import "./Permissions.sol";
 library PermissionsEnumerableStorage {
     /// @custom:storage-location erc7201:extension.manager.storage
     bytes32 public constant PERMISSIONS_ENUMERABLE_STORAGE_POSITION =
-        keccak256(abi.encode(uint256(keccak256("permissions.enumerable.storage")) - 1));
+        keccak256(abi.encode(uint256(keccak256("permissions.enumerable.storage")) - 1)) & ~bytes32(uint256(0xff));
 
     /**
      *  @notice A data structure to store data of members for a given role.

diff --git a/contracts/extension/upgradeable/PlatformFee.sol b/contracts/extension/upgradeable/PlatformFee.sol
@@ -11,7 +11,7 @@ import "../interface/IPlatformFee.sol";
 library PlatformFeeStorage {
     /// @custom:storage-location erc7201:extension.manager.storage
     bytes32 public constant PLATFORM_FEE_STORAGE_POSITION =
-        keccak256(abi.encode(uint256(keccak256("platform.fee.storage")) - 1));
+        keccak256(abi.encode(uint256(keccak256("platform.fee.storage")) - 1)) & ~bytes32(uint256(0xff));
 
     struct Data {
         /// @dev The address that receives all platform fees from all sales.

diff --git a/contracts/extension/upgradeable/PrimarySale.sol b/contracts/extension/upgradeable/PrimarySale.sol
@@ -8,7 +8,7 @@ import "../interface/IPrimarySale.sol";
 library PrimarySaleStorage {
     /// @custom:storage-location erc7201:extension.manager.storage
     bytes32 public constant PRIMARY_SALE_STORAGE_POSITION =
-        keccak256(abi.encode(uint256(keccak256("primary.sale.storage")) - 1));
+        keccak256(abi.encode(uint256(keccak256("primary.sale.storage")) - 1)) & ~bytes32(uint256(0xff));
 
     struct Data {
         address recipient;

diff --git a/contracts/extension/upgradeable/ReentrancyGuard.sol b/contracts/extension/upgradeable/ReentrancyGuard.sol
@@ -6,7 +6,7 @@ pragma solidity ^0.8.0;
 library ReentrancyGuardStorage {
     /// @custom:storage-location erc7201:extension.manager.storage
     bytes32 public constant REENTRANCY_GUARD_STORAGE_POSITION =
-        keccak256(abi.encode(uint256(keccak256("reentrancy.guard.storage")) - 1));
+        keccak256(abi.encode(uint256(keccak256("reentrancy.guard.storage")) - 1)) & ~bytes32(uint256(0xff));
 
     struct Data {
         uint256 _status;

diff --git a/contracts/extension/upgradeable/Royalty.sol b/contracts/extension/upgradeable/Royalty.sol
@@ -7,7 +7,8 @@ import "../interface/IRoyalty.sol";
 
 library RoyaltyStorage {
     /// @custom:storage-location erc7201:extension.manager.storage
-    bytes32 public constant ROYALTY_STORAGE_POSITION = keccak256(abi.encode(uint256(keccak256("royalty.storage")) - 1));
+    bytes32 public constant ROYALTY_STORAGE_POSITION =
+        keccak256(abi.encode(uint256(keccak256("royalty.storage")) - 1)) & ~bytes32(uint256(0xff));
 
     struct Data {
         /// @dev The (default) address that receives all royalty value.

diff --git a/contracts/extension/upgradeable/RulesEngine.sol b/contracts/extension/upgradeable/RulesEngine.sol
@@ -15,7 +15,7 @@ import "../../external-deps/openzeppelin/utils/structs/EnumerableSet.sol";
 library RulesEngineStorage {
     /// @custom:storage-location erc7201:extension.manager.storage
     bytes32 public constant RULES_ENGINE_STORAGE_POSITION =
-        keccak256(abi.encode(uint256(keccak256("rules.engine.storage")) - 1));
+        keccak256(abi.encode(uint256(keccak256("rules.engine.storage")) - 1)) & ~bytes32(uint256(0xff));
 
     struct Data {
         address rulesEngineOverride;

diff --git a/contracts/extension/upgradeable/SharedMetadataBatch.sol b/contracts/extension/upgradeable/SharedMetadataBatch.sol
@@ -14,7 +14,7 @@ import "../../external-deps/openzeppelin/utils/EnumerableSet.sol";
 library SharedMetadataBatchStorage {
     /// @custom:storage-location erc7201:extension.manager.storage
     bytes32 public constant SHARED_METADATA_BATCH_STORAGE_POSITION =
-        keccak256(abi.encode(uint256(keccak256("shared.metadata.batch.storage")) - 1));
+        keccak256(abi.encode(uint256(keccak256("shared.metadata.batch.storage")) - 1)) & ~bytes32(uint256(0xff));
 
     struct Data {
         EnumerableSet.Bytes32Set ids;

diff --git a/contracts/prebuilts/marketplace/direct-listings/DirectListingsStorage.sol b/contracts/prebuilts/marketplace/direct-listings/DirectListingsStorage.sol
@@ -11,7 +11,7 @@ import { IDirectListings } from "../IMarketplace.sol";
 library DirectListingsStorage {
     /// @custom:storage-location erc7201:extension.manager.storage
     bytes32 public constant DIRECT_LISTINGS_STORAGE_POSITION =
-        keccak256(abi.encode(uint256(keccak256("direct.listings.storage")) - 1));
+        keccak256(abi.encode(uint256(keccak256("direct.listings.storage")) - 1)) & ~bytes32(uint256(0xff));
 
     struct Data {
         uint256 totalListings;

diff --git a/contracts/prebuilts/marketplace/english-auctions/EnglishAuctionsStorage.sol b/contracts/prebuilts/marketplace/english-auctions/EnglishAuctionsStorage.sol
@@ -11,7 +11,7 @@ import { IEnglishAuctions } from "../IMarketplace.sol";
 library EnglishAuctionsStorage {
     /// @custom:storage-location erc7201:extension.manager.storage
     bytes32 public constant ENGLISH_AUCTIONS_STORAGE_POSITION =
-        keccak256(abi.encode(uint256(keccak256("english.auctions.storage")) - 1));
+        keccak256(abi.encode(uint256(keccak256("english.auctions.storage")) - 1)) & ~bytes32(uint256(0xff));
 
     struct Data {
         uint256 totalAuctions;

diff --git a/contracts/prebuilts/marketplace/offers/OffersStorage.sol b/contracts/prebuilts/marketplace/offers/OffersStorage.sol
@@ -10,7 +10,8 @@ import { IOffers } from "../IMarketplace.sol";
  */
 library OffersStorage {
     /// @custom:storage-location erc7201:extension.manager.storage
-    bytes32 public constant OFFERS_STORAGE_POSITION = keccak256(abi.encode(uint256(keccak256("offers.storage")) - 1));
+    bytes32 public constant OFFERS_STORAGE_POSITION =
+        keccak256(abi.encode(uint256(keccak256("offers.storage")) - 1)) & ~bytes32(uint256(0xff));
 
     struct Data {
         uint256 totalOffers;

diff --git a/contracts/prebuilts/unaudited/burn-to-claim-drop/extension/BurnToClaimDrop721Storage.sol b/contracts/prebuilts/unaudited/burn-to-claim-drop/extension/BurnToClaimDrop721Storage.sol
@@ -4,7 +4,7 @@ pragma solidity ^0.8.0;
 library BurnToClaimDrop721Storage {
     /// @custom:storage-location erc7201:burn.to.claim.drop.721.storage
     bytes32 public constant BURN_TO_CLAIM_DROP_721_STORAGE_POSITION =
-        keccak256(abi.encode(uint256(keccak256("burn.to.claim.drop.721.storage")) - 1));
+        keccak256(abi.encode(uint256(keccak256("burn.to.claim.drop.721.storage")) - 1)) & ~bytes32(uint256(0xff));
 
     struct Data {
         /// @dev Global max total NFTs that can be minted.