@stake-dao/reader 0.2.13 → 0.2.15

package/dist/types/index.d.ts

@@ -17,6 +17,7 @@ export { fetchPancakeswap } from './strategies/pancakeswap/fetch/index.js';
 export { buildPancakeSwapStrategies } from './strategies/pancakeswap/build.js';
 export { buildPancakeSwapErc20Strategies } from './strategies/pancakeswap/buildErc20.js';
 export { computePositionData } from './strategies/pancakeswap/fetch/pancakePositions.js';
+export { getPancakeV3Positions } from './strategies/pancakeswap/fetch/getPancakeV3Positions.js';
 export { fetchPendle } from './strategies/pendle/fetch.js';
 export { buildPendleStrategies } from './strategies/pendle/build.js';
 export { default as getPendleApiData } from './strategies/pendle/getPendleApiData.js';

package/dist/types/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,kBAAkB,EAAE,0BAA0B,EAAE,MAAM,aAAa,CAAA;AAC5E,cAAc,UAAU,CAAA;AAKxB,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAA;AAKvC,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAA;AAKvD,cAAc,6BAA6B,CAAA;AAG3C,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAA;AAClE,OAAO,EAAE,UAAU,EAAE,MAAM,mCAAmC,CAAA;AAC9D,OAAO,EAAE,eAAe,EAAE,MAAM,0DAA0D,CAAA;AAC1F,OAAO,EAAE,gBAAgB,EAAE,MAAM,2DAA2D,CAAA;AAC5F,OAAO,EAAE,qBAAqB,EAAE,MAAM,gEAAgE,CAAA;AAGtG,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAA;AAGxD,OAAO,EAAE,uBAAuB,EAAE,MAAM,gCAAgC,CAAA;AACxE,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAA;AAG9D,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAA;AAClE,OAAO,EAAE,UAAU,EAAE,MAAM,mCAAmC,CAAA;AAG9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,yCAAyC,CAAA;AAC1E,OAAO,EAAE,0BAA0B,EAAE,MAAM,mCAAmC,CAAA;AAC9E,OAAO,EAAE,+BAA+B,EAAE,MAAM,wCAAwC,CAAA;AACxF,OAAO,EAAE,mBAAmB,EAAE,MAAM,oDAAoD,CAAA;AAGxF,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAA;AAC1D,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAA;AACpE,OAAO,EAAE,OAAO,IAAI,gBAAgB,EAAE,MAAM,yCAAyC,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,kBAAkB,EAAE,0BAA0B,EAAE,MAAM,aAAa,CAAA;AAC5E,cAAc,UAAU,CAAA;AAKxB,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAA;AAKvC,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAA;AAKvD,cAAc,6BAA6B,CAAA;AAG3C,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAA;AAClE,OAAO,EAAE,UAAU,EAAE,MAAM,mCAAmC,CAAA;AAC9D,OAAO,EAAE,eAAe,EAAE,MAAM,0DAA0D,CAAA;AAC1F,OAAO,EAAE,gBAAgB,EAAE,MAAM,2DAA2D,CAAA;AAC5F,OAAO,EAAE,qBAAqB,EAAE,MAAM,gEAAgE,CAAA;AAGtG,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAA;AAGxD,OAAO,EAAE,uBAAuB,EAAE,MAAM,gCAAgC,CAAA;AACxE,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAA;AAG9D,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAA;AAClE,OAAO,EAAE,UAAU,EAAE,MAAM,mCAAmC,CAAA;AAG9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,yCAAyC,CAAA;AAC1E,OAAO,EAAE,0BAA0B,EAAE,MAAM,mCAAmC,CAAA;AAC9E,OAAO,EAAE,+BAA+B,EAAE,MAAM,wCAAwC,CAAA;AACxF,OAAO,EAAE,mBAAmB,EAAE,MAAM,oDAAoD,CAAA;AACxF,OAAO,EAAE,qBAAqB,EAAE,MAAM,yDAAyD,CAAA;AAG/F,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAA;AAC1D,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAA;AACpE,OAAO,EAAE,OAAO,IAAI,gBAAgB,EAAE,MAAM,yCAAyC,CAAA"}

