@stake-dao/reader 0.2.3 → 0.2.5

package/dist/types/strategies/balancer/fetch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fetch.d.ts","sourceRoot":"","sources":["../../../../src/strategies/balancer/fetch.ts"],"names":[],"mappings":"AAiBA,OAAO,KAAK,EAA6C,YAAY,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAMvH,UAAU,cAAc;IACtB,QAAQ,EAAE,GAAG,CAAA;IACb,QAAQ,EAAE,aAAa,CAAA;IACvB,cAAc,EAAE,MAAM,CAAA;IACtB,OAAO,EAAE,YAAY,CAAA;IACrB,eAAe,EAAE,GAAG,CAAA;CACrB;AAED,eAAO,MAAM,aAAa,sEAMvB,cAAc,KAAG,OAAO,CAAC,YAAY,CAoOvC,CAAA"}
+{"version":3,"file":"fetch.d.ts","sourceRoot":"","sources":["../../../../src/strategies/balancer/fetch.ts"],"names":[],"mappings":"AAiBA,OAAO,KAAK,EAA6C,YAAY,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAMvH,UAAU,cAAc;IACtB,QAAQ,EAAE,GAAG,CAAA;IACb,QAAQ,EAAE,aAAa,CAAA;IACvB,cAAc,EAAE,MAAM,CAAA;IACtB,OAAO,EAAE,YAAY,CAAA;IACrB,eAAe,EAAE,GAAG,CAAA;CACrB;AAED,eAAO,MAAM,aAAa,sEAMvB,cAAc,KAAG,OAAO,CAAC,YAAY,CAqOvC,CAAA"}

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/strategies/curve/fetch/index.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAA;AAE/C,OAAO,KAAK,EAIV,YAAY,EACZ,YAAY,EACZ,aAAa,EACd,MAAM,gBAAgB,CAAA;AAKvB,OAAO,EAAE,KAAK,eAAe,EAAa,MAAM,oBAAoB,CAAA;AAKpE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAA;AAK3E,UAAU,WAAW;IACnB,MAAM,EAAE,KAAK,EAAE,CAAA;IACf,QAAQ,EAAE,GAAG,CAAA;IACb,GAAG,EAAE,MAAM,CAAA;IACX,cAAc,EAAE,MAAM,CAAA;IACtB,QAAQ,EAAE,aAAa,CAAA;IACvB,OAAO,EAAE,YAAY,CAAA;IACrB,eAAe,EAAE,MAAM,CAAA;IACvB,eAAe,EAAE,eAAe,CAAA;IAChC,aAAa,EAAE,iBAAiB,CAAA;CACjC;AAED,eAAO,MAAM,UAAU,mHAUpB,WAAW,KAAG,OAAO,CAAC,YAAY,CAwPpC,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/strategies/curve/fetch/index.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAA;AAE/C,OAAO,KAAK,EAIV,YAAY,EACZ,YAAY,EACZ,aAAa,EACd,MAAM,gBAAgB,CAAA;AAKvB,OAAO,EAAE,KAAK,eAAe,EAAa,MAAM,oBAAoB,CAAA;AAKpE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAA;AAK3E,UAAU,WAAW;IACnB,MAAM,EAAE,KAAK,EAAE,CAAA;IACf,QAAQ,EAAE,GAAG,CAAA;IACb,GAAG,EAAE,MAAM,CAAA;IACX,cAAc,EAAE,MAAM,CAAA;IACtB,QAAQ,EAAE,aAAa,CAAA;IACvB,OAAO,EAAE,YAAY,CAAA;IACrB,eAAe,EAAE,MAAM,CAAA;IACvB,eAAe,EAAE,eAAe,CAAA;IAChC,aAAa,EAAE,iBAAiB,CAAA;CACjC;AAED,eAAO,MAAM,UAAU,mHAUpB,WAAW,KAAG,OAAO,CAAC,YAAY,CAyPpC,CAAA"}

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

@@ -23,6 +23,7 @@ export declare const getPancakeErc20Vaults: (rpc: string, chainId: number, baseP
         workingSupply: string;
     };
     lpPriceInUsd: number;
