@ensdomains/ensjs 3.0.0-alpha.1 → 3.0.0-alpha.4

package/src/functions/setRecords.ts

@@ -1,5 +1,5 @@
-import { ethers } from 'ethers'
 import { ENSArgs } from '..'
+import { namehash } from '../utils/normalise'
 import { generateRecordCallArray, RecordOptions } from '../utils/recordHelpers'
 
 export default async function (
@@ -30,9 +30,9 @@ export default async function (
   const resolver = (
     await contracts?.getPublicResolver(provider, resolverAddress)
   )?.connect(provider?.getSigner()!)
-  const namehash = ethers.utils.namehash(name)
+  const hash = namehash(name)
 
-  const calls: string[] = generateRecordCallArray(namehash, records, resolver!)
+  const calls: string[] = generateRecordCallArray(hash, records, resolver!)
 
   return resolver?.multicall(calls)
 }

package/src/{tests → functions}/setResolver.test.ts

@@ -1,7 +1,7 @@
 import { ethers } from 'ethers'
 import { ENS } from '..'
 import { hexEncodeName } from '../utils/hexEncodedName'
-import setup from './setup'
+import setup from '../tests/setup'
 
 let ENSInstance: ENS
 let revert: Awaited<ReturnType<typeof setup>>['revert']

package/src/functions/setResolver.ts

@@ -1,5 +1,5 @@
-import { ethers } from 'ethers'
 import { ENSArgs } from '..'
+import { namehash } from '../utils/normalise'
 
 export default async function (
   { contracts, provider }: ENSArgs<'contracts' | 'provider'>,
@@ -25,13 +25,13 @@ export default async function (
       const registry = (await contracts?.getRegistry())!.connect(
         provider?.getSigner(options?.addressOrIndex)!,
       )
-      return registry.setResolver(ethers.utils.namehash(name), resolver)
+      return registry.setResolver(namehash(name), resolver)
     }
     case 'nameWrapper': {
       const nameWrapper = (await contracts?.getNameWrapper())!.connect(
         provider?.getSigner(options?.addressOrIndex)!,
       )
-      return nameWrapper.setResolver(ethers.utils.namehash(name), resolver)
+      return nameWrapper.setResolver(namehash(name), resolver)
     }
     default: {
       throw new Error(`Unknown contract: ${contract}`)

package/src/{tests → functions}/transferName.test.ts

@@ -1,6 +1,7 @@
 import { ethers, utils } from 'ethers'
 import { ENS } from '..'
-import setup from './setup'
+import { namehash } from '../utils/normalise'
+import setup from '../tests/setup'
 
 let ENSInstance: ENS
 let revert: Awaited<ReturnType<typeof setup>>['revert']
@@ -52,7 +53,7 @@ describe('transferName', () => {
     await tx.wait()
 
     const nameWrapper = await ENSInstance.contracts!.getNameWrapper()!
-    const result = await nameWrapper.ownerOf(utils.namehash('parthtejpal.eth'))
+    const result = await nameWrapper.ownerOf(namehash('parthtejpal.eth'))
     expect(result).toBe(accounts[1])
   })
   it('should allow a transfer on the registry', async () => {
@@ -74,7 +75,7 @@ describe('transferName', () => {
     await tx.wait()
 
     const registry = await ENSInstance.contracts!.getRegistry()!
-    const result = await registry.owner(utils.namehash('test.parthtejpal.eth'))
+    const result = await registry.owner(namehash('test.parthtejpal.eth'))
     expect(result).toBe(accounts[1])
   })
 })

package/src/functions/transferName.ts

@@ -1,5 +1,6 @@
 import { ethers } from 'ethers'
 import { ENSArgs } from '..'
+import { namehash } from '../utils/normalise'
 
 export default async function (
   { contracts, provider }: ENSArgs<'contracts' | 'provider'>,
@@ -21,7 +22,7 @@ export default async function (
       const registry = (await contracts?.getRegistry())!.connect(
         provider?.getSigner(options?.addressOrIndex)!,
       )
-      return registry.setOwner(ethers.utils.namehash(name), newOwner)
+      return registry.setOwner(namehash(name), newOwner)
     }
     case 'baseRegistrar': {
       const baseRegistrar = (await contracts?.getBaseRegistrar())!.connect(
@@ -44,7 +45,7 @@ export default async function (
       return nameWrapper.safeTransferFrom(
         address,
         newOwner,
-        ethers.utils.namehash(name),
+        namehash(name),
         1,
         '0x',
       )

package/src/{tests → functions}/transferSubname.test.ts

@@ -1,6 +1,7 @@
-import { ethers, utils } from 'ethers'
+import { ethers } from 'ethers'
 import { ENS } from '..'
-import setup from './setup'
+import { namehash } from '../utils/normalise'
+import setup from '../tests/setup'
 
 let ENSInstance: ENS
 let revert: Awaited<ReturnType<typeof setup>>['revert']
@@ -39,7 +40,7 @@ describe('transferSubname', () => {
     await tx.wait()
 
     const registry = await ENSInstance.contracts!.getRegistry()!
-    const result = await registry.owner(utils.namehash('test.parthtejpal.eth'))
+    const result = await registry.owner(namehash('test.parthtejpal.eth'))
     expect(result).toBe(accounts[1])
   })
   it('should allow transferring a subname on the nameWrapper', async () => {
@@ -66,9 +67,7 @@ describe('transferSubname', () => {
     await tx.wait()
 
     const nameWrapper = await ENSInstance.contracts!.getNameWrapper()!
-    const result = await nameWrapper.ownerOf(
-      utils.namehash('test.parthtejpal.eth'),
-    )
+    const result = await nameWrapper.ownerOf(namehash('test.parthtejpal.eth'))
     expect(result).toBe(accounts[1])
   })
 })

package/src/functions/transferSubname.ts

@@ -1,5 +1,6 @@
 import { ethers } from 'ethers'
 import { ENSArgs } from '..'
+import { namehash } from '../utils/normalise'
 
 export default async function (
   { contracts, provider }: ENSArgs<'contracts' | 'provider'>,
@@ -17,7 +18,7 @@ export default async function (
   const labels = name.split('.')
   const label = labels.shift() as string
   const labelhash = ethers.utils.solidityKeccak256(['string'], [label])
-  const parentNodehash = ethers.utils.namehash(labels.join('.'))
+  const parentNodehash = namehash(labels.join('.'))
 
   switch (contract) {
     case 'registry': {

package/src/{tests → functions}/unwrapName.test.ts

@@ -1,6 +1,7 @@
 import { ethers, utils } from 'ethers'
 import { ENS } from '..'
-import setup from './setup'
+import { namehash } from '../utils/normalise'
+import setup from '../tests/setup'
 
 let ENSInstance: ENS
 let revert: Awaited<ReturnType<typeof setup>>['revert']
@@ -61,7 +62,7 @@ describe('unwrapName', () => {
     await tx.wait()
 
     const registry = await ENSInstance.contracts!.getRegistry()!
-    const result = await registry.owner(utils.namehash('test.parthtejpal.eth'))
+    const result = await registry.owner(namehash('test.parthtejpal.eth'))
     expect(result).toBe(accounts[0])
   })
 })

package/src/functions/unwrapName.ts

@@ -1,5 +1,6 @@
 import { utils } from 'ethers'
 import { ENSArgs } from '..'
+import { namehash } from '../utils/normalise'
 
 export default async function (
   { contracts, provider }: ENSArgs<'contracts' | 'provider'>,
@@ -18,7 +19,7 @@ export default async function (
 
   const labels = name.split('.')
   const labelhash = utils.solidityKeccak256(['string'], [labels[0]])
-  const parentNodehash = utils.namehash(labels.slice(1).join('.'))
+  const parentNodehash = namehash(labels.slice(1).join('.'))
 
   const nameWrapper = (await contracts?.getNameWrapper()!).connect(signer)
 

package/src/{tests → functions}/wrapName.test.ts

@@ -1,7 +1,8 @@
-import { BigNumber, ethers, utils } from 'ethers'
+import { BigNumber, ethers } from 'ethers'
 import { ENS } from '..'
 import { hexEncodeName } from '../utils/hexEncodedName'
-import setup from './setup'
+import { namehash } from '../utils/normalise'
+import setup from '../tests/setup'
 
 let ENSInstance: ENS
 let revert: Awaited<ReturnType<typeof setup>>['revert']
@@ -28,9 +29,7 @@ describe('wrapName', () => {
     await tx.wait()
 
     const nameWrapper = await ENSInstance.contracts!.getNameWrapper()!
-    const [result] = await nameWrapper.getFuses(
-      utils.namehash('parthtejpal.eth'),
-    )
+    const [result] = await nameWrapper.getFuses(namehash('parthtejpal.eth'))
     expect((result as BigNumber).toHexString()).toBe('0x40')
   })
   it('should allow initial fuses', async () => {
@@ -42,9 +41,7 @@ describe('wrapName', () => {
     await tx.wait()
 
     const nameWrapper = await ENSInstance.contracts!.getNameWrapper()!
-    const [result] = await nameWrapper.getFuses(
-      utils.namehash('parthtejpal.eth'),
-    )
+    const [result] = await nameWrapper.getFuses(namehash('parthtejpal.eth'))
     expect((result as BigNumber).toHexString()).toBe('0x51')
   })
   it('should allow an initial resolver address', async () => {

package/src/index.ts

@@ -41,6 +41,7 @@ import type transferName from './functions/transferName'
 import type transferSubname from './functions/transferSubname'
 import type unwrapName from './functions/unwrapName'
 import type wrapName from './functions/wrapName'
+import type getDNSOwner from './functions/getDNSOwner'
 import GqlManager from './GqlManager'
 import singleCall from './utils/singleCall'
 
@@ -321,6 +322,7 @@ export class ENS {
       'gqlInstance',
       'getName',
       'resolverMulticallWrapper',
+      'multicallWrapper',
       '_getAddr',
       '_getContentHash',
       '_getText',
@@ -503,4 +505,9 @@ export class ENS {
     'transferSubname',
     ['contracts', 'provider'],
   )
+
+  public getDNSOwner = this.generateFunction<typeof getDNSOwner>(
+    'getDNSOwner',
+    [],
+  )
 }

package/src/tests/withProvider.test.ts

@@ -1,6 +1,6 @@
 import { ethers } from 'ethers'
 import { ENS } from '..'
-import setup from './setup'
+import setup from '../tests/setup'
 
 let ENSInstance: ENS
 let providerFake: ethers.providers.JsonRpcProvider

package/src/utils/makeHashIndexes.ts

@@ -1,9 +1,9 @@
-import { ethers } from 'ethers'
+import { namehash } from './normalise'
 
 export const makeOtherIndexes = (data: string, findStr: string) =>
   Array.from(data.matchAll(findStr as any)).map((x: any) => x.index / 2 - 1)
 
 export const makeNamehashIndexes = (data: string, name: string) =>
-  Array.from(
-    data.matchAll(ethers.utils.namehash(name).substring(2) as any),
-  ).map((x: any) => x.index / 2 - 1)
+  Array.from(data.matchAll(namehash(name).substring(2) as any)).map(
+    (x: any) => x.index / 2 - 1,
+  )

package/src/utils/normalise.ts

@@ -1,4 +1,27 @@
+import { concat, hexlify, keccak256, toUtf8Bytes } from 'ethers/lib/utils'
 import uts46 from 'idna-uts46-hx/uts46bundle.js'
 
+const zeros = new Uint8Array(32)
+zeros.fill(0)
+
 export const normalise = (name: string) =>
   name ? uts46.toUnicode(name, { useStd3ASCII: true }) : name
+
+export const namehash = (inputName: string): string => {
+  let result: string | Uint8Array = zeros
+
+  const name = normalise(inputName)
+
+  if (name) {
+    const labels = name.split('.')
+
+    for (var i = labels.length - 1; i >= 0; i--) {
+      const labelSha = keccak256(toUtf8Bytes(labels[i]))
+      result = keccak256(concat([result, labelSha]))
+    }
+  } else {
+    result = hexlify(zeros)
+  }
+
+  return result as string
+}

package/src/utils/registerHelpers.ts

@@ -3,6 +3,7 @@ import type { FuseOptions } from '../@types/FuseOptions'
 import type { PublicResolver } from '../generated'
 import generateFuseInput from './generateFuseInput'
 import { labelhash } from './labels'
+import { namehash } from './normalise'
 import { generateRecordCallArray, RecordOptions } from './recordHelpers'
 
 export const randomSecret = () => {
@@ -28,11 +29,9 @@ export const makeCommitment = ({
   fuses?: FuseOptions
 }) => {
   const label = labelhash(name.split('.')[0])
-  const namehash = utils.namehash(name)
+  const hash = namehash(name)
   const resolverAddress = resolver.address
-  const data = records
-    ? generateRecordCallArray(namehash, records, resolver)
-    : []
+  const data = records ? generateRecordCallArray(hash, records, resolver) : []
   const secret = randomSecret()
   const fuseData = fuses ? generateFuseInput(fuses) : '0'