Merge pull request #23 from dOrgTech/xtz-polls

logic for xtz weighted polls
dOrgTech · Feb 9, 2024 · cb50719 · cb50719
2 parents 3bbfd90 + efdc805
commit cb50719
Show file tree

Hide file tree

Showing 4 changed files with 77 additions and 39 deletions.
diff --git a/components/choices/index.js b/components/choices/index.js
@@ -94,7 +94,8 @@ const updateChoiceById = async (req, response) => {
       dao.daoContract,
       token.tokenID,
       block,
-      address
+      address,
+      poll.isXTZ
     );
 
     if (!total) {
@@ -151,9 +152,6 @@ const updateChoiceById = async (req, response) => {
             try {
               await session.withTransaction(async () => {
                 const coll1 = db_connect.collection("Choices");
-                const coll2 = db_connect.collection("Polls");
-
-                // await coll2.updateOne({_id: poll._id},  { $set: { "votes" : values.length }})
                 // Important:: You must pass the session to the operations
                 await coll1.updateOne(
                   { _id: ObjectId(oldVote._id) },
@@ -199,8 +197,6 @@ const updateChoiceById = async (req, response) => {
               await session
                 .withTransaction(async () => {
                   const coll1 = db_connect.collection("Choices");
-                  const coll2 = db_connect.collection("Polls");
-
                   await coll1.updateOne(
                     {
                       _id: choice._id,

diff --git a/components/polls/index.js b/components/polls/index.js
@@ -62,6 +62,7 @@ const addPoll = async (req, response) => {
       externalLink,
       endTime,
       votingStrategy,
+      isXTZ
     } = values;
 
     const author = getPkhfromPk(publicKey);
@@ -166,6 +167,7 @@ const addPoll = async (req, response) => {
       choices: choicesPoll,
       author,
       votingStrategy,
+      isXTZ
     };
 
     let data = {

diff --git a/components/tokens/index.js b/components/tokens/index.js
@@ -75,10 +75,21 @@ const getVotingPowerAtLevel = async (req, response) => {
       daoContract,
       tokenID,
       level,
-      userAddress
+      userAddress,
+      isXTZ = false
     );
 
-    response.json({ votingWeight });
+    const votingXTZWeight = await getUserTotalVotingPowerAtReferenceBlock(
+      network,
+      address,
+      daoContract,
+      tokenID,
+      level,
+      userAddress,
+      isXTZ = true
+    );
+
+    response.json({ votingWeight, votingXTZWeight });
   } catch (error) {
     console.log("error: ", error);
     response.status(400).send({

diff --git a/utils.js b/utils.js
@@ -80,6 +80,26 @@ const getUserBalanceAtLevel = async (
   return new BigNumber(0);
 };
 
+const getUserXTZBalanceAtLevel = async (
+  network,
+  level,
+  userAddress
+) => {
+  const url = `https://api.${network}.tzkt.io/v1/accounts/${userAddress}/balance_history/${level}`;
+  const response = await axios({ url, method: "GET" });
+
+  if (response.status === 200) {
+    const result = response.data;
+    if (result) {
+      return new BigNumber(result);
+    } else {
+      return new BigNumber(0);
+    }
+  }
+
+  return new BigNumber(0);
+};
+
 const getUserDAODepositBalanceAtLevel = async (
   accountAddress,
   network,
@@ -117,49 +137,57 @@ const getUserTotalVotingPowerAtReferenceBlock = async (
   daoContract,
   tokenID,
   level,
-  userAddress
+  userAddress,
+  isXTZ = false
 ) => {
   try {
     let userVotingPower = new BigNumber(0);
-
-    const isTokenDelegation = await isTokenDelegationSupported(
-      network,
-      address
-    );
-
-    if (isTokenDelegation) {
-      const userVotePower = await getUserTotalVotingWeightAtBlock(
+    if (!isXTZ) {
+      const isTokenDelegation = await isTokenDelegationSupported(
         network,
-        address,
-        level,
-        userAddress
+        address
       );
-      if (!userVotePower) {
-        throw new Error("Could Not get voting weight");
+      if (isTokenDelegation) {
+        const userVotePower = await getUserTotalVotingWeightAtBlock(
+          network,
+          address,
+          level,
+          userAddress
+        );
+        if (!userVotePower) {
+          throw new Error("Could Not get voting weight");
+        }
+        userVotingPower = userVotingPower.plus(userVotePower);
+      } else {
+        const selfBalance = await getUserBalanceAtLevel(
+          network,
+          address,
+          tokenID,
+          level,
+          userAddress
+        );
+        userVotingPower = userVotingPower.plus(selfBalance);
+
+        if (daoContract) {
+          const userDAODepositBalance = await getUserDAODepositBalanceAtLevel(
+            userAddress,
+            network,
+            daoContract,
+            level
+          );
+          userVotingPower = userVotingPower.plus(userDAODepositBalance);
+        }
       }
-      userVotingPower = userVotingPower.plus(userVotePower);
+
+      return userVotingPower;
     } else {
-      const selfBalance = await getUserBalanceAtLevel(
+      const selfBalance = await getUserXTZBalanceAtLevel(
         network,
-        address,
-        tokenID,
         level,
         userAddress
       );
-      userVotingPower = userVotingPower.plus(selfBalance);
-
-      if (daoContract) {
-        const userDAODepositBalance = await getUserDAODepositBalanceAtLevel(
-          userAddress,
-          network,
-          daoContract,
-          level
-        );
-        userVotingPower = userVotingPower.plus(userDAODepositBalance);
-      }
+      return userVotingPower.plus(selfBalance);
     }
-
-    return userVotingPower;
   } catch (error) {
     console.log("error: ", error);
     throw error;
@@ -200,4 +228,5 @@ module.exports = {
   getUserTotalVotingPowerAtReferenceBlock,
   getUserBalanceAtLevel,
   getTokenHoldersCount,
+  getUserXTZBalanceAtLevel
 };