undid some work, root registration and transfer works but transfer through registry still breaks subdomain registration

Author: JamesEarle

contracts/registrar/ZNSRootRegistrar.sol

@@ -73,6 +73,7 @@ contract ZNSRootRegistrar is
     }
 
     function registerRootDomainBulk(
+        address[] calldata owners, // for post registration, we transfer to actual owner
         string[] calldata names,
         address[] calldata domainAddresses,
         string [] calldata tokenURIs,
@@ -84,14 +85,20 @@ contract ZNSRootRegistrar is
         for (uint256 i = 0; i < names.length;) {
             // DistributionConfig memory distrConfig = DistributionConfig(IZNSPricer(address(0)), PaymentType.DIRECT, AccessType.OPEN);
             // PaymentConfig memory paymentConfig = PaymentConfig(IERC20(address(0)), address(0));
-            registerRootDomain(
+            bytes32 domainHash = registerRootDomain(
                 names[i],
                 domainAddresses[i],
                 tokenURIs[i],
                 emptyDistrConfig,
                 emptyPaymentConfig
             );
 
+            // Transfer ERC721 to actual owner
+            domainToken.transferFrom(msg.sender, owners[i], uint256(domainHash));
+
+            // This call breaks subdomain registration right now
+            // registry.updateDomainOwnerForMigration(domainHash, owners[i]);
+
             unchecked {
                 ++i;
             }

contracts/registry/IZNSRegistry.sol

@@ -142,6 +142,11 @@ interface IZNSRegistry {
 
     function updateDomainOwner(bytes32 domainHash, address owner) external;
 
+    function updateDomainOwnerForMigration(
+            bytes32 domainHash,
+            address owner
+        ) external;
+
     function updateDomainResolver(
         bytes32 domainHash,
         string calldata resolverType

contracts/registry/ZNSRegistry.sol

@@ -239,6 +239,14 @@ contract ZNSRegistry is AAccessControlled, UUPSUpgradeable, IZNSRegistry {
         _setDomainOwner(domainHash, owner);
     }
 
+    // TODO for remove after migration. This is to allow a no contact airdrop to users in migration
+    function updateDomainOwnerForMigration(
+        bytes32 domainHash,
+        address owner
+    ) external override {
+        _setDomainOwner(domainHash, owner);
+    }
+
     /**
      * @notice Updates the resolver of an existing domain in `records`.
      * Can be called by either the owner of the Name or an allowed operator.

src/utils/migration/02_register.ts

@@ -64,6 +64,8 @@ const main = async () => {
     await zns.meowToken.connect(migrationAdmin).approve(await zns.treasury.getAddress(), hre.ethers.MaxUint256);
   }
 
+  await zns.domainToken.connect(migrationAdmin).setApprovalForAll(await zns.rootRegistrar.getAddress(), true);
+
   // TODO fix, On real chain we wont use the mock that can simply mint tokens
   await zns.meowToken.connect(migrationAdmin).mint(migrationAdmin.address, hre.ethers.parseEther("99999999999999999999"));
 
@@ -94,6 +96,9 @@ const main = async () => {
     start
   );
 
+  const tid = rootDomains[0].tokenId;
+  const ownerBefore = await zns.domainToken.ownerOf(tid);
+
   // ms -> s -> min
   const totalTime = (Date.now() - startTime) / 1000 / 60;
   console.log(`Registered ${registeredDomains.length + registeredSubdomains.length} groups of domains in ${totalTime} minutes`);

src/utils/migration/registration.ts

@@ -93,6 +93,7 @@ export const registerBase = async ({
 
   // console.log("DEBUG");
 
+  const owners = domains.map((domain) => { return domain.owner.id });
   const parentHashes = domains.map((domain) => { return domain.parentHash });
   const labels = domains.map((domain) => { return domain.label });
   const domainAddresses = domains.map((domain) => {return domain.address });
@@ -108,10 +109,16 @@ export const registerBase = async ({
       // We aren't setting configs intentionally.
       // console.log(`Registering ${domains.length} root domains...`);
       tx = await zns.rootRegistrar.connect(regAdmin).registerRootDomainBulk(
+        owners,
         labels,
         domainAddresses,
         tokenURIs,
-        distrConfigEmpty, // TODO what should this be? stake vs, direct should be upheld maybe?
+        {
+          pricerContract: hre.ethers.ZeroAddress,
+          paymentType: 0n, // Direct
+          accessType: 1n, // Open
+
+        }, // TODO what should this be? stake vs, direct should be upheld maybe?
         paymentConfigEmpty,
         // {
         //   // TODO Debug, force the TX
@@ -171,6 +178,8 @@ export const registerBase = async ({
 
   // console.log(`DOMAINHASHES: ${domainHashes.length}`);
 
+  // console.log(txReceipt.hash);
+
   return { domainHashes, txHash: txReceipt.hash, retryData: undefined };
 };