@ensdomains/ensjs 3.0.0-alpha.30 → 3.0.0-alpha.32

package/README.md

@@ -253,6 +253,11 @@ It allows `withProvider` to act as a new ENS instance without having to await a
 
 ## Individual Functions
 
+### Utils
+
+Utils can be imported at follows
+`import { encodeContenthash } from '@ensdomains/ensjs/utils/contentHash'`
+
 ### getFuses
 
 Gets the fuses for a specified wrapped name.

package/dist/cjs/functions/getNames.js

@@ -36,6 +36,12 @@ const mapDomain = (domain) => {
 };
 const mapWrappedDomain = (wrappedDomain) => {
   const domain = mapDomain(wrappedDomain.domain);
+  if (domain.registration) {
+    domain.registration = {
+      expiryDate: new Date(parseInt(domain.registration.expiryDate) * 1e3),
+      registrationDate: new Date(domain.registration.registrationDate * 1e3)
+    };
+  }
   return {
     expiryDate: new Date(parseInt(wrappedDomain.expiryDate) * 1e3),
     fuses: (0, import_fuses.decodeFuses)(wrappedDomain.fuses),

package/dist/cjs/functions/getOwner.js

@@ -86,8 +86,23 @@ const raw = async ({ contracts, multicallWrapper }, name, contract) => {
   }
   return multicallWrapper.raw(data);
 };
+const registrantQuery = `
+  query GetRegistrant($namehash: String!) {
+    domain(id: $namehash) {
+      registration {
+        registrant {
+          id
+        }
+      }
+    }
+  }
+`;
 const singleContractOwnerDecode = (data) => import_ethers.ethers.utils.defaultAbiCoder.decode(["address"], data)[0];
-const decode = async ({ contracts, multicallWrapper }, data, name, contract) => {
+const decode = async ({
+  contracts,
+  multicallWrapper,
+  gqlInstance
+}, data, name, contract) => {
   if (!data)
     return;
   const labels = name.split(".");
@@ -116,8 +131,17 @@ const decode = async ({ contracts, multicallWrapper }, data, name, contract) =>
   );
   const registryOwner = decodedData[0][0];
   const nameWrapperOwner = decodedData[1][0];
-  const registrarOwner = decodedData[2]?.[0];
+  let registrarOwner = decodedData[2]?.[0];
   if (labels[labels.length - 1] === "eth") {
+    if (!registrarOwner && labels.length === 2) {
+      const graphRegistrantResult = await gqlInstance?.request(
+        registrantQuery,
+        {
+          namehash: (0, import_normalise.namehash)(name)
+        }
+      );
+      registrarOwner = graphRegistrantResult.domain?.registration?.registrant?.id;
+    }
     if (registrarOwner === nameWrapper.address) {
       return {
         owner: nameWrapperOwner,
@@ -131,7 +155,14 @@ const decode = async ({ contracts, multicallWrapper }, data, name, contract) =>
         ownershipLevel: "registrar"
       };
     }
-    if (labels.length > 2 && import_ethers.ethers.utils.hexStripZeros(registryOwner) !== "0x") {
+    if (import_ethers.ethers.utils.hexStripZeros(registryOwner) !== "0x") {
+      if (labels.length === 2) {
+        return {
+          registrant: void 0,
+          owner: registryOwner,
+          ownershipLevel: "registrar"
+        };
+      }
       if (registryOwner === nameWrapper.address && nameWrapperOwner && import_ethers.ethers.utils.hexStripZeros(nameWrapperOwner) !== "0x") {
         return {
           owner: nameWrapperOwner,

package/dist/cjs/index.js

@@ -234,7 +234,7 @@ class ENS {
   );
   getOwner = this.generateRawFunction(
     "initialGetters",
-    ["contracts", "multicallWrapper"],
+    ["contracts", "multicallWrapper", "gqlInstance"],
     "getOwner"
   );
   getExpiry = this.generateRawFunction(

package/dist/esm/functions/getNames.mjs

@@ -14,6 +14,12 @@ var mapDomain = (domain) => {
 };
 var mapWrappedDomain = (wrappedDomain) => {
   const domain = mapDomain(wrappedDomain.domain);
+  if (domain.registration) {
+    domain.registration = {
+      expiryDate: new Date(parseInt(domain.registration.expiryDate) * 1e3),
+      registrationDate: new Date(domain.registration.registrationDate * 1e3)
+    };
+  }
   return {
     expiryDate: new Date(parseInt(wrappedDomain.expiryDate) * 1e3),
     fuses: decodeFuses(wrappedDomain.fuses),

package/dist/esm/functions/getOwner.mjs

@@ -64,8 +64,23 @@ var raw = async ({ contracts, multicallWrapper }, name, contract) => {
   }
   return multicallWrapper.raw(data);
 };
+var registrantQuery = `
+  query GetRegistrant($namehash: String!) {
+    domain(id: $namehash) {
+      registration {
+        registrant {
+          id
+        }
+      }
+    }
+  }
+`;
 var singleContractOwnerDecode = (data) => ethers.utils.defaultAbiCoder.decode(["address"], data)[0];
-var decode = async ({ contracts, multicallWrapper }, data, name, contract) => {
+var decode = async ({
+  contracts,
+  multicallWrapper,
+  gqlInstance
+}, data, name, contract) => {
   if (!data)
     return;
   const labels = name.split(".");
@@ -94,8 +109,17 @@ var decode = async ({ contracts, multicallWrapper }, data, name, contract) => {
   );
   const registryOwner = decodedData[0][0];
   const nameWrapperOwner = decodedData[1][0];
-  const registrarOwner = decodedData[2]?.[0];
+  let registrarOwner = decodedData[2]?.[0];
   if (labels[labels.length - 1] === "eth") {
+    if (!registrarOwner && labels.length === 2) {
+      const graphRegistrantResult = await gqlInstance?.request(
+        registrantQuery,
+        {
+          namehash: makeNamehash(name)
+        }
+      );
+      registrarOwner = graphRegistrantResult.domain?.registration?.registrant?.id;
+    }
     if (registrarOwner === nameWrapper.address) {
       return {
         owner: nameWrapperOwner,
@@ -109,7 +133,14 @@ var decode = async ({ contracts, multicallWrapper }, data, name, contract) => {
         ownershipLevel: "registrar"
       };
     }
-    if (labels.length > 2 && ethers.utils.hexStripZeros(registryOwner) !== "0x") {
+    if (ethers.utils.hexStripZeros(registryOwner) !== "0x") {
+      if (labels.length === 2) {
+        return {
+          registrant: void 0,
+          owner: registryOwner,
+          ownershipLevel: "registrar"
+        };
+      }
       if (registryOwner === nameWrapper.address && nameWrapperOwner && ethers.utils.hexStripZeros(nameWrapperOwner) !== "0x") {
         return {
           owner: nameWrapperOwner,

package/dist/esm/index.mjs

@@ -206,7 +206,7 @@ var ENS = class {
   );
   getOwner = this.generateRawFunction(
     "initialGetters",
-    ["contracts", "multicallWrapper"],
+    ["contracts", "multicallWrapper", "gqlInstance"],
     "getOwner"
   );
   getExpiry = this.generateRawFunction(

package/dist/types/functions/createSubname.d.ts

@@ -1,6 +1,6 @@
 import { ethers } from 'ethers';
 import { ENSArgs } from '..';
-import { FuseOptions } from '../@types/FuseOptions';
+import { FuseOptions } from '../utils/fuses';
 import { Expiry } from '../utils/wrapper';
 declare type BaseArgs = {
     owner: string;

package/dist/types/functions/getNames.d.ts

@@ -14,6 +14,10 @@ export declare type Name = {
     registrationDate?: Date;
     expiryDate?: Date;
     fuses?: CurrentFuses;
+    registration?: {
+        expiryDate: Date;
+        registrationDate: Date;
+    };
     type: 'domain' | 'registration' | 'wrappedDomain';
 };
 declare type BaseParams = {

package/dist/types/functions/getOwner.d.ts

@@ -9,6 +9,6 @@ declare const _default: {
         to: string;
         data: string;
     }>;
-    decode: ({ contracts, multicallWrapper }: ENSArgs<"contracts" | "multicallWrapper">, data: string, name: string, contract?: "nameWrapper" | "registrar" | "registry" | undefined) => Promise<Owner | undefined>;
+    decode: ({ contracts, multicallWrapper, gqlInstance, }: ENSArgs<"contracts" | "gqlInstance" | "multicallWrapper">, data: string, name: string, contract?: "nameWrapper" | "registrar" | "registry" | undefined) => Promise<Owner | undefined>;
 };
 export default _default;

package/dist/types/functions/wrapName.d.ts

@@ -1,6 +1,6 @@
 import { ethers } from 'ethers';
 import { ENSArgs } from '..';
-import type { FuseOptions } from '../@types/FuseOptions';
+import { FuseOptions } from '../utils/fuses';
 import { Expiry } from '../utils/wrapper';
 export default function ({ contracts, signer, getExpiry, }: ENSArgs<'contracts' | 'signer' | 'getExpiry'>, name: string, { wrappedOwner, fuseOptions, expiry, resolverAddress, }: {
     wrappedOwner: string;

package/dist/types/index.d.ts

@@ -7,6 +7,7 @@ import type burnFuses from './functions/burnFuses';
 import type commitName from './functions/commitName';
 import type createSubname from './functions/createSubname';
 import type deleteSubname from './functions/deleteSubname';
+import importDNSSECName from './functions/importDNSSECName';
 import type registerName from './functions/registerName';
 import type { default as renewNames, renewNameWithData } from './functions/renewNames';
 import type setName from './functions/setName';
@@ -19,7 +20,6 @@ import type transferSubname from './functions/transferSubname';
 import type unwrapName from './functions/unwrapName';
 import type wrapName from './functions/wrapName';
 import GqlManager from './GqlManager';
-import importDNSSECName from './functions/importDNSSECName';
 export type { Fuse, FuseArrayPossibilities, FuseObj, NamedFusesToBurn, UnnamedFuseType, UnnamedFuseValues, } from './utils/fuses';
 declare type ENSOptions = {
     graphURI?: string | null;
@@ -344,7 +344,7 @@ export declare class ENS {
             to: string;
             data: string;
         }>;
-        decode: ({ contracts, multicallWrapper }: ENSArgs<"contracts" | "multicallWrapper">, data: string, name: string, contract?: "nameWrapper" | "registrar" | "registry" | undefined) => Promise<{
+        decode: ({ contracts, multicallWrapper, gqlInstance, }: ENSArgs<"contracts" | "gqlInstance" | "multicallWrapper">, data: string, name: string, contract?: "nameWrapper" | "registrar" | "registry" | undefined) => Promise<{
             registrant?: string | undefined;
             owner?: string | undefined;
             ownershipLevel: "nameWrapper" | "registrar" | "registry";

package/dist/types/utils/fuses.d.ts

@@ -8,6 +8,9 @@ export declare const fuseEnum: {
     readonly CANNOT_CREATE_SUBDOMAIN: 32;
     readonly PARENT_CANNOT_CONTROL: 64;
 };
+export declare type FuseOptions = {
+    -readonly [K in keyof typeof fuseEnum]?: boolean;
+};
 export declare const unnamedFuses: readonly [128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768, 65536, 131072, 262144, 524288, 1048576, 2097152, 4194304, 8388608, 16777216, 33554432, 67108864, 134217728, 268435456, 536870912, 1073741824, 2147483648, 4294967296];
 declare const fullFuseEnum: {
     CAN_DO_EVERYTHING: number;

package/dist/types/utils/generateFuseInput.d.ts

@@ -1,3 +1,3 @@
-import { FuseOptions } from '../@types/FuseOptions';
+import { FuseOptions } from './fuses';
 declare const _default: (fuseOptions: FuseOptions) => string;
 export default _default;

package/dist/types/utils/registerHelpers.d.ts

@@ -1,6 +1,6 @@
 import { BigNumberish } from 'ethers';
-import type { FuseOptions } from '../@types/FuseOptions';
 import type { PublicResolver } from '../generated';
+import { FuseOptions } from './fuses';
 import { RecordOptions } from './recordHelpers';
 export declare const MAX_INT_64: bigint;
 export declare type BaseRegistrationParams = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ensdomains/ensjs",
-  "version": "3.0.0-alpha.30",
+  "version": "3.0.0-alpha.32",
   "description": "ENS javascript library for contract interaction",
   "main": "./dist/cjs/index.js",
   "module": "./dist/esm/index.mjs",
@@ -66,7 +66,7 @@
   "devDependencies": {
     "@ensdomains/buffer": "^0.0.13",
     "@ensdomains/ens-contracts": "^0.0.15",
-    "@ensdomains/ens-test-env": "0.3.2",
+    "@ensdomains/ens-test-env": "0.3.3",
     "@ethersproject/abi": "^5.6.0",
     "@ethersproject/providers": "^5.6.2",
     "@nomiclabs/hardhat-ethers": "npm:hardhat-deploy-ethers",

package/src/functions/createSubname.ts

@@ -1,6 +1,6 @@
 import { BigNumber, ethers } from 'ethers'
 import { ENSArgs } from '..'
-import { FuseOptions } from '../@types/FuseOptions'
+import { FuseOptions } from '../utils/fuses'
 import generateFuseInput from '../utils/generateFuseInput'
 import { namehash } from '../utils/normalise'
 import { Expiry, makeExpiry, wrappedLabelLengthCheck } from '../utils/wrapper'

package/src/functions/getNames.ts

@@ -17,6 +17,10 @@ export type Name = {
   registrationDate?: Date
   expiryDate?: Date
   fuses?: CurrentFuses
+  registration?: {
+    expiryDate: Date
+    registrationDate: Date
+  }
   type: 'domain' | 'registration' | 'wrappedDomain'
 }
 
@@ -66,6 +70,12 @@ const mapDomain = (domain: any) => {
 
 const mapWrappedDomain = (wrappedDomain: any) => {
   const domain = mapDomain(wrappedDomain.domain)
+  if (domain.registration) {
+    domain.registration = {
+      expiryDate: new Date(parseInt(domain.registration.expiryDate) * 1000),
+      registrationDate: new Date(domain.registration.registrationDate * 1000),
+    }
+  }
   return {
     expiryDate: new Date(parseInt(wrappedDomain.expiryDate) * 1000),
     fuses: decodeFuses(wrappedDomain.fuses),

package/src/functions/getOwner.ts

@@ -91,11 +91,27 @@ const raw = async (
   return multicallWrapper.raw(data)
 }
 
+const registrantQuery = `
+  query GetRegistrant($namehash: String!) {
+    domain(id: $namehash) {
+      registration {
+        registrant {
+          id
+        }
+      }
+    }
+  }
+`
+
 const singleContractOwnerDecode = (data: string) =>
   ethers.utils.defaultAbiCoder.decode(['address'], data)[0]
 
 const decode = async (
-  { contracts, multicallWrapper }: ENSArgs<'contracts' | 'multicallWrapper'>,
+  {
+    contracts,
+    multicallWrapper,
+    gqlInstance,
+  }: ENSArgs<'contracts' | 'multicallWrapper' | 'gqlInstance'>,
   data: string,
   name: string,
   contract?: 'nameWrapper' | 'registry' | 'registrar',
@@ -131,12 +147,20 @@ const decode = async (
 
   const registryOwner = (decodedData[0] as ethers.utils.Result)[0]
   const nameWrapperOwner = (decodedData[1] as ethers.utils.Result)[0]
-  const registrarOwner = (
-    decodedData[2] as ethers.utils.Result | undefined
-  )?.[0]
+  let registrarOwner = (decodedData[2] as ethers.utils.Result | undefined)?.[0]
 
   // check for only .eth names
   if (labels[labels.length - 1] === 'eth') {
+    if (!registrarOwner && labels.length === 2) {
+      const graphRegistrantResult = await gqlInstance?.request(
+        registrantQuery,
+        {
+          namehash: makeNamehash(name),
+        },
+      )
+      registrarOwner =
+        graphRegistrantResult.domain?.registration?.registrant?.id
+    }
     // if the owner on the registrar is the namewrapper, then the namewrapper owner is the owner
     // there is no "registrant" for wrapped names
     if (registrarOwner === nameWrapper.address) {
@@ -156,10 +180,16 @@ const decode = async (
         ownershipLevel: 'registrar',
       }
     }
-    if (
-      labels.length > 2 &&
-      ethers.utils.hexStripZeros(registryOwner) !== '0x'
-    ) {
+    if (ethers.utils.hexStripZeros(registryOwner) !== '0x') {
+      // if there is no registrar owner, but the label length is two, then the domain is an expired 2LD .eth
+      // so we still want to return the ownership values
+      if (labels.length === 2) {
+        return {
+          registrant: undefined,
+          owner: registryOwner,
+          ownershipLevel: 'registrar',
+        }
+      }
       // this means that the subname is wrapped
       if (
         registryOwner === nameWrapper.address &&

package/src/functions/wrapName.test.ts

@@ -53,8 +53,8 @@ describe('wrapName', () => {
       const tx = await ensInstance.wrapName('test123.eth', {
         wrappedOwner: accounts[2],
         fuseOptions: {
-          cannotUnwrap: true,
-          cannotSetTtl: true,
+          CANNOT_UNWRAP: true,
+          CANNOT_SET_TTL: true,
         },
         addressOrIndex: 1,
       })

package/src/functions/wrapName.ts

@@ -1,6 +1,6 @@
 import { BigNumber, ethers } from 'ethers'
 import { ENSArgs } from '..'
-import type { FuseOptions } from '../@types/FuseOptions'
+import { FuseOptions } from '../utils/fuses'
 import generateFuseInput from '../utils/generateFuseInput'
 import { hexEncodeName } from '../utils/hexEncodedName'
 import { Expiry, makeExpiry, wrappedLabelLengthCheck } from '../utils/wrapper'

package/src/index.ts

@@ -33,6 +33,7 @@ import type {
 } from './functions/getSpecificRecord'
 import type getSubnames from './functions/getSubnames'
 import type getWrapperData from './functions/getWrapperData'
+import importDNSSECName from './functions/importDNSSECName'
 import type registerName from './functions/registerName'
 import type {
   // eslint-disable-next-line import/no-named-default
@@ -51,7 +52,6 @@ import type wrapName from './functions/wrapName'
 import GqlManager from './GqlManager'
 import singleCall from './utils/singleCall'
 import writeTx from './utils/writeTx'
-import importDNSSECName from './functions/importDNSSECName'
 
 export type {
   Fuse,
@@ -500,7 +500,7 @@ export class ENS {
 
   public getOwner = this.generateRawFunction<typeof getOwner>(
     'initialGetters',
-    ['contracts', 'multicallWrapper'],
+    ['contracts', 'multicallWrapper', 'gqlInstance'],
     'getOwner',
   )
 

package/src/utils/fuses.ts

@@ -19,6 +19,8 @@ export const fuseEnum = {
   PARENT_CANNOT_CONTROL,
 } as const
 
+export type FuseOptions = { -readonly [K in keyof typeof fuseEnum]?: boolean }
+
 export const unnamedFuses = [
   128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768, 65536, 131072, 262144,
   524288, 1048576, 2097152, 4194304, 8388608, 16777216, 33554432, 67108864,

package/src/utils/generateFuseInput.ts

@@ -1,6 +1,5 @@
 import { ethers } from 'ethers'
-import { FuseOptions } from '../@types/FuseOptions'
-import fuses from './fuses'
+import fuses, { FuseOptions } from './fuses'
 
 export default (fuseOptions: FuseOptions) => {
   const fuseKeys = Object.keys(fuseOptions).filter(

package/src/utils/registerHelpers.ts

@@ -1,6 +1,6 @@
 import { BigNumberish, utils } from 'ethers'
-import type { FuseOptions } from '../@types/FuseOptions'
 import type { PublicResolver } from '../generated'
+import { FuseOptions } from './fuses'
 import generateFuseInput from './generateFuseInput'
 import { labelhash } from './labels'
 import { namehash } from './normalise'

package/src/@types/FuseOptions.d.ts

@@ -1,9 +0,0 @@
-export type FuseOptions = {
-  cannotUnwrap: true
-  cannotBurnFuses?: boolean
-  cannotTransfer?: boolean
-  cannotSetResolver?: boolean
-  cannotSetTtl?: boolean
-  cannotCreateSubdomain?: boolean
-  parentCannotControl?: boolean
-}