Merge pull request #22 from farcasterxyz/horsefacts/enumerable-keys

feat: enumerable keys

Author: horsefacts

.github/workflows/ci.yml

@@ -160,7 +160,7 @@ jobs:
       - name: Filter directories
         run: |
           sudo apt update && sudo apt install -y lcov
-          lcov --remove lcov.info 'test/*' 'script/*' --output-file lcov.info --rc lcov_branch_coverage=1
+          lcov --remove lcov.info 'test/*' 'script/*' 'src/libraries/*' --output-file lcov.info --rc lcov_branch_coverage=1
 
       # Post a detailed coverage report as a comment and deletes previous comments on each push.
       - name: Post coverage report

script/DeployL1.s.sol

@@ -2,7 +2,7 @@
 pragma solidity 0.8.21;
 
 import {FnameResolver} from "../src/FnameResolver.sol";
-import {console, ImmutableCreate2Deployer} from "./lib/ImmutableCreate2Deployer.sol";
+import {console, ImmutableCreate2Deployer} from "./abstract/ImmutableCreate2Deployer.sol";
 
 contract DeployL1 is ImmutableCreate2Deployer {
     bytes32 internal constant FNAME_RESOLVER_CREATE2_SALT = bytes32(0);

script/DeployL2.s.sol

@@ -10,7 +10,7 @@ import {SignedKeyRequestValidator} from "../src/validators/SignedKeyRequestValid
 import {Bundler, IBundler} from "../src/Bundler.sol";
 import {RecoveryProxy} from "../src/RecoveryProxy.sol";
 import {IMetadataValidator} from "../src/interfaces/IMetadataValidator.sol";
-import {console, ImmutableCreate2Deployer} from "./lib/ImmutableCreate2Deployer.sol";
+import {console, ImmutableCreate2Deployer} from "./abstract/ImmutableCreate2Deployer.sol";
 
 contract DeployL2 is ImmutableCreate2Deployer {
     uint256 public constant INITIAL_USD_UNIT_PRICE = 5e8; // $5 USD

script/FnameResolver.s.sol

@@ -4,7 +4,7 @@ pragma solidity 0.8.21;
 import "forge-std/Script.sol";
 
 import {FnameResolver} from "../src/FnameResolver.sol";
-import {ImmutableCreate2Deployer} from "./lib/ImmutableCreate2Deployer.sol";
+import {ImmutableCreate2Deployer} from "./abstract/ImmutableCreate2Deployer.sol";
 
 contract FnameResolverScript is ImmutableCreate2Deployer {
     function run() public {

script/IdRegistry.s.sol

@@ -2,7 +2,7 @@
 pragma solidity 0.8.21;
 
 import {IdRegistry} from "../src/IdRegistry.sol";
-import {ImmutableCreate2Deployer} from "./lib/ImmutableCreate2Deployer.sol";
+import {ImmutableCreate2Deployer} from "./abstract/ImmutableCreate2Deployer.sol";
 
 contract IdRegistryScript is ImmutableCreate2Deployer {
     function run() public {

script/KeyRegistry.s.sol

@@ -2,7 +2,7 @@
 pragma solidity 0.8.21;
 
 import {KeyRegistry} from "../src/KeyRegistry.sol";
-import {ImmutableCreate2Deployer} from "./lib/ImmutableCreate2Deployer.sol";
+import {ImmutableCreate2Deployer} from "./abstract/ImmutableCreate2Deployer.sol";
 
 contract IdRegistryScript is ImmutableCreate2Deployer {
     uint24 internal constant KEY_REGISTRY_MIGRATION_GRACE_PERIOD = 1 days;

script/StorageRegistry.s.sol

@@ -2,7 +2,7 @@
 pragma solidity 0.8.21;
 
 import {StorageRegistry} from "../src/StorageRegistry.sol";
-import {ImmutableCreate2Deployer} from "./lib/ImmutableCreate2Deployer.sol";
+import {ImmutableCreate2Deployer} from "./abstract/ImmutableCreate2Deployer.sol";
 
 contract StorageRegistryScript is ImmutableCreate2Deployer {
     uint256 internal constant INITIAL_RENTAL_PERIOD = 365 days;

script/UpgradeL2.s.sol

@@ -10,7 +10,7 @@ import {SignedKeyRequestValidator} from "../src/validators/SignedKeyRequestValid
 import {Bundler, IBundler} from "../src/Bundler.sol";
 import {RecoveryProxy} from "../src/RecoveryProxy.sol";
 import {IMetadataValidator} from "../src/interfaces/IMetadataValidator.sol";
-import {console, ImmutableCreate2Deployer} from "./lib/ImmutableCreate2Deployer.sol";
+import {console, ImmutableCreate2Deployer} from "./abstract/ImmutableCreate2Deployer.sol";
 
 contract UpgradeL2 is ImmutableCreate2Deployer {
     uint256 public constant INITIAL_USD_UNIT_PRICE = 5e8; // $5 USD

script/lib/ImmutableCreate2Deployer.sol renamed to script/abstract/ImmutableCreate2Deployer.sol

@@ -4,7 +4,7 @@ pragma solidity 0.8.21;
 import {IBundler} from "./interfaces/IBundler.sol";
 import {IIdGateway} from "./interfaces/IIdGateway.sol";
 import {IKeyGateway} from "./interfaces/IKeyGateway.sol";
-import {TransferHelper} from "./lib/TransferHelper.sol";
+import {TransferHelper} from "./libraries/TransferHelper.sol";
 
 /**
  * @title Farcaster Bundler