Merge pull request #297 from hhio618/development

ubiquity · Sep 14, 2024 · 9237f0e · 9237f0e
2 parents f487f75 + de6d398
commit 9237f0e
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 56 deletions.
diff --git a/static/scripts/rewards/cirip/ens-lookup.ts b/static/scripts/rewards/cirip/ens-lookup.ts
@@ -1,10 +1,5 @@
-import { ethers } from "ethers";
-import abi from "../abis/cirip.json";
-import { fetchEns } from "./fetch-ens";
 import { queryReverseEns } from "./query-reverse-ens";
 
-export const reverseEnsInterface = new ethers.utils.Interface(abi);
-
 // addEventListener("fetch", event => {
 //   event.respondWith(handleRequest(event.request).catch(err => new Response(err.stack, { status: 500 })));
 // });
@@ -24,29 +19,26 @@ export async function ensLookup(addr: string, networkId: number) {
   // let response = "";
   try {
     reverseRecord = await queryReverseEns(address, networkId);
-    const responseParsed = JSON.parse(reverseRecord).result;
-    const _reverseRecord = ethers.utils.defaultAbiCoder.decode([ethers.utils.ParamType.from("string[]")], responseParsed);
-    reverseRecord = _reverseRecord[0][0];
   } catch (e) {
     console.error(e);
     //   throw "Error contacting ethereum node. \nCause: '" + e + "'. \nResponse: " + response;
   }
 
-  const allDomains = await fetchEns(address);
+  // const allDomains = await fetchEns(address);
 
   if (reverseRecord == "") {
     reverseRecord = null;
   }
 
   // if reverse record is set, validate addr owns this domain.
-  if (reverseRecord != null && !allDomains.includes(reverseRecord)) {
-    console.warn("Failed to validate! Reverse record set to " + reverseRecord + ", but user does not own this name.");
-    reverseRecord = null;
-  }
+  // if (reverseRecord != null && !allDomains.includes(reverseRecord)) {
+  //   console.warn("Failed to validate! Reverse record set to " + reverseRecord + ", but user does not own this name.");
+  //  reverseRecord = null;
+  // }
 
   return {
     reverseRecord: reverseRecord,
-    domains: allDomains,
+    domains: [],
   };
   //  new Response(JSON.stringify(response), {
   //   headers: {

diff --git a/static/scripts/rewards/cirip/fetch-ens.ts b/static/scripts/rewards/cirip/fetch-ens.ts
diff --git a/static/scripts/rewards/cirip/query-graph.ts b/static/scripts/rewards/cirip/query-graph.ts
diff --git a/static/scripts/rewards/cirip/query-reverse-ens.ts b/static/scripts/rewards/cirip/query-reverse-ens.ts
@@ -1,6 +1,8 @@
 import { app } from "../app-state";
 import { useRpcHandler } from "../web3/use-rpc-handler";
-import { reverseEnsInterface } from "./ens-lookup";
+import { ethers } from "ethers";
+
+const mainnetRpcUrl = "https://eth.api.onfinality.io/public";
 
 export async function queryReverseEns(address: string, networkId: number) {
   // Try to get the ENS name from localStorage
@@ -17,28 +19,14 @@ export async function queryReverseEns(address: string, networkId: number) {
     return cachedEnsName;
   } else {
     // If the ENS name is not in localStorage, fetch it from the API
-    const data = reverseEnsInterface.encodeFunctionData("getNames", [[address.substring(2)]]);
-
-    const response = await fetch(endpoint, {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json",
-      },
-      body: JSON.stringify({
-        jsonrpc: "2.0",
-        id: "1",
-        method: "eth_call",
-        params: [{ to: "0x3671aE578E63FdF66ad4F3E12CC0c0d71Ac7510C", data: data }, "latest"],
-      }),
-    });
+    const web3Provider = new ethers.providers.JsonRpcProvider(mainnetRpcUrl);
+    const ensName = await web3Provider.lookupAddress(address);
 
-    if (!response.ok) {
+    if (ensName === null) {
       console.error("ENS lookup failed: API request failed");
       return "";
     }
 
-    const ensName = await response.text();
-
     // Store the ENS name in localStorage for future use
     localStorage.setItem(address, ensName);