4.0.2 - removed blocklist abstract contracts as the iheritance tree g…

…ets tricky and this is a registry more than anything so doesn't make sense to include those abstract contracts. Especially as this will stay at 0.8.19 for the foreseeable future to avoid deploying a new factory.

foundry.toml

@@ -6,8 +6,6 @@ libs = ['lib']                                                # a list of librar
 libraries = []                                                # a list of deployed libraries to link against
 cache = true                                                  # whether to cache builds or not
 force = false                                                 # whether to ignore the cache (clean build)
-evm_version = 'london'                                        # the evm version (by hardfork name)
-#solc_version = '0.8.17'                                      # override for the solc version (setting this ignores `auto_detect_solc`)
 auto_detect_solc = true                                       # enable auto-detection of the appropriate solc version to use
 offline = false                                               # disable downloading of missing solc version(s)
 optimizer = true                                              # enable or disable the solc optimizer
@@ -18,4 +16,4 @@ gas_reports = ["*"]
 fs_permissions = [{ access = 'read', path = './test/file_utils'}] 
 
 [fuzz]
-runs = 2000
+runs = 20000

remappings.txt

@@ -0,0 +1,5 @@
+ds-test/=lib/forge-std/lib/ds-test/src/
+forge-std/=lib/forge-std/src/
+openzeppelin-upgradeable/=lib/tl-sol-tools/lib/openzeppelin-contracts-upgradeable/contracts/
+openzeppelin/=lib/tl-sol-tools/lib/openzeppelin-contracts/contracts/
+tl-sol-tools/=lib/tl-sol-tools/src/

src/BlockListRegistry.sol

@@ -2,7 +2,7 @@
 pragma solidity 0.8.19;
 
 import {ERC165Upgradeable} from "openzeppelin-upgradeable/utils/introspection/ERC165Upgradeable.sol";
-import {OwnableAccessControlUpgradeable} from "lib/tl-sol-tools/src/upgradeable/access/OwnableAccessControlUpgradeable.sol";
+import {OwnableAccessControlUpgradeable} from "tl-sol-tools/upgradeable/access/OwnableAccessControlUpgradeable.sol";
 import {IBlockListRegistry} from "src/IBlockListRegistry.sol";
 
 /// @title BlockListRegistry

src/BlockListRegistryFactory.sol

@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.19;
 
-import {Ownable} from "lib/openzeppelin-contracts/contracts/access/Ownable.sol";
-import {Clones} from "lib/openzeppelin-contracts/contracts/proxy/Clones.sol";
+import {Ownable} from "openzeppelin/access/Ownable.sol";
+import {Clones} from "openzeppelin/proxy/Clones.sol";
 import {BlockListRegistry} from "src/BlockListRegistry.sol";
 
 /// @title BlockListFactory

test/BlockListRegistry.t.sol

@@ -2,9 +2,9 @@
 pragma solidity 0.8.19;
 
 import "forge-std/Test.sol";
-import {NotRoleOrOwner} from "lib/tl-sol-tools/src/access/OwnableAccessControl.sol";
+import {NotRoleOrOwner} from "tl-sol-tools/access/OwnableAccessControl.sol";
 import {BlockListRegistry, IBlockListRegistry} from "src/BlockListRegistry.sol";
-import {IERC165Upgradeable} from "lib/openzeppelin-contracts-upgradeable/contracts/utils/introspection/IERC165Upgradeable.sol";
+import {IERC165Upgradeable} from "openzeppelin-upgradeable/utils/introspection/IERC165Upgradeable.sol";
 
 contract BlockListRegistryUnitTest is Test, BlockListRegistry {
     address[] public initBlockedOperators = [address(1), address(2), address(3)];