package/dist/types/strategies/curve/fetch/getStratsWithApr.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getStratsWithApr.d.ts","sourceRoot":"","sources":["../../../../../src/strategies/curve/fetch/getStratsWithApr.ts"],"names":[],"mappings":"AAwBA,eAAO,MAAM,qBAAqB,aAAoB,GAAG,WAAW,MAAM,eAAe,GAAG,EAAE,YAAY,GAAG;;;EAqD5G,CAAA"}
+{"version":3,"file":"getStratsWithApr.d.ts","sourceRoot":"","sources":["../../../../../src/strategies/curve/fetch/getStratsWithApr.ts"],"names":[],"mappings":"AAyBA,eAAO,MAAM,qBAAqB,aAAoB,GAAG,WAAW,MAAM,eAAe,GAAG,EAAE,YAAY,GAAG;;;EAoD5G,CAAA"}

package/dist/types/strategies/pancakeswap/fetch/getPancakeV3Positions.d.ts

@@ -0,0 +1,2 @@
+export declare const getPancakeV3Positions: (rpc: string, chainId: number) => Promise<any>;
+//# sourceMappingURL=getPancakeV3Positions.d.ts.map

package/dist/types/strategies/pancakeswap/fetch/getPancakeV3Positions.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"getPancakeV3Positions.d.ts","sourceRoot":"","sources":["../../../../../src/strategies/pancakeswap/fetch/getPancakeV3Positions.ts"],"names":[],"mappings":"AAQA,eAAO,MAAM,qBAAqB,QAAe,MAAM,WAAW,MAAM,iBAevE,CAAA"}

