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

package/dist/esm/functions/createSubname.js

@@ -1,5 +1,6 @@
 import { ethers } from 'ethers';
 import generateFuseInput from '../utils/generateFuseInput';
+import { namehash } from '../utils/normalise';
 export default async function ({ contracts, provider }, { name, owner, resolverAddress, contract, options, ...wrapperArgs }) {
     const signer = provider?.getSigner(options?.addressOrIndex);
     if (!signer) {
@@ -17,7 +18,7 @@ export default async function ({ contracts, provider }, { name, owner, resolverA
     }
     const label = labels.shift();
     const labelhash = ethers.utils.solidityKeccak256(['string'], [label]);
-    const parentNodehash = ethers.utils.namehash(labels.join('.'));
+    const parentNodehash = namehash(labels.join('.'));
     switch (contract) {
         case 'registry': {
             const registry = (await contracts?.getRegistry()).connect(signer);

package/dist/esm/functions/getFuses.js

@@ -1,5 +1,6 @@
-import { ethers, utils } from 'ethers';
+import { utils } from 'ethers';
 import { testable as fuseEnums } from '../utils/fuses';
+import { namehash } from '../utils/normalise';
 const NameSafety = [
     'Safe',
     'RegistrantNotWrapped',
@@ -12,7 +13,7 @@ const raw = async ({ contracts }, name) => {
     return {
         to: nameWrapper.address,
         data: nameWrapper.interface.encodeFunctionData('getFuses', [
-            ethers.utils.namehash(name),
+            namehash(name),
         ]),
     };
 };
@@ -36,7 +37,7 @@ const decode = async ({ contracts }, data, name) => {
         if (utils.hexStripZeros(vulnerableNode) !== '0x') {
             name.split('.').forEach((label, index, arr) => {
                 const node = arr.slice(index).join('.');
-                const nodehash = utils.namehash(node);
+                const nodehash = namehash(node);
                 if (nodehash === vulnerableNode) {
                     returnVulnerableNode = node;
                 }

package/dist/esm/functions/getOwner.js

@@ -1,5 +1,6 @@
 import { ethers } from 'ethers';
 import { labelhash } from '../utils/labels';
+import { namehash as makeNamehash } from '../utils/normalise';
 const singleContractOwnerRaw = async ({ contracts }, contract, namehash, labels) => {
     switch (contract) {
         case 'nameWrapper': {
@@ -28,10 +29,10 @@ const singleContractOwnerRaw = async ({ contracts }, contract, namehash, labels)
     }
 };
 const raw = async ({ contracts, multicallWrapper }, name, contract) => {
-    const namehash = ethers.utils.namehash(name);
+    const namehash = makeNamehash(name);
     const labels = name.split('.');
-    if (contract) {
-        return await singleContractOwnerRaw({ contracts }, contract, namehash, labels);
+    if (contract || labels.length === 1) {
+        return await singleContractOwnerRaw({ contracts }, contract || 'registry', namehash, labels);
     }
     const registryData = await singleContractOwnerRaw({ contracts }, 'registry', namehash, labels);
     const nameWrapperData = await singleContractOwnerRaw({ contracts }, 'nameWrapper', namehash, labels);
@@ -46,10 +47,11 @@ const singleContractOwnerDecode = (data) => ethers.utils.defaultAbiCoder.decode(
 const decode = async ({ contracts, multicallWrapper }, data, name, contract) => {
     if (data === null)
         return;
-    if (contract) {
+    const labels = name.split('.');
+    if (contract || labels.length === 1) {
         const singleOwner = singleContractOwnerDecode(data);
         let obj = {
-            ownershipLevel: contract,
+            ownershipLevel: contract || 'registry',
         };
         if (contract === 'registrar') {
             return {
@@ -74,7 +76,6 @@ const decode = async ({ contracts, multicallWrapper }, data, name, contract) =>
     const registryOwner = decodedData[0][0];
     const nameWrapperOwner = decodedData[1][0];
     const registrarOwner = decodedData[2]?.[0];
-    const labels = name.split('.');
     // check for only .eth names
     if (labels[labels.length - 1] === 'eth') {
         // if the owner on the registrar is the namewrapper, then the namewrapper owner is the owner

package/dist/esm/functions/getProfile.d.ts

@@ -26,5 +26,5 @@ declare type ProfileOptions = {
     texts?: boolean | string[];
     coinTypes?: boolean | string[];
 };
-export default function ({ contracts, gqlInstance, getName, _getAddr, _getContentHash, _getText, resolverMulticallWrapper, }: ENSArgs<'contracts' | 'gqlInstance' | 'getName' | '_getText' | '_getAddr' | '_getContentHash' | 'resolverMulticallWrapper'>, nameOrAddress: string, options?: ProfileOptions): Promise<ResolvedProfile | undefined>;
+export default function ({ contracts, gqlInstance, getName, _getAddr, _getContentHash, _getText, resolverMulticallWrapper, multicallWrapper, }: ENSArgs<'contracts' | 'gqlInstance' | 'getName' | '_getText' | '_getAddr' | '_getContentHash' | 'resolverMulticallWrapper' | 'multicallWrapper'>, nameOrAddress: string, options?: ProfileOptions): Promise<ResolvedProfile | undefined>;
 export {};

package/dist/esm/functions/getProfile.js

@@ -40,23 +40,39 @@ const makeMulticallData = async ({ _getAddr, _getContentHash, _getText, resolver
     const prRawData = await resolverMulticallWrapper.raw(calls.map((x) => x.data));
     return { data: prRawData.data, calls };
 };
-const makeHashIndexes = (data, name) => [...data.matchAll(ethers.utils.namehash(name).substring(2))].map((x) => x.index / 2 - 1);
-const getDataForName = async ({ contracts, _getAddr, _getContentHash, _getText, resolverMulticallWrapper, }, name, options) => {
+const fetchWithoutResolverMulticall = async ({ multicallWrapper }, calls, resolverAddress) => {
+    const callsWithResolver = calls.map((call) => ({
+        to: resolverAddress,
+        data: call.data.data,
+    }));
+    return (await multicallWrapper(callsWithResolver)).map((x) => x[1]);
+};
+const getDataForName = async ({ contracts, _getAddr, _getContentHash, _getText, resolverMulticallWrapper, multicallWrapper, }, name, options, fallbackResolver) => {
     const universalResolver = await contracts?.getUniversalResolver();
     const { data, calls } = await makeMulticallData({ _getAddr, _getContentHash, _getText, resolverMulticallWrapper }, name, options);
-    let resolver;
+    let resolvedData;
+    let useFallbackResolver = false;
     try {
-        resolver = await universalResolver?.resolve(hexEncodeName(name), data);
+        resolvedData = await universalResolver?.resolve(hexEncodeName(name), data);
     }
     catch {
-        return;
+        useFallbackResolver = true;
+    }
+    let resolverAddress;
+    let recordData;
+    if (useFallbackResolver) {
+        resolverAddress = fallbackResolver;
+        recordData = await fetchWithoutResolverMulticall({ multicallWrapper }, calls, resolverAddress);
+    }
+    else {
+        resolverAddress = resolvedData['1'];
+        [recordData] = await resolverMulticallWrapper.decode(resolvedData['0']);
     }
-    const [recordData] = await resolverMulticallWrapper.decode(resolver['0']);
     const matchAddress = recordData[calls.findIndex((x) => x.key === '60')];
     return {
         address: matchAddress && (await _getAddr.decode(matchAddress)),
         records: await formatRecords({ _getAddr, _getContentHash, _getText }, recordData, calls, options),
-        resolverAddress: resolver['1'],
+        resolverAddress,
     };
 };
 const formatRecords = async ({ _getText, _getAddr, _getContentHash, }, data, calls, options) => {
@@ -66,7 +82,7 @@ const formatRecords = async ({ _getText, _getAddr, _getContentHash, }, data, cal
             key: calls[i].key,
             type: calls[i].type,
         };
-        if (itemRet.type === 'addr' || itemRet.type === 'contenthash') {
+        if (itemRet.type === 'contenthash') {
             decodedFromAbi = ethers.utils.defaultAbiCoder.decode(['bytes'], item)[0];
             if (ethers.utils.hexStripZeros(decodedFromAbi) === '0x') {
                 return;
@@ -155,6 +171,7 @@ const graphFetch = async ({ gqlInstance }, name, wantedRecords) => {
           addr {
             id
           }
+          address
         }
       }
     }
@@ -165,8 +182,14 @@ const graphFetch = async ({ gqlInstance }, name, wantedRecords) => {
         return;
     const [{ resolver: resolverResponse, isMigrated, createdAt }] = domains;
     let returnedRecords = {};
-    if (!wantedRecords)
+    if (!resolverResponse)
         return { isMigrated, createdAt };
+    if (!wantedRecords)
+        return {
+            isMigrated,
+            createdAt,
+            graphResolverAddress: resolverResponse.address,
+        };
     Object.keys(wantedRecords).forEach((key) => {
         const data = wantedRecords[key];
         if (typeof data === 'boolean' && data) {
@@ -178,28 +201,36 @@ const graphFetch = async ({ gqlInstance }, name, wantedRecords) => {
             }
         }
     });
-    return { ...returnedRecords, isMigrated, createdAt };
+    return {
+        ...returnedRecords,
+        isMigrated,
+        createdAt,
+        graphResolverAddress: resolverResponse.address,
+    };
 };
-const getProfileFromName = async ({ contracts, gqlInstance, _getAddr, _getContentHash, _getText, resolverMulticallWrapper, }, name, options) => {
+const getProfileFromName = async ({ contracts, gqlInstance, _getAddr, _getContentHash, _getText, resolverMulticallWrapper, multicallWrapper, }, name, options) => {
     const usingOptions = !options || options?.texts === true || options?.coinTypes === true
         ? options || { contentHash: true, texts: true, coinTypes: true }
         : undefined;
     const graphResult = await graphFetch({ gqlInstance }, name, usingOptions);
     if (!graphResult)
         return;
-    const { isMigrated, createdAt, ...wantedRecords } = graphResult;
+    const { isMigrated, createdAt, graphResolverAddress, ...wantedRecords } = graphResult;
+    if (!graphResolverAddress)
+        return { isMigrated, createdAt, message: "Name doesn't have a resolver" };
     const result = await getDataForName({
         contracts,
         _getAddr,
         _getContentHash,
         _getText,
         resolverMulticallWrapper,
-    }, name, usingOptions ? wantedRecords : options);
+        multicallWrapper,
+    }, name, usingOptions ? wantedRecords : options, graphResolverAddress);
     if (!result)
         return { isMigrated, createdAt, message: "Records fetch didn't complete" };
     return { ...result, isMigrated, createdAt, message: undefined };
 };
-const getProfileFromAddress = async ({ contracts, gqlInstance, getName, _getAddr, _getContentHash, _getText, resolverMulticallWrapper, }, address, options) => {
+const getProfileFromAddress = async ({ contracts, gqlInstance, getName, _getAddr, _getContentHash, _getText, resolverMulticallWrapper, multicallWrapper, }, address, options) => {
     let name;
     try {
         name = await getName(address);
@@ -218,6 +249,7 @@ const getProfileFromAddress = async ({ contracts, gqlInstance, getName, _getAddr
         _getContentHash,
         _getText,
         resolverMulticallWrapper,
+        multicallWrapper,
     }, name.name, options);
     if (!result || result.message)
         return;
@@ -228,7 +260,7 @@ const getProfileFromAddress = async ({ contracts, gqlInstance, getName, _getAddr
         message: undefined,
     };
 };
-export default async function ({ contracts, gqlInstance, getName, _getAddr, _getContentHash, _getText, resolverMulticallWrapper, }, nameOrAddress, options) {
+export default async function ({ contracts, gqlInstance, getName, _getAddr, _getContentHash, _getText, resolverMulticallWrapper, multicallWrapper, }, nameOrAddress, options) {
     if (options && options.coinTypes && typeof options.coinTypes !== 'boolean') {
         options.coinTypes = options.coinTypes.map((coin) => {
             if (!isNaN(parseInt(coin))) {
@@ -252,6 +284,7 @@ export default async function ({ contracts, gqlInstance, getName, _getAddr, _get
             _getContentHash,
             _getText,
             resolverMulticallWrapper,
+            multicallWrapper,
         }, nameOrAddress, options);
     }
     return getProfileFromName({
@@ -261,5 +294,6 @@ export default async function ({ contracts, gqlInstance, getName, _getAddr, _get
         _getContentHash,
         _getText,
         resolverMulticallWrapper,
+        multicallWrapper,
     }, nameOrAddress, options);
 }

package/dist/esm/functions/getSpecificRecord.js

@@ -1,13 +1,14 @@
 import { formatsByCoinType, formatsByName } from '@ensdomains/address-encoder';
 import { ethers } from 'ethers';
 import { decodeContenthash } from '../utils/contentHash';
+import { namehash } from '../utils/normalise';
 export const _getContentHash = {
     raw: async ({ contracts }, name) => {
         const publicResolver = await contracts?.getPublicResolver();
         return {
             to: '0x0000000000000000000000000000000000000000',
             data: publicResolver.interface.encodeFunctionData('contenthash', [
-                ethers.utils.namehash(name),
+                namehash(name),
             ]),
         };
     },
@@ -45,7 +46,7 @@ export const _getText = {
         return {
             to: '0x0000000000000000000000000000000000000000',
             data: publicResolver.interface.encodeFunctionData('text', [
-                ethers.utils.namehash(name),
+                namehash(name),
                 key,
             ]),
         };
@@ -77,10 +78,18 @@ export const _getAddr = {
             coinType = 60;
         }
         const publicResolver = await contracts?.getPublicResolver();
+        if (coinType === 60 || coinType === '60') {
+            return {
+                to: '0x0000000000000000000000000000000000000000',
+                data: publicResolver.interface.encodeFunctionData('addr(bytes32)', [
+                    namehash(name),
+                ]),
+            };
+        }
         if (bypassFormat) {
             return {
                 to: '0x0000000000000000000000000000000000000000',
-                data: publicResolver.interface.encodeFunctionData('addr(bytes32,uint256)', [ethers.utils.namehash(name), coinType]),
+                data: publicResolver.interface.encodeFunctionData('addr(bytes32,uint256)', [namehash(name), coinType]),
             };
         }
         const formatter = typeof coinType === 'string' && isNaN(parseInt(coinType))
@@ -91,7 +100,7 @@ export const _getAddr = {
         }
         return {
             to: '0x0000000000000000000000000000000000000000',
-            data: publicResolver.interface.encodeFunctionData('addr(bytes32,uint256)', [ethers.utils.namehash(name), formatter.coinType]),
+            data: publicResolver.interface.encodeFunctionData('addr(bytes32,uint256)', [namehash(name), formatter.coinType]),
         };
     },
     decode: async ({ contracts }, data, _name, coinType) => {
@@ -104,7 +113,15 @@ export const _getAddr = {
         const formatter = typeof coinType === 'string' && isNaN(parseInt(coinType))
             ? formatsByName[coinType]
             : formatsByCoinType[typeof coinType === 'number' ? coinType : parseInt(coinType)];
-        const [response] = publicResolver.interface.decodeFunctionResult('addr(bytes32,uint256)', data);
+        let response;
+        if (coinType === 60 || coinType === '60') {
+            ;
+            [response] = publicResolver.interface.decodeFunctionResult('addr(bytes32)', data);
+        }
+        else {
+            ;
+            [response] = publicResolver.interface.decodeFunctionResult('addr(bytes32,uint256)', data);
+        }
         if (!response)
             return;
         if (ethers.utils.hexStripZeros(response) === '0x') {

package/dist/esm/functions/getSubnames.js

@@ -1,6 +1,6 @@
-import { namehash } from 'ethers/lib/utils';
 import { truncateFormat } from '../utils/format';
 import { decryptName } from '../utils/labels';
+import { namehash } from '../utils/normalise';
 const largeQuery = async ({ gqlInstance }, { name, page, pageSize = 10, orderDirection, orderBy, lastSubnames }) => {
     const client = gqlInstance.client;
     let finalQuery = gqlInstance.gql `
@@ -53,7 +53,7 @@ const largeQuery = async ({ gqlInstance }, { name, page, pageSize = 10, orderDir
     });
     return {
         subnames: subdomains,
-        subnameCount: domain.subdomainCount
+        subnameCount: domain.subdomainCount,
     };
 };
 const smallQuery = async ({ gqlInstance }, { name, page, pageSize = 10, orderDirection, orderBy }) => {
@@ -140,7 +140,7 @@ const smallQuery = async ({ gqlInstance }, { name, page, pageSize = 10, orderDir
     });
     return {
         subnames: subdomains,
-        subnameCount: domain.subdomainCount
+        subnameCount: domain.subdomainCount,
     };
 };
 const getSubnames = (injected, functionArgs) => {

package/dist/esm/functions/setRecords.d.ts

@@ -1,4 +1,3 @@
-import { ethers } from 'ethers';
 import { ENSArgs } from '..';
 import { RecordOptions } from '../utils/recordHelpers';
-export default function ({ contracts, provider, getResolver, }: ENSArgs<'contracts' | 'provider' | 'getResolver'>, name: string, records: RecordOptions): Promise<ethers.ContractTransaction | undefined>;
+export default function ({ contracts, provider, getResolver, }: ENSArgs<'contracts' | 'provider' | 'getResolver'>, name: string, records: RecordOptions): Promise<import("ethers").ContractTransaction | undefined>;

package/dist/esm/functions/setRecords.js

@@ -1,4 +1,4 @@
-import { ethers } from 'ethers';
+import { namehash } from '../utils/normalise';
 import { generateRecordCallArray } from '../utils/recordHelpers';
 export default async function ({ contracts, provider, getResolver, }, name, records) {
     if (!name.includes('.')) {
@@ -13,7 +13,7 @@ export default async function ({ contracts, provider, getResolver, }, name, reco
         throw new Error('No signer found');
     }
     const resolver = (await contracts?.getPublicResolver(provider, resolverAddress))?.connect(provider?.getSigner());
-    const namehash = ethers.utils.namehash(name);
-    const calls = generateRecordCallArray(namehash, records, resolver);
+    const hash = namehash(name);
+    const calls = generateRecordCallArray(hash, records, resolver);
     return resolver?.multicall(calls);
 }

package/dist/esm/functions/setResolver.d.ts

@@ -1,5 +1,4 @@
-import { ethers } from 'ethers';
 import { ENSArgs } from '..';
 export default function ({ contracts, provider }: ENSArgs<'contracts' | 'provider'>, name: string, contract: 'registry' | 'nameWrapper', resolver?: string, options?: {
     addressOrIndex?: string | number;
-}): Promise<ethers.ContractTransaction>;
+}): Promise<import("ethers").ContractTransaction>;

package/dist/esm/functions/setResolver.js

@@ -1,4 +1,4 @@
-import { ethers } from 'ethers';
+import { namehash } from '../utils/normalise';
 export default async function ({ contracts, provider }, name, contract, resolver, options) {
     const address = await provider
         ?.getSigner(options?.addressOrIndex)
@@ -12,11 +12,11 @@ export default async function ({ contracts, provider }, name, contract, resolver
     switch (contract) {
         case 'registry': {
             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/dist/esm/functions/transferName.js

@@ -1,4 +1,5 @@
 import { ethers } from 'ethers';
+import { namehash } from '../utils/normalise';
 export default async function ({ contracts, provider }, name, newOwner, contract, options) {
     const address = await provider
         ?.getSigner(options?.addressOrIndex)
@@ -9,7 +10,7 @@ export default async function ({ contracts, provider }, name, newOwner, contract
     switch (contract) {
         case 'registry': {
             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(provider?.getSigner(options?.addressOrIndex));
@@ -21,7 +22,7 @@ export default async function ({ contracts, provider }, name, newOwner, contract
         }
         case 'nameWrapper': {
             const nameWrapper = (await contracts?.getNameWrapper()).connect(provider?.getSigner(options?.addressOrIndex));
-            return nameWrapper.safeTransferFrom(address, newOwner, ethers.utils.namehash(name), 1, '0x');
+            return nameWrapper.safeTransferFrom(address, newOwner, namehash(name), 1, '0x');
         }
         default: {
             throw new Error(`Unknown contract: ${contract}`);

package/dist/esm/functions/transferSubname.js

@@ -1,4 +1,5 @@
 import { ethers } from 'ethers';
+import { namehash } from '../utils/normalise';
 export default async function ({ contracts, provider }, name, contract, address, options) {
     const signer = provider?.getSigner(options?.addressOrIndex);
     if (!signer) {
@@ -7,7 +8,7 @@ export default async function ({ contracts, provider }, name, contract, address,
     const labels = name.split('.');
     const label = labels.shift();
     const labelhash = ethers.utils.solidityKeccak256(['string'], [label]);
-    const parentNodehash = ethers.utils.namehash(labels.join('.'));
+    const parentNodehash = namehash(labels.join('.'));
     switch (contract) {
         case 'registry': {
             const registry = (await contracts?.getRegistry()).connect(signer);

package/dist/esm/functions/unwrapName.js

@@ -1,4 +1,5 @@
 import { utils } from 'ethers';
+import { namehash } from '../utils/normalise';
 export default async function ({ contracts, provider }, name, newController, newRegistrant, options) {
     const signer = provider?.getSigner(options?.addressOrIndex);
     const address = await signer?.getAddress();
@@ -7,7 +8,7 @@ export default async function ({ contracts, provider }, name, newController, new
     }
     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);
     if (labels.length === 2 && labels[1] === 'eth') {
         if (!newRegistrant) {

package/dist/esm/index.js

@@ -129,6 +129,7 @@ export class ENS {
             'gqlInstance',
             'getName',
             'resolverMulticallWrapper',
+            'multicallWrapper',
             '_getAddr',
             '_getContentHash',
             '_getText',

package/dist/esm/utils/makeHashIndexes.js

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

package/dist/esm/utils/normalise.d.ts

@@ -1 +1,2 @@
 export declare const normalise: (name: string) => any;
+export declare const namehash: (inputName: string) => string;

package/dist/esm/utils/normalise.js

@@ -1,2 +1,20 @@
+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) => name ? uts46.toUnicode(name, { useStd3ASCII: true }) : name;
+export const namehash = (inputName) => {
+    let result = 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;
+};

package/dist/esm/utils/registerHelpers.js

@@ -1,6 +1,7 @@
 import { utils } from 'ethers';
 import generateFuseInput from './generateFuseInput';
 import { labelhash } from './labels';
+import { namehash } from './normalise';
 import { generateRecordCallArray } from './recordHelpers';
 export const randomSecret = () => {
     const bytes = Buffer.allocUnsafe(32);
@@ -8,11 +9,9 @@ export const randomSecret = () => {
 };
 export const makeCommitment = ({ name, owner, duration, resolver, records, reverseRecord, fuses, }) => {
     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';
     const commitment = _makeCommitment({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ensdomains/ensjs",
-  "version": "3.0.0-alpha.1",
+  "version": "3.0.0-alpha.2",
   "description": "ENS javascript library for contract interaction",
   "main": "./dist/cjs/index.js",
   "types": "./dist/cjs/index.d.ts",
@@ -75,5 +75,6 @@
   },
   "peerDependencies": {
     "ethers": "*"
-  }
+  },
+  "stableVersion": "3.0.0-alpha.1"
 }

package/src/functions/burnFuses.ts

@@ -1,7 +1,7 @@
-import { ethers } from 'ethers'
 import { ENSArgs } from '..'
 import { FuseOptions } from '../@types/FuseOptions'
 import generateFuseInput from '../utils/generateFuseInput'
+import { namehash } from '../utils/normalise'
 
 export default async function (
   { contracts, provider }: ENSArgs<'contracts' | 'provider'>,
@@ -15,9 +15,9 @@ export default async function (
   }
 
   const nameWrapper = (await contracts?.getNameWrapper()!).connect(signer)
-  const namehash = ethers.utils.namehash(name)
+  const hash = namehash(name)
 
   const encodedFuses = generateFuseInput(fusesToBurn)
 
-  return nameWrapper.burnFuses(namehash, encodedFuses)
+  return nameWrapper.burnFuses(hash, encodedFuses)
 }

package/src/functions/createSubname.ts

@@ -2,6 +2,7 @@ import { ethers } from 'ethers'
 import { ENSArgs } from '..'
 import { FuseOptions } from '../@types/FuseOptions'
 import generateFuseInput from '../utils/generateFuseInput'
+import { namehash } from '../utils/normalise'
 
 type BaseArgs = {
   name: string
@@ -44,7 +45,7 @@ export default async function (
 
   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/functions/getFuses.ts

@@ -1,6 +1,7 @@
-import { BigNumber, ethers, utils } from 'ethers'
+import { BigNumber, utils } from 'ethers'
 import { ENSArgs } from '..'
 import { testable as fuseEnums } from '../utils/fuses'
+import { namehash } from '../utils/normalise'
 
 const NameSafety = [
   'Safe',
@@ -15,7 +16,7 @@ const raw = async ({ contracts }: ENSArgs<'contracts'>, name: string) => {
   return {
     to: nameWrapper.address,
     data: nameWrapper.interface.encodeFunctionData('getFuses', [
-      ethers.utils.namehash(name),
+      namehash(name),
     ]),
   }
 }
@@ -51,7 +52,7 @@ const decode = async (
     if (utils.hexStripZeros(vulnerableNode) !== '0x') {
       name.split('.').forEach((label, index, arr) => {
         const node = arr.slice(index).join('.')
-        const nodehash = utils.namehash(node)
+        const nodehash = namehash(node)
         if (nodehash === vulnerableNode) {
           returnVulnerableNode = node
         }

package/src/functions/getOwner.ts

@@ -1,6 +1,7 @@
 import { ethers } from 'ethers'
 import { ENSArgs } from '..'
 import { labelhash } from '../utils/labels'
+import { namehash as makeNamehash } from '../utils/normalise'
 
 type Owner = {
   registrant?: string
@@ -49,13 +50,13 @@ const raw = async (
   name: string,
   contract?: 'nameWrapper' | 'registry' | 'registrar',
 ) => {
-  const namehash = ethers.utils.namehash(name)
+  const namehash = makeNamehash(name)
   const labels = name.split('.')
 
-  if (contract) {
+  if (contract || labels.length === 1) {
     return await singleContractOwnerRaw(
       { contracts },
-      contract,
+      contract || 'registry',
       namehash,
       labels,
     )
@@ -99,10 +100,11 @@ const decode = async (
   contract?: 'nameWrapper' | 'registry' | 'registrar',
 ): Promise<Owner | undefined> => {
   if (data === null) return
-  if (contract) {
+  const labels = name.split('.')
+  if (contract || labels.length === 1) {
     const singleOwner = singleContractOwnerDecode(data)
     let obj = {
-      ownershipLevel: contract,
+      ownershipLevel: contract || 'registry',
     }
     if (contract === 'registrar') {
       return {
@@ -133,8 +135,6 @@ const decode = async (
     decodedData[2] as ethers.utils.Result | undefined
   )?.[0]
 
-  const labels = name.split('.')
-
   // check for only .eth names
   if (labels[labels.length - 1] === 'eth') {
     // if the owner on the registrar is the namewrapper, then the namewrapper owner is the owner