Deploy to mainnet

deploy/dnsregistrar/10_deploy_dnsregistrar.ts

@@ -32,11 +32,17 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   })
   console.log(`Deployed DNSRegistrar to ${tx.address}`)
 
-  const tx2 = await root
-    .connect(await ethers.getSigner(owner))
-    .setController(tx.address, true)
-  console.log(`Set DNSRegistrar as controller of Root (${tx2.hash})`)
-  await tx2.wait()
+  if (owner !== undefined && (await root.isOwner(owner))) {
+    const tx2 = await root
+      .connect(await ethers.getSigner(owner))
+      .setController(tx.address, true)
+    console.log(`Set DNSRegistrar as controller of Root (${tx2.hash})`)
+    await tx2.wait()
+  } else {
+    console.log(
+      `${owner} is not the owner of the root; you will need to call setController('${tx.address}', true) manually`,
+    )
+  }
 }
 
 func.tags = ['DNSRegistrar']

deploy/dnsregistrar/20_set_tlds.ts

@@ -1284,7 +1284,7 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   }
 }
 
-func.tags = ['DNSRegistrar']
+func.tags = ['registrar-tlds']
 func.dependencies = ['registry', 'dnssec-oracle']
 func.runAtTheEnd = true
 

deploy/resolvers/00_deploy_extended_dns_resolver.ts

@@ -13,7 +13,6 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   })
 }
 
-func.id = 'extended-dns-resolver'
 func.tags = ['resolvers', 'ExtendedDNSResolver']
 
 export default func

deployments/mainnet/.migrations.json

@@ -1,4 +1,5 @@
 {
   "ens": 1626404011,
-  "root": 1580387832
+  "root": 1580387832,
+  "setupRoot": 1580387832
 }