@stake-dao/reader 0.4.35 → 0.4.36

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/lockers/fetch/index.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAA;AAK5C,OAA6B,EAAE,KAAK,cAAc,EAAE,MAAM,kCAAkC,CAAA;AAuB5F,UAAU,aAAa;IACrB,QAAQ,EAAE,GAAG,CAAA;IACb,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,KAAK,EAAE,CAAA;IACf,gBAAgB,CAAC,EAAE,OAAO,CAAA;CAC3B;AAED,eAAO,MAAM,YAAY,oDAA2D,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAiThG,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/lockers/fetch/index.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAA;AAK5C,OAA6B,EAAE,KAAK,cAAc,EAAE,MAAM,kCAAkC,CAAA;AAuB5F,UAAU,aAAa;IACrB,QAAQ,EAAE,GAAG,CAAA;IACb,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,KAAK,EAAE,CAAA;IACf,gBAAgB,CAAC,EAAE,OAAO,CAAA;CAC3B;AAED,eAAO,MAAM,YAAY,oDAA2D,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAsRhG,CAAA"}

package/dist/types/lockers/utils/getBribesRewardsData.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getBribesRewardsData.d.ts","sourceRoot":"","sources":["../../../../src/lockers/utils/getBribesRewardsData.ts"],"names":[],"mappings":"AAMA,MAAM,MAAM,cAAc,GAAG;IAC3B,WAAW,EAAE,MAAM,CAAA;IACnB,WAAW,EAAE,MAAM,CAAA;IACnB,eAAe,EAAE,MAAM,CAAA;IACvB,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,EAAE,MAAM,CAAA;IAChB,KAAK,EAAE,MAAM,CAAA;IACb,YAAY,CAAC,EAAE,OAAO,CAAA;CACvB,CAAA;AAED,QAAA,MAAM,oBAAoB,WAChB,GAAG,cACC,GAAG,oBACG,GAAG,qBACF,GAAG,qBACH,GAAG,sBACF,GAAG,KACtB;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,cAAc,GAAG,SAAS,CAAA;CA8CtF,CAAA;AAED,eAAe,oBAAoB,CAAA"}
+{"version":3,"file":"getBribesRewardsData.d.ts","sourceRoot":"","sources":["../../../../src/lockers/utils/getBribesRewardsData.ts"],"names":[],"mappings":"AAMA,MAAM,MAAM,cAAc,GAAG;IAC3B,WAAW,EAAE,MAAM,CAAA;IACnB,WAAW,EAAE,MAAM,CAAA;IACnB,eAAe,EAAE,MAAM,CAAA;IACvB,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,EAAE,MAAM,CAAA;IAChB,KAAK,EAAE,MAAM,CAAA;IACb,YAAY,CAAC,EAAE,OAAO,CAAA;CACvB,CAAA;AAED,QAAA,MAAM,oBAAoB,WAChB,GAAG,cACC,GAAG,oBACG,GAAG,qBACF,GAAG,qBACH,GAAG,sBACF,GAAG,KACtB;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,cAAc,GAAG,SAAS,CAAA;CA+CtF,CAAA;AAED,eAAe,oBAAoB,CAAA"}

package/package.json

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

package/src/lockers/fetch/index.ts

@@ -1,11 +1,11 @@
-import { type Locker, ONE_YEAR, Zero, delegationWithId, lockers } from '@stake-dao/constants'
+import { type Locker, ONE_YEAR, RPC, Zero, contract, lockers } from '@stake-dao/constants'
 import { formatUnits, parseAbi, zeroAddress } from 'viem'
-import { fraxtal, mainnet } from 'viem/chains'
+import { mainnet } from 'viem/chains'
 import lockersMulticallAbi from '../../abis/lockersMulticall.js'
 import { getSdtInflationData } from '../../index.js'
 import type { Price } from '../../prices.js'
 import { handlePromise } from '../../strategies/utils/promise.js'
-import { type Call, type MultiChainCall, equalTlc, multicall, multichainMulticall } from '../../utils.js'
+import { type Call, type MultiChainCall, equalTlc, multicall, multichainMulticall, rpcCall } from '../../utils.js'
 import { extractFees, feeCalls } from '../utils/callsForLockers/feeCalls.js'
 import callsForLockers from '../utils/callsForLockers/index.js'
 import getBribesRewardsData, { type TBribesRewards } from '../utils/getBribesRewardsData.js'
