feat: unwrapped controller support

Author: TateB

abis/EthRegistrarControllerOld.json abis/LegacyEthRegistrarController.jsonabis/EthRegistrarControllerOld.json renamed to abis/LegacyEthRegistrarController.json

@@ -15,46 +15,21 @@
       "address": "0x57f1887a8BF19b14fC0dF6Fd9B2acc9Af147eA85",
       "startBlock": 9380410
     },
-    "EthRegistrarControllerOld": {
+    "LegacyEthRegistrarController": {
       "address": "0x283Af0B28c62C092C9727F1Ee09c02CA627EB7F5",
       "startBlock": 9380471
     },
-    "EthRegistrarController": {
+    "WrappedEthRegistrarController": {
       "address": "0x253553366Da8546fC250F225fe3d25d0C782303b",
       "startBlock": 16925618
     },
     "NameWrapper": {
       "address": "0xD4416b13d2b3a9aBae7AcD5D6C2BbDBE25686401",
       "startBlock": 16925608
-    }
-  },
-  "goerli": {
-    "ENSRegistry": {
-      "address": "0x00000000000C2E074eC69A0dFb2997BA6C7d2e1e",
-      "startBlock": 2086611
     },
-    "ENSRegistryOld": {
-      "address": "0x112234455c3a32fd11230c42e7bccd4a84e02010",
-      "startBlock": 43152
-    },
-    "Resolver": {
-      "startBlock": 43152
-    },
-    "BaseRegistrar": {
-      "address": "0x57f1887a8BF19b14fC0dF6Fd9B2acc9Af147eA85",
-      "startBlock": 2086621
-    },
-    "EthRegistrarControllerOld": {
-      "address": "0x283Af0B28c62C092C9727F1Ee09c02CA627EB7F5",
-      "startBlock": 2086640
-    },
-    "EthRegistrarController": {
-      "address": "0xCc5e7dB10E65EED1BBD105359e7268aa660f6734",
-      "startBlock": 8649286
-    },
-    "NameWrapper": {
-      "address": "0x114D4603199df73e7D157787f8778E21fCd13066",
-      "startBlock": 8649122
+    "UnwrappedEthRegistrarController": {
+      "address": "0x59E16fcCd424Cc24e280Be16E11Bcd56fb0CE547",
+      "startBlock": 22764821
     }
   },
   "sepolia": {
@@ -73,17 +48,21 @@
       "address": "0x57f1887a8BF19b14fC0dF6Fd9B2acc9Af147eA85",
       "startBlock": 3702731
     },
-    "EthRegistrarControllerOld": {
+    "LegacyEthRegistrarController": {
       "address": "0x7e02892cfc2Bfd53a75275451d73cF620e793fc0",
       "startBlock": 3790197
     },
-    "EthRegistrarController": {
+    "WrappedEthRegistrarController": {
       "address": "0xFED6a969AaA60E4961FCD3EBF1A2e8913ac65B72",
       "startBlock": 3790244
     },
     "NameWrapper": {
       "address": "0x0635513f179D50A207757E05759CbD106d7dFcE8",
       "startBlock": 3790153
+    },
+    "UnwrappedEthRegistrarController": {
+      "address": "0xfb3cE5D01e0f33f41DbB39035dB9745962F1f968",
+      "startBlock": 8579988
     }
   },
   "holesky": {
@@ -102,17 +81,21 @@
       "address": "0x57f1887a8BF19b14fC0dF6Fd9B2acc9Af147eA85",
       "startBlock": 801686
     },
-    "EthRegistrarControllerOld": {
+    "LegacyEthRegistrarController": {
       "address": "0xf13fC748601fDc5afA255e9D9166EB43f603a903",
       "startBlock": 815355
     },
-    "EthRegistrarController": {
+    "WrappedEthRegistrarController": {
       "address": "0x179Be112b24Ad4cFC392eF8924DfA08C20Ad8583",
       "startBlock": 815359
     },
     "NameWrapper": {
       "address": "0xab50971078225D365994dc1Edcb9b7FD72Bb4862",
       "startBlock": 815127
+    },
+    "UnwrappedEthRegistrarController": {
+      "address": "0xFce6ce4373CB6E7e470EAa55329638acD9Dbd202",
+      "startBlock": 4027261
     }
   }
 }

abis/UnwrappedEthRegistrarController.json

@@ -16,12 +16,15 @@ import {
   Transfer as TransferEvent,
 } from "./types/BaseRegistrar/BaseRegistrar";
 
-import { NameRegistered as ControllerNameRegisteredEventOld } from "./types/EthRegistrarControllerOld/EthRegistrarControllerOld";
-
 import {
-  NameRegistered as ControllerNameRegisteredEvent,
-  NameRenewed as ControllerNameRenewedEvent,
-} from "./types/EthRegistrarController/EthRegistrarController";
+  NameRegistered as LegacyEthRegistrarController_NameRegistered,
+  NameRenewed as LegacyEthRegistrarController_NameRenewed,
+} from "./types/LegacyEthRegistrarController/LegacyEthRegistrarController";
+import {
+  NameRegistered as UnwrappedEthRegistrarController_NameRegistered,
+  NameRenewed as UnwrappedEthRegistrarController_NameRenewed,
+} from "./types/UnwrappedEthRegistrarController/UnwrappedEthRegistrarController";
+import { NameRegistered as WrappedEthRegistrarController_NameRegistered } from "./types/WrappedEthRegistrarController/WrappedEthRegistrarController";
 
 // Import entity types generated from the GraphQL schema
 import {
@@ -71,14 +74,24 @@ export function handleNameRegistered(event: NameRegisteredEvent): void {
   registrationEvent.save();
 }
 
-export function handleNameRegisteredByControllerOld(
-  event: ControllerNameRegisteredEventOld
+// Legacy controller
+
+export function handleNameRegisteredByLegacyController(
+  event: LegacyEthRegistrarController_NameRegistered
+): void {
+  setNamePreimage(event.params.name, event.params.label, event.params.cost);
+}
+
+export function handleNameRenewedByLegacyController(
+  event: LegacyEthRegistrarController_NameRenewed
 ): void {
   setNamePreimage(event.params.name, event.params.label, event.params.cost);
 }
 
-export function handleNameRegisteredByController(
-  event: ControllerNameRegisteredEvent
+// Wrapped controller (reuses same renew event as legacy controller)
+
+export function handleNameRegisteredByWrappedController(
+  event: WrappedEthRegistrarController_NameRegistered
 ): void {
   setNamePreimage(
     event.params.name,
@@ -87,10 +100,26 @@ export function handleNameRegisteredByController(
   );
 }
 
-export function handleNameRenewedByController(
-  event: ControllerNameRenewedEvent
+// Unwrapped controller
+
+export function handleNameRegisteredByUnwrappedController(
+  event: UnwrappedEthRegistrarController_NameRegistered
 ): void {
-  setNamePreimage(event.params.name, event.params.label, event.params.cost);
+  setNamePreimage(
+    event.params.label,
+    event.params.labelhash,
+    event.params.baseCost.plus(event.params.premium)
+  );
+}
+
+export function handleNameRenewedByUnwrappedController(
+  event: UnwrappedEthRegistrarController_NameRenewed
+): void {
+  setNamePreimage(
+    event.params.label,
+    event.params.labelhash,
+    event.params.cost
+  );
 }
 
 function setNamePreimage(name: string, label: Bytes, cost: BigInt): void {

abis/EthRegistrarController.json abis/WrappedEthRegistrarController.jsonabis/EthRegistrarController.json renamed to abis/WrappedEthRegistrarController.json

@@ -34,6 +34,7 @@ dataSources:
           handler: handleNewResolver
         - event: "NewTTL(indexed bytes32,uint64)"
           handler: handleNewTTL
+
   - kind: ethereum/contract
     name: ENSRegistryOld
     network: mainnet
@@ -62,6 +63,7 @@ dataSources:
           handler: handleNewResolverOldRegistry
         - event: "NewTTL(indexed bytes32,uint64)"
           handler: handleNewTTLOldRegistry
+
   - kind: ethereum/contract
     name: Resolver
     network: mainnet
@@ -110,6 +112,7 @@ dataSources:
           handler: handleTextChangedWithValue
         - event: "VersionChanged(indexed bytes32,uint64)"
           handler: handleVersionChanged
+
   - kind: ethereum/contract
     name: BaseRegistrar
     network: mainnet
@@ -137,12 +140,13 @@ dataSources:
           handler: handleNameRenewed
         - event: "Transfer(indexed address,indexed address,indexed uint256)"
           handler: handleNameTransferred
+
   - kind: ethereum/contract
-    name: EthRegistrarControllerOld
+    name: LegacyEthRegistrarController
     network: mainnet
     source:
       address: "0x283Af0B28c62C092C9727F1Ee09c02CA627EB7F5"
-      abi: EthRegistrarControllerOld
+      abi: LegacyEthRegistrarController
       startBlock: 9380471
     mapping:
       kind: ethereum/events
@@ -152,21 +156,22 @@ dataSources:
       entities:
         - Registration
       abis:
-        - name: EthRegistrarControllerOld
-          file: ./abis/EthRegistrarControllerOld.json
+        - name: LegacyEthRegistrarController
+          file: ./abis/LegacyEthRegistrarController.json
       eventHandlers:
         - event: >-
             NameRegistered(string,indexed bytes32,indexed
             address,uint256,uint256)
-          handler: handleNameRegisteredByControllerOld
+          handler: handleNameRegisteredByLegacyController
         - event: "NameRenewed(string,indexed bytes32,uint256,uint256)"
-          handler: handleNameRenewedByController
+          handler: handleNameRenewedByLegacyController
+
   - kind: ethereum/contract
-    name: EthRegistrarController
+    name: WrappedEthRegistrarController
     network: mainnet
     source:
       address: "0x253553366Da8546fC250F225fe3d25d0C782303b"
-      abi: EthRegistrarController
+      abi: WrappedEthRegistrarController
       startBlock: 16925618
     mapping:
       kind: ethereum/events
@@ -176,15 +181,16 @@ dataSources:
       entities:
         - Registration
       abis:
-        - name: EthRegistrarController
-          file: ./abis/EthRegistrarController.json
+        - name: WrappedEthRegistrarController
+          file: ./abis/WrappedEthRegistrarController.json
       eventHandlers:
         - event: >-
             NameRegistered(string,indexed bytes32,indexed
             address,uint256,uint256,uint256)
-          handler: handleNameRegisteredByController
+          handler: handleNameRegisteredByWrappedController
         - event: "NameRenewed(string,indexed bytes32,uint256,uint256)"
-          handler: handleNameRenewedByController
+          handler: handleNameRenewedByLegacyController
+
   - kind: ethereum/contract
     name: NameWrapper
     network: mainnet
@@ -214,4 +220,29 @@ dataSources:
         - event: TransferSingle(indexed address,indexed address,indexed address,uint256,uint256)
           handler: handleTransferSingle
         - event: TransferBatch(indexed address,indexed address,indexed address,uint256[],uint256[])
-          handler: handleTransferBatch
+          handler: handleTransferBatch
+
+  - kind: ethereum/contract
+    name: UnwrappedEthRegistrarController
+    network: mainnet
+    source:
+      address: "0x59E16fcCd424Cc24e280Be16E11Bcd56fb0CE547"
+      abi: UnwrappedEthRegistrarController
+      startBlock: 22764821
+    mapping:
+      kind: ethereum/events
+      apiVersion: 0.0.6
+      language: wasm/assemblyscript
+      file: ./src/ethRegistrar.ts
+      entities:
+        - Registration
+      abis:
+        - name: UnwrappedEthRegistrarController
+          file: ./abis/UnwrappedEthRegistrarController.json
+      eventHandlers:
+        - event: >-
+            NameRegistered(string,indexed bytes32,indexed
+            address,uint256,uint256,uint256,bytes32)
+          handler: handleNameRegisteredByUnwrappedController
+        - event: "NameRenewed(string,indexed bytes32,uint256,uint256,bytes32)"
+          handler: handleNameRenewedByUnwrappedController

networks.json

@@ -1,4 +1,4 @@
 {
   "version": "0.6.0",
-  "timestamp": 1707952879651
+  "timestamp": 1751423035005
 }