Correct ERC-7201 support (#525)

nkrishang · web-flow · commit 39ac9c9c7c29 · 2023-10-04T17:28:34.000-04:00
diff --git a/contracts/eip/ERC721AUpgradeable.sol b/contracts/eip/ERC721AUpgradeable.sol
@@ -15,7 +15,10 @@ import "./ERC165.sol";
 import "../extension/upgradeable/Initializable.sol";
 
 library ERC721AStorage {
-    bytes32 public constant ERC721A_STORAGE_POSITION = keccak256("erc721.a.storage");
+    /// @custom:storage-location erc7201:erc721.a.storage
+    /// @dev keccak256(abi.encode(uint256(keccak256("erc721.a.storage")) - 1)) & ~bytes32(uint256(0xff))
+    bytes32 public constant ERC721A_STORAGE_POSITION =
+        0xe2efff925b8936e8a3471e86ad87942375e24de600ddfb2b841647ce1379ed00;
 
     struct Data {
         // The tokenId of the next token to be minted.
diff --git a/contracts/extension/plugin/ContractMetadataStorage.sol b/contracts/extension/plugin/ContractMetadataStorage.sol
@@ -7,7 +7,10 @@ pragma solidity ^0.8.0;
  *  @author  thirdweb.com
  */
 library ContractMetadataStorage {
-    bytes32 public constant CONTRACT_METADATA_STORAGE_POSITION = keccak256("contract.metadata.storage");
+    /// @custom:storage-location erc7201:contract.metadata.storage
+    /// @dev keccak256(abi.encode(uint256(keccak256("contract.metadata.storage")) - 1)) & ~bytes32(uint256(0xff))
+    bytes32 public constant CONTRACT_METADATA_STORAGE_POSITION =
+        0x4bc804ba64359c0e35e5ed5d90ee596ecaa49a3a930ddcb1470ea0dd625da900;
 
     struct Data {
         string contractURI;
diff --git a/contracts/extension/plugin/ERC2771ContextStorage.sol b/contracts/extension/plugin/ERC2771ContextStorage.sol
@@ -4,7 +4,10 @@ pragma solidity ^0.8.0;
 /// @author thirdweb
 
 library ERC2771ContextStorage {
-    bytes32 public constant ERC2771_CONTEXT_STORAGE_POSITION = keccak256("erc2771.context.storage");
+    /// @custom:storage-location erc7201:erc2771.context.storage
+    /// @dev keccak256(abi.encode(uint256(keccak256("erc2771.context.storage")) - 1)) & ~bytes32(uint256(0xff))
+    bytes32 public constant ERC2771_CONTEXT_STORAGE_POSITION =
+        0x82aadcdf5bea62fd30615b6c0754b644e71b6c1e8c55b71bb927ad005b504f00;
 
     struct Data {
         mapping(address => bool) _trustedForwarder;
diff --git a/contracts/extension/plugin/PermissionsEnumerableStorage.sol b/contracts/extension/plugin/PermissionsEnumerableStorage.sol
@@ -9,7 +9,10 @@ import "../interface/IPermissionsEnumerable.sol";
  *  @author  thirdweb.com
  */
 library PermissionsEnumerableStorage {
-    bytes32 public constant PERMISSIONS_ENUMERABLE_STORAGE_POSITION = keccak256("permissions.enumerable.storage");
+    /// @custom:storage-location erc7201:permissions.enumerable.storage
+    /// @dev keccak256(abi.encode(uint256(keccak256("permissions.enumerable.storage")) - 1)) & ~bytes32(uint256(0xff))
+    bytes32 public constant PERMISSIONS_ENUMERABLE_STORAGE_POSITION =
+        0x1ea2ed6cf13bfad376ba49bede85b663fef0b40eac197c5ac8e6f92ec4076100;
 
     /**
      *  @notice A data structure to store data of members for a given role.
diff --git a/contracts/extension/plugin/PermissionsStorage.sol b/contracts/extension/plugin/PermissionsStorage.sol
@@ -7,7 +7,10 @@ pragma solidity ^0.8.0;
  *  @author  thirdweb.com
  */
 library PermissionsStorage {
-    bytes32 public constant PERMISSIONS_STORAGE_POSITION = keccak256("permissions.storage");
+    /// @custom:storage-location erc7201:permissions.storage
+    /// @dev keccak256(abi.encode(uint256(keccak256("permissions.storage")) - 1)) & ~bytes32(uint256(0xff))
+    bytes32 public constant PERMISSIONS_STORAGE_POSITION =
+        0x0a7b0f5c59907924802379ebe98cdc23e2ee7820f63d30126e10b3752010e500;
 
     struct Data {
         /// @dev Map from keccak256 hash of a role => a map from address => whether address has role.
diff --git a/contracts/extension/plugin/PlatformFeeStorage.sol b/contracts/extension/plugin/PlatformFeeStorage.sol
@@ -7,7 +7,10 @@ pragma solidity ^0.8.0;
  *  @author  thirdweb.com
  */
 library PlatformFeeStorage {
-    bytes32 public constant PLATFORM_FEE_STORAGE_POSITION = keccak256("platform.fee.storage");
+    /// @custom:storage-location erc7201:platform.fee.storage
+    /// @dev keccak256(abi.encode(uint256(keccak256("platform.fee.storage")) - 1)) & ~bytes32(uint256(0xff))
+    bytes32 public constant PLATFORM_FEE_STORAGE_POSITION =
+        0xc0c34308b4a2f4c5ee9af8ba82541cfb3c33b076d1fd05c65f9ce7060c64c400;
 
     struct Data {
         /// @dev The address that receives all platform fees from all sales.
diff --git a/contracts/extension/plugin/ReentrancyGuardStorage.sol b/contracts/extension/plugin/ReentrancyGuardStorage.sol
@@ -4,7 +4,10 @@ pragma solidity ^0.8.0;
 /// @author thirdweb
 
 library ReentrancyGuardStorage {
-    bytes32 public constant REENTRANCY_GUARD_STORAGE_POSITION = keccak256("reentrancy.guard.storage");
+    /// @custom:storage-location erc7201:reentrancy.guard.storage
+    /// @dev keccak256(abi.encode(uint256(keccak256("reentrancy.guard.storage")) - 1)) & ~bytes32(uint256(0xff))
+    bytes32 public constant REENTRANCY_GUARD_STORAGE_POSITION =
+        0x1d281c488dae143b6ea4122e80c65059929950b9c32f17fc57be22089d9c3b00;
 
     struct Data {
         uint256 _status;
diff --git a/contracts/extension/plugin/Router.sol b/contracts/extension/plugin/Router.sol
@@ -12,7 +12,10 @@ import "../../external-deps/openzeppelin/utils/EnumerableSet.sol";
  *  @author  thirdweb.com
  */
 library RouterStorage {
-    bytes32 public constant ROUTER_STORAGE_POSITION = keccak256("router.storage");
+    /// @custom:storage-location erc7201:router.storage
+    /// @dev keccak256(abi.encode(uint256(keccak256("router.storage")) - 1)) & ~bytes32(uint256(0xff))
+    bytes32 public constant ROUTER_STORAGE_POSITION =
+        0x012ef321094c8c682aa635dfdfcd754624a7473f08ad6ac415bb7f35eb12a100;
 
     struct Data {
         EnumerableSet.Bytes32Set allSelectors;
diff --git a/contracts/extension/plugin/RoyaltyPayments.sol b/contracts/extension/plugin/RoyaltyPayments.sol
@@ -8,7 +8,10 @@ import "../interface/IRoyaltyEngineV1.sol";
 import { IERC2981 } from "../../eip/interface/IERC2981.sol";
 
 library RoyaltyPaymentsStorage {
-    bytes32 public constant ROYALTY_PAYMENTS_STORAGE_POSITION = keccak256("royalty.payments.storage");
+    /// @custom:storage-location erc7201:royalty.payments.storage
+    /// @dev keccak256(abi.encode(uint256(keccak256("royalty.payments.storage")) - 1)) & ~bytes32(uint256(0xff))
+    bytes32 public constant ROYALTY_PAYMENTS_STORAGE_POSITION =
+        0xc802b338f3fb784853cf3c808df5ff08335200e394ea2c687d12571a91045000;
 
     struct Data {
         /// @dev The address of RoyaltyEngineV1, replacing the one set during construction.
diff --git a/contracts/extension/upgradeable/AccountPermissions.sol b/contracts/extension/upgradeable/AccountPermissions.sol
@@ -8,9 +8,10 @@ import "../../external-deps/openzeppelin/utils/cryptography/EIP712.sol";
 import "../../external-deps/openzeppelin/utils/structs/EnumerableSet.sol";
 
 library AccountPermissionsStorage {
-    /// @custom:storage-location erc7201:extension.manager.storage
+    /// @custom:storage-location erc7201:account.permissions.storage
+    /// @dev keccak256(abi.encode(uint256(keccak256("account.permissions.storage")) - 1)) & ~bytes32(uint256(0xff))
     bytes32 public constant ACCOUNT_PERMISSIONS_STORAGE_POSITION =
-        keccak256(abi.encode(uint256(keccak256("account.permissions.storage")) - 1)) & ~bytes32(uint256(0xff));
+        0x3181e78fc1b109bc611fd2406150bf06e33faa75f71cba12c3e1fd670f2def00;
 
     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
@@ -2,9 +2,10 @@
 pragma solidity ^0.8.0;
 
 library BatchMintMetadataStorage {
-    /// @custom:storage-location erc7201:extension.manager.storage
+    /// @custom:storage-location erc7201:batch.mint.metadata.storage
+    /// @dev keccak256(abi.encode(uint256(keccak256("batch.mint.metadata.storage")) - 1)) & ~bytes32(uint256(0xff))
     bytes32 public constant BATCH_MINT_METADATA_STORAGE_POSITION =
-        keccak256(abi.encode(uint256(keccak256("batch.mint.metadata.storage")) - 1)) & ~bytes32(uint256(0xff));
+        0xf5b99f0648d517803cfbd359284c3fd81ac54e1c89b4874d917ae042d05e8500;
 
     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
@@ -12,9 +12,10 @@ import "../../eip/interface/IERC721.sol";
 import "../interface/IBurnToClaim.sol";
 
 library BurnToClaimStorage {
-    /// @custom:storage-location erc7201:extension.manager.storage
+    /// @custom:storage-location erc7201:burn.to.claim.storage
+    /// @dev keccak256(abi.encode(uint256(keccak256("burn.to.claim.storage")) - 1)) & ~bytes32(uint256(0xff))
     bytes32 public constant BURN_TO_CLAIM_STORAGE_POSITION =
-        keccak256(abi.encode(uint256(keccak256("burn.to.claim.storage")) - 1)) & ~bytes32(uint256(0xff));
+        0x6f0d20bed2d5528732497d5a17ac45087a6175b2a140eebe2a39ab447d7ad400;
 
     struct Data {
         IBurnToClaim.BurnToClaimInfo burnToClaimInfo;
diff --git a/contracts/extension/upgradeable/ContractMetadata.sol b/contracts/extension/upgradeable/ContractMetadata.sol
@@ -15,9 +15,10 @@ import "../interface/IContractMetadata.sol";
  */
 
 library ContractMetadataStorage {
-    /// @custom:storage-location erc7201:extension.manager.storage
+    /// @custom:storage-location erc7201:contract.metadata.storage
+    /// @dev keccak256(abi.encode(uint256(keccak256("contract.metadata.storage")) - 1)) & ~bytes32(uint256(0xff))
     bytes32 public constant CONTRACT_METADATA_STORAGE_POSITION =
-        keccak256(abi.encode(uint256(keccak256("contract.metadata.storage")) - 1)) & ~bytes32(uint256(0xff));
+        0x4bc804ba64359c0e35e5ed5d90ee596ecaa49a3a930ddcb1470ea0dd625da900;
 
     struct Data {
         /// @notice Returns the contract metadata URI.
diff --git a/contracts/extension/upgradeable/DelayedReveal.sol b/contracts/extension/upgradeable/DelayedReveal.sol
@@ -6,9 +6,10 @@ pragma solidity ^0.8.0;
 import "../interface/IDelayedReveal.sol";
 
 library DelayedRevealStorage {
-    /// @custom:storage-location erc7201:extension.manager.storage
+    /// @custom:storage-location erc7201:delayed.reveal.storage
+    ///@dev keccak256(abi.encode(uint256(keccak256("delayed.reveal.storage")) - 1)) & ~bytes32(uint256(0xff))
     bytes32 public constant DELAYED_REVEAL_STORAGE_POSITION =
-        keccak256(abi.encode(uint256(keccak256("delayed.reveal.storage")) - 1)) & ~bytes32(uint256(0xff));
+        0x29cbb6a3768b42f407b01945994a37861bf5a2179c5dea5be7e378415e755100;
 
     struct Data {
         /// @dev Mapping from tokenId of a batch of tokens => to delayed reveal data.
diff --git a/contracts/extension/upgradeable/ERC2771Context.sol b/contracts/extension/upgradeable/ERC2771Context.sol
@@ -8,9 +8,10 @@ import "../interface/IERC2771Context.sol";
  */
 
 library ERC2771ContextStorage {
-    /// @custom:storage-location erc7201:extension.manager.storage
+    /// @custom:storage-location erc7201:erc2771.context.storage
+    /// @dev keccak256(abi.encode(uint256(keccak256("erc2771.context.storage")) - 1)) & ~bytes32(uint256(0xff))
     bytes32 public constant ERC2771_CONTEXT_STORAGE_POSITION =
-        keccak256(abi.encode(uint256(keccak256("erc2771.context.storage")) - 1)) & ~bytes32(uint256(0xff));
+        0x82aadcdf5bea62fd30615b6c0754b644e71b6c1e8c55b71bb927ad005b504f00;
 
     struct Data {
         mapping(address => bool) trustedForwarder;
diff --git a/contracts/extension/upgradeable/ERC2771ContextUpgradeable.sol b/contracts/extension/upgradeable/ERC2771ContextUpgradeable.sol
@@ -9,9 +9,10 @@ import "./Initializable.sol";
  */
 
 library ERC2771ContextStorage {
-    /// @custom:storage-location erc7201:extension.manager.storage
+    /// @custom:storage-location erc7201:erc2771.context.storage
+    /// @dev keccak256(abi.encode(uint256(keccak256("erc2771.context.storage")) - 1)) & ~bytes32(uint256(0xff))
     bytes32 public constant ERC2771_CONTEXT_STORAGE_POSITION =
-        keccak256(abi.encode(uint256(keccak256("erc2771.context.storage")) - 1)) & ~bytes32(uint256(0xff));
+        0x82aadcdf5bea62fd30615b6c0754b644e71b6c1e8c55b71bb927ad005b504f00;
 
     struct Data {
         mapping(address => bool) trustedForwarder;
diff --git a/contracts/extension/upgradeable/Initializable.sol b/contracts/extension/upgradeable/Initializable.sol
@@ -4,9 +4,9 @@ pragma solidity ^0.8.0;
 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(uint256(0xff));
+    /// @custom:storage-location erc7201:init.storage
+    /// @dev keccak256(abi.encode(uint256(keccak256("init.storage")) - 1)) & ~bytes32(uint256(0xff))
+    bytes32 constant INIT_STORAGE_POSITION = 0x322cf19c484104d3b1a9c2982ebae869ede3fa5f6c4703ca41b9a48c76ee0300;
 
     /// @dev Layout of the entrypoint contract's storage.
     struct Data {
diff --git a/contracts/extension/upgradeable/LazyMint.sol b/contracts/extension/upgradeable/LazyMint.sol
@@ -7,9 +7,10 @@ import "../interface/ILazyMint.sol";
 import "./BatchMintMetadata.sol";
 
 library LazyMintStorage {
-    /// @custom:storage-location erc7201:extension.manager.storage
+    /// @custom:storage-location erc7201:lazy.mint.storage
+    /// @dev keccak256(abi.encode(uint256(keccak256("lazy.mint.storage")) - 1)) & ~bytes32(uint256(0xff))
     bytes32 public constant LAZY_MINT_STORAGE_POSITION =
-        keccak256(abi.encode(uint256(keccak256("lazy.mint.storage")) - 1)) & ~bytes32(uint256(0xff));
+        0xb9d1563179e0b515350da446a9b78048cef890c6aaa6e34cdf88122d970b5c00;
 
     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
@@ -6,9 +6,10 @@ pragma solidity ^0.8.0;
 import "../interface/IOperatorFilterToggle.sol";
 
 library OperatorFilterToggleStorage {
-    /// @custom:storage-location erc7201:extension.manager.storage
+    /// @custom:storage-location erc7201:operator.filter.toggle.storage
+    /// @dev keccak256(abi.encode(uint256(keccak256("operator.filter.toggle.storage")) - 1)) & ~bytes32(uint256(0xff))
     bytes32 public constant OPERATOR_FILTER_TOGGLE_STORAGE_POSITION =
-        keccak256(abi.encode(uint256(keccak256("operator.filter.toggle.storage")) - 1)) & ~bytes32(uint256(0xff));
+        0xc9c6c05578224a00a593ea5c05021a182582a08fc1143a677c61a8fe56c23800;
 
     struct Data {
         bool operatorRestriction;
diff --git a/contracts/extension/upgradeable/Permissions.sol b/contracts/extension/upgradeable/Permissions.sol
@@ -12,9 +12,10 @@ import "../../lib/TWStrings.sol";
  */
 
 library PermissionsStorage {
-    /// @custom:storage-location erc7201:extension.manager.storage
+    /// @custom:storage-location erc7201:permissions.storage
+    /// @dev keccak256(abi.encode(uint256(keccak256("permissions.storage")) - 1)) & ~bytes32(uint256(0xff))
     bytes32 public constant PERMISSIONS_STORAGE_POSITION =
-        keccak256(abi.encode(uint256(keccak256("permissions.storage")) - 1)) & ~bytes32(uint256(0xff));
+        0x0a7b0f5c59907924802379ebe98cdc23e2ee7820f63d30126e10b3752010e500;
 
     struct Data {
         /// @dev Map from keccak256 hash of a role => a map from address => whether address has role.
diff --git a/contracts/extension/upgradeable/PlatformFee.sol b/contracts/extension/upgradeable/PlatformFee.sol
@@ -9,9 +9,10 @@ import "../interface/IPlatformFee.sol";
  *  @author  thirdweb.com
  */
 library PlatformFeeStorage {
-    /// @custom:storage-location erc7201:extension.manager.storage
+    /// @custom:storage-location erc7201:platform.fee.storage
+    /// @dev keccak256(abi.encode(uint256(keccak256("platform.fee.storage")) - 1)) & ~bytes32(uint256(0xff))
     bytes32 public constant PLATFORM_FEE_STORAGE_POSITION =
-        keccak256(abi.encode(uint256(keccak256("platform.fee.storage")) - 1)) & ~bytes32(uint256(0xff));
+        0xc0c34308b4a2f4c5ee9af8ba82541cfb3c33b076d1fd05c65f9ce7060c64c400;
 
     struct Data {
         /// @dev The address that receives all platform fees from all sales.
diff --git a/contracts/extension/upgradeable/ReentrancyGuard.sol b/contracts/extension/upgradeable/ReentrancyGuard.sol
@@ -4,9 +4,10 @@
 pragma solidity ^0.8.0;
 
 library ReentrancyGuardStorage {
-    /// @custom:storage-location erc7201:extension.manager.storage
+    /// @custom:storage-location erc7201:reentrancy.guard.storage
+    /// @dev keccak256(abi.encode(uint256(keccak256("reentrancy.guard.storage")) - 1)) & ~bytes32(uint256(0xff))
     bytes32 public constant REENTRANCY_GUARD_STORAGE_POSITION =
-        keccak256(abi.encode(uint256(keccak256("reentrancy.guard.storage")) - 1)) & ~bytes32(uint256(0xff));
+        0x1d281c488dae143b6ea4122e80c65059929950b9c32f17fc57be22089d9c3b00;
 
     struct Data {
         uint256 _status;
diff --git a/contracts/extension/upgradeable/Royalty.sol b/contracts/extension/upgradeable/Royalty.sol
@@ -6,9 +6,10 @@ pragma solidity ^0.8.0;
 import "../interface/IRoyalty.sol";
 
 library RoyaltyStorage {
-    /// @custom:storage-location erc7201:extension.manager.storage
+    /// @custom:storage-location erc7201:royalty.storage
+    /// @dev keccak256(abi.encode(uint256(keccak256("royalty.storage")) - 1)) & ~bytes32(uint256(0xff))
     bytes32 public constant ROYALTY_STORAGE_POSITION =
-        keccak256(abi.encode(uint256(keccak256("royalty.storage")) - 1)) & ~bytes32(uint256(0xff));
+        0x8116a128b135962baae86382f90f26a5e28c4bb803b8888f92fd98e3bbbc6d00;
 
     struct Data {
         /// @dev The (default) address that receives all royalty value.
diff --git a/contracts/extension/upgradeable/RoyaltyPayments.sol b/contracts/extension/upgradeable/RoyaltyPayments.sol
@@ -8,7 +8,10 @@ import "../interface/IRoyaltyEngineV1.sol";
 import { IERC2981 } from "../../eip/interface/IERC2981.sol";
 
 library RoyaltyPaymentsStorage {
-    bytes32 public constant ROYALTY_PAYMENTS_STORAGE_POSITION = keccak256("royalty.payments.storage");
+    /// @custom:storage-location erc7201:royalty.payments.storage
+    /// @dev keccak256(abi.encode(uint256(keccak256("royalty.payments.storage")) - 1)) & ~bytes32(uint256(0xff))
+    bytes32 public constant ROYALTY_PAYMENTS_STORAGE_POSITION =
+        0xc802b338f3fb784853cf3c808df5ff08335200e394ea2c687d12571a91045000;
 
     struct Data {
         /// @dev The address of RoyaltyEngineV1, replacing the one set during construction.
diff --git a/contracts/extension/upgradeable/RulesEngine.sol b/contracts/extension/upgradeable/RulesEngine.sol
@@ -13,9 +13,10 @@ import "../../eip/interface/IERC1155.sol";
 import "../../external-deps/openzeppelin/utils/structs/EnumerableSet.sol";
 
 library RulesEngineStorage {
-    /// @custom:storage-location erc7201:extension.manager.storage
+    /// @custom:storage-location erc7201:rules.engine.storage
+    /// @dev keccak256(abi.encode(uint256(keccak256("rules.engine.storage")) - 1)) & ~bytes32(uint256(0xff))
     bytes32 public constant RULES_ENGINE_STORAGE_POSITION =
-        keccak256(abi.encode(uint256(keccak256("rules.engine.storage")) - 1)) & ~bytes32(uint256(0xff));
+        0x41d4cb087b2c44a761b2288e4c8ac115e76a546efd837c9a2e9cec2661a49a00;
 
     struct Data {
         address rulesEngineOverride;
diff --git a/contracts/extension/upgradeable/SharedMetadataBatch.sol b/contracts/extension/upgradeable/SharedMetadataBatch.sol
@@ -12,9 +12,10 @@ import "../../external-deps/openzeppelin/utils/EnumerableSet.sol";
  *  @notice  Store a batch of shared metadata for NFTs
  */
 library SharedMetadataBatchStorage {
-    /// @custom:storage-location erc7201:extension.manager.storage
+    /// @custom:storage-location erc7201:shared.metadata.batch.storage
+    /// @dev keccak256(abi.encode(uint256(keccak256("shared.metadata.batch.storage")) - 1)) & ~bytes32(uint256(0xff))
     bytes32 public constant SHARED_METADATA_BATCH_STORAGE_POSITION =
-        keccak256(abi.encode(uint256(keccak256("shared.metadata.batch.storage")) - 1)) & ~bytes32(uint256(0xff));
+        0xf85ae2b98503142dac20c6561e88360cff7f1cb5634b6ad090b7f724e2f67a00;
 
     struct Data {
         EnumerableSet.Bytes32Set ids;
diff --git a/contracts/infra/registry/registry-extension/TWMultichainRegistryStorage.sol b/contracts/infra/registry/registry-extension/TWMultichainRegistryStorage.sol
@@ -8,7 +8,10 @@ import "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
 import "../../interface/ITWMultichainRegistry.sol";
 
 library TWMultichainRegistryStorage {
-    bytes32 public constant MULTICHAIN_REGISTRY_STORAGE_POSITION = keccak256("multichain.registry.storage");
+    /// @custom:storage-location erc7201:multichain.registry.storage
+    /// @dev keccak256(abi.encode(uint256(keccak256("multichain.registry.storage")) - 1)) & ~bytes32(uint256(0xff))
+    bytes32 public constant MULTICHAIN_REGISTRY_STORAGE_POSITION =
+        0x14e6df431852605a9ea88d8bd521d0d3fa06563ab37f65080e288e5afad4ac00;
 
     struct Data {
         /// @dev wallet address => [contract addresses]
diff --git a/contracts/prebuilts/account/utils/AccountCoreStorage.sol b/contracts/prebuilts/account/utils/AccountCoreStorage.sol
@@ -2,7 +2,10 @@
 pragma solidity ^0.8.11;
 
 library AccountCoreStorage {
-    bytes32 public constant ACCOUNT_CORE_STORAGE_POSITION = keccak256("account.core.storage");
+    /// @custom:storage-location erc7201:account.core.storage
+    /// @dev keccak256(abi.encode(uint256(keccak256("account.core.storage")) - 1)) & ~bytes32(uint256(0xff))
+    bytes32 public constant ACCOUNT_CORE_STORAGE_POSITION =
+        0x036f52c1827dab135f7fd44ca0bddde297e2f659c710e0ec53e975f22b548300;
 
     struct Data {
         address entrypointOverride;
diff --git a/contracts/prebuilts/marketplace/direct-listings/DirectListingsStorage.sol b/contracts/prebuilts/marketplace/direct-listings/DirectListingsStorage.sol
@@ -9,9 +9,10 @@ import { IDirectListings } from "../IMarketplace.sol";
  * @author  thirdweb.com
  */
 library DirectListingsStorage {
-    /// @custom:storage-location erc7201:extension.manager.storage
+    /// @custom:storage-location erc7201:direct.listings.storage
+    /// @dev keccak256(abi.encode(uint256(keccak256("direct.listings.storage")) - 1)) & ~bytes32(uint256(0xff))
     bytes32 public constant DIRECT_LISTINGS_STORAGE_POSITION =
-        keccak256(abi.encode(uint256(keccak256("direct.listings.storage")) - 1)) & ~bytes32(uint256(0xff));
+        0xa5370dfa5e46a36b8e1214352e211aa04006b977c8fd45a98e6b8c6e230ba000;
 
     struct Data {
         uint256 totalListings;
diff --git a/contracts/prebuilts/marketplace/english-auctions/EnglishAuctionsStorage.sol b/contracts/prebuilts/marketplace/english-auctions/EnglishAuctionsStorage.sol
@@ -9,9 +9,10 @@ import { IEnglishAuctions } from "../IMarketplace.sol";
  * @author  thirdweb.com
  */
 library EnglishAuctionsStorage {
-    /// @custom:storage-location erc7201:extension.manager.storage
+    /// @custom:storage-location erc7201:english.auctions.storage
+    /// @dev keccak256(abi.encode(uint256(keccak256("english.auctions.storage")) - 1)) & ~bytes32(uint256(0xff))
     bytes32 public constant ENGLISH_AUCTIONS_STORAGE_POSITION =
-        keccak256(abi.encode(uint256(keccak256("english.auctions.storage")) - 1)) & ~bytes32(uint256(0xff));
+        0x89032daddd224983b4d69fda31dc440901185d9636f6e798dbe1e433d9d34c00;
 
     struct Data {
         uint256 totalAuctions;
diff --git a/contracts/prebuilts/marketplace/offers/OffersStorage.sol b/contracts/prebuilts/marketplace/offers/OffersStorage.sol
diff --git a/contracts/prebuilts/unaudited/burn-to-claim-drop/extension/BurnToClaimDrop721Storage.sol b/contracts/prebuilts/unaudited/burn-to-claim-drop/extension/BurnToClaimDrop721Storage.sol
diff --git a/src/test/plugin/Router.t.sol b/src/test/plugin/Router.t.sol
