@snapshot-labs/snapshot.js 0.11.38 → 0.11.39

package/src/utils.ts

@@ -29,8 +29,10 @@ interface Strategy {
   params: any;
 }
 
-const ENS_RESOLVER_ABI = [
-  'function text(bytes32 node, string calldata key) external view returns (string memory)'
+const ENS_REGISTRY = '0x00000000000C2E074eC69A0dFb2997BA6C7d2e1e';
+const ENS_ABI = [
+  'function text(bytes32 node, string calldata key) external view returns (string memory)',
+  'function resolver(bytes32 node) view returns (address)' // ENS registry ABI
 ];
 const EMPTY_ADDRESS = '0x0000000000000000000000000000000000000000';
 
@@ -65,7 +67,7 @@ async function parseScoreAPIResponse(res: any) {
   let data: any = await res.text();
   try {
     data = JSON.parse(data);
-  } catch (e) {
+  } catch (e: any) {
     return Promise.reject({
       code: res.status || 500,
       message: 'Failed to parse response from score API',
@@ -204,7 +206,7 @@ export async function call(provider, abi: any[], call: any[], options?) {
   try {
     const params = call[2] || [];
     return await contract[call[1]](...params, options || {});
-  } catch (e) {
+  } catch (e: any) {
     return Promise.reject(e);
   }
 }
@@ -245,7 +247,7 @@ export async function multicall(
     return results.map((call, i) =>
       itf.decodeFunctionResult(calls[i][1], call)
     );
-  } catch (e) {
+  } catch (e: any) {
     return Promise.reject(e);
   }
 }
@@ -263,7 +265,7 @@ export async function subgraphRequest(url: string, query, options: any = {}) {
   let responseData: any = await res.text();
   try {
     responseData = JSON.parse(responseData);
-  } catch (e) {
+  } catch (e: any) {
     throw new Error(
       `Errors found in subgraphRequest: URL: ${url}, Status: ${
         res.status
@@ -388,7 +390,7 @@ export async function getScores(
     return options.returnValue === 'all'
       ? response.result
       : response.result[options.returnValue || 'scores'];
-  } catch (e) {
+  } catch (e: any) {
     if (e.errno) {
       return Promise.reject({ code: e.errno, message: e.toString(), data: '' });
     }
@@ -448,7 +450,7 @@ export async function getVp(
     const res = await fetch(url, init);
     const response = await parseScoreAPIResponse(res);
     return response.result;
-  } catch (e) {
+  } catch (e: any) {
     if (e.errno) {
       return Promise.reject({ code: e.errno, message: e.toString(), data: '' });
     }
@@ -502,7 +504,7 @@ export async function validate(
     const res = await fetch(url, init);
     const response = await parseScoreAPIResponse(res);
     return response.result;
-  } catch (e) {
+  } catch (e: any) {
     if (e.errno) {
       return Promise.reject({ code: e.errno, message: e.toString(), data: '' });
     }
@@ -535,25 +537,34 @@ export async function getEnsTextRecord(
   options: any = {}
 ) {
   const {
-    ensResolvers: ensResolversOpt,
+    ensResolvers = networks[network]?.ensResolvers ||
+      networks['1'].ensResolvers,
     broviderUrl,
     ...multicallOptions
   } = options;
-  const ensResolvers =
-    ensResolversOpt ||
-    networks[network].ensResolvers ||
-    networks['1'].ensResolvers;
+
   const ensHash = namehash(ensNormalize(ens));
   const provider = getProvider(network, { broviderUrl });
 
-  const result = await multicall(
+  const calls = [
+    [ENS_REGISTRY, 'resolver', [ensHash]], // Query for resolver from registry
+    ...ensResolvers.map((address: string) => [
+      address,
+      'text',
+      [ensHash, record]
+    ]) // Query for text record from each resolver
+  ];
+
+  const [[resolverAddress], ...textRecords]: string[][] = await multicall(
     network,
     provider,
-    ENS_RESOLVER_ABI,
-    ensResolvers.map((address: any) => [address, 'text', [ensHash, record]]),
+    ENS_ABI,
+    calls,
     multicallOptions
   );
-  return result.flat().find((r: string) => r) || '';
+
+  const resolverIndex = ensResolvers.indexOf(resolverAddress);
+  return resolverIndex !== -1 ? textRecords[resolverIndex]?.[0] : null;
 }
 
 export async function getSpaceUri(
@@ -563,7 +574,7 @@ export async function getSpaceUri(
 ): Promise<string | null> {
   try {
     return await getEnsTextRecord(id, 'snapshot', network, options);
-  } catch (e) {
+  } catch (e: any) {
     console.log(e);
     return null;
   }
@@ -574,10 +585,9 @@ export async function getEnsOwner(
   network = '1',
   options: any = {}
 ): Promise<string | null> {
-  const registryAddress = '0x00000000000C2E074eC69A0dFb2997BA6C7d2e1e';
   const provider = getProvider(network, options);
   const ensRegistry = new Contract(
-    registryAddress,
+    ENS_REGISTRY,
     ['function owner(bytes32) view returns (address)'],
     provider
   );