minor refactor

Author: dan13ram

prisma/prod.db

@@ -2,12 +2,11 @@ import { getCache, setCache } from '@/cache'
 import { env } from '@/config'
 import { logger } from '@/logger'
 import { getDAOsForOwners } from '@/services/builder/get-daos-for-owners'
-import { getProposalData } from '@/services/builder/get-proposal-for-propdate'
+import { getProposalData } from '@/services/builder/get-proposal-from-id'
 import { Chain, Proposal } from '@/services/builder/types'
 import { getFollowers } from '@/services/warpcast/get-followers'
 import { getMe } from '@/services/warpcast/get-me'
 import { getVerifications } from '@/services/warpcast/get-verifications'
-import { shortenAddress } from '@/utils'
 import { Hex } from 'viem'
 
 export const CACHE_MAX_AGE_MS = 86400 * 1000 // 1 day in milliseconds
@@ -116,18 +115,13 @@ export async function getUserFid() {
 }
 
 /**
- * Retrieves proposal data associated with a propdate
+ * Retrieves proposal data for a given proposal ID
  * @param chain - The blockchain network to query
- * @param propdateId - attestation Id for caching
  * @param proposalId - proposal Id
  * @returns A promise that resolves to the DAO object
  */
-export async function getProposalFromPropdate(
-  chain: Chain,
-  propdateId: Hex,
-  proposalId: Hex,
-) {
-  const cacheKey = `propdate_${shortenAddress(proposalId)}_${shortenAddress(propdateId)}`
+export async function getProposalFromId(chain: Chain, proposalId: Hex) {
+  const cacheKey = `propdate_${proposalId.toLowerCase()}`
   let proposal = await getCache<Proposal | null>(cacheKey, CACHE_MAX_AGE_MS)
 
   if (proposal) {

src/commands/index.ts

@@ -3,13 +3,12 @@ import {
   getFollowerAddresses,
   getFollowerDAOs,
   getFollowerFids,
-  getProposalFromPropdate,
+  getProposalFromId,
   getUserFid,
 } from '@/commands'
 import { logger } from '@/logger'
 import { addToQueue } from '@/queue'
-import { getAttestations } from '@/services/builder/get-propdate-attestations'
-import { shortenAddress } from '@/utils'
+import { getPropdateAttestations } from '@/services/eas/get-propdate-attestations'
 import { filter, pipe } from 'remeda'
 import { JsonValue } from 'type-fest'
 
@@ -20,9 +19,9 @@ import { JsonValue } from 'type-fest'
  */
 async function handleProposalUpdates() {
   try {
-    logger.info('Fetching new updates...')
-    const { propdates } = await getAttestations()
-    logger.info({ propdates }, 'New updates retrieved.')
+    logger.info('Fetching new propdates...')
+    const { propdates } = await getPropdateAttestations()
+    logger.info({ propdates }, 'New propdates retrieved.')
 
     const userFid = await getUserFid()
     logger.debug({ userFid }, 'User FID retrieved.')
@@ -89,27 +88,26 @@ async function handleProposalUpdates() {
       for (const propdate of propdates) {
         logger.debug(
           {
-            proposalId: shortenAddress(propdate.proposalId),
-            propdateId: shortenAddress(propdate.id),
+            propdateId: propdate.id,
+            proposalId: propdate.proposalId,
           },
           'Processing proposal update for follower.',
         )
 
-        // get dao and proposal data from dao treasury address
-        const proposal = await getProposalFromPropdate(
+        // get proposal data from proposal id
+        const proposal = await getProposalFromId(
           propdate.chain,
-          propdate.id,
           propdate.proposalId,
         )
 
-        if (proposal === null || propdate.proposalId === '0x') {
+        if (!proposal) {
           // skip if proposal doesn't exist or Json parsing error
           logger.debug(
             {
-              proposalId: shortenAddress(propdate.proposalId),
-              propdateId: shortenAddress(propdate.id),
+              propdateId: propdate.id,
+              proposalId: propdate.proposalId,
             },
-            'proposal update for skipped.',
+            'Proposal not found, skipping.',
           )
           continue
         }
@@ -118,8 +116,8 @@ async function handleProposalUpdates() {
         if (!daos.includes(proposal.dao.id)) {
           logger.debug(
             {
-              proposalId: shortenAddress(propdate.proposalId),
-              propdateId: shortenAddress(propdate.id),
+              propdateId: propdate.id,
+              proposalId: propdate.proposalId,
               follower,
             },
             'Proposal DAO ID not associated with follower, skipping.',
@@ -131,8 +129,8 @@ async function handleProposalUpdates() {
         if (notifiedUpdatesSet.has(propdate.id)) {
           logger.debug(
             {
-              proposalId: shortenAddress(propdate.proposalId),
-              propdateId: shortenAddress(propdate.id),
+              propdateId: propdate.id,
+              proposalId: propdate.proposalId,
               follower,
             },
             'Proposal update already notified, skipping.',
@@ -143,8 +141,8 @@ async function handleProposalUpdates() {
         // Add the proposal to the queue for notifications
         logger.info(
           {
-            proposalId: shortenAddress(propdate.proposalId),
-            propdateId: shortenAddress(propdate.id),
+            propdateId: propdate.id,
+            proposalId: propdate.proposalId,
             follower,
           },
           'Adding proposal update to notification queue.',
@@ -160,8 +158,8 @@ async function handleProposalUpdates() {
         notifiedUpdatesSet.add(propdate.id)
         logger.debug(
           {
-            proposalId: shortenAddress(propdate.proposalId),
-            propdateId: shortenAddress(propdate.id),
+            propdateId: propdate.id,
+            proposalId: propdate.proposalId,
             follower,
           },
           'Proposal Update marked as notified.',

src/commands/process/propdates.ts

@@ -15,7 +15,7 @@ type TaskData = {
 
 interface NotificationData {
   recipient: number
-  proposal?: Proposal
+  proposal: Proposal
   propdate?: Propdate
 }
 
@@ -79,15 +79,16 @@ function formatPropdateMessage(propdate: Propdate, proposal: Proposal): string {
 
   const milestoneText =
     parsedMessage.milestoneId !== undefined
-      ? ` for milestone ${parsedMessage.milestoneId.toString()}`
+      ? // Add 1 to the milestone ID to account for the fact that the milestone ID starts at 0
+        ` for milestone ${(parsedMessage.milestoneId + 1).toString()}`
       : ''
 
   return (
     `📢 A new update to proposal (#${proposalNumber.toString()}: "${proposalTitle}")${milestoneText} has been created on ${daoName} ` +
     `around ${toRelativeTime(Number(createdAt))}. ` +
     `\n\n${truncatedUpdate} ` +
     `\n\n🚀 Check it out for more details and participate in the voting process!` +
-    `\n\nhttps://nouns.build/dao/${chainName}/${daoId}/vote/${proposalNumber.toString()}`
+    `\n\nhttps://nouns.build/dao/${chainName.toLowerCase()}/${daoId}/vote/${proposalNumber.toString()}`
   )
 }
 
@@ -101,14 +102,13 @@ async function handleNotification(taskId: string, data: NotificationData) {
   try {
     const { recipient, proposal, propdate } = data
     let message: string | undefined
-    if (proposal && !propdate) {
-      message = formatProposalMessage(proposal)
-    } else if (proposal && propdate) {
+
+    if (propdate) {
       message = formatPropdateMessage(propdate, proposal)
+    } else {
+      message = formatProposalMessage(proposal)
     }
-    if (!message) {
-      throw new Error('No valid message format found')
-    }
+
     const idempotencyKey = sha256(message).toString()
 
     const result = await sendDirectCast(env, recipient, message, idempotencyKey)

src/commands/queues/consume.ts

@@ -4,7 +4,7 @@ import { gql, GraphQLClient } from 'graphql-request'
 import { JsonObject } from 'type-fest'
 
 type Data = {
-  proposal: Proposal
+  proposal?: Proposal
 } & JsonObject
 
 interface Result {
@@ -16,16 +16,19 @@ export const getProposalData = async (
   proposalId: string,
 ): Promise<Result> => {
   const query = gql`
-    {
-      proposal(
-        id: "${proposalId}"
-      ) {
+    query GetProposal($id: ID!) {
+      proposal(id: $id) {
+        id
         proposalNumber
-        title
-        dao{
+        dao {
           id
           name
         }
+        title
+        proposer
+        timeCreated
+        voteStart
+        voteEnd
       }
     }
   `
@@ -38,8 +41,11 @@ export const getProposalData = async (
       throw new Error(`Endpoint not found for chain ID: ${chain.id.toString()}`)
     }
     const client = new GraphQLClient(endpoint.endpoint)
-    const response = await client.request<Data>(query)
-    if (!response.proposal.title) {
+    const variables = {
+      id: proposalId.toLowerCase(),
+    }
+    const response = await client.request<Data>(query, variables)
+    if (!response.proposal) {
       throw new Error(`Proposal does not exist: ${proposalId}`)
     }
     return { proposal: response.proposal }

src/services/builder/get-proposal-for-propdate.ts renamed to src/services/builder/get-proposal-from-id.ts

@@ -27,15 +27,6 @@ export const endpoints: Record<number, string> = {
   7777777: env.BUILDER_SUBGRAPH_ZORA_URL,
 }
 
-const attestationEndpoints: Record<number, string> = {
-  1: 'https://easscan.org/graphql',
-  10: 'https://optimism.easscan.org/graphql',
-  8453: 'https://base.easscan.org/graphql',
-}
-
-const PROPDATES_SCHEMA_ID =
-  '0x8bd0d42901ce3cd9898dbea6ae2fbf1e796ef0923e7cbb0a1cecac2e42d47cb3'
-
 export const chainEndpoints = chains.map((chain) => {
   const endpoint: string | undefined = endpoints[chain.id]
   if (!endpoint) {
@@ -46,76 +37,3 @@ export const chainEndpoints = chains.map((chain) => {
     endpoint,
   }
 })
-
-export const attestationChainEndpoints = chains
-  .filter((chain) => chain.id != 7777777)
-  .map((chain) => {
-    const endpoint = attestationEndpoints[chain.id]
-    const schemaId = PROPDATES_SCHEMA_ID
-    if (!endpoint) {
-      throw new Error(`Endpoint not found for chain ID: ${chain.id.toString()}`)
-    }
-    return {
-      chain,
-      endpoint,
-      schemaId,
-    }
-  })
-
-const IPFS_ENDPOINTS = [
-  `https://ipfs.io/ipfs/`,
-  `https://cloudflare-ipfs.com/ipfs/`,
-  `https://dweb.link/ipfs/`,
-  `https://w3s.link/ipfs/`,
-  `https://flk-ipfs.xyz/ipfs/`,
-]
-
-/**
- * Strips protocol prefixes from a CID
- * @param cid - The CID that might contain protocol prefixes
- * @returns The CID without protocol prefixes
- */
-function stripProtocolFromCid(cid: string): string {
-  return cid.replace(/^https?:\/\/|^ipfs:\/\//, '')
-}
-
-/**
- * Fetches content from IPFS using multiple gateways
- * @param cid - The IPFS CID to fetch, with or without protocol prefix
- * @returns The content fetched from IPFS as a string
- */
-export const fetchFromIPFS = async (
-  cid: string | undefined,
-): Promise<string> => {
-  if (!cid) {
-    throw new Error('CID is required')
-  }
-
-  const cleanCid = stripProtocolFromCid(cid)
-  const controllers = IPFS_ENDPOINTS.map(() => new AbortController())
-
-  try {
-    const response = await Promise.any<string>(
-      IPFS_ENDPOINTS.map(async (endpoint, index) => {
-        const controller = controllers[index]
-        const { signal } = controller
-
-        const res = await fetch(`${endpoint}${cleanCid}`, { signal })
-        if (res.ok) {
-          // Abort other requests once a successful one is found
-          controllers.forEach((ctrl, i) => {
-            if (i !== index) ctrl.abort()
-          })
-          const data = await res.text()
-          return data
-        }
-        throw new Error(`Failed to fetch from ${endpoint}`)
-      }),
-    )
-
-    return response
-  } catch (error) {
-    console.error(`Failed to fetch from IPFS for CID: ${cleanCid}: `, error)
-    throw new Error(`Failed to fetch from IPFS for CID: ${cleanCid}`)
-  }
-}