Improve utils-eth

dOrgTech · Aug 28, 2024 · 313db2b · 313db2b
1 parent cb7dfd0
commit 313db2b
Show file tree

Hide file tree

Showing 5 changed files with 58 additions and 23 deletions.
diff --git a/bun.lockb b/bun.lockb
diff --git a/components/daos/index.js b/components/daos/index.js
@@ -30,7 +30,6 @@ const getAllLiteOnlyDAOs = async (req, response) => {
     }).lean();
 
     const allDaoIds = allDaos.map(dao => new mongoose.Types.ObjectId(dao._id));
-
     const allTokens = await TokenModel.find({ daoID: { $in: allDaoIds } }).lean();
     // console.log('All Tokens DAO', [...new Set(allTokens.map(token => token.daoID))])
     // console.log('Found Tokens',allDaoIds, allTokens.length)
@@ -164,6 +163,7 @@ const updateTotalCount = async (req, response) => {
         dao.network,
         token.tokenAddress,
       );
+      console.log(`Token holder count for ${token.tokenAddress} is ${count}`)
     } else {
       count = await getTokenHoldersCount(
         dao.network,

diff --git a/components/tokens/index.js b/components/tokens/index.js
@@ -1,11 +1,13 @@
 // This will help us connect to the database
+const mongoose = require("mongoose");
+const mongodb = require("mongodb");
 const dbo = require("../../db/conn");
 const TokenModel = require("../../db/models/Token.model");
+const DAOModel = require("../../db/models/Dao.model");
 const { getUserTotalVotingPowerAtReferenceBlock } = require("../../utils");
 const { getEthTokenMetadata } = require("../../utils-eth");
 
-const ObjectId = require("mongodb").ObjectId;
-
+const ObjectId = mongodb.ObjectId;
 const addToken = async (req, response) => {
   const { daoID, tokenID, symbol, tokenAddress } = req.body;
 
@@ -35,7 +37,16 @@ const getTokenById = async (req, response) => {
   const { id } = req.params;
 
   try {
-    const result = await TokenModel.findOne({daoId: ObjectId(id)})
+    const result = await TokenModel.findOne({daoID: id}).lean()
+    if(result.tokenType === "ERC20") {
+      const linkedDao = await DAOModel.findById(result.daoID)
+      const tokenMeta = await getEthTokenMetadata(linkedDao?.network, result.tokenAddress)
+      if(tokenMeta) {
+        result.holders = tokenMeta?.holders
+      }else{
+        console.log(tokenMeta, linkedDao.address, result.tokenAddress)
+      }
+    }
     response.json(result);
   } catch (error) {
     console.log("error: ", error);

diff --git a/pm2.config.js b/pm2.config.js
@@ -0,0 +1,5 @@
+module.exports = {
+    name: "homebase-api",
+    script: "server.js", 
+    interpreter: "~/.bun/bin/bun", 
+};
diff --git a/utils-eth.js b/utils-eth.js
@@ -323,12 +323,43 @@ const tokenAbiForErc20 = [
     }
 ]
 
-// ⚠️ To be Fixed
 function _getEthProvider(network) {
-    return new JsonRpcProvider("https://node.ghostnet.etherlink.com");
-    //   return new JsonRpcProvider("https://eth-sepolia.blockscout.com");
+    const rpcEndpoint = network.includes("test") ? "https://node.ghostnet.etherlink.com" : "https://node.mainnet.etherlink.com";
+    return new JsonRpcProvider(rpcEndpoint);
 }
 
+function _getEthRestEndpoint(network) {
+    const rpcEndpoint = network.includes("test") ? "https://testnet.explorer.etherlink.com/api/v2" : "https://node.mainnet.etherlink.com";
+    return rpcEndpoint;
+}
+
+async function _getEthTokenMetadataWithRpc(network, tokenAddress) {
+    const provider = _getEthProvider(network);
+    const tokenContract = new ethers.Contract(tokenAddress, tokenAbiForErc20, provider);
+    const symbol = await tokenContract.symbol();
+    const decimals = await tokenContract.decimals();
+    const name = await tokenContract.name();
+    const totalSupply = await tokenContract.totalSupply();
+    return {
+        name,
+        decimals: Number(decimals),
+        symbol,
+        totalSupply: BigNumber(totalSupply).toString(),
+    };
+}
+
+async function _getEthTokenMetadataWithRest(network, tokenAddress) {
+    const url = _getEthRestEndpoint(network)
+    const response = await fetch(`${url}/tokens/${tokenAddress}`)
+    const data = await response.json()
+    return {
+        name: data?.name,
+        decimals: data?.decimals,
+        symbol: data?.symbol,
+        totalSupply: data?.total_supply,
+        holders: data?.holders,
+    }
+}
 // ⚠️ To be Implemented
 function verityEthSignture(signature, payloadBytes) {
 
@@ -360,19 +391,7 @@ function verityEthSignture(signature, payloadBytes) {
 
 // ✅ Working
 async function getEthTokenMetadata(network, tokenAddress) {
-    const provider = _getEthProvider(network);
-    const tokenContract = new ethers.Contract(tokenAddress, tokenAbiForErc20, provider);
-    const symbol = await tokenContract.symbol();
-    const decimals = await tokenContract.decimals();
-    const name = await tokenContract.name();
-    const totalSupply = await tokenContract.totalSupply();
-
-    return {
-        name,
-        decimals: Number(decimals),
-        symbol,
-        totalSupply: BigNumber(totalSupply).toString(),
-    };
+    return await _getEthTokenMetadataWithRest(network, tokenAddress)
 }
 
 // ✅ Working
@@ -432,9 +451,9 @@ async function getEthTokenHoldersCount(network, tokenAddress, block = 0) {
     return holders.size;
 }
 
-getEthTokenMetadata("sepolia", "0x336bfd0356f6babec084f9120901c0296db1967e").then(console.log)
+// getEthTokenMetadata("etherlink_testnet", "0x336bfd0356f6babec084f9120901c0296db1967e").then(console.log)
 
-// getEthTokenHoldersCount("sepolia","0x336bfd0356f6babec084f9120901c0296db1967e").then(console.log)
+// getEthTokenHoldersCount("etherlink_testnet","0x336bfd0356f6babec084f9120901c0296db1967e").then(console.log)
 
 // ✅ Working
 // getEthTotalSupply("sepoplia","0x336bfd0356f6babec084f9120901c0296db1967e").then((x)=>console.log("Total Suplpy",x))
@@ -445,7 +464,7 @@ getEthTokenMetadata("sepolia", "0x336bfd0356f6babec084f9120901c0296db1967e").the
 
 
 // ✅ Working
-// getEthCurrentBlock("sepolia").then(console.log)
+// getEthCurrentBlock("etherlink_testnet").then(console.log)
 
 console.log("from ETH")