Merge pull request #76 from lens-protocol/misc/versioned-initializable-removal

Misc/versioned initializable removal

contracts/modules/act/collect/CollectPublicationAction.sol

@@ -12,7 +12,6 @@ import {Strings} from '@openzeppelin/contracts/utils/Strings.sol';
 import {Errors} from 'contracts/libraries/constants/Errors.sol';
 import {HubRestricted} from 'contracts/base/HubRestricted.sol';
 import {IModuleGlobals} from 'contracts/interfaces/IModuleGlobals.sol';
-import {VersionedInitializable} from 'contracts/base/upgradeability/VersionedInitializable.sol';
 
 contract CollectPublicationAction is HubRestricted, IPublicationActionModule {
     using Strings for uint256;

contracts/modules/act/seadrop/SeaDropMintPublicationAction.sol

@@ -10,18 +10,13 @@ import {Types} from 'contracts/libraries/constants/Types.sol';
 import {IERC20} from '@openzeppelin/contracts/token/ERC20/IERC20.sol';
 import {IWMATIC} from 'contracts/modules/interfaces/IWMATIC.sol';
 import {IERC721} from '@openzeppelin/contracts/token/ERC721/IERC721.sol';
-import {VersionedInitializable} from 'contracts/base/upgradeability/VersionedInitializable.sol';
 import {ERC721SeaDropStructsErrorsAndEvents} from '@seadrop/lib/ERC721SeaDropStructsErrorsAndEvents.sol';
 import {ISeaDrop} from '@seadrop/interfaces/ISeaDrop.sol';
 import {Clones} from 'openzeppelin-contracts/proxy/Clones.sol';
 import {PublicDrop} from '@seadrop/lib/SeaDropStructs.sol';
 import {LensSeaDropCollection} from 'contracts/modules/act/seadrop/LensSeaDropCollection.sol';
 
-contract SeaDropMintPublicationAction is VersionedInitializable, HubRestricted, IPublicationActionModule {
-    // Constant for upgradeability purposes, see VersionedInitializable,
-    // do not confuse it with the EIP-712 version number.
-    uint256 internal constant REVISION = 1;
-
+contract SeaDropMintPublicationAction is HubRestricted, IPublicationActionModule {
     uint256 constant MAX_BPS = 10_000;
 
     ISeaDrop public immutable SEADROP;
@@ -280,8 +275,4 @@ contract SeaDropMintPublicationAction is VersionedInitializable, HubRestricted,
             _rescaleFees(profileId, pubId, lensTreasuryFeeBps, publicDrop);
         }
     }
-
-    function getRevision() internal pure virtual override returns (uint256) {
-        return REVISION;
-    }
 }

contracts/namespaces/LensHandles.sol

@@ -3,17 +3,13 @@
 pragma solidity ^0.8.18;
 
 import {ERC721} from '@openzeppelin/contracts/token/ERC721/ERC721.sol';
-import {VersionedInitializable} from 'contracts/base/upgradeability/VersionedInitializable.sol';
 import {ImmutableOwnable} from 'contracts/misc/ImmutableOwnable.sol';
 import {ILensHandles} from 'contracts/interfaces/ILensHandles.sol';
 import {HandlesEvents} from 'contracts/namespaces/constants/Events.sol';
 import {HandlesErrors} from 'contracts/namespaces/constants/Errors.sol';
 import {HandleTokenURILib} from 'contracts/libraries/token-uris/HandleTokenURILib.sol';
 
-contract LensHandles is ILensHandles, ERC721, VersionedInitializable, ImmutableOwnable {
-    // Constant for upgradeability purposes, see VersionedInitializable. Do not confuse it with the EIP-712 revision number.
-    uint256 internal constant REVISION = 1;
-
+contract LensHandles is ILensHandles, ERC721, ImmutableOwnable {
     string constant NAMESPACE = 'lens';
     bytes32 constant NAMESPACE_HASH = keccak256(bytes(NAMESPACE));
 
@@ -29,8 +25,6 @@ contract LensHandles is ILensHandles, ERC721, VersionedInitializable, ImmutableO
         return string.concat('.', NAMESPACE);
     }
 
-    function initialize() external initializer {}
-
     /**
      * @dev See {IERC721Metadata-tokenURI}.
      */
@@ -88,8 +82,4 @@ contract LensHandles is ILensHandles, ERC721, VersionedInitializable, ImmutableO
             }
         }
     }
-
-    function getRevision() internal pure virtual override returns (uint256) {
-        return REVISION;
-    }
 }

contracts/namespaces/TokenHandleRegistry.sol

@@ -3,16 +3,12 @@
 pragma solidity ^0.8.18;
 
 import {IERC721} from '@openzeppelin/contracts/token/ERC721/IERC721.sol';
-import {VersionedInitializable} from 'contracts/base/upgradeability/VersionedInitializable.sol';
 import {ITokenHandleRegistry} from 'contracts/interfaces/ITokenHandleRegistry.sol';
 import {RegistryTypes} from 'contracts/namespaces/constants/Types.sol';
 import {RegistryErrors} from 'contracts/namespaces/constants/Errors.sol';
 import {RegistryEvents} from 'contracts/namespaces/constants/Events.sol';
 
-contract TokenHandleRegistry is ITokenHandleRegistry, VersionedInitializable {
-    // Constant for upgradeability purposes, see VersionedInitializable. Do not confuse it with the EIP-712 revision number.
-    uint256 internal constant REVISION = 1;
-
+contract TokenHandleRegistry is ITokenHandleRegistry {
     address immutable LENS_HUB;
     address immutable LENS_HANDLES;
 
@@ -56,8 +52,6 @@ contract TokenHandleRegistry is ITokenHandleRegistry, VersionedInitializable {
         LENS_HANDLES = lensHandles;
     }
 
-    function initialize() external initializer {}
-
     // V1 --> V2 Migration function
     function migrationLinkHandleWithToken(uint256 handleId, uint256 tokenId) external {
         if (msg.sender != LENS_HUB) {
@@ -151,10 +145,4 @@ contract TokenHandleRegistry is ITokenHandleRegistry, VersionedInitializable {
     function _tokenHash(RegistryTypes.Token memory token) internal pure returns (bytes32) {
         return keccak256(abi.encodePacked(token.collection, token.id));
     }
-
-    // VersionedInitializable
-
-    function getRevision() internal pure virtual override returns (uint256) {
-        return REVISION;
-    }
 }