+    streaming: any;
     tvl: number;
     apr: {
         boost: number;

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

@@ -1 +1 @@
-{"version":3,"file":"getPancakeErc20Vaults.d.ts","sourceRoot":"","sources":["../../../../../src/strategies/pancakeswap/fetch/getPancakeErc20Vaults.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,KAAK,KAAK,EAAe,MAAM,oBAAoB,CAAA;AAI5D,eAAO,MAAM,qBAAqB,QAC3B,MAAM,WACF,MAAM,cACH,KAAK,EAAE,WACV,GAAG,eACC,GAAG,UACR,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAqKZ,CAAA"}
+{"version":3,"file":"getPancakeErc20Vaults.d.ts","sourceRoot":"","sources":["../../../../../src/strategies/pancakeswap/fetch/getPancakeErc20Vaults.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,KAAK,KAAK,EAAe,MAAM,oBAAoB,CAAA;AAI5D,eAAO,MAAM,qBAAqB,QAC3B,MAAM,WACF,MAAM,cACH,KAAK,EAAE,WACV,GAAG,eACC,GAAG,UACR,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAsKZ,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;;;EAyKhB,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/dist/types/strategies/pendle/fetch.d.ts

@@ -18,6 +18,7 @@ export declare const fetchPendle: ({ prices, provider, rpc, explorerApiKey, expl
         vault: any;
         lpToken: any;
         coins: any;
+        streaming: boolean;
         sdGauge: {
             relativeWeight: string;
             weight: string;

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

@@ -1 +1 @@
-{"version":3,"file":"fetch.d.ts","sourceRoot":"","sources":["../../../../src/strategies/pendle/fetch.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAA;AAG5C,OAAO,KAAK,EAAE,WAAW,EAAU,YAAY,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAsBnF,UAAU,YAAY;IACpB,MAAM,EAAE,KAAK,EAAE,CAAA;IACf,QAAQ,EAAE,GAAG,CAAA;IACb,GAAG,EAAE,MAAM,CAAA;IACX,cAAc,EAAE,MAAM,CAAA;IACtB,QAAQ,EAAE,aAAa,CAAA;IACvB,OAAO,EAAE,YAAY,CAAA;CACtB;AAED,eAAO,MAAM,WAAW,iEAAwE,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAoT3G,CAAA"}
+{"version":3,"file":"fetch.d.ts","sourceRoot":"","sources":["../../../../src/strategies/pendle/fetch.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAA;AAG5C,OAAO,KAAK,EAAE,WAAW,EAAU,YAAY,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAsBnF,UAAU,YAAY;IACpB,MAAM,EAAE,KAAK,EAAE,CAAA;IACf,QAAQ,EAAE,GAAG,CAAA;IACb,GAAG,EAAE,MAAM,CAAA;IACX,cAAc,EAAE,MAAM,CAAA;IACtB,QAAQ,EAAE,aAAa,CAAA;IACvB,OAAO,EAAE,YAAY,CAAA;CACtB;AAED,eAAO,MAAM,WAAW,iEAAwE,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAqT3G,CAAA"}

package/dist/types/strategies/yearn/fetch/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/strategies/yearn/fetch/index.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAA;AAC/C,OAAO,KAAK,EAAe,YAAY,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAA;AAE5F,OAAO,EAAE,KAAK,eAAe,EAAoC,MAAM,sBAAsB,CAAA;AAiC7F,UAAU,WAAW;IACnB,MAAM,EAAE,KAAK,EAAE,CAAA;IACf,QAAQ,EAAE,GAAG,CAAA;IACb,GAAG,EAAE,MAAM,CAAA;IACX,cAAc,EAAE,MAAM,CAAA;IACtB,QAAQ,EAAE,aAAa,CAAA;IACvB,OAAO,EAAE,YAAY,CAAA;IACrB,eAAe,EAAE,MAAM,CAAA;IACvB,eAAe,EAAE,eAAe,CAAA;CACjC;AAED,eAAO,MAAM,UAAU,oGASpB,WAAW,KAAG,OAAO,CAAC,YAAY,CA6KpC,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/strategies/yearn/fetch/index.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAA;AAC/C,OAAO,KAAK,EAAe,YAAY,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAA;AAE5F,OAAO,EAAE,KAAK,eAAe,EAAoC,MAAM,sBAAsB,CAAA;AAiC7F,UAAU,WAAW;IACnB,MAAM,EAAE,KAAK,EAAE,CAAA;IACf,QAAQ,EAAE,GAAG,CAAA;IACb,GAAG,EAAE,MAAM,CAAA;IACX,cAAc,EAAE,MAAM,CAAA;IACtB,QAAQ,EAAE,aAAa,CAAA;IACvB,OAAO,EAAE,YAAY,CAAA;IACrB,eAAe,EAAE,MAAM,CAAA;IACvB,eAAe,EAAE,eAAe,CAAA;CACjC;AAED,eAAO,MAAM,UAAU,oGASpB,WAAW,KAAG,OAAO,CAAC,YAAY,CA8KpC,CAAA"}

package/package.json

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

package/src/strategies/balancer/fetch.ts

@@ -231,6 +231,7 @@ export const fetchBalancer = async ({
           coins: strat.coins,
           sdGauge,
           lpPriceInUsd: lpPriceInUsd ? lpPriceInUsd.usdPrice : 0,
+          streaming: rewardsData.every((r) => Math.floor(Date.now() / 1000) > Number(r.periodFinish)),
           tvl,
           apr: {
             boost,

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

@@ -215,6 +215,7 @@ export const fetchCurve = async ({
         underlyingCoins: strat.underlyingCoins,
         sdGauge,
         lpPriceInUsd: strat.lpPriceInUsd,
+        streaming: rewardsData.every((r) => Math.floor(Date.now() / 1000) > Number(r.periodFinish)),
         tvl,
         apr: {
           boost,

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

@@ -165,6 +165,7 @@ export const getPancakeErc20Vaults = async (
         coins: strat.coins,
         sdGauge,
         lpPriceInUsd,
+        streaming: rewardsData.every((r) => Math.floor(Date.now() / 1000) > Number(r.periodFinish)),
         tvl,
         apr: { ...apr, boost },
         rewards: rewardsData,

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,
@@ -167,6 +174,7 @@ export const getPancakeV3Vaults = async (
         fee: strat.fee,
         coins: strat.coins,
         coinsPrice: [token0PriceInUsd, token1PriceInUsd],
+        streaming: true,
         tvl,
         apr: { ...apr, boost },
         rewards,
@@ -178,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 }
-}

package/src/strategies/pendle/fetch.ts

@@ -255,6 +255,7 @@ export const fetchPendle = async ({ prices, provider, rpc, explorerApiKey, explo
       vault: s.vault,
       lpToken: s.lpToken,
       coins: s.coins,
+      streaming: rewardsData.every((r) => Math.floor(Date.now() / 1000) > Number(r.periodFinish)),
       sdGauge,
       lpPriceInUsd,
       tvl,

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

@@ -208,6 +208,7 @@ export const fetchYearn = async ({
       underlyingCoins: [],
       sdGauge,
       rewards: rewardsData,
+      streaming: rewardsData.every((r) => Math.floor(Date.now() / 1000) > Number(r.periodFinish)),
       name: s.coins.reduce((res: string, current) => `${res}/${current.symbol}`, '').slice(1),
       tradingApy: 0,
       underlyingReward,