@@ -73,7 +73,7 @@ export const fetchLockers = async ({ provider, chainId, prices, withAirdropGraph
     lockersFeeCalls.push(...feeCalls(locker.id, locker.modules.accumulator))
   }
 
-  const [rawLockersData, rawLockersSideChainData, rawLockersRewardsData] = await handlePromise(
+  const [rawLockersData, rawLockersSideChainData, rawLockersRewardsData, rawVeSdtTotalSupply] = await handlePromise(
     [
       multicall(provider, lockersCalls.concat(lockersFeeCalls), lockersMulticallAbi),
       multichainMulticall(lockersSideChainsCalls, lockersMulticallAbi),
@@ -84,6 +84,7 @@ export const fetchLockers = async ({ provider, chainId, prices, withAirdropGraph
           'function reward_data(address) external view returns (address,address,uint256,uint256,uint256,uint256)',
         ]),
       ),
+      rpcCall(RPC[mainnet.id], [{ to: contract('veSdt', mainnet.id), data: '0x18160ddd' }]),
     ],
     'lockerMulticalls',
   )
@@ -91,6 +92,7 @@ export const fetchLockers = async ({ provider, chainId, prices, withAirdropGraph
   const lockersFees = extractFees(chainLockers, rawLockersData)
 
   const sdtInflationData = chainId === mainnet.id ? await getSdtInflationData(provider) : undefined
+  const veSdtTotalSupply = BigInt(rawVeSdtTotalSupply[0].result)
 
   const lockerData = chainLockers.map(async (locker) => {
     const lockerCallsLength = callsForLockers(
@@ -135,7 +137,7 @@ export const fetchLockers = async ({ provider, chainId, prices, withAirdropGraph
         ? formatUnits(chunkedRawLockersData[7].result, locker.token.decimals)
         : '0'
     const amountTokenNotLock = formatUnits(chunkedRawLockersData[8].result, locker.token.decimals)
-    const veSdtTotalSupply = chainId === mainnet.id ? chunkedRawLockersData[9].result : '0'
+    // const veSdtTotalSupply = chainId === mainnet.id ? chunkedRawLockersData[9].result : '0'
 
     const voteBooster = parseVoteBoosterData(locker, chunkedRawLockersData)
     const peg = parsePeg(locker, chunkedRawLockersData)
@@ -209,57 +211,28 @@ export const fetchLockers = async ({ provider, chainId, prices, withAirdropGraph
       }
     })
 
-    let bribeMinApr = 0
-    let bribeMaxApr = 0
-    let bribeRewards: TBribesRewards | undefined = undefined
+    let _workingSupply = chainId === mainnet.id ? gaugeWorkingSupply : totalSupplyStaked
+    let _veSdtTotalSupply = veSdtTotalSupply
+    let _veBalanceOfLocker = veBalanceOfLocker
 
-    if (chainId === mainnet.id || chainId === fraxtal.id) {
-      let _workingSupply = gaugeWorkingSupply
-      let _veSdtTotalSupply = veSdtTotalSupply
-      let _veBalanceOfLocker = veBalanceOfLocker
-
-      if (locker.id === 'fxs') {
-        _workingSupply = httpCalls.sdfxsWorkingData.working_supply.toString()
-        _veSdtTotalSupply = BigInt(httpCalls.sdfxsWorkingData.veSDT_total_supply)
-        _veBalanceOfLocker = (httpCalls.sdfxsWorkingData.veBalance * 4).toString()
-      }
+    if (locker.id === 'fxs') {
+      _workingSupply = httpCalls.sdfxsWorkingData.working_supply.toString()
+      _veSdtTotalSupply = BigInt(httpCalls.sdfxsWorkingData.veSDT_total_supply)
+      _veBalanceOfLocker = (httpCalls.sdfxsWorkingData.veBalance * 4).toString()
+    }
 
-      const data = getBribesRewardsData(
-        locker,
-        httpCalls.bribesData,
-        _veSdtTotalSupply,
-        totalSupplyStaked,
-        _veBalanceOfLocker,
-        _workingSupply,
-      )
-
-      bribeMinApr = data.bribeMinApr
-      bribeMaxApr = data.bribeMaxApr
-      bribeRewards = data.bribeRewards
-    } else if (locker.id === 'cake') {
-      let _veBalanceOfLocker = Number(veBalanceOfLocker)
-
-      // Add sidechain veBalance
-      if (sideChains && sideChains.length > 0) {
-        _veBalanceOfLocker +=
-          sideChains?.reduce((acc: number, sideChain) => acc + Number(sideChain.veBalanceOfLocker), 0) || 0
-      }
+    const data = getBribesRewardsData(
+      locker,
+      httpCalls.bribesData,
+      _veSdtTotalSupply,
+      totalSupplyStaked,
+      _veBalanceOfLocker,
+      _workingSupply,
+    )
 
-      const apr =
-        (httpCalls.bribesData?.[delegationWithId(locker.id)!] || 0) * (_veBalanceOfLocker / Number(totalSupplyStaked))
-
-      bribeMinApr = apr
-      bribeMaxApr = apr
-      bribeRewards = {
-        bribeMinApr: apr,
-        bribeMaxApr: apr,
-        bribeAverageApr: apr,
-        minBoost: '0',
-        maxBoost: '0',
-        hideBoostTab: true,
-        token: `sd${locker.id}`,
-      }
-    }
+    const bribeMinApr: number = data.bribeMinApr
+    const bribeMaxApr: number = data.bribeMaxApr
+    const bribeRewards: TBribesRewards | undefined = data.bribeRewards
 
     // Total APR
     const minRewardsAprs = rewardsData.reduce((x, y) => x + y.apr, 0) + bribeMinApr

package/src/lockers/utils/getBribesRewardsData.ts

@@ -27,6 +27,7 @@ const getBribesRewardsData = (
     { id: 'bal', value: bribesData?.[delegationWithId('bal')!] / 100 || 0 },
     { id: 'fxs', value: bribesData?.[delegationWithId('fxs')!] / 100 || 0 }, // 1 FXS = 4 veFXS
     { id: 'angle', value: bribesData?.[delegationWithId('angle')!] / 100 || 0 },
+    { id: 'cake', value: bribesData?.[delegationWithId('cake')!] / 100 || 0 },
     { id: 'pendle', value: bribesData?.[delegationWithId('pendle')!] / 100 || 0 },
     { id: 'fxn', value: bribesData?.[delegationWithId('fxn')!] / 100 || 0 },
   ]