Merge branch 'main' into feat/block-details-api

Author: reeshavacharya

src/controllers/address.ts

@@ -1,23 +1,20 @@
-import { Request, Response, Router } from "express";
-import { handlerWrapper } from "../errors/AppError";
-import { convertToHexIfBech32, validateAddress } from "../helpers/validator";
-import { fetchFaucetBalance } from "../repository/address";
+import { Request, Response, Router } from 'express'
+import { handlerWrapper } from '../errors/AppError'
+import { convertToHexIfBech32, validateAddress } from '../helpers/validator'
+import { fetchFaucetBalance } from '../repository/address'
 
-const router = Router();
+const router = Router()
 
 const getFaucetBalance = async (req: Request, res: Response): Promise<any> => {
-  let address = convertToHexIfBech32(req.query.address as string)
-  if (validateAddress(address)){
-    address = address.length === 56 ? `e0${address}`:address
-  }else{
-    return res.status(400).json({message:'Provide a valid address'})
-  }
+    let address = convertToHexIfBech32(req.query.address as string)
+    if (validateAddress(address)) {
+        const balance = await fetchFaucetBalance(address)
+        return res.status(200).json(balance)
+    } else {
+        return res.status(400).json({ message: 'Provide a valid address' })
+    }
+}
 
- const balance = await fetchFaucetBalance(address)
+router.get('/balance', handlerWrapper(getFaucetBalance))
 
-  return res.status(200).json(balance);
-};
-
-router.get('/balance', handlerWrapper(getFaucetBalance));
-
-export default router;
+export default router

src/controllers/delegation.ts

@@ -1,21 +1,20 @@
-import { Request, Response, Router } from "express";
-import { handlerWrapper } from "../errors/AppError";
-import { convertToHexIfBech32, validateAddress } from "../helpers/validator";
-import { fetchDelegationDetail } from "../repository/delegation";
+import { Request, Response, Router } from 'express'
+import { handlerWrapper } from '../errors/AppError'
+import { convertToHexIfBech32, validateAddress } from '../helpers/validator'
+import { fetchDelegationDetail } from '../repository/delegation'
 
-const router = Router();
+const router = Router()
 
 const getDelegation = async (req: Request, res: Response): Promise<any> => {
-  let address = convertToHexIfBech32(req.query.address as string);
-  if (validateAddress(address)){
-    address = address.length === 56 ? `e0${address}`:address
-  }else{
-    return res.status(400).json({message:'Provide a valid address'})
-  }
-  const result = await fetchDelegationDetail(address)
-  return res.status(200).json(result);
-};
+    let address = convertToHexIfBech32(req.query.address as string)
+    if (validateAddress(address)) {
+        const result = await fetchDelegationDetail(address)
+        return res.status(200).json(result)
+    } else {
+        return res.status(400).json({ message: 'Provide a valid address' })
+    }
+}
 
-router.get('/', handlerWrapper(getDelegation));
+router.get('/', handlerWrapper(getDelegation))
 
-export default router;
+export default router

src/controllers/governance.ts

@@ -9,10 +9,10 @@ const cache = new NodeCache({ stdTTL: 3600, checkperiod: 600 })
 
 const updateCache = async () => {
     const activeTotalStake = await fetchActiveToalStake()
-    const liveTotalStake = await fetchLiveTotalStake()
+    //const liveTotalStake = await fetchLiveTotalStake()
 
     cache.set('activeTotalStake', activeTotalStake)
-    cache.set('liveTotalStake', liveTotalStake)
+    //cache.set('liveTotalStake', liveTotalStake)
 }
 
 updateCache()
@@ -35,6 +35,6 @@ const getToalLiveStake = async (req: Request, res: Response) => {
 }
 
 router.get('/active-stake', handlerWrapper(getToalActiveStake))
-router.get('/live-stake', handlerWrapper(getToalLiveStake))
+//router.get('/live-stake', handlerWrapper(getToalLiveStake))
 
 export default router

src/controllers/stakeAddress.ts

@@ -1,22 +1,20 @@
-import { Request, Response, Router } from "express";
-import { handlerWrapper } from "../errors/AppError";
-import { convertToHexIfBech32, validateAddress } from "../helpers/validator";
-import { fetchStakeAddressDetails } from "../repository/stakeAddress";
+import { Request, Response, Router } from 'express'
+import { handlerWrapper } from '../errors/AppError'
+import { convertToHexIfBech32, validateAddress } from '../helpers/validator'
+import { fetchStakeAddressDetails } from '../repository/stakeAddress'
 
-const router = Router();
+const router = Router()
 
 const getStakeAddressDetails = async (req: Request, res: Response): Promise<any> => {
-  let address = convertToHexIfBech32(req.query.address as string)
-  if (validateAddress(address)){
-    address = address.length === 56 ? `e0${address}`:address
-  }else{
-    return res.status(400).json({message:'Provide a valid address'})
-  }
+    let address = convertToHexIfBech32(req.query.address as string)
+    if (validateAddress(address)) {
+        const result = await fetchStakeAddressDetails(address)
+        return res.status(200).json(result)
+    } else {
+        return res.status(400).json({ message: 'Provide a valid address' })
+    }
+}
 
