@stake-dao/reader 0.4.84 → 0.4.86

package/src/strategies/pancakeswap/fetch/index.ts

@@ -3,7 +3,7 @@ import { NEW_FACTORY_EXPLORER_EVENTS } from '../../curve/endpoints.js'
 import { contracts, pancakeswapErc20Strats } from '@stake-dao/constants'
 import { GH_STAKE_DAO_VM_DATA } from '../../../endpoints.js'
 import type { Price } from '../../../prices.js'
-import type { ValidChainId, ValidExplorer } from '../../types.js'
+import type { ValidChainId } from '../../types.js'
 import { getPancakeSwapFeesAPR, getPancakeSwapManagerFeesAPR } from './getPancakeApisData.js'
 import { getPancakeErc20Vaults } from './getPancakeErc20Vaults.js'
 import { getPancakeV3Vaults } from './getPancakeV3Vaults.js'
@@ -14,17 +14,9 @@ interface TFetchPancakeswap {
   chainId: ValidChainId
   prices: Price[]
   explorerApiKey: string
-  explorer: ValidExplorer
 }
 
-export const fetchPancakeswap = async ({
-  provider,
-  rpc,
-  chainId,
-  prices,
-  explorerApiKey,
-  explorer,
-}: TFetchPancakeswap) => {
+export const fetchPancakeswap = async ({ provider, rpc, chainId, prices, explorerApiKey }: TFetchPancakeswap) => {
   const fromBlock = pancakeswapErc20Strats.meta.lastSyncBlock[chainId]! + 1
   const toBlock = Number(await provider.getBlockNumber())
 
@@ -34,13 +26,7 @@ export const fetchPancakeswap = async ({
     (await fetch(`${GH_STAKE_DAO_VM_DATA}/main/tvls/cake.json`)).json(),
     (
       await fetch(
-        NEW_FACTORY_EXPLORER_EVENTS(
-          explorerApiKey,
-          explorer,
-          contracts.cakeVaultFactory![chainId]!,
-          fromBlock,
-          toBlock,
-        ),
+        NEW_FACTORY_EXPLORER_EVENTS(explorerApiKey, chainId, contracts.cakeVaultFactory![chainId]!, fromBlock, toBlock),
       )
     ).json(),
   ])

package/src/strategies/pendle/fetch.ts

@@ -18,7 +18,7 @@ import { batchPendleStrats } from '../../bytecodes/index.js'
 import type { Price } from '../../prices.js'
 import { type Call, batchJsonRpc, equalTlc, lc, multicall } from '../../utils.js'
 import { FACTORY_EXPLORER_EVENTS } from '../curve/endpoints.js'
-import type { RewardsData, SdtApr, ValidChainId, ValidExplorer } from '../types.js'
+import type { RewardsData, SdtApr, ValidChainId } from '../types.js'
 import { getBoost } from '../utils/boost.js'
 import decodeEtherscanFactoryEvent from '../utils/decodeEtherscanFactoryEvent.js'
 import { getAprBreakdown } from '../utils/getAprBreakdown.js'
@@ -26,7 +26,7 @@ import { concatBytecode } from '../utils/index.js'
 import { buildPendleStrategies } from './build.js'
 import getPendleApiData from './getPendleApiData.js'
 import ignoreExtraRewards from './ignoreExtraRewards.js'
-import pendlePoints from './pendlePoints.js'
+import points from './points.js'
 
 const pendleApiForMarket = async (market: string) =>
   (await fetch(`https://api-v2.pendle.finance/core/v1/1/markets/${market}`)).json()
@@ -45,11 +45,10 @@ interface TFetchPendle {
   provider: any
   rpc: string
   explorerApiKey: string
-  explorer: ValidExplorer
   chainId: ValidChainId
 }
 
-export const fetchPendle = async ({ prices, provider, rpc, explorerApiKey, explorer, chainId }: TFetchPendle) => {
+export const fetchPendle = async ({ prices, provider, rpc, explorerApiKey, chainId }: TFetchPendle) => {
   const sdt = tokenWithId('sdt', chainId)!
   const sdtToken = {
     name: sdt.name,
@@ -65,7 +64,7 @@ export const fetchPendle = async ({ prices, provider, rpc, explorerApiKey, explo
     // Etherscan Events
     await (
       await fetch(
-        FACTORY_EXPLORER_EVENTS(explorerApiKey, explorer, contracts.pendleVaultFactory![chainId]!, fromBlock, toBlock),
+        FACTORY_EXPLORER_EVENTS(explorerApiKey, chainId, contracts.pendleVaultFactory![chainId]!, fromBlock, toBlock),
       )
     ).json(),
     // Pende Api
@@ -286,7 +285,7 @@ export const fetchPendle = async ({ prices, provider, rpc, explorerApiKey, explo
       lpToken: s.lpToken,
       coins: s.coins,
       syToken: s.syToken,
-      points: pendlePoints[lc(s.lpToken.address)],
+      points: points[lc(s.lpToken.address)],
       streaming: rewardsData.some((r) => Number(r.periodFinish) > Math.floor(Date.now() / 1000)),
       sdGauge,
       lpPriceInUsd,
@@ -344,7 +343,7 @@ export const fetchPendle = async ({ prices, provider, rpc, explorerApiKey, explo
     ],
     maxApy: s.maxBoostedApy * 100,
     accentColor: s.accentColor,
-    points: pendlePoints[s.address.toLowerCase()],
+    points: points[s.address.toLowerCase()],
   }))
 
   return {

package/src/strategies/pendle/{pendlePoints.ts → points.ts}

@@ -1,4 +1,4 @@
-const pendlePoints = {
+const points = {
   '0x90c98ab215498b72abfec04c651e2e496ba364c0': [
     { multiplier: 20, label: 'Sats Multiplier' },
     { multiplier: 2, label: 'Zircuit Multiplier' },
@@ -19,8 +19,8 @@ const pendlePoints = {
     { multiplier: 1, label: 'EigenLayer Multiplier' },
   ],
   '0x353d0b2efb5b3a7987fb06d30ad6160522d08426': [{ multiplier: 15, label: 'Resolv Points' }],
-  '0x09fa04aac9c6d1c6131352ee950cd67ecc6d4fb9': [{ multiplier: 25, label: 'Resolv Points' }], // 25x Resolv points till 17 April, and 15x thereafter
+  '0x09fa04aac9c6d1c6131352ee950cd67ecc6d4fb9': [{ multiplier: 15, label: 'Resolv Points' }],
   '0x82d810ededb09614144900f914e75dd76700f19d': [{ multiplier: 30, label: 'Resolv Points' }],
 }
 
-export default pendlePoints
+export default points

package/src/strategies/types.ts

@@ -1,4 +1,3 @@
-export type ValidExplorer = 'etherscan.io' | 'bscscan.com' | 'arbiscan.io'
 export type ValidChainId = 1 | 56 | 42161
 
 export type Coin = {

package/src/strategies/yearn/fetch/index.ts

@@ -11,7 +11,7 @@ import { computeYearnApr } from './computeYearnApr.js'
 
 import { contracts } from '@stake-dao/constants'
 import type { Price } from '../../../prices.js'
-import type { RewardsData, SdtApr, StrategyData, ValidChainId, ValidExplorer } from '../../types.js'
+import type { RewardsData, SdtApr, StrategyData, ValidChainId } from '../../types.js'
 import { getAprBreakdown } from '../../utils/getAprBreakdown.js'
 import { decodeNewFactoryEvent } from '../../utils/index.js'
 import { fetchAllYearnGauges } from './fetchAllYearnGauges.js'
@@ -49,7 +49,6 @@ interface TFetchYearn {
   provider: any
   rpc: string
   explorerApiKey: string
-  explorer: ValidExplorer
   chainId: ValidChainId
 }
 
@@ -58,7 +57,6 @@ export const fetchYearn = async ({
   provider,
   rpc,
   explorerApiKey,
-  explorer,
   chainId,
 }: TFetchYearn): Promise<StrategyData> => {
   const fromBlock = yearnStrats.meta.lastSyncBlock[chainId]! + 1
@@ -74,7 +72,7 @@ export const fetchYearn = async ({
       await fetch(
         NEW_FACTORY_EXPLORER_EVENTS(
           explorerApiKey,
-          explorer,
+          chainId,
           contracts.yearnVaultFactory![chainId]!,
           fromBlock,
           toBlock,

package/src/votemarket/curve/fetchSnapshotUserData.ts

@@ -39,7 +39,7 @@ query Proposals {
         first: 20
         where: {
             space: "${space}"
-            title_contains: "${TITLE}"
+            ${space.startsWith('sd') ? '' : `title_contains: "${TITLE}"`}
             type: "weighted"
         }
         orderBy: "created"
@@ -86,6 +86,19 @@ query UserVote {
 }
 `
 
+export const getStakeDaoSnapshotSpace = (protocolId: string): string | undefined => {
+  switch (protocolId) {
+    case 'curve':
+      return 'sdcrv.eth'
+    case 'fxn':
+      return 'sdfxn.eth'
+    case 'balancer':
+      return 'sdbal.eth'
+    default:
+      return undefined
+  }
+}
+
 export const fetchSnapshotUserData = async (
   userAddress: string,
   spaces: string[],
@@ -109,7 +122,9 @@ export const fetchSnapshotUserData = async (
     const proposals = response.proposals as SnapshotProposal[]
 
     const prefix = titlePrefix?.[space] || ''
-    const proposal = proposals.find((proposal) => proposal.title.startsWith(`${prefix}${TITLE}`))
+    const title = `${prefix}${space.startsWith('sd') ? '' : TITLE}`
+
+    const proposal = proposals.find((proposal) => proposal.title.startsWith(title))
     if (!proposal) {
       return undefined
     }

package/src/votemarket/fetchCampaigns/processRawCampaigns.ts

@@ -121,6 +121,7 @@ export const processRawCampaigns = async ({
     ...(fetchedTokens.length > 0 ? await getPrices(fetchedTokens as any, chainId) : []),
     ...(nativeFetchedTokens.length > 0 ? await getPrices(nativeFetchedTokens as any, mainnet.id) : []),
     ...(underlyingTokens.length > 0 ? await getPrices(underlyingTokens as any, chainId) : []),
+    { address: '0x4DF454443D6e9A888e9B1571B2375e8Ab4118d9d', symbol: 'TAC IOU', usdPrice: 0.0375 }, // tmp rEYWA price
     // { address: '0x9E49A0314AE61e9C9E34e4Af62a73FBFfB6DE95A', symbol: 'ARR', usdPrice: 10 }, // For test purpose
     // { address: '0x0Cc20784f790805537D4eE33B41f1aC4eC55446B', symbol: 'USDC', usdPrice: 1 }, // For test purpose
     // { address: '0x59c9a01163e685719FAbE5De34779F563f49D4a3', symbol: 'CRV', usdPrice: 30 }, // For test purpose

package/dist/esm/strategies/pendle/pendlePoints.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"pendlePoints.js","sourceRoot":"","sources":["../../../../src/strategies/pendle/pendlePoints.ts"],"names":[],"mappings":"AAAA,MAAM,YAAY,GAAG;IACnB,4CAA4C,EAAE;QAC5C,EAAE,UAAU,EAAE,EAAE,EAAE,KAAK,EAAE,iBAAiB,EAAE;QAC5C,EAAE,UAAU,EAAE,CAAC,EAAE,KAAK,EAAE,oBAAoB,EAAE;KAC/C;IACD,4CAA4C,EAAE;QAC5C,EAAE,UAAU,EAAE,CAAC,EAAE,KAAK,EAAE,qBAAqB,EAAE;QAC/C,EAAE,UAAU,EAAE,CAAC,EAAE,KAAK,EAAE,oBAAoB,EAAE;QAC9C,EAAE,UAAU,EAAE,CAAC,EAAE,KAAK,EAAE,uBAAuB,EAAE;KAClD;IACD,4CAA4C,EAAE;QAC5C,EAAE,UAAU,EAAE,CAAC,EAAE,KAAK,EAAE,kBAAkB,EAAE;QAC5C,EAAE,UAAU,EAAE,CAAC,EAAE,KAAK,EAAE,oBAAoB,EAAE;QAC9C,EAAE,UAAU,EAAE,CAAC,EAAE,KAAK,EAAE,uBAAuB,EAAE;KAClD;IACD,4CAA4C,EAAE;QAC5C,EAAE,UAAU,EAAE,CAAC,EAAE,KAAK,EAAE,iBAAiB,EAAE;QAC3C,EAAE,UAAU,EAAE,CAAC,EAAE,KAAK,EAAE,oBAAoB,EAAE;QAC9C,EAAE,UAAU,EAAE,CAAC,EAAE,KAAK,EAAE,uBAAuB,EAAE;KAClD;IACD,4CAA4C,EAAE,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE,KAAK,EAAE,eAAe,EAAE,CAAC;IAC1F,4CAA4C,EAAE,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE,KAAK,EAAE,eAAe,EAAE,CAAC,EAAE,sDAAsD;IAClJ,4CAA4C,EAAE,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE,KAAK,EAAE,eAAe,EAAE,CAAC;CAC3F,CAAA;AAED,eAAe,YAAY,CAAA"}

package/dist/types/strategies/pendle/pendlePoints.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"pendlePoints.d.ts","sourceRoot":"","sources":["../../../../src/strategies/pendle/pendlePoints.ts"],"names":[],"mappings":"AAAA,QAAA,MAAM,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAuBjB,CAAA;AAED,eAAe,YAAY,CAAA"}