@stake-dao/reader 0.2.4 → 0.2.6

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;;;EA0KhB,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;;;EAsLhB,CAAA"}

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

@@ -1,11 +1,15 @@
-export declare const computePositionData: (s: any, p: any, stratParsedData: any, fees24H: number, prices: any[], token0PriceInUsd: number, token1PriceInUsd: number, totalAllocPoint: string, inflationRate: string) => {
+type StratParsedData = {
+    allocPoint: number;
+    tick: number;
+    sqrtPriceX96: string;
+    totalLiquidity: string;
+    totalBoostLiquidity: string;
+    poolLiquidity: string;
+};
+export declare const computePositionData: (s: any, p: any, stratParsedData: StratParsedData, fees24H: number, prices: any[], token0PriceInUsd: number, token1PriceInUsd: number, totalAllocPoint: string, inflationRate: string) => {
     positionData: any;
     boost: number;
     tvlToAdd: number;
 };
-export declare const getPositionData: (chainId: number, tokenId: number, tickLower: number, tickUpper: number, user: string, strat: any, prices: any[], provider: any) => Promise<{
-    tokenIdPositionData: any;
-    tvlToAdd: number;
-    boost: number;
-}>;
+export {};
 //# sourceMappingURL=pancakePositions.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"pancakePositions.d.ts","sourceRoot":"","sources":["../../../../../src/strategies/pancakeswap/fetch/pancakePositions.ts"],"names":[],"mappings":"AAaA,eAAO,MAAM,mBAAmB,MAC3B,GAAG,KACH,GAAG,mBACW,GAAG,WACX,MAAM,UACP,GAAG,EAAE,oBACK,MAAM,oBACN,MAAM,mBACP,MAAM,iBACR,MAAM;;;;CA2EtB,CAAA;AAED,eAAO,MAAM,eAAe,YACjB,MAAM,WACN,MAAM,aACJ,MAAM,aACN,MAAM,QACX,MAAM,SACL,GAAG,UACF,GAAG,EAAE,YACH,GAAG;;;;EAuCd,CAAA"}
+{"version":3,"file":"pancakePositions.d.ts","sourceRoot":"","sources":["../../../../../src/strategies/pancakeswap/fetch/pancakePositions.ts"],"names":[],"mappings":"AAWA,KAAK,eAAe,GAAG;IACrB,UAAU,EAAE,MAAM,CAAA;IAClB,IAAI,EAAE,MAAM,CAAA;IACZ,YAAY,EAAE,MAAM,CAAA;IACpB,cAAc,EAAE,MAAM,CAAA;IACtB,mBAAmB,EAAE,MAAM,CAAA;IAC3B,aAAa,EAAE,MAAM,CAAA;CACtB,CAAA;AAED,eAAO,MAAM,mBAAmB,MAC3B,GAAG,KACH,GAAG,mBACW,eAAe,WACvB,MAAM,UACP,GAAG,EAAE,oBACK,MAAM,oBACN,MAAM,mBACP,MAAM,iBACR,MAAM;;;;CA2EtB,CAAA"}

package/package.json

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

package/src/strategies/curve/fetch/curveApiData/config.ts

@@ -33,7 +33,7 @@ export const lendingStartIndex = {
 }
 
 export const CHUNK_SIZE = 30
-export const GAUGES_CHUNK_SIZE = { 1: 60, 42161: 40 }
+export const GAUGES_CHUNK_SIZE = { 1: 60, 42161: 30 }
 export const TOKENS_CHUNK_SIZE = 100
 export const GAUGES_WEIGHTS_CHUNK_SIZE = 100
 export const GAUGES_REGISTRY_CHUNK_SIZE = 30

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

@@ -90,11 +90,11 @@ export const getPancakeV3Vaults = async (
       const stratParsedData = {
         poolId: Number(stratData.id),
         allocPoint: Number(stratData.allocPoint),
-        tick: stratData.tick,
-        sqrtPriceX96: stratData.sqrtPriceX96.toString(),
-        totalLiquidity: stratData.totalLiquidity.toString(),
-        totalBoostLiquidity: stratData.totalBoostLiquidity.toString(),
-        poolLiquidity: stratData.poolLiquidity.toString(),
+        tick: Number(stratData.tick),
+        sqrtPriceX96: formatUnits(stratData.sqrtPriceX96, 0),
+        totalLiquidity: formatUnits(stratData.totalLiquidity, 0),
+        totalBoostLiquidity: formatUnits(stratData.totalBoostLiquidity, 0),
+        poolLiquidity: formatUnits(stratData.poolLiquidity, 0),
       }
 
       const strat = pools.find((p) => p.poolId === stratParsedData.poolId)
@@ -111,7 +111,14 @@ export const getPancakeV3Vaults = async (
         const computedPositionData = computePositionData(
           strat,
           p,
-          stratParsedData,
+          {
+            allocPoint: stratParsedData.allocPoint,
+            tick: stratParsedData.tick,
+            sqrtPriceX96: stratParsedData.sqrtPriceX96,
+            totalLiquidity: stratParsedData.totalLiquidity,
+            totalBoostLiquidity: stratParsedData.totalBoostLiquidity,
+            poolLiquidity: stratParsedData.poolLiquidity,
+          },
           fees24H,
           prices,
           token0PriceInUsd,
@@ -179,9 +186,14 @@ export const getPancakeV3Vaults = async (
         minApr: farmApr,
         maxApr: farmApr * 2,
         // Raw data
-        tick: Number(stratParsedData.tick),
-        sqrtPriceX96: stratParsedData.sqrtPriceX96.toString(),
         allocPoint: stratParsedData.allocPoint,
+        tick: stratParsedData.tick,
+        sqrtPriceX96: stratParsedData.sqrtPriceX96,
+        totalLiquidity: stratParsedData.totalLiquidity,
+        totalBoostLiquidity: stratParsedData.totalBoostLiquidity,
+        poolLiquidity: stratParsedData.poolLiquidity,
+        totalAllocPoint: global.totalAllocPoint,
+        inflationRate: global.inflationRate,
       }
 
       stratsData = stratsData.concat(parsedData)

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

@@ -1,8 +1,6 @@
 import { formatUnits } from 'viem'
 
-import pancakeMasterchefAbi from '../abis/PancakeSwapMasterchef.json'
-
-import { contracts, tokenWithId } from '@stake-dao/constants'
+import { tokenWithId } from '@stake-dao/constants'
 import {
   getPositionFarmApr,
   getPositionTradingFee,
@@ -11,10 +9,19 @@ import {
   tickToPrice,
 } from './pancakeswapMath.js'
 
+type StratParsedData = {
+  allocPoint: number
+  tick: number
+  sqrtPriceX96: string
+  totalLiquidity: string
+  totalBoostLiquidity: string
+  poolLiquidity: string
+}
+
 export const computePositionData = (
   s: any,
   p: any,
-  stratParsedData: any,
+  stratParsedData: StratParsedData,
   fees24H: number,
   prices: any[],
   token0PriceInUsd: number,
@@ -25,11 +32,11 @@ export const computePositionData = (
   const bnSqrtPriceX96 = BigInt(stratParsedData.sqrtPriceX96)
 
   const token0Amount = formatUnits(
-    getToken0Amount(Number(stratParsedData.tick), p.tickLower, p.tickUpper, bnSqrtPriceX96, p.liquidity),
+    getToken0Amount(stratParsedData.tick, p.tickLower, p.tickUpper, bnSqrtPriceX96, p.liquidity),
     s.coins[0].decimals,
   )
   const token1Amount = formatUnits(
-    getToken1Amount(Number(stratParsedData.tick), p.tickLower, p.tickUpper, bnSqrtPriceX96, p.liquidity),
+    getToken1Amount(stratParsedData.tick, p.tickLower, p.tickUpper, bnSqrtPriceX96, p.liquidity),
     s.coins[1].decimals,
   )
 
@@ -96,52 +103,3 @@ export const computePositionData = (
     tvlToAdd,
   }
 }
-
-export const getPositionData = async (
-  chainId: number,
-  tokenId: number,
-  tickLower: number,
-  tickUpper: number,
-  user: string,
-  strat: any,
-  prices: any[],
-  provider: any,
-) => {
-  const positionData = await provider.readContract({
-    address: contracts.pancakeMasterchef![chainId],
-    abi: pancakeMasterchefAbi,
-    functionName: 'userPositionInfos',
-    args: [tokenId],
-  })
-
-  const p = {
-    tokenId,
-    liquidity: positionData[0],
-    boostLiquidity: positionData[1],
-    tickLower,
-    tickUpper,
-    rewardGrowthInside: positionData[4],
-    reward: positionData[5],
-    owner: user,
-    pid: positionData[7],
-    boostMultiplier: positionData[8],
-  }
-
-  const {
-    positionData: tokenIdPositionData,
-    tvlToAdd,
-    boost,
-  } = computePositionData(
-    strat,
-    p,
-    strat.stratsData,
-    strat.stratsData.fees24H,
-    prices,
-    strat.token0PriceInUsd,
-    strat.token1PriceInUsd,
-    strat.stratsData.totalAllocPoint || strat.stratsData.allocPoints,
-    strat.stratsData.inflationRate,
-  )
-
-  return { tokenIdPositionData, tvlToAdd, boost }
-}