-const result = await fetchStakeAddressDetails(address)
-  return res.status(200).json(result);
-};
+router.get('/', handlerWrapper(getStakeAddressDetails))
 
-router.get('/', handlerWrapper(getStakeAddressDetails));
-
-export default router;
+export default router

src/helpers/validator.ts

@@ -105,7 +105,7 @@ export function fromHex(prefix: string, hex: string) {
 
 export function validateAddress(value: string): boolean {
     if (isHexValue(value)) {
-        return value.length === 56 || value.length === 58
+        return value.length === 58
     }
     return false
 }

src/repository/drep.ts

@@ -573,7 +573,7 @@ export const fetchDrepLiveStats = async (drepId: string, isScript?: boolean) =>
 
     const drepVotingHistory = (await prisma.$queryRaw`
         WITH firstRegistration AS (
-            SELECT b.time AS firstRegistrationTime
+            SELECT b.epoch_no AS firstRegistrationEpoch
             FROM drep_registration dr
             JOIN drep_hash dh ON dh.id = dr.drep_hash_id
             JOIN tx ON tx.id = dr.tx_id
@@ -586,10 +586,8 @@ export const fetchDrepLiveStats = async (drepId: string, isScript?: boolean) =>
         govActionsAfter AS (
             SELECT COALESCE(COUNT(DISTINCT gp.id), 0) AS totalGovActionsAfter
             FROM gov_action_proposal AS gp
-            JOIN tx ON tx.id = gp.tx_id
-            JOIN block b ON b.id = tx.block_id
             LEFT JOIN firstRegistration ON TRUE 
-            WHERE b.time > firstRegistration.firstRegistrationTime
+            WHERE gp.expiration > firstRegistration.firstRegistrationEpoch
         ),
         votedGovActions AS (
             SELECT COUNT(DISTINCT gp.id) AS voted
@@ -959,4 +957,4 @@ export const fetchDrepDelegationHistory = async (dRepId: string, isScript?: bool
     })
     flattenedDelegations.sort((a: Delegation, b: Delegation) => new Date(b.time).getTime() - new Date(a.time).getTime())
     return flattenedDelegations
-}
+}

src/repository/proposal.ts

@@ -2,6 +2,8 @@ import { Prisma } from '@prisma/client'
 import { prisma } from '../config/db'
 import { formatResult } from '../helpers/formatter'
 import { GovActionStateTypes, ProposalTypes, SortTypes } from '../types/proposal'
+import { ProposalTypes, SortTypes } from '../types/proposal'
+
 
 export const fetchProposals = async (
     page: number,
@@ -569,7 +571,24 @@ export const fetchProposalVoteCount = async (proposalId: string, proposalIndex:
     `
     const spoSelectionQuery = Prisma.sql`SELECT 'spo' AS voterRole, (SELECT jsonb_agg(to_jsonb(poolVoteRecord)) FROM poolVoteRecord) AS voteRecord`
     const ccVoteQuery = Prisma.sql`
-        , committeeVoteRecord AS (
+        , RatifiedCommitteeGovAction AS (
+            SELECT gap.id
+            FROM gov_action_proposal gap
+            WHERE gap.type = 'NewCommittee'
+            AND ratified_epoch IS NOT NULL
+            ORDER BY gap.id DESC
+            LIMIT 1
+        ),
+        Committee AS (
+            SELECT Count(DISTINCT(ch.raw)) as committeeMembersCount
+            FROM committee c
+            JOIN committee_member cm ON cm.committee_id = c.id
+            JOIN committee_hash ch ON cm.committee_hash_id = ch.id
+            LEFT JOIN RatifiedCommitteeGovAction rc 
+                ON rc.id = c.gov_action_proposal_id
+            WHERE c.gov_action_proposal_id IS NULL
+        ), 
+        committeeVoteRecord AS (
             WITH CommitteeVotes AS (
                 -- Count committee votes for each vote type
                 SELECT 
@@ -597,8 +616,8 @@ export const fetchProposalVoteCount = async (proposalId: string, proposalIndex:
                 WHERE cm.expiration_epoch > (SELECT epoch FROM latestOrGovActionExpiration)
                 ORDER BY ch.raw, cm.expiration_epoch DESC
             )
-            SELECT 'total_distribution' as vote_type, COUNT(DISTINCT hash) AS count
-            FROM CommitteeData
+            SELECT 'total_distribution' as vote_type, committeeMembersCount AS count
+            FROM Committee
             UNION ALL
             SELECT 'yes_votes' as vote_type, COALESCE(cc_Yes_Votes, 0) AS count FROM CommitteeVotes
             UNION ALL
@@ -1390,6 +1409,7 @@ export const fetchProposalById = async (proposalId: string, proposaIndex: number
         any,
         any
     >[]
+    if (result.length == 0) return result
     const proposalVoteCount = includeVoteCount
         ? { vote: await fetchProposalVoteCount(proposalId, proposaIndex) }
         : undefined