feat: add KeyRegistry (#257)

* feat: add KeyRegistry

* feat: transfer ownership in constructor

* feat(KeyRegistry): add migration switch

* feat(KeyRegistry): bulk add/remove signers

* feat(KeyRegistry): add admin migration grace period

* chore: rename scope to keyType

* feat: remove ability to freeze signers

* feat: a signer key can only be associated with one type

* test: assert state of signer as part of all fuzz tests

* chore: remove invalid comments

* feat: add metadata to Register event

* refactor: rename for clarity

* test: add coverage for cases, pull out shared helpers

* refactor: parameter ordering in Add event

* change scheme from uint200 to uint32

* fix: test helper after rebase

* feat: add the migrated timestamp to the event

---------

Co-authored-by: Varun Srinivasan <[email protected]>

Author: horsefacts

.vscode/settings.json

@@ -3,7 +3,7 @@
     ".git": true,
     "out": true,
     "cache": true,
-    "lib": true,
+    "lib": true
   },
   "editor.formatOnSave": true,
   "editor.rulers": [119],
@@ -14,12 +14,6 @@
     "editor.defaultFormatter": "JuanBlanco.solidity"
   },
   "solidity.formatter": "forge",
-  "cSpell.words": [
-    "curr",
-    "Fname",
-    "Seedable",
-    "Pausable",
-    "UUPS"
-  ],
-  "solidity.compileUsingRemoteVersion": "v0.8.18+commit.87f61d96"
+  "cSpell.words": ["curr", "Fname", "Seedable", "Pausable", "UUPS"],
+  "solidity.compileUsingRemoteVersion": "v0.8.19+commit.7dd6d404"
 }

script/Deploy.s.sol

@@ -5,7 +5,7 @@ import "forge-std/Script.sol";
 import "forge-std/console.sol";
 import {AggregatorV3Interface} from "chainlink/v0.8/interfaces/AggregatorV3Interface.sol";
 
-import {IdRegistryFab} from "./helpers/IdRegistryFab.sol";
+import {IdRegistry} from "../src/IdRegistry.sol";
 import {StorageRent} from "../src/StorageRent.sol";
 import {MockPriceFeed, MockUptimeFeed, MockChainlinkFeed} from "../test/Utils.sol";
 
@@ -32,7 +32,7 @@ contract Deploy is Script {
 
         vm.startBroadcast();
         (AggregatorV3Interface priceFeed, AggregatorV3Interface uptimeFeed) = _getOrDeployPriceFeeds();
-        IdRegistryFab idRegistry = new IdRegistryFab(initialOwner, ID_REGISTRY_CREATE2_SALT);
+        IdRegistry idRegistry = new IdRegistry{ salt: ID_REGISTRY_CREATE2_SALT }(initialOwner);
         StorageRent storageRent = new StorageRent{ salt: STORAGE_RENT_CREATE2_SALT }(
             priceFeed,
             uptimeFeed,
@@ -46,7 +46,7 @@ contract Deploy is Script {
             treasurer
         );
         vm.stopBroadcast();
-        console.log("ID Registry: %s", idRegistry.registryAddr());
+        console.log("ID Registry: %s", address(idRegistry));
         console.log("Storage Rent: %s", address(storageRent));
     }
 

script/IdRegistry.s.sol

@@ -2,7 +2,7 @@
 pragma solidity 0.8.19;
 
 import "forge-std/Script.sol";
-import {IdRegistryFab} from "./helpers/IdRegistryFab.sol";
+import {IdRegistry} from "../src/IdRegistry.sol";
 
 contract IdRegistryScript is Script {
     bytes32 internal constant CREATE2_SALT = "fc";
@@ -11,6 +11,6 @@ contract IdRegistryScript is Script {
         address initialOwner = vm.envAddress("ID_REGISTRY_OWNER_ADDRESS");
 
         vm.broadcast();
-        new IdRegistryFab(initialOwner, CREATE2_SALT);
+        new IdRegistry{ salt: CREATE2_SALT }(initialOwner);
     }
 }

script/helpers/IdRegistryFab.sol

@@ -75,7 +75,9 @@ contract Bundler is Ownable2Step {
      * @param _storageRent   Address of the StorageRent contract
      * @param _trustedCaller Address that can call trustedRegister and trustedBatchRegister
      */
-    constructor(address _idRegistry, address _storageRent, address _trustedCaller) {
+    constructor(address _idRegistry, address _storageRent, address _trustedCaller, address _owner) {
+        _transferOwnership(_owner);
+
         idRegistry = IdRegistry(_idRegistry);
         storageRent = StorageRent(_storageRent);
         trustedCaller = _trustedCaller;

src/Bundler.sol

@@ -100,7 +100,8 @@ contract FnameResolver is IExtendedResolver, EIP712, ERC165, Ownable2Step {
      * @param _url    Lookup gateway URL. This value is set permanently.
      * @param _signer Initial authorized signer address.
      */
-    constructor(string memory _url, address _signer) EIP712("Farcaster name verification", "1") {
+    constructor(string memory _url, address _signer, address _owner) EIP712("Farcaster name verification", "1") {
+        _transferOwnership(_owner);
         url = _url;
         signers[_signer] = true;
         emit AddSigner(_signer);

src/FnameResolver.sol

@@ -144,7 +144,7 @@ contract IdRegistry is Ownable2Step, Pausable, EIP712, Nonces {
      * @notice Set the owner of the contract to the deployer.
      */
     // solhint-disable-next-line no-empty-blocks
-    constructor() EIP712("Farcaster IdRegistry", "1") {}
+    constructor(address _owner) EIP712("Farcaster IdRegistry", "1") {}
 
     /*//////////////////////////////////////////////////////////////
                              REGISTRATION LOGIC