@ensdomains/ensjs 3.0.0-alpha.64 → 3.0.0-alpha.65

package/dist/cjs/functions/getSubnames.js

@@ -26,7 +26,7 @@ var import_format = require("../utils/format");
 var import_fuses = require("../utils/fuses");
 var import_labels = require("../utils/labels");
 var import_normalise = require("../utils/normalise");
-const largeQuery = async ({ gqlInstance }, {
+const largeQuery = async ({ gqlInstance, contracts }, {
   name,
   pageSize = 10,
   orderDirection,
@@ -34,6 +34,8 @@ const largeQuery = async ({ gqlInstance }, {
   lastSubnames = [],
   search = ""
 }) => {
+  const nameWrapper = await (contracts == null ? void 0 : contracts.getNameWrapper());
+  const nameWrapperAddress = nameWrapper == null ? void 0 : nameWrapper.address.toLowerCase();
   const { client } = gqlInstance;
   const lastSubname = lastSubnames == null ? void 0 : lastSubnames[lastSubnames.length - 1];
   const lastCreatedAt = lastSubname == null ? void 0 : lastSubname.createdAt;
@@ -121,7 +123,7 @@ const largeQuery = async ({ gqlInstance }, {
         owner: subname.owner.id,
         type: "domain"
       };
-      if (wrappedDomain) {
+      if (wrappedDomain && obj.owner === nameWrapperAddress) {
         obj.type = "wrappedDomain";
         const expiryDateAsDate = wrappedDomain.expiryDate && wrappedDomain.expiryDate !== "0" ? new Date(parseInt(wrappedDomain.expiryDate) * 1e3) : void 0;
         const hasExpired = expiryDateAsDate && expiryDateAsDate < new Date();

package/dist/cjs/index.js

@@ -247,7 +247,7 @@ class ENS {
     );
     this.getSubnames = this.generateFunction(
       "initialGetters",
-      ["gqlInstance"],
+      ["gqlInstance", "contracts"],
       "getSubnames"
     );
     this.getNames = this.generateFunction(

package/dist/esm/functions/getSubnames.mjs

@@ -8,7 +8,7 @@ import { truncateFormat } from "../utils/format.mjs";
 import { checkPCCBurned, decodeFuses } from "../utils/fuses.mjs";
 import { decryptName } from "../utils/labels.mjs";
 import { namehash } from "../utils/normalise.mjs";
-var largeQuery = async ({ gqlInstance }, {
+var largeQuery = async ({ gqlInstance, contracts }, {
   name,
   pageSize = 10,
   orderDirection,
@@ -16,6 +16,8 @@ var largeQuery = async ({ gqlInstance }, {
   lastSubnames = [],
   search = ""
 }) => {
+  const nameWrapper = await contracts?.getNameWrapper();
+  const nameWrapperAddress = nameWrapper?.address.toLowerCase();
   const { client } = gqlInstance;
   const lastSubname = lastSubnames?.[lastSubnames.length - 1];
   const lastCreatedAt = lastSubname?.createdAt;
@@ -103,7 +105,7 @@ var largeQuery = async ({ gqlInstance }, {
         owner: subname.owner.id,
         type: "domain"
       };
-      if (wrappedDomain) {
+      if (wrappedDomain && obj.owner === nameWrapperAddress) {
         obj.type = "wrappedDomain";
         const expiryDateAsDate = wrappedDomain.expiryDate && wrappedDomain.expiryDate !== "0" ? new Date(parseInt(wrappedDomain.expiryDate) * 1e3) : void 0;
         const hasExpired = expiryDateAsDate && expiryDateAsDate < new Date();

package/dist/esm/index.mjs

@@ -224,7 +224,7 @@ var ENS = class {
   );
   getSubnames = this.generateFunction(
     "initialGetters",
-    ["gqlInstance"],
+    ["gqlInstance", "contracts"],
     "getSubnames"
   );
   getNames = this.generateFunction(

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

@@ -35,5 +35,5 @@ declare type Params = {
     lastSubnames?: Array<any>;
     search?: string;
 };
-declare const getSubnames: (injected: ENSArgs<'gqlInstance'>, functionArgs: Params) => Promise<ReturnData>;
+declare const getSubnames: (injected: ENSArgs<'gqlInstance' | 'contracts'>, functionArgs: Params) => Promise<ReturnData>;
 export default getSubnames;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ensdomains/ensjs",
-  "version": "3.0.0-alpha.64",
+  "version": "3.0.0-alpha.65",
   "description": "ENS javascript library for contract interaction",
   "main": "./dist/cjs/index.js",
   "module": "./dist/esm/index.mjs",

package/src/functions/getSubnames.ts

@@ -52,7 +52,7 @@ type Params = {
 }
 
 const largeQuery = async (
-  { gqlInstance }: ENSArgs<'gqlInstance'>,
+  { gqlInstance, contracts }: ENSArgs<'gqlInstance' | 'contracts'>,
   {
     name,
     pageSize = 10,
@@ -62,6 +62,9 @@ const largeQuery = async (
     search = '',
   }: Params,
 ) => {
+  const nameWrapper = await contracts?.getNameWrapper()
+  const nameWrapperAddress = nameWrapper?.address.toLowerCase()
+
   const { client } = gqlInstance
 
   const lastSubname = lastSubnames?.[lastSubnames.length - 1]
@@ -165,7 +168,8 @@ const largeQuery = async (
         type: 'domain',
       } as Subname
 
-      if (wrappedDomain) {
+      // If the subname is wrapped, we need to verfiy that it is wrapped by checking the registry owner
+      if (wrappedDomain && obj.owner === nameWrapperAddress) {
         obj.type = 'wrappedDomain'
         const expiryDateAsDate =
           wrappedDomain.expiryDate && wrappedDomain.expiryDate !== '0'
@@ -194,7 +198,7 @@ const largeQuery = async (
 }
 
 const getSubnames = (
-  injected: ENSArgs<'gqlInstance'>,
+  injected: ENSArgs<'gqlInstance' | 'contracts'>,
   functionArgs: Params,
 ): Promise<ReturnData> => {
   return largeQuery(injected, functionArgs)

package/src/index.ts

@@ -510,7 +510,7 @@ export class ENS {
 
   public getSubnames = this.generateFunction<FunctionTypes['getSubnames']>(
     'initialGetters',
-    ['gqlInstance'],
+    ['gqlInstance', 'contracts'],
     'getSubnames',
   )