package/dist/types/strategies/pancakeswap/fetch/getPancakeV3Vaults.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getPancakeV3Vaults.d.ts","sourceRoot":"","sources":["../../../../../src/strategies/pancakeswap/fetch/getPancakeV3Vaults.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,KAAK,KAAK,EAAe,MAAM,oBAAoB,CAAA;AAE5D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAA;AAK3D,eAAO,MAAM,kBAAkB,QACxB,MAAM,WACF,MAAM,cACH,KAAK,EAAE,WACV,GAAG,cACA,GAAG;;;EA2LhB,CAAA"}
+{"version":3,"file":"getPancakeV3Vaults.d.ts","sourceRoot":"","sources":["../../../../../src/strategies/pancakeswap/fetch/getPancakeV3Vaults.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,KAAK,KAAK,EAAe,MAAM,oBAAoB,CAAA;AAE5D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAA;AAK3D,eAAO,MAAM,kBAAkB,QACxB,MAAM,WACF,MAAM,cACH,KAAK,EAAE,WACV,GAAG,cACA,GAAG;;;EAiLhB,CAAA"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stake-dao/reader",
   "description": "",
-  "version": "0.2.13",
+  "version": "0.2.15",
   "license": "AGPL-3.0-only",
   "repository": {
     "type": "git",

package/src/index.ts

@@ -42,6 +42,7 @@ export { fetchPancakeswap } from './strategies/pancakeswap/fetch/index.js'
 export { buildPancakeSwapStrategies } from './strategies/pancakeswap/build.js'
 export { buildPancakeSwapErc20Strategies } from './strategies/pancakeswap/buildErc20.js'
 export { computePositionData } from './strategies/pancakeswap/fetch/pancakePositions.js'
+export { getPancakeV3Positions } from './strategies/pancakeswap/fetch/getPancakeV3Positions.js'
 
 // Pendle
 export { fetchPendle } from './strategies/pendle/fetch.js'

package/src/strategies/curve/fetch/getStratsWithApr.ts

@@ -1,7 +1,7 @@
 import { STRAT_FEES } from '@stake-dao/constants'
+import { formatUnits, parseAbi } from 'viem'
 import { mainnet } from 'viem/chains'
 import { equalTlc, multicall } from '../../../utils.js'
-import { formatUnits, parseAbi } from 'viem'
 
 const getConvexPool = (apisData: any, chainId: number, isLending: boolean, stratLpAddress: string) => {
   if (chainId === mainnet.id) {
@@ -15,7 +15,8 @@ const getConvexPool = (apisData: any, chainId: number, isLending: boolean, strat
 
 const getName = (s: any) => {
   if (s.isLending) {
-    return s.coins[0].symbol
+    const id = s.key.replace('lending-oneway-', '')
+    return `${s.coins[0].symbol}${Number(id) > 8 ? ' Leverage' : ''}`
   }
   return (s.isMetapool ? s.underlyingCoins : s.coins)
     .reduce((res: string, current: any) => `${res}/${current.symbol}`, '')
@@ -55,9 +56,8 @@ export const getCurveStratsWithApr = async (provider: any, chainId: number, curv
     let tradingApy: number = 0
     if (s.isLending) {
       const lendingApyCallResult = lendingExtraCalls.shift()
-      tradingApy =  Number(formatUnits(lendingApyCallResult.result, 16))
-    }
-    else {
+      tradingApy = Number(formatUnits(lendingApyCallResult.result, 16))
+    } else {
       tradingApy = subgraphData?.latestWeeklyApy || 0
     }
 

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

@@ -0,0 +1,24 @@
+import { encodeAbiParameters, parseAbiParameters } from 'viem'
+
+import { batchPancakeSwapPositions } from '../../../bytecodes/index.js'
+
+import { contracts } from '@stake-dao/constants'
+import { concatBytecode } from '../../../index.js'
+import { batchJsonRpc } from '../../../utils.js'
+
+export const getPancakeV3Positions = async (rpc: string, chainId: number) => {
+  const positionsInputData = encodeAbiParameters(
+    parseAbiParameters(batchPancakeSwapPositions.inputType[chainId]!) as any,
+    [contracts.pancakeMasterchef![chainId], contracts.cakeStrategy![chainId], contracts.cakeLocker![chainId]],
+  )
+  const positionsCalls = concatBytecode(batchPancakeSwapPositions.bytecode[chainId]!, positionsInputData)
+
+  const positionsData = await batchJsonRpc({
+    rpc,
+    calls: [positionsCalls],
+    outputTypeAbi: batchPancakeSwapPositions.outputTypeHr[chainId]!,
+    callsKey: `strategies/pancakeswap/fetch/getPancakeV3Positions.ts: positionsData - chainId ${chainId} - rpc ${rpc}`,
+  })
+
+  return positionsData
+}

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

@@ -1,7 +1,7 @@
 import { chunk } from 'lodash-es'
 import { encodeAbiParameters, formatUnits, parseAbiParameters } from 'viem'
 
-import { batchPancakeSwapPositions, batchPancakeSwapStrats } from '../../../bytecodes/index.js'
+import { batchPancakeSwapStrats } from '../../../bytecodes/index.js'
 
 import { getFarmApr } from './pancakeswapMath.js'
 
@@ -11,9 +11,9 @@ import { type Price, mergePrices } from '../../../prices.js'
 import { batchJsonRpc, equalTlc } from '../../../utils.js'
 import type { PancakeSwapGlobalData } from '../../types.js'
 import { getAprBreakdown } from '../../utils/getAprBreakdown.js'
+import { getPancakeV3Positions } from './getPancakeV3Positions.js'
 import { computePositionData } from './pancakePositions.js'
 
-// NOTE: Need to include mainnet SDT price and sdCAKE in prices args
 export const getPancakeV3Vaults = async (
   rpc: string,
   chainId: number,
@@ -40,18 +40,7 @@ export const getPancakeV3Vaults = async (
     callsKey: `strategies/pancakeswap/fetch/getPancakeV3Vaults.ts: getPancakeV3Vaults - chainId ${chainId} - rpc ${rpc}`,
   })
 
-  const positionsInputData = encodeAbiParameters(
-    parseAbiParameters(batchPancakeSwapPositions.inputType[chainId]!) as any,
-    [contracts.pancakeMasterchef![chainId], contracts.cakeStrategy![chainId], contracts.cakeLocker![chainId]],
-  )
-  const positionsCalls = concatBytecode(batchPancakeSwapPositions.bytecode[chainId]!, positionsInputData)
-
-  const positionsData = await batchJsonRpc({
-    rpc,
-    calls: [positionsCalls],
-    outputTypeAbi: batchPancakeSwapPositions.outputTypeHr[chainId]!,
-    callsKey: `strategies/pancakeswap/fetch/getPancakeV3Vaults.ts: positionsData - chainId ${chainId} - rpc ${rpc}`,
-  })
+  const positionsData = await getPancakeV3Positions(rpc, chainId)
 
   const pricesToFetch = pools
     .flatMap((p) =>
@@ -172,6 +161,7 @@ export const getPancakeV3Vaults = async (
         version: '3',
         chainId: strat.chainId,
         pool: strat.pool,
+        pid: strat.poolId,
         fee: strat.fee,
         coins: strat.coins,
         coinsPrice: [token0PriceInUsd, token1PriceInUsd],