Merge pull request #13 from Transient-Labs/disable-initializer

added disable initializer to constructor of BlockListRegistry
Transient-Labs · Feb 7, 2023 · 7494a4b · 7494a4b
2 parents 678fe98 + 467b75a
commit 7494a4b
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 3 deletions.
diff --git a/src/BlockListRegistry.sol b/src/BlockListRegistry.sol
@@ -34,6 +34,11 @@ contract BlockListRegistry is IBlockListRegistry, OwnableAccessControlUpgradeabl
                                 Constructor
     //////////////////////////////////////////////////////////////////////////*/
 
+    /// @param disable - disable the initalizer on deployment
+    constructor(bool disable) {
+        if (disable) _disableInitializers();
+    }
+
     /// @param newOwner - the initial owner of this contract
     /// @param initBlockList - initial list of addresses to add to the blocklist
     function initialize(address newOwner, address[] memory initBlockList) external initializer {

diff --git a/src/BlockListRegistryFactory.sol b/src/BlockListRegistryFactory.sol
@@ -16,6 +16,7 @@ import {BlockListRegistry} from "./BlockListRegistry.sol";
 /// @title BlockListFactory
 /// @notice contract factory to deploy blocklist registries.
 /// @author transientlabs.xyz
+
 contract BlockListRegistryFactory is Ownable {
     /*//////////////////////////////////////////////////////////////////////////
                                 Events

diff --git a/test/integration_tests/BlockListIntegration.t.sol b/test/integration_tests/BlockListIntegration.t.sol
@@ -20,7 +20,7 @@ contract BlockListIntegrationTest is Test {
         blockList.push(address(2));
         blockList.push(address(3));
 
-        blockListRegistryTemplate = address(new BlockListRegistry());
+        blockListRegistryTemplate = address(new BlockListRegistry(true));
         factory = new BlockListRegistryFactory(blockListRegistryTemplate);
         registry = factory.createBlockListRegistry(blockList);
         mockContract = new BlockListMock(registry);

diff --git a/test/integration_tests/BlockListUpgradeableIntegration.t.sol b/test/integration_tests/BlockListUpgradeableIntegration.t.sol
@@ -20,7 +20,7 @@ contract BlockListUpgradeableIntegrationTest is Test {
         blockList.push(address(2));
         blockList.push(address(3));
 
-        blockListRegistryTemplate = address(new BlockListRegistry());
+        blockListRegistryTemplate = address(new BlockListRegistry(true));
         factory = new BlockListRegistryFactory(blockListRegistryTemplate);
         registry = factory.createBlockListRegistry(blockList);
         mockContract = new BlockListMockUpgradeable();

diff --git a/test/unit_tests/BlockListRegistry.t.sol b/test/unit_tests/BlockListRegistry.t.sol
@@ -11,8 +11,10 @@ contract BlockListRegistryUnitTest is Test, BlockListRegistry {
     bytes32 public constant NOT_ADMIN_ROLE = keccak256("NOT_ADMIN_ROLE");
     BlockListRegistry public blocklist;
 
+    constructor() BlockListRegistry(false) {}
+
     function setUp() public {
-        blocklist = new BlockListRegistry();
+        blocklist = new BlockListRegistry(false);
         blocklist.initialize(address(this), initBlockedOperators);
     }