@ensdomains/ensjs 3.0.0-alpha.46 → 3.0.0-alpha.48

package/src/functions/deleteSubname.ts

@@ -2,28 +2,34 @@ import { keccak256 as solidityKeccak256 } from '@ethersproject/solidity'
 import { ENSArgs } from '..'
 import { namehash } from '../utils/normalise'
 
-type Args = {
+type BaseArgs = {
   contract: 'registry' | 'nameWrapper'
+  method?: 'setRecord' | 'setSubnodeOwner'
 }
 
+type NameWrapperArgs = {
+  contract: 'nameWrapper'
+  method: 'setRecord' | 'setSubnodeOwner'
+}
+
+type Args = BaseArgs | NameWrapperArgs
+
 export default async function (
-  { contracts, signer }: ENSArgs<'contracts' | 'signer' | 'getExpiry'>,
+  { contracts, signer }: ENSArgs<'contracts' | 'signer'>,
   name: string,
-  { contract }: Args,
+  { contract, ...args }: Args,
 ) {
   const labels = name.split('.')
-
   if (labels.length < 3) {
     throw new Error(`${name} is not a valid subname`)
   }
 
-  const label = labels.shift() as string
-  const labelhash = solidityKeccak256(['string'], [label])
-  const parentNodehash = namehash(labels.join('.'))
-
   switch (contract) {
     case 'registry': {
       const registry = (await contracts!.getRegistry()!).connect(signer)
+      const label = labels.shift() as string
+      const labelhash = solidityKeccak256(['string'], [label])
+      const parentNodehash = namehash(labels.join('.'))
 
       return registry.populateTransaction.setSubnodeRecord(
         parentNodehash,
@@ -35,13 +41,24 @@ export default async function (
     }
     case 'nameWrapper': {
       const nameWrapper = (await contracts!.getNameWrapper()!).connect(signer)
+      const { method } = args as NameWrapperArgs
+
+      if (method === 'setRecord') {
+        const node = namehash(name)
+        return nameWrapper.populateTransaction.setRecord(
+          node,
+          '0x0000000000000000000000000000000000000000',
+          '0x0000000000000000000000000000000000000000',
+          0,
+        )
+      }
 
-      return nameWrapper.populateTransaction.setSubnodeRecord(
+      const label = labels.shift() as string
+      const parentNodehash = namehash(labels.join('.'))
+      return nameWrapper.populateTransaction.setSubnodeOwner(
         parentNodehash,
         label,
         '0x0000000000000000000000000000000000000000',
-        '0x0000000000000000000000000000000000000000',
-        0,
         0,
         0,
       )

package/src/functions/getNames.test.ts

@@ -1,6 +1,7 @@
 import { ENS } from '..'
 import setup from '../tests/setup'
 import { Name } from './getNames'
+import { names as wrappedNames } from '../../deploy/00_register_wrapped'
 
 let ensInstance: ENS
 
@@ -172,10 +173,19 @@ describe('getNames', () => {
       type: 'wrappedOwner',
       page: 0,
     })
+
+    const nameCout = wrappedNames.reduce<number>((count, name) => {
+      if (name.namedOwner === 'owner2') count += 1
+      ;(name.subnames || []).forEach((subname: any) => {
+        if (subname.namedOwner === 'owner2') count += 1
+      })
+      return count
+    }, 0)
+
     // length of page one should be all the names on 0x3C44CdDdB6a900fa2b585dd299e03d12FA4293BC
     // minus 1 for the PCC expired name.
     // the result here implies that the PCC expired name is not returned
-    expect(pageOne).toHaveLength(4)
+    expect(pageOne).toHaveLength(nameCout - 1)
   })
   describe('orderBy', () => {
     describe('registrations', () => {

package/src/functions/getNames.ts

@@ -144,6 +144,7 @@ const getNames = async (
     parent {
         name
     }
+    createdAt
   `
 
   let queryVars: object = {}
@@ -168,7 +169,6 @@ const getNames = async (
           }
           domains(first: 1000) {
             ${domainQueryData}
-            createdAt
             registration {
               registrationDate
               expiryDate
@@ -203,7 +203,6 @@ const getNames = async (
           account(id: $id) {
             domains(orderBy: $orderBy, orderDirection: $orderDirection) {
               ${domainQueryData}
-              createdAt
               registration {
                 registrationDate
                 expiryDate
@@ -234,7 +233,6 @@ const getNames = async (
               orderDirection: $orderDirection
             ) {
               ${domainQueryData}
-              createdAt
             }
           }
         }
@@ -267,7 +265,6 @@ const getNames = async (
             fuses
             domain {
               ${domainQueryData}
-              createdAt
             }
           }
         }
@@ -298,7 +295,6 @@ const getNames = async (
             fuses
             domain {
               ${domainQueryData}
-              createdAt
             }
           }
         }